Remove stale ebuilds and patches. Add taglib dependency for musepack as suggested by frirajder@gmail.com, closes bug #123378.

Package-Manager: portage-2.1_pre4-r1

12 files changed, 19 insertions, 448 deletions

diff --git a/media-sound/audacious/ChangeLog b/media-sound/audacious/ChangeLog
index 54fe4c8d933d..31fe8922a9e2 100644
--- a/media-sound/audacious/ChangeLog
+++ b/media-sound/audacious/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/audacious
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.18 2006/02/18 21:59:22 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.19 2006/02/19 16:05:13 chainsaw Exp $
+
+  19 Feb 2006; Tony Vroon <chainsaw@gentoo.org> -files/0.1-aac-makefile.am,
+  -audacious-0.1.ebuild, -audacious-0.1-r1.ebuild, -audacious-0.1.1.ebuild,
+  -audacious-0.2.ebuild, audacious-0.2-r1.ebuild:
+  Remove stale ebuilds and patches. Add taglib dependency for musepack as
+  suggested by frirajder@gmail.com, closes bug #123378.
 
   18 Feb 2006; Tony Vroon <chainsaw@gentoo.org> +files/0.2-segfault.diff,
   +files/0.2-thumbnail.diff, audacious-0.2-r1.ebuild:
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index b7be33919558..7ad42f01ddf4 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,30 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a2b6357651132bb85360f8cf4dd82b41 ChangeLog 3092
-RMD160 7cb0cc5eb74c519b6d874935545faf622cb93571 ChangeLog 3092
-SHA256 e9b920a3cc4f5d9b83f70714db6963a10dd8aa50afac2fbdaeb31e4e6de33add ChangeLog 3092
-MD5 b5ac0de9588722b6dc7f188a1feaf051 audacious-0.1-r1.ebuild 2498
-RMD160 5d6f4412b6c9b097d5c1b740d6165c0253139cc0 audacious-0.1-r1.ebuild 2498
-SHA256 5deea884786614fb29ac196b048994360b35f10c86f6aa976fb5b1500e8b2674 audacious-0.1-r1.ebuild 2498
-MD5 d6bbf4e291a918a0aa1c1942585863cd audacious-0.1.1.ebuild 2388
-RMD160 241965e5c2641ed25e22d141eea4e232e11d43ce audacious-0.1.1.ebuild 2388
-SHA256 419b368b622d4fa0562ccf04eec4b6e81701f86155f87328ac7da31633902e51 audacious-0.1.1.ebuild 2388
+MD5 5b844e809de0e3dd26888a949361529b ChangeLog 3425
+RMD160 ba86293269b47021bb23fcffa002615e668765f3 ChangeLog 3425
+SHA256 0e3fcf6b60fed28240cb98d88680c1b484ba35b6f1855833126d5a238cf1e527 ChangeLog 3425
 MD5 c6125c4339339a14a4b4248e153a21ba audacious-0.1.2.ebuild 2470
 RMD160 0ce19e11e3f64815f0fe2caac9e72807983473c6 audacious-0.1.2.ebuild 2470
 SHA256 e08f645ee6ffdcc04f7e1bb9afdd3236fa89b524645c2fbe2ced8f8f73c6cb86 audacious-0.1.2.ebuild 2470
