Adapt phonon dependency for package move

(Portage version: 2.1.9.44/cvs/Linux x86_64)

6 files changed, 25 insertions, 20 deletions

diff --git a/x11-libs/qt-demo/ChangeLog b/x11-libs/qt-demo/ChangeLog
index 117b22796992..5674a4c31196 100644
--- a/x11-libs/qt-demo/ChangeLog
+++ b/x11-libs/qt-demo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-demo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.64 2011/03/01 19:07:32 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.65 2011/03/26 17:08:50 dilfridge Exp $
+
+  26 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  qt-demo-4.6.2.ebuild, qt-demo-4.6.3.ebuild, qt-demo-4.7.0.ebuild,
+  qt-demo-4.7.1.ebuild, qt-demo-4.7.2.ebuild:
+  Adapt phonon dependency for package move
 
 *qt-demo-4.7.2 (01 Mar 2011)
 
diff --git a/x11-libs/qt-demo/qt-demo-4.6.2.ebuild b/x11-libs/qt-demo/qt-demo-4.6.2.ebuild
index 2747a552e1b5..c46adcb33d6f 100644
--- a/x11-libs/qt-demo/qt-demo-4.6.2.ebuild
+++ b/x11-libs/qt-demo/qt-demo-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-demo/qt-demo-4.6.2.ebuild,v 1.6 2010/09/26 18:11:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.6.2.ebuild,v 1.7 2011/03/26 17:08:50 dilfridge Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -17,8 +17,8 @@ DEPEND="~x11-libs/qt-assistant-${PV}:${SLOT}[aqua=]
 	~x11-libs/qt-multimedia-${PV}:${SLOT}[aqua=]
 	~x11-libs/qt-opengl-${PV}:${SLOT}[aqua=]
 	!kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=]
-		media-sound/phonon[aqua=] ) )
-	kde? ( media-sound/phonon[aqua=] )
+		media-libs/phonon[aqua=] ) )
+	kde? ( media-libs/phonon[aqua=] )
 	~x11-libs/qt-script-${PV}:${SLOT}[aqua=]
 	~x11-libs/qt-sql-${PV}:${SLOT}[aqua=]
 	~x11-libs/qt-svg-${PV}:${SLOT}[aqua=]
diff --git a/x11-libs/qt-demo/qt-demo-4.6.3.ebuild b/x11-libs/qt-demo/qt-demo-4.6.3.ebuild
index 3fac9812eb09..75bdfec7e7a6 100644
--- a/x11-libs/qt-demo/qt-demo-4.6.3.ebuild
+++ b/x11-libs/qt-demo/qt-demo-4.6.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/x11-libs/qt-demo/qt-demo-4.6.3.ebuild,v 1.6 2010/12/23 07:55:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.6.3.ebuild,v 1.7 2011/03/26 17:08:50 dilfridge Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -17,8 +17,8 @@ DEPEND="~x11-libs/qt-assistant-${PV}:${SLOT}[aqua=]
 	~x11-libs/qt-multimedia-${PV}:${SLOT}[aqua=]
 	~x11-libs/qt-opengl-${PV}:${SLOT}[aqua=]
 	!kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=]
-		media-sound/phonon[aqua=] ) )
-	kde? ( media-sound/phonon[aqua=] )
+		media-libs/phonon[aqua=] ) )
+	kde? ( media-libs/phonon[aqua=] )
 	~x11-libs/qt-script-${PV}:${SLOT}[aqua=]
 	~x11-libs/qt-sql-${PV}:${SLOT}[aqua=]
 	~x11-libs/qt-svg-${PV}:${SLOT}[aqua=]
diff --git a/x11-libs/qt-demo/qt-demo-4.7.0.ebuild b/x11-libs/qt-demo/qt-demo-4.7.0.ebuild
index 9805b87ff164..df2d7b97c243 100644
--- a/x11-libs/qt-demo/qt-demo-4.7.0.ebuild
+++ b/x11-libs/qt-demo/qt-demo-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-demo/qt-demo-4.7.0.ebuild,v 1.5 2010/11/06 19:16:57 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.7.0.ebuild,v 1.6 2011/03/26 17:08:50 dilfridge Exp $
 
 EAPI="3"
 inherit qt4-build
