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.

Package-Manager: portage-2.1.2.9

5 files changed, 137 insertions, 8 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/Manifest b/media-sound/amarok/Manifest
index 490264854a31..2cc9b23da53d 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -5,6 +5,10 @@ AUX amarok-1.4.4+libgpod-0.4.0.patch 2738 RMD160 2e6a44eabe8691c209a3beba5764fa9
 MD5 2b0195629a6a2b52f22db726bc59cd2f files/amarok-1.4.4+libgpod-0.4.0.patch 2738
 RMD160 2e6a44eabe8691c209a3beba5764fa9ca59aa43c files/amarok-1.4.4+libgpod-0.4.0.patch 2738
 SHA256 8def3879b8adb5e2e32d4b4f724d4dd2d896791f6cbe99d5fffcb3f128b26b26 files/amarok-1.4.4+libgpod-0.4.0.patch 2738
+AUX amarok-1.4.5-lyrc-script.patch 572 RMD160 e96b751f43dcd354e950431da7a73ee1cf5412cb SHA1 de0e098464d6076feb61b544605c8f7a24a2b29a SHA256 a4235698e9eac8292e336b9ad463f42691b019ba8be22cd4ec255e2bd21c4d6b
+MD5 db1ae0ee333309316864fd68efba85d5 files/amarok-1.4.5-lyrc-script.patch 572
+RMD160 e96b751f43dcd354e950431da7a73ee1cf5412cb files/amarok-1.4.5-lyrc-script.patch 572
+SHA256 a4235698e9eac8292e336b9ad463f42691b019ba8be22cd4ec255e2bd21c4d6b files/amarok-1.4.5-lyrc-script.patch 572
 AUX amarok-1.4.5-magnatune.patch 873 RMD160 f9d68fce79b228c8eb894442a95447dbaec0179b SHA1 aacd742d79b91d19ab68edd5a38d1dd08459c7b9 SHA256 96848937bffca80b2e9eb338e4581b7600ee2957f26a32291b5337fffb04cfb9
 MD5 7a108e4a750077b5bd606cb4dd6947ee files/amarok-1.4.5-magnatune.patch 873
 RMD160 f9d68fce79b228c8eb894442a95447dbaec0179b files/amarok-1.4.5-magnatune.patch 873
@@ -14,14 +18,18 @@ EBUILD amarok-1.4.5-r1.ebuild 2635 RMD160 1596fd3f4af7b1dd6bc0a19b21a9ee8a9a86fe
 MD5 198ee7a8434a6d6ec28d80ace8103685 amarok-1.4.5-r1.ebuild 2635
 RMD160 1596fd3f4af7b1dd6bc0a19b21a9ee8a9a86fedd amarok-1.4.5-r1.ebuild 2635
 SHA256 b0dce117d925fe2551da8cfbcc27b92f60f210794c2476d396fdd7d07a890f19 amarok-1.4.5-r1.ebuild 2635
+EBUILD amarok-1.4.5-r2.ebuild 2841 RMD160 ef6f04be2d8d46d53cc4f6862c5b82ed3888ce9f SHA1 7381f396c4e22c2ffd4f4217efb9e10465e5c085 SHA256 4d404a37233107074b951537020f50b92d457ba6f0424dbb93e7160d7a09b7a7
+MD5 8fe3013afaf86cfa9af703a14d149728 amarok-1.4.5-r2.ebuild 2841
+RMD160 ef6f04be2d8d46d53cc4f6862c5b82ed3888ce9f amarok-1.4.5-r2.ebuild 2841
+SHA256 4d404a37233107074b951537020f50b92d457ba6f0424dbb93e7160d7a09b7a7 amarok-1.4.5-r2.ebuild 2841
 EBUILD amarok-9999-r1.ebuild 2753 RMD160 eeb8c4016feb305a447c7757e292a0ef21ae2c9b SHA1 89e35931ee077d1557618993d5c9f18cbed98a9b SHA256 e9876a6ba0782965217a86820b8536bd6537673d2dc36b27e4515b5e6d303f7e
 MD5 c116c2eb572ee0f17dc0028e1f26598e amarok-9999-r1.ebuild 2753
 RMD160 eeb8c4016feb305a447c7757e292a0ef21ae2c9b amarok-9999-r1.ebuild 2753
 SHA256 e9876a6ba0782965217a86820b8536bd6537673d2dc36b27e4515b5e6d303f7e amarok-9999-r1.ebuild 2753
