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

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

4 files changed, 78 insertions, 3 deletions

diff --git a/media-sound/amarok-utils/ChangeLog b/media-sound/amarok-utils/ChangeLog
index 2c8a2bc729a3..33081af2d0be 100644
--- a/media-sound/amarok-utils/ChangeLog
+++ b/media-sound/amarok-utils/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/amarok-utils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok-utils/ChangeLog,v 1.14 2010/02/19 16:44:58 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok-utils/ChangeLog,v 1.15 2010/02/19 16:57:49 jmbsvicetto Exp $
+
+*amarok-utils-2.2.2-r1 (19 Feb 2010)
+
+  19 Feb 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-utils-2.2.2-r1.ebuild:
+  Rev-bumped amarok-utils-2.2.2 to fix the deps and to ask for a quick
+  stabilization.
+  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-utils-2.2.1.ebuild, -amarok-utils-2.2.1-r1.ebuild,
diff --git a/media-sound/amarok-utils/Manifest b/media-sound/amarok-utils/Manifest
index f64d835d5966..58310cd237e7 100644
--- a/media-sound/amarok-utils/Manifest
+++ b/media-sound/amarok-utils/Manifest
@@ -2,7 +2,8 @@ DIST amarok-2.2.0.tar.bz2 8379041 RMD160 bf86bae9dd1039f4c7e591fc0104a819ecd57fc
 DIST amarok-2.2.2.90.tar.bz2 9166245 RMD160 0b595183c17b58fe2f9da6afcca44bf32d574366 SHA1 fd0f2f42aae199b63a8fb0818033b4c3c027b866 SHA256 4c1c3da3d7b59847a47c41e46bd4b1425c98e4efd7c325f1818381f37ac65fb9
 DIST amarok-2.2.2.tar.bz2 8788107 RMD160 0782c4b032d318179bd8bb91353f8e33772d2912 SHA1 2075299b856477cf55cba8ba983ea25a93dc139b SHA256 768d308572897a3100f0d87999f1bb1c68b2e2fa3b0961fd0b918bcfd33ae64d
 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 2639 RMD160 943f98c9274e937f4ecaf155a28974515cc60a75 SHA1 eb323efffc570a0f18f9b4c2a00781e90e7363ce SHA256 9a5081cf04ed1770c20656042c9321b6ffbdac3e45dc5378ad01f7b298f0e828
