Version bump to 2.1, slot change to 4

(Portage version: 2.2_rc33/cvs/Linux x86_64)

5 files changed, 109 insertions, 5 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index b573540bc95f..5c9a9ca4eaf6 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/amarok
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.326 2009/06/04 19:03:15 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.327 2009/06/04 19:48:24 tampakrap Exp $
+
+*amarok-2.1 (04 Jun 2009)
+
+  04 Jun 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  amarok-2.0.2-r2.ebuild, amarok-2.0.2-r3.ebuild, +amarok-2.1.ebuild,
+  +files/disable_bindings_test.patch:
+  Version bump to 2.1, slot change to 4
 
   04 Jun 2009; Theo Chatzimichos <tampakrap@gentoo.org>
   amarok-1.4.10_p20090130-r2.ebuild:
diff --git a/media-sound/amarok/amarok-2.0.2-r2.ebuild b/media-sound/amarok/amarok-2.0.2-r2.ebuild
index f1469a5053a2..ba18628564b9 100644
--- a/media-sound/amarok/amarok-2.0.2-r2.ebuild
+++ b/media-sound/amarok/amarok-2.0.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.0.2-r2.ebuild,v 1.2 2009/05/13 13:47:49 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.0.2-r2.ebuild,v 1.3 2009/06/04 19:48:24 tampakrap Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://amarok.kde.org/"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
-SLOT="2"
+SLOT="4"
 IUSE="cdaudio daap debug ifp ipod mp3tunes mp4 mtp njb +semantic-desktop"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
 
diff --git a/media-sound/amarok/amarok-2.0.2-r3.ebuild b/media-sound/amarok/amarok-2.0.2-r3.ebuild
index 42edca718b52..b8ee376b30d7 100644
--- a/media-sound/amarok/amarok-2.0.2-r3.ebuild
+++ b/media-sound/amarok/amarok-2.0.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.0.2-r3.ebuild,v 1.2 2009/05/13 13:47:49 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.0.2-r3.ebuild,v 1.3 2009/06/04 19:48:24 tampakrap Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://amarok.kde.org/"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
-SLOT="2"
+SLOT="4"
 IUSE="cdaudio daap debug ifp ipod mp3tunes mp4 mtp njb +semantic-desktop"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
 
diff --git a/media-sound/amarok/amarok-2.1.ebuild b/media-sound/amarok/amarok-2.1.ebuild
new file mode 100644
index 000000000000..03ade08e998c
--- /dev/null
+++ b/media-sound/amarok/amarok-2.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.1.ebuild,v 1.1 2009/06/04 19:48:24 tampakrap Exp $
+
+EAPI="2"
+
+OPENGL_REQUIRED="optional"
+KMNAME="extragear/multimedia"
+inherit kde4-base
+
+DESCRIPTION="Advanced audio player based on KDE framework."
+HOMEPAGE="http://amarok.kde.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="cdaudio daap debug ipod mp3tunes mtp +semantic-desktop"
+
+# ipod requires gdk enabled and also gtk compiled in libgpod
+DEPEND="
+	>=app-misc/strigi-0.5.7
+	|| (
+		>=dev-db/mysql-5.0.76-r1[embedded,-minimal]
+		>=dev-db/mysql-community-5.0.77-r1[embedded,-minimal]
+	)
+	>=media-libs/taglib-1.5
+	>=media-libs/taglib-extras-0.1[kde]
+	>=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?]
+	sys-libs/zlib
+	>=x11-libs/qtscriptgenerator-0.1.0
+	cdaudio? (
+		>=kde-base/libkcddb-${KDE_MINIMAL}
+		>=kde-base/libkcompactdisc-${KDE_MINIMAL}
+	)
+	ipod? (
+		>=media-libs/libgpod-0.7.0[gtk]
+	)
+	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 )
+"
+RDEPEND="${DEPEND}
+	>=kde-base/phonon-kde-${KDE_MINIMAL}
+	>=media-sound/amarok-utils-${PV}
+	semantic-desktop? ( >=kde-base/nepomuk-${KDE_MINIMAL} )
+"
+
+PATCHES=( "${FILESDIR}/disable_bindings_test.patch" )
+
+src_configure() {
+	# Workaround for problems related to libmysqld.so and collection plugin not
+	# being found on some architectures when --as-needed is not used.
+	append-ldflags -Wl,--as-needed
+
+	mycmakeargs="${mycmakeargs}
+		-DWITH_PLAYER=ON
+		-DWITH_UTILITIES=OFF
+		-DWITH_Libgcrypt=OFF
+		$(cmake-utils_use_with ipod Ipod)
+		$(cmake-utils_use_with ipod Gdk)
+		$(cmake-utils_use_with mtp Mtp)
+		$(cmake-utils_use_with mp3tunes MP3TUNES)"
+#		$(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
+}
diff --git a/media-sound/amarok/files/disable_bindings_test.patch b/media-sound/amarok/files/disable_bindings_test.patch
new file mode 100644
index 000000000000..27194a883959
--- /dev/null
+++ b/media-sound/amarok/files/disable_bindings_test.patch
@@ -0,0 +1,12 @@
+--- CMakeLists.txt	2009-03-24 16:51:54.000000000 +0200
++++ CMakeLists.txt2	2009-03-24 17:06:57.000000000 +0200
+@@ -38,9 +38,6 @@
+ 
+     macro_log_feature( KDE4_FOUND "kdelibs" "The toolkit Amarok uses to build" "http://www.kde.org" TRUE "4.2.0" "" )
+ 
+-    find_package( QtScriptQtBindings REQUIRED )
+-    macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/" TRUE "" "" )
+-
+     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+ 
+     find_package(MySQLAmarok REQUIRED)