-MISC ChangeLog 35328 RMD160 2ad96b2001dfd328520dd115c0aea0a1309453e6 SHA1 2aa59d6370ebb5b6bfeae82cfe0f2732cf08475f SHA256 5c3b11d280c22768835fb0f27b6641efa18d398bad87fd3fa16c93fd77596e88
-MD5 03c270b58e211ad2b0a49639c479b614 ChangeLog 35328
-RMD160 2ad96b2001dfd328520dd115c0aea0a1309453e6 ChangeLog 35328
-SHA256 5c3b11d280c22768835fb0f27b6641efa18d398bad87fd3fa16c93fd77596e88 ChangeLog 35328
+MISC ChangeLog 35631 RMD160 1f6eeba48c6c53025a168421ad2eaceb887c20cb SHA1 cab316140e9a5ab09eeee4aa4126f0395af7a4d0 SHA256 fb361ab4f55978214cd91f2398b948676778e414a842e93f2cbfca9be4a3ef58
+MD5 2a58fbe800af40a627b7b5675c917167 ChangeLog 35631
+RMD160 1f6eeba48c6c53025a168421ad2eaceb887c20cb ChangeLog 35631
+SHA256 fb361ab4f55978214cd91f2398b948676778e414a842e93f2cbfca9be4a3ef58 ChangeLog 35631
 MISC metadata.xml 278 RMD160 69d1ffb637c604d94508afaf7428a9483f6ee881 SHA1 003ec39d3802862e92547cfd058de6a86a2696d4 SHA256 6ab2a5bf2864cdb1536513678c8f93fb81dc0c55c4ba26b585a97e281f5c4a75
 MD5 56c49c4a013438dddcf7405055d39ff8 metadata.xml 278
 RMD160 69d1ffb637c604d94508afaf7428a9483f6ee881 metadata.xml 278
@@ -29,13 +37,16 @@ SHA256 6ab2a5bf2864cdb1536513678c8f93fb81dc0c55c4ba26b585a97e281f5c4a75 metadata
 MD5 800f0767daa0ef9fe4ab838f9417e389 files/digest-amarok-1.4.5-r1 247
 RMD160 193cf84cab415ad5adeed61993a76209cecd9f3c files/digest-amarok-1.4.5-r1 247
 SHA256 2588dc180c448a480698e60949cbecff302cbd3a56db2e98120ceca137759bbd files/digest-amarok-1.4.5-r1 247
+MD5 800f0767daa0ef9fe4ab838f9417e389 files/digest-amarok-1.4.5-r2 247
+RMD160 193cf84cab415ad5adeed61993a76209cecd9f3c files/digest-amarok-1.4.5-r2 247
+SHA256 2588dc180c448a480698e60949cbecff302cbd3a56db2e98120ceca137759bbd files/digest-amarok-1.4.5-r2 247
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-amarok-9999-r1 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-amarok-9999-r1 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-amarok-9999-r1 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGaDK+AiZjviIA2XgRAmNbAJ48AuikMumL/MjJ62kjxE38LaJniQCgkuIW
-al4x0MWukxmru5wx6HTH89g=
-=vRi9
+iD8DBQFGaGOTAiZjviIA2XgRAjO7AKCcVZ9VOfhcJuWyy4cl454UV/+qjQCfYPVl
+02xpaFlr3+uk3zTVgygrX+o=
+=dDmd
 -----END PGP SIGNATURE-----
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