+MISC ChangeLog 2990 RMD160 525f68a4b0da0bc379332c44c2ffb67e202f0113 SHA1 210e028978bc8ad027ef30c2e42de1b44fbaf93c SHA256 1fc5920d8ece094bc2bcb480d9cd39db7f5ead1812e35a276d020923980b17fb
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/media-sound/amarok-utils/amarok-utils-2.2.2-r1.ebuild b/media-sound/amarok-utils/amarok-utils-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..9e4cff6610f0
--- /dev/null
+++ b/media-sound/amarok-utils/amarok-utils-2.2.2-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok-utils/amarok-utils-2.2.2-r1.ebuild,v 1.1 2010/02/19 16:57:49 jmbsvicetto Exp $
+
+EAPI="2"
+
+if [[ ${PV} = *9999* ]]; then
+	GIT_ECLASS="git"
+	EGIT_PROJECT="amarok"
+	EGIT_REPO_URI="git://gitorious.org/amarok/amarok.git"
+fi
+
+inherit base cmake-utils ${GIT_ECLASS}
+
+MY_PN="amarok"
+
+DESCRIPTION="Various utility programs for Amarok."
+HOMEPAGE="http://amarok.kde.org/"
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/src/${MY_PN}-${PV}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="debug"
+
+DEPEND="
+	>=media-libs/taglib-1.6.1[asf,mp4]
+	>=media-libs/taglib-extras-1.0.1
+	>=x11-libs/qt-core-4.4:4
+	>=x11-libs/qt-dbus-4.4:4
+"
+RDEPEND="${DEPEND}
+	!<media-sound/amarok-2.1.80:2
+	!<media-sound/amarok-2.1.80:${SLOT}
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+DOCS="TODO README ChangeLog AUTHORS"
+
+src_prepare() {
+	# Disable po processing
+	sed -e "s:include(MacroOptionalAddSubdirectory)::" \
+		-i "${S}/CMakeLists.txt" \
+		|| die "Removing include of MacroOptionalAddSubdirectory failed."
+	sed -e "s:macro_optional_add_subdirectory( po )::" \
+		-i "${S}/CMakeLists.txt" \
+		|| die "Removing include of MacroOptionalAddSubdirectory failed."
+
+	base_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_PLAYER=OFF
+		-DWITH_UTILITIES=ON
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index f287b8f7c0c1..5244326c2081 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -5,7 +5,8 @@ DIST amarok-2.2.0.tar.bz2 8379041 RMD160 bf86bae9dd1039f4c7e591fc0104a819ecd57fc
 DIST amarok-2.2.2.90.tar.bz2 9166245 RMD160 0b595183c17b58fe2f9da6afcca44bf32d574366 SHA1 fd0f2f42aae199b63a8fb0818033b4c3c027b866 SHA256 4c1c3da3d7b59847a47c41e46bd4b1425c98e4efd7c325f1818381f37ac65fb9
 DIST amarok-2.2.2.tar.bz2 8788107 RMD160 0782c4b032d318179bd8bb91353f8e33772d2912 SHA1 2075299b856477cf55cba8ba983ea25a93dc139b SHA256 768d308572897a3100f0d87999f1bb1c68b2e2fa3b0961fd0b918bcfd33ae64d
 EBUILD amarok-2.2.0.ebuild 2760 RMD160 671c5f9228f9ae600aabe6c6448bf9fa7bdfd757 SHA1 02d340458f12dd79d7bcdd9717946a9c9b17fac2 SHA256 3a2ca481c3433417599b92940280d5516c3296a4212f3a5198abb4917062c8a9
+EBUILD amarok-2.2.2-r1.ebuild 2742 RMD160 cf061b9ed82a316de1513c8386973210c0f04aea SHA1 6c1be0fcd4cc84f723eeb63ab69f989ad2dc5f68 SHA256 92391d2c4d7420cae5d6893e66b95ebe09d885bb26d38bfec0ca0fa48e426c7a
 EBUILD amarok-2.2.2.90.ebuild 2698 RMD160 327d51252ecf3a632f4cd208bb826a335d644ebd SHA1 3cf1cde0c035f3a86ffc54fee414f2c8c99368b6 SHA256 a5ec48027ebab3b5ff812a7d6d02490744fbc61e047f0b3dd4254c4d0ef51250
 EBUILD amarok-2.2.2.ebuild 2802 RMD160 1b331328506927c54151b2385f25b6f64b4cf2fe SHA1 775dcc7d92de1c8584a04c2dfed6545393da37e5 SHA256 ab52b01fb81c8dec695e7b1216c74df5917edf5c0ac419e490647df676c90aec
-MISC ChangeLog 58441 RMD160 0103db0698db3ce5db94b2b56a314724ff735517 SHA1 33957b4128b5ad657e7950a5a4c5bb5a280a0880 SHA256 f3f1d86c241d4294fd3567a580d367fb809c9391dc480670d18aad20635ef92d
+MISC ChangeLog 58827 RMD160 fb78f79d4654dccb461c2a2d8b0cbaf2e31cea53 SHA1 edc8fb4f4fc4f30d3ce3b29628b6fc01264b2646 SHA256 eb4173e602623996b10ad17f1e42c929a85388a066eadceeaf90283d7f5a0fc7
 MISC metadata.xml 1283 RMD160 f188f32c38a3e5425d86c59b8c1af8f27833d6b2 SHA1 34f8738cfbf39c87b3ef2ed35f43711b3302c15c SHA256 72c533c0a2afe35a34f0064cdac226e714a1d4bfdddd5cbb6a2ecc75541c16c8