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

Package-Manager: portage-2203-svn

5 files changed, 93 insertions, 1 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/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
+}