Version bump to 1.4.6_rc2 tarball.

Package-Manager: portage-2.1.2.9

11 files changed, 36 insertions, 338 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 1d3fef7c920e..b10712384729 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,15 @@
 # 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.220 2007/06/14 14:01:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.221 2007/06/17 21:15:35 flameeyes Exp $
+
+*amarok-1.4.6_rc2 (17 Jun 2007)
+
+  17 Jun 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/amarok-1.4.4+libgpod-0.4.0.patch,
+  -files/amarok-1.4.5-lyrc-script.patch, -amarok-1.4.5-r2.ebuild,
+  -amarok-1.4.6_pre20070608.ebuild, -amarok-1.4.6_pre20070608-r1.ebuild,
+  +amarok-1.4.6_rc2.ebuild:
+  Version bump to 1.4.6_rc2 tarball.
 
 *amarok-1.4.9999-r1 (14 Jun 2007)
 *amarok-1.4.6_pre20070608-r1 (14 Jun 2007)
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index dbd1d62c1ed7..8373f953bf29 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,44 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX amarok-1.4.4+libgpod-0.4.0.patch 2738 RMD160 2e6a44eabe8691c209a3beba5764fa9ca59aa43c SHA1 bc6e39a93490be265e3f37e3af73a31c0d27bc59 SHA256 8def3879b8adb5e2e32d4b4f724d4dd2d896791f6cbe99d5fffcb3f128b26b26
-MD5 2b0195629a6a2b52f22db726bc59cd2f files/amarok-1.4.4+libgpod-0.4.0.patch 2738
-RMD160 2e6a44eabe8691c209a3beba5764fa9ca59aa43c files/amarok-1.4.4+libgpod-0.4.0.patch 2738
-SHA256 8def3879b8adb5e2e32d4b4f724d4dd2d896791f6cbe99d5fffcb3f128b26b26 files/amarok-1.4.4+libgpod-0.4.0.patch 2738
-AUX amarok-1.4.5-lyrc-script.patch 572 RMD160 e96b751f43dcd354e950431da7a73ee1cf5412cb SHA1 de0e098464d6076feb61b544605c8f7a24a2b29a SHA256 a4235698e9eac8292e336b9ad463f42691b019ba8be22cd4ec255e2bd21c4d6b
-MD5 db1ae0ee333309316864fd68efba85d5 files/amarok-1.4.5-lyrc-script.patch 572
-RMD160 e96b751f43dcd354e950431da7a73ee1cf5412cb files/amarok-1.4.5-lyrc-script.patch 572
-SHA256 a4235698e9eac8292e336b9ad463f42691b019ba8be22cd4ec255e2bd21c4d6b files/amarok-1.4.5-lyrc-script.patch 572
 AUX amarok-1.4.5-magnatune.patch 873 RMD160 f9d68fce79b228c8eb894442a95447dbaec0179b SHA1 aacd742d79b91d19ab68edd5a38d1dd08459c7b9 SHA256 96848937bffca80b2e9eb338e4581b7600ee2957f26a32291b5337fffb04cfb9
 MD5 7a108e4a750077b5bd606cb4dd6947ee files/amarok-1.4.5-magnatune.patch 873
 RMD160 f9d68fce79b228c8eb894442a95447dbaec0179b files/amarok-1.4.5-magnatune.patch 873
 SHA256 96848937bffca80b2e9eb338e4581b7600ee2957f26a32291b5337fffb04cfb9 files/amarok-1.4.5-magnatune.patch 873
 DIST amarok-1.4.5.tar.bz2 18034110 RMD160 c2bbfe06f3e613dfc7d3926d086024073390c712 SHA1 882dec8d30c10f609a1f5e21d2e91342e78304c5 SHA256 45aa7cafe2a46dd988cd5034ae19da988926eecb2ac90d3e6912c57e558108c8
