Make Akode optional. Make the Juk file renamer work with non-english locales. Assure building against GStreamer 0.8.

(Portage version: 2203-svn)

6 files changed, 129 insertions, 54 deletions

diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index 50b7a2fd9237..0dad559238b9 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdemultimedia
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.199 2006/04/18 19:50:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.200 2006/05/05 14:53:02 carlo Exp $
+
+*kdemultimedia-3.5.2-r2 (05 May 2006)
+
+  05 May 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/juk-3.5.2-do_not_use_gstreamer-0.10.diff,
+  +files/juk-3.5.2-filerename.diff, +kdemultimedia-3.5.2-r2.ebuild:
+  Make Akode optional. Make the Juk file renamer work with non-english
+  locales. Assure building against GStreamer 0.8.
 
   18 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   kdemultimedia-3.5.2.ebuild:
diff --git a/kde-base/kdemultimedia/Manifest b/kde-base/kdemultimedia/Manifest
index 2167830d3ee5..06559bcd74c5 100644
--- a/kde-base/kdemultimedia/Manifest
+++ b/kde-base/kdemultimedia/Manifest
@@ -1,73 +1,25 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8cc6390e76f209c9b38d34fb5d0390e2 ChangeLog 28684
-RMD160 7a794979c7aa023e78396ffb191564f6a36668a2 ChangeLog 28684
-SHA256 26b5a01e39a20e5c67de91b601881fed64f92bb977b71ec4354f5b5db764fb33 ChangeLog 28684
+MD5 47733952d3764050767af21d5b7af939 ChangeLog 29013
 MD5 d860129d92634080c3f7368ed282e098 files/artsplugin-akode-3.5.2-memleak.patch 797
-RMD160 593b8a40af0b373259d37410f57989cdfb9ec568 files/artsplugin-akode-3.5.2-memleak.patch 797
-SHA256 1a6d341f130430ca7faef4188899e4fe98c4ba808ea9702d352a9b28eb2b3642 files/artsplugin-akode-3.5.2-memleak.patch 797
 MD5 30810bdee5baa766c389b0a4d8533a4e files/digest-kdemultimedia-3.3.2 73
-RMD160 6211b7f15cd6ddbd0ae102b84cf225dd8d22ef01 files/digest-kdemultimedia-3.3.2 73
-SHA256 bb975749a40d6c7d175429d2dded352702855a584c90719081df6e279b0c0f52 files/digest-kdemultimedia-3.3.2 73
 MD5 7768e89277edde1b1e163ae65e5a4e9c files/digest-kdemultimedia-3.4.1 73
-RMD160 69dd4c0b07d2d85b891790eb09eb6a30f672ab2a files/digest-kdemultimedia-3.4.1 73
-SHA256 d06f5029b31a19a5ff1a58c51984d9c0943964e23f23f06e2c08033322a6cfa4 files/digest-kdemultimedia-3.4.1 73
 MD5 7768e89277edde1b1e163ae65e5a4e9c files/digest-kdemultimedia-3.4.1-r1 73
-RMD160 69dd4c0b07d2d85b891790eb09eb6a30f672ab2a files/digest-kdemultimedia-3.4.1-r1 73
-SHA256 d06f5029b31a19a5ff1a58c51984d9c0943964e23f23f06e2c08033322a6cfa4 files/digest-kdemultimedia-3.4.1-r1 73
 MD5 dfce952f93ee14ecafcfea645134aec2 files/digest-kdemultimedia-3.4.2 73
-RMD160 353eaad0b32f4145fe421a39712f4bb952050bbc files/digest-kdemultimedia-3.4.2 73
-SHA256 b4f198c0ce98f53227a9d8041d9138827471ca5543f724e91fb30b51db94da10 files/digest-kdemultimedia-3.4.2 73
 MD5 05ac286d8f93c4f275aa4cec809fb5a9 files/digest-kdemultimedia-3.4.3 73
-RMD160 0980cde95a4b1374dfe3d266b26c41861b3ae2cd files/digest-kdemultimedia-3.4.3 73
-SHA256 fd38c00fe48ae0b8ae9f5df74927d5ff51d616ba33d77e28dd70f9df31ce6069 files/digest-kdemultimedia-3.4.3 73
 MD5 c6f3f23fcb5a1fa806c5073f45b26b59 files/digest-kdemultimedia-3.5.2 265
