Remove old version, sync amarok-1.4.9999 to the current amarok release ebuild.

(Portage version: 2.1.4_rc1)

6 files changed, 17 insertions, 134 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index b6892ee04646..7b891a12d813 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,13 @@
 # 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.246 2007/11/22 20:00:12 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.247 2007/11/23 13:55:00 flameeyes Exp $
+
+*amarok-1.4.9999-r2 (23 Nov 2007)
+
+  23 Nov 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -amarok-1.4.7-r1.ebuild, amarok-1.4.7-r2.ebuild,
+  -amarok-1.4.9999-r1.ebuild, +amarok-1.4.9999-r2.ebuild:
+  Remove old version, sync amarok-1.4.9999 to the current amarok release ebuild.
 
   22 Nov 2007; nixnut <nixnut@gentoo.org> amarok-1.4.7-r2.ebuild:
   Stable on ppc wrt bug 199547
diff --git a/media-sound/amarok/amarok-1.4.7-r1.ebuild b/media-sound/amarok/amarok-1.4.7-r1.ebuild
deleted file mode 100644
index 2f6c2ef14a30..000000000000
--- a/media-sound/amarok/amarok-1.4.7-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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.7-r1.ebuild,v 1.6 2007/11/17 17:54:24 drac Exp $
-
-LANGS="af ar az be bg bn br ca cs cy da de el en_GB eo es et eu fa fi
-fr ga gl he hi hu id is it ja km ko ku lo lt mk ms nb nds ne nl nn pa pl
-pt pt_BR ro ru rw se sk sl sq sr sr@Latn ss 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
-
-inherit kde eutils flag-o-matic
-
-PKG_SUFFIX=""
-
-if [[ ${P/_pre} == ${P} ]]; then
-	MY_P="${P/_/-}"
-
-	if [[ ${P/_rc} == ${P} ]]; then
-		SRC_URI="mirror://kde/stable/amarok/${PV}/src/${MY_P}.tar.bz2"
-		S="${WORKDIR}/${P/_/-}"
-	else
-		SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-		S="${WORKDIR}/${P/_rc*}"
-	fi
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-fi
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="mp4 kde mysql amazon opengl postgres
-visualization ipod ifp real njb mtp musicbrainz daap
-python"
-# kde: enables compilation of the konqueror sidebar plugin
-
-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 )
-	postgres? ( dev-db/libpq )
-	opengl? ( virtual/opengl )
-	visualization? ( media-libs/libsdl
-					 =media-plugins/libvisual-plugins-0.4* )
-	ipod? ( >=media-libs/libgpod-0.4.2 )
-	mp4? ( media-libs/libmp4v2 )
-	ifp? ( media-libs/libifp )
-	real? ( media-video/realplayer )
-	njb? ( >=media-libs/libnjb-2.2.4 )
-	mtp? ( >=media-libs/libmtp-0.1.1 )
-	musicbrainz? ( media-libs/tunepimp )
-	=dev-lang/ruby-1.8*"
-
-DEPEND="${RDEPEND}"
-
-RDEPEND="${RDEPEND}
-	app-arch/unzip
-	python? ( dev-python/PyQt )
-	daap? ( www-servers/mongrel )"
-
-PATCHES="${FILESDIR}/${P}+xine-lib-1.1.8-lastfm.patch"
-
-need-kde 3.3
-
-src_compile() {
-	# Extra, unsupported engines are forcefully disabled.
-	local myconf="$(use_enable mysql) $(use_enable postgres postgresql)
-				  $(use_with opengl) --without-xmms
-				  $(use_with visualization libvisual)
-				  $(use_enable amazon)
-				  $(use_with ipod libgpod)
-				  $(use_with mp4 mp4v2)
-				  $(use_with ifp)
-				  $(use_with real helix)
-				  $(use_with njb libnjb)
-				  $(use_with mtp libmtp)
-				  $(use_with musicbrainz)
-				  $(use_with daap)
-				  --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
-
-	if ! use python; then
-		rm -r "${D}"/usr/share/apps/amarok/scripts/webcontrol \
-			|| die "Unable to remove webcontrol."
-	fi
-}
diff --git a/media-sound/amarok/amarok-1.4.7-r2.ebuild b/media-sound/amarok/amarok-1.4.7-r2.ebuild
index b39867144910..5be4532ca14f 100644
--- a/media-sound/amarok/amarok-1.4.7-r2.ebuild
+++ b/media-sound/amarok/amarok-1.4.7-r2.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.7-r2.ebuild,v 1.6 2007/11/22 20:00:12 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.7-r2.ebuild,v 1.7 2007/11/23 13:55:00 flameeyes Exp $
 
 LANGS="af ar az be bg bn br ca cs cy da de el en_GB eo es et eu fa fi
 fr ga gl he hi hu id is it ja km ko ku lo lt mk ms nb nds ne nl nn pa pl
