Bumped amarok to the 2.4.0.90 release (2.4.1 beta 1).

Added a patch to get upnp support - not working yet.

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

6 files changed, 213 insertions, 5 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 9575a8ff0815..9ce861450660 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.399 2011/02/02 04:11:38 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.400 2011/04/19 02:40:05 jmbsvicetto Exp $
+
+*amarok-2.4.0.90 (19 Apr 2011)
+
+  19 Apr 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.3.2-r1.ebuild, amarok-2.4.0.ebuild, +amarok-2.4.0.90.ebuild,
+  +files/amarok-2.4.0.90-fix-upnp-dep.patch, metadata.xml:
+  Bumped amarok to the 2.4.0.90 release (2.4.1 beta 1).
+  Added a patch to get upnp support - not working yet.
 
   02 Feb 2011; Theo Chatzimichos <tampakrap@gentoo.org> amarok-2.3.2-r1.ebuild,
   amarok-2.4.0.ebuild:
diff --git a/media-sound/amarok/amarok-2.3.2-r1.ebuild b/media-sound/amarok/amarok-2.3.2-r1.ebuild
index 836413e69390..5ca44482f737 100644
--- a/media-sound/amarok/amarok-2.3.2-r1.ebuild
+++ b/media-sound/amarok/amarok-2.3.2-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.3.2-r1.ebuild,v 1.6 2011/02/02 04:11:39 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.3.2-r1.ebuild,v 1.7 2011/04/19 02:40:12 jmbsvicetto Exp $
 
-EAPI=3
+EAPI="3"
 
 # Translations are only in the tarballs, not the git repo
 if [[ ${PV} != *9999* ]]; then
diff --git a/media-sound/amarok/amarok-2.4.0.90.ebuild b/media-sound/amarok/amarok-2.4.0.90.ebuild
new file mode 100644
index 000000000000..6440f8e61b7e
--- /dev/null
+++ b/media-sound/amarok/amarok-2.4.0.90.ebuild
@@ -0,0 +1,161 @@
+# 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.0.90.ebuild,v 1.1 2011/04/19 02:40:12 jmbsvicetto Exp $
+
+EAPI="3"
+
+# 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=""
+else
+	KDE_SCM="git"
+	KEYWORDS=""
+fi
+
+KDE_REQUIRED="never"
+inherit flag-o-matic kde4-base
+
+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 playdar +player semantic-desktop upnp +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]
+		$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
+		sys-libs/zlib
+		>=virtual/mysql-5.1
+		x11-libs/qt-script
+		>=x11-libs/qtscriptgenerator-0.1.0
+		cdda? (
+			$(add_kdebase_dep libkcddb)
+			$(add_kdebase_dep libkcompactdisc)
+			$(add_kdebase_dep kdemultimedia-kioslaves)
+		)
+		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 )
+		playdar? ( dev-libs/qjson )
+		upnp? ( kde-misc/kio-upnp-ms )
+	)
+	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? ( $(add_kdebase_dep phonon-kde) )
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-upnp-dep.patch" )
+
+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)
+			$(cmake-utils_use_with playdar QJSON)
+			$(cmake-utils_use_with upnp HUpnp)
+		)
+	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-2.4.0.ebuild b/media-sound/amarok/amarok-2.4.0.ebuild
index 159570393881..c452fbf05272 100644
--- a/media-sound/amarok/amarok-2.4.0.ebuild
+++ b/media-sound/amarok/amarok-2.4.0.ebuild
@@ -1,8 +1,8 @@
 # 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.0.ebuild,v 1.3 2011/02/02 04:11:38 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.0.ebuild,v 1.4 2011/04/19 02:40:05 jmbsvicetto Exp $
 
-EAPI=3
+EAPI="3"
 
 # Translations are only in the tarballs, not the git repo
 if [[ ${PV} != *9999* ]]; then
diff --git a/media-sound/amarok/files/amarok-2.4.0.90-fix-upnp-dep.patch b/media-sound/amarok/files/amarok-2.4.0.90-fix-upnp-dep.patch
new file mode 100644
index 000000000000..d9f149b8197b
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.4.0.90-fix-upnp-dep.patch
@@ -0,0 +1,37 @@
+diff -urN amarok-2.4.0.90.orig/CMakeLists.txt amarok-2.4.0.90/CMakeLists.txt
+--- amarok-2.4.0.90.orig/CMakeLists.txt	2011-04-19 00:03:27.910000016 +0000
++++ amarok-2.4.0.90/CMakeLists.txt	2011-04-19 00:06:17.466666683 +0000
+@@ -105,6 +105,10 @@
+     macro_optional_find_package(QJSON)
+     macro_log_feature( QJSON_FOUND "QJson" "Qt JSON Parser used for the Playdar Collection" "http://qjson.sourceforge.net/" FALSE "" "" )
+ 
++    # HUpnp is required for the upnp plugin
++    macro_optional_find_package(HUpnp)
++    macro_log_feature ( HUPNP_FOUND "HUpnp" "HUpnp is an universal Plug and Play Library" "http://herqq.org/" FALSE "" "" )
++
+     # macro_optional_find_package(Strigi)
+     # macro_log_feature( STRIGI_FOUND "strigi" "Index metadata of files" "http://strigi.sourceforge.net" FALSE "" "" )
+ 
+diff -urN amarok-2.4.0.90.orig/src/core-impl/collections/CMakeLists.txt amarok-2.4.0.90/src/core-impl/collections/CMakeLists.txt
+--- amarok-2.4.0.90.orig/src/core-impl/collections/CMakeLists.txt	2011-04-19 00:03:27.940000015 +0000
++++ amarok-2.4.0.90/src/core-impl/collections/CMakeLists.txt	2011-04-19 00:07:06.753333348 +0000
+@@ -25,4 +25,6 @@
+ if( QJSON_FOUND )
+     add_subdirectory( playdarcollection )
+ endif( QJSON_FOUND )
+-add_subdirectory( upnpcollection )
++if( HUPNP_FOUND )
++    add_subdirectory( upnpcollection )
++endif( HUPNP_FOUND )
+diff -urN amarok-2.4.0.90.orig/cmake/modules/FindHUpnp.cmake amarok-2.4.0.90/cmake/modules/FindHUpnp.cmake
+--- amarok-2.4.0.90.orig/cmake/modules/FindHUpnp.cmake	2011-04-19 01:59:14.313333349 +0000
++++ amarok-2.4.0.90/cmake/modules/FindHUpnp.cmake	2011-04-19 02:14:13.670000016 +0000
+@@ -6,7 +6,7 @@
+ # HUPNP_LIBRARIES
+ # HUPNP_FOUND
+ 
+-find_path(HUPNP_INCLUDE_DIR HUpnp HINTS ${KDE4_INCLUDE_DIR})
++find_path(HUPNP_INCLUDE_DIR HUpnp HINTS ${KDE4_INCLUDE_DIR} ${KDE_INCLUDE_DIR}/HUpnpCore)
+ 
+ find_library(HUPNP_LIBRARIES HUpnp PATHS ${KDE4_LIB_DIR})
+ 
diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index 644519594126..bd6a479359b3 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -21,7 +21,9 @@
     </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="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>
   </use>
 </pkgmetadata>