Move qt-phonon blocker to COMMONDEPEND, bug 374111

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

diff --git a/media-libs/phonon/ChangeLog b/media-libs/phonon/ChangeLog
index 51cc15a6e7b6fca7b1bb715fb30b7c33f2d3c795..58f48fac369eafeec37aab8775473861637b5057 100644 (file)
--- a/media-libs/phonon/ChangeLog
+++ b/media-libs/phonon/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/phonon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.18 2011/10/20 20:22:51 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.19 2011/10/20 20:23:37 dilfridge Exp $
+
+  20 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> phonon-9999.ebuild:
+  Move qt-phonon blocker to COMMONDEPEND, bug 374111
 
   20 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> phonon-4.5.0.ebuild,
   phonon-4.5.0-r1.ebuild:

diff --git a/media-libs/phonon/phonon-4.5.0-r1.ebuild b/media-libs/phonon/phonon-4.5.0-r1.ebuild
index 9dfb3969250cf9ae0dc8f1fdeaa5c2511edda781..1cee3d440306cce098de9d2d15465112d39cc358 100644 (file)
--- a/media-libs/phonon/phonon-4.5.0-r1.ebuild
+++ b/media-libs/phonon/phonon-4.5.0-r1.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/media-libs/phonon/phonon-4.5.0-r1.ebuild,v 1.1 2011/10/16 10:41:36 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.5.0-r1.ebuild,v 1.2 2011/10/20 20:22:51 dilfridge Exp $
 
 EAPI=4
 
@@ -24,6 +24,7 @@ COMMON_DEPEND="
                dev-libs/glib:2
                >=media-sound/pulseaudio-0.9.21[glib]
        )
+       !x11-libs/qt-phonon:4
 "
 # directshow? ( media-sound/phonon-directshow )
 # mmf? ( media-sound/phonon-mmf )
@@ -37,7 +38,6 @@ PDEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
        !kde-base/phonon-xine
-       !x11-libs/qt-phonon:4
 "
 DEPEND="${COMMON_DEPEND}
        >=dev-util/automoc-0.9.87

diff --git a/media-libs/phonon/phonon-4.5.0.ebuild b/media-libs/phonon/phonon-4.5.0.ebuild
index 62160ad7fe1e186f66730886923031bfad7b5fb1..e38d838ceb6320f6676178b90739ead6e3c25167 100644 (file)
--- a/media-libs/phonon/phonon-4.5.0.ebuild
+++ b/media-libs/phonon/phonon-4.5.0.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/media-libs/phonon/phonon-4.5.0.ebuild,v 1.8 2011/05/24 11:21:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.5.0.ebuild,v 1.9 2011/10/20 20:22:51 dilfridge Exp $
 
 EAPI=4
 
@@ -24,6 +24,7 @@ COMMON_DEPEND="
                dev-libs/glib:2
                >=media-sound/pulseaudio-0.9.21[glib]
        )
+       !x11-libs/qt-phonon:4
 "
 # directshow? ( media-sound/phonon-directshow )
 # mmf? ( media-sound/phonon-mmf )
@@ -37,7 +38,6 @@ PDEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
        !kde-base/phonon-xine
-       !x11-libs/qt-phonon:4
 "
 DEPEND="${COMMON_DEPEND}
        >=dev-util/automoc-0.9.87

diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild
index d2e669cf9a523884a35a771c141fc2944dabcfb8..dd9d83feb7c78b516b720ebaf633a8529ff2d3ac 100644 (file)
--- a/media-libs/phonon/phonon-9999.ebuild
+++ b/media-libs/phonon/phonon-9999.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/media-libs/phonon/phonon-9999.ebuild,v 1.9 2011/05/24 11:21:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.10 2011/10/20 20:23:37 dilfridge Exp $
 
 EAPI=4
 
@@ -24,6 +24,7 @@ COMMON_DEPEND="
                dev-libs/glib:2
                >=media-sound/pulseaudio-0.9.21[glib]
        )
+       !x11-libs/qt-phonon:4
 "
 # directshow? ( media-sound/phonon-directshow )
 # mmf? ( media-sound/phonon-mmf )
@@ -37,7 +38,6 @@ PDEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
        !kde-base/phonon-xine
-       !x11-libs/qt-phonon:4
 "
 DEPEND="${COMMON_DEPEND}
        >=dev-util/automoc-0.9.87