More complete fix for bug #466120. Thanks to Arfrever in comment #6.

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

4 files changed, 29 insertions, 50 deletions

diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog
index a04c3037329b..a05177ed332d 100644
--- a/x11-libs/qscintilla/ChangeLog
+++ b/x11-libs/qscintilla/ChangeLog
@@ -1,6 +1,12 @@
 # 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.102 2014/09/13 01:07:02 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.103 2014/09/21 13:39:23 pesa Exp $
+
+*qscintilla-2.8.4-r1 (21 Sep 2014)
+
+  21 Sep 2014; Davide Pesavento <pesa@gentoo.org> +qscintilla-2.8.4-r1.ebuild,
+  -files/qscintilla-2.8.4-designer.patch, -qscintilla-2.8.4.ebuild:
+  More complete fix for bug #466120. Thanks to Arfrever in comment #6.
 
 *qscintilla-2.8.4 (13 Sep 2014)
 
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index c56fceef4c58..ce49e9349532 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -2,29 +2,28 @@
 Hash: SHA256
 
 AUX qscintilla-2.7.1-designer.patch 434 SHA256 fa643d33e12ce21d041230285ab71f989f84963c422899a74508f74a8299154f SHA512 bf257cbaf0e30f41ba674778cc8c37d6b958eb25cc89046b5b88c4e6582ddfe8eb4f4daea07a6d7cb23808bdf8ce26954c2470f499e1cdd957046347897fcb23 WHIRLPOOL 2f731cea40791890d2962a88b65f46f750f7b558f45c41692a04363e66f210b4eb56d087a7259c762094b1700cd8b63249b39b4e83bdc4078126447cdff644eb