-MD5 343fbbbf4c755e36e509b34c296929b2 audacious-0.1.ebuild 2402
-RMD160 1ce98e38ba735c524f4b3cfe1e0524b1a6ceb03a audacious-0.1.ebuild 2402
-SHA256 a59cc7ebcff9d2ae59820592216d41d8623f463bef540df4998ad638f141652d audacious-0.1.ebuild 2402
-MD5 d480eaee62267500c72167a371972d99 audacious-0.2-r1.ebuild 2943
-RMD160 4c943de5831724b69d0736101522b109c5df1997 audacious-0.2-r1.ebuild 2943
-SHA256 22c76efaac478912af3d34631591f6bd24c3aa5dc7ecb92b88be4de7b127f6c4 audacious-0.2-r1.ebuild 2943
-MD5 889f58a8b65f5beae79be9fa50809f4b audacious-0.2.ebuild 2764
-RMD160 dcb73d190f6c63f59cab54f01c3e5c486d398360 audacious-0.2.ebuild 2764
-SHA256 15d3ee0b920ec2b2cecba9a4de2ac36a9767a75a9c13fbf80201a86c9c05aa8a audacious-0.2.ebuild 2764
-MD5 91d8a8b27023cfe143010b46f5d97ffb files/0.1-aac-makefile.am 52
-RMD160 3f688d16d3232df2acb0548163182604bf81ae0f files/0.1-aac-makefile.am 52
-SHA256 93c0f6ceeac65d055ec058fe0af789f006e631247d6f1e7c5d5beb36df710bcd files/0.1-aac-makefile.am 52
+MD5 eeba5eb83c1c849a84f35e39c4e4ed07 audacious-0.2-r1.ebuild 2967
+RMD160 d82a9584bd9c431826fbfd0b296c64b041dbbda5 audacious-0.2-r1.ebuild 2967
+SHA256 21fb680ea1a6fa8b5c4d88028aeaae9e6705db4901b04b272d3d394c53e113ee audacious-0.2-r1.ebuild 2967
 MD5 f136cb1abd33101806a7879f4f5ae7d8 files/0.2-no-sigabrt-on-null-path.diff 442
 RMD160 d937400e5fcacf6992efddd2f2490eff04443853 files/0.2-no-sigabrt-on-null-path.diff 442
 SHA256 d34083f23c74d3e75ffbe55b21c23120089bddf7be523de4725ba85b630c3449 files/0.2-no-sigabrt-on-null-path.diff 442
@@ -34,21 +19,9 @@ SHA256 40aea64363c0a25d04099eb73f07d567170268d1297907055e261008683cbce9 files/0.
 MD5 8a917c27ee8ada32b8a4f0b690733602 files/0.2-thumbnail.diff 871
 RMD160 ae7063d943511f83c8f547843908f4e6563f3b44 files/0.2-thumbnail.diff 871
 SHA256 e80bb6d38e9c4e0891868e6e870404eba6d3a80067768128e0cd162187755848 files/0.2-thumbnail.diff 871
-MD5 556a78b44b63b6950de07d76f6261e8f files/digest-audacious-0.1 134
-RMD160 204be8a13a1997dc4e07ed6effe5c9e35f885cc6 files/digest-audacious-0.1 134
-SHA256 aa7d4cbac5b1f3dd6c80472a513b840ee9d2ad7d550e52d416fe0ff64cf7e3a6 files/digest-audacious-0.1 134
-MD5 8a62ab9f0b016d1b6a876704775313b1 files/digest-audacious-0.1-r1 187
-RMD160 8fd5706fc14f326f929637b0cf20baecdc879c39 files/digest-audacious-0.1-r1 187
-SHA256 67c16476a814cf1cdaf133e732fcad7698f44aa541e5643b317a956ea6a87757 files/digest-audacious-0.1-r1 187
-MD5 507beef06e637d463bb045c409bab2e7 files/digest-audacious-0.1.1 136
-RMD160 eeff0b88c937f83766b7fa1041113e00f17a6700 files/digest-audacious-0.1.1 136
-SHA256 79b81134068ba8ab3d78e193103921fce1ae31246480e93ea2e0cd7a0f09f014 files/digest-audacious-0.1.1 136
 MD5 341fd05802a609f2c76b98c5ef3cc172 files/digest-audacious-0.1.2 136
 RMD160 13a922d95fa5c08b53c0f86021a307bb7a6d8264 files/digest-audacious-0.1.2 136
 SHA256 fd363e94648e14fbe9aceaa633176533e7f4cb472860f464b54b87dc8bc4526d files/digest-audacious-0.1.2 136
