[media-sound/amarok-2.3.1-r1] Merged amarok and amarok-utils. Applied patch to drop the accessibility requirement - should fix bug 319803.

Reviewed mysql deps to allow for mariadb - fixes bug 320807. Applied minimal-toc cflag to avoid issues on ppc64 - should fix bug 280552.
Testing for this masked version is welcomed.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 184 insertions, 3 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 1624f9fb3523..16af8279d466 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-sound/amarok
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.374 2010/06/09 12:42:57 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.375 2010/06/12 01:01:42 jmbsvicetto Exp $
+
+*amarok-2.3.1-r1 (12 Jun 2010)
+
+  12 Jun 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-2.3.1-r1.ebuild, +files/amarok-fix-accessibility-dep.patch,
+  metadata.xml:
+  [media-sound/amarok-2.3.1-r1] Merged amarok and amarok-utils. Applied
+  patch to drop the accessibility requirement - should fix bug 319803.
+  Reviewed mysql deps to allow for mariadb - fixes bug 320807. Applied
+  minimal-toc cflag to avoid issues on ppc64 - should fix bug 280552.
+  Testing for this masked version is welcomed.
 
   09 Jun 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   amarok-2.3.1.ebuild:
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 16164762ce06..713dd3bd6193 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,6 +1,7 @@
 AUX amarok-2.2-mysql-libs.patch 540 RMD160 16b143a50c126ba69851e4c1d1524b1d6b7c175d SHA1 0358c91184604bf4587cfa755202a41ba9c4d346 SHA256 ace02a3f8d20295077de08d17af00382c19ad21ddf4ef324ff7c5e5ec4d666e1
 AUX amarok-2.2.2-nodebug.patch 16478 RMD160 8f8eedbd5a29f10da6243cc4ac586f59ca493a7d SHA1 c2316800d0632b473b14d683415f51a36879922a SHA256 022a655eff5cd918fc61999001a3251de7e406cbffb40127295820eb4e398a29
 AUX amarok-2.3.0-crash_fix_info_applet.patch 1820 RMD160 2ddbd8e30d7c9031eead648430bc8c9e2e6ec0cd SHA1 5aa6fd5ae30c956ea4f4be3d5bb6078af9e88ea3 SHA256 2f48faa43ad621616289b30da5b2febcd2861bc500a73bf9112916d1eeb3b41c
+AUX amarok-fix-accessibility-dep.patch 687 RMD160 184a28eecb351117c8ce3c922112e7ac5c4efde1 SHA1 e9ea735d7431fb3c11f5aabab0935c637826059c SHA256 8d631d10dccce5a72eb24a366afc5672d7853fba8a5c667e300549d8ee85170d
 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.2.90.tar.bz2 9166245 RMD160 0b595183c17b58fe2f9da6afcca44bf32d574366 SHA1 fd0f2f42aae199b63a8fb0818033b4c3c027b866 SHA256 4c1c3da3d7b59847a47c41e46bd4b1425c98e4efd7c325f1818381f37ac65fb9
@@ -15,6 +16,7 @@ EBUILD amarok-2.2.2.ebuild 2850 RMD160 9b7b2f61e0d5b01f4ba3259d8303d72a72f95c6c
 EBUILD amarok-2.3.0-r1.ebuild 3425 RMD160 5a01c3daf02c51e561baf84045a35f672fbd875e SHA1 ddd0cf1ce64761547028f0013eb3d1f918de3075 SHA256 6d60b0ef36d56b43f5cf17eafee55a163e9ddd0823e55e8f4494c92993525644
 EBUILD amarok-2.3.0.90.ebuild 3367 RMD160 4c368035183d2b95553ec0eb332a85e633d3d0c9 SHA1 5723e3890b37187bd6f9b3d9a70d104a18bbe70b SHA256 ecf42c7d9ce4b85efb9813270c6fa0e8379c73208af36bf5ffe766c60528e503
 EBUILD amarok-2.3.0.ebuild 3362 RMD160 383175b7c7192174aa09c4bd17103b7757e634d7 SHA1 ee33ebae814777706f2ae99df51dc2b77f9cf241 SHA256 2d977d3eade9e2dde0baa517775093fafb56e03a5a375595c61be5f7c742689e
+EBUILD amarok-2.3.1-r1.ebuild 4315 RMD160 af8999c13398ec1a3c3c699722d88e5fad48933f SHA1 7730ea30e5078d6ef02ca33671a50683bf61541a SHA256 c14b93342410c1c9fed9f6d09602e9f46c56d3b97995364715be74a23799e1b3
 EBUILD amarok-2.3.1.ebuild 3465 RMD160 7834bed748ffc58ae9573eaad9f779de67332598 SHA1 ce11a10148980406634e9b494c6eeb530c647f7e SHA256 86b44855a9c8ea722406a13ef861350d18ba8e19ff7c11b202e9a3db9557a632
