diff options
author | 2005-06-07 15:35:04 +0000 | |
---|---|---|
committer | 2005-06-07 15:35:04 +0000 | |
commit | 827f278ec9fe96623ea7dbf4b29560e5ab9feae7 (patch) | |
tree | 65241f6be4447fa58abb275f8ee0f12624bf346d /kde-base/kdemultimedia-kioslaves | |
parent | Version bump. (diff) | |
download | gentoo-2-827f278ec9fe96623ea7dbf4b29560e5ab9feae7.tar.gz gentoo-2-827f278ec9fe96623ea7dbf4b29560e5ab9feae7.tar.bz2 gentoo-2-827f278ec9fe96623ea7dbf4b29560e5ab9feae7.zip |
Correct dependencies.
(Portage version: 2.0.51.19)
Diffstat (limited to 'kde-base/kdemultimedia-kioslaves')
-rw-r--r-- | kde-base/kdemultimedia-kioslaves/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.4.1.ebuild | 21 |
2 files changed, 19 insertions, 8 deletions
diff --git a/kde-base/kdemultimedia-kioslaves/ChangeLog b/kde-base/kdemultimedia-kioslaves/ChangeLog index b003b31f6204..dc57ef522813 100644 --- a/kde-base/kdemultimedia-kioslaves/ChangeLog +++ b/kde-base/kdemultimedia-kioslaves/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdemultimedia-kioslaves # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/ChangeLog,v 1.10 2005/05/26 09:02:19 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/ChangeLog,v 1.11 2005/06/07 15:35:04 greg_g Exp $ + + 07 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> + kdemultimedia-kioslaves-3.4.1.ebuild: + Correct dependencies. 26 May 2005; Gregorio Guidi <greg_g@gentoo.org> kdemultimedia-kioslaves-3.4.1.ebuild: diff --git a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.4.1.ebuild b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.4.1.ebuild index d06190d04676..87e94d635a81 100644 --- a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.4.1.ebuild +++ b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.4.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.4.1.ebuild,v 1.3 2005/05/26 17:14:26 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.4.1.ebuild,v 1.4 2005/06/07 15:35:04 greg_g Exp $ KMNAME=kdemultimedia KMMODULE=kioslave @@ -10,20 +10,27 @@ inherit kde-meta eutils DESCRIPTION="kioslaves from kdemultimedia package" KEYWORDS="~x86 ~amd64 ~ppc64 ~ppc ~sparc" -IUSE="vorbis flac encode" +IUSE="encode flac mp3 vorbis" DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcddb) media-sound/cdparanoia media-libs/taglib - vorbis? ( media-libs/libvorbis ) - flac? ( media-libs/flac ) - encode? ( media-sound/lame )" + encode? ( vorbis? ( media-libs/libvorbis ) + flac? ( media-libs/flac ) )" +RDEPEND="${DEPEND} + encode? ( mp3? ( media-sound/lame ) )" + KMCOPYLIB="libkcddb libkcddb" -KMEXTRACTONLY="kdemultimedia-3.3.0/akode/configure.in.in" +KMEXTRACTONLY="akode/configure.in.in" KMCOMPILEONLY="libkcddb/" src_compile() { myconf="--with-cdparanoia --enable-cdparanoia" - use vorbis && myconf="$myconf --with-vorbis=/usr" || myconf="$myconf --without-vorbis" + if use encode; then + myconf="$myconf $(use_with vorbis) $(use_with flac)" + else + myconf="$myconf --without-vorbis --without-flac" + fi + DO_NOT_COMPILE=libkcddb kde-meta_src_compile myconf configure cd $S/libkcddb && make configbase.h DO_NOT_COMPILE=libkcddb kde-meta_src_compile make |