-RMD160 5e81c0b91adc803bf7923ec3176b9ff50217ed22 files/digest-kdemultimedia-3.5.2 265
-SHA256 da5960a94d94974711cce49b9e15a2465e392feb2dd48db846adce8d9e02d864 files/digest-kdemultimedia-3.5.2 265
 MD5 c6f3f23fcb5a1fa806c5073f45b26b59 files/digest-kdemultimedia-3.5.2-r1 265
-RMD160 5e81c0b91adc803bf7923ec3176b9ff50217ed22 files/digest-kdemultimedia-3.5.2-r1 265
-SHA256 da5960a94d94974711cce49b9e15a2465e392feb2dd48db846adce8d9e02d864 files/digest-kdemultimedia-3.5.2-r1 265
+MD5 2aa29a9df2776295e706a66e3e3485d4 files/digest-kdemultimedia-3.5.2-r2 73
+MD5 0aacb785c8be1d7ee16a7fe69d4ff1c9 files/juk-3.5.2-do_not_use_gstreamer-0.10.diff 400
+MD5 843346e52d5bd259568adc2cd01e7612 files/juk-3.5.2-filerename.diff 477
 MD5 ab4383e2b9810696530127a0a5464bfc files/kdemultimedia-3.4-configure.patch 5211
-RMD160 5c3916b02411206806637b107bcf0f9f703c7cfc files/kdemultimedia-3.4-configure.patch 5211
-SHA256 8f101cbf2f37d5f99cdf4fdb5376be2315be2127d714d200d25d502c88feff11 files/kdemultimedia-3.4-configure.patch 5211
 MD5 b7a984a57c27e1e62a606d90d0c39437 files/kdemultimedia-3.4.0-amd64.patch 523
-RMD160 818db0ade15f6d1fd84331d000bdac0aaa63fb97 files/kdemultimedia-3.4.0-amd64.patch 523
-SHA256 37f7d3e1b2799e520e7fc490b68bba48ba3ee6c2c67f751e5b5f17140d959bc9 files/kdemultimedia-3.4.0-amd64.patch 523
 MD5 0ed594ab9238b688fca70c1959d3932e files/kdemultimedia-3.4.1-akode-hang.patch 653
-RMD160 8779e6a3d1a853867b0b33c849f79424c218c9f9 files/kdemultimedia-3.4.1-akode-hang.patch 653
-SHA256 69e031855da180e4915d4dae07559f9f33d62efaf5ec05e44cf7b2246969833d files/kdemultimedia-3.4.1-akode-hang.patch 653
 MD5 0af60268ec8424c72256db89062b6f31 files/kdemultimedia-64bit.patch 634
-RMD160 4b72fcf4253e201e3c0760fb34c3fdc4ca664d82 files/kdemultimedia-64bit.patch 634
-SHA256 19b133440b23f10ee54f11962f120f6d27c1720c87680506f2f028b1105d2e7b files/kdemultimedia-64bit.patch 634
 MD5 127d4cff1f95952f349c134f5b2cb861 kdemultimedia-3.3.2.ebuild 1757
-RMD160 d3cfc2b850b63f279df05130628c04efb78c625c kdemultimedia-3.3.2.ebuild 1757
-SHA256 6696e9fa10b1fcde27506aeef2daa179363493db4d915288458c0425f05bbe68 kdemultimedia-3.3.2.ebuild 1757
 MD5 c305a0f972bc6f69cdee9d818cdd431c kdemultimedia-3.4.1-r1.ebuild 1925
-RMD160 8d12962e009467e643b70d9a1f91cd790ff00294 kdemultimedia-3.4.1-r1.ebuild 1925
-SHA256 ecd9032e6ab6247f7c9d14d94bc3275777585e0d05defd0b982935443eecc938 kdemultimedia-3.4.1-r1.ebuild 1925
 MD5 3c278760391c3f291cc6b3ec5ef7c32b kdemultimedia-3.4.1.ebuild 1773
-RMD160 c9e4bba72d8f6def6edc5820f50f94aa818deb73 kdemultimedia-3.4.1.ebuild 1773
-SHA256 779171ee3a9a743007c97fc89a2c74a73f17fa2fb513d1f601587a32e9b6f413 kdemultimedia-3.4.1.ebuild 1773
 MD5 7b2b37aa321b64e715a57b9401ccd891 kdemultimedia-3.4.2.ebuild 2008
