added qt3support useflag, fixes bug #341861

Package-Manager: portage-2.2.0_alpha3/cvs/Linux x86_64

4 files changed, 40 insertions, 12 deletions

diff --git a/x11-libs/qt-declarative/ChangeLog b/x11-libs/qt-declarative/ChangeLog
index f1c8c32d4230..dcf920d650a6 100644
--- a/x11-libs/qt-declarative/ChangeLog
+++ b/x11-libs/qt-declarative/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-declarative
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/ChangeLog,v 1.9 2010/11/01 12:28:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/ChangeLog,v 1.10 2010/11/06 10:49:49 wired Exp $
+
+  06 Nov 2010; Alex Alexander <wired@gentoo.org>
+  qt-declarative-4.7.0.ebuild, metadata.xml:
+  added qt3support useflag, fixes bug #341861
 
   01 Nov 2010; Samuli Suominen <ssuominen@gentoo.org>
   qt-declarative-4.7.0.ebuild:
diff --git a/x11-libs/qt-declarative/Manifest b/x11-libs/qt-declarative/Manifest
index 7bcd8933bdcd..7d76650b2413 100644
--- a/x11-libs/qt-declarative/Manifest
+++ b/x11-libs/qt-declarative/Manifest
@@ -1,4 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST qt-everywhere-opensource-src-4.7.0.tar.gz 208320257 RMD160 3e9c0f0d9843b5c03ad4bd6193aff98531ee0746 SHA1 a5796c8f468c8f59249e5c696f913864c979f411 SHA256 e05256d560ca7d674cd4310bb791748900ad14ad662cbfe22b6d72ada43e7955
-EBUILD qt-declarative-4.7.0.ebuild 1191 RMD160 6daf193a281d1799aafb7db8e07ed908ea5a1471 SHA1 8b9ca27b59b707ffbce57f9e28892b633eef7002 SHA256 3ded3c9bb9c163a0eeb9e2aee130e3753bd040090a62f4f013e8cecadfa85e28
-MISC ChangeLog 954 RMD160 54316dbb98e43bf94584a81ca625df0cf950761c SHA1 6be1bec0bd5c3e562a566daf2280fe49acaddf16 SHA256 040bcf3e025d93d5f7b0ba54db2296737b92515f392f57cafd098226adf03be2
-MISC metadata.xml 482 RMD160 d89ca7ec6ee668257cfe26579d78806b65c5456d SHA1 a0253f67263f64635ef28bc5ab13426a310224a2 SHA256 7ad1a89abc2518bc789a4a44400c9bf08f90ab3846fe46e9402a21fdae0c351a
+EBUILD qt-declarative-4.7.0.ebuild 1323 RMD160 48c25d524a08b6d792f6e8da5aa4617a10a77e2a SHA1 8ff6d7040c6ea53bbc3a1451af76474809eb1e6b SHA256 13b5091276207b916500b00ebfff7e8f4b4c6f5b64c557410b98ca7581eb4a0a
+MISC ChangeLog 1092 RMD160 7ca6e48c38671efd433ba83e8f5ef2cdff24e5d8 SHA1 ce5b3220abee771ebb995b291a84c6890bb97ea3 SHA256 3ead7ce5147917b2f9bc93ab1901b8306fcb52d7c89db7f28844342003fd7b16
+MISC metadata.xml 630 RMD160 cfe5140728dfa21844f00a8c8b10d596c71cf13d SHA1 5a481e672b17ce670c13609e7c85abc3a4c1dee2 SHA256 878c0b4d475644a76713cc90df071083f0faf583e334983ca6d351d6e50a5439
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.12 (GNU/Linux)
+
+iQIcBAEBCAAGBQJM1TLaAAoJEDZF8K7rm0r6FxsP/AlJD3V6UFE2Yraq4tZstiof
+NZjveRVAmHmHvqFgNkQ+KV/pSPr01PqS9KMVTbULNXj+om+Jpo5JMqmG+hFHjY2D
+FJTQ4GO2ZTWpp7xYbTnnzf8kQbMHs14M0HAFBPcHP4x3MIp5bvm0CR05+Rn6E9MF
+gostdXR53+mEraf7YoEjMMedooX3FTjbJbsC4Zd4rBb4mKsO7Aj/yVFPcFBIwzg1
+snSo1URU2naI0bnxr68Lc3rXp3xoX6sxvcCkd3tv/9wTDIXDvD0C8mVZ3DR7gjOT
+knNpbC0pkxXOCmJHyPgXNVtmjTsVOyfHWaQTHWn3I5h+rX4BwazRfJlWCRR7IwqA
+6W3MHMB3Pj+l4xRevxN8tNlWH0TLR7Us8bHLmI0t9/Fso7CzICQyvEyHBru+zuAr
+jR17c95haB3Ea9yziMHJ/hRH9s0Ad2iMu1R8WWCHi9CC4vWjJ73yvLCpSN4X0/Ev
+Sh0l5XypLk8JjYZg0rlVKNSZoi6NZf0ziim79h6Jj+qaQ0yYWuw8dljmIbqYXN43
+FY2M83TOA/SK/uXtuYOYmsRhtxI5PLSv0myCS0IbKwi0J5JcX+OUuOktvmqm1V89
+FCrQEQ+ZiR+DJ1ASKtaAIA3kjqWY0rKIOIgmmihHfXI308XsoXCG8GkR65KE10Su
+9zJylOFNUKHCz5tvVAUq
+=LEan
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-declarative/metadata.xml b/x11-libs/qt-declarative/metadata.xml
index e1a08b3f18df..be567d541229 100644
--- a/x11-libs/qt-declarative/metadata.xml
+++ b/x11-libs/qt-declarative/metadata.xml
@@ -5,6 +5,8 @@
 <use>
 	<flag name="private-headers">Install Qt declarative private headers required
 		by Qt-creator QmlDesigner and QmlInspector plugins"</flag>
