Version bump, mostly a bugfix release. Adds AltiVec support for WMA thanks to our own lu_zero. Cleaning up old ebuilds.

(Portage version: 2.1.1_pre3-r3)
 (Signed Manifest commit)

14 files changed, 22 insertions, 722 deletions

diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index a450d536ab82..fd1dd1503409 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,67 +1,35 @@
-AUX util-filesize.diff 462 RMD160 d9417e2bdf44745150096f0173fc0a0dd448c82f SHA1 777409608e96b1945801ce4e2d706f7a3714dce0 SHA256 d198ef445bbf46486c39263d44139d7397fd9116fe1520c6ed7074b195a65a83
-MD5 249bb26ef28b6feeb6498e63051d03bc files/util-filesize.diff 462
-RMD160 d9417e2bdf44745150096f0173fc0a0dd448c82f files/util-filesize.diff 462
-SHA256 d198ef445bbf46486c39263d44139d7397fd9116fe1520c6ed7074b195a65a83 files/util-filesize.diff 462
-DIST audacious-0.2.3.tgz 3246886 RMD160 e4ac4a1d5036689a2362e50387419d362270e417 SHA1 f640d06053a5e9fabd367e69b22f572528c9e930 SHA256 e1c8efc805bb95eff8f2bb3d6de919dd67240b979f16af8f87429fbc92dd789b
-DIST audacious-1.0.0.tgz 3248602 RMD160 358f580448f61e48520557cd8406ef9ec81073eb SHA1 3afa76cc716e23f740e323e72609e27de86000e3 SHA256 c3b11f7755af0bc89330aa79907cf43e99227a6f935652c7cd529385e152c8cb
-DIST audacious-1.1.0-dr1.tgz 3189815 RMD160 49a0df7e52f49f43de5a66da936604d771e3f1e5 SHA1 b521d7b5210359932151d347e04840c1d9baf3ce SHA256 e772792198b61f8372ae2ea9f73efc23ae1703ad1421b632555c23bb0ce105cd
-DIST audacious-1.1.0-dr2.tgz 3270998 RMD160 1e91c41a3fd519674303b8b1207eab9a55768a51 SHA1 c096e166b67901bf4e9891bcf9125c6fdc21d074 SHA256 620c31ac372a2f91c4afd419387244f324d6396a5e54ccd39e64ac954526a7fc
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST audacious-1.1.0.tgz 3365149 RMD160 5825caacd093dabadd16d1f37d7225490e1ce1c9 SHA1 443c68b185381d3ad6c7f053e17aa5345bbc5ba1 SHA256 ac2fcba9020d4ae38c578d9494f99761cddd153b0281570b538d7d3a6af6a4f8
+DIST audacious-1.1.1.tgz 3387162 RMD160 852a2af9ad71fcb9480f32d0581c4864aeaece17 SHA1 89246f0232e6e4d98419268e395a9fc4a40a6ed9 SHA256 11f0079bfedb01ff7248c32065cca7706d0eba75dd3035a0770ed9c42b94b887
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 SHA1 e97ebbf204e0d1b150265f9e67f0ed54d779e110 SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1
-EBUILD audacious-0.2.3.ebuild 2552 RMD160 93e522f8402adce72bb4dab97851eb25d3365bcf SHA1 775bdb48629c5672d7139a106955630e8c16f7a6 SHA256 b51202585e526af70395bd50fcde4ea314feafb7e449fbc3f1d32865603a6600
-MD5 ef2ce7cecb8f2bf6363734f9c2b9795e audacious-0.2.3.ebuild 2552
-RMD160 93e522f8402adce72bb4dab97851eb25d3365bcf audacious-0.2.3.ebuild 2552
-SHA256 b51202585e526af70395bd50fcde4ea314feafb7e449fbc3f1d32865603a6600 audacious-0.2.3.ebuild 2552
-EBUILD audacious-1.0.0-r1.ebuild 2644 RMD160 b4f4ee697ac5f5210b1d64ed25e53c3701382cd2 SHA1 80b698077bbedfb8bb7c206f7651350e322671a4 SHA256 4b1837ef355efc117fa4d7e1147769e3e24ed50a7d395d61b8fa87f47d054502
-MD5 712702daafd5918ccec8b204ef0f024c audacious-1.0.0-r1.ebuild 2644
-RMD160 b4f4ee697ac5f5210b1d64ed25e53c3701382cd2 audacious-1.0.0-r1.ebuild 2644
-SHA256 4b1837ef355efc117fa4d7e1147769e3e24ed50a7d395d61b8fa87f47d054502 audacious-1.0.0-r1.ebuild 2644
-EBUILD audacious-1.0.0.ebuild 2611 RMD160 1a3718ccdbd406937f7a7a22dd80382ff0544006 SHA1 efa138a0ce947f2bfb6b52e52fc6c111d6312bbc SHA256 82da5580623f3da52468195d07680b41a6c22b0a78d175b04e666d66ede9e466
-MD5 c81132c30362be6170e33b0948af5f15 audacious-1.0.0.ebuild 2611
-RMD160 1a3718ccdbd406937f7a7a22dd80382ff0544006 audacious-1.0.0.ebuild 2611
-SHA256 82da5580623f3da52468195d07680b41a6c22b0a78d175b04e666d66ede9e466 audacious-1.0.0.ebuild 2611
 EBUILD audacious-1.1.0.ebuild 2638 RMD160 4cc63a2a5232d889a3e888340161912f999fd3bb SHA1 12265bdcb5777c959c5f794e9cf3e0bde0f29cca SHA256 448805bd65f34b2392fc6e19c14d5053a8371d5a98d39b3967038683073152b5
 MD5 81bccc3a074fca6d8c9e8f1bf484e437 audacious-1.1.0.ebuild 2638
 RMD160 4cc63a2a5232d889a3e888340161912f999fd3bb audacious-1.1.0.ebuild 2638
 SHA256 448805bd65f34b2392fc6e19c14d5053a8371d5a98d39b3967038683073152b5 audacious-1.1.0.ebuild 2638
