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

Package-Manager: portage-2.1.4_rc1

7 files changed, 42 insertions, 156 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/Manifest b/media-sound/amarok/Manifest
index ac6300aec388..3cfc257117f6 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX amarok-1.4.7+xine-lib-1.1.8-lastfm.patch 808 RMD160 fcf33e066734fdf14b5b25421093f19282b2f130 SHA1 bf38186111297dc9da5eb00be14ba9772d2ae134 SHA256 5c65d14d2aa8b6739a7a8493f7d4db808c25d56047ff00b7adcd8754ee97e4f2
 MD5 71a8bbcf89bd7bc606006a150c8caba8 files/amarok-1.4.7+xine-lib-1.1.8-lastfm.patch 808
 RMD160 fcf33e066734fdf14b5b25421093f19282b2f130 files/amarok-1.4.7+xine-lib-1.1.8-lastfm.patch 808
@@ -7,32 +10,32 @@ MD5 fcd6742a3a8d6653ab8cccb19fb7ccea files/amarok-1.4.7-svn148317.patch 538
 RMD160 088c06869d98f2bc9de83a8e9e39d0026bc74db1 files/amarok-1.4.7-svn148317.patch 538
 SHA256 f159099ec72687ad306c4d386336f0864b4510d5c5b09026cd31401c3ade23ae files/amarok-1.4.7-svn148317.patch 538
 DIST amarok-1.4.7.tar.bz2 12723499 RMD160 fc5f5182b488f629cc608aee16aa84a0c4978dcd SHA1 ff97ad833159f4be32c0dfe546a6dee944f5339d SHA256 7ef2691d0cda238696e021421052a04b3cfb068ea0d9854e0c617b33216340f8
