[media-sound/amarok] Version bump (2.6 RC).

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 151 insertions, 9 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 98c0979178db..39b2e6b93083 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/amarok
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.432 2012/07/19 15:56:45 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.433 2012/08/03 03:42:35 jmbsvicetto Exp $
+
+*amarok-2.5.96 (03 Aug 2012)
+
+  03 Aug 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-2.5.96.ebuild:
+  [media-sound/amarok] Version bump (2.6 RC).
 
   19 Jul 2012; Michael Palimaka <kensington@gentoo.org> amarok-2.4.3-r1.ebuild,
   amarok-2.5.0-r3.ebuild, amarok-2.5.0-r4.ebuild, amarok-2.5.90-r1.ebuild:
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 06b7d9846c52..2e9e73886f16 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -11,20 +11,28 @@ AUX amarok-fix-upnp-dep.patch 1896 SHA256 e88481548d77d334adb51250ee2e70186249ee
 DIST amarok-2.4.3.tar.bz2 17468203 SHA256 6ce448ecd30cc3d45211617636904e3662c2082441b79ca1e36685c8b0be8208 SHA512 68a06a92f354b6ecd9e888c57f0d3dccf29d1029f4d877a80853daf9846863ad9e5195cce2335a3fca46ebed49e8d767c09211a1661a331a53a59fbab518b6cb WHIRLPOOL 692610428f5a1db37bd430e38f9efd49f5b061c2e19d49d6545b016d4e54a69bb82721b2a200ade3bf35da1aa46e05e8d355d49879056a7125ea0f8c99b3d81a
 DIST amarok-2.5.0.tar.bz2 46607238 SHA256 1ed191db290fdede7c910c322cff2aba8ecfc1c4af891508d9ee410db3768849 SHA512 ac195f627ed0b1daba4b3a2896048d445caa85310b3373b373cabc76c36f424a60f2a3a439012363f3022c0ddb85a6770f2debd5b1a6e009e067bc5329d284c6 WHIRLPOOL e2256ae5dc941016afc9c3798b8f4ee4275dd23085b520067d6f24fa682ce465254d251c3494208a679441058771226668d5b500cb84851ccdd5b48584bb73bc
 DIST amarok-2.5.90.tar.bz2 44196885 SHA256 c8f9c36126df06b53a8753dc31179e55b692ef8ecb44323088df0b2bc92c1aea SHA512 eb76f27d55aa2bd5958156f8e36688cd9d605d583619ea8aaa04f464f656752966e15818ffcbd8d01ddc4bac5afb677ea4e32dd8d88fc34c88536a825617dc3d WHIRLPOOL aa9344f0102fe34a5f9a86ad90a5b818e026e943f4e70b7e1e94078e627bf9c493a6af275d8d2a96fea3b16bd06f8c8fc0b2e629999bb345f16fa2603c26fdc4
+DIST amarok-2.5.96.tar.bz2 42263640 SHA256 3168c0f8d6d39e8517f10e6ea8d221b8dbf12ef0de7098b07700e6c92889d4fd SHA512 8173800715823575f1bd1975fc74cc5a7d9230123ffd96ef506898f6d0cfa00e90b95a1bce0129b6cea6d84c2cb327890fc85aa1d0a1944f0af5531a783e07c5 WHIRLPOOL 0f4c81721d5e595ebf6effa59a967eba74ffcae2546531fa84317ee33bdb7029205909d0208812e00309cea26011469dd19c627b6fbde6f77cffb75b271aefb8
 EBUILD amarok-2.4.3-r1.ebuild 3266 SHA256 4c667dcc5c1eeb180425f1a21672c89b10cd6524202aaf73fae021753f700e41 SHA512 864803b8363974a64be9bacd4edcfc54903f9c1589ff2432e3c19b4146e98e4290d3d0280e6789cdbb90f9d323ec6897b212cadc9adc1967bc39fe9ff063d55c WHIRLPOOL 7b5db4ebf4132e17fc93a989fa16c2bbefd5d2dcfdefa754cfdef397db067a11b3c539a591390e9bfcb365fd078c058d850f0394be82bd87d5fb2b5745b915d2
 EBUILD amarok-2.5.0-r3.ebuild 4185 SHA256 17937dce0f1129db5de40f587c276ec18e3a44e60a1fcfa0f698e9a9a6908a6d SHA512 4881fab14acecd7a3892cc201e656d4c6c2544713c5b67d4532eb5e125b0df46bd4d63e716d64f00c561ba2728a23f4a5e0c45d85224f3082d8ef77128544919 WHIRLPOOL 74be4438d9110ee70d7bdfd05f7c3a2037b6acc0dd5a32fd92c6c001666e1fddd83d2eb3bbb5dbf1afe318289351757c47b2f2c5624136017d5e4dbd6eb4a34e
 EBUILD amarok-2.5.0-r4.ebuild 3817 SHA256 0f77844aab7e0bbc70135ac376931149f4c434075efbbe2425ef5a3607ba4f03 SHA512 d26a067d5b46d6f25850d3d6f734e303e3830d7bda2870d171dbb8f55bd9e944444e412ef4fe7d10ed6e186c983b2c0fb5c9606ba911ed1b0c7ee3336b5964eb WHIRLPOOL 0b3940a449c3bbc5eec53691b807d8c45198af1fef3feae19b9af0866018accc2bea3c873742ca14b9715737667214089b6541690da4aa1564d705e90361a052
 EBUILD amarok-2.5.90-r1.ebuild 3441 SHA256 b005951fa4f8744af5798a1230dafb9b4e16b5aadebd25b03c2de5cf8025ae81 SHA512 c351091d5fdaff70f10ac4aaeb640ca67fc4d62bc4aec4d8a91634d5ddd34c0729cfd4dce81eaebf5ff01b714be63d0bdf71d76fa32eaeeffd17215be41e26b6 WHIRLPOOL 38b597d7c8138431b47b9d987fccdb1ce814078870d8e11ad3b1202c73e22b9ceab67580df005446041f9af0382f4f2f0a457b5e03c6fe2b30317aea368e95ca
