Bump and finally fix bug #466120. Remove old.

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!

6 files changed, 77 insertions, 63 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/Manifest b/x11-libs/qscintilla/Manifest
index 6b3a1ac99ebb..c56fceef4c58 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -2,29 +2,29 @@
 Hash: SHA256
 
 AUX qscintilla-2.7.1-designer.patch 434 SHA256 fa643d33e12ce21d041230285ab71f989f84963c422899a74508f74a8299154f SHA512 bf257cbaf0e30f41ba674778cc8c37d6b958eb25cc89046b5b88c4e6582ddfe8eb4f4daea07a6d7cb23808bdf8ce26954c2470f499e1cdd957046347897fcb23 WHIRLPOOL 2f731cea40791890d2962a88b65f46f750f7b558f45c41692a04363e66f210b4eb56d087a7259c762094b1700cd8b63249b39b4e83bdc4078126447cdff644eb
-AUX qscintilla-2.8.3-designer.patch 608 SHA256 34b1146802d78e618ea0828fed7eebcc6f5c6fc88942358bbb18b8fec4e06ce5 SHA512 93e0d409c5edc541b012309c3302c1428ad958f1009559765a17bc35780a153ae374c62ce363b19c123b751dfd94e4de255920af9b872e4e14e79225a451d7ae WHIRLPOOL 71d109cb221cab7d60780b77453dcd9b2c0e5eb90048b368ca30d14adab6297f13d693cf46b778d3e4f024cf40a8bd2bd3b641e886821cb9f6a7bdf2b791f46a
+AUX qscintilla-2.8.4-designer.patch 721 SHA256 fee772e260d2038cad7c4bb88d5484d50c3a72411033c3db0245982e58a36e11 SHA512 9d1472b0fe352c491ab1c79b3f0671c5badc9bb81c8a9864f33d80846286fa1000dbcff2ed54f31479541ca412c7768bdefce580c248ec69cda434190a60f3c0 WHIRLPOOL 3b046ac97214543e287a54bcb330af3d1aef234cf2abe7269a877a423f0d3659c6f3a375bdac904c72b19051437ffbaf48b9e7e0e991d35ff822b0ba0c8693cf
 DIST QScintilla-gpl-2.7.2.tar.gz 2842625 SHA256 14b47d686dc1586321f84fcf3c9a911ddaace37a1cb0b1e6a6195e252e5bb69c SHA512 d3ca9d75687687210ca6ae3599fd44bfbbad8c99d6d38aaf1c92c83250dc0c5af1c713bdd74d077d0fb9ba1eccbd5e2910eef855d3656392c33c4832d46ff7fb WHIRLPOOL 1ea4a189a5998755afaa0fad111a7f2153e5ecbe13290d62930cce992b0159040de9cb304e848705abc3d0f1909a82fde908d8179ddd9de05970323cee5ffebe
-DIST QScintilla-gpl-2.8.3.tar.gz 3028154 SHA256 fb94e6d61c3ccd4bf167d5f092629e619f7069d42207469458998b761a7cf505 SHA512 088973c1ac3947594e46464b02bee5bae09a2c92054911b7ce73d7723f018d3e8e4f5ebe97480180d275bc7bf5684711f44604310d02c790e4ef2d94bc4df603 WHIRLPOOL eff01464a6d9f6d77bfcf52d6451120104bd88f71ef752a563a23a64d553f0dd0f1a2cc4a227b5893256f306ccc0eb2435382a651690b647ea024c85c20ea8f8
+DIST QScintilla-gpl-2.8.4.tar.gz 3031919 SHA256 9b7b2d7440cc39736bbe937b853506b3bd218af3b79095d4f710cccb0fabe80f SHA512 ab10dc756231b293ddebc06e681bb65a11b2be2a4c4132a5b2a27ca583adef76af325fa95748888d9091f2e89a30494d370df262c4eaba7b7fbed04fb7c76907 WHIRLPOOL 7357addbc0ad8869c5749a67106c18e47d79e32399416cc2867461fa8ad0c662711b8937987cb7c3cd5b83fe9f88e1529911eefec28a972e86c7f242c8c0d634
 EBUILD qscintilla-2.7.2.ebuild 2155 SHA256 af2587f609b091a8725d6b5855162e1a04ac43096f22141c555750d5aa5c8811 SHA512 355050f374c81adfed0cdb31aee5cbd727e3f99df7979469a5c14ae63fa962f7708d571e23a9dde6d0841df695ce1ea79011bbc359465351addd60e44d3cf115 WHIRLPOOL dae3b2754571216741d4b5e929c9d7350c988cbae0242266a69a960a928fef871542e3e6165c5beca9583e676ccc03216b8e75becba2b29ff5764132e01f12b7