-RMD160 5b316b7d15e4008dcd7636604ddad30f504bef84 kdemultimedia-3.4.2.ebuild 2008
-SHA256 4bcb8e9346ce2d895e0bc89fc6110ccc4c07668fbf3f7761477d39fb75f171ae kdemultimedia-3.4.2.ebuild 2008
 MD5 d47c2bc5565e8dd0cd99eb9dee5d9723 kdemultimedia-3.4.3.ebuild 2016
-RMD160 238813088e1a2d45718759a85ec345fe37a228fd kdemultimedia-3.4.3.ebuild 2016
-SHA256 60ee40c5f90a6d64ba0c2409bc0e8fbc07ccefe83024218e86e5afd59ab5c730 kdemultimedia-3.4.3.ebuild 2016
 MD5 ff9ba3df7335338a5e9a65f187d54102 kdemultimedia-3.5.2-r1.ebuild 2260
-RMD160 27c630c73ce3ec1240c504744e0e2cc4712859da kdemultimedia-3.5.2-r1.ebuild 2260
-SHA256 773a0e2657dba9196ff6aacf5bdb108d578e2093d7da6c24a46fc3d27a77a329 kdemultimedia-3.5.2-r1.ebuild 2260
+MD5 e80a8649c396ea7b113fa381fc3128ad kdemultimedia-3.5.2-r2.ebuild 2913
 MD5 0c03cae32e413805e0d1e2cf0c9b7818 kdemultimedia-3.5.2.ebuild 2419
