Revision bump: add patch to fix lyrc script, thanks to Jan Spitalnik in bug #166050 and add a python useflag to depend on PyQT as per bug #179472.

(Portage version: 2.1.2.9)

4 files changed, 119 insertions, 1 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 880751a53132..f86888e1dc48 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.215 2007/06/07 16:30:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.216 2007/06/07 19:59:08 flameeyes Exp $
+
+*amarok-1.4.5-r2 (07 Jun 2007)
+
+  07 Jun 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.4.5-lyrc-script.patch, +amarok-1.4.5-r2.ebuild:
+  Revision bump: add patch to fix lyrc script, thanks to Jan Spitalnik in bug
+  #166050 and add a python useflag to depend on PyQT as per bug #179472.
 
   07 Jun 2007; Diego Pettenò <flameeyes@gentoo.org> metadata.xml,
   -amarok-1.4.4-r3.ebuild:
diff --git a/media-sound/amarok/amarok-1.4.5-r2.ebuild b/media-sound/amarok/amarok-1.4.5-r2.ebuild
new file mode 100644
index 000000000000..8270aeedbbd5
--- /dev/null
+++ b/media-sound/amarok/amarok-1.4.5-r2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.5-r2.ebuild,v 1.1 2007/06/07 19:59:08 flameeyes Exp $
+
+LANGS="af ar az bg br ca cs cy da de el en_GB es et fa fi fr ga gl he
+hi hu is it ja ka km ko lt ms nb nl nn pa pl pt pt_BR ro ru rw se sk
+sl sq sr sr@Latn sv ta tg th tr uk uz zh_CN zh_TW"
+LANGS_DOC="da de es et fr it nl pl pt pt_BR ru sv"
+
+USE_KEG_PACKAGING=1
+
+inherit kde eutils flag-o-matic
+
+PKG_SUFFIX=""
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${P/_/-}"
+
+DESCRIPTION="Advanced audio player based on KDE framework."
+HOMEPAGE="http://amarok.kde.org/"
+
+SRC_URI="mirror://kde/stable/amarok/${PV}/src/${MY_P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="aac kde mysql noamazon opengl postgres
+visualization ipod ifp real njb mtp musicbrainz daap
+python"
+# kde: enables compilation of the konqueror sidebar plugin
+
+RDEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
+	>=media-libs/xine-lib-1.1.2_pre20060328-r8
+	>=media-libs/taglib-1.4
+	mysql? ( >=virtual/mysql-4.0 )
+	postgres? ( dev-db/libpq )
+	opengl? ( virtual/opengl )
+	visualization? ( media-libs/libsdl
+					 =media-plugins/libvisual-plugins-0.4* )
+	ipod? ( >=media-libs/libgpod-0.4.2 )
+	aac? ( media-libs/libmp4v2 )
+	ifp? ( media-libs/libifp )
+	real? ( media-video/realplayer )
+	njb? ( >=media-libs/libnjb-2.2.4 )
+	mtp? ( >=media-libs/libmtp-0.1.1 )
+	musicbrainz? ( media-libs/tunepimp )
+	=dev-lang/ruby-1.8*"
+
+DEPEND="${RDEPEND}"
+
+RDEPEND="${RDEPEND}
+	app-arch/unzip
+	python? ( dev-python/PyQt )
+	daap? ( www-servers/mongrel )"
+
+PATCHES="${FILESDIR}/${P}-magnatune.patch
+	${FILESDIR}/${P}-lyrc-script.patch"
+
+need-kde 3.3
+
+src_compile() {
+	# Extra, unsupported engines are forcefully disabled.
+	local myconf="$(use_enable mysql) $(use_enable postgres postgresql)
+				  $(use_with opengl) --without-xmms
+				  $(use_with visualization libvisual)
+				  $(use_enable !noamazon amazon)
+				  $(use_with ipod libgpod)
+				  $(use_with aac mp4v2)
+				  $(use_with ifp)
+				  $(use_with real helix)
+				  $(use_with njb libnjb)
+				  $(use_with mtp libmtp)
+				  $(use_with musicbrainz)
+				  $(use_with daap)
+				  --with-xine
+				  --without-mas
+				  --without-nmm"
+
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+
+	# As much as I respect Ian, I'd rather leave Amarok to use mongrel
+	# from Portage, for security and policy reasons.
+	rm -rf "${D}"/usr/share/apps/amarok/ruby_lib/rbconfig \
+		"${D}"/usr/share/apps/amarok/ruby_lib/mongrel* \
+		"${D}"/usr/share/apps/amarok/ruby_lib/rubygems* \
+		"${D}"/usr/share/apps/amarok/ruby_lib/gem* \
+		"${D}"/usr/$(get_libdir)/ruby_lib
+
+	if ! use python; then
+		rm -r "${D}"/usr/share/apps/amarok/scripts/webcontrol \
+			|| die "Unable to remove webcontrol."
+	fi
+}
diff --git a/media-sound/amarok/files/amarok-1.4.5-lyrc-script.patch b/media-sound/amarok/files/amarok-1.4.5-lyrc-script.patch
new file mode 100644
index 000000000000..ed31fd8f6a5a
--- /dev/null
+++ b/media-sound/amarok/files/amarok-1.4.5-lyrc-script.patch
@@ -0,0 +1,11 @@
+--- amarok-1.4.5/amarok/src/scripts/lyrics_lyrc/lyrics_lyrc.rb.orig	2007-02-07 14:19:43.000000000 +0100
++++ amarok-1.4.5/amarok/src/scripts/lyrics_lyrc/lyrics_lyrc.rb	2007-02-09 11:43:12.000000000 +0100
+@@ -112,7 +112,7 @@ def fetchLyrics( artist, title, url )
+     proxy_host = nil
+     proxy_port = nil
+     if ( @proxy == nil )
+-        @proxy = `dcop amarok script proxyForUrl #{@page_url.shellquote}"`
++        @proxy = `dcop amarok script proxyForUrl #{@page_url.shellquote}`
+     end
+     proxy_uri = URI.parse( @proxy )
+     if ( proxy_uri.class != URI::Generic )
diff --git a/media-sound/amarok/files/digest-amarok-1.4.5-r2 b/media-sound/amarok/files/digest-amarok-1.4.5-r2
new file mode 100644
index 000000000000..d3825a8bef40
--- /dev/null
+++ b/media-sound/amarok/files/digest-amarok-1.4.5-r2
@@ -0,0 +1,3 @@
+MD5 1dac1cb5ac9c9cdabdab5f69b39e92c8 amarok-1.4.5.tar.bz2 18034110
+RMD160 c2bbfe06f3e613dfc7d3926d086024073390c712 amarok-1.4.5.tar.bz2 18034110
+SHA256 45aa7cafe2a46dd988cd5034ae19da988926eecb2ac90d3e6912c57e558108c8 amarok-1.4.5.tar.bz2 18034110