-EBUILD qscintilla-2.8.3.ebuild 2179 SHA256 005082e541cecf647200a31698108af5550d6ab720e8568bab55e1d0a7b9542e SHA512 e1cff981a303e9354358d3a2a7c3f4f55e46d39c77d2750dbadd4871ee96f3d279c4ac5c12ebcbb476911e5d199c0d12f8e3eafce5b75a23749bd350b8c6ac85 WHIRLPOOL 2391c650601eb8d86b04a78d4e05dcab0d1220556d37b010d581f87b5aeb6ac1836129ceceb1361ce4f35688a4f6b6796e177272a75405de05a4b3b1de76356a
-MISC ChangeLog 24063 SHA256 8c1800218cab28c805bbacc33fec02248a8c0edb9c281d712d2b03e610d316f4 SHA512 f4a5e2060a8c3eb5cd9833c1f03024b0933dd161c66cb3378fa96f7256f633672fa3145c9771dd1bbd8d1db6cfff4a42ec50025906fa2b8a72e0d278aba27e2a WHIRLPOOL ed00216cf70eabd8fed9ef16d41003c4afdd26b1bb49955a4beed60ad80c315f4f20b2cf6b53e1537501777fd6909dd7b170b8e55e5a753b383d8b5eed9ecfc0
-MISC metadata.xml 175 SHA256 815ada75b169c0b450bdb3429137e6edd42429656bb6369d42e89fd652bdf7c2 SHA512 a359c0d6627fd2a42ec25cad50c4b61c15c14564e778f0534b6be6a70638ff28ad724a7c0d1bc08956b31bf7ffa0469cc1e35b6ac65c2b170c20ba1b1b01d111 WHIRLPOOL 4ecefe797f3c5b2205827da137f631780a7b3c77254b7d7ce70e4ee4bf4dd22fb6e2605dcf4901aed768f16e6c1e34fdbb2e656688897f5da2570e367b843984
+EBUILD qscintilla-2.8.4.ebuild 2000 SHA256 c64204b6c05b9519b6c57705edc4f7a8bdd08d3954381deccafa477dcb2f9186 SHA512 0c79c65fb3fc5e760eafbf039dea79b54cf45ed62cb349654f47d712a597c1a0f97400ba25ccd8392e6a405aeaa20cfea478886134921c009ca26b0c41ad1d85 WHIRLPOOL 8acc15527643a3a9d2afb89754ba77b2cf0ebb8ac1a980028ab010c09e1e33ab7a7e9f9603dc63d069ff70783722131b08b29813b8a5ff08fc8eee99fb2bdafb
+MISC ChangeLog 24347 SHA256 79f7491f14d31cda2dfd3fa2a4dddc204c8d2148e0bbea332d0d23e3d753b50d SHA512 7579d6909bdaf69f90dbcf27c21418de6000c4875c4c0e73053f5048da10422bba98f1ab656ae44a917e418e4154cc48410b0597017c233a3fb68f428361a024 WHIRLPOOL bf5f04c0437de5dc72b1dc6c8fba673ebef348b78ef72fc4f5e59478646bd3de3d4dd0bd959af461c322ba17808c6111fb444faf7ee2716a9c95d8ce18e1e946
+MISC metadata.xml 252 SHA256 7e16021176c43a97f94745e40506c7b1f18841e362a1d0b4f3774e8ccd78eba4 SHA512 8b08556f81a91d5e8e887ae3bbbed30143bd7ddef4df37319c6268bca6ab6262845fd699b9f7b065960b53fbfe5e38f752be24507b05d4fd7344c873605700ef WHIRLPOOL 511d8283ae829568365575489d3bf3cf7c1bbfb54a1f36044b5af5d8e2c79a9906e1680da63c5980296f412cb64d43d2b6d77d9878fd9550edfa1f497ac5ab58
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJTyXp4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUE5i+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9WUcP/RNUg5+BRicXksro+ix2Fbmv
-3dX6LFjv7pth1fCrQyJLstorHIekvUc5AghrAL6i4EYgm8MFfS9/Cnrv2n8dfXYs
-Dr9qYGQ6NoYzyHjE22Niv+iCBhkvwScmlU99VytBolPjCKbXeZPyXywaBt4j2rex
-J8a6W/LCp93NvFliZkWI3hiTN5kblcjOrutbiUta72A1jViQ22j229QtLtK7pg5q
-4NNlcTWUj6fIbe6AqqaOojUDUlH05NWejcgHwkOuOxGvUbFbeA8RP9vQFpm9X+Oo
-I1UTqmthanp4CcDBQ7D6abTjUrm3wXiuNViS6kQx8MxwHOCoDnQwkFbxQi+i4Tsj
-ftQa0CB0w2v8DXB8LCuufNovj/C50J5YV/PhUGS3ouxfn/nRrsBQXyV9oweskwoL
-hEgY6ubH9qOIEs1HbNNyP8Y0twvYNVunXejebDrAiyps6QEThucXhGyUBGLdsH8k
-1nw1uGDvoOfPDYGVi12VFOKz/cug+zjX95pacFwLcRBsn1UGTIRez167yFA8UYaD
-xbJ6Dv7KLECOTJwnS6pLlOJ+X/QShk16lYWBToh2+4I064+qDUIqjK9ZO9j+X34z
-M4U61Tk5AvPCqwi5xeXw1EVqoiAGz9pCTseQ8h+2HKMPtr/3gfCiS4ojaucYklnS
-MPvWyASBTSR+I4L9jCji
-=uE09
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9Nk0P/0WPaAMICMz7OBMNLqcUfPtl
+T7xTi5O/i41KAWUu67Y5pJfwhPd9PeHYVfVITW58hz8q3+fdAZqYY9C0XC4EFMQz
+X3jveHrfT+d6x36b5hEEJ8snLBUzR7rNmFBcPwfgrTQSKpzZ6BwN3suZ4wiuF8ln
+vvkMI0HpTFytL5Nvkt05AWueE7tEIFlDH1GFS9NMIyyX7h15s9fnBZwHFuEp/vkn
+E4fTIwJovcqVkMwjXnW03CcrQPH/v5yCVHuDdyX6ots8wigHp3IGPDkbx5c57FAr
+vU0xgqNAuhxIyCOT1Rwbaawc0QamReN3lKqRMzcAOsaqGAdLj2rCFJLvYz8RAXFS
+Hlw5tL/ANQPQjEkT63hqe3Y3gHof6MVGxjwPMMYPUyypbWCCqrOPuterK3GarcH9
+gykeMQ0W+C4qxSU8KCAzMD2IyPjdcEQDounBjjOOH/HvcHNlhupN0FEK5rQmqP6E
+Os/5nyZc1up0UKF7pjr0p+kimtArlGBulQFre3N83QLdRLQBwNwSYA1Vx1GG8frN
+5aHwAvhox2AU4S/Kw/0FIclxWCVH3CxalginTIO0EPuzwSFOdmvBQnqidH4Lh6xh
+gLgvHoOQ6rYg6BTkEdw4syh3p4g31lsV3kjT5RNVs07j2mvoueHcRIhwR4Lp/Eq6
+wMTA1EWj7fKiTNMnK266
+=Li6K
 -----END PGP SIGNATURE-----
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
 }