+	<flag name='qt3support'>Enable the Qt3Support libraries for Qt4. Note that
+		this does not mean you can compile pure Qt3 programs with Qt4.</flag>
 	<flag name='exceptions'>Add support for exceptions - like catching them
 		inside the event loop (recommended by Nokia)</flag>
 </use>
diff --git a/x11-libs/qt-declarative/qt-declarative-4.7.0.ebuild b/x11-libs/qt-declarative/qt-declarative-4.7.0.ebuild
index ec2245c03dbb..2c39524246fe 100644
--- a/x11-libs/qt-declarative/qt-declarative-4.7.0.ebuild
+++ b/x11-libs/qt-declarative/qt-declarative-4.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/qt-declarative-4.7.0.ebuild,v 1.6 2010/11/01 12:28:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/qt-declarative-4.7.0.ebuild,v 1.7 2010/11/06 10:49:49 wired Exp $
 
 EAPI="3"
 inherit qt4-build
@@ -8,17 +8,19 @@ inherit qt4-build
 DESCRIPTION="The Declarative module for the Qt toolkit"
 SLOT="4"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="private-headers"
+IUSE="private-headers qt3support"
 
-DEPEND="~x11-libs/qt-core-${PV}[aqua=]
-	~x11-libs/qt-gui-${PV}[aqua=]
+DEPEND="~x11-libs/qt-core-${PV}[aqua=,qt3support=]
+	~x11-libs/qt-gui-${PV}[aqua=,qt3support=]
 	~x11-libs/qt-multimedia-${PV}[aqua=]
-	~x11-libs/qt-opengl-${PV}[aqua=]
+	~x11-libs/qt-opengl-${PV}[aqua=,qt3support=]
 	~x11-libs/qt-script-${PV}[aqua=]
-	~x11-libs/qt-sql-${PV}[aqua=]
+	~x11-libs/qt-sql-${PV}[aqua=,qt3support=]
 	~x11-libs/qt-svg-${PV}[aqua=]
 	~x11-libs/qt-webkit-${PV}[aqua=]
-	~x11-libs/qt-xmlpatterns-${PV}[aqua=]"
+	~x11-libs/qt-xmlpatterns-${PV}[aqua=]
+	qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=] )
+	"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
@@ -36,7 +38,7 @@ pkg_setup() {
 }
 
 src_configure() {
-	myconf="${myconf} -declarative"
+	myconf="${myconf} -declarative $(qt_use qt3support)"
 	qt4-build_src_configure
 }