-DIST amarok-1.4.6_pre20070608.tar.bz2 17956550 RMD160 06a9296d548fe0d97dafc657ecc39125e8b4654a SHA1 e4b83889d37f63da86a4caf386ce8bd4207b3ff8 SHA256 7dbf7c67936b232c0962e93c3de546559bb63ab1d02c70e42cb07ba064451030
+DIST amarok-1.4.6-rc2.tar.bz2 13260949 RMD160 993e5a31d814e8c1bdac00683ddb4b4abd35a814 SHA1 c339315febcaf8930af384c398decde196908cc1 SHA256 9f1d55146b2397872df0bb7ffba20b18f5131c3f30dcc5c086b22fca4633488e
 EBUILD amarok-1.4.5-r1.ebuild 2635 RMD160 1596fd3f4af7b1dd6bc0a19b21a9ee8a9a86fedd SHA1 d206461975e530c8802aa2ab62663fc055d60566 SHA256 b0dce117d925fe2551da8cfbcc27b92f60f210794c2476d396fdd7d07a890f19
 MD5 198ee7a8434a6d6ec28d80ace8103685 amarok-1.4.5-r1.ebuild 2635
 RMD160 1596fd3f4af7b1dd6bc0a19b21a9ee8a9a86fedd amarok-1.4.5-r1.ebuild 2635
 SHA256 b0dce117d925fe2551da8cfbcc27b92f60f210794c2476d396fdd7d07a890f19 amarok-1.4.5-r1.ebuild 2635
-EBUILD amarok-1.4.5-r2.ebuild 2841 RMD160 ef6f04be2d8d46d53cc4f6862c5b82ed3888ce9f SHA1 7381f396c4e22c2ffd4f4217efb9e10465e5c085 SHA256 4d404a37233107074b951537020f50b92d457ba6f0424dbb93e7160d7a09b7a7
-MD5 8fe3013afaf86cfa9af703a14d149728 amarok-1.4.5-r2.ebuild 2841
-RMD160 ef6f04be2d8d46d53cc4f6862c5b82ed3888ce9f amarok-1.4.5-r2.ebuild 2841
-SHA256 4d404a37233107074b951537020f50b92d457ba6f0424dbb93e7160d7a09b7a7 amarok-1.4.5-r2.ebuild 2841
-EBUILD amarok-1.4.6_pre20070608-r1.ebuild 3325 RMD160 eb4371f4e760455b7eb59ad897c2d922c6736d78 SHA1 e06921cdc59f50679388b9a5ea9e72a75eb3dec7 SHA256 8a84cd4a7932cccda61b6153e768d2a92b430a57c582eb8a33abd817075bbc3e
-MD5 3f7045b4533692a586bd55c80bdfe091 amarok-1.4.6_pre20070608-r1.ebuild 3325
-RMD160 eb4371f4e760455b7eb59ad897c2d922c6736d78 amarok-1.4.6_pre20070608-r1.ebuild 3325
-SHA256 8a84cd4a7932cccda61b6153e768d2a92b430a57c582eb8a33abd817075bbc3e amarok-1.4.6_pre20070608-r1.ebuild 3325
-EBUILD amarok-1.4.6_pre20070608.ebuild 2883 RMD160 ff4a08be19282623c5c2a4ad889ff53613b2e528 SHA1 ade4ff18c3c3e531340987d18df9835e73e71ed4 SHA256 2e220403b5d4ffd064a4d497ad0bb3d4f57d3c2d742200c1e7cd208282bcdf3b
-MD5 fc514e75cf319d34748b282989e92e12 amarok-1.4.6_pre20070608.ebuild 2883
-RMD160 ff4a08be19282623c5c2a4ad889ff53613b2e528 amarok-1.4.6_pre20070608.ebuild 2883
-SHA256 2e220403b5d4ffd064a4d497ad0bb3d4f57d3c2d742200c1e7cd208282bcdf3b amarok-1.4.6_pre20070608.ebuild 2883
+EBUILD amarok-1.4.6_rc2.ebuild 3430 RMD160 c9945a126fafe2e0f4dcbfc8b77f09f0fd49f417 SHA1 817b53962ea418b9024e4958b324c33fd0fffccd SHA256 26ffac44fee6675ceedcc47b6b63fc8c2a06671dde0e5a10090389c9024802bf
+MD5 4561e3707628c68b5097bd19aef4fd49 amarok-1.4.6_rc2.ebuild 3430
+RMD160 c9945a126fafe2e0f4dcbfc8b77f09f0fd49f417 amarok-1.4.6_rc2.ebuild 3430
+SHA256 26ffac44fee6675ceedcc47b6b63fc8c2a06671dde0e5a10090389c9024802bf amarok-1.4.6_rc2.ebuild 3430
 EBUILD amarok-1.4.9999-r1.ebuild 3375 RMD160 759a68cdc7d0a00aeb2eb16e422f1d940aad52ba SHA1 9bdfda8d0c17b0158d8db9c68b54863703b75e10 SHA256 a1aaf719c4561b83104725b3b6d8f79dc383f8b9c8b62b73ef700c287eadc16f
 MD5 fee67bf93fba0727cb83ba0dc55714ea amarok-1.4.9999-r1.ebuild 3375
 RMD160 759a68cdc7d0a00aeb2eb16e422f1d940aad52ba amarok-1.4.9999-r1.ebuild 3375
 SHA256 a1aaf719c4561b83104725b3b6d8f79dc383f8b9c8b62b73ef700c287eadc16f amarok-1.4.9999-r1.ebuild 3375
