First release on the 2.5 branch, no longer masked. Removed old ebuilds.

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

9 files changed, 16 insertions, 618 deletions

diff --git a/media-plugins/audacious-plugins/ChangeLog b/media-plugins/audacious-plugins/ChangeLog
index 8d0bc0efca25..edef8f2539e3 100644
--- a/media-plugins/audacious-plugins/ChangeLog
+++ b/media-plugins/audacious-plugins/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-plugins/audacious-plugins
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.204 2011/04/11 22:32:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.205 2011/04/16 20:37:09 chainsaw Exp $
+
+*audacious-plugins-2.5.0 (16 Apr 2011)
+
+  16 Apr 2011; Tony Vroon <chainsaw@gentoo.org>
+  -audacious-plugins-2.2-r2.ebuild, -audacious-plugins-2.4.1.ebuild,
+  -audacious-plugins-2.4.2.ebuild, -audacious-plugins-2.4.3.ebuild,
+  -audacious-plugins-2.4.3-r1.ebuild, -audacious-plugins-2.5_alpha1.ebuild,
+  +audacious-plugins-2.5.0.ebuild:
+  First release on the 2.5 branch, no longer masked. Removed old ebuilds.
 
   11 Apr 2011; Jeroen Roovers <jer@gentoo.org>
   audacious-plugins-2.4.4-r1.ebuild:
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index d651df451179..93627da252bf 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,29 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.2-jackcompat.patch 811 RMD160 4d8ddf51be312903175a22c4cdc877f5518a8e58 SHA1 1c4d8ae53b150f194ce7f8d46be444bed5049e4d SHA256 5979809ed82980df98372bb7852e958d45c0b99fcc3fae5994da6367b2656c55
 AUX 2.4.3-libnotify-0.7.patch 782 RMD160 6a188c51d51512442df125c305d0c78077578754 SHA1 c16afb578ea84bf986efb14d7680cbabe3c88bff SHA256 b03212eea71da0ff565c1dfa66651fb4fd4128137b1257cce19cab215b85ad12
-DIST audacious-plugins-2.2.tgz 3135776 RMD160 3b57282efc1f69319c0b3d0e196023a0b00f8d8f SHA1 f70ef19d397a7d72c00ee9a5c18ae4242e6e412b SHA256 aee812b34aa057bfff9e38dda29f1261e8e8cbdde65cf5fe553ab6b6a9ae33c8
 DIST audacious-plugins-2.4.0.tgz 3369517 RMD160 0f4760e14de2bb2252d86efa591552c0be4c9b9b SHA1 bd59c31ffb439380fcfec028dcf10b49cb82ad5f SHA256 c5a9b5efe0315e4c34e0e1922a8852561ea5608974d0adb0f9ce91c20e743a13
-DIST audacious-plugins-2.4.1.tgz 3420472 RMD160 f6188f31dc86041c7a1660c97553210d60a10289 SHA1 1948b592a5d3214f90b557073fa9430336926ee1 SHA256 ee68aba789c67af58fe85613ab3abae9c032d7da76e3eeccf08ac17a32a3ac9e
-DIST audacious-plugins-2.4.2.tgz 3420880 RMD160 d8946942f8875e10f3dd7ce881ba296ba9ba9d33 SHA1 07a0c0ac65bc01aa936454da9550ad982e66b8f0 SHA256 bf7b68b7bcd7a41107675e6c930e33a11130522c0bd53a32b4fbd2aa3c5e5ba8
-DIST audacious-plugins-2.4.3.tgz 3420791 RMD160 08a0a503c5882aed69a5361fb7da9ab6caeed159 SHA1 b89f87e9abb0249cb6b8318ed8fa58bb7bb27c67 SHA256 e4c97ac509cea4c9f43442914f8017b21b52faf19c325b0267ff38c98ad2fafc
 DIST audacious-plugins-2.4.4.tgz 3425914 RMD160 d8ec95fb678efcb9acd17e77b890d4c685c2b892 SHA1 33a43cdcb699578accbc181918b96da6ab04cedc SHA256 24948ae2161ddde580bcad27dbc11faed0cacd142252749e64da5f8f5e8084e4