@@ -17,8 +17,8 @@ DEPEND="~x11-libs/qt-assistant-${PV}:${SLOT}[aqua=]
 	~x11-libs/qt-multimedia-${PV}:${SLOT}[aqua=]
 	~x11-libs/qt-opengl-${PV}:${SLOT}[aqua=,qt3support=]
 	!kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=]
-		media-sound/phonon[aqua=] ) )
-	kde? ( media-sound/phonon[aqua=] )
+		media-libs/phonon[aqua=] ) )
+	kde? ( media-libs/phonon[aqua=] )
 	~x11-libs/qt-script-${PV}:${SLOT}[aqua=]
 	~x11-libs/qt-sql-${PV}:${SLOT}[aqua=,qt3support=]
 	~x11-libs/qt-svg-${PV}:${SLOT}[aqua=]
diff --git a/x11-libs/qt-demo/qt-demo-4.7.1.ebuild b/x11-libs/qt-demo/qt-demo-4.7.1.ebuild
index e3e20bdcc60f..ebbddfc437f9 100644
--- a/x11-libs/qt-demo/qt-demo-4.7.1.ebuild
+++ b/x11-libs/qt-demo/qt-demo-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-demo/qt-demo-4.7.1.ebuild,v 1.1 2010/11/09 15:49:26 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.7.1.ebuild,v 1.2 2011/03/26 17:08:50 dilfridge Exp $
 
 EAPI="3"
 inherit qt4-build
@@ -17,8 +17,8 @@ DEPEND="~x11-libs/qt-assistant-${PV}:${SLOT}[aqua=]
 	~x11-libs/qt-multimedia-${PV}:${SLOT}[aqua=]
 	~x11-libs/qt-opengl-${PV}:${SLOT}[aqua=,qt3support=]
 	!kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=]
-		media-sound/phonon[aqua=] ) )
-	kde? ( media-sound/phonon[aqua=] )
+		media-libs/phonon[aqua=] ) )
+	kde? ( media-libs/phonon[aqua=] )
 	~x11-libs/qt-script-${PV}:${SLOT}[aqua=]
 	~x11-libs/qt-sql-${PV}:${SLOT}[aqua=,qt3support=]
 	~x11-libs/qt-svg-${PV}:${SLOT}[aqua=]
diff --git a/x11-libs/qt-demo/qt-demo-4.7.2.ebuild b/x11-libs/qt-demo/qt-demo-4.7.2.ebuild
index 7d1abeb177b3..40deba1aa44b 100644
--- a/x11-libs/qt-demo/qt-demo-4.7.2.ebuild
+++ b/x11-libs/qt-demo/qt-demo-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-demo/qt-demo-4.7.2.ebuild,v 1.1 2011/03/01 19:07:32 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.7.2.ebuild,v 1.2 2011/03/26 17:08:50 dilfridge Exp $
 
 EAPI="3"
 inherit qt4-build
@@ -17,8 +17,8 @@ DEPEND="~x11-libs/qt-assistant-${PV}:${SLOT}[aqua=]
 	~x11-libs/qt-multimedia-${PV}:${SLOT}[aqua=]
 	~x11-libs/qt-opengl-${PV}:${SLOT}[aqua=,qt3support=]
 	!kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=]
-		media-sound/phonon[aqua=] ) )
-	kde? ( media-sound/phonon[aqua=] )
+		media-libs/phonon[aqua=] ) )
+	kde? ( media-libs/phonon[aqua=] )
 	~x11-libs/qt-script-${PV}:${SLOT}[aqua=]
 	~x11-libs/qt-sql-${PV}:${SLOT}[aqua=,qt3support=]
 	~x11-libs/qt-svg-${PV}:${SLOT}[aqua=]