Adapt phonon dependency for package move

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

6 files changed, 20 insertions, 10 deletions

diff --git a/x11-libs/qt-phonon/ChangeLog b/x11-libs/qt-phonon/ChangeLog
index aafeda94cc76..cf2984241a81 100644
--- a/x11-libs/qt-phonon/ChangeLog
+++ b/x11-libs/qt-phonon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-phonon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.88 2011/03/01 19:09:20 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.89 2011/03/26 16:49:00 dilfridge Exp $
+
+  26 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  qt-phonon-4.6.2.ebuild, qt-phonon-4.6.3.ebuild, qt-phonon-4.7.0.ebuild,
+  qt-phonon-4.7.1.ebuild, qt-phonon-4.7.2.ebuild:
+  Adapt phonon dependency for package move
 
 *qt-phonon-4.7.2 (01 Mar 2011)
 
diff --git a/x11-libs/qt-phonon/qt-phonon-4.6.2.ebuild b/x11-libs/qt-phonon/qt-phonon-4.6.2.ebuild
index b552f867f669..b86ef51d943c 100644
--- a/x11-libs/qt-phonon/qt-phonon-4.6.2.ebuild
+++ b/x11-libs/qt-phonon/qt-phonon-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-phonon/qt-phonon-4.6.2.ebuild,v 1.7 2010/09/13 21:21:34 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.6.2.ebuild,v 1.8 2011/03/26 16:49:00 dilfridge Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -14,6 +14,7 @@ DEPEND="~x11-libs/qt-gui-${PV}[aqua=,debug=,glib,qt3support]
 	!kde-base/phonon-kde
 	!kde-base/phonon-xine
 	!media-sound/phonon
+	!media-libs/phonon
 	!aqua? ( media-libs/gstreamer
 			 media-plugins/gst-plugins-meta )
 	aqua? ( ~x11-libs/qt-opengl-${PV}[aqua] )
diff --git a/x11-libs/qt-phonon/qt-phonon-4.6.3.ebuild b/x11-libs/qt-phonon/qt-phonon-4.6.3.ebuild
index 6ac38f1ddbdb..b972447a6924 100644
--- a/x11-libs/qt-phonon/qt-phonon-4.6.3.ebuild
+++ b/x11-libs/qt-phonon/qt-phonon-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-phonon/qt-phonon-4.6.3.ebuild,v 1.8 2010/12/23 07:56:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.6.3.ebuild,v 1.9 2011/03/26 16:49:00 dilfridge Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -13,6 +13,7 @@ IUSE="dbus"
 DEPEND="~x11-libs/qt-gui-${PV}[aqua=,debug=,glib,qt3support]
 	!kde-base/phonon-kde
 	!kde-base/phonon-xine
+	!media-libs/phonon
 	!media-sound/phonon
 	!aqua? ( media-libs/gstreamer
 			 media-plugins/gst-plugins-meta )
diff --git a/x11-libs/qt-phonon/qt-phonon-4.7.0.ebuild b/x11-libs/qt-phonon/qt-phonon-4.7.0.ebuild
index 8bcd985c5b9a..8ca00bbf2428 100644
--- a/x11-libs/qt-phonon/qt-phonon-4.7.0.ebuild
+++ b/x11-libs/qt-phonon/qt-phonon-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-phonon/qt-phonon-4.7.0.ebuild,v 1.4 2010/11/06 09:36:31 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.7.0.ebuild,v 1.5 2011/03/26 16:49:00 dilfridge Exp $
 
 EAPI="3"
 inherit qt4-build
@@ -14,6 +14,7 @@ DEPEND="~x11-libs/qt-gui-${PV}[aqua=,debug=,glib,qt3support]
 	!kde-base/phonon-kde
 	!kde-base/phonon-xine
 	!media-sound/phonon
+	!media-libs/phonon
 	!aqua? ( media-libs/gstreamer
 			 media-plugins/gst-plugins-meta )
 	aqua? ( ~x11-libs/qt-opengl-${PV}[aqua] )
diff --git a/x11-libs/qt-phonon/qt-phonon-4.7.1.ebuild b/x11-libs/qt-phonon/qt-phonon-4.7.1.ebuild
index e311a77ad4ea..0648679be9dc 100644
--- a/x11-libs/qt-phonon/qt-phonon-4.7.1.ebuild
+++ b/x11-libs/qt-phonon/qt-phonon-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-phonon/qt-phonon-4.7.1.ebuild,v 1.1 2010/11/09 15:50:02 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.7.1.ebuild,v 1.2 2011/03/26 16:49:00 dilfridge Exp $
 
 EAPI="3"
 inherit qt4-build
@@ -13,6 +13,7 @@ IUSE="dbus"
 DEPEND="~x11-libs/qt-gui-${PV}[aqua=,debug=,glib,qt3support]
 	!kde-base/phonon-kde
 	!kde-base/phonon-xine
+	!media-libs/phonon
 	!media-sound/phonon
 	!aqua? ( media-libs/gstreamer
 			 media-plugins/gst-plugins-meta )
diff --git a/x11-libs/qt-phonon/qt-phonon-4.7.2.ebuild b/x11-libs/qt-phonon/qt-phonon-4.7.2.ebuild
index 45e2988d96b0..e52b722f0903 100644
--- a/x11-libs/qt-phonon/qt-phonon-4.7.2.ebuild
+++ b/x11-libs/qt-phonon/qt-phonon-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-phonon/qt-phonon-4.7.2.ebuild,v 1.1 2011/03/01 19:09:20 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.7.2.ebuild,v 1.2 2011/03/26 16:49:00 dilfridge Exp $
 
 EAPI="3"
 inherit qt4-build
@@ -13,6 +13,7 @@ IUSE="dbus"
 DEPEND="~x11-libs/qt-gui-${PV}[aqua=,debug=,glib,qt3support]
 	!kde-base/phonon-kde
 	!kde-base/phonon-xine
+	!media-libs/phonon
 	!media-sound/phonon
 	!aqua? ( media-libs/gstreamer
 			 media-plugins/gst-plugins-meta )