-EBUILD amarok-1.4.7-r1.ebuild 3027 RMD160 13c88f2bcf3126037263959afbcb11e43df64a04 SHA1 4ccbbdf4a6cfedf47560512d949625900ddbfcfa SHA256 47ee55a973c8ff78904635d8468edeb61374e78d18b067855de0c355b154dcdd
-MD5 7e7ed1f8cd3da59730e864cfde609b15 amarok-1.4.7-r1.ebuild 3027
-RMD160 13c88f2bcf3126037263959afbcb11e43df64a04 amarok-1.4.7-r1.ebuild 3027
-SHA256 47ee55a973c8ff78904635d8468edeb61374e78d18b067855de0c355b154dcdd amarok-1.4.7-r1.ebuild 3027
-EBUILD amarok-1.4.7-r2.ebuild 3063 RMD160 c8558a68c4c72f9f701934b9a6fa448e8ffc36c8 SHA1 4276c12246de576252785a60835914c66f5b47a5 SHA256 0ad9c70fc4a0ddbdc21e0d5bec7e1fde92e551f92a06086d0ca12625fa1aa8c9
-MD5 31c1d141fd4376140e4ca1ae1ef2f412 amarok-1.4.7-r2.ebuild 3063
-RMD160 c8558a68c4c72f9f701934b9a6fa448e8ffc36c8 amarok-1.4.7-r2.ebuild 3063
-SHA256 0ad9c70fc4a0ddbdc21e0d5bec7e1fde92e551f92a06086d0ca12625fa1aa8c9 amarok-1.4.7-r2.ebuild 3063
-EBUILD amarok-1.4.9999-r1.ebuild 3358 RMD160 28e9e295bd969e4c2fbcd6ab672e94ffaa72e633 SHA1 bc218ab126860229ad83d272c30aba3c146f7aa3 SHA256 fe352d3c351e8e427c985ed8afda4a608ec11e132359ed6de588c74e02d56fe3
-MD5 779cf2d84e652fa4a4465c48ba0ca5da amarok-1.4.9999-r1.ebuild 3358
-RMD160 28e9e295bd969e4c2fbcd6ab672e94ffaa72e633 amarok-1.4.9999-r1.ebuild 3358
-SHA256 fe352d3c351e8e427c985ed8afda4a608ec11e132359ed6de588c74e02d56fe3 amarok-1.4.9999-r1.ebuild 3358
-MISC ChangeLog 40665 RMD160 639496176b73b65a890ef1d20e44afa39833e268 SHA1 3409ad1458a239167891de1886339acaa65dd5dd SHA256 ae1186ec94680f18f00c0db2a692db47cba6a50e79c35f5b072a1f16d24dd5b1
-MD5 f9d5671c84e2b1d68596936f07845280 ChangeLog 40665
-RMD160 639496176b73b65a890ef1d20e44afa39833e268 ChangeLog 40665
-SHA256 ae1186ec94680f18f00c0db2a692db47cba6a50e79c35f5b072a1f16d24dd5b1 ChangeLog 40665
+EBUILD amarok-1.4.7-r2.ebuild 3046 RMD160 1839a0d84a2b5b02f98b83c78ed8354555da2d4a SHA1 b430a19ca9409e7b09245a35c758f81aba1e176e SHA256 2be889884142fb37b2657d351894f3052fb9cd84206e4bf9a7234eb12d34a847
+MD5 29c97a93b97ed14a00c0ba64f0a65f83 amarok-1.4.7-r2.ebuild 3046
+RMD160 1839a0d84a2b5b02f98b83c78ed8354555da2d4a amarok-1.4.7-r2.ebuild 3046
+SHA256 2be889884142fb37b2657d351894f3052fb9cd84206e4bf9a7234eb12d34a847 amarok-1.4.7-r2.ebuild 3046
+EBUILD amarok-1.4.9999-r2.ebuild 2926 RMD160 42b3161c12ccd98bee3acc38d8a569c44321f774 SHA1 84fad372b45e40960f67c136fda4daa959c02e5d SHA256 a97fb4a844ae422ea85acddd06009b8cea2f357539916edd405de0cfbaebf320
+MD5 5be6ce92d51cecac15253534a6550ece amarok-1.4.9999-r2.ebuild 2926
+RMD160 42b3161c12ccd98bee3acc38d8a569c44321f774 amarok-1.4.9999-r2.ebuild 2926
+SHA256 a97fb4a844ae422ea85acddd06009b8cea2f357539916edd405de0cfbaebf320 amarok-1.4.9999-r2.ebuild 2926
+MISC ChangeLog 40947 RMD160 a4cfe941a03b9a7dfb025a6476ea012a06a4dd1c SHA1 84babaeb550bb411845cfc5f3e9b8c7a673f4259 SHA256 c10c779e3e269962f7dabeb7497ff584d8e8df66059180884a5aea243b5bf32a
+MD5 d607686c8a4e4d0d75b8372f4f1cb4d7 ChangeLog 40947
+RMD160 a4cfe941a03b9a7dfb025a6476ea012a06a4dd1c ChangeLog 40947
+SHA256 c10c779e3e269962f7dabeb7497ff584d8e8df66059180884a5aea243b5bf32a ChangeLog 40947
 MISC metadata.xml 278 RMD160 69d1ffb637c604d94508afaf7428a9483f6ee881 SHA1 003ec39d3802862e92547cfd058de6a86a2696d4 SHA256 6ab2a5bf2864cdb1536513678c8f93fb81dc0c55c4ba26b585a97e281f5c4a75
 MD5 56c49c4a013438dddcf7405055d39ff8 metadata.xml 278
 RMD160 69d1ffb637c604d94508afaf7428a9483f6ee881 metadata.xml 278
 SHA256 6ab2a5bf2864cdb1536513678c8f93fb81dc0c55c4ba26b585a97e281f5c4a75 metadata.xml 278
-MD5 819a3361be33608a6fd644ab5037d7ea files/digest-amarok-1.4.7-r1 247
-RMD160 3f51ae0d63da4e58b449053269c1cc4933b40756 files/digest-amarok-1.4.7-r1 247
-SHA256 dc5e5849495524988d0d1c84b0191ba153244c0a2804a8c814f8e9a005cd954b files/digest-amarok-1.4.7-r1 247
 MD5 819a3361be33608a6fd644ab5037d7ea files/digest-amarok-1.4.7-r2 247
 RMD160 3f51ae0d63da4e58b449053269c1cc4933b40756 files/digest-amarok-1.4.7-r2 247
 SHA256 dc5e5849495524988d0d1c84b0191ba153244c0a2804a8c814f8e9a005cd954b files/digest-amarok-1.4.7-r2 247
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-amarok-1.4.9999-r1 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-amarok-1.4.9999-r1 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-amarok-1.4.9999-r1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-amarok-1.4.9999-r2 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-amarok-1.4.9999-r2 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-amarok-1.4.9999-r2 0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHRtqHAiZjviIA2XgRAi3iAKDSPKEjhspmqEFQ9A7Aj94IWeL6HwCgqqDr
+OR1CKtphYUUwigItvIrghes=
+=XsJF
+-----END PGP SIGNATURE-----
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