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.

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

4 files changed, 20 insertions, 72 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/Manifest b/media-sound/audacious/Manifest
index 8b3c5d9c50c3..52e49c96ddb2 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,9 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST audacious-2.1.tgz 1852176 RMD160 ba7c5672654e36ae6fa39a4f68e258363cddaf05 SHA1 520c7192ccb89c65353e2d8840cccef9f11c6a42 SHA256 32e16412d446f32744cb477d5b8a066447c0c826f71347ec653e9a8cb5ce747c
-DIST audacious-2.2-beta2.tgz 1584646 RMD160 88700744845e215c7e35a65e3ccb8a650d281ca3 SHA1 df66a9968a4346a689e8c7b9ee719b16870f7f7a SHA256 ab88bd202ac8f997a7433e24d226125d2624129b93f9cc87987bb06512c079ac
 DIST audacious-2.2.tgz 1581717 RMD160 a8a3eb32f802ff45030971fceb21915386157177 SHA1 7b946830028f0d8a985107974094cd91b12b0259 SHA256 f15af7a90085e7be86f7f876a8e74a5ba03385880a165c4b2033944219213bea
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 SHA1 e97ebbf204e0d1b150265f9e67f0ed54d779e110 SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1
 EBUILD audacious-2.1.ebuild 1929 RMD160 83977d4b922187ea0a8b070b6fdcdfb7a32687b4 SHA1 ee31b236bd96ebf16d897f5d95c48fe1a2e8039a SHA256 620221d4db0e7483887423f62b666909cf7b9a7e20157c90b654798944d1b976
-EBUILD audacious-2.2.ebuild 1937 RMD160 59f8b3abda45d312ec39d16a78c39ec830009931 SHA1 6ed8115b13d4a6197632152673d07504a3efce57 SHA256 40d4dad346ed2d16f3706a3cce9313e796adeefcf8dc718b959e31b1f39703f1
-EBUILD audacious-2.2_beta2.ebuild 1942 RMD160 2cf51ddb4071bd8cdc5669851a5a543df9f9ecdb SHA1 ca502da6da3539d54a67b5a6467e74995e4e1c16 SHA256 a45aef6ab2674a5e0d41c0934b75118c1a683bf657fccbab6dfa9c2aeabac2d5
-MISC ChangeLog 32153 RMD160 6afa163b194bf2646a352dc70d5ff71ea4803555 SHA1 16aa7750f0d200d2fe61e3c5f3c145aeda1a40bc SHA256 bcde0f62c8303dc61f7a11ef3a59b061386f3a298790af61b31105bc2971138b
+EBUILD audacious-2.2.ebuild 1936 RMD160 9053084c022357c9e5e787f75b83f3d0e1f79955 SHA1 0bedd6716ccad182d493af5f38dd09abef1b67d0 SHA256 b01fc8e10bbc5f3d0612102378c6f64224e09e55493a64fad20481a790e6bfbe
+MISC ChangeLog 32393 RMD160 9b5443d1e91b5e03b36194fd7387342aff6190e2 SHA1 b57f605cea28c888d7840818549a6a4ab734fc03 SHA256 c648846db2a2171d4f55e9dfbb5cb5453e9aa9ac98e2615cf42a82c25618b2ab
 MISC metadata.xml 363 RMD160 fba132fb7596814a0d7e42330a5703dc4afa32dc SHA1 2a77afacfd9e5628bd59bfc6332320302d3a6387 SHA256 cc833502f2ab5b13e4b22684d0f7bec07804c3aa2daccaee913297853e6e5b07
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAkspFQwACgkQp5vW4rUFj5o45gCdFubnFZa1PUpplNQq62xj6k/N
+WksAn1hwUX0PEhRxu/Drd7wy0AtcgYaz
+=LCBy
+-----END PGP SIGNATURE-----
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
-}