-RMD160 1db45e03b43e0f575a4aa5642babc89c812bf6e3 kdemultimedia-3.5.2.ebuild 2419
-SHA256 788b8e74d142f600ab8eb609d005b40c52809cb478c094f4ae04c459b7b7bba3 kdemultimedia-3.5.2.ebuild 2419
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
-SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFERUJPAiZjviIA2XgRAhX+AJ0Z+OLs27g7ixpkIV/GnYois7mJJACfbN7X
-tOI9hewVOPZhUHQgE5TlGuU=
-=d9lq
------END PGP SIGNATURE-----
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.5.2-r2 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.5.2-r2
new file mode 100644
index 000000000000..30dc34623f93
--- /dev/null
+++ b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.5.2-r2
@@ -0,0 +1 @@
+MD5 f98ef8465bf4de1eb36bc3bdb1f4f7d6 kdemultimedia-3.5.2.tar.bz2 6272386
diff --git a/kde-base/kdemultimedia/files/juk-3.5.2-do_not_use_gstreamer-0.10.diff b/kde-base/kdemultimedia/files/juk-3.5.2-do_not_use_gstreamer-0.10.diff
new file mode 100644
index 000000000000..fcc5afd0799c
--- /dev/null
+++ b/kde-base/kdemultimedia/files/juk-3.5.2-do_not_use_gstreamer-0.10.diff
@@ -0,0 +1,15 @@
+--- juk/configure.in.in.orig	2006-04-06 20:28:55.000000000 +0200
++++ juk/configure.in.in	2006-04-06 20:29:33.000000000 +0200
+@@ -59,9 +59,9 @@
+   	PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
+ 	export PKG_CONFIG_ALLOW_SYSTEM_LIBS
+ 
+-	GST_MAJORMINOR=0.10
+-	GST_REQ=0.10.0
+-	GST_VERSION=10
++	GST_MAJORMINOR=0.8
++	GST_REQ=0.8.0
++	GST_VERSION=8
+ 
+ 	PKG_CHECK_MODULES(GST, \
+ 		gstreamer-$GST_MAJORMINOR >= $GST_REQ, \
diff --git a/kde-base/kdemultimedia/files/juk-3.5.2-filerename.diff b/kde-base/kdemultimedia/files/juk-3.5.2-filerename.diff
new file mode 100644
index 000000000000..6a2d66d332b0
--- /dev/null
+++ b/kde-base/kdemultimedia/files/juk-3.5.2-filerename.diff
@@ -0,0 +1,11 @@
+--- juk/tagrenameroptions.cpp.orig	2006-04-05 17:08:35.000000000 +0200
++++ juk/tagrenameroptions.cpp	2006-04-05 17:08:59.000000000 +0200
+@@ -147,7 +147,7 @@
+ TagType TagRenamerOptions::tagFromCategoryText(const QString &text)
+ {
+     for(unsigned i = StartTag; i < NumTypes; ++i)
+-        if(tagTypeText(static_cast<TagType>(i), false) == text)
++        if(tagTypeText(static_cast<TagType>(i), true) == text)
+             return static_cast<TagType>(i);
+ 
+     return Unknown;
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.5.2-r2.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.5.2-r2.ebuild
new file mode 100644
index 000000000000..c5d63147424c
--- /dev/null
+++ b/kde-base/kdemultimedia/kdemultimedia-3.5.2-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.2-r2.ebuild,v 1.1 2006/05/05 14:53:02 carlo Exp $
+
+inherit kde-dist
+
+DESCRIPTION="KDE multimedia apps: noatun, kscd, juk..."
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa audiofile encode flac gstreamer mp3 musicbrainz theora vorbis xine"
+
+DEPEND="~kde-base/kdebase-${PV}
+	media-sound/cdparanoia
+	akode? ( media-libs/akode )
+	>=media-libs/taglib-1.2
+	audiofile? ( media-libs/audiofile )
+	xine? ( >=media-libs/xine-lib-1.0 )
+	alsa? ( media-libs/alsa-lib )
+	theora? ( media-libs/libtheora )
+	gstreamer? ( =media-libs/gstreamer-0.8*
+	             =media-libs/gst-plugins-0.8* )
+	musicbrainz? ( media-libs/tunepimp
+	               media-libs/musicbrainz )
+	encode? ( mp3? ( media-sound/lame )
+	          vorbis? ( media-sound/vorbis-tools )
+	          flac? ( media-libs/flac ) )
+	!arts? ( !gstreamer? ( media-libs/akode ) )"
+
+RDEPEND="${DEPEND}
+	gstreamer? ( mp3? ( =media-plugins/gst-plugins-mad-0.8* )
+		     vorbis? ( =media-plugins/gst-plugins-ogg-0.8*
+		               =media-plugins/gst-plugins-vorbis-0.8* )
+		     flac? ( =media-plugins/gst-plugins-flac-0.8* ) )"
+
+DEPEND="${DEPEND}
+	dev-util/pkgconfig"
+
+PATCHES="${FILESDIR}/artsplugin-akode-${PV}-memleak.patch
+	${FILESDIR}/juk-3.5.2-filerename.diff
+	${FILESDIR}/juk-3.5.2-do_not_use_gstreamer-0.10.diff"
+
+pkg_setup() {
+	if ! use arts && ! use gstreamer && ! use akode ; then
+		ewarn "No audio backend chosen. Defaulting to media-libs/akode."
+	fi
+}
+
+src_compile() {
+	local myconf="--with-cdparanoia --with-taglib
+	              --with-akode $(use_with alsa)
+	              $(use_with audiofile) $(use_with gstreamer)
+	              $(use_with xine) $(use_with theora)
+	              $(use_with musicbrainz)"
+
+	# encoding can happen through:
+	# - kio_audiocd (based on libflac for flac,
+	#   on libvorbis for vorbis, on the lame binary for mp3)
+	# - kaudiocreator (based on the flac binary for flac,
+	#   on the lame binary for mp3, on the oggenc binary for vorbis)
+	# - krec (based on libvorbis for vorbis,
+	#   on libmp3lame for mp3)
+	if use encode; then
+		myconf="${myconf} $(use_with mp3 lame)
+	                $(use_with vorbis) $(use_with flac)"
+	else
+		myconf="${myconf} --without-lame
+	                --without-vorbis --without-flac"
+	fi
+
+	if ! use arts && ! use gstreamer ; then
+		myconf="${myconf} --with-akokde"
+	else
+		if ! use akode ; then
+			# work around broken configure
+			export include_akode_ffmpeg_FALSE='#'
+			export include_akode_mpc_FALSE='#'
+			export include_akode_mpeg_FALSE='#'
+			export include_akode_xiph_FALSE='#'
+		fi
+		myconf="${myconf} $(use_with akode)"
+	fi
+
+	# Not used anymore and scheduled for removal.
+	export DO_NOT_COMPILE="${DO_NOT_COMPILE} mpeglib mpeglib_artsplug"
+
+	rm configure
+	kde_src_compile
+}