Bump and finally fix bug #466120. Remove old.

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)

5 files changed, 58 insertions, 44 deletions

diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog
index 04fc0651ec7d..a04c3037329b 100644
--- a/x11-libs/qscintilla/ChangeLog
+++ b/x11-libs/qscintilla/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/qscintilla
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.101 2014/07/18 19:50:08 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.102 2014/09/13 01:07:02 pesa Exp $
+
+*qscintilla-2.8.4 (13 Sep 2014)
+
+  13 Sep 2014; Davide Pesavento <pesa@gentoo.org>
+  +files/qscintilla-2.8.4-designer.patch, +qscintilla-2.8.4.ebuild,
+  -files/qscintilla-2.8.3-designer.patch, -qscintilla-2.8.3.ebuild,
+  metadata.xml:
+  Bump and finally fix bug #466120. Remove old.
 
 *qscintilla-2.8.3 (18 Jul 2014)
 
diff --git a/x11-libs/qscintilla/files/qscintilla-2.8.3-designer.patch b/x11-libs/qscintilla/files/qscintilla-2.8.3-designer.patch
deleted file mode 100644
index 1dbae09a51b4..000000000000
--- a/x11-libs/qscintilla/files/qscintilla-2.8.3-designer.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-This patch causes the designer plugin to be built against the just-built
-qscintilla, rather than trying to build against the system qscintilla
-which may not be installed yet.
-
---- QScintilla-gpl-2.8.3.orig/designer-Qt4Qt5/designer.pro	2014-07-18 21:42:30.822408448 +0200
-+++ QScintilla-gpl-2.8.3/designer-Qt4Qt5/designer.pro	2014-07-18 21:42:56.153048772 +0200
-@@ -4,7 +4,10 @@
- TEMPLATE = lib
- TARGET = qscintillaplugin
- 
--CONFIG += release plugin qscintilla2
-+CONFIG += release plugin
-+
-+INCLUDEPATH += ../Qt4Qt5
-+LIBS += -L../Qt4Qt5 -lqscintilla2
- 
- greaterThan(QT_MAJOR_VERSION, 4) {
-     QT += designer
diff --git a/x11-libs/qscintilla/files/qscintilla-2.8.4-designer.patch b/x11-libs/qscintilla/files/qscintilla-2.8.4-designer.patch
new file mode 100644
index 000000000000..5b5eacdfcdee
--- /dev/null
+++ b/x11-libs/qscintilla/files/qscintilla-2.8.4-designer.patch
@@ -0,0 +1,22 @@
+This patch causes the designer plugin to be built against the just-built
+libqscintilla2.so, rather than trying to build against the system library
+which may either (a) not be installed yet, or (b) belong to an older
+installation and thus have a different soname (bug 466120).
+
+diff --git a/designer-Qt4Qt5/designer.pro b/designer-Qt4Qt5/designer.pro
+index e3432ff..2b7fa6a 100644
+--- a/designer-Qt4Qt5/designer.pro
++++ b/designer-Qt4Qt5/designer.pro
+@@ -4,7 +4,11 @@
+ TEMPLATE = lib
+ TARGET = qscintillaplugin
+ 
+-CONFIG += release plugin qscintilla2
++CONFIG += release plugin
++
++INCLUDEPATH  += ../Qt4Qt5
++QMAKE_LIBDIR += ../Qt4Qt5
++LIBS         += -lqscintilla2
+ 
+ greaterThan(QT_MAJOR_VERSION, 4) {
+     QT += designer
diff --git a/x11-libs/qscintilla/metadata.xml b/x11-libs/qscintilla/metadata.xml
index 2b23b45efd14..a55bd8c3c47a 100644
--- a/x11-libs/qscintilla/metadata.xml
+++ b/x11-libs/qscintilla/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
-<herd>python</herd>
+	<herd>qt</herd>
+	<herd>python</herd>
+	<use>
+		<flag name="designer">Build plugin for Qt Designer</flag>
+	</use>
 </pkgmetadata>
diff --git a/x11-libs/qscintilla/qscintilla-2.8.3.ebuild b/x11-libs/qscintilla/qscintilla-2.8.4.ebuild
index 3d853399c422..94aa85aff8bc 100644
--- a/x11-libs/qscintilla/qscintilla-2.8.3.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.8.3.ebuild,v 1.1 2014/07/18 19:50:08 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.8.4.ebuild,v 1.1 2014/09/13 01:07:02 pesa Exp $
 
 EAPI=5
 
@@ -15,19 +15,19 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0/11"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
+IUSE="designer doc"
 
 DEPEND="
-	>=dev-qt/designer-4.8.5:4
 	>=dev-qt/qtcore-4.8.5:4
 	>=dev-qt/qtgui-4.8.5:4
+	designer? ( >=dev-qt/designer-4.8.5:4 )
 "
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.8.3-designer.patch"
+	"${FILESDIR}/${PN}-2.8.4-designer.patch"
 )
 
 src_unpack() {
@@ -53,44 +53,43 @@ src_prepare() {
 
 src_configure() {
 	pushd Qt4Qt5 > /dev/null
-	einfo "Configuration of qscintilla"
-	eqmake4 qscintilla.pro
+	eqmake4
 	popd > /dev/null
 
-	pushd designer-Qt4Qt5 > /dev/null
-	einfo "Configuration of designer plugin"
-	eqmake4 designer.pro
-	popd > /dev/null
+	if use designer; then
+		pushd designer-Qt4Qt5 > /dev/null
+		eqmake4
+		popd > /dev/null
+	fi
 }
 
 src_compile() {
 	pushd Qt4Qt5 > /dev/null
-	einfo "Building of qscintilla"
 	emake
 	popd > /dev/null
 
-	pushd designer-Qt4Qt5 > /dev/null
-	einfo "Building of designer plugin"
-	emake
-	popd > /dev/null
+	if use designer; then
+		pushd designer-Qt4Qt5 > /dev/null
+		emake
+		popd > /dev/null
+	fi
 }
 
 src_install() {
 	pushd Qt4Qt5 > /dev/null
-	einfo "Installation of qscintilla"
 	emake INSTALL_ROOT="${D}" install
 	popd > /dev/null
 
-	pushd designer-Qt4Qt5 > /dev/null
-	einfo "Installation of designer plugin"
-	emake INSTALL_ROOT="${D}" install
-	popd > /dev/null
+	if use designer; then
+		pushd designer-Qt4Qt5 > /dev/null
+		emake INSTALL_ROOT="${D}" install
+		popd > /dev/null
+	fi
 
 	dodoc NEWS
 
 	if use doc; then
-		dohtml doc/html-Qt4Qt5/*
-		insinto /usr/share/doc/${PF}
-		doins -r doc/Scintilla
+		docinto html
+		dodoc -r doc/html-Qt4Qt5/*
 	fi
 }