-DIST audacious-plugins-2.5-alpha1.tgz 3430695 RMD160 ebc269436adfc2d0b08a7858c68a246064e27786 SHA1 23ede03141bd3e0c7eb5da3c8ed422efcc4e4964 SHA256 dfa95db22a9e4f8569c8d0e905128423507e1a0034e71ede8e47bb1eb61e36d8
-EBUILD audacious-plugins-2.2-r2.ebuild 3502 RMD160 4ff0e4dd537d6ea80fed61923dddf683beee61d4 SHA1 0c42b5cc3b7eb6dd651a0eed615189188fc6e55c SHA256 6025640247e9641294b288d0e070fa11ac3fe399abb5c4b2670a519939855441
+DIST audacious-plugins-2.5.0.tgz 3480901 RMD160 6ca05dceb7daf9da7f149a603689ab453c9fa75f SHA1 33d33f96f5de56f73398814f0534e88989b2c71f SHA256 1e1bcf88b350a6ad4b9c0c40a0921f7fc20c89eafd7f8f616a82de738b6c5de2
 EBUILD audacious-plugins-2.4.0.ebuild 3294 RMD160 b03ac61548fc9d73d5becdbcc2829e8101f527c7 SHA1 9aa9a62624712b1ec9a11d2a0b377589088efaf9 SHA256 047f7e1cc4e00118827c9c39b7511f0e5e58d158b9e239a8ae88f8e97733ffb2
-EBUILD audacious-plugins-2.4.1.ebuild 3270 RMD160 4e4d0868fc19e3ddf5003c2f1581c231802d63cf SHA1 84b10f4ffe216c332685e544cb33c04ed18bbcee SHA256 447e3a8872df3599d8862f2112e7d3ec4e3e0957cac19b9aa90312954e1a0046
-EBUILD audacious-plugins-2.4.2.ebuild 3270 RMD160 9e9149d7168dea84e6f6ef81b767f586f5629efc SHA1 880b46c5983c1bb9615d02989e09d64b92332668 SHA256 aab368c9cfec657557762ea56ac739288b86a4a4a5d710af7ec0c2781fd734f3
-EBUILD audacious-plugins-2.4.3-r1.ebuild 3543 RMD160 bf5d81b693b4721cd5ffb69279e822dcfb7bb544 SHA1 572001bf121b428612c96e879d182c264f1974ac SHA256 4300d7b09c18d2c4e4055c09f12944a3bed9e4a1b44809e0fe826a83a1726f4a
-EBUILD audacious-plugins-2.4.3.ebuild 3270 RMD160 f36ce11ecd3c99a47f5aab5ecd51b6610dbdf0b9 SHA1 b2739c4c22b3bc27c44196221ec2cf008b6c3cea SHA256 91de0a09b5400077838af2af2b82d7cc16244df70e94138e8823c3f3e3aa3291
 EBUILD audacious-plugins-2.4.4-r1.ebuild 3529 RMD160 2adefaa884fd93cbc3eed4d71315e789b85ccd9c SHA1 1e98af6d3eb9ec9d8bcda33f276a511aae97def3 SHA256 19d7836c1aa8ee83ecc927ad2245f20d5927fb70b636c6f1132bcbe9d40459c7
