Version bump.

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

5 files changed, 57 insertions, 15 deletions

diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog
index d3ffc531647b..04fc0651ec7d 100644
--- a/x11-libs/qscintilla/ChangeLog
+++ b/x11-libs/qscintilla/ChangeLog
@@ -1,6 +1,13 @@
 # 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.100 2014/04/15 19:44:51 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.101 2014/07/18 19:50:08 pesa Exp $
+
+*qscintilla-2.8.3 (18 Jul 2014)
+
+  18 Jul 2014; Davide Pesavento <pesa@gentoo.org>
+  +files/qscintilla-2.8.3-designer.patch, +qscintilla-2.8.3.ebuild,
+  -qscintilla-2.8-r1.ebuild, metadata.xml:
+  Version bump.
 
   15 Apr 2014; Sébastien Fabbro <bicatali@gentoo.org> qscintilla-2.8-r1.ebuild:
   Keyword arm
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index a072e9b52bee..6b3a1ac99ebb 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -2,16 +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
 DIST QScintilla-gpl-2.7.2.tar.gz 2842625 SHA256 14b47d686dc1586321f84fcf3c9a911ddaace37a1cb0b1e6a6195e252e5bb69c SHA512 d3ca9d75687687210ca6ae3599fd44bfbbad8c99d6d38aaf1c92c83250dc0c5af1c713bdd74d077d0fb9ba1eccbd5e2910eef855d3656392c33c4832d46ff7fb WHIRLPOOL 1ea4a189a5998755afaa0fad111a7f2153e5ecbe13290d62930cce992b0159040de9cb304e848705abc3d0f1909a82fde908d8179ddd9de05970323cee5ffebe
-DIST QScintilla-gpl-2.8.tar.gz 2917864 SHA256 41d32af71501bdfdfc0668f304ba7d7c15019462795e9441d3b23fc054fdfb71 SHA512 531cec5fb89037f79b71bfd07bc94f2744b8b43c7cf8376d102bd4c85d91af1213ac39cce0cb19e8b90d2fbcda47a8617d1b787dbbadaf6270b66660d7d72cd4 WHIRLPOOL 39eb0231fb6c557f49de1abf8c851dd22dd6416841acecf2350a0dcb23f500f571c1bab67a7e5c28d0c31c142781feb32c8475e5a9840dfbfe6decaa6909df80
+DIST QScintilla-gpl-2.8.3.tar.gz 3028154 SHA256 fb94e6d61c3ccd4bf167d5f092629e619f7069d42207469458998b761a7cf505 SHA512 088973c1ac3947594e46464b02bee5bae09a2c92054911b7ce73d7723f018d3e8e4f5ebe97480180d275bc7bf5684711f44604310d02c790e4ef2d94bc4df603 WHIRLPOOL eff01464a6d9f6d77bfcf52d6451120104bd88f71ef752a563a23a64d553f0dd0f1a2cc4a227b5893256f306ccc0eb2435382a651690b647ea024c85c20ea8f8
 EBUILD qscintilla-2.7.2.ebuild 2155 SHA256 af2587f609b091a8725d6b5855162e1a04ac43096f22141c555750d5aa5c8811 SHA512 355050f374c81adfed0cdb31aee5cbd727e3f99df7979469a5c14ae63fa962f7708d571e23a9dde6d0841df695ce1ea79011bbc359465351addd60e44d3cf115 WHIRLPOOL dae3b2754571216741d4b5e929c9d7350c988cbae0242266a69a960a928fef871542e3e6165c5beca9583e676ccc03216b8e75becba2b29ff5764132e01f12b7
-EBUILD qscintilla-2.8-r1.ebuild 2116 SHA256 763b86c09932d3e2ec4d3d585e6f1310745f06293d880b7dba36d733413a4949 SHA512 2069b7d6484959aa63eec26acf0cf9050402870ec6e22718c8f6a0e851502776ae68ccf98cc7ffcc580653b108217c7f35dfdae9417268be45ccff5a8941904b WHIRLPOOL de26dc2d02ae7927c399b1ce5919ac649ff52f77ed3579a60ce13683c97f3ed4be6e3976f543bccd5adc74ab703085fd4539fa36d48538ff7e5c6c34d2ab8401
-MISC ChangeLog 23856 SHA256 3c7220609fdb59ae30d18d50bce0243cfc6a9a05c8e76ae1e05614ae93fc53cc SHA512 a66240ddf8ead470ab84b2314eeac2b58af167fb62a4b90e70e640a6d5e2b42afb8963aa98b404db81febf73988b084448e37112793fdbcac0a0470b14903e4f WHIRLPOOL 1f7aeab9e47caf10dda88e204c5b01cf2938f5b171f06bf5c6f6ed052270a7b8ffa18ff606414979cfb4ab0296689af1e59c20318f6e33ef29cc9688eb7ee455
-MISC metadata.xml 175 SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d SHA512 bea471fa9163260e9198463bcd8e6f2a88f9fb25dea55be266216d5f99abf1492d069f8dbdc111e4a26d87928f44a19db96562886edfc0233d5a9c5c947fdc7c WHIRLPOOL 4266a6076b386b6bd3e374650ddfa7879920261bef209534de056c935279dba6da27db83162e5b73ed05d3a82e47f5b839274f8137d525ff4c68073f5efdfe6c
+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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlNNjEsACgkQ1ycZbhPLE2C0sQCgm/uaCFOw5E6eAbDTFwjhKK6W
-35wAoIZ5SjvQKXkhB3EAw08zGzuH+Bx6
-=AE9G
+iQJ8BAEBCABmBQJTyXp4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+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
 -----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
new file mode 100644
index 000000000000..1dbae09a51b4
--- /dev/null
+++ b/x11-libs/qscintilla/files/qscintilla-2.8.3-designer.patch
@@ -0,0 +1,18 @@
+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/metadata.xml b/x11-libs/qscintilla/metadata.xml
index a789e7bbe9ee..2b23b45efd14 100644
--- a/x11-libs/qscintilla/metadata.xml
+++ b/x11-libs/qscintilla/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
 <herd>qt</herd>
+<herd>python</herd>
 </pkgmetadata>
diff --git a/x11-libs/qscintilla/qscintilla-2.8-r1.ebuild b/x11-libs/qscintilla/qscintilla-2.8.3.ebuild
index 62572a17141b..3d853399c422 100644
--- a/x11-libs/qscintilla/qscintilla-2.8-r1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.8.3.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-r1.ebuild,v 1.3 2014/04/15 19:44:51 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.8.3.ebuild,v 1.1 2014/07/18 19:50:08 pesa Exp $
 
 EAPI=5
 
-inherit qt4-r2
+inherit eutils qmake-utils
 
 MY_P=QScintilla-gpl-${PV}
 
@@ -14,7 +14,7 @@ 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 ~x86-linux ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="
@@ -27,11 +27,11 @@ RDEPEND="${DEPEND}"
 S=${WORKDIR}/${MY_P}
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.7.1-designer.patch"
+	"${FILESDIR}/${PN}-2.8.3-designer.patch"
 )
 
 src_unpack() {
-	qt4-r2_src_unpack
+	default
 
 	# Sub-slot sanity check
 	local subslot=${SLOT#*/}
@@ -47,6 +47,10 @@ src_unpack() {
 	fi
 }
 
+src_prepare() {
+	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+}
+
 src_configure() {
 	pushd Qt4Qt5 > /dev/null
 	einfo "Configuration of qscintilla"