Rev-bumped amarok-2.2.2 to fix the deps and to ask for a quick stabilization.

Fixed strigi deps (bug 304883) - thanks to Samuli.
Dropped the bindist use flag and added a hard dep on taglib[asf,mp4] (bug 299899) - thanks to Jeff Mitchell (jefferai).
Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

3 files changed, 115 insertions, 3 deletions

diff --git a/media-sound/amarok-utils/Manifest b/media-sound/amarok-utils/Manifest
index 58310cd237e7..bc6e52f699eb 100644
--- a/media-sound/amarok-utils/Manifest
+++ b/media-sound/amarok-utils/Manifest
@@ -4,6 +4,6 @@ DIST amarok-2.2.2.tar.bz2 8788107 RMD160 0782c4b032d318179bd8bb91353f8e33772d291
 EBUILD amarok-utils-2.2.0.ebuild 1463 RMD160 a207359e7227fda5169f818c3e15ac37123ddfdb SHA1 5f8a06d70ca98d235dd4710d08944d4dc3afbe4d SHA256 ab6bfc26e25c33a8aa0c69ed732ab997783830f9aae5b71b5a10b271abb06443
 EBUILD amarok-utils-2.2.2-r1.ebuild 1473 RMD160 6449fa81c5524601399bc32bbca23130016d7cce SHA1 367bab8ecb161959328a3f894faca924b57d6500 SHA256 f03ba995cc39b1c91bc748f5efa691e700a0e6361db72180cc60132f11cbdf03
 EBUILD amarok-utils-2.2.2.90.ebuild 1475 RMD160 40fd0e4cdd47798428a30214cc86500fd41a73b3 SHA1 a7cb360d7269475b1ddb93e2dc01fb59caa5d4af SHA256 8a908f82a9d81ab92698d3034f39bfa032ac7372bc712dc68cd8a3b2fe64bbf1
-EBUILD amarok-utils-2.2.2.ebuild 1545 RMD160 d6e41d7342ba270017f510f77c867f1b66847383 SHA1 215b16360cafab15f8eb0f109855190e0047ae8a SHA256 32b3df57581b73f20a88325caf3617bb5f629669ee8802ec72ba638953d6473f
-MISC ChangeLog 2990 RMD160 525f68a4b0da0bc379332c44c2ffb67e202f0113 SHA1 210e028978bc8ad027ef30c2e42de1b44fbaf93c SHA256 1fc5920d8ece094bc2bcb480d9cd39db7f5ead1812e35a276d020923980b17fb
+EBUILD amarok-utils-2.2.2.ebuild 1543 RMD160 dfe9b98d2abb62a76498866390bb5c7c1f1f2f5b SHA1 3f88138f1acf2df874785900a494bbe188189cfe SHA256 4b92758a924fd858ffa654d01f642d7b5daae3726a8f47d7ddd5021ba9a815ad
+MISC ChangeLog 3157 RMD160 461e88d44448698fff764b287e10b49a2d1aef1c SHA1 abfd2776188c8e683b0ce2ceba3b8d1912c617e3 SHA256 54f1e4086895b0922ac548e354f8f867e653da450ac42bfd091c6cf40fa53f7b
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index e0a1242f8652..2f2343fe3e85 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-sound/amarok
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.357 2010/02/19 16:46:26 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.358 2010/02/19 16:58:53 jmbsvicetto Exp $
+
+*amarok-2.2.2-r1 (19 Feb 2010)
+
+  19 Feb 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-2.2.2-r1.ebuild:
+  Rev-bumped amarok-2.2.2 to fix the deps and to ask for a quick
+  stabilization.
+  Fixed strigi deps (bug 304883) - thanks to Samuli.
+  Dropped the bindist use flag and added a hard dep on taglib[asf,mp4] (bug
+  299899) - thanks to Jeff Mitchell (jefferai).
 
   19 Feb 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   -amarok-2.2.1.ebuild, -amarok-2.2.1-r1.ebuild, -amarok-2.2.1-r2.ebuild,
diff --git a/media-sound/amarok/amarok-2.2.2-r1.ebuild b/media-sound/amarok/amarok-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..aa6e05e0685c
--- /dev/null
+++ b/media-sound/amarok/amarok-2.2.2-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.2-r1.ebuild,v 1.1 2010/02/19 16:58:53 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 +embedded 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[dbus,qt4]
+	|| (
+		>=dev-db/mysql-5.0.76-r1[embedded?,-minimal]
+		>=dev-db/mysql-community-5.0.77-r1[embedded?,-minimal]
+	)
+	>=media-libs/taglib-1.6.1[asf,mp4]
+	>=media-libs/taglib-extras-1.0.1
+	>=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?]
+	sys-libs/zlib
+	x11-libs/qt-script
+	>=x11-libs/qtscriptgenerator-0.1.0
+	cdda? (
+		>=kde-base/libkcddb-${KDE_MINIMAL}
+		>=kde-base/libkcompactdisc-${KDE_MINIMAL}
+		>=kde-base/kdemultimedia-kioslaves-${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}/${P}-nodebug.patch" )
+
+# Only really required for live ebuild, to skip git_src_prepare
+src_prepare() {
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_PLAYER=ON
+		-DWITH_UTILITIES=OFF
+		-DWITH_Libgcrypt=OFF
+		$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
+		$(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
+}