Added amarok 2.3.1.90 (2.3.2 Beta1).

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 160 insertions, 2 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 29293768c5a8..443daafb6420 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,12 @@
 # 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.386 2010/08/10 12:55:46 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.387 2010/08/24 01:17:32 jmbsvicetto Exp $
+
+*amarok-2.3.1.90 (24 Aug 2010)
+
+  24 Aug 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-2.3.1.90.ebuild:
+  Added amarok 2.3.1.90 (2.3.2 Beta1).
 
   10 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   -amarok-2.2.2-r1.ebuild, -files/amarok-2.2.2-nodebug.patch,
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index f1bf12a78416..f177e995647e 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,6 +1,8 @@
 AUX amarok-2.3.1-fix-trayicon.patch 13469 RMD160 36f5ae424bdd6d865bfce203e7d74f08966ad379 SHA1 f0110088ecd826b652d558c7463a0a717ed5080b SHA256 4adb543ab25a86f85ea7b914e66374faeca0df8e02aa40682cee17d137a9b76a
 AUX amarok-fix-accessibility-dep.patch 687 RMD160 184a28eecb351117c8ce3c922112e7ac5c4efde1 SHA1 e9ea735d7431fb3c11f5aabab0935c637826059c SHA256 8d631d10dccce5a72eb24a366afc5672d7853fba8a5c667e300549d8ee85170d
+DIST amarok-2.3.1.90.tar.bz2 16081136 RMD160 1a82aac61e2bb8546c0f66f55a159592cb0c324d SHA1 9b6be6263da71a792b8f1b517529dbd237e32832 SHA256 ba2f7db419ddd5b2f00d24bb2d755fea7d450968d0874b10b13a64fce3497459
 DIST amarok-2.3.1.tar.bz2 9823411 RMD160 70e581bd681361d7837f1ed295191174e92e9f8f SHA1 00a596384df8d155b91b40bb2484ec0a7f51da80 SHA256 3fef3f4d4b4ffa22faf4a3b97e2c2bcfde85f55a9973b1ad6d66df55068b4a72
 EBUILD amarok-2.3.1-r2.ebuild 4915 RMD160 f2d19c5d9420659d408306fa682cf24cae39386e SHA1 a99199f5af5c22710c7687ec8b84b41e1bcdd88f SHA256 d1c83136de4ebf642cad3dcbe90545b04985fd1c816d287da6f60999e17adbe8
-MISC ChangeLog 65030 RMD160 5fa209cf5e2c3666ee29e46ae173559bb7164623 SHA1 1e44c10fcd1e1cf8807cb2658710c5a18ef862fd SHA256 e3cbbe042ac0399cc295c541025ae025f18fb6dcd8d5d1cca84b8a86b5ee170b
+EBUILD amarok-2.3.1.90.ebuild 4194 RMD160 c562d422c8ba7c0e0986f150eac34ed1e27cba3e SHA1 551261a3322f885a61c177fab9eb7d80c7d2a03e SHA256 d12f64a1f87fddc69a3599533a0ea4df5d323b7c9fa06ca9dbd80a9664a6e63f
+MISC ChangeLog 65198 RMD160 31b0da537b7ce442ac2081a4ddcdbae082fbc0c7 SHA1 acc6d7119844d79b3382d8e2a1482956ad3902a6 SHA256 37cf7830e3ab1151d156a17ba3ff945ba865d0a59585e261ce591172891b1388
 MISC metadata.xml 1413 RMD160 62fc2ae4eae51f52f3ef02d86e8b244a3132ba86 SHA1 dda8b8bf344947925b93744cff693605f46c1006 SHA256 be46bcd7f470f66bb3afc8df3338aab204e055e10f042d4bae2be65eae7b3f8f
diff --git a/media-sound/amarok/amarok-2.3.1.90.ebuild b/media-sound/amarok/amarok-2.3.1.90.ebuild
new file mode 100644
index 000000000000..e9ec37745ded
--- /dev/null
+++ b/media-sound/amarok/amarok-2.3.1.90.ebuild
@@ -0,0 +1,150 @@
+# 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.90.ebuild,v 1.1 2010/08/24 01:17:32 jmbsvicetto Exp $
+
+EAPI="2"
+
+# Translations are only in the tarballs, not the git repo
+if [[ ${PV} != *9999* ]]; then
+	KDE_LINGUAS="af bg ca ca@valencia cs da de el en_GB es et fr it ja lt lv nb nds pa pl
+	pt pt_BR ru sk sl sr sr@ijekavian sr@ijekavianlatin sr@latin sv th tr uk zh_CN zh_TW"
+	SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
+else
+	EGIT_REPO_URI="git://git.kde.org/${PN}/${PN}.git"
+	GIT_ECLASS="git"
+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"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+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]
+		|| ( >=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 )
+		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
+}