Sync to stable branch, fixing bug #256389. Desktop entry fixes.

Package-Manager: portage-2.2_rc23/cvs/Linux i686

4 files changed, 223 insertions, 2 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 938edaec814b..afba39e7c87c 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.300 2009/01/25 22:17:57 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.301 2009/01/30 15:35:30 carlo Exp $
+
+*amarok-1.4.10_p20090130-r1 (30 Jan 2009)
+*amarok-1.4.10_p20090130 (30 Jan 2009)
+
+  30 Jan 2009; Carsten Lohrke <carlo@gentoo.org>
+  +amarok-1.4.10_p20090130.ebuild, +amarok-1.4.10_p20090130-r1.ebuild:
+  Sync to stable branch, fixing bug #256389. Desktop entry fixes.
 
   25 Jan 2009; <jokey@gentoo.org> amarok-2.0.1.1.ebuild:
   Revert keyword per #gentoo-dev talk
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 531ee2423df8..5ee2ed623a7e 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -3,16 +3,19 @@ AUX amarok-1.4.7+xine-lib-1.1.8-lastfm.patch 808 RMD160 fcf33e066734fdf14b5b2542
 AUX amarok-1.4.7-svn148317.patch 538 RMD160 088c06869d98f2bc9de83a8e9e39d0026bc74db1 SHA1 f66e14a0273e68caf9ceb40b8475d35c32bc04e5 SHA256 f159099ec72687ad306c4d386336f0864b4510d5c5b09026cd31401c3ade23ae
 AUX amarok-1.4.9.1-helix+gcc-4.3.patch 435 RMD160 2ebf5155e052d90e027d207820bd4328b75014ea SHA1 af9169a7dd9df1598099acea2e84310d1ec9b1bb SHA256 b35b0c42d19d48fda2385962aeaa132b2cf659ddeebcadc5eae3f6dfe7e44894
 AUX amarok-1.4.9.1-libmtp-0.3.0-API.patch 1912 RMD160 475852fde4ad1e27cc093d9435a4b525492e0156 SHA1 b211ad82d9abc49dd3a51260ba597cfaa78d9f6b SHA256 87583a40c4e13eae7a5364dc5b98dd83885c216e662c05c4de7c1de9739f6d9c
+DIST amarok-1.4.10-post20090130.diff.tar.bz2 4050 RMD160 e1b871213d7658081ffd396a1a208f97c3f10752 SHA1 8aa7492e91529ce1e01f3d2ee8183b7d7da7cb83 SHA256 64924546008abf88f7f776b27afe3de539defcd212c79c62c6abd90a7174dbe0
 DIST amarok-1.4.10.tar.bz2 12812583 RMD160 f86c71dd0459e0cf1ff586cd6de240ca6501cf62 SHA1 cb0bebe99c6f4dc1b01601f2f3aee3a86da08fbd SHA256 4b28f86e81447b94d33c35aa0cff65d59d85da74fde2a86c5c7862c048509c9b
 DIST amarok-1.4.8.tar.bz2 12699378 RMD160 b557f6f5f14c304ae82c8d5537263ecc1faa922e SHA1 8051efa40483271fe6b7d229da9b4d7af3142348 SHA256 12877e60dc5a362e37dc4c775cc809ce8e5a15c13211902f6a821f238a45aae5
 DIST amarok-1.4.9.1.tar.bz2 12707926 RMD160 9f6e59116292bd33e10c0245bfdbd3a2df319765 SHA1 5473c7d578a4bf2662f977d9239ff0066ee8f159 SHA256 c4a02c3267cd5f3a9ff9efa066f1e0308c2cd903be2d5b24e3d9f75abdc1fa93
 DIST amarok-2.0.1.1.tar.bz2 5012905 RMD160 d7d159d5407231f787397b0bbc57623ebcc75785 SHA1 235ff1b62c10f2bb8cb30fb256fcdd3704a132d7 SHA256 905a4b4344ddee5f77c0e158c2a28e4d282a3dc93cff635c6ff10ddac86c0f2b
 EBUILD amarok-1.4.10-r1.ebuild 3092 RMD160 d70b9dccb9cd14e582697d80f419e9cc8d112560 SHA1 6b9a31df3f2ceaaa413ba06d55b865f0149426b0 SHA256 e9295d57260f7c1b063175197770c3e0a42f1a09ec339c2aee056e50aff31811
 EBUILD amarok-1.4.10.ebuild 3030 RMD160 2e72e10285e8d56932740ca1ac2f2805c9be46aa SHA1 449b3a6bb442d1cd9565fa197d2889d447af8156 SHA256 29b55d449f20700ae756b6deddea68b38f3e1bd262374f665e9018aaa18cfe43
