Refactor dependencies. Drop qt3support entirely and kde/phonon dependencies as well. Bug #345443

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

5 files changed, 40 insertions, 43 deletions

diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index db94bc571953..06143399b505 100644
--- a/dev-util/qt-creator/ChangeLog
+++ b/dev-util/qt-creator/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/qt-creator
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.63 2010/11/15 18:55:01 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.64 2010/11/15 21:35:18 hwoarang Exp $
+
+  15 Nov 2010; Markos Chandras <hwoarang@gentoo.org>
+  qt-creator-2.0.1.ebuild, qt-creator-2.1.0_beta2.ebuild, metadata.xml:
+  Refactor dependencies. Drop qt3support entirely and kde/phonon
+  dependencies as well. Bug #345443
 
   15 Nov 2010; Markos Chandras <hwoarang@gentoo.org>
   qt-creator-2.0.1.ebuild, qt-creator-2.1.0_beta2.ebuild, metadata.xml:
diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest
index 4da3a6ac75d8..61efa9bc4e6d 100644
--- a/dev-util/qt-creator/Manifest
+++ b/dev-util/qt-creator/Manifest
@@ -8,14 +8,14 @@ DIST qt-creator-2.0.1-src.zip 21954080 RMD160 ac0f61a82d49fb5768331f548cdad44b48
 DIST qt-creator-2.1.0-beta2-src.zip 26509840 RMD160 b6ba77e5e91192aad352b2c021c9cee995346b12 SHA1 b212d7038553e050695a38a8af7785a80996859c SHA256 c80a446aedf62b69bd32d76d0b784a764581e316cf14ab7f880fcca74a77199e
 EBUILD qt-creator-1.2.1.ebuild 2877 RMD160 416a97236be7bc7eb755e767ebf2303faf9830ec SHA1 01f6cb828301c5a805e1213a531b16f077a115c4 SHA256 77de0b2c402e7c12ee3b6309211af0a7c3d9984a3741a3646ebdebbccea92cfc
 EBUILD qt-creator-1.3.1-r1.ebuild 3512 RMD160 980433faeab74fe06ed1e09f6994f4b9611fa204 SHA1 790dcda8f70f83c652306bb4ae6f4aa882f382f9 SHA256 bd9986ca4aca5377813d040e38a1b153df2277feb33fa3038ebd83ba27cbfd29
-EBUILD qt-creator-2.0.1.ebuild 3901 RMD160 ef27ba39031af6a9f3279493ea656f000ae803f6 SHA1 742ae0975ebe675648bad46994efd4386198aff4 SHA256 e8eb1d5ffd30ef5f4600346427c02b5b21294c5d7fb3222669224f919ba05314
-EBUILD qt-creator-2.1.0_beta2.ebuild 4046 RMD160 9f3ef8d65483e9266b92e838365a7652e61c7d80 SHA1 6c031daa567b89aa3888b32e75f9805034d75106 SHA256 0b9456773abe3ef262b2d3c8dcb9178e0a07abbf4eb1cf0b808c36fc1ac1a7e4
-MISC ChangeLog 9226 RMD160 49646f3b59d95907eb0810a407bc9336f390679d SHA1 4f92f3be95bc30aa9e74773739f6175aca6ee272 SHA256 dd0289e1687be70b1ad244251b4bf83e2534a6bcd0cef6b981ef6da645f2464f
-MISC metadata.xml 1099 RMD160 e9fe63accbea23ed36933d60a8f8445618db635b SHA1 8fa125bc8e77cd1dbdeccf65785bad65d062c7da SHA256 507006a5513fb820373560ed38021bb39660c265789abc350f69c18ecb332905
+EBUILD qt-creator-2.0.1.ebuild 3709 RMD160 4722d7b2d381adaedb57569f03c547fa9526cbfd SHA1 3689a5f31667d8db7a7e727c865afe7252ab53ee SHA256 5e678f50361961559747f0695c8e5c067df5ad0a591108270f2df9dc99a8a50a
+EBUILD qt-creator-2.1.0_beta2.ebuild 3849 RMD160 52a23a93c8fa4099b825273e47961a7fdc0d557d SHA1 310c25ab295ca92372f18a8a771e5b89fc9d8ec1 SHA256 25ade845badb257e762b997b21f6606bbf1c9a57cdb897ca2eac530720f3549d
+MISC ChangeLog 9453 RMD160 5f45e2b792d2395c33a7143432db28fd8a96acb1 SHA1 adcbcaec88ff57e898557e566b0627a29378253b SHA256 24006d364c704db459f72cbdaabccff49053c9098fce693f89eef83270790362
+MISC metadata.xml 1034 RMD160 ff0e30c74188440729f8a7eb6ac4edb78a58261e SHA1 96e28085ccb41904e21e54ef0a3e160bf13d0acc SHA256 9fad95b6ee7de9a1136b6e780084f2185d3fe5ce111f5d605cea5e0292da7878
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzhggMACgkQ9/cejkQaxBDAYgCfVIc0y58bic4xx0uEdGar8/yu
-QJQAn0B/cHwrNO0+YbcgTtvQtDMa3OVh
-=iiHD
+iEYEARECAAYFAkzhp7oACgkQ9/cejkQaxBBbHwCfde37XKvNHwL3IrMO0vuaW0lX
+yVIAmgOek6zycN6mhY0yG84dfCqiD1um
+=9yyv
 -----END PGP SIGNATURE-----
