Bumped amarok to release 2.2.1.

This release like 2.2.0 segfauls on start if built with binutils-2.20
(bug 290662).
Package-Manager: portage-2.2_rc49/cvs/Linux x86_64

4 files changed, 116 insertions, 23 deletions

diff --git a/media-sound/amarok-utils/Manifest b/media-sound/amarok-utils/Manifest
index 8eee0851d6a0..b502d42603d3 100644
--- a/media-sound/amarok-utils/Manifest
+++ b/media-sound/amarok-utils/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST amarok-2.1.1.tar.bz2 5151731 RMD160 7a2a00fde109cc6c76b07922bd6a9d583b162782 SHA1 6242afaec5112ea3933885cb6948b19c0209b3c4 SHA256 27d6627e965e37da7a68b23a2807cabb54fe3c6febaa081ae200388396cd117c
 DIST amarok-2.1.tar.bz2 4782899 RMD160 0c756b5e0e88c7efa96541c67388fd37aae788f7 SHA1 ce6635e4e388de4ebf3ffe9971826c2c9da95acf SHA256 19ac076d475babdeb66d1d1f5c8a2eea91aba0fe4f6d1478636af361b66fb8ea
 DIST amarok-2.2.0.tar.bz2 8379041 RMD160 bf86bae9dd1039f4c7e591fc0104a819ecd57fca SHA1 7603f991aa92810669e71278f9abc20a2180f97d SHA256 2f40b0664701f79d5a49cb336ba2567535e0eb093c1a0691bbac08b73224643d
+DIST amarok-2.2.1.tar.bz2 8701156 RMD160 75d4fe3c71059c0f562763c0145981dad4be7158 SHA1 438cb6e59ed1f1bc310af8608dabb9ba5d46f031 SHA256 f3dbb257d64cd0787701df90fabc09f908294063657571f7f856780addcc1a08
 EBUILD amarok-utils-2.1.1.ebuild 1284 RMD160 ce21c9ce8bb54541c8e11ed364ea91e1132e7be2 SHA1 bbd37ae73b16ea18401b45dded5e82529420ec41 SHA256 f23a9001a12b5f528ca147f0b402182fe3b26c8be956b7731b5507dd7ac8f9db
 EBUILD amarok-utils-2.1.ebuild 1282 RMD160 377b09c117e471844968fc8934fe49f75309261a SHA1 f96a471dbdda49d41cb0d1380eb057db26f8e55a SHA256 c81bb63ea5cef6d254d00be8c17e59af0ebacfafcd1571f1965d8d7d401f1472
 EBUILD amarok-utils-2.2.0.ebuild 1463 RMD160 a207359e7227fda5169f818c3e15ac37123ddfdb SHA1 5f8a06d70ca98d235dd4710d08944d4dc3afbe4d SHA256 ab6bfc26e25c33a8aa0c69ed732ab997783830f9aae5b71b5a10b271abb06443
-MISC ChangeLog 1182 RMD160 b783092cfb3c41b95bad46ddf8d2da0e3199afa1 SHA1 98c31a4d40e1a114864d91e00afaf6177279150b SHA256 512113a3cbe0b889307cdc5fc760f1168f4577e269794a265e4e5293419d3625
+EBUILD amarok-utils-2.2.1.ebuild 1480 RMD160 1c8850d021993bc6ad2f6f1d592eb7280cda634a SHA1 f293aaa95b4648bd99ae7e748be5d659be26c171 SHA256 07ee5aaade1b4ac19ad7906eb379dfdf5ee2e9c9e1e10701f3006348c231a04d
+MISC ChangeLog 1449 RMD160 db68a6361dfd47664d4d5bbfdef118b697c5d920 SHA1 640e9af002ac32a4550dcebbb24ecd676acdf933 SHA256 c7eb686447f1bf9d1f53a7b801d107f5823d8a5ed1e989ac3c590a75390bb875
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkr4WmcACgkQNQqtfCuFneOl4wCfUjTL1HUTnS0+yqSoyHYdoJVV
-WhkAn3dulUIpj5dVML9SsLmBENVKGNsP
-=Ytw5
------END PGP SIGNATURE-----
diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 3c40e25ed6ec..130971c4f147 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/amarok
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.344 2009/11/09 18:18:36 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.345 2009/11/14 12:48:52 jmbsvicetto Exp $
+
+*amarok-2.2.1 (14 Nov 2009)
+
+  14 Nov 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-2.2.1.ebuild:
+  Bumped amarok to release 2.2.1.
+  This release like 2.2.0 segfauls on start if built with binutils-2.20
+  (bug 290662).
 
   09 Nov 2009; Christian Faulhammer <fauli@gentoo.org> amarok-2.2.0.ebuild:
   stable x86, bug 290483
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 8f0b3aac80aa..a088fbb014d4 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX amarok-1.4.10-gcc-4.3.patch 271 RMD160 facfb2796b871f3b3a5cb0c5e2268386950b3801 SHA1 c86f458ba6ae8d5b78a047852f9f2699e6da2908 SHA256 b96e976276f5c87265ecdb62b596f6f2e91c921130b833b0e395f2b50c9fa9cc
 AUX amarok-1.4.10-gcc44.patch 4085 RMD160 bda16ee1d016cd158654b3f80faa413eaa7a6543 SHA1 f5c7eeea6ff80d6e634465517face69f3f344516 SHA256 b94338af91e5a108c39b100162f38bfe53d6c94fb9ed4c175f09de68df1c1989
 AUX amarok-1.4.9.1-libmtp-0.3.0-API.patch 1912 RMD160 475852fde4ad1e27cc093d9435a4b525492e0156 SHA1 b211ad82d9abc49dd3a51260ba597cfaa78d9f6b SHA256 87583a40c4e13eae7a5364dc5b98dd83885c216e662c05c4de7c1de9739f6d9c
