Spring cleaning. One more arch keyword and 1.5.1-r3 can go too.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

7 files changed, 18 insertions, 504 deletions

diff --git a/media-plugins/audacious-plugins/ChangeLog b/media-plugins/audacious-plugins/ChangeLog
index f1abd11ab41a..a50519789a73 100644
--- a/media-plugins/audacious-plugins/ChangeLog
+++ b/media-plugins/audacious-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/audacious-plugins
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.139 2009/10/04 21:50:34 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.140 2009/10/14 21:55:35 chainsaw Exp $
+
+  14 Oct 2009; <chainsaw@gentoo.org>
+  -files/2.0.1-icecast-flawed-vorbis-enum.patch,
+  -audacious-plugins-2.0.1.ebuild, -audacious-plugins-2.1_beta1.ebuild,
+  -audacious-plugins-2.1.ebuild, -audacious-plugins-2.2_alpha1.ebuild:
+  Spring cleaning. One more arch keyword and 1.5.1-r3 can go too.
 
 *audacious-plugins-2.2_alpha2 (04 Oct 2009)
 
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index 93b3c3ab4c0c..ed5ec3de60c6 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,19 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.5.1-libmtp-0.3.0-API.patch 1936 RMD160 5a02b522df61e0dc32db13ab18d825ad1289b03f SHA1 1bfe2256f7f30703b39c98e9a3d815d89f22e9f2 SHA256 9e4154cfd8ae19a9525e7c5429ade2f5f049cc263fcb421ebc1ed208baf8d619
 AUX 1.5.1-missing-include.patch 376 RMD160 ae09acafa32c52696d4d8cec79636cfa17eee87e SHA1 fee2cdfeecac269c5ae6c32bf1eaff14de281c13 SHA256 fc91c4cf6b8d70d8a81e5744abdd3c19b6eaf6f76332a6b782e2ecb62389ea59
-AUX 2.0.1-icecast-flawed-vorbis-enum.patch 578 RMD160 297eefc31bb4435a8d19136233aeaeb78d25343a SHA1 b928760a5d9edc56e77a65935cf5bca524b816b9 SHA256 7b9164e054c7e284930ae1ae7bd9a9c1e7d6254af9d35a58fbe8a0965b4d203a
 AUX 2.1-libmpcdecsv7.patch 1549 RMD160 3ff62a034d28b35c08c4e90f859065400258bc21 SHA1 d919d4a34868cc0b097281f71a20315a663a0c56 SHA256 1cb0933640889a010e46b2672d34d9ca3ff218dcea35c508191c9a55cfeab1bc
 DIST audacious-plugins-1.5.1.tgz 2944448 RMD160 4b9fc29ccf61d1a503f10f060cbdee8b148f28b8 SHA1 630c936027c66649795cac7327cf6ab3590d3e49 SHA256 aed33732c55566604a24cd2cd1751c24d159ff8eca510647c5c3c7889fd8ae15
-DIST audacious-plugins-2.0.1.tgz 3505273 RMD160 61c8528f6a2440dbc433aff5ae6849d740883e1a SHA1 cbb702b269e59ccdc36f483768881baa865af012 SHA256 3279a2160d026c16828a850dd2d0b289bd69569c3a8ad6e060c6673b5d8cf648
-DIST audacious-plugins-2.1-beta1.tgz 3616603 RMD160 fd47e1016f4590c84f12aa204771aef86f6019f8 SHA1 281c73573faae75c215c23abef7e8adad06402ca SHA256 58d83885b49ee627eb75eb90e1e5cb36d7e9daf07d25a03f63b51b0b55ff9dc3
 DIST audacious-plugins-2.1.tgz 3610509 RMD160 fb73e37b5c05baf376dfbcf9744d96ae85de0d02 SHA1 735c773688e65ee57ce72005a72a53bb7cacc78b SHA256 fe7441e9ee6ab903fa71d21e6ee6b1b2d398567a6618d519cbeb5fa0a6e3a013
