Remove old version; revision bump fo both 1.4.4 release and live Subversion ebuild to depend on mongrel rather than building and installing its own copy. This drops ~ppc ~ppc64 and ~sparc keywords.

(Portage version: 2.1.2-r4)

7 files changed, 71 insertions, 26 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index d893f43e7ee5..786075c02da1 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.195 2007/01/25 19:02:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.196 2007/01/28 14:52:30 flameeyes Exp $
+
+*amarok-9999-r1 (28 Jan 2007)
+*amarok-1.4.4-r4 (28 Jan 2007)
+
+  28 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -amarok-1.4.3-r1.ebuild, amarok-1.4.4-r3.ebuild, +amarok-1.4.4-r4.ebuild,
+  -amarok-9999.ebuild, +amarok-9999-r1.ebuild:
+  Remove old version; revision bump fo both 1.4.4 release and live Subversion
+  ebuild to depend on mongrel rather than building and installing its own
+  copy. This drops ~ppc ~ppc64 and ~sparc keywords.
 
   25 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> amarok-9999.ebuild:
   Replace -* keyword with empty keywords.
diff --git a/media-sound/amarok/amarok-1.4.4-r3.ebuild b/media-sound/amarok/amarok-1.4.4-r3.ebuild
index 3badf8e8a752..50afdb5ebddc 100644
--- a/media-sound/amarok/amarok-1.4.4-r3.ebuild
+++ b/media-sound/amarok/amarok-1.4.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.4-r3.ebuild,v 1.7 2007/01/23 15:51:04 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.4-r3.ebuild,v 1.8 2007/01/28 14:52:30 flameeyes Exp $
 
 LANGS="af ar az bg br ca cs cy da de el en_GB es et fi fr ga gl he hi hu is it
 ja ka km ko lt ms nb nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta tg
@@ -48,6 +48,9 @@ RDEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
 
 DEPEND="${RDEPEND}"
 
+RDEPEND="${RDEPEND}
+	!www-servers/mongrel"
+
 need-kde 3.3
 
 PATCHES="${WORKDIR}/${P}-gentoo/*.patch
diff --git a/media-sound/amarok/amarok-1.4.3-r1.ebuild b/media-sound/amarok/amarok-1.4.4-r4.ebuild
index b038cd1fc3f5..d37e448ec3d6 100644
--- a/media-sound/amarok/amarok-1.4.3-r1.ebuild
+++ b/media-sound/amarok/amarok-1.4.4-r4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.3-r1.ebuild,v 1.11 2006/12/22 16:06:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.4-r4.ebuild,v 1.1 2007/01/28 14:52:30 flameeyes Exp $
 
-LANGS="az bg br ca cs cy da de el en_GB es et fi fr ga gl he hi hu is it ja ka
-km ko lt ms nb nl nn pa pl pt pt_BR ro ru rw sl sr sr@Latn sv ta tg th tr uk uz
-zh_CN zh_TW"
+LANGS="af ar az bg br ca cs cy da de el en_GB es et fi fr ga gl he hi hu is it
+ja ka km ko lt ms nb nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta tg
+th tr uk uz zh_CN zh_TW"
 LANGS_DOC="da de es et fr it nl pl pt pt_BR ru sv"
 
 USE_KEG_PACKAGING=1
@@ -19,16 +19,17 @@ S="${WORKDIR}/${P/_/-}"
 DESCRIPTION="Advanced audio player based on KDE framework."
 HOMEPAGE="http://amarok.kde.org/"
 
-SRC_URI="mirror://kde/stable/amarok/${PV}/src/${MY_P}.tar.bz2"
+SRC_URI="mirror://kde/stable/amarok/${PV}/src/${MY_P}.tar.bz2
+	mirror://gentoo/${P}-gentoo.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="aac kde mysql noamazon opengl postgres
-visualization ipod ifp real njb"
+visualization ipod ifp real njb mtp musicbrainz"
 # kde: enables compilation of the konqueror sidebar plugin
 
-DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
+RDEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
 	>=media-libs/xine-lib-1.1.2_pre20060328-r8
 	>=media-libs/taglib-1.4
 	mysql? ( >=virtual/mysql-4.0 )
@@ -40,21 +41,22 @@ DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
 	aac? ( media-libs/libmp4v2 )
 	ifp? ( media-libs/libifp )
 	real? ( media-video/realplayer )
-	njb? ( >=media-libs/libnjb-2.2.4 )"
+	njb? ( >=media-libs/libnjb-2.2.4 )
+	mtp? ( media-libs/libmtp )
+	musicbrainz? ( media-libs/tunepimp )
+	=dev-lang/ruby-1.8*"
 
-RDEPEND="${DEPEND}
-	dev-lang/ruby"
+DEPEND="${RDEPEND}"
 
-DEPEND="${DEPEND}
-	>=dev-util/pkgconfig-0.9.0"
-
-PATCHES="${FILESDIR}/${P}-playlist-encoding.patch"
+RDEPEND="${RDEPEND}
+	www-servers/mongrel"
 
 need-kde 3.3
 