-EBUILD audacious-1.1.0_beta1.ebuild 2693 RMD160 cf007e5816b3511de37e9a587184e8147b92c86d SHA1 15eaa3c15287b2efbfb3476687bed75083fc59bd SHA256 bd256f4d791df65ee6d2729b04506e1e12596aeb40dc701dc7768d664433ad07
-MD5 52543e695bb143d0a822295f0dcb4c13 audacious-1.1.0_beta1.ebuild 2693
-RMD160 cf007e5816b3511de37e9a587184e8147b92c86d audacious-1.1.0_beta1.ebuild 2693
-SHA256 bd256f4d791df65ee6d2729b04506e1e12596aeb40dc701dc7768d664433ad07 audacious-1.1.0_beta1.ebuild 2693
-EBUILD audacious-1.1.0_beta2-r1.ebuild 2747 RMD160 f44d0ad9baf80371b8161a51102a14f9141df551 SHA1 8fc89ddc8acd4dc52e283dabc8d8e039e8b5ebb1 SHA256 abc198e16489879533c0d49f28bbadf32b687a7a88ce4c15f7c0ff04856f748d
-MD5 e7af1082cbb2bbcb8322d9e8c9e96ffd audacious-1.1.0_beta2-r1.ebuild 2747
-RMD160 f44d0ad9baf80371b8161a51102a14f9141df551 audacious-1.1.0_beta2-r1.ebuild 2747
-SHA256 abc198e16489879533c0d49f28bbadf32b687a7a88ce4c15f7c0ff04856f748d audacious-1.1.0_beta2-r1.ebuild 2747
-EBUILD audacious-1.1.0_beta2.ebuild 2695 RMD160 159fd699f81f5c85e5031be908be5a3afbf85566 SHA1 af42fa9aa96445b3993a6acdb24b31788717bdde SHA256 ee0782fef95ad55c9a5696632a70b2d62bb2e037770f3911bf42a01f6145373c
-MD5 e92aaae75dd85c6319575d6221b1af5f audacious-1.1.0_beta2.ebuild 2695
-RMD160 159fd699f81f5c85e5031be908be5a3afbf85566 audacious-1.1.0_beta2.ebuild 2695
-SHA256 ee0782fef95ad55c9a5696632a70b2d62bb2e037770f3911bf42a01f6145373c audacious-1.1.0_beta2.ebuild 2695
-MISC ChangeLog 9622 RMD160 5b3a618acfa30d1939e2b58dfd159ca3fc1e93c6 SHA1 147091218d890f86dad41c49b4e1de9c02becb6f SHA256 aae04c24f2cf1070d8b0f05f27203787c0c6eff0f033bf21bf11663f5723921b
-MD5 b37df2c1033a811cafd878d27fe75d8d ChangeLog 9622
-RMD160 5b3a618acfa30d1939e2b58dfd159ca3fc1e93c6 ChangeLog 9622
-SHA256 aae04c24f2cf1070d8b0f05f27203787c0c6eff0f033bf21bf11663f5723921b ChangeLog 9622
+EBUILD audacious-1.1.1.ebuild 2644 RMD160 90995eecb27ca934a4fb7c9ca083853f79dd5e60 SHA1 a0328dcc4a4556fe40b56653934049bf74501782 SHA256 af57fe161b17fc538e6a6c70c8136e5b78f19c3043e0e2a71182079d8def7c49
+MD5 9e44c5f7aed278543f5f22efe8e120d0 audacious-1.1.1.ebuild 2644
+RMD160 90995eecb27ca934a4fb7c9ca083853f79dd5e60 audacious-1.1.1.ebuild 2644
+SHA256 af57fe161b17fc538e6a6c70c8136e5b78f19c3043e0e2a71182079d8def7c49 audacious-1.1.1.ebuild 2644
+MISC ChangeLog 10060 RMD160 a9603f40d6a831b2bd9734c6596e7afb79982b3c SHA1 2614fa138e4d074ef727cacad7c3c15f9e5604ef SHA256 8ca5ebe5deddc70a5fb0cab1bbcac56558eb03e63bbe7793df3cfd18d20e2c76
+MD5 924d254a0ea07becaec4508c2d3eaec1 ChangeLog 10060
+RMD160 a9603f40d6a831b2bd9734c6596e7afb79982b3c ChangeLog 10060
+SHA256 8ca5ebe5deddc70a5fb0cab1bbcac56558eb03e63bbe7793df3cfd18d20e2c76 ChangeLog 10060
 MISC metadata.xml 248 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d SHA1 4ea80510c4e90c385ac851b4f82c36b4f91d9402 SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6
 MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248
 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d metadata.xml 248
 SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6 metadata.xml 248
