Add USE=encode. Make USE=flac depend on fixed kdelibs.

(Portage version: 2.1.4)

2 files changed, 24 insertions, 12 deletions

diff --git a/kde-base/kdemultimedia-kioslaves/ChangeLog b/kde-base/kdemultimedia-kioslaves/ChangeLog
index a6c379d26a8f..8ce099cc6ae6 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/ChangeLog,v 1.82 2008/01/29 16:35:59 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/ChangeLog,v 1.83 2008/01/29 19:46:57 zlin Exp $
+
+  29 Jan 2008; Bo Ørsted Andresen <zlin@gentoo.org>
+  kdemultimedia-kioslaves-4.0.0-r1.ebuild:
+  Add USE=encode. Make USE=flac depend on fixed kdelibs.
 
   29 Jan 2008; Raúl Porcel <armin76@gentoo.org>
   kdemultimedia-kioslaves-3.5.8.ebuild:
diff --git a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.0.0-r1.ebuild b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.0.0-r1.ebuild
index 364d2fa3ab41..b452b52e619b 100644
--- a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.0.0-r1.ebuild
+++ b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.0.0-r1.ebuild,v 1.1 2008/01/29 05:42:23 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.0.0-r1.ebuild,v 1.2 2008/01/29 19:46:57 zlin Exp $
 
 EAPI="1"
 
@@ -10,15 +10,16 @@ inherit kde4-meta
 
 DESCRIPTION="KDE kioslaves from the kdemultimedia package"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug flac vorbis"
+IUSE="debug encode flac vorbis"
 RESTRICT="test"
 
 DEPEND="${DEPEND}
 	>=kde-base/libkcddb-${PV}:${SLOT}
 	>=kde-base/libkcompactdisc-${PV}:${SLOT}
 	media-sound/cdparanoia
-	flac? ( media-libs/flac )
-	vorbis? ( media-libs/libvorbis )"
+	encode? ( flac? ( >=media-libs/flac-1.1.2
+		>=kde-base/kdelibs-4.0.0-r1:kde-4 )
+		vorbis? ( media-libs/libvorbis ) )"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY="libkcompactdisc/"
@@ -27,16 +28,23 @@ KMCOMPILEONLY="libkcddb/"
 PATCHES="${FILESDIR}/${P}-flac-1.1.3.patch"
 
 src_compile() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with flac Flac)
-		$(cmake-utils_use_with vorbis OggVorbis)"
+	if use encode; then
+		mycmakeargs="${mycmakeargs}
+			$(cmake-utils_use_with flac Flac)
+			$(cmake-utils_use_with vorbis OggVorbis)"
+	else
+		mycmakeargs="${mycmakeargs}
+			-DWITH_OggVorbis=OFF -DWITH_Flac=OFF"
+	fi
 
 	kde4-meta_src_compile
 }
 
 pkg_postinst() {
-	echo
-	elog "In order to use the lame plugin to encode mp3 files you will need to"
-	elog "install media-sound/lame"
-	echo
+	if use encode; then
+		echo
+		elog "In order to use the lame plugin to encode mp3 files you will need to"
+		elog "install media-sound/lame"
+		echo
+	fi
 }