diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-15 14:42:16 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-15 14:42:16 +0000 |
| commit | fad56b5b3a41ccf1c5f680cec55c63b8f9b28a89 (patch) | |
| tree | a9332fba20cbd5f6c72cdf9e04ea78a047faa8c1 /kde-base/phonon-kde | |
| parent | Automatic-merge: merge updates for 4.2.1 from kde-testing. (diff) | |
| download | gentoo-2-fad56b5b3a41ccf1c5f680cec55c63b8f9b28a89.tar.gz gentoo-2-fad56b5b3a41ccf1c5f680cec55c63b8f9b28a89.tar.bz2 gentoo-2-fad56b5b3a41ccf1c5f680cec55c63b8f9b28a89.zip | |
Automatic-merge: merge updates for 4.2.1 from kde-testing.
(Portage version: 2.2_rc25/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/phonon-kde')
| -rw-r--r-- | kde-base/phonon-kde/ChangeLog | 5 | ||||
| -rw-r--r-- | kde-base/phonon-kde/phonon-kde-4.2.1.ebuild | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/kde-base/phonon-kde/ChangeLog b/kde-base/phonon-kde/ChangeLog index b1cb692b07f2..a89e7df0da45 100644 --- a/kde-base/phonon-kde/ChangeLog +++ b/kde-base/phonon-kde/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/phonon-kde # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.7 2009/03/08 20:55:07 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.8 2009/03/15 14:42:16 scarabeus Exp $ + + 15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> phonon-kde-4.2.1.ebuild: + Automatic-merge: merge updates for 4.2.1 from kde-testing. 08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -phonon-kde-4.2.0.ebuild, -phonon-kde-4.2.0-r1.ebuild: diff --git a/kde-base/phonon-kde/phonon-kde-4.2.1.ebuild b/kde-base/phonon-kde/phonon-kde-4.2.1.ebuild index 0e43adb6c1ee..a56873f75573 100644 --- a/kde-base/phonon-kde/phonon-kde-4.2.1.ebuild +++ b/kde-base/phonon-kde/phonon-kde-4.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.2.1.ebuild,v 1.2 2009/03/08 14:19:35 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.2.1.ebuild,v 1.3 2009/03/15 14:42:16 scarabeus Exp $ EAPI="2" @@ -15,10 +15,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="debug" RDEPEND=" - !kdeprefix? ( - !kde-base/phonon - !kde-base/phonon-xine - ) + !kdeprefix? ( !kde-base/phonon-xine[-kdeprefix] ) " src_prepare() { |