-MD5 f2c1bac89dd4b26750455eb7c8b8bf9a files/digest-audacious-0.2.3 500
-RMD160 4acff2d0d55544477c08cc4e389f15190a464826 files/digest-audacious-0.2.3 500
-SHA256 863715454a5c9955cedc5f2cdf695d6def3dc1b6cfe2f0a1e2dc19d0c7f07b4a files/digest-audacious-0.2.3 500
-MD5 c208147e974fdba9e399a029cea95bd1 files/digest-audacious-1.0.0 500
-RMD160 1c5fa06b79d45af42b7ececac7e21e4a45f6be37 files/digest-audacious-1.0.0 500
-SHA256 578452a3884065ca25e3a5c6d84a876afceee8a31638c1495a3b20016ca49ad1 files/digest-audacious-1.0.0 500
-MD5 c208147e974fdba9e399a029cea95bd1 files/digest-audacious-1.0.0-r1 500
-RMD160 1c5fa06b79d45af42b7ececac7e21e4a45f6be37 files/digest-audacious-1.0.0-r1 500
-SHA256 578452a3884065ca25e3a5c6d84a876afceee8a31638c1495a3b20016ca49ad1 files/digest-audacious-1.0.0-r1 500
 MD5 ffd93e27f63003181bef12a1e6fd2fc1 files/digest-audacious-1.1.0 500
 RMD160 a93afb5b876db9032db996f8659023e875aa619d files/digest-audacious-1.1.0 500
 SHA256 fee6721a0d76209abce16b356a840991d64066b56be4f741b3f49b1c0d3a7e55 files/digest-audacious-1.1.0 500