-MISC ChangeLog 36746 RMD160 d7d33cedd47b7446c39d5cf074467871cfb2e9aa SHA1 5aaaacea614a236826f3bab95de7e4d48e120343 SHA256 0551f02a0e17c2efeaff0c0f29750632d9c300d566374643542b6ee65a618eea
-MD5 8f5b99db18fb46e9538058f2e1d83d02 ChangeLog 36746
-RMD160 d7d33cedd47b7446c39d5cf074467871cfb2e9aa ChangeLog 36746
-SHA256 0551f02a0e17c2efeaff0c0f29750632d9c300d566374643542b6ee65a618eea ChangeLog 36746
+MISC ChangeLog 37080 RMD160 13459fa3fd3f0182c06a67433fb13d85cf90da1c SHA1 4fc9f616e13487669a5adc80d2205f916d12095e SHA256 0c8023d59d8f77eea9e619b68a1582baabbfeeb64b6c3fedc91f89fc5a157b5d
+MD5 1ff94c2d54e245145daca1594be69ff8 ChangeLog 37080
+RMD160 13459fa3fd3f0182c06a67433fb13d85cf90da1c ChangeLog 37080
+SHA256 0c8023d59d8f77eea9e619b68a1582baabbfeeb64b6c3fedc91f89fc5a157b5d ChangeLog 37080
 MISC metadata.xml 278 RMD160 69d1ffb637c604d94508afaf7428a9483f6ee881 SHA1 003ec39d3802862e92547cfd058de6a86a2696d4 SHA256 6ab2a5bf2864cdb1536513678c8f93fb81dc0c55c4ba26b585a97e281f5c4a75
 MD5 56c49c4a013438dddcf7405055d39ff8 metadata.xml 278
 RMD160 69d1ffb637c604d94508afaf7428a9483f6ee881 metadata.xml 278
@@ -46,22 +30,16 @@ SHA256 6ab2a5bf2864cdb1536513678c8f93fb81dc0c55c4ba26b585a97e281f5c4a75 metadata
 MD5 800f0767daa0ef9fe4ab838f9417e389 files/digest-amarok-1.4.5-r1 247
 RMD160 193cf84cab415ad5adeed61993a76209cecd9f3c files/digest-amarok-1.4.5-r1 247
 SHA256 2588dc180c448a480698e60949cbecff302cbd3a56db2e98120ceca137759bbd files/digest-amarok-1.4.5-r1 247
