Adapt phonon dependency for package move

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

7 files changed, 28 insertions, 23 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index de7d82a2448f..0fd98237d2e4 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/PyQt4
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.149 2011/03/16 21:08:50 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.150 2011/03/26 16:38:02 dilfridge Exp $
+
+  26 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org> PyQt4-4.7.3.ebuild,
+  PyQt4-4.7.7-r1.ebuild, PyQt4-4.8.1.ebuild, PyQt4-4.8.1-r1.ebuild,
+  PyQt4-4.8.2.ebuild, PyQt4-4.8.3.ebuild:
+  Adapt phonon dependency for package move
 
   16 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> PyQt4-4.8.1.ebuild:
   ppc64 stable wrt #349607
diff --git a/dev-python/PyQt4/PyQt4-4.7.3.ebuild b/dev-python/PyQt4/PyQt4-4.7.3.ebuild
index a9e0ffffea48..c12771ea209b 100644
--- a/dev-python/PyQt4/PyQt4-4.7.3.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.7.3.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/dev-python/PyQt4/PyQt4-4.7.3.ebuild,v 1.12 2010/12/19 18:54:31 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.7.3.ebuild,v 1.13 2011/03/26 16:38:02 dilfridge Exp $
 
 EAPI="2"
 PYTHON_EXPORT_PHASE_FUNCTIONS="1"
@@ -34,8 +34,8 @@ DEPEND=">=dev-python/sip-4.10
 	multimedia? ( >=x11-libs/qt-multimedia-${QTVER}:4 )
 	opengl? ( >=x11-libs/qt-opengl-${QTVER}:4 )
 	phonon? (
-		!kde? ( || ( >=x11-libs/qt-phonon-${QTVER}:4 media-sound/phonon ) )
-		kde? ( media-sound/phonon )
+		!kde? ( || ( >=x11-libs/qt-phonon-${QTVER}:4 media-libs/phonon ) )
+		kde? ( media-libs/phonon )
 	)
 	sql? ( >=x11-libs/qt-sql-${QTVER}:4 )
 	svg? ( >=x11-libs/qt-svg-${QTVER}:4 )
diff --git a/dev-python/PyQt4/PyQt4-4.7.7-r1.ebuild b/dev-python/PyQt4/PyQt4-4.7.7-r1.ebuild
index 276b778910fe..7ea98333e93e 100644
--- a/dev-python/PyQt4/PyQt4-4.7.7-r1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.7.7-r1.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/dev-python/PyQt4/PyQt4-4.7.7-r1.ebuild,v 1.3 2010/12/19 18:54:31 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.7.7-r1.ebuild,v 1.4 2011/03/26 16:38:02 dilfridge Exp $
 
 EAPI="3"
 PYTHON_DEPEND="*"
@@ -35,8 +35,8 @@ DEPEND=">=dev-python/sip-4.11
 	multimedia? ( >=x11-libs/qt-multimedia-${QTVER}:4 )
 	opengl? ( >=x11-libs/qt-opengl-${QTVER}:4 )
 	phonon? (
-		!kde? ( || ( >=x11-libs/qt-phonon-${QTVER}:4 media-sound/phonon ) )
-		kde? ( media-sound/phonon )
+		!kde? ( || ( >=x11-libs/qt-phonon-${QTVER}:4 media-libs/phonon ) )
+		kde? ( media-libs/phonon )
 	)
 	sql? ( >=x11-libs/qt-sql-${QTVER}:4 )
 	svg? ( >=x11-libs/qt-svg-${QTVER}:4 )
diff --git a/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild b/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild
index c3cb53867e37..78c06a6ce71c 100644
--- a/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.8.1-r1.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/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild,v 1.2 2010/12/30 18:08:19 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild,v 1.3 2011/03/26 16:38:02 dilfridge Exp $
 
 EAPI="3"
 PYTHON_DEPEND="*"
