Revision bump introduces USE flag nepomuk, bug #508350.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

4 files changed, 164 insertions, 16 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index b2a083c269e5..c1d116484f51 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/amarok
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.468 2014/03/14 14:47:58 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.469 2014/05/13 18:15:58 johu Exp $
+
+*amarok-2.8.0-r2 (13 May 2014)
+
+  13 May 2014; Johannes Huber <johu@gentoo.org> +amarok-2.8.0-r2.ebuild,
+  metadata.xml:
+  Revision bump introduces USE flag nepomuk, bug #508350.
 
 *amarok-2.8.0-r1 (14 Mar 2014)
 
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 6131f8dbf4ba..bc8220f55afb 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -4,23 +4,24 @@ Hash: SHA256
 AUX amarok-2.8.0-gmock-1.7.patch 1205 SHA256 3d780ba18dfda23eb19772dd803969a72b7bb47c5181060bdb18257cd16ce88b SHA512 6bbbdf633f65337523d023decd6b3ca889a2bf9b10e93d12f686e273144a58dd398813a99474adf8d35ad1184658f77626b040be288b44a9ac58424a51d05790 WHIRLPOOL a4c45a1386cd8f5c5b97e4fb6563b3e59de19de61d584669ee62f8884d5cafacdb746e6578b2e2f9adf20779ff059d758cea1686ced9c7392b1f9dd1b6ee5b87
 DIST amarok-2.8.0.tar.bz2 39950028 SHA256 f4b89b28f217a6d947e55fb0890de22fad8c404794c6beeb2dcaf2711b4f8ec6 SHA512 09f7f675f1223d36fb9df2f8c88923c6616524e022ad83b12bcb770dfbf60cb6b191e4035633f2ea2eee5fb7b38e6d5092cf69fe222ef9c3f3c46ba8f157a62d WHIRLPOOL 108cfd95d65e74f28f85a846f605bc349e5b2962b7f9a357415225f3e48ff87148d7f50a642665cc3c809bb2cb4c22f339ad049cdeb4659bb7c0a48e798833ad
 EBUILD amarok-2.8.0-r1.ebuild 3777 SHA256 ec2b5fca44fc58098509a56b2def1fa476a7017bf47103a90c4bc3834bdc1ca3 SHA512 3290e311763aa97a50fa2b1c1027afc8459c424015cfdfb028ffb213b0f13433c3514c76e95372b146f45c5af6c52d8b4b249bb9d2ce1ec42331f66332fc6031 WHIRLPOOL a1cceea348e43a1c27e4550e7e5ecb5c4a4499eb4ab483b1c8d119fcacd82e7ed58859739e94e27d2718b6085522114cda7ff94bcbff1d8e918b599e01aa5715
+EBUILD amarok-2.8.0-r2.ebuild 3745 SHA256 7ba006d5ad732d9cf66e524c3e779d1571215b5d36a390e5a70255fc2bbd030d SHA512 c1ca7420acdcdbde780c6010ce90e0367cfaf2b448142fb97b75a3ec3c0f2309294222dec7c970dbf6cb95a2b2d097d8a540f3426c15cf8aa142c4fab13898d8 WHIRLPOOL 7219d02eff553460abcf20755dc56ffc5c06c5d7ec214f2628d1cec55b3efb5ca027984251bb5caa283d3a2461297c684fec77eb279d178f8785b52124b1b9cf
 EBUILD amarok-2.8.0.ebuild 3584 SHA256 67ed6b77d0f365efaad45bfe43d0719b62285871f82c11988eaee232dac48edf SHA512 2217db5bfbe0ed547201a4e5d473c0b56ca1d65bd16c8b422f6f4f7d4b4535d0b4e9eb8eee968f40234ba89b08e0bb53b61fdc9e66480243fe03dad59a271300 WHIRLPOOL 47777678cc16b9d4c3fd87ae424764f08fe75bf9c8715301db4e2d79ca2066c47c47f4d84cc63aea34cedf6e8c149879fbbf6e02a704986197ff80ebb3887236