-MISC ChangeLog 74260 SHA256 93a02214eb36e69a73661d95a82fc9c647836f236a8775373bedfe897129a7b5 SHA512 83390ee63695e2ce43cfd84aceccbb59af71962c397f898e2134911e0062616cc5c81ba469bce755dc0ef1f8aeefae805f8abea9e8aec8e4100b7b4b72ba22c4 WHIRLPOOL 73692add6762388c77a88668dd069f1f0014e7d7f10d86b529a8c1cfd81869e1dc36e828097636f14c1179f31aeb379a4dffbd309b07d0e25f6eec0e01944f40
+EBUILD amarok-2.5.96.ebuild 3469 SHA256 1911a87069dd5ee2eb0bfad418e2f70dccad98fb8b25e8dc229848b666d21bf5 SHA512 345c43844d21af56189509f53ba0782f59ea3a325d4a1d62f2b282186899ef18fa6a103fe7eea6c650c17159ccb074ed2978d08a8240d345741dd64559e1c637 WHIRLPOOL 3eef6e1743a2bb20be161c57bc17675f63cacb7e907d3bc926a8076918d31e3aba7155788d67c20a5385c5ea4ebc873fcf13a5d86b382980aaf9886b44c404d5
+MISC ChangeLog 74430 SHA256 ff0ab4ac17e84645b6866c22b497240e2c4a70cfd1336acaed753054df2fbf71 SHA512 10c7a2250ae37644bf47aa5ea08960bf4d01e0738056a97b10b75a3811d1e92f2a851a4d50a0c2dd4068ab156cfc95914696a804effa45a38307e7c84fea3bbf WHIRLPOOL 39fad9d4267fb27e33b81207683ba830958d13f1676b4d62c0d3fe172e4c9197d45f99980d7e38c9ae535d27a0f0d6fd3778931ecbe32caacdaf6892bd4ea3c5
 MISC metadata.xml 1283 SHA256 dbd309064732531993f21257f6db969c681545fcf7dd4766daac33bb41da0451 SHA512 f61fc22596e31125cd7e4964d0699527e79fb5bf39e7708c1051eb1a3bf9f23dbc4310f9e94da58672a81d1a93c57b7924d84fb8af86e9ac78962b0ee3ffee7f WHIRLPOOL 3e408437f2857ba19314e17056da6204226e42362cccc75fe2c26931499b2c05abb6c672255dc29682bd77f2acb069e36dac568daf13a388a047a6cf616a13d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQCC43AAoJEMbwO6tnXQ0sSvgH/RVXLzrqbX7zYxPlvlKRa3E0
