Bumped amarok-utils to 2.2.2 (should be out next Monday).

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 80 insertions, 14 deletions

diff --git a/media-sound/amarok-utils/ChangeLog b/media-sound/amarok-utils/ChangeLog
index 224bcd40c561..3cd79ba2dc1f 100644
--- a/media-sound/amarok-utils/ChangeLog
+++ b/media-sound/amarok-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/amarok-utils
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok-utils/ChangeLog,v 1.11 2009/12/16 00:40:09 tampakrap Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok-utils/ChangeLog,v 1.12 2010/01/08 15:50:10 jmbsvicetto Exp $
+
+*amarok-utils-2.2.2 (08 Jan 2010)
+
+  08 Jan 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-utils-2.2.2.ebuild:
+  Bumped amarok-utils to 2.2.2 (should be out next Monday).
 
 *amarok-utils-2.2.1.90 (16 Dec 2009)
 
diff --git a/media-sound/amarok-utils/Manifest b/media-sound/amarok-utils/Manifest
index 799c1cc57fcd..5af1bf88b8b7 100644
--- a/media-sound/amarok-utils/Manifest
+++ b/media-sound/amarok-utils/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST amarok-2.2.0.tar.bz2 8379041 RMD160 bf86bae9dd1039f4c7e591fc0104a819ecd57fca SHA1 7603f991aa92810669e71278f9abc20a2180f97d SHA256 2f40b0664701f79d5a49cb336ba2567535e0eb093c1a0691bbac08b73224643d
 DIST amarok-2.2.1.90.tar.bz2 8572570 RMD160 6a01be2c80cadead1ae1b50c6c53464311091151 SHA1 3441631c2c8ba589f13c8d2fb26dd2f3b97de451 SHA256 0f30b3014540f9396503bef3299394c3ac644cafb9968c65c330170f34b715c2
 DIST amarok-2.2.1.tar.bz2 8701156 RMD160 75d4fe3c71059c0f562763c0145981dad4be7158 SHA1 438cb6e59ed1f1bc310af8608dabb9ba5d46f031 SHA256 f3dbb257d64cd0787701df90fabc09f908294063657571f7f856780addcc1a08
+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.1-r1.ebuild 1558 RMD160 eb98ea6f13710a046c6d98e850e72f4671e0bb2b SHA1 c513112e854d8e752cbe1032ebc5c1bde791bca0 SHA256 4db490f46bb56399e30b2c29ac25704d41acb378593c6ea9582807b3ae17c37a
 EBUILD amarok-utils-2.2.1.90.ebuild 1546 RMD160 8532779d4438189f17a40b451ee42621941b7655 SHA1 534f4f5eb9be6373e8cbe832c7a167d555fca1cf SHA256 3d5443350be418f100f520b6299be205f8a4a28b15cece4eb223111361b5653d
 EBUILD amarok-utils-2.2.1.ebuild 1480 RMD160 1c8850d021993bc6ad2f6f1d592eb7280cda634a SHA1 f293aaa95b4648bd99ae7e748be5d659be26c171 SHA256 07ee5aaade1b4ac19ad7906eb379dfdf5ee2e9c9e1e10701f3006348c231a04d
-MISC ChangeLog 1941 RMD160 b5deacd5c46f91268f02780e1939e2689bf57296 SHA1 ac2a7cf8c6111ac7061c7d3a233d76b5e37d34af SHA256 5aa5963d23813cb14a9d5143bc5e7476a768a7e56e22772b3e62fd41afa08ebf
+EBUILD amarok-utils-2.2.2.ebuild 1545 RMD160 d6e41d7342ba270017f510f77c867f1b66847383 SHA1 215b16360cafab15f8eb0f109855190e0047ae8a SHA256 32b3df57581b73f20a88325caf3617bb5f629669ee8802ec72ba638953d6473f
+MISC ChangeLog 2136 RMD160 0b9f4b944defa0d9b85613c5c43cb097aa9e5c6c SHA1 289660427f407bcce9fe6386a707d06a1dfb3424 SHA256 4da6f25b66c1cd596d8462383d35634424924c5e6d96daf022439f3190f56c86
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAksoLHcACgkQjDdoMVfcAHhdZwCgnlgJZ5SynUWUXnxoYjUasyTz
-n2YAoMtmXqFUhq224wvtS3HWZV9Boja3
-=lQO/
------END PGP SIGNATURE-----
diff --git a/media-sound/amarok-utils/amarok-utils-2.2.2.ebuild b/media-sound/amarok-utils/amarok-utils-2.2.2.ebuild
new file mode 100644
index 000000000000..f2b0c84f068a
--- /dev/null
+++ b/media-sound/amarok-utils/amarok-utils-2.2.2.ebuild
@@ -0,0 +1,65 @@
+# 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.ebuild,v 1.1 2010/01/08 15:50:10 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/unstable/${MY_PN}/${PV}/src/${MY_PN}-${PV}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="bindist debug"
+
+DEPEND="
+	>=media-libs/taglib-extras-1.0.1
+	>=x11-libs/qt-core-4.4:4
+	>=x11-libs/qt-dbus-4.4:4
+	bindist? ( >=media-libs/taglib-1.6.1[-asf,-mp4] )
+	!bindist? ( >=media-libs/taglib-1.6.1[asf,mp4] )
+"
+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 3020b11461c6..974ad97336b6 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -2,16 +2,19 @@ AUX amarok-1.4.10-gcc-4.3.patch 271 RMD160 facfb2796b871f3b3a5cb0c5e2268386950b3
 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
 AUX amarok-2.2-mysql-libs.patch 540 RMD160 16b143a50c126ba69851e4c1d1524b1d6b7c175d SHA1 0358c91184604bf4587cfa755202a41ba9c4d346 SHA256 ace02a3f8d20295077de08d17af00382c19ad21ddf4ef324ff7c5e5ec4d666e1
