[media-sound/amarok-2.3.90] Added amarok-2.3.90 (2.4 beta 1).

5 files changed, 168 insertions, 2 deletions

diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 08f1514ca52..640a7c99b8b 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,2 +1,4 @@
-EBUILD amarok-9999.ebuild 4036 RMD160 2de30f29c488f4577b493a4da474e82cf3ca80ec SHA1 944ccdab0b731c09587fde2efd6dc8dc867ec026 SHA256 3493695ee22fb93758d2e6c4dcf6caddafc800fed790c1454cc5c398cd90467f
+DIST amarok-2.3.90.tar.bz2 14920987 RMD160 3c6456fc82875b61a1d1fb7b45cbf43e519da60a SHA1 bf67c7ac9d436fe76f75734a6c011efa5e824947 SHA256 727072e7d6e3af71098452c76385e9f0983a5ac8e3224c43de893fdb97ee795f
+EBUILD amarok-2.3.90.ebuild 4073 RMD160 ec797b2077228777121219108020bab59aca5e1d SHA1 a62a2c7249737200f720966a904d64e9a79e29cd SHA256 4a3dc8bac1da3fab2977c3d52813b08d4bec3148a0273cac8ff1883a76c62c49
+EBUILD amarok-9999.ebuild 4073 RMD160 ec797b2077228777121219108020bab59aca5e1d SHA1 a62a2c7249737200f720966a904d64e9a79e29cd SHA256 4a3dc8bac1da3fab2977c3d52813b08d4bec3148a0273cac8ff1883a76c62c49
 MISC metadata.xml 2384 RMD160 1e9411c37f455cd9fb86123666aa5854c0e10a1a SHA1 1a8e81fd7a81d4a977cc1c3c538f8dec79a8dbd5 SHA256 4a5e4eb285dd976746a8967d78c44b79fd1d04762df33db186faf3c254f2c19d
diff --git a/media-sound/amarok/amarok-2.3.90.ebuild b/media-sound/amarok/amarok-2.3.90.ebuild
new file mode 100644
index 00000000000..08c0d2a2b23
--- /dev/null
+++ b/media-sound/amarok/amarok-2.3.90.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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"
+	SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+else
+	EGIT_REPO_URI="git://git.kde.org/${PN}.git"
+	GIT_ECLASS="git"
+	KEYWORDS=""
+fi
+
+KDE_REQUIRED="never"
+inherit flag-o-matic kde4-base ${GIT_ECLASS}
+
+DESCRIPTION="Advanced audio player based on KDE framework."
+HOMEPAGE="http://amarok.kde.org/"
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp opengl +player 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="
+	>=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]
+		>=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?]
+		sys-libs/zlib
+		>=virtual/mysql-5.1
+		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.50-r3[embedded]
+				>=dev-db/mariadb-5.1.50[embedded]
+			)
+		)
+		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 )
+	)
+	utils? (
+		x11-libs/qt-core
+		x11-libs/qt-dbus
+	)
+	!player? ( !utils? ( media-sound/amarok[player] ) )
+"
+DEPEND="${COMMONDEPEND}
+	dev-util/automoc
+	dev-util/pkgconfig
+"
+RDEPEND="${COMMONDEPEND}
+	!media-sound/amarok-utils
+	player? ( >=kde-base/phonon-kde-${KDE_MINIMAL} )
+"
+
+src_prepare() {
+	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() {
+	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
+	use ppc64 && append-flags -mminimal-toc
+
+	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 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 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/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 29985b55c17..08c0d2a2b23 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -9,9 +9,11 @@ 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"
 	SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 else
 	EGIT_REPO_URI="git://git.kde.org/${PN}.git"
 	GIT_ECLASS="git"
+	KEYWORDS=""
 fi
 
 KDE_REQUIRED="never"
@@ -21,7 +23,6 @@ DESCRIPTION="Advanced audio player based on KDE framework."
 HOMEPAGE="http://amarok.kde.org/"
 
 LICENSE="GPL-2"
-KEYWORDS=""
 SLOT="4"
 IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp opengl +player semantic-desktop +utils"
 
diff --git a/profiles/package.mask b/profiles/package.mask
index 07ec366014e..398f47dfd12 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,6 +1,10 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Edit profiles/package.mask.d/ files instead.
 
+# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (5 Dec 2010)
+# Masking amarok-2.3.90 until the tarball is released
+=media-sound/amarok-2.3.90
+
 # Markos Chandras <hwoarang@gentoo.org> (14 Jul 2009)
 # Name changed to plasma-applet-daisy.
 kde-misc/daisy
diff --git a/profiles/package.mask.d/amarok b/profiles/package.mask.d/amarok
new file mode 100644
index 00000000000..c2d5c536b05
--- /dev/null
+++ b/profiles/package.mask.d/amarok
@@ -0,0 +1,3 @@
+# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (5 Dec 2010)
+# Masking amarok-2.3.90 until the tarball is released
+=media-sound/amarok-2.3.90