Added missing app-crypt/qca:2 dep. Fixes bug #293509 - thanks to Rafael <rktspm@gmail.com>.

Added missing kde-base/kdemultimedia-kioslaves. Fixes bug #292216 - thanks to Hubert Lee <oboe-nerd@hotmail.com>.
Bumped revision to avoid dep tree issues.
Package-Manager: portage-2.2_rc50/cvs/Linux x86_64

3 files changed, 118 insertions, 15 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 848dba628a2f..947f2dc7de72 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,10 +1,16 @@
 # 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.347 2009/11/15 00:27:26 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.348 2009/11/20 03:02:48 jmbsvicetto Exp $
 
-  15 Nov 2009; Theo Chatzimichos <tampakrap@gentoo.org> -amarok-2.1.ebuild,
-  -amarok-2.1.1.ebuild, -files/disable_bindings_test.patch:
-  Remove old 2.1 ebuilds and deprecated patch
+*amarok-2.2.1-r1 (20 Nov 2009)
+
+  20 Nov 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-2.2.1-r1.ebuild:
+  Added missing app-crypt/qca:2 dep. Fixes bug #293509 - thanks to Rafael
+  <rktspm@gmail.com>.
+  Added missing kde-base/kdemultimedia-kioslaves. Fixes bug #292216 - thanks
+  to Hubert Lee <oboe-nerd@hotmail.com>.
+  Bumped revision to avoid dep tree issues.
 
   14 Nov 2009; Theo Chatzimichos <tampakrap@gentoo.org> amarok-2.2.0.ebuild,
   amarok-2.2.1.ebuild, +files/amarok-qtscriptcheck.patch:
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 8f71cf17b2c5..653f0b15b05e 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
@@ -13,13 +10,7 @@ DIST amarok-2.2.0.tar.bz2 8379041 RMD160 bf86bae9dd1039f4c7e591fc0104a819ecd57fc
 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.2.0.ebuild 2760 RMD160 671c5f9228f9ae600aabe6c6448bf9fa7bdfd757 SHA1 02d340458f12dd79d7bcdd9717946a9c9b17fac2 SHA256 3a2ca481c3433417599b92940280d5516c3296a4212f3a5198abb4917062c8a9
+EBUILD amarok-2.2.1-r1.ebuild 3063 RMD160 acace040d061c1e95a81d8dd777cffdb2f5bc665 SHA1 03266fe560f4af8d65c607b4627a054a7df4c585 SHA256 85be00fdeeb62ae0f4d55b862ee41290b4fdb3f89b1328f0bc1f75ca1b026d9c
 EBUILD amarok-2.2.1.ebuild 2773 RMD160 6a07a36b2459b8506e4cc313c77f01ddee1b0e86 SHA1 e10b48f50e61e708c12e02b30b2207af71518be1 SHA256 b108945fd5933b0c251e02ae0d9c26cf4afc82c8c87831eb637e3e86bac5fafd
-MISC ChangeLog 56282 RMD160 679b192b2f6f4586aec80dd722cd7b8748ead451 SHA1 b52c99d4836a4c8c1fcc05a045078d2d9f05ac4f SHA256 d7cf66dadf8527b5f96e00cf3d9f5efb323782b2a846bff7489b3f813d1f5bda
+MISC ChangeLog 56486 RMD160 d1c111ddc9fb820420becf778926aa5ba5939a9c SHA1 af95c05039495853092d8af447e71a96f14e5f19 SHA256 a3df2f361799a1dba59d5e8b97e829680be70efe420aba998dc8e2ab570b23e1
 MISC metadata.xml 2160 RMD160 60852f091cb201337c8322cad498466cd63fee1d SHA1 15af0f24c3490806e06700d05bf5341779b2b26b SHA256 49e722b9b2a370e01b0efc327486bc3e02446e0c2b4b8047dffad765a1992357
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAkr/Sr4ACgkQjDdoMVfcAHgjzwCcDToL15SqZ3ghvmQUDieRpHY7
-E/cAniJNakJYZS5C/rZdljq0gaIdqalN
-=Lipf
------END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-2.2.1-r1.ebuild b/media-sound/amarok/amarok-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..81141d3f52c7
--- /dev/null
+++ b/media-sound/amarok/amarok-2.2.1-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-2.2.1-r1.ebuild,v 1.1 2009/11/20 03:02:48 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-crypt/qca:2
+	>=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}/amarok-qtscriptcheck.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
+
+	elog "This version of amarok will segfault on start if built with >=binutils-2.20 - bug #290662"
+	elog "While this issue is being checked, for a temporary workaround run the following:"
+	elog "emerge -1 =binutils-2.19.1-r1 && emerge -1 amarok && emerge -1 binutils"
+}