[media-sound/amarok] Drop the player use flag until upstream allows to

disable the player again. Apply Matěj Laitl's patch to amarok-2.5.0.

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

5 files changed, 291 insertions, 18 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index e1d0cf15eb71..8e8f147c4868 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/amarok
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.414 2011/12/20 09:22:09 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.415 2011/12/28 01:39:32 jmbsvicetto Exp $
+
+*amarok-2.5.0-r1 (28 Dec 2011)
+*amarok-2.4.3-r1 (28 Dec 2011)
+
+  28 Dec 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-2.4.3-r1.ebuild, +amarok-2.5.0-r1.ebuild, metadata.xml:
+  [media-sound/amarok] Drop the player use flag until upstream allows to
+  disable the player again. Apply Matěj Laitl's patch to amarok-2.5.0.
 
 *amarok-2.5.0 (20 Dec 2011)
 
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 65b5da70c59c..ac4b6987407d 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -9,24 +9,26 @@ DIST amarok-2.4.0.tar.bz2 15219572 RMD160 f32a664521b9827ef8e7d49100e39b69fa87dd
 DIST amarok-2.4.3.tar.bz2 17468203 RMD160 02026c400025e944c69f31b29013c8054a2575d2 SHA1 8a46fca6a550a4ca403a9be7f595728c819641c4 SHA256 6ce448ecd30cc3d45211617636904e3662c2082441b79ca1e36685c8b0be8208
 DIST amarok-2.5.0.tar.bz2 46607238 RMD160 4506d4b4b1b11378d25ad488f3bdba54cd9b7567 SHA1 9849900d20225e703c43d242650a8fa211cf15f2 SHA256 1ed191db290fdede7c910c322cff2aba8ecfc1c4af891508d9ee410db3768849
 EBUILD amarok-2.4.0.ebuild 4023 RMD160 a083182d5ef0a4a6bf3fb06f3a2ce94ab12b655c SHA1 c8c363ac52361fb9345450304a63f14a98f9e991 SHA256 d36c21adcf3aa887d63d1b560b3ffa959cc9935f7e630189f6eee9288a96c836
+EBUILD amarok-2.4.3-r1.ebuild 3269 RMD160 a71de6983d0bb6359070480ce7e791c4d8857af5 SHA1 2755d73f6ff802b57be9f6fd3c9b51a0f7ef83e6 SHA256 38a6c09a339452ac74f30d1f831cc48938052f91c38cd4be264b5e332a56103b
 EBUILD amarok-2.4.3.ebuild 3961 RMD160 11e52e8f6a63848dfa992c56098a7f4dca7ad880 SHA1 9cea33664da7ba5e06f01854b4f1932cb9af4dec SHA256 d1c04f5e1011c7e56804542109077e4a5dc531c1411c8b204c1b18cdbf1a1690
+EBUILD amarok-2.5.0-r1.ebuild 3966 RMD160 2816b589be08ad8c5197723a4d902c36cf165bfd SHA1 ad0657954ff637154d2dcfd937bc6c4a08e1b73d SHA256 a81f7207d6cbd8317c15e6f6c2cd133b90d08c80137722d62c43f235dc691f3e
 EBUILD amarok-2.5.0.ebuild 3961 RMD160 9ca6c640799a9697ea3e86b0a561e7787b14688e SHA1 9a7cef7b24d85eef617b2a67e1bfb69c527d8f4e SHA256 8799d70ae5340af5b974493363fd71863794b2d0107d1a2a8d900b6bb84d3a1e