-MD5 9faec72aab5c98a345c75ace5ea1ebb5 files/digest-audacious-0.2 494
-RMD160 b2e80322b1063267b9de70496d39adc8d0731fad files/digest-audacious-0.2 494
-SHA256 1093c6c03241b7a885005a425d583eda4e985faabb2a170bf7d96f9dd8b078dd files/digest-audacious-0.2 494
 MD5 9faec72aab5c98a345c75ace5ea1ebb5 files/digest-audacious-0.2-r1 494
 RMD160 b2e80322b1063267b9de70496d39adc8d0731fad files/digest-audacious-0.2-r1 494
 SHA256 1093c6c03241b7a885005a425d583eda4e985faabb2a170bf7d96f9dd8b078dd files/digest-audacious-0.2-r1 494
@@ -58,7 +31,7 @@ SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6 metadata
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFD95kYp5vW4rUFj5oRAlFJAJ92yPVXsINpTFkkKrzib92ZEThaggCfYiTV
-Ao0Fi9wxFOXhxG3wDvL68lo=
-=H8Un
+iD8DBQFD+Jebp5vW4rUFj5oRAutzAJwNoGfpMe3MMJpdLuD6A+XoNqed1wCeKI5A
+47e1tnm6cdWdr7n5NCqLRjs=
+=EbPu
 -----END PGP SIGNATURE-----