-MISC ChangeLog 61824 RMD160 e396c06129851527318e4aefd6cf47c149b7d59c SHA1 2d0b76cbec01dc7addf017f875f8266dd87b5997 SHA256 d48cf709ce87831c94601aaa077978231d2773444bb4d76ebfeeead115e06158
-MISC metadata.xml 1283 RMD160 f188f32c38a3e5425d86c59b8c1af8f27833d6b2 SHA1 34f8738cfbf39c87b3ef2ed35f43711b3302c15c SHA256 72c533c0a2afe35a34f0064cdac226e714a1d4bfdddd5cbb6a2ecc75541c16c8
+MISC ChangeLog 62341 RMD160 2b30be5446ed5ea6fbc3146447c58441b5b22311 SHA1 7ab3b61c53fd53e30e5549ff5adda71d124513fe SHA256 1af6acb0d487205e7aef2217754f1ad9dea6e11b78ab839f52ffc163ee6f0ef5
+MISC metadata.xml 1413 RMD160 62fc2ae4eae51f52f3ef02d86e8b244a3132ba86 SHA1 dda8b8bf344947925b93744cff693605f46c1006 SHA256 be46bcd7f470f66bb3afc8df3338aab204e055e10f042d4bae2be65eae7b3f8f
diff --git a/media-sound/amarok/amarok-2.3.1-r1.ebuild b/media-sound/amarok/amarok-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..44fd2b1ec5c2
--- /dev/null
+++ b/media-sound/amarok/amarok-2.3.1-r1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.3.1-r1.ebuild,v 1.1 2010/06/12 01:01:42 jmbsvicetto Exp $
+
+EAPI="2"
+
+# Translations are only in the tarballs, not the git repo
+if [[ ${PV} != *9999* ]]; then
+	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"
+else
+	EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git"
+	GIT_ECLASS="git"
+fi
+OPENGL_REQUIRED="optional"
+KDE_REQUIRED="never"
+inherit flag-o-matic kde4-base ${GIT_ECLASS}
+
+DESCRIPTION="Advanced audio player based on KDE framework."
+HOMEPAGE="http://amarok.kde.org/"
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="4"
+IUSE="cdda daap debug embedded ipod lastfm mp3tunes mtp +player semantic-desktop +utils"
+
+# ipod requires gdk enabled and also gtk compiled in libgpod
+# Some UI dialogs require qt-gui built with the accessibility use flag
+DEPEND="
+	!<=media-sound/amarok-utils-2.3.1
+	>=media-libs/taglib-1.6.1[asf,mp4]
+	>=media-libs/taglib-extras-1.0.1
+	player? (
+		app-crypt/qca:2
+		>=app-misc/strigi-0.5.7[dbus,qt4]
+		|| ( >=dev-db/mysql-5.0.76 =virtual/mysql-5.1 )
+		>=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?]
+		sys-libs/zlib
+		x11-libs/qt-script
+		>=x11-libs/qtscriptgenerator-0.1.0
+		cdda? (
+			>=kde-base/libkcddb-${KDE_MINIMAL}
+			>=kde-base/libkcompactdisc-${KDE_MINIMAL}
+			>=kde-base/kdemultimedia-kioslaves-${KDE_MINIMAL}
+		)
+		embedded? ( <dev-db/mysql-5.1[embedded,-minimal] )
+		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-0.3.0 )
+	)
+	!player? ( !utils? ( media-sound/amarok[player] ) )
+"
+RDEPEND="${DEPEND}
+	>=kde-base/phonon-kde-${KDE_MINIMAL}
+	player? (
+		semantic-desktop? ( >=kde-base/nepomuk-${KDE_MINIMAL} )
+	)
+"
+
+# Tests require gmock - http://code.google.com/p/gmock/
+# It's not in the tree yet
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${PN}-fix-accessibility-dep.patch" )
+
+# required for live ebuild, to skip git_src_prepare, to add
+# the minimal-toc cflag for ppc64 and to fix po issues on utils
+src_prepare() {
+	use ppc64 && append-flags -mminimal-toc
+
+	if ! use player; then
+
+		# 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."
+	fi
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	if use player; then
+		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)
+		)
+	else
+		mycmakeargs=(
+			-DWITH_PLAYER=OFF
+		)
+	fi
+
+	mycmakeargs+=(
+		$(cmake-utils_use_with utilities 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 player; then
+
+		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://amaroklive.com/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 "dev-db/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
+	fi
+}
diff --git a/media-sound/amarok/files/amarok-fix-accessibility-dep.patch b/media-sound/amarok/files/amarok-fix-accessibility-dep.patch
new file mode 100644
index 000000000000..d86abe920497
--- /dev/null
+++ b/media-sound/amarok/files/amarok-fix-accessibility-dep.patch
@@ -0,0 +1,13 @@
+diff -urN amarok-2.3.1/src/core-impl/collections/audiocd/FormatSelectionDialog.ui amarok-2.3.1-new/src/core-impl/collections/audiocd/FormatSelectionDialog.ui
+--- amarok-2.3.1/src/core-impl/collections/audiocd/FormatSelectionDialog.ui	2010-05-27 18:37:21.000000000 +0000
++++ amarok-2.3.1-new/src/core-impl/collections/audiocd/FormatSelectionDialog.ui	2010-06-11 18:23:00.157305026 +0000
+@@ -13,9 +13,6 @@
+   <property name="windowTitle">
+    <string>Amarok</string>
+   </property>
+-  <property name="accessibleName">
+-   <string/>
+-  </property>
+   <layout class="QGridLayout" name="gridLayout_2">
+    <item row="0" column="0" colspan="2">
+     <widget class="QGroupBox" name="groupBox">
diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index 69cf7b8fd01e..935d3e8454f0 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -20,5 +20,7 @@
     </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="player">Build the player</flag>
+	<flag name="utils">Build the utils - old <pkg>media-sound/amarok-utils</pkg></flag>
   </use>
 </pkgmetadata>