Marked stable on AMD64 as it addresses bug #295051 (JACK plugin build failure). Tested using MP3, AAC, LDS, SID & WMA files on a Lifebook S6420.

(Portage version: 2.1.7.14/cvs/Linux x86_64)

3 files changed, 8 insertions, 68 deletions

diff --git a/media-sound/audacious/ChangeLog b/media-sound/audacious/ChangeLog
index 54948c999353..2a45a52b0d08 100644
--- a/media-sound/audacious/ChangeLog
+++ b/media-sound/audacious/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/audacious
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.185 2009/12/14 09:56:59 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.186 2009/12/16 17:14:19 chainsaw Exp $
+
+  16 Dec 2009; <chainsaw@gentoo.org> -audacious-2.2_beta2.ebuild,
+  audacious-2.2.ebuild:
+  Marked stable on AMD64 as it addresses bug #295051 (JACK plugin build
+  failure). Tested using MP3, AAC, LDS, SID & WMA files on a Lifebook S6420.
 
   14 Dec 2009; Tobias Klausmann <klausman@gentoo.org> audacious-2.2.ebuild:
   Re-keyworded on alpha, bug 292526
diff --git a/media-sound/audacious/audacious-2.2.ebuild b/media-sound/audacious/audacious-2.2.ebuild
index e94ee530c7a1..a7a02aaf228d 100644
--- a/media-sound/audacious/audacious-2.2.ebuild
+++ b/media-sound/audacious/audacious-2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-2.2.ebuild,v 1.2 2009/12/14 09:56:59 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-2.2.ebuild,v 1.3 2009/12/16 17:14:19 chainsaw Exp $
 
 MY_P="${P/_/-}"
 S="${WORKDIR}/${MY_P}"
@@ -11,7 +11,7 @@ SRC_URI="http://distfiles.atheme.org/${MY_P}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="altivec chardet nls libsamplerate session sse2"
 
 RDEPEND=">=dev-libs/dbus-glib-0.60
diff --git a/media-sound/audacious/audacious-2.2_beta2.ebuild b/media-sound/audacious/audacious-2.2_beta2.ebuild
deleted file mode 100644
index 357cd464c32b..000000000000
--- a/media-sound/audacious/audacious-2.2_beta2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-2.2_beta2.ebuild,v 1.1 2009/11/09 14:35:01 chainsaw Exp $
-
-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
-	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="altivec chardet nls libsamplerate session sse2"
-
-RDEPEND=">=dev-libs/dbus-glib-0.60
-	>=dev-libs/glib-2.16
-	>=dev-libs/libmcs-0.7.1-r2
-	>=dev-libs/libmowgli-0.7.0
-	dev-libs/libxml2
-	>=x11-libs/cairo-1.2.6
-	>=x11-libs/gtk+-2.14
-	>=x11-libs/pango-1.8.0
-	libsamplerate? ( media-libs/libsamplerate )
-	session? ( x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9.0
-	nls? ( dev-util/intltool )"
-
-PDEPEND=">=media-plugins/audacious-plugins-2.2_beta2"
-
-src_compile() {
-	# D-Bus is a mandatory dependency, remote control,
-	# session management and some plugins depend on this.
-	# Building without D-Bus is *unsupported* and a USE-flag
-	# will not be added due to the bug reports that will result.
-	# Bugs #197894, #199069, #207330, #208606
-	# Disabling XSPF playlists would make startup *very* slow as
-	# all plugins will then have to re-probed each time.
-	econf \
-		--enable-dbus \
-		--enable-xspf \
-		$(use_enable altivec) \
-		$(use_enable chardet) \
-		$(use_enable nls) \
-		$(use_enable session sm) \
-		$(use_enable sse2) \
-		$(use_enable libsamplerate samplerate) \
-		|| 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
-}