Remove old. Fix phonon dep, bug 269622.

(Portage version: 2.2_rc28/cvs/Linux x86_64)

3 files changed, 9 insertions, 42 deletions

diff --git a/x11-libs/qt-qt3support/ChangeLog b/x11-libs/qt-qt3support/ChangeLog
index 16296ecff0bc..03eee1e98f98 100644
--- a/x11-libs/qt-qt3support/ChangeLog
+++ b/x11-libs/qt-qt3support/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-qt3support
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.28 2009/05/13 18:02:26 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.29 2009/05/14 20:57:31 yngwin Exp $
+
+  14 May 2009; Ben de Groot <yngwin@gentoo.org> -qt-qt3support-4.5.0.ebuild,
+  qt-qt3support-4.5.1.ebuild:
+  Remove old. Fix phonon dep, bug 269622.
 
   13 May 2009; Brent Baude <ranger@gentoo.org> qt-qt3support-4.5.1.ebuild:
   Marking qt-qt3support-4.5.1 ppc stable for bug 266201
diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.5.0.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.5.0.ebuild
deleted file mode 100644
index 055417a912af..000000000000
--- a/x11-libs/qt-qt3support/qt-qt3support-4.5.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.5.0.ebuild,v 1.2 2009/03/17 17:57:50 armin76 Exp $
-
-EAPI="2"
-inherit qt4-build
-
-DESCRIPTION="The Qt3 support module for the Qt toolkit"
-SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+accessibility phonon"
-
-DEPEND="~x11-libs/qt-core-${PV}[debug=,qt3support]
-	~x11-libs/qt-gui-${PV}[accessibility=,debug=,qt3support]
-	~x11-libs/qt-sql-${PV}[debug=,qt3support]"
-RDEPEND="${DEPEND}"
-PDEPEND="phonon? (
-	|| ( ~x11-libs/qt-phonon-${PV}[debug=] media-sound/phonon[gstreamer] ) )"
-
-QT4_TARGET_DIRECTORIES="
-src/qt3support
-src/tools/uic3
-tools/designer/src/plugins/widgets
-tools/qtconfig
-tools/porting"
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-src/
-include/
-tools/"
-
-src_configure() {
-	myconf="${myconf} -qt3support
-		$(qt_use phonon gstreamer)
-		$(qt_use phonon)
-		$(qt_use accessibility)"
-	qt4-build_src_configure
-}
diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.5.1.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.5.1.ebuild
index 57f23585be15..1f493b36d194 100644
--- a/x11-libs/qt-qt3support/qt-qt3support-4.5.1.ebuild
+++ b/x11-libs/qt-qt3support/qt-qt3support-4.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.5.1.ebuild,v 1.2 2009/05/13 18:02:26 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.5.1.ebuild,v 1.3 2009/05/14 20:57:31 yngwin Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -12,10 +12,10 @@ IUSE="+accessibility phonon"
 
 DEPEND="~x11-libs/qt-core-${PV}[debug=,qt3support]
 	~x11-libs/qt-gui-${PV}[accessibility=,debug=,qt3support]
-	~x11-libs/qt-sql-${PV}[debug=,qt3support]"
+	~x11-libs/qt-sql-${PV}[debug=,qt3support]
+	phonon? ( || ( ~x11-libs/qt-phonon-${PV}[debug=]
+		media-sound/phonon[gstreamer] ) )"
 RDEPEND="${DEPEND}"
-PDEPEND="phonon? (
-	|| ( ~x11-libs/qt-phonon-${PV}[debug=] media-sound/phonon[gstreamer] ) )"
 
 QT4_TARGET_DIRECTORIES="
 src/qt3support