-MD5 af29d12665104369f15f605a53c28cc3 files/digest-audacious-1.1.0_beta1 512
-RMD160 738eaa94b55228830a1b2c386fd64471d35b62b7 files/digest-audacious-1.1.0_beta1 512
-SHA256 ab8d6a6c85723afd9464667f5977a5d4678b877607e2067e97afd5c66875db2a files/digest-audacious-1.1.0_beta1 512
-MD5 fda6b7c74a82df4001029522d377da32 files/digest-audacious-1.1.0_beta2 512
-RMD160 d2e4c4cef31cf9c56dbc974997e4fbd58043eff9 files/digest-audacious-1.1.0_beta2 512
-SHA256 37f8959c66ef14ec5b987a742ac13b19ff1eee4ff3f660afbf04833233eec106 files/digest-audacious-1.1.0_beta2 512
-MD5 fda6b7c74a82df4001029522d377da32 files/digest-audacious-1.1.0_beta2-r1 512
-RMD160 d2e4c4cef31cf9c56dbc974997e4fbd58043eff9 files/digest-audacious-1.1.0_beta2-r1 512
-SHA256 37f8959c66ef14ec5b987a742ac13b19ff1eee4ff3f660afbf04833233eec106 files/digest-audacious-1.1.0_beta2-r1 512
+MD5 d81325749ccf3a3a4ccd099ad4d41c07 files/digest-audacious-1.1.1 500
+RMD160 2c0c7202a9f133950bd03bc62f0b399f77471e62 files/digest-audacious-1.1.1 500
+SHA256 740da60ce500fcc16e36ea972aed38116e2c3328db451789e91973df79b23c3a files/digest-audacious-1.1.1 500
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFEwscDp5vW4rUFj5oRAp5eAJ9LxLLLYg4xwtKDQ1e/o9YZsL9x7wCdFpsO
+/ue7qyFOp/K1BYmNubWCO6A=
+=pPxO
+-----END PGP SIGNATURE-----
diff --git a/media-sound/audacious/audacious-0.2.3.ebuild b/media-sound/audacious/audacious-0.2.3.ebuild
deleted file mode 100644
index a430743c43dc..000000000000
--- a/media-sound/audacious/audacious-0.2.3.ebuild
+++ /dev/null
@@ -1,98 +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/audacious/audacious-0.2.3.ebuild,v 1.8 2006/04/22 02:10:53 metalgod Exp $
-
-IUSE="aac alsa esd flac gnome jack lirc mmx modplug mp3 musepack nls oss sid sndfile vorbis wma"
-
-inherit flag-o-matic
-
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions."
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://audacious-media-player.org/release/${P}.tgz
-	mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
-
-RDEPEND="app-arch/unzip
-	net-misc/curl
-	media-libs/musicbrainz
-	>=x11-libs/gtk+-2.6
-	>=gnome-base/libglade-2.3.1
-	>=dev-cpp/libbinio-1.4
-	alsa? ( >=media-libs/alsa-lib-1.0.9_rc2 )
-	esd? ( >=media-sound/esound-0.2.30 )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.1.2 )
-	gnome? ( >=gnome-base/gconf-2.6.0 )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-libs/libsamplerate
-		media-sound/jack-audio-connection-kit )
-	lirc? ( app-misc/lirc )
-	modplug? ( media-libs/libmodplug )
-	musepack? ( media-libs/libmpcdec
-		    media-libs/taglib )
-	mp3? ( media-libs/id3lib )
-	sid? ( media-libs/libsidplay )
-	sndfile? ( media-libs/libsndfile )
-	vorbis? ( >=media-libs/libvorbis-1.0
-		  >=media-libs/libogg-1.0 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	>=dev-util/pkgconfig-0.9.0"
-
-src_compile() {
-	if ! useq mp3; then
-		ewarn "MP3 support is now optional and you have not enabled it."
-	fi
-
-	# Bug #42893
-	replace-flags "-Os" "-O2"
-	# Bug #86689
-	is-flag "-O*" || append-flags -O
-
-	econf \
-		--with-dev-dsp=/dev/sound/dsp \
-		--with-dev-mixer=/dev/sound/mixer \
-		--includedir=/usr/include/audacious \
-		`use_enable mmx simd` \
-		`use_enable gnome gconf` \
-		`use_enable vorbis` \
-		`use_enable esd` \
-		`use_enable mp3` \
-		`use_enable nls` \
-		`use_enable oss` \
-		`use_enable alsa` \
-		`use_enable flac` \
-		`use_enable aac` \
-		`use_enable modplug` \
-		`use_enable lirc` \
-		`use_enable sndfile` \
-		`use_enable wma` \
-		`use_enable sid` \
-		`use_enable musepack` \
-		`use_enable jack` \
-		|| die
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README
-
-	# Gentoo_ice skin installation; bug #109772
-	insinto /usr/share/audacious/Skins/gentoo_ice
-	doins ${WORKDIR}/gentoo_ice/*
-	docinto gentoo_ice
-	dodoc ${WORKDIR}/README
-}
-
-pkg_postinst() {
-	echo
-	einfo "MP3 support is now optional, you may want to enable the mp3 USE-flag."
-	echo
-}
diff --git a/media-sound/audacious/audacious-1.0.0-r1.ebuild b/media-sound/audacious/audacious-1.0.0-r1.ebuild
deleted file mode 100644
index fd591f6d7594..000000000000
--- a/media-sound/audacious/audacious-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,102 +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/audacious/audacious-1.0.0-r1.ebuild,v 1.5 2006/06/23 21:04:24 gustavoz Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://audacious-media-player.org/release/${P}.tgz
-	mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~ppc64 sparc ~x86"
-IUSE="aac alsa arts esd flac gnome jack lirc mmx modplug mp3 musepack nls oss sid sndfile timidity vorbis wma"
-
-RDEPEND="app-arch/unzip
-	net-misc/curl
-	media-libs/musicbrainz
-	>=x11-libs/gtk+-2.6
-	>=gnome-base/libglade-2.3.1
-	>=dev-cpp/libbinio-1.4
-	alsa? ( >=media-libs/alsa-lib-1.0.9_rc2 )
-	arts? ( kde-base/arts )
-	esd? ( >=media-sound/esound-0.2.30 )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.1.2 )
-	gnome? ( >=gnome-base/gconf-2.6.0 )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-libs/libsamplerate
-		media-sound/jack-audio-connection-kit )
-	lirc? ( app-misc/lirc )
-	modplug? ( media-libs/libmodplug )
-	musepack? ( media-libs/libmpcdec
-		    media-libs/taglib )
-	mp3? ( media-libs/id3lib )
-	sid? ( media-libs/libsidplay )
-	sndfile? ( media-libs/libsndfile )
-	timidity? ( media-sound/timidity++ )
-	vorbis? ( >=media-libs/libvorbis-1.0
-		  >=media-libs/libogg-1.0 )"
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	>=dev-util/pkgconfig-0.9.0"
-
-mp3_warning() {
-	if ! useq mp3 ; then
-		echo
-		ewarn "MP3 support is now optional, you may want to enable the mp3 USE-flag"
-		echo
-	fi
-}
-
-src_compile() {
-	mp3_warning
-
-	# Bug #42893
-	replace-flags "-Os" "-O2"
-	# Bug #86689
-	is-flag "-O*" || append-flags -O
-
-	econf \
-		--with-dev-dsp=/dev/sound/dsp \
-		--with-dev-mixer=/dev/sound/mixer \
-		$(use_enable mmx simd) \
-		$(use_enable gnome gconf) \
-		$(use_enable vorbis) \
-		$(use_enable esd) \
-		$(use_enable mp3) \
-		$(use_enable nls) \
-		$(use_enable oss) \
-		$(use_enable alsa) \
-		$(use_enable arts) \
-		$(use_enable flac) \
-		$(use_enable aac) \
-		$(use_enable modplug) \
-		$(use_enable lirc) \
-		$(use_enable sndfile) \
-		$(use_enable wma) \
-		$(use_enable sid) \
-		$(use_enable musepack) \
-		$(use_enable jack) \
-		$(use_enable timidity) \
-		|| die
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README
-
-	# Gentoo_ice skin installation; bug #109772
-	insinto /usr/share/audacious/Skins/gentoo_ice
-	doins "${WORKDIR}"/gentoo_ice/*
-	docinto gentoo_ice
-	dodoc "${WORKDIR}"/README
-}
-
-pkg_postinst() {
-	mp3_warning
-}
diff --git a/media-sound/audacious/audacious-1.0.0.ebuild b/media-sound/audacious/audacious-1.0.0.ebuild
deleted file mode 100644
index c0f48ec8870c..000000000000
--- a/media-sound/audacious/audacious-1.0.0.ebuild
+++ /dev/null
@@ -1,100 +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/audacious/audacious-1.0.0.ebuild,v 1.1 2006/04/16 19:45:38 chainsaw Exp $
-
-IUSE="aac alsa arts esd flac gnome jack lirc mmx modplug mp3 musepack nls oss sid sndfile vorbis wma"
-
-inherit flag-o-matic
-
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions."
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://audacious-media-player.org/release/${P}.tgz
-	mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="app-arch/unzip
-	net-misc/curl
-	media-libs/musicbrainz
-	>=x11-libs/gtk+-2.6
-	>=gnome-base/libglade-2.3.1
-	>=dev-cpp/libbinio-1.4
-	alsa? ( >=media-libs/alsa-lib-1.0.9_rc2 )
-	arts? ( kde-base/arts )
-	esd? ( >=media-sound/esound-0.2.30 )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.1.2 )
-	gnome? ( >=gnome-base/gconf-2.6.0 )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-libs/libsamplerate
-		media-sound/jack-audio-connection-kit )
-	lirc? ( app-misc/lirc )
-	modplug? ( media-libs/libmodplug )
-	musepack? ( media-libs/libmpcdec
-		    media-libs/taglib )
-	mp3? ( media-libs/id3lib )
-	sid? ( media-libs/libsidplay )
-	sndfile? ( media-libs/libsndfile )
-	vorbis? ( >=media-libs/libvorbis-1.0
-		  >=media-libs/libogg-1.0 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	>=dev-util/pkgconfig-0.9.0"
-
-src_compile() {
-	if ! useq mp3; then
-		ewarn "MP3 support is now optional and you have not enabled it."
-	fi
-
-	# Bug #42893
-	replace-flags "-Os" "-O2"
-	# Bug #86689
-	is-flag "-O*" || append-flags -O
-
-	econf \
-		--with-dev-dsp=/dev/sound/dsp \
-		--with-dev-mixer=/dev/sound/mixer \
-		--includedir=/usr/include/audacious \
-		`use_enable mmx simd` \
-		`use_enable gnome gconf` \
-		`use_enable vorbis` \
-		`use_enable esd` \
-		`use_enable mp3` \
-		`use_enable nls` \
-		`use_enable oss` \
-		`use_enable alsa` \
-		`use_enable arts` \
-		`use_enable flac` \
-		`use_enable aac` \
-		`use_enable modplug` \
-		`use_enable lirc` \
-		`use_enable sndfile` \
-		`use_enable wma` \
-		`use_enable sid` \
-		`use_enable musepack` \
-		`use_enable jack` \
-		|| die
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README
-
-	# Gentoo_ice skin installation; bug #109772
-	insinto /usr/share/audacious/Skins/gentoo_ice
-	doins ${WORKDIR}/gentoo_ice/*
-	docinto gentoo_ice
-	dodoc ${WORKDIR}/README
-}
-
-pkg_postinst() {
-	echo
-	einfo "MP3 support is now optional, you may want to enable the mp3 USE-flag."
-	echo
-}
diff --git a/media-sound/audacious/audacious-1.1.0_beta1.ebuild b/media-sound/audacious/audacious-1.1.0_beta1.ebuild
deleted file mode 100644
index 07802c65da36..000000000000
--- a/media-sound/audacious/audacious-1.1.0_beta1.ebuild
+++ /dev/null
@@ -1,104 +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/audacious/audacious-1.1.0_beta1.ebuild,v 1.3 2006/06/10 14:51:55 vapier Exp $
-
-inherit flag-o-matic
-
-MY_P="${P/_beta/-dr}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://audacious-media-player.org/beta/${MY_P}.tgz
-	mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="aac alsa arts esd flac gnome jack lirc mmx modplug mp3 musepack nls oss sid sndfile timidity vorbis wma"
-
-RDEPEND="app-arch/unzip
-	net-misc/curl
-	media-libs/musicbrainz
-	>=x11-libs/gtk+-2.6
-	>=gnome-base/libglade-2.3.1
-	>=dev-cpp/libbinio-1.4
-	alsa? ( >=media-libs/alsa-lib-1.0.9_rc2 )
-	arts? ( kde-base/arts )
-	esd? ( >=media-sound/esound-0.2.30 )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.1.2 )
-	gnome? ( >=gnome-base/gconf-2.6.0 )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-libs/libsamplerate
-		media-sound/jack-audio-connection-kit )
-	lirc? ( app-misc/lirc )
-	modplug? ( media-libs/libmodplug )
-	musepack? ( media-libs/libmpcdec
-		    media-libs/taglib )
-	mp3? ( media-libs/taglib )
-	sid? ( media-libs/libsidplay )
-	sndfile? ( media-libs/libsndfile )
-	timidity? ( media-sound/timidity++ )
-	vorbis? ( >=media-libs/libvorbis-1.0
-		  >=media-libs/libogg-1.0 )"
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	>=dev-util/pkgconfig-0.9.0"
-
-mp3_warning() {
-	if ! useq mp3 ; then
-		echo
-		ewarn "MP3 support is now optional, you may want to enable the mp3 USE-flag"
-		echo
-	fi
-}
-
-src_compile() {
-	mp3_warning
-
-	# Bug #42893
-	replace-flags "-Os" "-O2"
-	# Bug #86689
-	is-flag "-O*" || append-flags -O
-
-	econf \
-		--with-dev-dsp=/dev/sound/dsp \
-		--with-dev-mixer=/dev/sound/mixer \
-		$(use_enable mmx simd) \
-		$(use_enable gnome gconf) \
-		$(use_enable vorbis) \
-		$(use_enable esd) \
-		$(use_enable mp3) \
-		$(use_enable nls) \
-		$(use_enable oss) \
-		$(use_enable alsa) \
-		$(use_enable arts) \
-		$(use_enable flac) \
-		$(use_enable aac) \
-		$(use_enable modplug) \
-		$(use_enable lirc) \
-		$(use_enable sndfile) \
-		$(use_enable wma) \
-		$(use_enable sid) \
-		$(use_enable musepack) \
-		$(use_enable jack) \
-		$(use_enable timidity) \
-		|| die
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README
-
-	# Gentoo_ice skin installation; bug #109772
-	insinto /usr/share/audacious/Skins/gentoo_ice
-	doins "${WORKDIR}"/gentoo_ice/*
-	docinto gentoo_ice
-	dodoc "${WORKDIR}"/README
-}
-
-pkg_postinst() {
-	mp3_warning
-}
diff --git a/media-sound/audacious/audacious-1.1.0_beta2-r1.ebuild b/media-sound/audacious/audacious-1.1.0_beta2-r1.ebuild
deleted file mode 100644
index aa1ebb3d98c7..000000000000
--- a/media-sound/audacious/audacious-1.1.0_beta2-r1.ebuild
+++ /dev/null
@@ -1,110 +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/audacious/audacious-1.1.0_beta2-r1.ebuild,v 1.2 2006/06/25 01:07:27 chainsaw Exp $
-
-inherit flag-o-matic
-
-MY_P="${P/_beta/-dr}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://audacious-media-player.org/beta/${MY_P}.tgz
-	mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="aac alsa arts esd flac gnome jack lirc mmx modplug mp3 musepack nls oss sid sndfile timidity vorbis wma"
-
-RDEPEND="app-arch/unzip
-	net-misc/curl
-	media-libs/musicbrainz
-	media-libs/taglib
-	>=x11-libs/gtk+-2.6
-	>=gnome-base/libglade-2.3.1
-	>=dev-cpp/libbinio-1.4
-	alsa? ( >=media-libs/alsa-lib-1.0.9_rc2 )
-	arts? ( kde-base/arts )
-	esd? ( >=media-sound/esound-0.2.30 )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.1.2 )
-	gnome? ( >=gnome-base/gconf-2.6.0 )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-libs/libsamplerate
-		media-sound/jack-audio-connection-kit )
-	lirc? ( app-misc/lirc )
-	modplug? ( media-libs/libmodplug )
-	musepack? ( media-libs/libmpcdec )
-	sid? ( media-libs/libsidplay )
-	sndfile? ( media-libs/libsndfile )
-	timidity? ( media-sound/timidity++ )
-	vorbis? ( >=media-libs/libvorbis-1.0
-		  >=media-libs/libogg-1.0 )"
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	>=dev-util/pkgconfig-0.9.0"
-
-mp3_warning() {
-	if ! useq mp3 ; then
-		echo
-		ewarn "MP3 support is now optional, you may want to enable the mp3 USE-flag"
-		echo
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch ${FILESDIR}/util-filesize.diff
-}
-
-src_compile() {
-	mp3_warning
-
-	# Bug #42893
-	replace-flags "-Os" "-O2"
-	# Bug #86689
-	is-flag "-O*" || append-flags -O
-
-	econf \
-		--with-dev-dsp=/dev/sound/dsp \
-		--with-dev-mixer=/dev/sound/mixer \
-		$(use_enable mmx simd) \
-		$(use_enable gnome gconf) \
-		$(use_enable vorbis) \
-		$(use_enable esd) \
-		$(use_enable mp3) \
-		$(use_enable nls) \
-		$(use_enable oss) \
-		$(use_enable alsa) \
-		$(use_enable arts) \
-		$(use_enable flac) \
-		$(use_enable aac) \
-		$(use_enable modplug) \
-		$(use_enable lirc) \
-		$(use_enable sndfile) \
-		$(use_enable wma) \
-		$(use_enable sid) \
-		$(use_enable musepack) \
-		$(use_enable jack) \
-		$(use_enable timidity) \
-		|| die
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README
-
-	# Gentoo_ice skin installation; bug #109772
-	insinto /usr/share/audacious/Skins/gentoo_ice
-	doins "${WORKDIR}"/gentoo_ice/*
-	docinto gentoo_ice
-	dodoc "${WORKDIR}"/README
-}
-
-pkg_postinst() {
-	mp3_warning
-}
diff --git a/media-sound/audacious/audacious-1.1.0_beta2.ebuild b/media-sound/audacious/audacious-1.1.0_beta2.ebuild
deleted file mode 100644
index ba481c8c45fd..000000000000
--- a/media-sound/audacious/audacious-1.1.0_beta2.ebuild
+++ /dev/null
@@ -1,104 +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/audacious/audacious-1.1.0_beta2.ebuild,v 1.1 2006/06/12 20:40:48 chainsaw Exp $
-
-inherit flag-o-matic
-
-MY_P="${P/_beta/-dr}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://audacious-media-player.org/beta/${MY_P}.tgz
-	mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="aac alsa arts esd flac gnome jack lirc mmx modplug mp3 musepack nls oss sid sndfile timidity vorbis wma"
-
-RDEPEND="app-arch/unzip
-	net-misc/curl
-	media-libs/musicbrainz
-	>=x11-libs/gtk+-2.6
-	>=gnome-base/libglade-2.3.1
-	>=dev-cpp/libbinio-1.4
-	alsa? ( >=media-libs/alsa-lib-1.0.9_rc2 )
-	arts? ( kde-base/arts )
-	esd? ( >=media-sound/esound-0.2.30 )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.1.2 )
-	gnome? ( >=gnome-base/gconf-2.6.0 )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-libs/libsamplerate
-		media-sound/jack-audio-connection-kit )
-	lirc? ( app-misc/lirc )
-	modplug? ( media-libs/libmodplug )
-	musepack? ( media-libs/libmpcdec
-		    media-libs/taglib )
-	mp3? ( media-libs/taglib )
-	sid? ( media-libs/libsidplay )
-	sndfile? ( media-libs/libsndfile )
-	timidity? ( media-sound/timidity++ )
-	vorbis? ( >=media-libs/libvorbis-1.0
-		  >=media-libs/libogg-1.0 )"
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	>=dev-util/pkgconfig-0.9.0"
-
-mp3_warning() {
-	if ! useq mp3 ; then
-		echo
-		ewarn "MP3 support is now optional, you may want to enable the mp3 USE-flag"
-		echo
-	fi
-}
-
-src_compile() {
-	mp3_warning
-
-	# Bug #42893
-	replace-flags "-Os" "-O2"
-	# Bug #86689
-	is-flag "-O*" || append-flags -O
-
-	econf \
-		--with-dev-dsp=/dev/sound/dsp \
-		--with-dev-mixer=/dev/sound/mixer \
-		$(use_enable mmx simd) \
-		$(use_enable gnome gconf) \
-		$(use_enable vorbis) \
-		$(use_enable esd) \
-		$(use_enable mp3) \
-		$(use_enable nls) \
-		$(use_enable oss) \
-		$(use_enable alsa) \
-		$(use_enable arts) \
-		$(use_enable flac) \
-		$(use_enable aac) \
-		$(use_enable modplug) \
-		$(use_enable lirc) \
-		$(use_enable sndfile) \
-		$(use_enable wma) \
-		$(use_enable sid) \
-		$(use_enable musepack) \
-		$(use_enable jack) \
-		$(use_enable timidity) \
-		|| die
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README
-
-	# Gentoo_ice skin installation; bug #109772
-	insinto /usr/share/audacious/Skins/gentoo_ice
-	doins "${WORKDIR}"/gentoo_ice/*
-	docinto gentoo_ice
-	dodoc "${WORKDIR}"/README
-}
-
-pkg_postinst() {
-	mp3_warning
-}
diff --git a/media-sound/audacious/files/digest-audacious-0.2.3 b/media-sound/audacious/files/digest-audacious-0.2.3
deleted file mode 100644
index d151735b9228..000000000000
--- a/media-sound/audacious/files/digest-audacious-0.2.3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 c7ef54251f15d780c4938fbc1ba5855d audacious-0.2.3.tgz 3246886
-RMD160 e4ac4a1d5036689a2362e50387419d362270e417 audacious-0.2.3.tgz 3246886
-SHA256 e1c8efc805bb95eff8f2bb3d6de919dd67240b979f16af8f87429fbc92dd789b audacious-0.2.3.tgz 3246886
-MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
-RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 gentoo_ice-xmms-0.2.tar.bz2 51839
-SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1 gentoo_ice-xmms-0.2.tar.bz2 51839
diff --git a/media-sound/audacious/files/digest-audacious-1.0.0 b/media-sound/audacious/files/digest-audacious-1.0.0
deleted file mode 100644
index b69ce0bf9d5e..000000000000
--- a/media-sound/audacious/files/digest-audacious-1.0.0
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 a3e0f49be74eecb3c27a5a901cff0b66 audacious-1.0.0.tgz 3248602
-RMD160 358f580448f61e48520557cd8406ef9ec81073eb audacious-1.0.0.tgz 3248602
-SHA256 c3b11f7755af0bc89330aa79907cf43e99227a6f935652c7cd529385e152c8cb audacious-1.0.0.tgz 3248602
-MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
-RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 gentoo_ice-xmms-0.2.tar.bz2 51839
-SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1 gentoo_ice-xmms-0.2.tar.bz2 51839
diff --git a/media-sound/audacious/files/digest-audacious-1.0.0-r1 b/media-sound/audacious/files/digest-audacious-1.0.0-r1
deleted file mode 100644
index b69ce0bf9d5e..000000000000
--- a/media-sound/audacious/files/digest-audacious-1.0.0-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 a3e0f49be74eecb3c27a5a901cff0b66 audacious-1.0.0.tgz 3248602
-RMD160 358f580448f61e48520557cd8406ef9ec81073eb audacious-1.0.0.tgz 3248602
-SHA256 c3b11f7755af0bc89330aa79907cf43e99227a6f935652c7cd529385e152c8cb audacious-1.0.0.tgz 3248602
-MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
-RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 gentoo_ice-xmms-0.2.tar.bz2 51839
-SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1 gentoo_ice-xmms-0.2.tar.bz2 51839
diff --git a/media-sound/audacious/files/digest-audacious-1.1.0_beta1 b/media-sound/audacious/files/digest-audacious-1.1.0_beta1
deleted file mode 100644
index 999d3b4e9761..000000000000
--- a/media-sound/audacious/files/digest-audacious-1.1.0_beta1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 e6e479c159ac209fa0be2413ed8dc357 audacious-1.1.0-dr1.tgz 3189815
-RMD160 49a0df7e52f49f43de5a66da936604d771e3f1e5 audacious-1.1.0-dr1.tgz 3189815
-SHA256 e772792198b61f8372ae2ea9f73efc23ae1703ad1421b632555c23bb0ce105cd audacious-1.1.0-dr1.tgz 3189815
-MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
-RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 gentoo_ice-xmms-0.2.tar.bz2 51839
-SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1 gentoo_ice-xmms-0.2.tar.bz2 51839
diff --git a/media-sound/audacious/files/digest-audacious-1.1.0_beta2 b/media-sound/audacious/files/digest-audacious-1.1.0_beta2
deleted file mode 100644
index d62a777c8729..000000000000
--- a/media-sound/audacious/files/digest-audacious-1.1.0_beta2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 98ecf3d0980341ce6645f5663550d21b audacious-1.1.0-dr2.tgz 3270998
-RMD160 1e91c41a3fd519674303b8b1207eab9a55768a51 audacious-1.1.0-dr2.tgz 3270998
-SHA256 620c31ac372a2f91c4afd419387244f324d6396a5e54ccd39e64ac954526a7fc audacious-1.1.0-dr2.tgz 3270998
-MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
-RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 gentoo_ice-xmms-0.2.tar.bz2 51839
-SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1 gentoo_ice-xmms-0.2.tar.bz2 51839
diff --git a/media-sound/audacious/files/digest-audacious-1.1.0_beta2-r1 b/media-sound/audacious/files/digest-audacious-1.1.0_beta2-r1
deleted file mode 100644
index d62a777c8729..000000000000
--- a/media-sound/audacious/files/digest-audacious-1.1.0_beta2-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 98ecf3d0980341ce6645f5663550d21b audacious-1.1.0-dr2.tgz 3270998
-RMD160 1e91c41a3fd519674303b8b1207eab9a55768a51 audacious-1.1.0-dr2.tgz 3270998
-SHA256 620c31ac372a2f91c4afd419387244f324d6396a5e54ccd39e64ac954526a7fc audacious-1.1.0-dr2.tgz 3270998
-MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
-RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 gentoo_ice-xmms-0.2.tar.bz2 51839
-SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1 gentoo_ice-xmms-0.2.tar.bz2 51839
diff --git a/media-sound/audacious/files/util-filesize.diff b/media-sound/audacious/files/util-filesize.diff
deleted file mode 100644
index 858e13a4569c..000000000000
--- a/media-sound/audacious/files/util-filesize.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: audacious/util.c
-===================================================================
---- audacious/util.c	(revision 1246)
-+++ audacious/util.c	(working copy)
-@@ -403,7 +403,8 @@
-     static gchar *open_buffer = NULL;
-     gchar *ret_buffer = NULL;
-     gint found_section = 0, len = 0;
--    gsize filesize, off = 0;
-+    static gsize filesize = 0;
-+    gsize off = 0;
-     gchar *outbuf;
-     unsigned char x[] = { 0xff, 0xfe, 0x00 };
-     guint counter;