[gentoo-commits] proj/kde:master commit in: app-cdr/k3b/

["Michael Palimaka" <kensington@astralcloak.net>]

commit:     c4cf872536698c59ce3e04efa790c973af218718
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat May 19 18:07:59 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Sat May 19 18:07:59 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c4cf8725

[app-cdr/k3b] Sync with portage.

(Portage version: 2.1.10.62/git/Linux x86_64, unsigned Manifest commit)

---
 app-cdr/k3b/k3b-9999.ebuild |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index f04c92b..585c448 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -9,13 +9,14 @@ WEBKIT_REQUIRED="always"
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
 
-KDE_LINGUAS="ast be bg ca ca@valencia cs csb da de el en_GB eo es et eu fi fr ga
+# Translations are only in the tarballs, not in the git repo
+if [[ ${PV} != *9999* ]]; then
+	KDE_LINGUAS="ast be bg ca ca@valencia cs csb da de el en_GB eo es et eu fi fr ga
 	gl he hi hne hr hu is it ja km ko ku lt mai nb nds nl nn oc pa pl pt pt_BR ro ru
 	se sk sl sv th tr uk zh_CN zh_TW"
 
-if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.bz2"
-	DOCS=( FAQ PERMISSIONS README RELEASE_HOWTO )
+	DOCS=( FAQ PERMISSIONS README )
 	S=${WORKDIR}/${P/_*}
 else
 	DOCS=( FAQ.txt PERMISSIONS.txt README.txt )
@@ -29,23 +30,23 @@ HOMEPAGE="http://www.k3b.org/"
 LICENSE="GPL-2 FDL-1.2"
 SLOT="4"
 KEYWORDS=""
-IUSE="debug dvd emovix encode ffmpeg flac lame mad musepack musicbrainz sndfile sox taglib vcd vorbis +wav"
+IUSE="debug dvd emovix encode ffmpeg flac lame mad musepack sndfile sox taglib vcd vorbis +wav"
 
 DEPEND="
 	$(add_kdebase_dep libkcddb)
 	media-libs/libsamplerate
 	dvd? ( media-libs/libdvdread )
+	encode? ( lame? ( media-sound/lame ) )
 	ffmpeg? ( virtual/ffmpeg )
 	flac? ( >=media-libs/flac-1.2[cxx] )
-	encode? ( lame? ( media-sound/lame ) )
 	mad? ( media-libs/libmad )
 	musepack? ( >=media-sound/musepack-tools-444 )
-	musicbrainz? ( media-libs/musicbrainz:1 )
 	sndfile? ( media-libs/libsndfile )
 	taglib? ( >=media-libs/taglib-1.5 )
 	vorbis? ( media-libs/libvorbis )
 "
 RDEPEND="${DEPEND}
+	$(add_kdebase_dep kdelibs 'udev,udisks(+)')
 	app-cdr/cdrdao
 	media-sound/cdparanoia
 	virtual/cdrtools
@@ -62,28 +63,28 @@ DOCS+=( ChangeLog )
 
 src_configure() {
 	mycmakeargs=(
+		-DK3B_BUILD_API_DOCS=OFF
 		-DK3B_BUILD_K3BSETUP=OFF
-		$(cmake-utils_use debug K3B_DEBUG)
 		-DK3B_ENABLE_HAL_SUPPORT=OFF
-		$(cmake-utils_use musicbrainz K3B_ENABLE_MUSICBRAINZ)
+		-DK3B_ENABLE_MUSICBRAINZ=OFF
+		$(cmake-utils_use debug K3B_DEBUG)
 		$(cmake-utils_use dvd K3B_ENABLE_DVD_RIPPING)
 		$(cmake-utils_use taglib K3B_ENABLE_TAGLIB)
-		-DK3B_BUILD_API_DOCS=OFF
+		$(cmake-utils_use encode K3B_BUILD_EXTERNAL_ENCODER_PLUGIN)
+		$(cmake-utils_use flac K3B_BUILD_FLAC_DECODER_PLUGIN)
 		$(cmake-utils_use ffmpeg K3B_BUILD_FFMPEG_DECODER_PLUGIN)
-		$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN)
 		$(cmake-utils_use mad K3B_BUILD_MAD_DECODER_PLUGIN)
 		$(cmake-utils_use musepack K3B_BUILD_MUSE_DECODER_PLUGIN)
-		$(cmake-utils_use flac K3B_BUILD_FLAC_DECODER_PLUGIN)
 		$(cmake-utils_use sndfile K3B_BUILD_SNDFILE_DECODER_PLUGIN)
+		$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN)
 		$(cmake-utils_use wav K3B_BUILD_WAVE_DECODER_PLUGIN)
-		$(cmake-utils_use encode K3B_BUILD_EXTERNAL_ENCODER_PLUGIN)
 	)
 
 	if use encode; then
 		mycmakeargs+=(
-			$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
 			$(cmake-utils_use lame K3B_BUILD_LAME_ENCODER_PLUGIN)
 			$(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN)
+			$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
 		)
 	fi