-EBUILD audacious-plugins-2.5_alpha1.ebuild 3567 RMD160 e5884155b1d83af259859a74de1dfca9436dbf9a SHA1 19ffe29b0146b1350a8e2130d5222278359d950e SHA256 add8105855c1e07b1bbfed6b900a9d55f83d6e2f6af8039698d799752505105b
-MISC ChangeLog 42609 RMD160 0fae5811761d4e4d76e32e98b425c0819efbf91a SHA1 c7592eb580e6bbc611804164cb75f1f5f68587c8 SHA256 adccfa02f8a5ac1d2fc25e085be2407febe507f7d04d6e79d08309040fcd6889
-MISC metadata.xml 990 RMD160 8b2509c22251b13f82c1f8f416d56085f2946b0f SHA1 dfd20e69aa7a6ff809094132513e32f2633098b3 SHA256 887d6f341b3183f1cff1e4094520618d3b1c6c4c9479f8c0c6dc2482a522ca48
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk2jgW0ACgkQVWmRsqeSphMeUACeKC8S47BA1zI7cc0iNjFZXk+k
-HPQAn1K9T+dVXvYFDop6d5fHQi3cFGnw
-=s8Mp
------END PGP SIGNATURE-----
+EBUILD audacious-plugins-2.5.0.ebuild 3490 RMD160 b1abe8a74a38ef1b9d2cb0bd950b7f3e58a0cdfa SHA1 2e632d6886aa5034fafbe29f43d6d0b73c2cdd48 SHA256 ae3f3f5ae1abd7faee880666bfb4f169709d8f044d9599d07f3b351a3644a921
+MISC ChangeLog 43025 RMD160 11c1ab236aca175abe573b668d2cf0f50de77b57 SHA1 905c8fa0e777e62c9296bb8092a379d71095b941 SHA256 69336d4f9fb6bd4f59fda97800cb770c20a31b82ea421e6fe736a3b2b5dced99
+MISC metadata.xml 866 RMD160 5813435111a3c7f60b8b18a39dd08f28481fb090 SHA1 e73be922a3908576325e808791070c944f7b839d SHA256 bf2e4fa7b30470ba8f7d1c90a69cbc722f929107d05f3c44ba2579aa242ffa8c
diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.2-r2.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.2-r2.ebuild
deleted file mode 100644
index 966ba4e512e7..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-2.2-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2011 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-r2.ebuild,v 1.18 2011/04/03 18:18:54 scarabeus Exp $
-
-EAPI=1
-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="ppc"
-IUSE="aac adplug alsa aqua bs2b cdda cue esd ffmpeg flac fluidsynth gnome icecast ipv6 jack lame
-lirc midi mp3 mtp nls oss pulseaudio projectm scrobbler sdl sid sndfile sse2 vorbis wavpack"
-
-RDEPEND="app-arch/unzip
-	>=dev-libs/dbus-glib-0.60
-	dev-libs/libxml2:2
-	>=media-sound/audacious-2.2
-	>=net-libs/neon-0.26.4
-	>=x11-libs/gtk+-2.14:2
-	aac? ( >=media-libs/faad2-2.7 )
-	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 )
-	cue? ( media-libs/libcue )
-	esd? ( >=media-sound/esound-0.2.38-r1 )
-	ffmpeg? ( virtual/ffmpeg )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.2.1-r1 )
-	fluidsynth? ( media-sound/fluidsynth )
-	icecast? ( media-libs/libshout )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit )
-	lame? ( media-sound/lame )
-	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
-		x11-libs/gtkglext )
-	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 )
-	vorbis? ( >=media-libs/libvorbis-1.2.0
-		  >=media-libs/libogg-1.1.3 )
-	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	>=dev-util/pkgconfig-0.9.0"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PV}-jackcompat.patch"
-}
-
-mp3_warning() {
-	if ! use mp3 ; then
-		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-	fi
-}
-
-src_compile() {
-	mp3_warning
-
-	econf \
-		--enable-chardet \
-		--enable-dbus \
-		--enable-modplug \
-		--enable-neon \
-		--disable-projectm \
-		$(use_enable adplug) \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable alsa bluetooth) \
-		$(use_enable alsa amidiplug-alsa) \
-		$(use_enable aqua coreaudio) \
-		$(use_enable aqua dockalbumart) \
-		$(use_enable bs2b) \
-		$(use_enable cdda cdaudio) \
-		$(use_enable cue) \
-		$(use_enable esd) \
-		$(use_enable ffmpeg ffaudio) \
-		$(use_enable flac flacng) \
-		$(use_enable fluidsynth amidiplug-flsyn) \
-		$(use_enable flac filewriter_flac) \
-		$(use_enable icecast) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable gnome gnomeshortcuts) \
-		$(use_enable lame filewriter_mp3) \
-		$(use_enable lirc) \
-		$(use_enable mp3) \
-		$(use_enable midi amidiplug) \
-		$(use_enable mtp mtp_up) \
-		$(use_enable nls) \
-		$(use_enable oss) \
-		$(use_enable projectm projectm-1.0) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable sdl paranormal) \
-		$(use_enable sid) \
-		$(use_enable sndfile) \
-		$(use_enable sse2) \
-		$(use_enable vorbis) \
-		$(use_enable vorbis filewriter_vorbis) \
-		$(use_enable wavpack)
-
-	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.4.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.4.1.ebuild
deleted file mode 100644
index d2c3053202a4..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-2.4.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2011 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.4.1.ebuild,v 1.3 2011/04/03 18:18:54 scarabeus Exp $
-
-EAPI=1
-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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="aac adplug alsa aqua bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack
-lame lirc midi mp3 mtp nls oss pulseaudio scrobbler sdl sid sndfile sse2 vorbis wavpack"
-
-RDEPEND="app-arch/unzip
-	>=dev-libs/dbus-glib-0.60
-	dev-libs/libxml2:2
-	>=media-sound/audacious-2.4.1
-	>=net-libs/neon-0.26.4
-	>=x11-libs/gtk+-2.14:2
-	aac? ( >=media-libs/faad2-2.7 )
-	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 )
-	cue? ( media-libs/libcue )
-	ffmpeg? ( virtual/ffmpeg )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.2.1-r1 )
-	fluidsynth? ( media-sound/fluidsynth )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit )
-	lame? ( media-sound/lame )
-	lirc? ( app-misc/lirc )
-	mp3? ( >=media-sound/mpg123-1.12.1 )
-	mtp? ( media-libs/libmtp )
-	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 )
-	vorbis? ( >=media-libs/libvorbis-1.2.0
-		  >=media-libs/libogg-1.1.3 )
-	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	>=dev-util/pkgconfig-0.9.0"
-
-mp3_warning() {
-	if ! use mp3 ; then
-		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-	fi
-}
-
-src_compile() {
-	mp3_warning
-
-	econf \
-		--enable-chardet \
-		--enable-dbus \
-		--enable-modplug \
-		--enable-neon \
-		--disable-projectm \
-		--disable-projectm-1.0 \
-		$(use_enable adplug) \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable alsa bluetooth) \
-		$(use_enable alsa amidiplug-alsa) \
-		$(use_enable aqua coreaudio) \
-		$(use_enable aqua dockalbumart) \
-		$(use_enable bs2b) \
-		$(use_enable cdda cdaudio) \
-		$(use_enable cue) \
-		$(use_enable ffmpeg ffaudio) \
-		$(use_enable flac flacng) \
-		$(use_enable fluidsynth amidiplug-flsyn) \
-		$(use_enable flac filewriter_flac) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable gnome gnomeshortcuts) \
-		$(use_enable lame filewriter_mp3) \
-		$(use_enable lirc) \
-		$(use_enable mp3) \
-		$(use_enable midi amidiplug) \
-		$(use_enable mtp mtp_up) \
-		$(use_enable nls) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable scrobbler) \
-		$(use_enable sdl paranormal) \
-		$(use_enable sid) \
-		$(use_enable sndfile) \
-		$(use_enable sse2) \
-		$(use_enable vorbis) \
-		$(use_enable vorbis filewriter_vorbis) \
-		$(use_enable wavpack)
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS
-}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.4.2.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.4.2.ebuild
deleted file mode 100644
index 96436907946d..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-2.4.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2011 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.4.2.ebuild,v 1.3 2011/04/03 18:18:54 scarabeus Exp $
-
-EAPI=1
-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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="aac adplug alsa aqua bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack
-lame lirc midi mp3 mtp nls oss pulseaudio scrobbler sdl sid sndfile sse2 vorbis wavpack"
-
-RDEPEND="app-arch/unzip
-	>=dev-libs/dbus-glib-0.60
-	dev-libs/libxml2:2
-	>=media-sound/audacious-2.4.2
-	>=net-libs/neon-0.26.4
-	>=x11-libs/gtk+-2.14:2
-	aac? ( >=media-libs/faad2-2.7 )
-	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 )
-	cue? ( media-libs/libcue )
-	ffmpeg? ( virtual/ffmpeg )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.2.1-r1 )
-	fluidsynth? ( media-sound/fluidsynth )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit )
-	lame? ( media-sound/lame )
-	lirc? ( app-misc/lirc )
-	mp3? ( >=media-sound/mpg123-1.12.1 )
-	mtp? ( media-libs/libmtp )
-	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 )
-	vorbis? ( >=media-libs/libvorbis-1.2.0
-		  >=media-libs/libogg-1.1.3 )
-	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	>=dev-util/pkgconfig-0.9.0"
-
-mp3_warning() {
-	if ! use mp3 ; then
-		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-	fi
-}
-
-src_compile() {
-	mp3_warning
-
-	econf \
-		--enable-chardet \
-		--enable-dbus \
-		--enable-modplug \
-		--enable-neon \
-		--disable-projectm \
-		--disable-projectm-1.0 \
-		$(use_enable adplug) \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable alsa bluetooth) \
-		$(use_enable alsa amidiplug-alsa) \
-		$(use_enable aqua coreaudio) \
-		$(use_enable aqua dockalbumart) \
-		$(use_enable bs2b) \
-		$(use_enable cdda cdaudio) \
-		$(use_enable cue) \
-		$(use_enable ffmpeg ffaudio) \
-		$(use_enable flac flacng) \
-		$(use_enable fluidsynth amidiplug-flsyn) \
-		$(use_enable flac filewriter_flac) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable gnome gnomeshortcuts) \
-		$(use_enable lame filewriter_mp3) \
-		$(use_enable lirc) \
-		$(use_enable mp3) \
-		$(use_enable midi amidiplug) \
-		$(use_enable mtp mtp_up) \
-		$(use_enable nls) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable scrobbler) \
-		$(use_enable sdl paranormal) \
-		$(use_enable sid) \
-		$(use_enable sndfile) \
-		$(use_enable sse2) \
-		$(use_enable vorbis) \
-		$(use_enable vorbis filewriter_vorbis) \
-		$(use_enable wavpack)
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS
-}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.4.3-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.4.3-r1.ebuild
deleted file mode 100644
index f218030e95e6..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-2.4.3-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2011 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.4.3-r1.ebuild,v 1.5 2011/04/03 18:18:54 scarabeus Exp $
-
-EAPI=1
-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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="aac adplug alsa aqua bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack
-lame libnotify libsamplerate lirc midi mp3 mtp nls oss pulseaudio scrobbler sdl sid sndfile sse2 vorbis wavpack"
-
-RDEPEND="app-arch/unzip
-	>=dev-libs/dbus-glib-0.60
-	dev-libs/libxml2:2
-	>=media-sound/audacious-2.4.3
-	>=net-libs/neon-0.26.4
-	>=x11-libs/gtk+-2.14:2
-	aac? ( >=media-libs/faad2-2.7 )
-	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 )
-	cue? ( media-libs/libcue )
-	ffmpeg? ( virtual/ffmpeg )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.2.1-r1 )
-	fluidsynth? ( media-sound/fluidsynth )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit )
-	lame? ( media-sound/lame )
-	libnotify? ( x11-libs/libnotify )
-	libsamplerate? ( media-libs/libsamplerate )
-	lirc? ( app-misc/lirc )
-	mp3? ( >=media-sound/mpg123-1.12.1 )
-	mtp? ( media-libs/libmtp )
-	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 )
-	vorbis? ( >=media-libs/libvorbis-1.2.0
-		  >=media-libs/libogg-1.1.3 )
-	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	>=dev-util/pkgconfig-0.9.0"
-
-mp3_warning() {
-	if ! use 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}-libnotify-0.7.patch
-}
-
-src_compile() {
-	mp3_warning
-
-	econf \
-		--enable-chardet \
-		--enable-dbus \
-		--enable-modplug \
-		--enable-neon \
-		--disable-projectm \
-		--disable-projectm-1.0 \
-		$(use_enable adplug) \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable alsa bluetooth) \
-		$(use_enable alsa amidiplug-alsa) \
-		$(use_enable aqua coreaudio) \
-		$(use_enable aqua dockalbumart) \
-		$(use_enable bs2b) \
-		$(use_enable cdda cdaudio) \
-		$(use_enable cue) \
-		$(use_enable ffmpeg ffaudio) \
-		$(use_enable flac flacng) \
-		$(use_enable fluidsynth amidiplug-flsyn) \
-		$(use_enable flac filewriter_flac) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable gnome gnomeshortcuts) \
-		$(use_enable lame filewriter_mp3) \
-		$(use_enable libnotify notify) \
-		$(use_enable libsamplerate resample) \
-		$(use_enable lirc) \
-		$(use_enable mp3) \
-		$(use_enable midi amidiplug) \
-		$(use_enable mtp mtp_up) \
-		$(use_enable nls) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable scrobbler) \
-		$(use_enable sdl paranormal) \
-		$(use_enable sid) \
-		$(use_enable sndfile) \
-		$(use_enable sse2) \
-		$(use_enable vorbis) \
-		$(use_enable vorbis filewriter_vorbis) \
-		$(use_enable wavpack)
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS
-}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.4.3.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.4.3.ebuild
deleted file mode 100644
index e4bcf7a5eb96..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-2.4.3.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2011 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.4.3.ebuild,v 1.3 2011/04/03 18:18:54 scarabeus Exp $
-
-EAPI=1
-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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="aac adplug alsa aqua bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack
-lame lirc midi mp3 mtp nls oss pulseaudio scrobbler sdl sid sndfile sse2 vorbis wavpack"
-
-RDEPEND="app-arch/unzip
-	>=dev-libs/dbus-glib-0.60
-	dev-libs/libxml2:2
-	>=media-sound/audacious-2.4.3
-	>=net-libs/neon-0.26.4
-	>=x11-libs/gtk+-2.14:2
-	aac? ( >=media-libs/faad2-2.7 )
-	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 )
-	cue? ( media-libs/libcue )
-	ffmpeg? ( virtual/ffmpeg )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.2.1-r1 )
-	fluidsynth? ( media-sound/fluidsynth )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit )
-	lame? ( media-sound/lame )
-	lirc? ( app-misc/lirc )
-	mp3? ( >=media-sound/mpg123-1.12.1 )
-	mtp? ( media-libs/libmtp )
-	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 )
-	vorbis? ( >=media-libs/libvorbis-1.2.0
-		  >=media-libs/libogg-1.1.3 )
-	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	>=dev-util/pkgconfig-0.9.0"
-
-mp3_warning() {
-	if ! use mp3 ; then
-		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-	fi
-}
-
-src_compile() {
-	mp3_warning
-
-	econf \
-		--enable-chardet \
-		--enable-dbus \
-		--enable-modplug \
-		--enable-neon \
-		--disable-projectm \
-		--disable-projectm-1.0 \
-		$(use_enable adplug) \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable alsa bluetooth) \
-		$(use_enable alsa amidiplug-alsa) \
-		$(use_enable aqua coreaudio) \
-		$(use_enable aqua dockalbumart) \
-		$(use_enable bs2b) \
-		$(use_enable cdda cdaudio) \
-		$(use_enable cue) \
-		$(use_enable ffmpeg ffaudio) \
-		$(use_enable flac flacng) \
-		$(use_enable fluidsynth amidiplug-flsyn) \
-		$(use_enable flac filewriter_flac) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable gnome gnomeshortcuts) \
-		$(use_enable lame filewriter_mp3) \
-		$(use_enable lirc) \
-		$(use_enable mp3) \
-		$(use_enable midi amidiplug) \
-		$(use_enable mtp mtp_up) \
-		$(use_enable nls) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable scrobbler) \
-		$(use_enable sdl paranormal) \
-		$(use_enable sid) \
-		$(use_enable sndfile) \
-		$(use_enable sse2) \
-		$(use_enable vorbis) \
-		$(use_enable vorbis filewriter_vorbis) \
-		$(use_enable wavpack)
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS
-}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.5_alpha1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.5.0.ebuild
index 1c9c620de84f..f1fb33e05b06 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-2.5_alpha1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-2.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.5_alpha1.ebuild,v 1.6 2011/03/30 15:29:31 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-2.5.0.ebuild,v 1.1 2011/04/16 20:37:09 chainsaw Exp $
 
 EAPI=3
 