-tmE4NplLDpN7P3AwOq6xR2us03Eipd4Ie99DkSqHz1L5G2J0f5dCyOWcscJJxmw7
-jGTI0hYiycebMELTxT9LJ88waGmT9pi1Qh4ZueBiPrOk1e59tCYz3fAENGap8nGm
-u9lYEmr1lsB8ecbPUov4OYKEdlh4gv+NT1+7VQ9jsKIZeiq9BBG9v5DAoI55wgVh
-Qn7cFzrFTgoLE2Dtt57Qs1wTksHOvfT5WhE8oaprrTGbK5xHbnfQ4Z2AyKOUC/26
-yj4EJN5gpjkTPiS4lhRrBGSeVr/IlUwfqpSjDrKoqBYJRfxrTKEK6mTyVye6Sl8=
-=khRZ
+iQIcBAEBCAAGBQJQG0ijAAoJEC8ZTXQF1qEP9f4P/31oSbEcnbLGpAYWo+khUvvr
+RksXFKps9Lk8BBw3MOVRNwEPdi5AiRYpuvhEyFkDHkSaqK8dxt9t/651xKl0ayqV
+BQhEXaH4kgRCDnttVBsBk4z3sq7tgRQBT9XucIOiKHeiCUlHU8oGJMRxjcJVn8oA
+owZ0dO76p11YgZIFHLtwYp0pht6zim1YTkglkt25yaMkb1/zKx/1OaqRu6OGoBX8
+TI7/LPuQQ+51av76QBvl0thcYVktfYyZy3p9oC5lRebx8trdtweJKirNbE8Ye9HZ
+t21LSVKirp7+MwhnUXHevdMRBKrTWrqdCD3Fhf+3RbXd1mxriOZ3w9FXDECOWkYC
+th1imLL/WlmnoXXlHXyykMS7EdxEkCbHz15CJprevjGDA4vP8+wuqP8gyX7+R4O+
+sx+mU63wSWUVkYgK5KpEgkIj6xpnvCq7iu2mscUOCLV7TcgBgMCZttbrp+osPBc5
+c0VO2GmpcRPt2jQKrbXQfp6WzdriqQmjplFNKz88qvClgtVgqrwiYIdJT3CQ82xR
++x9L2l52muMcJcfvDhtoU0cxbapOBYKIj8qWYtAS/fTeqgn9/DetAngj5Xb/rp2J
+1DhAi8HXHJ2GDciyndwrZZROv+TVF9jZkzjypTvi+y1gepFaLwngDJInPPv1f9Pr
+5KglEf3VC5jmwn0G+lo6
+=G8Hr
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-2.5.96.ebuild b/media-sound/amarok/amarok-2.5.96.ebuild
new file mode 100644
index 000000000000..48af24ec4d91
--- /dev/null
+++ b/media-sound/amarok/amarok-2.5.96.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.5.96.ebuild,v 1.1 2012/08/03 03:42:35 jmbsvicetto Exp $
+
+EAPI=4
+
+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"
+KDE_SCM="git"
+KDE_REQUIRED="never"
+inherit flag-o-matic kde4-base
+
+DESCRIPTION="Advanced audio player based on KDE framework."
+HOMEPAGE="http://amarok.kde.org/"
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+else
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop +utils"
+
+# Tests require gmock - http://code.google.com/p/gmock/
+# It's not in the tree yet
+RESTRICT="test"
+
+# ipod requires gdk enabled and also gtk compiled in libgpod
+COMMONDEPEND="
+	app-crypt/qca:2
+	>=app-misc/strigi-0.5.7
+	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
+	$(add_kdebase_dep kdebase-kioslaves)
+	>=media-libs/taglib-1.6.1[asf,mp4]
+	>=media-libs/taglib-extras-1.0.1
+	sys-libs/zlib
+	>=virtual/mysql-5.1[embedded?]
+	x11-libs/qt-core:4
+	x11-libs/qt-dbus:4
+	x11-libs/qt-script:4
+	>=x11-libs/qtscriptgenerator-0.1.0
+	cdda? (
+		$(add_kdebase_dep libkcddb)
+		$(add_kdebase_dep libkcompactdisc)
+		|| (
+			$(add_kdebase_dep audiocd-kio)
+			$(add_kdebase_dep kdemultimedia-kioslaves)
+		)
+	)
+	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
+	lastfm? ( =media-libs/liblastfm-0.3* )
+	mp3tunes? (
+		dev-libs/glib:2
+		dev-libs/libxml2
+		dev-libs/openssl
+		net-libs/loudmouth
+		net-misc/curl
+		x11-libs/qt-core:4[glib]
+	)
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	ofa? ( >=media-libs/libofa-0.9.0 )
+	opengl? ( virtual/opengl )
+"
+DEPEND="${COMMONDEPEND}
+	dev-util/automoc
+	virtual/pkgconfig
+"
+RDEPEND="${COMMONDEPEND}
+	!media-sound/amarok-utils
+	$(add_kdebase_dep phonon-kde)
+"
+
+src_configure() {
+	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
+	use ppc64 && append-flags -mminimal-toc
+	local mycmakeargs
+
+	mycmakeargs=(
+		-DWITH_PLAYER=ON
+		-DWITH_Libgcrypt=OFF
+		-DWITH_SPECTRUM_ANALYZER=ON
+		$(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 ofa LibOFA)
+	)
+
+	mycmakeargs+=(
+		$(cmake-utils_use_with utils UTILITIES)
+	)
+
+	# $(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
+
+	if ! use embedded; then
+		echo
+		elog "You've disabled the amarok support for embedded mysql DBs."
+		elog "You'll have to configure amarok to use an external db server."
+		echo
+		elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
+		elog "to configure the external db and migrate your data from the embedded database."
+		echo
+
+		if has_version "virtual/mysql[minimal]"; then
+			elog "You built mysql with the minimal use flag, so it doesn't include the server."
+			elog "You won't be able to use the local mysql installation to store your amarok collection."
+			echo
+		fi
+	fi
+}