Straight to stable revision bump, as KDE SC 4.11.0 and <amarok-2.8 don't work well together

Package-Manager: portage-2.2.0/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 140 insertions, 3 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 3f6a776c371f..1721dc4af1b4 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/amarok
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.459 2013/08/18 14:06:49 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.460 2013/08/19 14:29:44 mrueg Exp $
+
+*amarok-2.7.1-r1 (19 Aug 2013)
+
+  19 Aug 2013; Manuel Rüger <mrueg@gentoo.org> +amarok-2.7.1-r1.ebuild:
+  Straight to stable revision bump, as KDE SC 4.11.0 and <amarok-2.8 don't work
+  well together
 
   18 Aug 2013; Manuel Rüger <mrueg@gentoo.org> amarok-2.8.0.ebuild:
   Style fixes
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 08b080d97b2e..fa005e9aaf96 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -3,13 +3,14 @@ AUX amarok-2.5.0-kde48.patch 2111 SHA256 4ee6b27d79d42e7fbb5469f46c3ebaf69eef73f
 AUX amarok-2.5.0-qtdebug.patch 2787 SHA256 a2b4ff34c38741979a76b96e0a741e5da7cadecc1a592035e10773b233d38f29 SHA512 5ea1523e16d9889a027866ee5e3f8bf8bb9efe743f55f7b5871aa6ef1a8f5341744b6858547251a9f472f840911cc516f247021659280a28f35eed41e27f5f85 WHIRLPOOL e2b8a58ad15e3d76e0a66befa044dd5b32e3838ddd0a94f767d723288c40854d257e1fe110f5b13c57b1d5842a47a4489c60711f9c8240c67dfc67524a2a24a6
 DIST amarok-2.5.0.tar.bz2 46607238 SHA256 1ed191db290fdede7c910c322cff2aba8ecfc1c4af891508d9ee410db3768849 SHA512 ac195f627ed0b1daba4b3a2896048d445caa85310b3373b373cabc76c36f424a60f2a3a439012363f3022c0ddb85a6770f2debd5b1a6e009e067bc5329d284c6 WHIRLPOOL e2256ae5dc941016afc9c3798b8f4ee4275dd23085b520067d6f24fa682ce465254d251c3494208a679441058771226668d5b500cb84851ccdd5b48584bb73bc
 DIST amarok-2.6.0.tar.bz2 42331208 SHA256 a91280e588181cf9363d7146f339ef527220fe0c8057f26f010f592b01fdd2c0 SHA512 da67876dfc41dcc3e1f3087698d36dabb43a339cef1669ca0518de191e2d9dd2e3e72122ffe76ecfd763e83547e46c55bba8606c095d35c85058df77bf35fb4a WHIRLPOOL 70fadaff2565fc2e9d8cb628942ec8107c6f4fcea0bd3e898f4ba6a72231ebaca8cb1d924f1413ced7c82940790438c9dcbe2fba7760e356b100eb832d8a2edc