@@ -21,7 +21,7 @@ lame libnotify libsamplerate lirc midi mms mp3 mtp nls oss pulseaudio scrobbler
 RDEPEND="app-arch/unzip
 	>=dev-libs/dbus-glib-0.60
 	dev-libs/libxml2:2
-	>=media-sound/audacious-2.5_alpha1
+	>=media-sound/audacious-2.5.0
 	>=net-libs/neon-0.26.4
 	>=x11-libs/gtk+-2.14:2
 	aac? ( >=media-libs/faad2-2.7 )
@@ -63,10 +63,6 @@ mp3_warning() {
 	fi
 }
 
-src_prepare() {
-	epatch "${FILESDIR}"/2.4.3-libnotify-0.7.patch
-}
-
 src_configure() {
 	mp3_warning
 
diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml
index 474352a7bc1e..acee6b498c1f 100644
--- a/media-plugins/audacious-plugins/metadata.xml
+++ b/media-plugins/audacious-plugins/metadata.xml
@@ -13,10 +13,8 @@
 		headphone filter</flag>
 	<flag name='cue'>Support CUE sheets using the libcue library</flag>
 	<flag name='fluidsynth'>Support FluidSynth as MIDI synth backend</flag>
-	<flag name='icecast'>Support for Icecast2 streaming</flag>
 	<flag name='midi'>Build with amidi-plug (MIDI synth) support</flag>
 	<flag name='mms'>Build with mms (Microsoft Media Server) support</flag>
-	<flag name='projectm'>Build with ProjectM visualization</flag>
 	<flag name='scrobbler'>Build with scrobbler/LastFM submission support</flag>
 	<flag name='sid'>Build with SID (Commodore 64 Audio) support</flag>
 </use>