@@ -12,16 +9,11 @@ DIST amarok-1.4.10.tar.bz2 12812583 RMD160 f86c71dd0459e0cf1ff586cd6de240ca6501c
 DIST amarok-2.1.1.tar.bz2 5151731 RMD160 7a2a00fde109cc6c76b07922bd6a9d583b162782 SHA1 6242afaec5112ea3933885cb6948b19c0209b3c4 SHA256 27d6627e965e37da7a68b23a2807cabb54fe3c6febaa081ae200388396cd117c
 DIST amarok-2.1.tar.bz2 4782899 RMD160 0c756b5e0e88c7efa96541c67388fd37aae788f7 SHA1 ce6635e4e388de4ebf3ffe9971826c2c9da95acf SHA256 19ac076d475babdeb66d1d1f5c8a2eea91aba0fe4f6d1478636af361b66fb8ea
 DIST amarok-2.2.0.tar.bz2 8379041 RMD160 bf86bae9dd1039f4c7e591fc0104a819ecd57fca SHA1 7603f991aa92810669e71278f9abc20a2180f97d SHA256 2f40b0664701f79d5a49cb336ba2567535e0eb093c1a0691bbac08b73224643d
+DIST amarok-2.2.1.tar.bz2 8701156 RMD160 75d4fe3c71059c0f562763c0145981dad4be7158 SHA1 438cb6e59ed1f1bc310af8608dabb9ba5d46f031 SHA256 f3dbb257d64cd0787701df90fabc09f908294063657571f7f856780addcc1a08
 EBUILD amarok-1.4.10_p20090130-r3.ebuild 3198 RMD160 c88ab563457a4dc8c226d41a32dc8b0c9a8b7418 SHA1 f98f41ac480a9c8c0d99c939fc2de1aa514a4f6b SHA256 17a78dbb7d26439930a18b9148144d3862dce12bf3201d2872fde27ac75dd66f
 EBUILD amarok-2.1.1.ebuild 2393 RMD160 84f67da3d49ce3441eeb6721a8f2116ec6c98ab5 SHA1 475cf04b1e73ffd1cc1f2b4f40704e2a671e2fb6 SHA256 089d8d2565e96f102416de5c75852067da3a14bd886b6f59f6675fcf62e1cf08
 EBUILD amarok-2.1.ebuild 2391 RMD160 ac645af2b8dc7c7c96286f001159c78f5a53fa59 SHA1 c9fe7fb8589397e7c0f4b17bc9a14d5bde56c01e SHA256 2781df1df211f85489677a59c93784a01c6f246ae3557b89cf3c69279ea48249
 EBUILD amarok-2.2.0.ebuild 2757 RMD160 71906d668cf69d405ddc8eba23f4fc90bbe71f46 SHA1 bba680a5d2652fa4ccd0ddf20b28b84bd41ee9d5 SHA256 51901b9596ee196a9d715acfd574537de94dd81b30f5be436ec8d2a5b1f3e159
