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

(Portage version: 2.1.9.24/cvs/Linux x86_64)

4 files changed, 33 insertions, 36 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/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