diff options
author | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-10-20 20:23:37 +0000 |
---|---|---|
committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-10-20 20:23:37 +0000 |
commit | 3ff5541d2cedeb474d80c3b10239e4b2ab25beaa (patch) | |
tree | 565ff3ecc9e31e5cfcf3dc605cb1e049995d73ba /media-libs/phonon | |
parent | Move qt-phonon blocker to COMMONDEPEND, bug 374111 (diff) | |
download | gentoo-2-3ff5541d2cedeb474d80c3b10239e4b2ab25beaa.tar.gz gentoo-2-3ff5541d2cedeb474d80c3b10239e4b2ab25beaa.tar.bz2 gentoo-2-3ff5541d2cedeb474d80c3b10239e4b2ab25beaa.zip |
Move qt-phonon blocker to COMMONDEPEND, bug 374111
(Portage version: 2.1.10.29/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/phonon')
-rw-r--r-- | media-libs/phonon/ChangeLog | 5 | ||||
-rw-r--r-- | media-libs/phonon/phonon-9999.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/media-libs/phonon/ChangeLog b/media-libs/phonon/ChangeLog index 51cc15a6e7b6..58f48fac369e 100644 --- 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-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild index d2e669cf9a52..dd9d83feb7c7 100644 --- 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 |