-DIST amarok-2.7.0.tar.bz2 42873142 SHA256 39649075f77e73dc7e0c1842b93de870b2f400cfd008907791ee81055a075d49 SHA512 8b2077765d6dc4d879dc7c7e7ae208704fa4c19de48deb6ebb13dcc9e555a71be7dca0086bd5258f42aaf03b479a29c0beefddf75244ab7f655008414ad3e62e WHIRLPOOL ee8dde5e72a86e62cabfe57146504028e940256680ea604890481e27e7c204f7f1448c1af04b8a2a164d8c09047b258d65063f314a4ae85bc9e17caeda0252f2
+DIST amarok-2.7.0.tar.bz2 15499004 SHA256 b3138400d946511f6fddd8f1fea383a1e744ca76094f1f9e407fb40d3db6d2f3 SHA512 0c2ed7e2c9e84bd19994f2adbea8e628ae50fcf8347406544a10f88e513312f6cee12708182f79e0d7e1fc531a32ec35f12725fac5e9a3755dd8403f3ac32a3e WHIRLPOOL b710a3eb8840c779f61e4a1dbcff54833cd71cde69ef4abc1e31fa3d890f7cda499582aa73a3bafd6ce902cd410e6de7ece3bc2b4707ec50cfd15dabff63c2c2
 DIST amarok-2.7.1.tar.bz2 42872919 SHA256 9e0dc6653096179ee6bd1538da95964efd6e69ef247d6de29a3e5a69bac5bb89 SHA512 7e398a52a2aee67fa36f8e550ef9929af0b36ad118cd22e75bf1420a2db67f657478fecddaacd42f6ce6be4221fbe93c4ba5e0b979359253f06065836f1860b8 WHIRLPOOL 7ad8bae556739dc48973749f3c99ed640136d918084100492f8acae93de6025a1807753b3ea0c7504d0179e4847399b2b520dfcc27c609b033e8f0394d7e3464
 DIST amarok-2.8.0.tar.bz2 39950028 SHA256 f4b89b28f217a6d947e55fb0890de22fad8c404794c6beeb2dcaf2711b4f8ec6 SHA512 09f7f675f1223d36fb9df2f8c88923c6616524e022ad83b12bcb770dfbf60cb6b191e4035633f2ea2eee5fb7b38e6d5092cf69fe222ef9c3f3c46ba8f157a62d WHIRLPOOL 108cfd95d65e74f28f85a846f605bc349e5b2962b7f9a357415225f3e48ff87148d7f50a642665cc3c809bb2cb4c22f339ad049cdeb4659bb7c0a48e798833ad
 EBUILD amarok-2.5.0-r4.ebuild 3800 SHA256 8306a195a1e008954ca58c45ea318c0c0bad085890af0e9d79c74e96ed115291 SHA512 7c9a2a12a9168dcaf63471d94ee1e02888581471b4f2c97b1a30bd8970f7f967282f6869500069d415c72f3137a0917c8452b4777b3496e97c609d43b532e7d3 WHIRLPOOL 33345fbd385f07cda260cbf6c0c54aa3576e8c1610ee64057d1652b3c3cf353faf07fd25264266c75c4046f6ba36d08f834ff88cf36cd29c80d097ad82a45729
 EBUILD amarok-2.6.0.ebuild 3443 SHA256 3996282ca71c6e2c91859a24c1dda157cb0dcd5f0a9cadaf0cc2928178243055 SHA512 e77b7f519ef078d6bd0c63fad4cc0fb85dc072dc545e3e92a473f4da74e758250fb3af0f241a60ec4a3c0cdc311cc8c2bc1a14d4a2e9f993bff54df969b6794a WHIRLPOOL 9361c7c028d461f734b861678b562cc7136b40e3ef1472f54e31705f61f8d52be4773c88886584ca2a4c82a0e50adf35e8613c3d2ed91f283c0ab1d8ec10c7b7
 EBUILD amarok-2.7.0.ebuild 3513 SHA256 a9fb2e214f542d16eef3c0a80693f3e23be03f747e77011e4253b7225eac6f18 SHA512 fee39667d5a9eec14019907aae908f73aa104ed9c993e11e3628fbe6e40b385216d03e8d4262635d55b75327d404ba3ae0b097507bd254855ef2630735f7723d WHIRLPOOL f4577e0d60110e1f205a2472c0b6426d5ea99c3546e682b3c205214a933e937f4982994bfea27e3d5808dea01778c8fd24b303f2f9edfc8215d43547173f6c1c
+EBUILD amarok-2.7.1-r1.ebuild 3516 SHA256 8d6f3b76622d9f35bb36064e4c295e63e01d74ad7a339ced73d74a20fa812375 SHA512 e41443e1085336fd1d9912579cd52dd5a25ba06b88cf51e897d2a603a28d1b5d8d6e2e7eadd14966fb1651fc7faa7eea97b97f5fe5200ec3576bc8cf5bf7a68e WHIRLPOOL a06ce02acb9f71ab7f12a49b16c8305c95201d886c16822edc17df180d9ff40c43bd088123e2012b5a9c2db4db1e0ec91e717607165e4a3ecc59f427c5ee6640
 EBUILD amarok-2.7.1.ebuild 3485 SHA256 31df6b6440c61c723a48a6304fe378ed71154da2a433d8a6297cb0dbce0a46cb SHA512 43961e9255f6b4b43d59882511e7a6cee41fe05e9170dff2d23670f7c1bc7cf3a6595dbed20a1a1c656c0c9a223f78c93a486ec176eeb07e78903d87599a57c4 WHIRLPOOL b8c892edc9ac6fbee47e6b406853a1c582e8dfaa124601065a8ac82fb7b9cca4a39b14d9a4f436ea4dd722d30d924f64d4da65241c561f755602ffd0a677a2c0
 EBUILD amarok-2.8.0.ebuild 3437 SHA256 0b2d29b5f7ddd38d8df7b90df6cce14f58c3bbd515b5937a570a09c0c1fd5157 SHA512 4b11f463b4c0a64ca2f1153bcc008b50c9c4b038119bfe26b0668460b30b346858c4bfdcd66868fe30782fce0e6cc6f3e0fa378c2cbcfe0f7403244407e98019 WHIRLPOOL 5961520403e6101031d0063065ec58204fc2941b8e4f3a24c10ed5d86b1e788f721357adc30b22986fe35d16ad5ae4ae9ead630bc5f8fd777f4b4c0d56b2da2d