@@ -38,8 +38,8 @@ DEPEND=">=dev-python/sip-4.11.2
 	multimedia? ( >=x11-libs/qt-multimedia-${QT_VER}:4 )
 	opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 || ( >=x11-libs/qt-opengl-4.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) )
 	phonon? (
-		!kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-sound/phonon ) )
-		kde? ( media-sound/phonon )
+		!kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-libs/phonon ) )
+		kde? ( media-libs/phonon )
 	)
 	sql? ( >=x11-libs/qt-sql-${QT_VER}:4 )
 	svg? ( >=x11-libs/qt-svg-${QT_VER}:4 )
diff --git a/dev-python/PyQt4/PyQt4-4.8.1.ebuild b/dev-python/PyQt4/PyQt4-4.8.1.ebuild
index 882c46ae70c4..7c4e33544824 100644
--- a/dev-python/PyQt4/PyQt4-4.8.1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.8.1.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/dev-python/PyQt4/PyQt4-4.8.1.ebuild,v 1.12 2011/03/16 21:08:50 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1.ebuild,v 1.13 2011/03/26 16:38:02 dilfridge Exp $
 
 EAPI="3"
 PYTHON_DEPEND="*"
@@ -37,8 +37,8 @@ DEPEND=">=dev-python/sip-4.11.2
 	multimedia? ( >=x11-libs/qt-multimedia-${QT_VER}:4 )
 	opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 || ( >=x11-libs/qt-opengl-4.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) )
 	phonon? (
-		!kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-sound/phonon ) )
-		kde? ( media-sound/phonon )
+		!kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-libs/phonon ) )
+		kde? ( media-libs/phonon )
 	)
 	sql? ( >=x11-libs/qt-sql-${QT_VER}:4 )
 	svg? ( >=x11-libs/qt-svg-${QT_VER}:4 )
diff --git a/dev-python/PyQt4/PyQt4-4.8.2.ebuild b/dev-python/PyQt4/PyQt4-4.8.2.ebuild
index 89fa60325d8b..d7b91fc61b17 100644
--- a/dev-python/PyQt4/PyQt4-4.8.2.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.8.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/dev-python/PyQt4/PyQt4-4.8.2.ebuild,v 1.3 2010/12/30 18:08:19 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.2.ebuild,v 1.4 2011/03/26 16:38:02 dilfridge Exp $
 
 EAPI="3"
 PYTHON_DEPEND="*"
@@ -38,8 +38,8 @@ DEPEND=">=dev-python/sip-4.12
 	multimedia? ( >=x11-libs/qt-multimedia-${QT_VER}:4 )
 	opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 || ( >=x11-libs/qt-opengl-4.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) )
 	phonon? (
-		!kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-sound/phonon ) )
-		kde? ( media-sound/phonon )
+		!kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-libs/phonon ) )
+		kde? ( media-libs/phonon )
 	)
 	sql? ( >=x11-libs/qt-sql-${QT_VER}:4 )
 	svg? ( >=x11-libs/qt-svg-${QT_VER}:4 )
diff --git a/dev-python/PyQt4/PyQt4-4.8.3.ebuild b/dev-python/PyQt4/PyQt4-4.8.3.ebuild
index 2007881f94c4..4174e03d0c01 100644
--- a/dev-python/PyQt4/PyQt4-4.8.3.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.8.3.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/dev-python/PyQt4/PyQt4-4.8.3.ebuild,v 1.2 2011/01/28 15:55:22 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.3.ebuild,v 1.3 2011/03/26 16:38:02 dilfridge Exp $
 
 EAPI="3"
 PYTHON_DEPEND="*"
@@ -38,8 +38,8 @@ DEPEND=">=dev-python/sip-4.12.1
 	multimedia? ( >=x11-libs/qt-multimedia-${QT_VER}:4 )
 	opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 || ( >=x11-libs/qt-opengl-4.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) )
 	phonon? (
-		!kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-sound/phonon ) )
-		kde? ( media-sound/phonon )
+		!kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-libs/phonon ) )
+		kde? ( media-libs/phonon )
 	)
 	sql? ( >=x11-libs/qt-sql-${QT_VER}:4 )
 	svg? ( >=x11-libs/qt-svg-${QT_VER}:4 )