-DIST audacious-plugins-2.2-alpha1.tgz 3198008 RMD160 7efc2e9668503d8ce9c7664abf54d02ce798e2eb SHA1 d7ad8ea7b9ff9ac8f1d95c056f56e548d5d7683c SHA256 843c37b9213c3779781e8340c4e0c8e1e4ba5054261c48963daf8c05fc578297
 DIST audacious-plugins-2.2-alpha2.tgz 3196554 RMD160 808ea348875b73a47214fd758212ee5e194b779b SHA1 75cd2265c5b285676a036c15ced266e0fcd8252b SHA256 39ca49f8198e97023b620e0453dfa75d939625eb0964d2ff9688fb4c366021dc
 EBUILD audacious-plugins-1.5.1-r3.ebuild 3345 RMD160 5f966da48fdba4bc70ce1feb1dea5836c4969773 SHA1 1c23f90575ac5737893dfe873fd706dbd6b9000b SHA256 031b9a34c94295d868b4165ab6cb788d137aad1d349bf2172478557b77ac7587
-EBUILD audacious-plugins-2.0.1.ebuild 3316 RMD160 1dd8bf74abfec6f9e549bffac681a16d73b2968d SHA1 c5f580ca288082645a6f9106825c3b1cf2c35130 SHA256 424dc69b431395712f61a77a3f44fb1d71f23e65c1261a81674e228d8522a78e
 EBUILD audacious-plugins-2.1-r1.ebuild 3442 RMD160 54a6e84ad653164fb87350e538f8a7d6630de61f SHA1 79877c1c840584254f92536c2ffce77816e27d52 SHA256 6b07442b86434bac4e7c07224cdb572cd6da07cea523a2cd1932033a205fdb1f
-EBUILD audacious-plugins-2.1.ebuild 3316 RMD160 563acaa905aa964989747d3c96ba990ff5866bfc SHA1 82eeb39a9aa9150e98bdec1448d7a4b00ffc62a0 SHA256 c456b93ac7129b405a799f1803736f3c9b3420eb0cf0c5f2ba107327c4e03cb0
-EBUILD audacious-plugins-2.1_beta1.ebuild 3328 RMD160 b547f68885eeeef55ca30fe278ae3f8a9a980acb SHA1 f7f1e3fcea14016bd638e5432efb8fccf4793b2e SHA256 37038e33677b906886e0266dc1f765efb0e24e7be3195b729a0a2ed437341846
-EBUILD audacious-plugins-2.2_alpha1.ebuild 3099 RMD160 4e567aa322e615f70bf09c89cebe161c28e105c6 SHA1 76b213fc1f528ac5763db0dcfe6a216b7e48cac1 SHA256 66a8a038a9d9dbe47c4536c624b4841a258c6636269493fd5935af8436745c77
 EBUILD audacious-plugins-2.2_alpha2.ebuild 3099 RMD160 54ae19d2521d8c02f0d49e99f46a9ae28fe8f5c2 SHA1 b83ad37554e66ee1ec6e479ec4f2a1485c06edba SHA256 d6faf48760f3e69804004533479f4299fc252ec07067dbb47e990858e3275b29