-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.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.4.ebuild 2000 SHA256 c64204b6c05b9519b6c57705edc4f7a8bdd08d3954381deccafa477dcb2f9186 SHA512 0c79c65fb3fc5e760eafbf039dea79b54cf45ed62cb349654f47d712a597c1a0f97400ba25ccd8392e6a405aeaa20cfea478886134921c009ca26b0c41ad1d85 WHIRLPOOL 8acc15527643a3a9d2afb89754ba77b2cf0ebb8ac1a980028ab010c09e1e33ab7a7e9f9603dc63d069ff70783722131b08b29813b8a5ff08fc8eee99fb2bdafb
-MISC ChangeLog 24347 SHA256 79f7491f14d31cda2dfd3fa2a4dddc204c8d2148e0bbea332d0d23e3d753b50d SHA512 7579d6909bdaf69f90dbcf27c21418de6000c4875c4c0e73053f5048da10422bba98f1ab656ae44a917e418e4154cc48410b0597017c233a3fb68f428361a024 WHIRLPOOL bf5f04c0437de5dc72b1dc6c8fba673ebef348b78ef72fc4f5e59478646bd3de3d4dd0bd959af461c322ba17808c6111fb444faf7ee2716a9c95d8ce18e1e946
+EBUILD qscintilla-2.8.4-r1.ebuild 2005 SHA256 5dae0eafe0535728b26f69150e2a5c009c4a7e4a41a075053d3812e290edb71b SHA512 4e58f69af40ef352370022d18e89f76795ea5816873b2246ddaf6e40b9a086dda5029dde73fd8f2a65cedce9cd12b6b86391042debbf6e9a501c6bc09a098d57 WHIRLPOOL 47b89c234e1e8248f793984fd16d4c6293f20608a50a10540a8ad4343fb429be4b9251ba282d25587f92027c91690808da07a1ac75fe11aa5ded489c7c10426b
+MISC ChangeLog 24602 SHA256 cbd29d6bc99be8ea84467c75434fb6e007ef082e97c35d568b74c52a1e13017d SHA512 407417c54b5e608689951d18e281ff0828a7c0f43ec670e468ea3a21c8292ab25873064ab62a5ca9b49a23290897752add4f23493c26e31272e90d665ed9aae3 WHIRLPOOL 9332d88f864adb3bdf97d44f110db341ef54bd76a627dce54752df2e7fe648534673560cdcf5c26f2c8d21b9fe88146d0837e4436b8c3ace7a8d79ee825c8c73
 MISC metadata.xml 252 SHA256 7e16021176c43a97f94745e40506c7b1f18841e362a1d0b4f3774e8ccd78eba4 SHA512 8b08556f81a91d5e8e887ae3bbbed30143bd7ddef4df37319c6268bca6ab6262845fd699b9f7b065960b53fbfe5e38f752be24507b05d4fd7344c873605700ef WHIRLPOOL 511d8283ae829568365575489d3bf3cf7c1bbfb54a1f36044b5af5d8e2c79a9906e1680da63c5980296f412cb64d43d2b6d77d9878fd9550edfa1f497ac5ab58
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUE5i+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUHtUTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-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
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9gUIP/2jb52Z+S0oZdCwTZbD4/36u
+iuoLlpyzxk+YOCqFnNpOauEYTAzpLwrWTVTLYa8YIkzMOafqRSuK+B4lNbtLTQQM
+kCgaLsBmHSbtkcIuvakqroIugpznR12sEjRZDDLj/JbHhjn5APY9V2XLcCcZT+Y0
+Nxr56ffR49kSIOEHXdnBi2s4rxCT8IIgKPcelZs5eDwxAbeHMYLTPIXPcuTZdA0r
+y9o4ycC+9tq02lMa4tqOTlU5ObMaSCpATBrbJt7BkWlpcSIUaYLbw4YZwff6AFtZ
+qV3SHaiMkSPvTuvrGisWpIGO1pVD13oUOqjfEM3DI5XIxf2nw01RrmpK/fcx+FHD
+G/ISq5unOiKwjMDSK8xQbZuEzDD2OKPsdu4FJrNhHlp/MJRUCZxN0XU+5PTANv/+
+uVFwUa5FZuepIjXqz+MrnDFmOPuP2MnRzUC7m/QN1Ee4gVM8cKOT0GJ1zxxLPI8d
+VsqknH3Voj+XWG0Lqh1SLGhWvWDbbrzDDh6N6/XNwhhWZNTLv22x6dOfVu/oTqou
++MgG2z1zaJYIlfrWLC/b7MSdjB1mru23q8/XUG7tol4tm6ob3f2L10+6T3/PqNVd
+Wa2TtQtqQC2CeB2hOQiAX4DfmC3mpLPagZ910GKOismLW1I8hiybYP44TfXsmhSW
+gUKqt5XtygAVYp0NC0FX
+=ngVU
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qscintilla/files/qscintilla-2.8.4-designer.patch b/x11-libs/qscintilla/files/qscintilla-2.8.4-designer.patch
deleted file mode 100644
index 5b5eacdfcdee..000000000000
--- a/x11-libs/qscintilla/files/qscintilla-2.8.4-designer.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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/qscintilla-2.8.4.ebuild b/x11-libs/qscintilla/qscintilla-2.8.4-r1.ebuild
index 94aa85aff8bc..b0c96001edf3 100644
--- a/x11-libs/qscintilla/qscintilla-2.8.4.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.8.4-r1.ebuild
@@ -1,10 +1,10 @@
 # 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.4.ebuild,v 1.1 2014/09/13 01:07:02 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.8.4-r1.ebuild,v 1.1 2014/09/21 13:39:23 pesa Exp $
 
 EAPI=5
 
-inherit eutils qmake-utils
+inherit flag-o-matic qmake-utils
 
 MY_P=QScintilla-gpl-${PV}
 
@@ -26,10 +26,6 @@ RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
-PATCHES=(
-	"${FILESDIR}/${PN}-2.8.4-designer.patch"
-)
-
 src_unpack() {
 	default
 
@@ -47,16 +43,16 @@ src_unpack() {
 	fi
 }
 
-src_prepare() {
-	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
-}
-
 src_configure() {
 	pushd Qt4Qt5 > /dev/null
 	eqmake4
 	popd > /dev/null
 
 	if use designer; then
+		# prevent building against system version (bug 466120)
+		append-cxxflags -I../Qt4Qt5
+		append-ldflags -L../Qt4Qt5
+
 		pushd designer-Qt4Qt5 > /dev/null
 		eqmake4
 		popd > /dev/null