diff --git a/dev-util/qt-creator/metadata.xml b/dev-util/qt-creator/metadata.xml
index 67331bbb95ba..90493d99edf0 100644
--- a/dev-util/qt-creator/metadata.xml
+++ b/dev-util/qt-creator/metadata.xml
@@ -18,7 +18,6 @@
 	<flag name="perforce">enable perforce software configuration manager plugin</flag>
 	<flag name="qml">Simple way of building UIs based on Qt Declarative module</flag>
 	<flag name="qtscript">enable qt script editor plugin</flag>
-	<flag name="qt3support">Use Qt3support compatibility API</flag>
 	<flag name="subversion">enable subversion plugin</flag>
 </use>
 <longdescription lang="en">
diff --git a/dev-util/qt-creator/qt-creator-2.0.1.ebuild b/dev-util/qt-creator/qt-creator-2.0.1.ebuild
index 21b1aab2a489..ca603cf53e49 100644
--- a/dev-util/qt-creator/qt-creator-2.0.1.ebuild
+++ b/dev-util/qt-creator/qt-creator-2.0.1.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/dev-util/qt-creator/qt-creator-2.0.1.ebuild,v 1.5 2010/11/15 18:55:01 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.0.1.ebuild,v 1.6 2010/11/15 21:35:18 hwoarang Exp $
 
 EAPI="2"
 LANGS="de es fr it ja pl ru sl"
@@ -18,31 +18,28 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="bineditor bookmarks +cmake cvs debug +designer doc examples fakevim git
-	kde mercurial perforce +qml qt3support qtscript rss subversion"
+	mercurial perforce +qml qtscript rss subversion"
 
 QTVER="4.7.0:4"
-DEPEND="~x11-libs/qt-assistant-${QTVER}[doc?]"
-RDEPEND="${DEPEND}
+DEPEND="~x11-libs/qt-assistant-${QTVER}[doc?]
 	~x11-libs/qt-sql-${QTVER}
 	~x11-libs/qt-svg-${QTVER}
-	~x11-libs/qt-test-${QTVER}
-	~x11-libs/qt-webkit-${QTVER}
-	!kde? ( || ( ~x11-libs/qt-phonon-${QTVER} media-sound/phonon ) )
-	kde? ( media-sound/phonon )
+	!qml? ( ~x11-libs/qt-gui-${QTVER} )
+	qml? (
+		~x11-libs/qt-declarative-${QTVER}[private-headers]
+		~x11-libs/qt-core-${QTVER}[private-headers]
+		~x11-libs/qt-gui-${QTVER}[private-headers]
+		~x11-libs/qt-script-${QTVER}[private-headers]
+	)
+	qtscript? ( >x11-libs/qt-script-${QTVER} )"
+
+RDEPEND="${DEPEND}
 	cmake? ( dev-util/cmake )
 	cvs? ( dev-vcs/cvs )
 	sys-devel/gdb
 	examples? ( ~x11-libs/qt-demo-${QTVER} )
 	git? ( dev-vcs/git )
 	mercurial? ( dev-vcs/mercurial )
