diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-10-20 20:22:51 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-10-20 20:22:51 +0000 |
| commit | 0fb1deeb0b500ac500194086269f9f4165c804f4 (patch) | |
| tree | 53b6d9bbd5db24fe421167b4c55257fd91375f33 /media-libs | |
| parent | Restrict tests, bug 387791 (diff) | |
| download | gentoo-2-0fb1deeb0b500ac500194086269f9f4165c804f4.tar.gz gentoo-2-0fb1deeb0b500ac500194086269f9f4165c804f4.tar.bz2 gentoo-2-0fb1deeb0b500ac500194086269f9f4165c804f4.zip | |
Move qt-phonon blocker to COMMONDEPEND, bug 374111
(Portage version: 2.1.10.29/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/phonon/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/phonon/phonon-4.5.0-r1.ebuild | 4 | ||||
| -rw-r--r-- | media-libs/phonon/phonon-4.5.0.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/media-libs/phonon/ChangeLog b/media-libs/phonon/ChangeLog index 31632eac4fe4..51cc15a6e7b6 100644 --- a/media-libs/phonon/ChangeLog +++ b/media-libs/phonon/ChangeLog @@ -1,6 +1,10 @@ # 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.17 2011/10/16 10:41:36 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.18 2011/10/20 20:22:51 dilfridge Exp $ + + 20 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> phonon-4.5.0.ebuild, + phonon-4.5.0-r1.ebuild: + Move qt-phonon blocker to COMMONDEPEND, bug 374111 *phonon-4.5.0-r1 (16 Oct 2011) diff --git a/media-libs/phonon/phonon-4.5.0-r1.ebuild b/media-libs/phonon/phonon-4.5.0-r1.ebuild index 9dfb3969250c..1cee3d440306 100644 --- 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 62160ad7fe1e..e38d838ceb63 100644 --- 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 |