Fix libgpod dependency on 0.3 version as 0.4 is not supported (see bug #150983); remove old versions as the new target stable is 1.4.3-r1.

(Portage version: 2.1.2_pre2-r9)
 (Signed Manifest commit)

12 files changed, 15 insertions, 490 deletions

diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 9a50c00e80ba..c1fedd8ff899 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -5,63 +5,29 @@ AUX amarok-1.4.0a-strict-aliasing.patch 435 RMD160 6c3ee58300525889b786b2220a245
 MD5 6a938d8f94e5b0faeb25349df3416c2f files/amarok-1.4.0a-strict-aliasing.patch 435
 RMD160 6c3ee58300525889b786b2220a2457d02ac665dd files/amarok-1.4.0a-strict-aliasing.patch 435
 SHA256 72069f37be46abf539b10ab937abe5e3eaf77d5ee973dfdbf203bdb031506cf5 files/amarok-1.4.0a-strict-aliasing.patch 435
-AUX amarok-1.4.1-libvisual.patch 1187 RMD160 b344b2c1de020f997262692e7ad8e6fda74c5a52 SHA1 1ff2ff00a123a0369eee8382711d8b041028a341 SHA256 d82cce8d9ab3777c257bf00251ed9651c68914be9d2567301f0019de0ad08440
-MD5 9dca6b7f5882ebdaadbaa02dff3cef6d files/amarok-1.4.1-libvisual.patch 1187
-RMD160 b344b2c1de020f997262692e7ad8e6fda74c5a52 files/amarok-1.4.1-libvisual.patch 1187
-SHA256 d82cce8d9ab3777c257bf00251ed9651c68914be9d2567301f0019de0ad08440 files/amarok-1.4.1-libvisual.patch 1187
-AUX amarok-1.4.2-20restarts.patch 451 RMD160 6d4535469a3e4a645cf4297432c70dfefa72cf5c SHA1 83bdf3862fd641ee8257b62228c0c92456c96250 SHA256 f747c78820921043146138f4c6b5a5439ab0fc92a345bdcdb4d00ac9082dadc8
-MD5 1ea575f2e6fe16c2a5b60306d8d779dd files/amarok-1.4.2-20restarts.patch 451
-RMD160 6d4535469a3e4a645cf4297432c70dfefa72cf5c files/amarok-1.4.2-20restarts.patch 451
-SHA256 f747c78820921043146138f4c6b5a5439ab0fc92a345bdcdb4d00ac9082dadc8 files/amarok-1.4.2-20restarts.patch 451
-AUX amarok-1.4.2-audiocd-freeze.patch 1409 RMD160 9570fc0e390c376f21e31aec197ad6b82903e23e SHA1 c49bfe7bfcaac979759ad3119dc0e5404c8ca0ed SHA256 1f7421426117167afbb996e98623c31981e3fbf37f6b0834cf90f94c5d1b6801
-MD5 bf3dff6157d02752fcdfccfbc700fc88 files/amarok-1.4.2-audiocd-freeze.patch 1409
-RMD160 9570fc0e390c376f21e31aec197ad6b82903e23e files/amarok-1.4.2-audiocd-freeze.patch 1409
-SHA256 1f7421426117167afbb996e98623c31981e3fbf37f6b0834cf90f94c5d1b6801 files/amarok-1.4.2-audiocd-freeze.patch 1409
-AUX amarok-1.4.2-collection-sqlite.patch 1146 RMD160 5a4539ef52a3ea79dd788a5f9f921bfa2a47e84e SHA1 e2caf4616f15b2ff9f22ec6c19690a7e106d567c SHA256 bb65b74c4b4c7ddbfe87d2a968ee366b95d2debc5552c85c90da7b8d7e546a05
-MD5 ff857181b94d1a0a8ee9006e240ef6f1 files/amarok-1.4.2-collection-sqlite.patch 1146
-RMD160 5a4539ef52a3ea79dd788a5f9f921bfa2a47e84e files/amarok-1.4.2-collection-sqlite.patch 1146
-SHA256 bb65b74c4b4c7ddbfe87d2a968ee366b95d2debc5552c85c90da7b8d7e546a05 files/amarok-1.4.2-collection-sqlite.patch 1146
-AUX amarok-1.4.2-libmtp.patch 2111 RMD160 0f6482fd622663b0748923faf8dc5a431cde1409 SHA1 8a29c60cc5fef354c9571633d5f56f4fabd26944 SHA256 a0fad26a2dc2ddf8bd8950ad0ca6e55271afa5d6ab5c7bc0d7a37af004ad4ca1
-MD5 fe65d93cecf89f11a19b64c29cc3a163 files/amarok-1.4.2-libmtp.patch 2111
-RMD160 0f6482fd622663b0748923faf8dc5a431cde1409 files/amarok-1.4.2-libmtp.patch 2111
-SHA256 a0fad26a2dc2ddf8bd8950ad0ca6e55271afa5d6ab5c7bc0d7a37af004ad4ca1 files/amarok-1.4.2-libmtp.patch 2111
 AUX amarok-1.4.3-playlist-encoding.patch 365 RMD160 5add54202bcc34ad1d695b938c075dd030bf6705 SHA1 9d2eacaf4d8f35cf88e3a2358258ca83c1d35fee SHA256 71ac78fbac11d404017ab1c9a942b0b72ac24638739498ca6f761298a906b11d
 MD5 0e211053265ad86a0f6656c07463b43a files/amarok-1.4.3-playlist-encoding.patch 365
 RMD160 5add54202bcc34ad1d695b938c075dd030bf6705 files/amarok-1.4.3-playlist-encoding.patch 365
 SHA256 71ac78fbac11d404017ab1c9a942b0b72ac24638739498ca6f761298a906b11d files/amarok-1.4.3-playlist-encoding.patch 365
 DIST amarok-1.3.8.tar.bz2 8728423 RMD160 14c5e38a515b4ebb11dd93f74511fa2f6247809b SHA1 08fbf6637593c41bf33f580633f75e343d4053e4 SHA256 6159837fd52c56bd00855cdd8ae8ba85f803572571ebb86efb01bf36e898a0a1
 DIST amarok-1.4.0a.tar.bz2 13045009 RMD160 47ae8f9e23aec02f825fe3791eae63520f56394e SHA1 0274e7d7b780ab10c0d1357fe852d895d86dd409 SHA256 46d298226ff855c68b1d179d900441fd3c2329f42a938c3fc842a218ab762344
-DIST amarok-1.4.1.tar.bz2 13509939 RMD160 d9df29c2a2a7b81aabb73c66b83190f0bc109094 SHA1 ecabf7fd15ac45d29ccd1b9309f093ecda8acfab SHA256 dbe4397d041a77f7ded063f50d5cfd2faf0e9efce9b4483589f751c20ff89ccd
-DIST amarok-1.4.2.tar.bz2 17080668 RMD160 abc1f6bef1962fc5b1fee18f3716e4c57a59a7b4 SHA1 b1ddd12e5ef2cee0b4e41063a18c4520733469e7 SHA256 4b0b3174edf30c1d78240f7a48aeda1d7d9763a18de409046ef426caa3f6fd82
 DIST amarok-1.4.3.tar.bz2 17175603 RMD160 287d6652868f50023d8602941fdc99aed5296d22 SHA1 624b5f9fd74ead1c0e75f7d8f935abcaf0313e70 SHA256 e9f6d8728d1c49467a2b72232c7ce907621e8e3792aa7dd9f206985b1450a847
 EBUILD amarok-1.3.8.ebuild 3660 RMD160 33a0c338ae2b00b7467cac81555a0b85217a27f9 SHA1 9420b8a1c4d5619833889d04f30b775a6f417c2b SHA256 71cdf0cc185114aeacb9b674e3a6e8c8c204ad856d908d5c646c08ed8a0d1164
 MD5 a302f3de8595bb73dd7c042de92ddcf2 amarok-1.3.8.ebuild 3660
 RMD160 33a0c338ae2b00b7467cac81555a0b85217a27f9 amarok-1.3.8.ebuild 3660
 SHA256 71cdf0cc185114aeacb9b674e3a6e8c8c204ad856d908d5c646c08ed8a0d1164 amarok-1.3.8.ebuild 3660
-EBUILD amarok-1.4.0a-r1.ebuild 2350 RMD160 ab67c658b9da292882f7542e89ddb7dcbe42f086 SHA1 9c6435c25157ddb9f2b8a5706fa38e6d0b194a19 SHA256 64d0c8df585e4528f9f9fc55d20a6c1b1d1c6875ad849b9b05a6c4b89a8347a2
-MD5 5889d6737c9819f1330b9456222a7afb amarok-1.4.0a-r1.ebuild 2350
-RMD160 ab67c658b9da292882f7542e89ddb7dcbe42f086 amarok-1.4.0a-r1.ebuild 2350
-SHA256 64d0c8df585e4528f9f9fc55d20a6c1b1d1c6875ad849b9b05a6c4b89a8347a2 amarok-1.4.0a-r1.ebuild 2350
-EBUILD amarok-1.4.1-r3.ebuild 2358 RMD160 57ff01ec0c71027122d6228c1b1380701d3eaae3 SHA1 1c5e1c491382c3ca1a12e2c9b9d2541c706a4922 SHA256 b88f2e56d180dda18ca978b0d19e85d428b1c6d24b6661ccccbd981fa44e7b7a
-MD5 e07d1cb8307c62c2dbe4bfc34f6e0f7d amarok-1.4.1-r3.ebuild 2358
-RMD160 57ff01ec0c71027122d6228c1b1380701d3eaae3 amarok-1.4.1-r3.ebuild 2358
-SHA256 b88f2e56d180dda18ca978b0d19e85d428b1c6d24b6661ccccbd981fa44e7b7a amarok-1.4.1-r3.ebuild 2358
-EBUILD amarok-1.4.2-r1.ebuild 2222 RMD160 edb0a4827f550dfc96b5733ea27e558dcbe56046 SHA1 bf3dac0fbfbd2ccdc9accecdbba2ec3b2becea14 SHA256 e77b389ad2cb62d970ea5842cd91a2b1421f8c0459fac4856c61b213742c00df
-MD5 be6d7f712f5bbe6c6d76d3cea8cf8ae7 amarok-1.4.2-r1.ebuild 2222
-RMD160 edb0a4827f550dfc96b5733ea27e558dcbe56046 amarok-1.4.2-r1.ebuild 2222
-SHA256 e77b389ad2cb62d970ea5842cd91a2b1421f8c0459fac4856c61b213742c00df amarok-1.4.2-r1.ebuild 2222
-EBUILD amarok-1.4.3-r1.ebuild 2147 RMD160 d7458da208628de0978f86a84497fe09d67bace5 SHA1 e2c424c808aa009bec925032465b9061b437cbc9 SHA256 d3b84db65f2770902d2c3902e3bea02caab6979c5ff7f5dd1387794fcb81296e
-MD5 e83439bf6c44109ce92934092ed72a49 amarok-1.4.3-r1.ebuild 2147
-RMD160 d7458da208628de0978f86a84497fe09d67bace5 amarok-1.4.3-r1.ebuild 2147
-SHA256 d3b84db65f2770902d2c3902e3bea02caab6979c5ff7f5dd1387794fcb81296e amarok-1.4.3-r1.ebuild 2147
-EBUILD amarok-1.4.3.ebuild 2092 RMD160 1286336ddf5fd7f9a04af7698f87a7b814d089bc SHA1 ce84a9464b389e244ca8e5cb75f6434b082521fc SHA256 198c4b72f6dcc1c09e559c9fcc4b8f115e41bd3184332b64792f4e50171206e8
-MD5 c4c646a01fbe7da07868d7fd9a81795a amarok-1.4.3.ebuild 2092
-RMD160 1286336ddf5fd7f9a04af7698f87a7b814d089bc amarok-1.4.3.ebuild 2092
-SHA256 198c4b72f6dcc1c09e559c9fcc4b8f115e41bd3184332b64792f4e50171206e8 amarok-1.4.3.ebuild 2092
-MISC ChangeLog 26519 RMD160 b48cb71697135ea36598618f0ee35a183f7ffe1e SHA1 9b87e6f57dff06b1065444c7e7e0680586ae024c SHA256 bc185a2cf03cb27958bc095d42fd0908b2d5c8fd6986a0dd0eb13a19e6a3fca6
-MD5 2df232fa3297e414b7c880ccac93b67b ChangeLog 26519
-RMD160 b48cb71697135ea36598618f0ee35a183f7ffe1e ChangeLog 26519
-SHA256 bc185a2cf03cb27958bc095d42fd0908b2d5c8fd6986a0dd0eb13a19e6a3fca6 ChangeLog 26519
+EBUILD amarok-1.4.0a-r1.ebuild 2360 RMD160 675f131b6d190a90693ece41f3e2116ac2f6dd78 SHA1 3b0cf2db31f21c0051d23f91ee24509a8939c180 SHA256 3e284e8369fd6d711ca33b76ed157287fbfd3ff1505fd07c499cca3390523193
+MD5 8872e14a1a31e2897a79a5b661d94bf3 amarok-1.4.0a-r1.ebuild 2360
+RMD160 675f131b6d190a90693ece41f3e2116ac2f6dd78 amarok-1.4.0a-r1.ebuild 2360
+SHA256 3e284e8369fd6d711ca33b76ed157287fbfd3ff1505fd07c499cca3390523193 amarok-1.4.0a-r1.ebuild 2360
+EBUILD amarok-1.4.3-r1.ebuild 2153 RMD160 e9531505d67da2d2d4cab99cd26d3c21b0967194 SHA1 f7aba9f46d6ff85e8c84142d5d8c379a2631eafa SHA256 2421d3435b896155e9de79a561bb03dd186e5fa7e84dce771488fbf038d5e4cc
+MD5 875593030d96c3095c73e4323792d714 amarok-1.4.3-r1.ebuild 2153
+RMD160 e9531505d67da2d2d4cab99cd26d3c21b0967194 amarok-1.4.3-r1.ebuild 2153
+SHA256 2421d3435b896155e9de79a561bb03dd186e5fa7e84dce771488fbf038d5e4cc amarok-1.4.3-r1.ebuild 2153
+MISC ChangeLog 27045 RMD160 b88b92379a9fad844d2988c5e47b6fb9b3f205b0 SHA1 2981bffc12d6d8a665e604901b8e1cd3c727bf63 SHA256 23b36aac98bf67bd38b97fc136191c1b2ae08b56c0799c7d028842c67ab3ff09
+MD5 0b75f612fd2d15689bc9b19920207f6e ChangeLog 27045
+RMD160 b88b92379a9fad844d2988c5e47b6fb9b3f205b0 ChangeLog 27045
+SHA256 23b36aac98bf67bd38b97fc136191c1b2ae08b56c0799c7d028842c67ab3ff09 ChangeLog 27045
 MISC metadata.xml 266 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e SHA1 d41658ffae344562e8579d219bd3f746d4cba624 SHA256 c2f316075bb660460a285a5474235615f5946bb47df6e6f0c9c4de9ed64edf26
 MD5 986cc6d7e9a21474e34336045796ffaa metadata.xml 266
 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e metadata.xml 266
@@ -72,22 +38,13 @@ SHA256 0904b3a3edc74467df4ec29c59ee0bb684eab9376ad863ab7a74b0323847bc53 files/di
 MD5 cdf1a1729e2f6c8062405c6312459f21 files/digest-amarok-1.4.0a-r1 250
 RMD160 1d3c3510efc7b822b36277d72e3131debd140f0d files/digest-amarok-1.4.0a-r1 250
 SHA256 f3b9961d6146de70b5f5c181f756e63fd23dbafdf7cfc254108ac7d876b304b2 files/digest-amarok-1.4.0a-r1 250
-MD5 ac4c9036a47681634edcf32f28379d66 files/digest-amarok-1.4.1-r3 247
-RMD160 ad434383ba59bf02e36b766bfce2eb5f72329012 files/digest-amarok-1.4.1-r3 247
-SHA256 b6e939431f1b0050daecc1e9ca12099743c1598de46b020aeb6b224aebbad03f files/digest-amarok-1.4.1-r3 247
-MD5 e608485f6f89430c0708ac9f54688ac3 files/digest-amarok-1.4.2-r1 247
-RMD160 c58c331261b820901f3dde78aea119b400859d3c files/digest-amarok-1.4.2-r1 247
-SHA256 5b69a6996c41aa97863f57c7ecffaf1500a0495f22f99752fdc424cf6be655b7 files/digest-amarok-1.4.2-r1 247
-MD5 ecfb45bf9511daa1e0894c64f2ff6112 files/digest-amarok-1.4.3 247
-RMD160 8eb0e628f823ab06d97dab32bc6a1e3476c37871 files/digest-amarok-1.4.3 247
-SHA256 30a763884b75f16b9a733b1eeb468f2316f2b6ae1e7500459463fee5cbd94493 files/digest-amarok-1.4.3 247
 MD5 ecfb45bf9511daa1e0894c64f2ff6112 files/digest-amarok-1.4.3-r1 247
 RMD160 8eb0e628f823ab06d97dab32bc6a1e3476c37871 files/digest-amarok-1.4.3-r1 247
 SHA256 30a763884b75f16b9a733b1eeb468f2316f2b6ae1e7500459463fee5cbd94493 files/digest-amarok-1.4.3-r1 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFCnbiAiZjviIA2XgRAoNWAJ4hTQlhp07B6i2AAYyKHVYUZKGbrQCbBfwF
-S1Hx2vYDg10oGOsO9hdfCo8=
-=aH2y
+iD8DBQFFLhakAiZjviIA2XgRAhW+AJ9mBrEFxMwYd5nHQInouwGeQG7amACgkQff
+J6SiGXj990gZU/d3NPwoYz0=
+=zVDA
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-1.4.1-r3.ebuild b/media-sound/amarok/amarok-1.4.1-r3.ebuild
deleted file mode 100644
index 35c997e0f2c9..000000000000
--- a/media-sound/amarok/amarok-1.4.1-r3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.1-r3.ebuild,v 1.2 2006/08/05 22:04:07 weeve 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_DOC="da de es et fr it nl pt pt_BR ru sv"
-
-USE_KEG_PACKAGING=1
-
-inherit kde eutils flag-o-matic
-
-PKG_SUFFIX=""
-
-MY_PV="${PV/_rc/_RC}"
-MY_PV="${MY_PV/_beta/-beta}${PKG_SUFFIX}"
-MY_BASE_PV="${MY_PV/_RC*/}"
-MY_BASE_PV="${MY_BASE_PV/-beta*/}"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-
-SRC_URI="mirror://sourceforge/amarok/${PN}-${MY_PV}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="aac kde mysql noamazon opengl postgres
-xmms visualization ipod ifp real njb"
-# kde: enables compilation of the konqueror sidebar plugin
-
-DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
-	>=media-libs/xine-lib-1.1.2_pre20060328-r8
-	>=media-libs/taglib-1.4
-	mysql? ( >=dev-db/mysql-4.0.16 )
-	postgres? ( dev-db/postgresql )
-	opengl? ( virtual/opengl )
-	xmms? ( >=media-sound/xmms-1.2 )
-	visualization? ( media-libs/libsdl
-					 =media-plugins/libvisual-plugins-0.4* )
-	ipod? ( media-libs/libgpod )
-	aac? ( media-libs/libmp4v2 )
-	ifp? ( media-libs/libifp )
-	real? ( media-video/realplayer )
-	njb? ( >=media-libs/libnjb-2.2.4 )"
-
-RDEPEND="${DEPEND}
-	dev-lang/ruby"
-
-DEPEND="${DEPEND}
-	>=dev-util/pkgconfig-0.9.0"
-
-PATCHES="${FILESDIR}/${P}-libvisual.patch"
-
-need-kde 3.3
-
-src_compile() {
-	append-flags -fno-inline
-
-	# Extra, unsupported engines are forcefully disabled.
-	local myconf="$(use_enable mysql) $(use_enable postgres postgresql)
-				  $(use_with opengl) $(use_with 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)
-				  --without-musicbrainz
-				  --with-xine
-				  --without-mas
-				  --without-nmm"
-
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-
-	mv "${D}/usr/share/services/lastfm.protocol" \
-		"${D}/usr/share/services/amaroklastfm.protocol"
-}
\ No newline at end of file
diff --git a/media-sound/amarok/amarok-1.4.2-r1.ebuild b/media-sound/amarok/amarok-1.4.2-r1.ebuild
deleted file mode 100644
index 4961070bd1f2..000000000000
--- a/media-sound/amarok/amarok-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.2-r1.ebuild,v 1.1 2006/08/31 09:17:00 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_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 ~x86 ~x86-fbsd"
-IUSE="aac kde mysql noamazon opengl postgres
-xmms visualization ipod ifp real njb"
-# kde: enables compilation of the konqueror sidebar plugin
-
-DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
-	>=media-libs/xine-lib-1.1.2_pre20060328-r8
-	>=media-libs/taglib-1.4
-	mysql? ( >=dev-db/mysql-4.0.16 )
-	postgres? ( dev-db/postgresql )
-	opengl? ( virtual/opengl )
-	xmms? ( >=media-sound/xmms-1.2 )
-	visualization? ( media-libs/libsdl
-					 =media-plugins/libvisual-plugins-0.4* )
-	ipod? ( media-libs/libgpod )
-	aac? ( media-libs/libmp4v2 )
-	ifp? ( media-libs/libifp )
-	real? ( media-video/realplayer )
-	njb? ( >=media-libs/libnjb-2.2.4 )"
-
-RDEPEND="${DEPEND}
-	dev-lang/ruby"
-
-DEPEND="${DEPEND}
-	>=dev-util/pkgconfig-0.9.0"
-
-PATCHES="${FILESDIR}/${P}-20restarts.patch
-	${FILESDIR}/${P}-audiocd-freeze.patch
-	${FILESDIR}/${P}-collection-sqlite.patch
-	${FILESDIR}/${P}-libmtp.patch"
-
-need-kde 3.3
-
-src_compile() {
-	append-flags -fno-inline
-
-	# Extra, unsupported engines are forcefully disabled.
-	local myconf="$(use_enable mysql) $(use_enable postgres postgresql)
-				  $(use_with opengl) $(use_with 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)
-				  --without-musicbrainz
-				  --with-xine
-				  --without-mas
-				  --without-nmm"
-
-	kde_src_compile
-}
diff --git a/media-sound/amarok/amarok-1.4.3.ebuild b/media-sound/amarok/amarok-1.4.3.ebuild
deleted file mode 100644
index a56639155454..000000000000
--- a/media-sound/amarok/amarok-1.4.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2006 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.ebuild,v 1.3 2006/09/05 22:19:43 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_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
-xmms visualization ipod ifp real njb"
-# kde: enables compilation of the konqueror sidebar plugin
-
-DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
-	>=media-libs/xine-lib-1.1.2_pre20060328-r8
-	>=media-libs/taglib-1.4
-	mysql? ( >=dev-db/mysql-4.0.16 )
-	postgres? ( dev-db/postgresql )
-	opengl? ( virtual/opengl )
-	xmms? ( >=media-sound/xmms-1.2 )
-	visualization? ( media-libs/libsdl
-					 =media-plugins/libvisual-plugins-0.4* )
-	ipod? ( media-libs/libgpod )
-	aac? ( media-libs/libmp4v2 )
-	ifp? ( media-libs/libifp )
-	real? ( media-video/realplayer )
-	njb? ( >=media-libs/libnjb-2.2.4 )"
-
-RDEPEND="${DEPEND}
-	dev-lang/ruby"
-
-DEPEND="${DEPEND}
-	>=dev-util/pkgconfig-0.9.0"
-
-need-kde 3.3
-
-src_compile() {
-	append-flags -fno-inline
-
-	# Extra, unsupported engines are forcefully disabled.
-	local myconf="$(use_enable mysql) $(use_enable postgres postgresql)
-				  $(use_with opengl) $(use_with 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)
-				  --without-musicbrainz
-				  --without-libmtp
-				  --with-xine
-				  --without-mas
-				  --without-nmm"
-
-	kde_src_compile
-}
diff --git a/media-sound/amarok/files/amarok-1.4.1-libvisual.patch b/media-sound/amarok/files/amarok-1.4.1-libvisual.patch
deleted file mode 100644
index 8388aefd9bfb..000000000000
--- a/media-sound/amarok/files/amarok-1.4.1-libvisual.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Ian Monroe <ian.monroe@gmail.com>
-Date: Jul 18, 2006 12:00 PM
-Subject: extragear/multimedia/amarok
-To: kde-commits@kde.org
-Cc: 130584-done@bugs.kde.org
-
-
-SVN commit 563853 by ianmonroe:
-
- r5938@wasabi:  ian | 2006-07-18 11:57:06 -0500
- ProjectM works!
- Fix libvisual 0.4.0 support. Patch by Dennis Smit, thanks to Joe Rabinoff
- for the good bug report.
- BUG:130584
-
-
- _M            . (directory)
- M  +1 -0      ChangeLog
- M  +5 -6      src/vis/libvisual/libvisual.cpp
-
-
-+++ trunk/extragear/multimedia/amarok/src/vis/libvisual/libvisual.cpp #563852:563853
-@@ -301,13 +301,12 @@
-     static int
-     upload_callback( VisInput*, VisAudio *audio, void* )
-     {
--        for( uint i = 0; i < 1024; i+=2 )
--        {
--            // amarok provides us with dual channel interleaved PCM
--            audio->plugpcm[0][i] = pcm_data[i];
--            audio->plugpcm[1][i] = pcm_data[i+1];
--        }
-+        VisBuffer buf;
-
-+        visual_buffer_init( &buf, pcm_data, 1024, 0 );
-+        visual_audio_samplepool_input( audio->samplepool, &buf, VISUAL_AUDIO_SAMPLE_RATE_44100,
-+            VISUAL_AUDIO_SAMPLE_FORMAT_S16, VISUAL_AUDIO_SAMPLE_CHANNEL_STEREO );
-+
-         return 0;
-     }
diff --git a/media-sound/amarok/files/amarok-1.4.2-20restarts.patch b/media-sound/amarok/files/amarok-1.4.2-20restarts.patch
deleted file mode 100644
index 973711c939c7..000000000000
--- a/media-sound/amarok/files/amarok-1.4.2-20restarts.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: amarok/src/scancontroller.h
-===================================================================
---- amarok/src/scancontroller.h	(revision 578921)
-+++ amarok/src/scancontroller.h	(revision 578922)
-@@ -99,7 +99,7 @@
-         void customEvent( QCustomEvent* );
- 
-         // Member variables:
--        static const uint MAX_RESTARTS = 2;
-+        static const uint MAX_RESTARTS = 20;
- 
-         KProcIO* m_scanner;
-         QStringList m_folders;
diff --git a/media-sound/amarok/files/amarok-1.4.2-audiocd-freeze.patch b/media-sound/amarok/files/amarok-1.4.2-audiocd-freeze.patch
deleted file mode 100644
index 3d630632e54f..000000000000
--- a/media-sound/amarok/files/amarok-1.4.2-audiocd-freeze.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: amarok/src/collectiondb.cpp
-===================================================================
---- amarok/src/collectiondb.cpp	(revision 578457)
-+++ amarok/src/collectiondb.cpp	(revision 578458)
-@@ -3463,28 +3463,6 @@
-             bundle->copyFrom( peb );
-             valid = true;
-         }
--        else if( bundle->url().protocol() == "audiocd" || bundle->url().protocol() == "cdda" )
--        {
--            // try to see if the engine has some info about the
--            // item (the intended behaviour should be that if the
--            // item is an AudioCD track, the engine can return
--            // CDDB data for it)
--            Engine::SimpleMetaBundle smb;
--            if ( EngineController::engine()->metaDataForUrl( bundle->url(), smb ) )
--            {
--                valid = true;
--                bundle->setTitle( smb.title );
--                bundle->setArtist( smb.artist );
--                bundle->setAlbum( smb.album );
--                bundle->setComment( smb.comment );
--                bundle->setGenre( smb.genre );
--                bundle->setBitrate( smb.bitrate.toInt() );
--                bundle->setSampleRate( smb.samplerate.toInt() );
--                bundle->setLength( smb.length.toInt() );
--                bundle->setYear( smb.year.toInt() );
--                bundle->setTrack( smb.tracknr.toInt() );
--            }
--        }
-     }
- 
-     return valid;
diff --git a/media-sound/amarok/files/amarok-1.4.2-collection-sqlite.patch b/media-sound/amarok/files/amarok-1.4.2-collection-sqlite.patch
deleted file mode 100644
index 0788c30a125f..000000000000
--- a/media-sound/amarok/files/amarok-1.4.2-collection-sqlite.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: amarok/src/collectiondb.cpp
-===================================================================
---- amarok/src/collectiondb.cpp	(revision 577764)
-+++ amarok/src/collectiondb.cpp	(revision 577765)
-@@ -5761,7 +5761,8 @@
- {
- 
-     QStringList values;
--    int error, rc;
-+    int error;
-+    int rc = 0;
-     const char* tail;
-     sqlite3_stmt* stmt;
-     int busyCnt = 0;
-@@ -5787,6 +5788,7 @@
-             Debug::error() << sqlite3_errmsg( m_db ) << endl;
-             Debug::error() << "on query: " << statement << endl;
-             values = QStringList();
-+            break;
-         }
-         else
-         {
-@@ -5851,7 +5853,8 @@
- 
- int SqliteConnection::insert( const QString& statement, const QString& /* table */ )
- {
--    int error, rc;
-+    int error;
-+    int rc = 0;
-     const char* tail;
-     sqlite3_stmt* stmt;
-     int busyCnt = 0;
-@@ -5876,6 +5879,7 @@
-             Debug::error() << k_funcinfo << " sqlite3_compile error:" << endl;
-             Debug::error() << sqlite3_errmsg( m_db ) << endl;
-             Debug::error() << "on insert: " << statement << endl;
-+            break;
-         }
-         else
-         {
diff --git a/media-sound/amarok/files/amarok-1.4.2-libmtp.patch b/media-sound/amarok/files/amarok-1.4.2-libmtp.patch
deleted file mode 100644
index ea8067dae77c..000000000000
--- a/media-sound/amarok/files/amarok-1.4.2-libmtp.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Index: amarok/src/mediadevice/mtp/mtpmediadevice.cpp
-===================================================================
---- amarok/src/mediadevice/mtp/mtpmediadevice.cpp	(revision 576120)
-+++ amarok/src/mediadevice/mtp/mtpmediadevice.cpp	(revision 576121)
-@@ -631,7 +631,11 @@
- 	}

- 

-     QString modelname = QString( LIBMTP_Get_Modelname( m_device ) );

-+#if LIBMTP_FRIENDLY_NAME 

-+    QString ownername = QString( LIBMTP_Get_Friendlyname( m_device ) );

-+#else

-     QString ownername = QString( LIBMTP_Get_Ownername( m_device ) );

-+#endif

-     m_name = modelname;

-     if(! ownername.isEmpty() )

-     {

-Index: amarok/src/mediadevice/mtp/Makefile.am
-===================================================================
---- amarok/src/mediadevice/mtp/Makefile.am	(revision 576120)
-+++ amarok/src/mediadevice/mtp/Makefile.am	(revision 576121)
-@@ -9,6 +9,7 @@
-     -I$(top_srcdir)/amarok/src/engine \
-     -I$(top_builddir)/amarok/src/engine \
-     -I$(top_srcdir)/amarok/src/mediadevice \
-+    -DLIBMTP_FRIENDLY_NAME=$(LIBMTP_FRIENDLY_NAME) \
-     $(taglib_includes) \
-     $(all_includes)
- 
-Index: amarok/configure.in.in
-===================================================================
---- amarok/configure.in.in	(revision 576120)
-+++ amarok/configure.in.in	(revision 576121)
-@@ -808,16 +808,22 @@
-     [build_libmtp=$withval],
-     [build_libmtp=yes]
- )
--
-     if test "$build_libmtp" != "no"; then
-         if test "$PKGCONFIGFOUND" = "yes" ; then
-+            have_libmtp=no
-+            LIBMTP_FRIENDLY_NAME=0
-+            PKG_CHECK_MODULES(LIBMTP, libmtp >= 0.0.12,
-+            [
-+                LIBMTP_FRIENDLY_NAME=1
-+                have_libmtp=yes
-+            ],
-+            [
-+                PKG_CHECK_MODULES(LIBMTP, libmtp < 0.0.12, have_libmtp=yes, have_libmtp=no)
-+            ])
- 
--        # check for libmtp
--        have_libmtp=no
--
--        PKG_CHECK_MODULES(LIBMTP, libmtp, have_libmtp=yes,have_libmtp=no)
-         if test "x$have_libmtp" != "xno"; then
-             AC_DEFINE(HAVE_LIBMTP, 1, [have libmtp])
-+            AC_SUBST(LIBMTP_FRIENDLY_NAME)
-         fi
-     fi
- fi
diff --git a/media-sound/amarok/files/digest-amarok-1.4.1-r3 b/media-sound/amarok/files/digest-amarok-1.4.1-r3
deleted file mode 100644
index 62510a3d95d4..000000000000
--- a/media-sound/amarok/files/digest-amarok-1.4.1-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4ed6e766541c4227d1d8c8eb93d0b891 amarok-1.4.1.tar.bz2 13509939
-RMD160 d9df29c2a2a7b81aabb73c66b83190f0bc109094 amarok-1.4.1.tar.bz2 13509939
-SHA256 dbe4397d041a77f7ded063f50d5cfd2faf0e9efce9b4483589f751c20ff89ccd amarok-1.4.1.tar.bz2 13509939
diff --git a/media-sound/amarok/files/digest-amarok-1.4.2-r1 b/media-sound/amarok/files/digest-amarok-1.4.2-r1
deleted file mode 100644
index fb1695f0f2ed..000000000000
--- a/media-sound/amarok/files/digest-amarok-1.4.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a1e5aac4294eb049021d1e2889c0d214 amarok-1.4.2.tar.bz2 17080668
-RMD160 abc1f6bef1962fc5b1fee18f3716e4c57a59a7b4 amarok-1.4.2.tar.bz2 17080668
-SHA256 4b0b3174edf30c1d78240f7a48aeda1d7d9763a18de409046ef426caa3f6fd82 amarok-1.4.2.tar.bz2 17080668
diff --git a/media-sound/amarok/files/digest-amarok-1.4.3 b/media-sound/amarok/files/digest-amarok-1.4.3
deleted file mode 100644
index 08960adff75d..000000000000
--- a/media-sound/amarok/files/digest-amarok-1.4.3
+++ /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