-	!qml? ( ~x11-libs/qt-gui-${QTVER}[qt3support?] )
-	qml? (
-		~x11-libs/qt-declarative-${QTVER}[private-headers]
-		~x11-libs/qt-core-${QTVER}[private-headers]
-		~x11-libs/qt-gui-${QTVER}[qt3support?,private-headers]
-		~x11-libs/qt-script-${QTVER}[private-headers]
-	)
-	qtscript? ( >x11-libs/qt-script-${QTVER} )
 	subversion? ( dev-vcs/subversion )"
 
 PLUGINS="bookmarks bineditor cmake cvs designer fakevim git mercurial perforce
diff --git a/dev-util/qt-creator/qt-creator-2.1.0_beta2.ebuild b/dev-util/qt-creator/qt-creator-2.1.0_beta2.ebuild
index 41ea74610440..2bad29125448 100644
--- a/dev-util/qt-creator/qt-creator-2.1.0_beta2.ebuild
+++ b/dev-util/qt-creator/qt-creator-2.1.0_beta2.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/dev-util/qt-creator/qt-creator-2.1.0_beta2.ebuild,v 1.3 2010/11/15 18:55:01 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.1.0_beta2.ebuild,v 1.4 2010/11/15 21:35:18 hwoarang Exp $
 
 EAPI="2"
 LANGS="de es fr it ja pl ru sl"
@@ -18,35 +18,31 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="bineditor bookmarks +cmake cvs debug +designer doc examples fakevim git
-	kde mercurial perforce +qml qt3support qtscript rss subversion"
+	mercurial perforce +qml qtscript rss subversion"
 
 QTVER="4.7.1:4"
-DEPEND=">=x11-libs/qt-assistant-${QTVER}[doc?]"
-RDEPEND="${DEPEND}
+DEPEND=">=x11-libs/qt-assistant-${QTVER}[doc?]
 	>=x11-libs/qt-sql-${QTVER}
 	>=x11-libs/qt-svg-${QTVER}
-	>=x11-libs/qt-test-${QTVER}
-	>=x11-libs/qt-webkit-${QTVER}
-	!kde? ( || ( >=x11-libs/qt-phonon-${QTVER} media-sound/phonon ) )
-	kde? ( media-sound/phonon )
+	!qml? ( >=x11-libs/qt-gui-${QTVER} )
+	qml? (
+		>=x11-libs/qt-declarative-${QTVER}[private-headers]
+		>=x11-libs/qt-core-${QTVER}[private-headers]
+		>=x11-libs/qt-gui-${QTVER}[private-headers]
+		>=x11-libs/qt-script-${QTVER}[private-headers]
+	)
+	qtscript? ( >=x11-libs/qt-script-${QTVER} )"
+
+RDEPEND="${DEPEND}
 	cmake? ( dev-util/cmake )
 	cvs? ( dev-vcs/cvs )
 	sys-devel/gdb
 	examples? ( >=x11-libs/qt-demo-${QTVER} )
 	git? ( dev-vcs/git )
 	mercurial? ( dev-vcs/mercurial )
-	!qml? ( >=x11-libs/qt-gui-${QTVER}[qt3support?] )
-	qml? (
-		>=x11-libs/qt-declarative-${QTVER}[private-headers]
-		>=x11-libs/qt-core-${QTVER}[private-headers]
-		>=x11-libs/qt-gui-${QTVER}[qt3support?,private-headers]
-		>=x11-libs/qt-script-${QTVER}[private-headers]
-	)
-	qtscript? ( >=x11-libs/qt-script-${QTVER} )
 	subversion? ( dev-vcs/subversion )"
 
-PLUGINS="bookmarks bineditor cmake cvs designer fakevim git mercurial perforce
-	+qml qtscript subversion"
+PLUGINS="bookmarks bineditor cmake cvs designer fakevim git mercurial perforce qml qtscript subversion"
 
 S="${WORKDIR}"/"${MY_P}"-src