+EBUILD amarok-1.4.10_p20090130-r1.ebuild 3061 RMD160 8bc91dc1579270f4d6f6acbf071bdf5f9c406747 SHA1 8e0ce1baafa05af31e9f0d34028a361381c9d41b SHA256 2d585d730ad84f43d8a8895347c1a0a90372544244bb86a3eb6856fab73cf59b
+EBUILD amarok-1.4.10_p20090130.ebuild 3004 RMD160 af33d54c5b8b99c35c65cae3446b5603d2578b6e SHA1 6c324ac91e3bf1e0e6546fca2ea9df648f69e280 SHA256 5b9b44d340ae9b1a5f5e6b8bf2d04ace3bf69100b545c2416d35f4138e5f28fa
 EBUILD amarok-1.4.8.ebuild 3195 RMD160 ae0a14b0ab7ecaed2de15710bbb8ca7127e4cbc8 SHA1 25a2eb100c29203cb3713e66bf25e5bb2c6d2a4a SHA256 1d56cc2d878de0e7d9afd2c89163a0f221f3c56e3f9c3725d3fe8884a30c19c8
 EBUILD amarok-1.4.9.1-r1.ebuild 3069 RMD160 410163fa1d2049988d3f00c7c86a9eb70b2f1013 SHA1 069b89e7f2320c5280b2862f7bd301a59a9ca7c1 SHA256 173d1a12c7f4d482b173a88d841ae66418fde82854de89cf723775d8b2f05642
 EBUILD amarok-1.4.9.1.ebuild 3016 RMD160 0e525e2ee81f4394ab4989dcca5e3d6d55caa606 SHA1 33474fdd4b643a11d50ec65ebeaebe765ce166a3 SHA256 70c548c4a9c362a682bc25021f818df72622918fcfc57d6ce3f3529af3745fbe
 EBUILD amarok-1.4.9999-r2.ebuild 2968 RMD160 ccdac64d981d96b28355906009cd37fb89ce36b0 SHA1 8530f914a80ac7d988981f996ebcb09055017995 SHA256 f3d3a1311d4614ce983e984fd6b589fcf5027fcb16b47234646b7eb2814e5941
 EBUILD amarok-2.0.1.1.ebuild 2822 RMD160 2045f50838db6b934f6d9249c2f2eb7e4d721620 SHA1 751472961a93432ce4ba53177a506d81b4648681 SHA256 943cff09ca8d1838d325b61289e14c51266ec7a8d55661a6f3b02e61736d8006
-MISC ChangeLog 48591 RMD160 fcfd2c616db115a6d73eafee1063f3c4aee8eec6 SHA1 90932edeaa0af1e501d8da8a0ba0fa4678f5b0bd SHA256 11d9b89a6ab62f0cd4f15ef108c2993fab8962bf3714689e3e8021a5cfd8f7ea
+MISC ChangeLog 48860 RMD160 fde1c54c4c81e332aab8daf4b3a339ba0a72438b SHA1 bfb5f67cd3ad27b4a8c5bf334d7869c000945ba1 SHA256 b3fe6777e5d14ca37cd3ceeba442fd2d38ddd7c12abebbc1c298568328551229
 MISC metadata.xml 2332 RMD160 4425c1a9dceeb8ee9d6418ab45ea5f65df4d8e3a SHA1 4ba5bd1734487b1954ecc0bbc1177b3ac044ddaa SHA256 881960810a5d4b5170ed1e3641f6b54c3ee45312b1d6fa11e20a7af60eaf3f0f
