Drop use flag and dependency on musicbrainz since it doesn't actually do anything useful, fixing bug #410347. Tidy ebuild.

Package-Manager: portage-2.1.10.62/cvs/Linux x86_64

3 files changed, 130 insertions, 6 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index c24baeebd9ae..c00d16f6c998 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.269 2012/02/28 23:30:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.270 2012/05/19 17:38:23 kensington Exp $
+
+*k3b-2.0.2-r2 (19 May 2012)
+
+  19 May 2012; Michael Palimaka <kensington@gentoo.org> +k3b-2.0.2-r2.ebuild:
+  Drop use flag and dependency on musicbrainz since it doesn't actually do
+  anything useful, fixing bug #410347. Tidy ebuild.
 
   28 Feb 2012; Alexis Ballier <aballier@gentoo.org> k3b-2.0.2-r1.ebuild,
   +files/k3b-2.0.2-libavformat54.patch:
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index cc9dba89a213..72cc321d49e6 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -5,12 +5,17 @@ AUX k3b-2.0.2-ffmpeg.patch 3298 RMD160 0e7cff12151cfa33f87f4d4d425921e01fd1a9ba
 AUX k3b-2.0.2-libavformat54.patch 917 RMD160 5cf3edb1bb46ceee8ff6c47fd8342e044488d40e SHA1 5b35bff3f7670686a32bd71afea2deaca4331631 SHA256 516efa7ad0d9806c603f761769f8d1457fe9fa047a7475e7f11615db89ee1271
 DIST k3b-2.0.2.tar.bz2 12833321 RMD160 a0289eb9ccec9607c2bdac3fc7c69102eec5ee40 SHA1 8b30a4d07942e82559b01bc07dea6bcf2defd532 SHA256 af176f29c1d2339c4648d461476227cb07bcd0c75056f2a4006f253e3ef5b7cd
 EBUILD k3b-2.0.2-r1.ebuild 3412 RMD160 bd84124d0d845017c79a930d30105381e2f20d4d SHA1 1226cf144b964ee0025fd029b445c7e1e450bbd9 SHA256 fdc5088812ef0d71b0ae2de0705318fb907e08c8da80316a6dcaf4149fd95cee
-MISC ChangeLog 38999 RMD160 daeedae90eef17df0cb3f0c4fe8e55dd0db53fe9 SHA1 27ee798ae48cf8f490a223f16510b8fa2fbe1fe7 SHA256 b0767a22a905218e1641f363b5aa26a7eb041100560f94f74d80303ae50ceb17
+EBUILD k3b-2.0.2-r2.ebuild 3305 RMD160 dda9a2e09a7b806cd53822b299184dd1e9263da9 SHA1 409b344b8a45dc0d3fb602777e7de202f8787b5b SHA256 ea9833c08cb8fd09516c59eaab8fd1f83645066a48e64966a6c98f629d625aa5
+MISC ChangeLog 39236 RMD160 cf84eb5c7b887722b3e631f48becde1d646aa88f SHA1 1e9cf26d1392036fadd712fd7f986d69e0da4cf8 SHA256 1d867e3713fe999fca735cba604eeb8d38d065004519667a1bc3c864a4bd0148
 MISC metadata.xml 328 RMD160 5b743e23199d1fe9055c726d7d177ee0e2f7e915 SHA1 73b1368091e675957fe43af4c9ce71b6049def16 SHA256 c7ade5871825684e83ad0a4126a78df11f40cfb6d7ac6578c8b65f3491ef01a0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk9NY7cACgkQvFcC4BYPU0q6YACfQ62K9xEDMU0/epr5Lr3ggPFC
-wJcAoMsViQqgaFKLAWp0wI6yf1cpEldI
-=U1+W
+iQEcBAEBAgAGBQJPt9qKAAoJEMbwO6tnXQ0swYsH/jcXJMNbilR7uv7mxWvQxm6O
+nO2AaDllu79F5Arb7NHZ/vHR1szbcdawQW2dSjzoit9gkEfBc1WsNbHxw7SGe2i/
+2KIgR70dLRRg4m4Y8BembjDmbfZX6mGVFCl75wn3A6l2PAbo6lVBbWjtqhexd31f
+Z9Q9tcISYfiNP36Qf9BrWjG99zkRoiaH1jnd5kG8BIAb8VFSwITGxXET+8lT9o74
+tgPX/xqkjh3XBglQG1BhtMnAInQ/S8Ll2o2gUIquCQaUq9WuaQWf7WoCyvHAULSd
+rJa2hrSqG2I7fminzuaQGUzPiTo7h6WoNp+7DnC00XuI4IASpVD22fF9Nh/TTs0=
+=mrvR
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/k3b/k3b-2.0.2-r2.ebuild b/app-cdr/k3b/k3b-2.0.2-r2.ebuild
new file mode 100644
index 000000000000..a6571537d459
--- /dev/null
+++ b/app-cdr/k3b/k3b-2.0.2-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.2-r2.ebuild,v 1.1 2012/05/19 17:38:22 kensington Exp $
+
+EAPI=4
+
+MULTIMEDIA_REQUIRED="always"
+WEBKIT_REQUIRED="always"
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+
+# 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"
+
+	SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.bz2"
+	DOCS=( FAQ PERMISSIONS README )
+	S=${WORKDIR}/${P/_*}
+else
+	DOCS=( FAQ.txt PERMISSIONS.txt README.txt )
+fi
+
+inherit kde4-base
+
+DESCRIPTION="The CD/DVD Kreator for KDE"
+HOMEPAGE="http://www.k3b.org/"
+
+LICENSE="GPL-2 FDL-1.2"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+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] )
+	mad? ( media-libs/libmad )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	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
+	dvd? (
+		>=app-cdr/dvd+rw-tools-7
+		encode? ( media-video/transcode[dvd] )
+	)
+	emovix? ( media-video/emovix )
+	encode? ( sox? ( media-sound/sox ) )
+	vcd? ( media-video/vcdimager )
+"
+
+DOCS+=( ChangeLog )
+
+PATCHES=(
+	"${FILESDIR}/${P}-ffmpeg.patch"
+	"${FILESDIR}/${P}-libavformat54.patch"
+)
+
+src_configure() {
+	mycmakeargs=(
+		-DK3B_BUILD_API_DOCS=OFF
+		-DK3B_BUILD_K3BSETUP=OFF
+		-DK3B_ENABLE_HAL_SUPPORT=OFF
+		-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)
+		$(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 mad K3B_BUILD_MAD_DECODER_PLUGIN)
+		$(cmake-utils_use musepack K3B_BUILD_MUSE_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)
+	)
+
+	if use encode; then
+		mycmakeargs+=(
+			$(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
+
+	kde4-base_src_configure
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	echo
+	elog "We don't install k3bsetup anymore because Gentoo doesn't need it."
+	elog "If you get warnings on start-up, uncheck the \"Check system"
+	elog "configuration\" option in the \"Misc\" settings window."
+	echo
+
+	local group=cdrom
+	use kernel_linux || group=operator
+	elog "Make sure you have proper read/write permissions on the cdrom device(s)."
+	elog "Usually, it is sufficient to be in the ${group} group."
+	echo
+}