diff --git a/media-sound/audacious/audacious-0.1-r1.ebuild b/media-sound/audacious/audacious-0.1-r1.ebuild
deleted file mode 100644
index 567a450ea1eb..000000000000
--- a/media-sound/audacious/audacious-0.1-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-0.1-r1.ebuild,v 1.3 2005/11/20 21:48:19 chainsaw Exp $
-
-IUSE="alsa esd flac gnome mmx mp3 nls oss sdl vorbis"
-
-inherit flag-o-matic eutils libtool autotools
-
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions."
-HOMEPAGE="http://audacious.nenolod.net/Main_Page"
-SRC_URI="http://audacious.nenolod.net/release/audacious-0.1.tgz
-	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2
-	 http://svn.atheme.org/audacious/trunk/m4/libFLAC.m4"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND="app-arch/unzip
-	>=x11-libs/gtk+-2.4
-	>=gnome-base/libglade-2.3.1
-	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 )
-	mp3? ( media-libs/id3lib )
-	sdl? ( >=media-libs/libsdl-1.2.5 )
-	vorbis? ( >=media-libs/libvorbis-1.0
-		  >=media-libs/libogg-1.0 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	>=dev-util/pkgconfig-0.9.0"
-
-src_unpack() {
-	if ! useq mp3; then
-		ewarn "MP3 support is now optional and you have not enabled it."
-	fi
-
-	mkdir -p ${S}/m4/
-	cp ${DISTDIR}/libFLAC.m4 ${S}/m4/
-
-	unpack ${A}
-	cd ${S}
-
-	cp ${FILESDIR}/${PV}-aac-makefile.am ${S}/Plugins/Input/aac/Makefile.am
-
-	eautoreconf
-	elibtoolize
-}
-
-src_compile() {
-	# Bug #42893
-	replace-flags "-Os" "-O2"
-	# Bug #86689
-	is-flag "-O*" || append-flags -O
-
-	econf \
-		--disable-aac \
-		--disable-mikmod \
-		--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` \
-		|| die
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS FAQ 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
-
-	# XMMS skin symlinking; bug 70697
-	for SKIN in /usr/share/xmms/Skins/* ; do
-		dosym "$SKIN" /usr/share/audacious/Skins/
-	done
-}
-
-pkg_postinst() {
-	echo
-	einfo "Your XMMS skins, if any, have been symlinked."
-	einfo "MP3 support is now optional, you may want to enable the mp3 USE-flag."
-	echo
-}
diff --git a/media-sound/audacious/audacious-0.1.1.ebuild b/media-sound/audacious/audacious-0.1.1.ebuild
deleted file mode 100644
index 051d4688f606..000000000000
--- a/media-sound/audacious/audacious-0.1.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-0.1.1.ebuild,v 1.1 2005/11/27 21:56:13 chainsaw Exp $
-
-IUSE="aac alsa esd flac gnome lirc mikmod mmx mp3 nls oss sdl sndfile vorbis"
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions."
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://audacious.nenolod.net/release/${P}.tgz
-	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND="app-arch/unzip
-	>=x11-libs/gtk+-2.4
-	>=gnome-base/libglade-2.3.1
-	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 )
-	lirc? ( app-misc/lirc )
-	mikmod? ( media-libs/libmikmod )
-	mp3? ( media-libs/id3lib )
-	sdl? ( >=media-libs/libsdl-1.2.5 )
-	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 mikmod` \
-		`use_enable lirc` \
-		`use_enable sndfile` \
-		|| die
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS FAQ 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
-
-	# XMMS skin symlinking; bug 70697
-	for SKIN in /usr/share/xmms/Skins/* ; do
-		dosym "$SKIN" /usr/share/audacious/Skins/
-	done
-}
-
-pkg_postinst() {
-	echo
-	einfo "Your XMMS skins, if any, have been symlinked."
-	einfo "MP3 support is now optional, you may want to enable the mp3 USE-flag."
-	echo
-}
diff --git a/media-sound/audacious/audacious-0.1.ebuild b/media-sound/audacious/audacious-0.1.ebuild
deleted file mode 100644
index 3d2cc396ba3e..000000000000
--- a/media-sound/audacious/audacious-0.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-0.1.ebuild,v 1.4 2005/11/14 01:48:50 ranger Exp $
-
-IUSE="aac alsa esd flac gnome mmx mp3 nls oss sdl vorbis"
-
-inherit flag-o-matic eutils libtool autotools
-
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions."
-HOMEPAGE="http://audacious.nenolod.net/Main_Page"
-SRC_URI="http://audacious.nenolod.net/release/audacious-0.1.tgz
-	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-# beep-config has a runtime depend on pkg-config
-RDEPEND="app-arch/unzip
-	>=x11-libs/gtk+-2.4
-	>=gnome-base/libglade-2.3.1
-	aac? ( >=media-libs/faac-1.24 )
-	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 )
-	mp3? ( media-libs/id3lib )
-	sdl? ( >=media-libs/libsdl-1.2.5 )
-	vorbis? ( >=media-libs/libvorbis-1.0
-		  >=media-libs/libogg-1.0 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	>=dev-util/pkgconfig-0.9.0"
-
-src_unpack() {
-	if ! useq mp3; then
-		ewarn "MP3 support is now optional and you have not enabled it."
-	fi
-
-	unpack ${A}
-	cd ${S}
-
-	eautoreconf
-	elibtoolize
-}
-
-src_compile() {
-	# Bug #42893
-	replace-flags "-Os" "-O2"
-	# Bug #86689
-	is-flag "-O*" || append-flags -O
-
-	econf \
-		--disable-mikmod \
-		--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 mikmod` \
-		|| die
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS FAQ 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
-
-	# XMMS skin symlinking; bug 70697
-	for SKIN in /usr/share/xmms/Skins/* ; do
-		dosym "$SKIN" /usr/share/audacious/Skins/
-	done
-}
-
-pkg_postinst() {
-	echo
-	einfo "Your XMMS skins, if any, have been symlinked."
-	einfo "MP3 support is now optional, you may want to enable the mp3 USE-flag."
-	echo
-}
diff --git a/media-sound/audacious/audacious-0.2-r1.ebuild b/media-sound/audacious/audacious-0.2-r1.ebuild
index 329eb1c14b5d..de9517977bb8 100644
--- a/media-sound/audacious/audacious-0.2-r1.ebuild
+++ b/media-sound/audacious/audacious-0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.2 2006/02/18 21:59:22 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-0.2-r1.ebuild,v 1.3 2006/02/19 16:05:13 chainsaw Exp $
 
 IUSE="aac alsa esd flac gnome jack libvisual lirc mmx modplug mp3 musepack nls oss sdl sid sndfile vorbis wma"
 
@@ -32,7 +32,8 @@ RDEPEND="app-arch/unzip
 		     >=media-libs/libsdl-1.2.5 )
 	lirc? ( app-misc/lirc )
 	modplug? ( media-libs/libmodplug )
-	musepack? ( media-libs/libmpcdec )
+	musepack? ( media-libs/libmpcdec
+		    media-libs/taglib )
 	mp3? ( media-libs/id3lib )
 	sid? ( media-libs/libsidplay )
 	sndfile? ( media-libs/libsndfile )
diff --git a/media-sound/audacious/audacious-0.2.ebuild b/media-sound/audacious/audacious-0.2.ebuild
deleted file mode 100644
index 552626fec1d9..000000000000
--- a/media-sound/audacious/audacious-0.2.ebuild
+++ /dev/null
@@ -1,103 +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.ebuild,v 1.2 2006/02/02 19:19:16 chainsaw Exp $
-
-IUSE="aac alsa esd flac gnome jack libvisual lirc mmx modplug mp3 musepack nls oss sdl sid sndfile vorbis wma"
-
-inherit flag-o-matic eutils
-
-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="~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND="app-arch/unzip
-	>=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 )
-	libvisual? ( =media-plugins/libvisual-plugins-0.2.0
-		     >=media-libs/libsdl-1.2.5 )
-	lirc? ( app-misc/lirc )
-	modplug? ( media-libs/libmodplug )
-	musepack? ( media-libs/libmpcdec )
-	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 FAQ 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
-
-	# XMMS skin symlinking; bug 70697
-	for SKIN in /usr/share/xmms/Skins/* ; do
-		dosym "$SKIN" /usr/share/audacious/Skins/
-	done
-}
-
-pkg_postinst() {
-	echo
-	einfo "Your XMMS skins, if any, have been symlinked."
-	einfo "MP3 support is now optional, you may want to enable the mp3 USE-flag."
-	echo
-}
diff --git a/media-sound/audacious/files/0.1-aac-makefile.am b/media-sound/audacious/files/0.1-aac-makefile.am
deleted file mode 100644
index 67cbd08d8913..000000000000
--- a/media-sound/audacious/files/0.1-aac-makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-if ENABLE_AAC
-SUBDIRS = libmp4v2 libfaad2 src
-endif
diff --git a/media-sound/audacious/files/digest-audacious-0.1 b/media-sound/audacious/files/digest-audacious-0.1
deleted file mode 100644
index 330adcc335bb..000000000000
--- a/media-sound/audacious/files/digest-audacious-0.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 540865e944f41a5bb082b13c6b8fd686 audacious-0.1.tgz 2385825
-MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
diff --git a/media-sound/audacious/files/digest-audacious-0.1-r1 b/media-sound/audacious/files/digest-audacious-0.1-r1
deleted file mode 100644
index e77386be6614..000000000000
--- a/media-sound/audacious/files/digest-audacious-0.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 540865e944f41a5bb082b13c6b8fd686 audacious-0.1.tgz 2385825
-MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
-MD5 f2a34c01dbaa658587520780316908d0 libFLAC.m4 3922
diff --git a/media-sound/audacious/files/digest-audacious-0.1.1 b/media-sound/audacious/files/digest-audacious-0.1.1
deleted file mode 100644
index 65006b0390e8..000000000000
--- a/media-sound/audacious/files/digest-audacious-0.1.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 12ead38a7052ed48ae67e32c5c391f9d audacious-0.1.1.tgz 2855865
-MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
diff --git a/media-sound/audacious/files/digest-audacious-0.2 b/media-sound/audacious/files/digest-audacious-0.2
deleted file mode 100644
index 5ace023775c9..000000000000
--- a/media-sound/audacious/files/digest-audacious-0.2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 42ecd9753684929482e598a0a7170147 audacious-0.2.tgz 3834934
-RMD160 0a8ed8920134a647eda44dc4093972e2a3ba2f97 audacious-0.2.tgz 3834934
-SHA256 5999c83d6afccff6d1cb1410fc8bea439c0a4337b4077470c6ac2a93cb1fd0a8 audacious-0.2.tgz 3834934
-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