diff --git a/media-sound/amarok/amarok-1.4.10_p20090130-r1.ebuild b/media-sound/amarok/amarok-1.4.10_p20090130-r1.ebuild
new file mode 100644
index 000000000000..f00d7daf5d79
--- /dev/null
+++ b/media-sound/amarok/amarok-1.4.10_p20090130-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.10_p20090130-r1.ebuild,v 1.1 2009/01/30 15:35:30 carlo Exp $
+
+ARTS_REQUIRED="never"
+
+LANGS="af ar az be bg bn br ca cs cy da de el en_GB eo es et eu fa fi
+fr ga gl he hi hu id is it ja km ko ku lo lt mk ms nb nds ne nl nn pa
+pl pt pt_BR ro ru rw se sk sl sq sr sr@Latn ss 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
+
+PKG_SUFFIX=""
+
+MY_P="${P/_*/}"
+S="${WORKDIR}/${MY_P}"
+
+SRC_URI="mirror://kde/stable/amarok/${PV/_*/}/src/${MY_P}.tar.bz2
+	mirror://gentoo/amarok-1.4.10-post20090130.diff.tar.bz2"
+
+DESCRIPTION="Advanced audio player based on KDE framework."
+HOMEPAGE="http://amarok.kde.org/"
+
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="mp4 kde mysql amazon opengl postgres
+visualization ipod ifp real njb mtp musicbrainz daap
+python"
+# kde: enables compilation of the konqueror sidebar plugin
+
+RDEPEND="kde? ( || ( =kde-base/konqueror-3.5* =kde-base/kdebase-3.5* ) )
+	>=media-libs/xine-lib-1.1.2_pre20060328-r8
+	>=media-libs/taglib-1.4
+	mysql? ( >=virtual/mysql-4.0 )
+	postgres? ( virtual/postgresql-base )
+	opengl? ( virtual/opengl )
+	visualization? ( media-libs/libsdl
+		=media-plugins/libvisual-plugins-0.4* )
+	ipod? ( >=media-libs/libgpod-0.5.2 )
+	mp4? ( media-libs/libmp4v2 )
+	ifp? ( media-libs/libifp )
+	real? (
+		media-video/realplayer
+		media-libs/alsa-lib )
+	njb? ( >=media-libs/libnjb-2.2.4 )
+	mtp? ( >=media-libs/libmtp-0.3.0 )
+	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}/amarok-1.4.9.1-libmtp-0.3.0-API.patch"
+	"${FILESDIR}/amarok-1.4.10-gcc-4.3.patch"
+	"${WORKDIR}/amarok-1.4.10-post20090130.diff"
+	"${WORKDIR}/amarok-1.4.10-desktop-entry.diff" )
+
+need-kde 3.5
+
+src_compile() {
+	# Extra, unsupported engines are forcefully disabled.
+	local myconf="$(use_enable mysql) $(use_enable postgres postgresql)
+				  $(use_with opengl)
+				  $(use_with visualization libvisual)
+				  $(use_enable amazon)
+				  $(use_with ipod libgpod)
+				  $(use_with mp4 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-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/amarok-1.4.10_p20090130.ebuild b/media-sound/amarok/amarok-1.4.10_p20090130.ebuild
new file mode 100644
index 000000000000..2b35efccdac7
--- /dev/null
+++ b/media-sound/amarok/amarok-1.4.10_p20090130.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.10_p20090130.ebuild,v 1.1 2009/01/30 15:35:30 carlo Exp $
+
+ARTS_REQUIRED="never"
+
+LANGS="af ar az be bg bn br ca cs cy da de el en_GB eo es et eu fa fi
+fr ga gl he hi hu id is it ja km ko ku lo lt mk ms nb nds ne nl nn pa
+pl pt pt_BR ro ru rw se sk sl sq sr sr@Latn ss 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
+
+PKG_SUFFIX=""
+
+MY_P="${P/_*/}"
+S="${WORKDIR}/${MY_P}"
+
+SRC_URI="mirror://kde/stable/amarok/${PV/_*/}/src/${MY_P}.tar.bz2
+	mirror://gentoo/amarok-1.4.10-post20090130.diff.tar.bz2"
+
+DESCRIPTION="Advanced audio player based on KDE framework."
+HOMEPAGE="http://amarok.kde.org/"
+
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="mp4 kde mysql amazon opengl postgres
+visualization ipod ifp real njb mtp musicbrainz daap
+python"
+# kde: enables compilation of the konqueror sidebar plugin
+
+RDEPEND="kde? ( || ( =kde-base/konqueror-3.5* =kde-base/kdebase-3.5* ) )
+	>=media-libs/xine-lib-1.1.2_pre20060328-r8
+	>=media-libs/taglib-1.4
+	mysql? ( >=virtual/mysql-4.0 )
+	postgres? ( virtual/postgresql-base )
+	opengl? ( virtual/opengl )
+	visualization? ( media-libs/libsdl
+		=media-plugins/libvisual-plugins-0.4* )
+	ipod? ( >=media-libs/libgpod-0.5.2 )
+	mp4? ( media-libs/libmp4v2 )
+	ifp? ( media-libs/libifp )
+	real? (
+		media-video/realplayer
+		media-libs/alsa-lib )
+	njb? ( >=media-libs/libnjb-2.2.4 )
+	mtp? ( <media-libs/libmtp-0.3.0 )
+	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}/amarok-1.4.10-gcc-4.3.patch"
+	"${WORKDIR}/amarok-1.4.10-post20090130.diff"
+	"${WORKDIR}/amarok-1.4.10-desktop-entry.diff" )
+
+need-kde 3.5
+
+src_compile() {
+	# Extra, unsupported engines are forcefully disabled.
+	local myconf="$(use_enable mysql) $(use_enable postgres postgresql)
+				  $(use_with opengl)
+				  $(use_with visualization libvisual)
+				  $(use_enable amazon)
+				  $(use_with ipod libgpod)
+				  $(use_with mp4 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-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
+}