-MISC ChangeLog 79650 SHA256 67a81f9ece5559863278ef96685859b57ec63dff6cc70a27b905c95a6c1640fa SHA512 4c0b10ac923c59ff83d296d4de4b6f283dd736ba18fcbcd0ef33661bafadea0d1fca3a561b2e5b1e0fbb82dfbb3883217797106aec43259a47adfbc65697c4ab WHIRLPOOL daa43dbb92ebbb0f2c30af6c74b66bdc99e444e0a1be29272d0b06abb9e7fcce84bf44117942bc6051929246f75f6e4d06aaac60167cf72be13e80278ce0312f
-MISC metadata.xml 976 SHA256 6fa627cd8f2b750d82864acd42b95ad76edcf91389356880728b21c071974f08 SHA512 e6b5cfd73a40577fbb8a3f082b1ab6c80185219b89f41badfd9b44686a6ae48254f225f4a46020dc45daed20d4b39c8c4120267ef7534a97cead0645eee89aca WHIRLPOOL 1766ac06339c55fabd2fa40d2a0b07260b26815224bd2c73dd6d67827f1c4a99c0318954fab95fd4304719de931664b6ed27035207a679b473d013a0152365b6
+MISC ChangeLog 79830 SHA256 182e2f546917bd6c614d0dc9573c27bd351dc9bae7224175a3f53e9960c893c1 SHA512 c79c64d6f90dda2a9196ded54ef1c938cd75c9267356d40d6268d03eab717c808c7621f1dd8437cc3f58505c958e4b0872cb9727bbe518c635d84486a39a484e WHIRLPOOL 634f9c539d70c05752e3c5dbebb290b48e5854ba92ef75768ca272a136bb5654cfb448863c2c1f6fa40ea83c847a7b16eb377af8274c733b48c7fd5a156a534b
+MISC metadata.xml 1064 SHA256 8e46a720b86b83508c2bf4a5a3be43bbdabb1bf8e057b547dc881912fea035e6 SHA512 d576c1e66b3e76e899f4580a908d41a0ad2faaae0346b47fe5e4d925763428e705be2fe7246f4109a4b470c6a75acd445215722fc3b3e82709af765d659e7705 WHIRLPOOL 9b1235b62922630dbb2968c62dda7cac97eddc48a4857232d6a0aa25abdb756dad474281d39f2e342e719adb9f6311a6004e3b629496975e8b82f68d4487f96e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTIxajAAoJEGVpnaTzz9K9EfoQAKx0qpVCTdQCPb61acAvxJ5J
-kHAvgy4TVZBsY0Sbqj5VAoaklfcGidm543YVEfqxyCwtL1WxiGoOqJ/OznRfWfqA
-e4C+6dbWsYK1YJHjBtDgpSSWGcTuEPvNesxoAbBVRHNUqzgI7yZIUZONtZm2CFn4
-YwLbXJMM0wVM/G4FuxenPd8HRqt1vnDjER8kUDdi2S7N0q/FiqbzkmA9Dq4IKWZ/
-Ei1mW56Z6Wwe/cugyzbhAF9BwAyxsgkaNhX31QJdnkDop1ilhOsznba4LbrQb8hI
-Nqd4lWz88wXZI4TY0v0L5wURnY4rLjRv82t+Rrw8IxlOlAf/7QXuRS5+H+nvCYb0
-IsA2UgQJzElfZ5r+XAsA2Cl49GclNGQuikmXclEidZXCrJNuxJVwK3q0COrX9f+U
-wjUAmc6buhR3Z+N9+td74XTA/nP933sw9yP71eIBVm61gdFsfLtuVNc+rMj3ZOAQ
-n7QyU3oLChMus7FBrqUX44lca3E/RJ+WMOQNulvr803So2qmoBonxtW3/BtWxgWd
-72oi7PTcYuuwpQBa4ytNITbdSITVk7u0gwBKEqjkEJcUTOzvfhrbXykHjIkG9KAk
-oBYTvJSXkFY5T14nL0W5jQpcTwm+v8bkye4iJ21vA4K+6CKFNuW4KhX39FyhcLGQ
-53ExKch1TS2ynrjBB0Gz
-=Ra0Z
+iQIcBAEBCAAGBQJTcmFfAAoJEGVpnaTzz9K995EP/i//3FhO6N/l6pyzUS6kllg0
+0rfm+6A2HFUrTlErvKFJj1pOcvDA+zKuuktz7bHVu/Da/lYhvDJTwOldEgb55APG
+B6bPPh5aL7FZVMv7RjKyNF4FZYVQ/86rqEP9OJWMeXABBvqibiwU+e9MsiP4POAh
+GevmiZFBpvslxaAxGNYw2mh/dLPhSDdLqNGFQMGNTQS64ahtfQsdbLJ1LcBQIVtm
+oVfhJCnF8zqUFBMejomRYr3qxyLglOhI2XfdQWrAqyYSjD7iQS01ThQI0GLkUvOW
+UyLgan4cLA+GPvSub/HSpv1yVXmjg0TMcNCvDsQgGuFwZvwu9zVkPKCZjD1IdW/i
+pYwuLA8AMk48sQbFONsgtruCwNylNIia29CARo6ikdc6Qb97KrQcygsTbmgJCaaJ
+FgTd5esKkjdPuNNW+7eOFTkfvpUUYbDFVWInmHBazmqvoYm20FMEKl7UGiltTKjs
+UGH2bsxGfI24YDnl6FNbK9YBc1X5eY26AOIhYh2TUXwFNq3hj1RxHapFByO8p2T9
+rP0Uh/U1RsJz3GU95iPpoNjLjnNICNQtL6gyKOj7SX2bSLbNzB0cMEY5PqeW40zw
+I4LXkvmDn2ydLXEb8TcwUfjF9/rI1NeA+egrHNelZtSDz4NKRj8oo1lLCH+Eu0nL
+mPTN0A+5EntZaV3C196q
+=mmqm
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-2.8.0-r2.ebuild b/media-sound/amarok/amarok-2.8.0-r2.ebuild
new file mode 100644
index 000000000000..d2d287cde0b7
--- /dev/null
+++ b/media-sound/amarok/amarok-2.8.0-r2.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.8.0-r2.ebuild,v 1.1 2014/05/13 18:15:58 johu 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 ro ru sl sr sr@ijekavian sr@ijekavianlatin sr@latin
+sv tr uk zh_CN zh_TW"
+KDE_REQUIRED="never"
+KDE_HANDBOOK="optional"
+KDE_MINIMAL="4.13.1"
+VIRTUALX_REQUIRED="test"
+VIRTUALDBUS_TEST="true"
+inherit flag-o-matic kde4-base pax-utils
+
+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 debug +embedded ipod lastfm mp3tunes mtp nepomuk ofa opengl test +utils"
+
+if [[ ${KDE_BUILD_TYPE} == live ]]; then
+	RESTRICT="test"
+fi
+
+# ipod requires gdk enabled and also gtk compiled in libgpod
+COMMONDEPEND="
+	app-crypt/qca:2
+	$(add_kdebase_dep kdelibs 'nepomuk?,opengl?' 4.8.4)
+	$(add_kdebase_dep kdebase-kioslaves)
+	>=media-libs/taglib-1.7[asf,mp4]
+	>=media-libs/taglib-extras-1.0.1
+	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 )
+	nepomuk? ( >=kde-base/nepomuk-core-4.9.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)
+"
+
+PATCHES=( "${FILESDIR}/${P}-gmock-1.7.patch" )
+
+src_prepare() {
+	if [[ ${KDE_BUILD_TYPE} != live ]]; then
+		mv doc/en_US doc/en || die
+		sed -e "s/en_US/en/" -i doc/CMakeLists.txt || die
+	fi
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
+	use ppc64 && append-flags -mminimal-toc
+
+	local 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 nepomuk)
+		$(cmake-utils_use_with nepomuk Soprano)
+		$(cmake-utils_use_with ofa LibOFA)
+		$(cmake-utils_use_with utils UTILITIES)
+	)
+
+	kde4-base_src_configure
+}
+
+src_install() {
+	kde4-base_src_install
+
+	# bug 481592
+	pax-mark m "${ED}"/usr/bin/amarok
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	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
+}
diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index c964fd8c4bac..e4da6b0d2ef6 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -18,6 +18,7 @@
 	<flag name="mp3tunes">Enable mp3tunes integration</flag>
 	<flag name="mtp">Enable support for libMTP (Plays4Sure) devices access through libmtp
 	</flag>
+	<flag name="nepomuk">Enable Nepomuk based semantic desktop support (deprecated)</flag>
 	<flag name="ofa">Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic
 		fingerprints (used by MusicBrainz)
 	</flag>