Revised dependencies. Make the file renamer dialog work with non-english locale. Assure building against GStreamer 0.8.

(Portage version: 2203-svn)

6 files changed, 98 insertions, 34 deletions

diff --git a/kde-base/juk/ChangeLog b/kde-base/juk/ChangeLog
index 2421fbb9f801..7b7c7ea6630f 100644
--- a/kde-base/juk/ChangeLog
+++ b/kde-base/juk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/juk
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/ChangeLog,v 1.46 2006/04/06 00:53:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/ChangeLog,v 1.47 2006/05/01 13:53:51 carlo Exp $
+
+*juk-3.5.2-r1 (01 May 2006)
+
+  01 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, +juk-3.5.2-r1.ebuild:
+  Revised dependencies. Make the file renamer dialog work with non-english
+  locale. Assure building against GStreamer 0.8.
 
   05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> -juk-3.5.0.ebuild,
   -juk-3.5.1.ebuild:
diff --git a/kde-base/juk/Manifest b/kde-base/juk/Manifest
index 3eb2cb9286dc..5b945fb4456a 100644
--- a/kde-base/juk/Manifest
+++ b/kde-base/juk/Manifest
@@ -1,43 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a8e59ec30c10441f13a2b8bd8aa1c803 ChangeLog 5911
-RMD160 e1b196f07ccc94ebc9c51322e4b970b56527805e ChangeLog 5911
-SHA256 4f02a9493bb4007b83ffded4192e325c44486434c74e5b039c8735e5cc0e5ab2 ChangeLog 5911
+MD5 478355c91fde35cf21cdc15366a7a57a ChangeLog 6223
 MD5 4fdb0ffd65dc5bbcb439ea875a4f1ba6 files/configure-fix-kdemultimedia-juk.patch 4482
-RMD160 97af91f57e65f343a0cb925877a70721f9d9e8e0 files/configure-fix-kdemultimedia-juk.patch 4482
-SHA256 4339266f2d643102f823531eaa5b1740f30edf5059d1c5c7b85cbb7c180ee517 files/configure-fix-kdemultimedia-juk.patch 4482
 MD5 5503be4dfa64fd0d3bf2165747a97fb0 files/digest-juk-3.4.1 227
-RMD160 58f8a5f7fe31a86b0b07163b26bef37f1c7d10a2 files/digest-juk-3.4.1 227
-SHA256 80b474a3df150d09f2cf2fb08f5d774eb58d5067a71e26fcce28f19ce7566e18 files/digest-juk-3.4.1 227
 MD5 453075362e3201c7f44fea430afec5d5 files/digest-juk-3.4.2 308
-RMD160 03e80242eb73c2690f95be4858f7cd0c56b704d3 files/digest-juk-3.4.2 308
-SHA256 3dba31aa5797928f27277e557b7be0f817e963596cad4a4332ab534d62d48efa files/digest-juk-3.4.2 308
 MD5 05ac286d8f93c4f275aa4cec809fb5a9 files/digest-juk-3.4.3 73
-RMD160 0980cde95a4b1374dfe3d266b26c41861b3ae2cd files/digest-juk-3.4.3 73
-SHA256 fd38c00fe48ae0b8ae9f5df74927d5ff51d616ba33d77e28dd70f9df31ce6069 files/digest-juk-3.4.3 73
 MD5 c6f3f23fcb5a1fa806c5073f45b26b59 files/digest-juk-3.5.2 265
-RMD160 5e81c0b91adc803bf7923ec3176b9ff50217ed22 files/digest-juk-3.5.2 265
-SHA256 da5960a94d94974711cce49b9e15a2465e392feb2dd48db846adce8d9e02d864 files/digest-juk-3.5.2 265
+MD5 2aa29a9df2776295e706a66e3e3485d4 files/digest-juk-3.5.2-r1 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 12b3c5e77687d1ffabc038b18677ac13 juk-3.4.1.ebuild 1085
-RMD160 f3a3174ef6c0fe880868568c7512436f82ddd661 juk-3.4.1.ebuild 1085
-SHA256 281aeeab095a407feadde5902f81dce1089e84293a0cb5eecbb9a00b76e6254d juk-3.4.1.ebuild 1085
 MD5 69af012da6b62027584d853f2d619e37 juk-3.4.2.ebuild 1275