-src_compile() {
-	append-flags -fno-inline
+PATCHES="${WORKDIR}/${P}-gentoo/*.patch
+	${FILESDIR}/${P}+libgpod-0.4.0.patch"
 
+src_compile() {
 	# Extra, unsupported engines are forcefully disabled.
 	local myconf="$(use_enable mysql) $(use_enable postgres postgresql)
 				  $(use_with opengl) --without-xmms
@@ -65,11 +67,23 @@ src_compile() {
 				  $(use_with ifp)
 				  $(use_with real helix)
 				  $(use_with njb libnjb)
-				  --without-musicbrainz
-				  --without-libmtp
+				  $(use_with mtp libmtp)
+				  $(use_with musicbrainz)
 				  --with-xine
 				  --without-mas
 				  --without-nmm"
 
 	kde_src_compile
 }
+
+src_install() {
+	kde_src_install
+
+	# As much as I respect Ian, I'd rather leave Amarok to use mongrel
+	# from Portage, for security and policy reasons.
+	rm -rf "${D}"/usr/share/apps/amarok/ruby_lib/rbconfig \
+		"${D}"/usr/share/apps/amarok/ruby_lib/mongrel* \
+		"${D}"/usr/share/apps/amarok/ruby_lib/rubygems* \
+		"${D}"/usr/share/apps/amarok/ruby_lib/gem* \
+		"${D}"/usr/$(get_libdir)/ruby_lib
+}
diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999-r1.ebuild
index 3b30f0e7fa01..d06c3b9af024 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-9999.ebuild,v 1.3 2007/01/25 19:02:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-9999-r1.ebuild,v 1.1 2007/01/28 14:52:30 flameeyes Exp $
 
 inherit kde subversion
 
@@ -39,6 +39,9 @@ RDEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
 
 DEPEND="${RDEPEND}"
 
+RDEPEND="${RDEPEND}
+	www-servers/mongrel"
+
 need-kde 3.3
 
 S="${WORKDIR}/${PN}"
@@ -78,3 +81,15 @@ src_compile() {
 
 	kde_src_compile
 }
+
+src_install() {
+	kde_src_install
+
+	# As much as I respect Ian, I'd rather leave Amarok to use mongrel
+	# from Portage, for security and policy reasons.
+	rm -rf "${D}"/usr/share/apps/amarok/ruby_lib/rbconfig \
+		"${D}"/usr/share/apps/amarok/ruby_lib/mongrel* \
+		"${D}"/usr/share/apps/amarok/ruby_lib/rubygems* \
+		"${D}"/usr/share/apps/amarok/ruby_lib/gem* \
+		"${D}"/usr/$(get_libdir)/ruby_lib
+}
diff --git a/media-sound/amarok/files/digest-amarok-1.4.3-r1 b/media-sound/amarok/files/digest-amarok-1.4.3-r1
deleted file mode 100644
index 08960adff75d..000000000000
--- a/media-sound/amarok/files/digest-amarok-1.4.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b0b4f8952ad23705c70815d50fd0af52 amarok-1.4.3.tar.bz2 17175603
-RMD160 287d6652868f50023d8602941fdc99aed5296d22 amarok-1.4.3.tar.bz2 17175603
-SHA256 e9f6d8728d1c49467a2b72232c7ce907621e8e3792aa7dd9f206985b1450a847 amarok-1.4.3.tar.bz2 17175603
diff --git a/media-sound/amarok/files/digest-amarok-1.4.4-r4 b/media-sound/amarok/files/digest-amarok-1.4.4-r4
new file mode 100644
index 000000000000..262445ff5727
--- /dev/null
+++ b/media-sound/amarok/files/digest-amarok-1.4.4-r4
@@ -0,0 +1,6 @@
+MD5 1eb17420bc9036303958da5a2567e611 amarok-1.4.4-gentoo.tar.bz2 2830
+RMD160 75c42ba3bab6aa363aa71bfd17d9532555abc040 amarok-1.4.4-gentoo.tar.bz2 2830
+SHA256 d874db4cd1b63084df4c20b26ef461e95c242579c4d6e4ca80ccff046d149b33 amarok-1.4.4-gentoo.tar.bz2 2830
+MD5 56a9aec42088c338b81252f8e0651781 amarok-1.4.4.tar.bz2 17635707
+RMD160 61cd2748ce0111f4ba388a71e9504abb7362b0d7 amarok-1.4.4.tar.bz2 17635707
+SHA256 760d30337cb73c86b9298e5c2c9836b3a753c39805b54f75b1eea82c15e9a0ea amarok-1.4.4.tar.bz2 17635707
diff --git a/media-sound/amarok/files/digest-amarok-9999 b/media-sound/amarok/files/digest-amarok-9999-r1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/media-sound/amarok/files/digest-amarok-9999
+++ b/media-sound/amarok/files/digest-amarok-9999-r1