@@ -10,7 +10,7 @@ LANGS_DOC="da de es et fr it nl pl pt pt_BR ru sv"
 
 USE_KEG_PACKAGING=1
 
-inherit kde eutils flag-o-matic
+inherit kde
 
 PKG_SUFFIX=""
 
diff --git a/media-sound/amarok/amarok-1.4.9999-r1.ebuild b/media-sound/amarok/amarok-1.4.9999-r2.ebuild
index 77d955460f0f..9d1a0cdf5ec8 100644
--- a/media-sound/amarok/amarok-1.4.9999-r1.ebuild
+++ b/media-sound/amarok/amarok-1.4.9999-r2.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.9999-r1.ebuild,v 1.2 2007/10/11 16:53:02 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.9999-r2.ebuild,v 1.1 2007/11/23 13:55:00 flameeyes Exp $
 
 inherit kde subversion
 
@@ -16,13 +16,11 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS=""
-IUSE="aac kde mysql amazon opengl postgres
+IUSE="mp4 kde mysql amazon opengl postgres
 visualization ipod ifp real njb mtp musicbrainz daap
 python"
 # kde: enables compilation of the konqueror sidebar plugin
 
-SQLITEVER="3.3.17"
-
 RDEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
 	>=media-libs/xine-lib-1.1.2_pre20060328-r8
 	>=media-libs/taglib-1.4
@@ -31,15 +29,14 @@ RDEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
 	opengl? ( virtual/opengl )
 	visualization? ( media-libs/libsdl
 					 =media-plugins/libvisual-plugins-0.4* )
-	ipod? ( >=media-libs/libgpod-0.3 )
-	aac? ( media-libs/libmp4v2 )
+	ipod? ( >=media-libs/libgpod-0.4.2 )
+	mp4? ( media-libs/libmp4v2 )
 	ifp? ( media-libs/libifp )
 	real? ( media-video/realplayer )
 	njb? ( >=media-libs/libnjb-2.2.4 )
 	mtp? ( >=media-libs/libmtp-0.1.1 )
 	musicbrainz? ( media-libs/tunepimp )
-	=dev-lang/ruby-1.8*
-	>=dev-db/sqlite-${SQLITEVER}"
+	=dev-lang/ruby-1.8*"
 
 DEPEND="${RDEPEND}"
 
@@ -52,16 +49,6 @@ need-kde 3.3
 
 S="${WORKDIR}/${PN}"
 
-pkg_setup() {
-	if built_with_use ">=dev-db/sqlite-${SQLITEVER}" nothreadsafe; then
-		eerror "SQLite was built without thread safety."
-		eerror "Amarok requires thread safety enabled in SQLite."
-		eerror "Please rebuild >=dev-db/sqlite-${SQLITEVER} with the"
-		eerror "nothreadsafe USE flag disabled."
-		die "SQLite built with nothreadsafe USE flag."
-	fi
-}
-
 src_unpack() {
 	ESVN_UPDATE_CMD="svn update -N" \
 	ESVN_FETCH_CMD="svn checkout -N" \
@@ -85,7 +72,7 @@ src_compile() {
 				  $(use_with visualization libvisual)
 				  $(use_enable amazon)
 				  $(use_with ipod libgpod)
-				  $(use_with aac mp4v2)
+				  $(use_with mp4 mp4v2)
 				  $(use_with ifp)
 				  $(use_with real helix)
 				  $(use_with njb libnjb)
@@ -94,8 +81,7 @@ src_compile() {
 				  $(use_with daap)
 				  --with-xine
 				  --without-mas
-				  --without-nmm
-				  --without-included-sqlite"
+				  --without-nmm"
 
 	kde_src_compile
 }
diff --git a/media-sound/amarok/files/digest-amarok-1.4.7-r1 b/media-sound/amarok/files/digest-amarok-1.4.7-r1
deleted file mode 100644
index 10d913cf761b..000000000000
--- a/media-sound/amarok/files/digest-amarok-1.4.7-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f1299e142da8a69bc3cff5d585e38d43 amarok-1.4.7.tar.bz2 12723499
-RMD160 fc5f5182b488f629cc608aee16aa84a0c4978dcd amarok-1.4.7.tar.bz2 12723499
-SHA256 7ef2691d0cda238696e021421052a04b3cfb068ea0d9854e0c617b33216340f8 amarok-1.4.7.tar.bz2 12723499
diff --git a/media-sound/amarok/files/digest-amarok-1.4.9999-r1 b/media-sound/amarok/files/digest-amarok-1.4.9999-r2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/media-sound/amarok/files/digest-amarok-1.4.9999-r1
+++ b/media-sound/amarok/files/digest-amarok-1.4.9999-r2