-MD5 800f0767daa0ef9fe4ab838f9417e389 files/digest-amarok-1.4.5-r2 247
-RMD160 193cf84cab415ad5adeed61993a76209cecd9f3c files/digest-amarok-1.4.5-r2 247
-SHA256 2588dc180c448a480698e60949cbecff302cbd3a56db2e98120ceca137759bbd files/digest-amarok-1.4.5-r2 247
-MD5 d45f064675d97c6fcebe17f808c71d3f files/digest-amarok-1.4.6_pre20070608 283
-RMD160 fabe8743c2bc3eae581e8b38e42164b2b2806c9e files/digest-amarok-1.4.6_pre20070608 283
-SHA256 46ced2cedc764a9a2d96cfe6f96c3f634b8e10399dffcfda54b344c8e31fdf4e files/digest-amarok-1.4.6_pre20070608 283
-MD5 d45f064675d97c6fcebe17f808c71d3f files/digest-amarok-1.4.6_pre20070608-r1 283
-RMD160 fabe8743c2bc3eae581e8b38e42164b2b2806c9e files/digest-amarok-1.4.6_pre20070608-r1 283
-SHA256 46ced2cedc764a9a2d96cfe6f96c3f634b8e10399dffcfda54b344c8e31fdf4e files/digest-amarok-1.4.6_pre20070608-r1 283
+MD5 b5e43c0dc1ecabf2a1b9cc22167f3088 files/digest-amarok-1.4.6_rc2 259
+RMD160 a757d4ab2eb705ca96de442c5818cb9ff4654e7a files/digest-amarok-1.4.6_rc2 259
+SHA256 15d8392e4137c16c63fe080f1f708d46b62f241dd4b4c3fbba1379c0854fc228 files/digest-amarok-1.4.6_rc2 259
 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGcUp6AiZjviIA2XgRAt+XAJ4jD7nIfBuLUxBmIY1/vpem4qzrfwCeLGrV