-MISC ChangeLog 29046 RMD160 512927f92fec7c7cdff7f4a7888deda10f5ccf6c SHA1 715b2ab4b341e38adafbeada5270585617c99abf SHA256 50a26eee98cee12103e0c332b79cb0714408876a07efd9ba7615bc69cd4df664
+MISC ChangeLog 29342 RMD160 2d006c1837fc23bf00afd925ee226608c44e6eaa SHA1 9056f7b849d01887cf79600e01c5abc75d9df932 SHA256 d04832d6a391406150fbd9a06299d532bea5415026ba1254fedea3316a30eeb7
 MISC metadata.xml 933 RMD160 a101abab026c1c2640b33a6e34d7e462a2e8a77b SHA1 30fc4bbee1c3b44aa8b3d292832932a47d4ce84c SHA256 b71897abce5726f445e94145fa1379b901715c72b8f151615d55296011f2a0fe
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkrWSVcACgkQp5vW4rUFj5pWMwCfQWysrIRD/Fl49N7oz3snQ7KL
+UF8AoL0dzgpRkx+F18O3qjcZIonoiivN
+=5mrX
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.0.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.0.1.ebuild
deleted file mode 100644
index ceb23c79d734..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-2.0.1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-2.0.1.ebuild,v 1.6 2009/07/22 16:04:13 ssuominen Exp $
-
-inherit eutils flag-o-matic
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.atheme.org/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="adplug alsa cdda esd flac gnome icecast ipv6 jack lirc mp3 mtp musepack
-nls oss projectm pulseaudio scrobbler sdl sid sndfile sse2 timidity tta vorbis wavpack wma"
-
-RDEPEND="app-arch/unzip
-	>=dev-libs/dbus-glib-0.60
-	dev-libs/libxml2
-	>=media-sound/audacious-2.0.1
-	>=net-misc/neon-0.26.4
-	>=x11-libs/gtk+-2.14
-	adplug? ( >=dev-cpp/libbinio-1.4 )
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	cdda? ( >=media-libs/libcddb-1.2.1
-		>=dev-libs/libcdio-0.79-r1 )
-	esd? ( >=media-sound/esound-0.2.38-r1 )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.2.1-r1 )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit )
-	lirc? ( app-misc/lirc )
-	mp3? ( media-libs/libmad )
-	mtp? ( media-libs/libmtp )
-	musepack? ( media-libs/libmpcdec media-libs/taglib )
-	projectm? ( >=media-libs/libprojectm-1.2.0
-		>=media-libs/libsdl-1.2.5 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	scrobbler? ( net-misc/curl )
-	sdl? (	>=media-libs/libsdl-1.2.5 )
-	sid? ( media-libs/libsidplay )
-	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
-	timidity? ( media-sound/timidity++ )
-	tta? ( media-libs/libid3tag )
-	vorbis? ( >=media-libs/libvorbis-1.2.0
-		  >=media-libs/libogg-1.1.3 )
-	wavpack? ( >=media-sound/wavpack-4.41.0 )
-	wma? ( >=media-libs/libmms-0.3 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	>=dev-util/pkgconfig-0.9.0"
-
-mp3_warning() {
-	if ! useq mp3 ; then
-		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PV}-icecast-flawed-vorbis-enum.patch"
-}
-
-src_compile() {
-	mp3_warning
-
-	econf \
-		--enable-aac \
-		--enable-chardet \
-		--enable-dbus \
-		--enable-modplug \
-		--enable-neon \
-		--disable-coreaudio \
-		--disable-dockalbumart \
-		--disable-projectm \
-		--disable-rootvis \
-		$(use_enable projectm projectm-1.0) \
-		$(use_enable adplug) \
-		$(use_enable alsa) \
-		$(use_enable alsa bluetooth) \
-		$(use_enable cdda cdaudio) \
-		$(use_enable esd) \
-		$(use_enable flac flacng) \
-		$(use_enable flac filewriter_flac) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable gnome gnomeshortcuts) \
-		$(use_enable lirc) \
-		$(use_enable mp3) \
-		$(use_enable musepack) \
-		$(use_enable mtp mtp_up) \
-		$(use_enable nls) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable sdl paranormal) \
-		$(use_enable sid) \
-		$(use_enable sndfile) \
-		$(use_enable sse2) \
-		$(use_enable timidity) \
-		$(use_enable tta) \
-		$(use_enable vorbis) \
-		$(use_enable vorbis filewriter_vorbis) \
-		$(use_enable wavpack) \
-		$(use_enable wma) \
-		$(use_enable wma mms) \
-		|| die
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS
-}
-
-pkg_postinst() {
-	mp3_warning
-}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.1.ebuild
deleted file mode 100644
index 50c42432fb5d..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-2.1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-2.1.ebuild,v 1.5 2009/08/02 18:29:32 nixnut Exp $
-
-inherit eutils flag-o-matic
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.atheme.org/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="adplug alsa bs2b cdda esd flac gnome icecast ipv6 jack lirc mp3 mtp musepack
-nls oss projectm pulseaudio scrobbler sdl sid sndfile sse2 timidity tta vorbis wavpack wma"
-
-RDEPEND="app-arch/unzip
-	>=dev-libs/dbus-glib-0.60
-	dev-libs/libxml2
-	>=media-sound/audacious-2.1_beta1
-	>=net-misc/neon-0.26.4
-	>=x11-libs/gtk+-2.14
-	adplug? ( >=dev-cpp/libbinio-1.4 )
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	bs2b? ( media-libs/libbs2b )
-	cdda? ( >=media-libs/libcddb-1.2.1
-		>=dev-libs/libcdio-0.79-r1 )
-	esd? ( >=media-sound/esound-0.2.38-r1 )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.2.1-r1 )
-	icecast? ( media-libs/libshout )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit )
-	lirc? ( app-misc/lirc )
-	mp3? ( media-libs/libmad )
-	mtp? ( media-libs/libmtp )
-	musepack? ( media-libs/libmpcdec media-libs/taglib )
-	projectm? ( >=media-libs/libprojectm-1.2.0
-		>=media-libs/libsdl-1.2.5 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	scrobbler? ( net-misc/curl )
-	sdl? (	>=media-libs/libsdl-1.2.5 )
-	sid? ( >=media-libs/libsidplay-2.1.1-r2 )
-	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
-	timidity? ( media-sound/timidity++ )
-	tta? ( media-libs/libid3tag )
-	vorbis? ( >=media-libs/libvorbis-1.2.0
-		  >=media-libs/libogg-1.1.3 )
-	wavpack? ( >=media-sound/wavpack-4.41.0 )
-	wma? ( >=media-libs/libmms-0.3 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	>=dev-util/pkgconfig-0.9.0"
-
-mp3_warning() {
-	if ! useq mp3 ; then
-		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-	fi
-}
-
-src_compile() {
-	mp3_warning
-
-	econf \
-		--enable-aac \
-		--enable-chardet \
-		--enable-dbus \
-		--enable-modplug \
-		--enable-neon \
-		--disable-coreaudio \
-		--disable-dockalbumart \
-		--disable-projectm \
-		$(use_enable projectm projectm-1.0) \
-		$(use_enable adplug) \
-		$(use_enable alsa) \
-		$(use_enable alsa bluetooth) \
-		$(use_enable bs2b) \
-		$(use_enable cdda cdaudio) \
-		$(use_enable esd) \
-		$(use_enable flac flacng) \
-		$(use_enable flac filewriter_flac) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable gnome gnomeshortcuts) \
-		$(use_enable lirc) \
-		$(use_enable mp3) \
-		$(use_enable musepack) \
-		$(use_enable mtp mtp_up) \
-		$(use_enable nls) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable sdl paranormal) \
-		$(use_enable sid) \
-		$(use_enable sndfile) \
-		$(use_enable sse2) \
-		$(use_enable timidity) \
-		$(use_enable tta) \
-		$(use_enable vorbis) \
-		$(use_enable vorbis filewriter_vorbis) \
-		$(use_enable wavpack) \
-		$(use_enable wma) \
-		$(use_enable wma mms) \
-		$(use_enable icecast) \
-		|| die
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS
-}
-
-pkg_postinst() {
-	mp3_warning
-}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.1_beta1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.1_beta1.ebuild
deleted file mode 100644
index a50c1d63677e..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-2.1_beta1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-2.1_beta1.ebuild,v 1.3 2009/07/22 16:04:13 ssuominen Exp $
-
-inherit eutils flag-o-matic
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.atheme.org/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="adplug alsa bs2b cdda esd flac gnome icecast ipv6 jack lirc mp3 mtp musepack
-nls oss projectm pulseaudio scrobbler sdl sid sndfile sse2 timidity tta vorbis wavpack wma"
-
-RDEPEND="app-arch/unzip
-	>=dev-libs/dbus-glib-0.60
-	dev-libs/libxml2
-	>=media-sound/audacious-2.1_beta1
-	>=net-misc/neon-0.26.4
-	>=x11-libs/gtk+-2.14
-	adplug? ( >=dev-cpp/libbinio-1.4 )
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	bs2b? ( media-libs/libbs2b )
-	cdda? ( >=media-libs/libcddb-1.2.1
-		>=dev-libs/libcdio-0.79-r1 )
-	esd? ( >=media-sound/esound-0.2.38-r1 )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.2.1-r1 )
-	icecast? ( media-libs/libshout )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit )
-	lirc? ( app-misc/lirc )
-	mp3? ( media-libs/libmad )
-	mtp? ( media-libs/libmtp )
-	musepack? ( media-libs/libmpcdec media-libs/taglib )
-	projectm? ( >=media-libs/libprojectm-1.2.0
-		>=media-libs/libsdl-1.2.5 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	scrobbler? ( net-misc/curl )
-	sdl? (	>=media-libs/libsdl-1.2.5 )
-	sid? ( >=media-libs/libsidplay-2.1.1-r2 )
-	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
-	timidity? ( media-sound/timidity++ )
-	tta? ( media-libs/libid3tag )
-	vorbis? ( >=media-libs/libvorbis-1.2.0
-		  >=media-libs/libogg-1.1.3 )
-	wavpack? ( >=media-sound/wavpack-4.41.0 )
-	wma? ( >=media-libs/libmms-0.3 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	>=dev-util/pkgconfig-0.9.0"
-
-mp3_warning() {
-	if ! useq mp3 ; then
-		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-	fi
-}
-
-src_compile() {
-	mp3_warning
-
-	econf \
-		--enable-aac \
-		--enable-chardet \
-		--enable-dbus \
-		--enable-modplug \
-		--enable-neon \
-		--disable-coreaudio \
-		--disable-dockalbumart \
-		--disable-projectm \
-		$(use_enable projectm projectm-1.0) \
-		$(use_enable adplug) \
-		$(use_enable alsa) \
-		$(use_enable alsa bluetooth) \
-		$(use_enable bs2b) \
-		$(use_enable cdda cdaudio) \
-		$(use_enable esd) \
-		$(use_enable flac flacng) \
-		$(use_enable flac filewriter_flac) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable gnome gnomeshortcuts) \
-		$(use_enable lirc) \
-		$(use_enable mp3) \
-		$(use_enable musepack) \
-		$(use_enable mtp mtp_up) \
-		$(use_enable nls) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable sdl paranormal) \
-		$(use_enable sid) \
-		$(use_enable sndfile) \
-		$(use_enable sse2) \
-		$(use_enable timidity) \
-		$(use_enable tta) \
-		$(use_enable vorbis) \
-		$(use_enable vorbis filewriter_vorbis) \
-		$(use_enable wavpack) \
-		$(use_enable wma) \
-		$(use_enable wma mms) \
-		$(use_enable icecast) \
-		|| die
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS
-}
-
-pkg_postinst() {
-	mp3_warning
-}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.2_alpha1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.2_alpha1.ebuild
deleted file mode 100644
index d221b05989c2..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-2.2_alpha1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-2.2_alpha1.ebuild,v 1.2 2009/09/16 19:08:03 chainsaw Exp $
-
-inherit eutils flag-o-matic
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.atheme.org/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="adplug alsa bs2b cdda esd flac ffmpeg gnome icecast ipv6 jack lirc mp3 mtp
-nls oss projectm scrobbler sdl sid sndfile sse2 timidity tta vorbis wavpack"
-
-RDEPEND="app-arch/unzip
-	>=dev-libs/dbus-glib-0.60
-	dev-libs/libxml2
-	>=media-sound/audacious-2.2_alpha1
-	>=net-misc/neon-0.26.4
-	>=x11-libs/gtk+-2.14
-	adplug? ( >=dev-cpp/libbinio-1.4 )
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	bs2b? ( media-libs/libbs2b )
-	cdda? ( >=media-libs/libcddb-1.2.1
-		>=dev-libs/libcdio-0.79-r1 )
-	esd? ( >=media-sound/esound-0.2.38-r1 )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.2.1-r1 )
-	icecast? ( media-libs/libshout )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit )
-	lirc? ( app-misc/lirc )
-	mp3? ( media-libs/libmad )
-	mtp? ( media-libs/libmtp )
-	projectm? ( >=media-libs/libprojectm-1.2.0
-		>=media-libs/libsdl-1.2.5 )
-	scrobbler? ( net-misc/curl )
-	sdl? (	>=media-libs/libsdl-1.2.5 )
-	sid? ( >=media-libs/libsidplay-2.1.1-r2 )
-	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
-	timidity? ( media-sound/timidity++ )
-	tta? ( media-libs/libid3tag )
-	vorbis? ( >=media-libs/libvorbis-1.2.0
-		  >=media-libs/libogg-1.1.3 )
-	wavpack? ( >=media-sound/wavpack-4.41.0 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	>=dev-util/pkgconfig-0.9.0"
-
-mp3_warning() {
-	if ! useq mp3 ; then
-		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-	fi
-}
-
-src_compile() {
-	mp3_warning
-
-	econf \
-		--enable-aac \
-		--enable-chardet \
-		--enable-dbus \
-		--enable-modplug \
-		--enable-neon \
-		--disable-coreaudio \
-		--disable-dockalbumart \
-		--disable-projectm \
-		$(use_enable projectm projectm-1.0) \
-		$(use_enable adplug) \
-		$(use_enable alsa) \
-		$(use_enable alsa bluetooth) \
-		$(use_enable bs2b) \
-		$(use_enable cdda cdaudio) \
-		$(use_enable esd) \
-		$(use_enable ffmpeg ffaudio) \
-		$(use_enable flac flacng) \
-		$(use_enable flac filewriter_flac) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable gnome gnomeshortcuts) \
-		$(use_enable lirc) \
-		$(use_enable mp3) \
-		$(use_enable mtp mtp_up) \
-		$(use_enable nls) \
-		$(use_enable oss) \
-		$(use_enable sdl paranormal) \
-		$(use_enable sid) \
-		$(use_enable sndfile) \
-		$(use_enable sse2) \
-		$(use_enable timidity) \
-		$(use_enable tta) \
-		$(use_enable vorbis) \
-		$(use_enable vorbis filewriter_vorbis) \
-		$(use_enable wavpack) \
-		$(use_enable icecast) \
-		|| die
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS
-}
-
-pkg_postinst() {
-	mp3_warning
-}
diff --git a/media-plugins/audacious-plugins/files/2.0.1-icecast-flawed-vorbis-enum.patch b/media-plugins/audacious-plugins/files/2.0.1-icecast-flawed-vorbis-enum.patch
deleted file mode 100644
index 925ca623e00b..000000000000
--- a/media-plugins/audacious-plugins/files/2.0.1-icecast-flawed-vorbis-enum.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-# HG changeset patch
-# User Matti Hamalainen <ccr@tnsp.org>
-# Date 1245161877 -10800
-# Node ID c41b5966778fce4eb9b15e0c5ee262c7ff1758fb
-# Parent  54c7d2087c8af9e01430a907675cb066f0b30b61
-Default to '0' instead of enum value VORBIS, which may not be defined if
-Vorbis support is not compiled in.
-
---- a/src/icecast/icecast.c	Tue Jun 16 08:15:49 2009 -0500
-+++ b/src/icecast/icecast.c	Tue Jun 16 17:17:57 2009 +0300
-@@ -52,7 +52,7 @@
-     streamformat_MAX
- };
- 
--static gint streamformat = VORBIS;
-+static gint streamformat = 0;
- 
- static unsigned int streamformat_shout[] =
- {
-