+AUX amarok-2.2.2-nodebug.patch 8707 RMD160 5982b7e4cfd4622c20b93cfec70334190a5d8714 SHA1 85865e28db8796d9afdaf5c463cb3bb8ed9f8e48 SHA256 ab2705297449d8e7449d3f370da6b04b0896d664d0a67dc60f87ac9342010d46
 AUX amarok-libmp4v2-2.patch 1317 RMD160 f2af142c7acca5d2f558d121fa4cd0ded2ea044c SHA1 14ab94f14e5be19f7ea5c6b83fdde768a1e5bcc1 SHA256 9a83dfdab7f393a802ec6394bf314736c7866391fb496b256c028bc81f86ce5c
 AUX amarok-libmp4v2.patch 2882 RMD160 f0786378bf963e8d10db49631bb0981facd9ed90 SHA1 a60289d7c852056c27ad2d03dc09b0500f428ac3 SHA256 df4c71a25381470411ac2223ec978989e1f3fa7e784de6a0b9e1cb53eed65e06
 AUX amarok-qtscriptcheck.patch 1024 RMD160 0693ddd6bbaa2f15d381eec329cfeff1e8b176cd SHA1 0585c08f8159a06c95e89f22e788d6e039224fbb SHA256 8a2983f3bd5ec422f2ed0a90a49970fd13fed3852c66ed220c01b4d8418ce89d
 DIST amarok-2.2.0.tar.bz2 8379041 RMD160 bf86bae9dd1039f4c7e591fc0104a819ecd57fca SHA1 7603f991aa92810669e71278f9abc20a2180f97d SHA256 2f40b0664701f79d5a49cb336ba2567535e0eb093c1a0691bbac08b73224643d
 DIST amarok-2.2.1.90.tar.bz2 8572570 RMD160 6a01be2c80cadead1ae1b50c6c53464311091151 SHA1 3441631c2c8ba589f13c8d2fb26dd2f3b97de451 SHA256 0f30b3014540f9396503bef3299394c3ac644cafb9968c65c330170f34b715c2
 DIST amarok-2.2.1.tar.bz2 8701156 RMD160 75d4fe3c71059c0f562763c0145981dad4be7158 SHA1 438cb6e59ed1f1bc310af8608dabb9ba5d46f031 SHA256 f3dbb257d64cd0787701df90fabc09f908294063657571f7f856780addcc1a08
+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.1-r1.ebuild 3115 RMD160 cf81fc1d5b9238df624d0da5277ae98eccc5dcfe SHA1 b880e4ed7fdb97b0eac13b163f98382242460d60 SHA256 1a3f031ed392a628bb5410e25b2ece0c7280c98be95d2ac32d96ff8fc9ce26f7
 EBUILD amarok-2.2.1-r2.ebuild 2787 RMD160 0329ad0290a718b412fce63cfe74e32b949d7d34 SHA1 424cfb468c0265714226c05a38e53903346562a2 SHA256 2bcf3578ac3520e201ff887815cd4ec9a63aa8ce794ddc85839ee3764f469d39
 EBUILD amarok-2.2.1.90.ebuild 2760 RMD160 62c79bc9818de001aa1c7cc19b2f69edeeb2c39a SHA1 62919d9dd880716a8428843ff0afd4038d08f423 SHA256 508d01cfc9bebbf231ccddda7c288888288e55d999925f99675ad79c609c50c9
 EBUILD amarok-2.2.1.ebuild 2773 RMD160 6a07a36b2459b8506e4cc313c77f01ddee1b0e86 SHA1 e10b48f50e61e708c12e02b30b2207af71518be1 SHA256 b108945fd5933b0c251e02ae0d9c26cf4afc82c8c87831eb637e3e86bac5fafd
-MISC ChangeLog 57206 RMD160 fbc7a8d4e5fdd1ab2fe5cc4d9091ec9cda68e325 SHA1 cc008714d7a96e592ff11b5db64f1c78133c3e2a SHA256 a12980da03e6603a93a9470f22044594acbda688effa5021fc05d49ed9fb725b
+EBUILD amarok-2.2.2.ebuild 2802 RMD160 1b331328506927c54151b2385f25b6f64b4cf2fe SHA1 775dcc7d92de1c8584a04c2dfed6545393da37e5 SHA256 ab52b01fb81c8dec695e7b1216c74df5917edf5c0ac419e490647df676c90aec
+MISC ChangeLog 57525 RMD160 bbfd1422e296c243214fbb0ce76b632503ac04c3 SHA1 f4b46924085fccb00b45310b27e2fda529c2626c SHA256 e0dc14937f47bf1c4bb17439b2a6e4ed4660d99ce9174982f1d8d1be3fb970f3
 MISC metadata.xml 1283 RMD160 f188f32c38a3e5425d86c59b8c1af8f27833d6b2 SHA1 34f8738cfbf39c87b3ef2ed35f43711b3302c15c SHA256 72c533c0a2afe35a34f0064cdac226e714a1d4bfdddd5cbb6a2ecc75541c16c8