Adapt phonon dependency for package move

(Portage version: 2.1.9.44/cvs/Linux x86_64)

5 files changed, 20 insertions, 16 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index eb84cd5c7106..988d103003e3 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.628 2011/03/01 19:05:31 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.629 2011/03/26 17:11:03 dilfridge Exp $
+
+  26 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org> qt-4.6.2.ebuild,
+  qt-4.7.0.ebuild, qt-4.7.1.ebuild, qt-4.7.2.ebuild:
+  Adapt phonon dependency for package move
 
 *qt-4.7.2 (01 Mar 2011)
 
diff --git a/x11-libs/qt/qt-4.6.2.ebuild b/x11-libs/qt/qt-4.6.2.ebuild
index 8ba286f97361..68a449e1bb5a 100644
--- a/x11-libs/qt/qt-4.6.2.ebuild
+++ b/x11-libs/qt/qt-4.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.6.2.ebuild,v 1.9 2010/09/13 21:18:29 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.6.2.ebuild,v 1.10 2011/03/26 17:11:03 dilfridge Exp $
 
 EAPI=2
 DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
@@ -20,8 +20,8 @@ RDEPEND="~x11-libs/qt-core-${PV}
 	~x11-libs/qt-xmlpatterns-${PV}
 	dbus? ( ~x11-libs/qt-dbus-${PV} )
 	opengl? ( ~x11-libs/qt-opengl-${PV} )
-	!kde? ( || ( ~x11-libs/qt-phonon-${PV} media-sound/phonon ) )
-	kde? ( media-sound/phonon )
+	!kde? ( || ( ~x11-libs/qt-phonon-${PV} media-libs/phonon ) )
+	kde? ( media-libs/phonon )
 	qt3support? ( ~x11-libs/qt-qt3support-${PV} )
 	~x11-libs/qt-webkit-${PV}
 	~x11-libs/qt-test-${PV}
diff --git a/x11-libs/qt/qt-4.7.0.ebuild b/x11-libs/qt/qt-4.7.0.ebuild
index 4caa77d91a39..9f6b524ad5d1 100644
--- a/x11-libs/qt/qt-4.7.0.ebuild
+++ b/x11-libs/qt/qt-4.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.7.0.ebuild,v 1.1 2010/11/06 20:12:12 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.7.0.ebuild,v 1.2 2011/03/26 17:11:03 dilfridge Exp $
 
 EAPI=2
 DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
@@ -20,8 +20,8 @@ RDEPEND="~x11-libs/qt-core-${PV}
 	~x11-libs/qt-xmlpatterns-${PV}
 	dbus? ( ~x11-libs/qt-dbus-${PV} )
 	opengl? ( ~x11-libs/qt-opengl-${PV} )
-	!kde? ( || ( ~x11-libs/qt-phonon-${PV} media-sound/phonon ) )
-	kde? ( media-sound/phonon )
+	!kde? ( || ( ~x11-libs/qt-phonon-${PV} media-libs/phonon ) )
+	kde? ( media-libs/phonon )
 	qt3support? ( ~x11-libs/qt-qt3support-${PV} )
 	~x11-libs/qt-webkit-${PV}
 	~x11-libs/qt-test-${PV}
diff --git a/x11-libs/qt/qt-4.7.1.ebuild b/x11-libs/qt/qt-4.7.1.ebuild
index 31b06be2c76d..f91da77495b0 100644
--- a/x11-libs/qt/qt-4.7.1.ebuild
+++ b/x11-libs/qt/qt-4.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.7.1.ebuild,v 1.1 2010/11/13 21:40:55 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.7.1.ebuild,v 1.2 2011/03/26 17:11:03 dilfridge Exp $
 
 EAPI=2
 DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
@@ -20,8 +20,8 @@ RDEPEND="~x11-libs/qt-core-${PV}
 	~x11-libs/qt-xmlpatterns-${PV}
 	dbus? ( ~x11-libs/qt-dbus-${PV} )
 	opengl? ( ~x11-libs/qt-opengl-${PV} )
-	!kde? ( || ( ~x11-libs/qt-phonon-${PV} media-sound/phonon ) )
-	kde? ( media-sound/phonon )
+	!kde? ( || ( ~x11-libs/qt-phonon-${PV} media-libs/phonon ) )
+	kde? ( media-libs/phonon )
 	qt3support? ( ~x11-libs/qt-qt3support-${PV} )
 	~x11-libs/qt-webkit-${PV}
 	~x11-libs/qt-test-${PV}
diff --git a/x11-libs/qt/qt-4.7.2.ebuild b/x11-libs/qt/qt-4.7.2.ebuild
index c9a18f03450d..457d3a75a23b 100644
--- a/x11-libs/qt/qt-4.7.2.ebuild
+++ b/x11-libs/qt/qt-4.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.7.2.ebuild,v 1.1 2011/03/01 19:05:31 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.7.2.ebuild,v 1.2 2011/03/26 17:11:03 dilfridge Exp $
 
 EAPI=2
 DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
@@ -20,8 +20,8 @@ RDEPEND="~x11-libs/qt-core-${PV}
 	~x11-libs/qt-xmlpatterns-${PV}
 	dbus? ( ~x11-libs/qt-dbus-${PV} )
 	opengl? ( ~x11-libs/qt-opengl-${PV} )
-	!kde? ( || ( ~x11-libs/qt-phonon-${PV} media-sound/phonon ) )
-	kde? ( media-sound/phonon )
+	!kde? ( || ( ~x11-libs/qt-phonon-${PV} media-libs/phonon ) )
+	kde? ( media-libs/phonon )
 	qt3support? ( ~x11-libs/qt-qt3support-${PV} )
 	~x11-libs/qt-webkit-${PV}
 	~x11-libs/qt-test-${PV}