-MISC ChangeLog 78215 SHA256 ed2be1b2c63111346405adb70f1869196f88fcfdd061d1cfa6c34489eba8cf32 SHA512 16bac31ff3a7b2a3f4cfe407b10c157b8b9cc65f5c4af5a6d6e8f1d2de35006ad3d965cc056afabb4f4ba81f862146f6da3df89dcb1a66a0c1a5d895354fdda7 WHIRLPOOL 092cb5f6bd9d723828abeda88b3817ff03032cb3b8ddc4195ecdb2e1112a9691000efe2247565aec6d44c9607ee910d333ac8061150c8e1d79de609ebc9d9afb
+MISC ChangeLog 78417 SHA256 0836b9ce47af9f6d866b5bff44861fab98e877dca2b208c7ffd2cb451f8a961a SHA512 d69d290d19110d6d3c0b4e2a0eaeb732c434b622438070253326b49d11417c742c5b690a758d6ccb90fd99f079d8841c5d168e23fa42be1286b38c24df999701 WHIRLPOOL 97ca7db577dae5647e311dabef958838912e76236954b46d6d0dadd016adcb9992b1852a656d2e4028d62659d65b3c43f821216720998e0795005a6382869ac9
 MISC metadata.xml 1265 SHA256 9684c4d743e651bacb1c5c0775e738bce5d99d5fdee933c0d2f4a62b470417ee SHA512 87e754fa6ad0f2309104ce9d316d30080e7bdfa1b5881b5cf84bd181e03c77e29c128ad9433eb1acaf8eb7c008afd97670e81716e0251b44e1f053d902bf03f8 WHIRLPOOL ad0baa1456718b3820912d94cd8c421177af9103d393a55309776fbff42dfc98d7c2af50d4874cf6b554cbccb4a62f241d3abe190596d5b30d14c9333b02ce33
diff --git a/media-sound/amarok/amarok-2.7.1-r1.ebuild b/media-sound/amarok/amarok-2.7.1-r1.ebuild
new file mode 100644
index 000000000000..fd6dd990bf54
--- /dev/null
+++ b/media-sound/amarok/amarok-2.7.1-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.7.1-r1.ebuild,v 1.1 2013/08/19 14:29:44 mrueg Exp $
+
+EAPI=5
+
+KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr
+ga gl hu it ja lt lv nb nl pa pl pt pt_BR ru sl sr sr@ijekavian
+sr@ijekavianlatin sr@latin sv uk zh_CN zh_TW"
+KDE_REQUIRED="never"
+VIRTUALX_REQUIRED=test
+inherit flag-o-matic kde4-base
+
+DESCRIPTION="Advanced audio player based on KDE framework."
+HOMEPAGE="http://amarok.kde.org/"
+if [[ ${PV} != *9999* ]]; then
+	if [[ $PV == *[6-9][0-9]* ]]; then
+		SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
+	else
+		SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+	fi
+	KEYWORDS="amd64 ppc x86"
+else
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
+
+if [[ ${PV} == *9999* ]]; then
+	RESTRICT="test"
+fi
+
+# ipod requires gdk enabled and also gtk compiled in libgpod
+COMMONDEPEND="
+	app-crypt/qca:2
+	>=app-misc/strigi-0.5.7
+	<kde-base/kdelibs-4.11.0
+	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop(+)' 4.8.4)
+	$(add_kdebase_dep kdebase-kioslaves)
+	>=media-libs/taglib-1.7[asf,mp4]
+	>=media-libs/taglib-extras-1.0.1
+	$(add_kdebase_dep nepomuk-core '' 4.9.0)
+	sys-libs/zlib
+	>=virtual/mysql-5.1[embedded?]
+	>=dev-qt/qtcore-4.8:4
+	>=dev-qt/qtdbus-4.8:4
+	>=dev-qt/qtscript-4.8:4
+	>=x11-libs/qtscriptgenerator-0.1.0
+	cdda? (
+		$(add_kdebase_dep libkcddb)
+		$(add_kdebase_dep libkcompactdisc)
+		$(add_kdebase_dep audiocd-kio)
+	)
+	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
+	lastfm? ( >=media-libs/liblastfm-1.0.3 )
+	mp3tunes? (
+		dev-libs/glib:2
+		dev-libs/libxml2
+		dev-libs/openssl
+		net-libs/loudmouth
+		net-misc/curl
+		>=dev-qt/qtcore-4.8.4: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
+	test? ( dev-cpp/gmock )
+"
+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=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 ofa LibOFA)
+	)
+
+	mycmakeargs+=(
+		$(cmake-utils_use_with utils UTILITIES)
+	)
+
+	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
+}