-RMD160 7b94f1dd59b34eff2497fc29b718932790f6001c juk-3.4.2.ebuild 1275
-SHA256 7a5ff290bf14cceda163fb1fb9af0d02c9417207b123e74e2eb50b98e7f993ef juk-3.4.2.ebuild 1275
 MD5 c53523738995fa9da492ec22fbe15a64 juk-3.4.3.ebuild 1275
-RMD160 19ab22c148c54167f739126b33f06edaf3b996e4 juk-3.4.3.ebuild 1275
-SHA256 ebf5f71f1f6b39bb9987f2a7948621d32caad58003992279a5e07af41edf8925 juk-3.4.3.ebuild 1275
+MD5 4f8a07962032907b2342585e56e9360a juk-3.5.2-r1.ebuild 1718
 MD5 8018b2069bee2c8232568da5bb48a164 juk-3.5.2.ebuild 1221
-RMD160 ba327f1b9e6efcd1bfd9e21e45236fbf0213b78a juk-3.5.2.ebuild 1221
-SHA256 c40bf6d5282278fe1fd227ed4e62ae93da69af9e467acbe09b7009244f784b6e juk-3.5.2.ebuild 1221
 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)
-
-iD8DBQFENGYMAiZjviIA2XgRAgQxAJ0T13wYeyJe6mydN8pE51IdOkD6lQCg43/4
-OH9h2B709xfE/aZvFZStQrQ=
-=h9Mq
------END PGP SIGNATURE-----
diff --git a/kde-base/juk/files/digest-juk-3.5.2-r1 b/kde-base/juk/files/digest-juk-3.5.2-r1
new file mode 100644
index 000000000000..30dc34623f93
--- /dev/null
+++ b/kde-base/juk/files/digest-juk-3.5.2-r1
@@ -0,0 +1 @@
+MD5 f98ef8465bf4de1eb36bc3bdb1f4f7d6 kdemultimedia-3.5.2.tar.bz2 6272386
diff --git a/kde-base/juk/files/juk-3.5.2-do_not_use_gstreamer-0.10.diff b/kde-base/juk/files/juk-3.5.2-do_not_use_gstreamer-0.10.diff
new file mode 100644
index 000000000000..fcc5afd0799c
--- /dev/null
+++ b/kde-base/juk/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/juk/files/juk-3.5.2-filerename.diff b/kde-base/juk/files/juk-3.5.2-filerename.diff
new file mode 100644
index 000000000000..6a2d66d332b0
--- /dev/null
+++ b/kde-base/juk/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/juk/juk-3.5.2-r1.ebuild b/kde-base/juk/juk-3.5.2-r1.ebuild
new file mode 100644
index 000000000000..4c52263dcea2
--- /dev/null
+++ b/kde-base/juk/juk-3.5.2-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/juk-3.5.2-r1.ebuild,v 1.1 2006/05/01 13:53:51 carlo Exp $
+
+KMNAME=kdemultimedia
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="Jukebox and music manager for KDE"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="akode flac gstreamer mp3 vorbis musicbrainz"
+
+DEPEND="media-libs/taglib
+	musicbrainz? ( 	media-libs/tunepimp
+			media-libs/musicbrainz )
+	gstreamer? ( =media-libs/gstreamer-0.8*
+	             =media-libs/gst-plugins-0.8* )
+	akode? ( media-libs/akode )
+	!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* ) )"
+
+KMEXTRACTONLY="arts/configure.in.in"
+
+PATCHES="${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="$(use_with gstreamer) $(use_with musicbrainz)"
+
+	export include_akode_mpeg_FALSE='#'
+	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
+
+	kde-meta_src_compile
+}