-MISC ChangeLog 71078 RMD160 329921867608c1046852310deaae6e9ad0cecd96 SHA1 8290d433234463dd789fb840a061f74e5b5eb367 SHA256 f45ea5987546dc288da5633da3010519ef2726346960185a30da9db20c121bde
-MISC metadata.xml 1566 RMD160 1ba975766c2e4e1cb5b162bf97e534c78a638e6b SHA1 6e0705052a0f430b39e693a4a7d722299a4d46c7 SHA256 c034e203d562fb1ac92d0d48436f64d3a36d04a3dadd15c5f7eec73d9298bd71
+MISC ChangeLog 71420 RMD160 98ddcf35d8f12dc644cd39178e8c1aa1d8fb7182 SHA1 ccc71c1b57ab34d4750b38c8a84b41d5dd5890c2 SHA256 f56415bd9c787c9495471f5ac9b04502580f0945c934659d3ae2e1e93ca504ab
+MISC metadata.xml 1739 RMD160 33e05987cb92cbe2d842d2570f14c2832d32c450 SHA1 7200789e72e26ccaabb97051b678ca528040b821 SHA256 d817903b822caa41353f1a32b8e6db9c84c86b824a1e5934ca1051f4fe297fed
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJO8FNjAAoJEC8ZTXQF1qEPgHYQAIqVjgdaIsAeU9aOsqGghQ6o
-96i3kwrWXZfyRMzsHlVBzd6gC6ofL2brBV9oM3W8DbNb1DGEsftohzajMUOWtI5O
-DtDQnOCargCSs6+WkIC/8J97xDIpuC2K8UZZr9GVtjcSSBjmLF0v8UC395YMVVRf
-8FK4O7hO7DCdzerBRsOEyrcQA+KFjfPfz1pJVRFNLXo9uTGmo+LufiLKTQBO5kMo
-47wQWgTNDhYqGsU0lBNNAjXEhe0gsgylpgQxc28ZYHeuU/JJ5PMzk14276IycDtE
-hxutx8lp4roeeZ6LlJGwDOgkYVgF8ZHXpeMbbKHxUIT+wY+ZJQk3bYAP7ZiZlTy2
-LrydpvwT5g2CK+kij8nxuFFK0KRcMizwkmdXxk6mqTMo1c2mGXucxM4nq5GTA+gz
-pMJhDon+T8lU2v9pK4TLlooueyUuh0TxkmXVr+mr7IFCK6XyXX462LWWW4USfUq/
-MAaLnNkYdi0yZJ3A51VAdLk1OI8NDP9NlSNKJAHJCVSKvuKXQcOcVepTHnlmDxri
-I573yNhaFD+89rR0teIRggCmfn1ME6UrHdYwuS/sVjq+Cgqcyduu26XzooP/heTq
-75oxSibQfmWgRtv1XUgAglHZGp7omIupuRCEMh/MX7cyfVAq7iyY/yw+OX4uIRt2
-gPc1i+WSvcgA4ZJ10YhW
-=AcoI
+iQIcBAEBAgAGBQJO+nLyAAoJEC8ZTXQF1qEPyIwP/1zqDV7OkBkAoSqqL+Hvs092
+MhQjUsMvmAz1ix3z+kc5jC+oz6wSIzNrMD3a1RIkiM9+5K0RniyshZmXGWYTtCLs
+GlJmy+BLNZ6SRYDGIWjGPGOO6omQ32I/MDq936hKm48GfBeYf8ONw5I0Rs2f+i46
+62AtyebwPHnZwBpnXuiJv5ZCJ3dOJExDJo6tjROERxJ755vq3fcDq9oX48L7SBzd
+LLsl+ArUW4X0FCO/Y/Y3rTKwmb+OISpxYB0RzTz1OPNyjL9ZRBDxBZR3F4eNDkuS
+H6r0vK3Ze9jXxzRSOD2CZictysZdbUyRK5WpXLI2VHbjxjYRzkT4neJsTZC3P8EJ
+roXZ/J8M81SWs8b6NLOGrA+oE2qwskWwtXQdrO+y+3s5SLAz6eIeVGsyidcKxv6c
+0ruNSNjZt+raZWrHRJ4DPA3gg9jOj6qs1PUAWGUU8bebdbVifnTTy2VK+0koYpZ4
+R7VqyO29kaarWsqsLwhSzG5RK2dslPhBL1upiunAqNL500e327WkV/JxFFL5syBi
+EdUZWxFclNd/GhMvY6axRVbvWBZMQ6Q3e3R/cynA0jfr6O1kCcdIC3ZJZfaqx7Qz
+oSGdxRurBcowi/bPKnyQ+dSUYkcwvJHrgr6aES66WbelsDM9lk6jB1+I350lphKZ
+QOEZ5srNHTq4uG2qtUcz
+=3vu7
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-2.4.3-r1.ebuild b/media-sound/amarok/amarok-2.4.3-r1.ebuild
new file mode 100644
index 000000000000..a8a1c52256ad
--- /dev/null
+++ b/media-sound/amarok/amarok-2.4.3-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.3-r1.ebuild,v 1.1 2011/12/28 01:39:32 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/stable/${PN}/${PV}/src/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~x86"
+else
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp 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-script
+	>=x11-libs/qtscriptgenerator-0.1.0
+	cdda? (
+		$(add_kdebase_dep libkcddb)
+		$(add_kdebase_dep libkcompactdisc)
+		$(add_kdebase_dep kdemultimedia-kioslaves)
+	)
+	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
+	lastfm? ( >=media-libs/liblastfm-0.3.0 )
+	mp3tunes? (
+		dev-libs/glib:2
+		dev-libs/libxml2
+		dev-libs/openssl
+		net-libs/loudmouth
+		net-misc/curl
+		x11-libs/qt-core[glib]
+	)
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	opengl? ( virtual/opengl )
+"
+DEPEND="${COMMONDEPEND}
+	dev-util/automoc
+	dev-util/pkgconfig
+"
+RDEPEND="${COMMONDEPEND}
+	$(add_kdebase_dep phonon-kde)
+	!media-sound/amarok-utils
+"
+
+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
+		$(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)
+	)
+
+	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
+}
diff --git a/media-sound/amarok/amarok-2.5.0-r1.ebuild b/media-sound/amarok/amarok-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..36251368891c
--- /dev/null
+++ b/media-sound/amarok/amarok-2.5.0-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.5.0-r1.ebuild,v 1.1 2011/12/28 01:39:32 jmbsvicetto Exp $
+
+EAPI=4
+
+KDE_LINGUAS="af ar ast be bg bs ca ca@valencia cs csb da de el en_GB eo es et
+eu fa fi fr ga gl he hr hu is it ja km ko ku lt lv mai ml ms nb nds ne nl nn
+oc pa pl pt pt_BR ro ru se si sk sl sq sr sr@ijekavian sr@ijekavianlatin
+sr@Latn sv tg th tr ug uk wa zh_CN 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/stable/${PN}/${PV}/src/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~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-script
+	>=x11-libs/qtscriptgenerator-0.1.0
+	cdda? (
+		$(add_kdebase_dep libkcddb)
+		$(add_kdebase_dep libkcompactdisc)
+		$(add_kdebase_dep kdemultimedia-kioslaves)
+	)
+	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
+	lastfm? ( >=media-libs/liblastfm-0.3.0 )
+	mp3tunes? (
+		dev-libs/glib:2
+		dev-libs/libxml2
+		dev-libs/openssl
+		net-libs/loudmouth
+		net-misc/curl
+		x11-libs/qt-core[glib]
+	)
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	opengl? ( virtual/opengl )
+"
+DEPEND="${COMMONDEPEND}
+	dev-util/automoc
+	dev-util/pkgconfig
+"
+RDEPEND="${COMMONDEPEND}
+	$(add_kdebase_dep phonon-kde)
+	!media-sound/amarok-utils
+"
+
+src_prepare() {
+	# en locale is special in a way that it is always enabled. English Amarok
+	# handbook however lies in the doc/en_US folder and thus is not picked
+	# up by kde4-functions eclass. Rename it.
+	sed -e 's:add_subdirectory(en_US):add_subdirectory(en):' \
+		-i "${S}/doc/CMakeLists.txt" \
+		|| die "Replacing en_US by en in doc/CMakeLists.txt failed."
+	mv "${S}/doc/en_US" "${S}/doc/en" || die "Moving doc/en_US to doc/en failed."
+
+	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
+
+	# Mygpo-qt not yet in portage, add IUSE when available
+	mycmakeargs=(
+		-DWITH_PLAYER=ON
+		-DWITH_Libgcrypt=OFF
+		-DWITH_Mygpo-qt=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)
+	)
+
+	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
+}
diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index bd6a479359b3..0ed4fbd7afc5 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -19,11 +19,20 @@
       Try disabling this if you encounter -PIC related in amarok,                                                             
       it will make amarok rely only on standalone MySQL server.                                                               
     </flag>
-    <flag name="lastfm">Enable Last.fm streaming services support through <pkg>media-libs/liblastfm</pkg></flag>
+    <flag name="lastfm">
+      Enable Last.fm streaming services support through
+      <pkg>media-libs/liblastfm</pkg>
+    </flag>
     <flag name="mp3tunes">Enable mp3tunes integration</flag>
+    <flag name="ofa">
+      Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic
+      fingerprints (used by MusicBrainz)
+    </flag>
 	<flag name="playdar">Build the playdar collection</flag>
 	<flag name="player">Build the player</flag>
 	<flag name="upnp">Support for upnp servers</flag>
-	<flag name="utils">Build the utils - old <pkg>media-sound/amarok-utils</pkg></flag>
+	<flag name="utils">
+      Build the utils - old <pkg>media-sound/amarok-utils</pkg>
+    </flag>
   </use>
 </pkgmetadata>