-MISC ChangeLog 55648 RMD160 08d560ac7bb47ad60bb7b462a5a756680ac88e49 SHA1 0c41754537d33b53e6fa8ad19c3ddef1cee41aa3 SHA256 78187b794ceaf5bb8f02955a98ded1806c2edf06a682e0f09359ef43674bdc11
+EBUILD amarok-2.2.1.ebuild 2776 RMD160 5d121c42c843e95455b1a492a5a3f6fa77e9662a SHA1 af9188443fbdb071d3e9c980aea7557a0c2f677f SHA256 64bfdc33c482f859988aebeecf1ed17c677ec11d907ac922466f595146a5b7c2
+MISC ChangeLog 55897 RMD160 286e902294e6ad074311c5993c6e85f27199bb5e SHA1 0fff9ba9a090e29c75ecd58599ebd734f204a4ad SHA256 cdc67acbcfb9e81b75fecd9f8153bf2b29d51255a48cc2342f57175b6d897487
 MISC metadata.xml 2160 RMD160 60852f091cb201337c8322cad498466cd63fee1d SHA1 15af0f24c3490806e06700d05bf5341779b2b26b SHA256 49e722b9b2a370e01b0efc327486bc3e02446e0c2b4b8047dffad765a1992357
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkr4XQMACgkQNQqtfCuFneO3aQCglqecImP9HGh1KO6929arypih
-Vp0AnAjzBDgVqHNFIMg6rqiqKMGrcwX1
-=nsRH
------END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-2.2.1.ebuild b/media-sound/amarok/amarok-2.2.1.ebuild
new file mode 100644
index 000000000000..0d6c5260fc8a
--- /dev/null
+++ b/media-sound/amarok/amarok-2.2.1.ebuild
@@ -0,0 +1,101 @@
+# 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-2.2.1.ebuild,v 1.1 2009/11/14 12:48:52 jmbsvicetto Exp $
+
+EAPI="2"
+
+# Translations are only in the tarballs, not the git repo
+if [[ ${PV} != *9999* ]]; then
+	KDE_LINGUAS="bg ca cs da de en_GB es et eu fi fr it ja km nb nds nl
+	pa pl pt pt_BR ru sl sr sr@latin sv th tr uk wa zh_TW"
+else
+	EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git"
+	GIT_ECLASS="git"
+fi
+OPENGL_REQUIRED="optional"
+inherit kde4-base ${GIT_ECLASS}
+
+DESCRIPTION="Advanced audio player based on KDE framework."
+HOMEPAGE="http://amarok.kde.org/"
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="cdda daap debug ipod lastfm mp3tunes mtp +semantic-desktop"
+
+# ipod requires gdk enabled and also gtk compiled in libgpod
+DEPEND="
+	>=app-misc/strigi-0.5.7
+	|| (
+		>=dev-db/mysql-5.0.76-r1[embedded,-minimal]
+		>=dev-db/mysql-community-5.0.77-r1[embedded,-minimal]
+	)
+	>=media-libs/taglib-1.6[asf,mp4]
+	>=media-libs/taglib-extras-1.0.1
+	>=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?]
+	sys-libs/zlib
+	>=x11-libs/qtscriptgenerator-0.1.0
+	cdda? (
+		>=kde-base/libkcddb-${KDE_MINIMAL}
+		>=kde-base/libkcompactdisc-${KDE_MINIMAL}
+	)
+	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
+	lastfm? ( >=media-libs/liblastfm-0.3.0 )
+	mp3tunes? (
+		dev-libs/glib:2
+		dev-libs/libxml2
+		dev-libs/openssl
+		net-libs/loudmouth
+		net-misc/curl
+		x11-libs/qt-core[glib]
+	)
+	mtp? ( >=media-libs/libmtp-0.3.0 )
+"
+RDEPEND="${DEPEND}
+	>=kde-base/phonon-kde-${KDE_MINIMAL}
+	>=media-sound/amarok-utils-${PV}
+	semantic-desktop? ( >=kde-base/nepomuk-${KDE_MINIMAL} )
+"
+
+PATCHES=( "${FILESDIR}/disable_bindings_test.patch" )
+
+# Only really required for live ebuild, to skip git_src_prepare
+src_prepare() {
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	# Workaround for problems related to libmysqld.so and collection plugin not
+	# being found on some architectures when --as-needed is not used.
+	# append-ldflags -Wl,--as-needed
+
+	mycmakeargs="${mycmakeargs}
+		-DWITH_PLAYER=ON
+		-DWITH_UTILITIES=OFF
+		-DWITH_Libgcrypt=OFF
+		$(cmake-utils_use_with ipod)
+		$(cmake-utils_use_with ipod Gdk)
+		$(cmake-utils_use_with lastfm LibLastFm)
+		$(cmake-utils_use_with mtp)
+		$(cmake-utils_use_with mp3tunes MP3Tunes)"
+#		$(cmake-utils_use_with semantic-desktop Nepomuk)
+#		$(cmake-utils_use_with semantic-desktop Soprano)"
+
+	kde4-base_src_configure
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	if use daap; then
+		echo
+		elog "You have installed amarok with daap support."
+		elog "You may be interested in installing www-servers/mongrel as well."
+		echo
+	fi
+}