-68KHdhj5R8ALDNPgke3Oo2g=
-=1Cgo
+iD8DBQFGdaSYAiZjviIA2XgRAsKHAJ4rHj6b6LNuxGc8Z9vhJ6jKmEPT9wCgn1pi
+WHizkdrHnExICz1nc37r+oY=
+=Mthj
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-1.4.5-r2.ebuild b/media-sound/amarok/amarok-1.4.5-r2.ebuild
deleted file mode 100644
index 8270aeedbbd5..000000000000
--- a/media-sound/amarok/amarok-1.4.5-r2.ebuild
+++ /dev/null
@@ -1,97 +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.5-r2.ebuild,v 1.1 2007/06/07 19:59:08 flameeyes Exp $
-
-LANGS="af ar az bg br ca cs cy da de el en_GB es et fa 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 se 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
-
-inherit kde eutils flag-o-matic
-
-PKG_SUFFIX=""
-
-MY_P="${P/_/-}"
-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"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="aac kde mysql noamazon 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 )
-	aac? ( 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}-magnatune.patch
-	${FILESDIR}/${P}-lyrc-script.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 !noamazon amazon)
-				  $(use_with ipod libgpod)
-				  $(use_with aac 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.6_pre20070608.ebuild b/media-sound/amarok/amarok-1.4.6_pre20070608.ebuild
deleted file mode 100644
index f2d0266fcff3..000000000000
--- a/media-sound/amarok/amarok-1.4.6_pre20070608.ebuild
+++ /dev/null
@@ -1,100 +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.6_pre20070608.ebuild,v 1.1 2007/06/08 14:01:18 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 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/_/-}"
-	S="${WORKDIR}/${P/_/-}"
-
-	SRC_URI="mirror://kde/stable/amarok/${PV}/src/${MY_P}.tar.bz2"
-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="aac kde mysql noamazon 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 )
-	aac? ( 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 )"
-
-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 !noamazon amazon)
-				  $(use_with ipod libgpod)
-				  $(use_with aac 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.6_pre20070608-r1.ebuild b/media-sound/amarok/amarok-1.4.6_rc2.ebuild
index dcaa99fbf388..2e4c2d4d74f8 100644
--- a/media-sound/amarok/amarok-1.4.6_pre20070608-r1.ebuild
+++ b/media-sound/amarok/amarok-1.4.6_rc2.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.6_pre20070608-r1.ebuild,v 1.1 2007/06/14 14:01:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.6_rc2.ebuild,v 1.1 2007/06/17 21:15:35 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 nl nn pa pl
@@ -16,9 +16,14 @@ PKG_SUFFIX=""
 
 if [[ ${P/_pre} == ${P} ]]; then
 	MY_P="${P/_/-}"
-	S="${WORKDIR}/${P/_/-}"
 
-	SRC_URI="mirror://kde/stable/amarok/${PV}/src/${MY_P}.tar.bz2"
+	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
diff --git a/media-sound/amarok/files/amarok-1.4.4+libgpod-0.4.0.patch b/media-sound/amarok/files/amarok-1.4.4+libgpod-0.4.0.patch
deleted file mode 100644
index 4109649f6934..000000000000
--- a/media-sound/amarok/files/amarok-1.4.4+libgpod-0.4.0.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Index: src/mediadevice/ipod/ipodmediadevice.cpp
-===================================================================
---- amarok-svn/amarok/src/mediadevice/ipod/ipodmediadevice.cpp	(revision 605590)
-+++ amarok-svn/amarok/src/mediadevice/ipod/ipodmediadevice.cpp	(revision 605591)
-@@ -302,7 +302,11 @@
-     track->genre = g_strdup( metaBundle.genre()->utf8() );
- 
- 
-+#ifdef HAVE_ITDB_MEDIATYPE
-+    track->mediatype = 0x01; // for audio
-+#else
-     track->unk208 = 0x01; // for audio
-+#endif
-     if(type=="wav")
-     {
-         track->filetype = g_strdup( "wav" );
-@@ -323,7 +327,11 @@
- #else
-         track->flag3 |= 0x01; // remember current position in track
- #endif
-+#ifdef HAVE_ITDB_MEDIATYPE
-+        track->mediatype = 0x08; // for audiobooks
-+#else
-         track->unk208 = 0x08; // for audiobooks
-+#endif
-     }
-     else if(type=="m4v" || type=="mp4v" || type=="mov" || type=="mpg" || type=="mp4")
-     {
-@@ -331,7 +339,11 @@
- #ifdef HAVE_ITDB_SKIP_SHUFFLE_FLAG
-         track->movie_flag = 0x01; // for videos
- #endif
-+#ifdef HAVE_ITDB_MEDIATYPE
-+        track->mediatype = 0x02; // for videos
-+#else
-         track->unk208 = 0x02; // for videos
-+#endif
-     }
-     else if(type=="aa")
-     {
-@@ -341,7 +353,11 @@
- #else
-         track->flag3 |= 0x01; // remember current position in track
- #endif
-+#ifdef HAVE_ITDB_MEDIATYPE
-+        track->mediatype = 0x08; // for audiobooks
-+#else
-         track->unk208 = 0x08; // for audiobooks
-+#endif
- 
-         TagLib::Audible::File f( QFile::encodeName( propertiesBundle.url().path() ) );
-         TagLib::Audible::Tag *t = f.getAudibleTag();
-@@ -384,7 +400,11 @@
- #ifdef HAVE_ITDB_MARK_UNPLAYED
-         track->mark_unplayed = podcastInfo->listened ? 0x01 : 0x02;
- #endif
-+#ifdef HAVE_ITDB_MEDIATYPE
-+        track->mediatype = track->mediatype==0x02 ? 0x06 : 0x04; // video or audio podcast
-+#else
-         track->unk208 = track->unk208==0x02 ? 0x06 : 0x04; // video or audio podcast
-+#endif
-         track->flag4 = 0x01; // also show description on iPod
-         QString plaindesc = podcastInfo->description;
-         plaindesc.replace( QRegExp("<[^>]*>"), "" );
-Index: configure.in.in
-===================================================================
---- amarok-svn/amarok/configure.in.in	(revision 605590)
-+++ amarok-svn/amarok/configure.in.in	(revision 605591)
-@@ -910,6 +910,11 @@
-                   ,
-                   [#include <gpod/itdb.h>])
- 
-+            AC_CHECK_MEMBER(struct _Itdb_Track.mediatype,
-+                  [AC_DEFINE(HAVE_ITDB_MEDIATYPE, 1, [have libgpod mediatype flag])],
-+                  ,
-+                  [#include <gpod/itdb.h>])
-+
-             CPPFLAGS=$ac_cppflags_save
-             CFLAGS=$ac_cflags_save
-             LDFLAGS=$ac_ldflags_save
diff --git a/media-sound/amarok/files/amarok-1.4.5-lyrc-script.patch b/media-sound/amarok/files/amarok-1.4.5-lyrc-script.patch
deleted file mode 100644
index ed31fd8f6a5a..000000000000
--- a/media-sound/amarok/files/amarok-1.4.5-lyrc-script.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- amarok-1.4.5/amarok/src/scripts/lyrics_lyrc/lyrics_lyrc.rb.orig	2007-02-07 14:19:43.000000000 +0100
-+++ amarok-1.4.5/amarok/src/scripts/lyrics_lyrc/lyrics_lyrc.rb	2007-02-09 11:43:12.000000000 +0100
-@@ -112,7 +112,7 @@ def fetchLyrics( artist, title, url )
-     proxy_host = nil
-     proxy_port = nil
-     if ( @proxy == nil )
--        @proxy = `dcop amarok script proxyForUrl #{@page_url.shellquote}"`
-+        @proxy = `dcop amarok script proxyForUrl #{@page_url.shellquote}`
-     end
-     proxy_uri = URI.parse( @proxy )
-     if ( proxy_uri.class != URI::Generic )
diff --git a/media-sound/amarok/files/digest-amarok-1.4.5-r2 b/media-sound/amarok/files/digest-amarok-1.4.5-r2
deleted file mode 100644
index d3825a8bef40..000000000000
--- a/media-sound/amarok/files/digest-amarok-1.4.5-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1dac1cb5ac9c9cdabdab5f69b39e92c8 amarok-1.4.5.tar.bz2 18034110
-RMD160 c2bbfe06f3e613dfc7d3926d086024073390c712 amarok-1.4.5.tar.bz2 18034110
-SHA256 45aa7cafe2a46dd988cd5034ae19da988926eecb2ac90d3e6912c57e558108c8 amarok-1.4.5.tar.bz2 18034110
diff --git a/media-sound/amarok/files/digest-amarok-1.4.6_pre20070608 b/media-sound/amarok/files/digest-amarok-1.4.6_pre20070608
deleted file mode 100644
index 20f746a6fa76..000000000000
--- a/media-sound/amarok/files/digest-amarok-1.4.6_pre20070608
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4da98b7cfeeb7c34f76146e89f76f7c4 amarok-1.4.6_pre20070608.tar.bz2 17956550
-RMD160 06a9296d548fe0d97dafc657ecc39125e8b4654a amarok-1.4.6_pre20070608.tar.bz2 17956550
-SHA256 7dbf7c67936b232c0962e93c3de546559bb63ab1d02c70e42cb07ba064451030 amarok-1.4.6_pre20070608.tar.bz2 17956550
diff --git a/media-sound/amarok/files/digest-amarok-1.4.6_pre20070608-r1 b/media-sound/amarok/files/digest-amarok-1.4.6_pre20070608-r1
deleted file mode 100644
index 20f746a6fa76..000000000000
--- a/media-sound/amarok/files/digest-amarok-1.4.6_pre20070608-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4da98b7cfeeb7c34f76146e89f76f7c4 amarok-1.4.6_pre20070608.tar.bz2 17956550
-RMD160 06a9296d548fe0d97dafc657ecc39125e8b4654a amarok-1.4.6_pre20070608.tar.bz2 17956550
-SHA256 7dbf7c67936b232c0962e93c3de546559bb63ab1d02c70e42cb07ba064451030 amarok-1.4.6_pre20070608.tar.bz2 17956550
diff --git a/media-sound/amarok/files/digest-amarok-1.4.6_rc2 b/media-sound/amarok/files/digest-amarok-1.4.6_rc2
new file mode 100644
index 000000000000..c9e39925e8a9
--- /dev/null
+++ b/media-sound/amarok/files/digest-amarok-1.4.6_rc2
@@ -0,0 +1,3 @@
+MD5 b3519d042732101acb74469746656cf0 amarok-1.4.6-rc2.tar.bz2 13260949
+RMD160 993e5a31d814e8c1bdac00683ddb4b4abd35a814 amarok-1.4.6-rc2.tar.bz2 13260949
+SHA256 9f1d55146b2397872df0bb7ffba20b18f5131c3f30dcc5c086b22fca4633488e amarok-1.4.6-rc2.tar.bz2 13260949