Version bump. Closes bugs #124607 and #124770. Lost ~sparc keywords over jack-audio-connection-kit dependency, will file a bug.

Package-Manager: portage-2.1_pre5-r2

6 files changed, 132 insertions, 17 deletions

diff --git a/media-sound/audacious/ChangeLog b/media-sound/audacious/ChangeLog
index c1ea9fd63fbc..fd7462d24cd0 100644
--- a/media-sound/audacious/ChangeLog
+++ b/media-sound/audacious/ChangeLog
@@ -1,6 +1,11 @@
 # 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.25 2006/02/28 21:50:47 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.26 2006/03/04 20:45:16 chainsaw Exp $
+
+*audacious-0.2.2 (04 Mar 2006)
+
+  04 Mar 2006; Tony Vroon <chainsaw@gentoo.org> +audacious-0.2.2.ebuild:
+  Version bump. Closes bugs #124607 and #124770.
 
   28 Feb 2006; Tony Vroon <chainsaw@gentoo.org> audacious-0.2.1.ebuild:
   Remove sdl from IUSE. Reported by deitarion on IRC.
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index a6e722bb4198..47c1f3c5f057 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8bed662de31527a6236a66e2f5d6dd1c ChangeLog 4395
-RMD160 73db0da9a20c3c277b1c614b2be546d4887b5aa8 ChangeLog 4395
-SHA256 67f97cdfc4f9753b90019535f99f911816dc84e1540d3319bd7d860cbb7c0452 ChangeLog 4395
+MD5 8c7a8fe6d9b07f59d23f811ec5abcf36 ChangeLog 4550
+RMD160 d7e9615a70fd9964428b5aa1617b47545af3249c ChangeLog 4550
+SHA256 9417aaa17e5da24abd71e815f800363544c0c71f7bdd2b478470430ebe2de773 ChangeLog 4550
 MD5 fe1ea03aa4a3e638681490e809f8d7c1 audacious-0.1.2.ebuild 2342
 RMD160 fc643500baae9af216f74163860dda1aae007aeb audacious-0.1.2.ebuild 2342
 SHA256 980088a1af4e1d0ac35809314eb7b7f7d6f14dc57e32d7ca0e98c5e61f47473f audacious-0.1.2.ebuild 2342
-MD5 adf61299a7cd0b7dfe477b5c3d93a90d audacious-0.2-r1.ebuild 2850
-RMD160 4f794577a4e2203fa9892ac691737b6dbb7b1d71 audacious-0.2-r1.ebuild 2850
-SHA256 d580c2d34e52cce9c1b66d939527a7887f5403cfe513f0385fba01e857441e10 audacious-0.2-r1.ebuild 2850
-MD5 9d9191e4822930f62db220240a6d8d9c audacious-0.2.1.ebuild 2553
-RMD160 044be5bf36b0652b015e19bdb1ebc6594c18deaf audacious-0.2.1.ebuild 2553
-SHA256 7165252254590fba1369a8db6d9369216a7ffb895af3c0b2437597be686edd49 audacious-0.2.1.ebuild 2553
+MD5 a5450cbc743660bcf7fbe6ead76f3674 audacious-0.2-r1.ebuild 2845
+RMD160 ef4918b3fe22ae46c20f86b1331cae13e15ebe1a audacious-0.2-r1.ebuild 2845
+SHA256 a44d918fd22f4b47fb5ffbaec85344624ced2c72ef24d44da7d70246f41e4d2f audacious-0.2-r1.ebuild 2845
+MD5 c04edeafe47bde2d475acccdee877064 audacious-0.2.1.ebuild 2546
+RMD160 9b155ddaa8d488ffde63bf71222fba6b98562fa8 audacious-0.2.1.ebuild 2546
+SHA256 af0a9a368c4731f10d1198e655d321da9c49479e40c378da260258148ebe3291 audacious-0.2.1.ebuild 2546
+MD5 2141c25a8a2fb1b73af13e9295a65d31 audacious-0.2.2.ebuild 2546
+RMD160 8066ba2067c6daf803bc7691cf5905f39b3ee9ce audacious-0.2.2.ebuild 2546
+SHA256 0ffdd60bad3c46c80cb576c17d57705d48d076c1d65667d809e7e3219c88a871 audacious-0.2.2.ebuild 2546
 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
@@ -31,13 +34,16 @@ SHA256 1093c6c03241b7a885005a425d583eda4e985faabb2a170bf7d96f9dd8b078dd files/di
 MD5 a39e06ee10135533360d5ed45e7f2425 files/digest-audacious-0.2.1 500
 RMD160 04e3ac9ae26d093c707dd5ef66237e2bf42a8bbe files/digest-audacious-0.2.1 500
 SHA256 b1674c0dcaf92471a472bf2a5c4f0984742dda416b584ae3b4e9289d5cec1d75 files/digest-audacious-0.2.1 500
+MD5 b30ac9b4305e33bb5fc5564cb1907d5c files/digest-audacious-0.2.2 500
+RMD160 6928da5965a910b6072dc672096a538e6a36061e files/digest-audacious-0.2.2 500
+SHA256 cef7bf4e834b6890eb31e3aca30adff3e6d685dcd265e1c64e9b75b100bc527b files/digest-audacious-0.2.2 500
 MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248
 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d metadata.xml 248
 SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6 metadata.xml 248
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFEBMZDp5vW4rUFj5oRAuPRAKCM2WRoku5/LlbdaL6GWPgtx/0rhQCePk55
-Bi+UjTVXeLFu65YJJGmMArs=
-=bIX3
+iD8DBQFECfzCp5vW4rUFj5oRAqBfAKCi2+s3vTjF2W9OXaJNZQ4mzGvCegCgrzmr
+30XYlsS5nucLf+KB0UBqmD0=
+=ESs/
 -----END PGP SIGNATURE-----
diff --git a/media-sound/audacious/audacious-0.2-r1.ebuild b/media-sound/audacious/audacious-0.2-r1.ebuild
index d5f2da80e5e8..abbc4ed78675 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.6 2006/02/25 00:13:56 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-0.2-r1.ebuild,v 1.7 2006/03/04 20:45:16 chainsaw Exp $
 
 IUSE="aac alsa esd flac gnome jack libvisual lirc mmx modplug mp3 musepack nls oss sdl sid sndfile vorbis wma"
 
@@ -14,7 +14,7 @@ SRC_URI="http://audacious-media-player.org/release/${P}.tgz
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
 
 RDEPEND="app-arch/unzip
 	>=x11-libs/gtk+-2.6
diff --git a/media-sound/audacious/audacious-0.2.1.ebuild b/media-sound/audacious/audacious-0.2.1.ebuild
index 0facb4191258..fa2bba13809f 100644
--- a/media-sound/audacious/audacious-0.2.1.ebuild
+++ b/media-sound/audacious/audacious-0.2.1.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.1.ebuild,v 1.3 2006/02/28 21:50:47 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-0.2.1.ebuild,v 1.4 2006/03/04 20:45:16 chainsaw Exp $
 
 IUSE="aac alsa esd flac gnome jack lirc mmx modplug mp3 musepack nls oss sid sndfile vorbis wma"
 
@@ -14,7 +14,7 @@ SRC_URI="http://audacious-media-player.org/release/${P}.tgz
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~x86"
 
 RDEPEND="app-arch/unzip
 	net-misc/curl
diff --git a/media-sound/audacious/audacious-0.2.2.ebuild b/media-sound/audacious/audacious-0.2.2.ebuild
new file mode 100644
index 000000000000..f99c0f2ab3d4
--- /dev/null
+++ b/media-sound/audacious/audacious-0.2.2.ebuild
@@ -0,0 +1,98 @@
+# 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.2.ebuild,v 1.1 2006/03/04 20:45:16 chainsaw 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 ~mips ~ppc ~ppc64 ~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/files/digest-audacious-0.2.2 b/media-sound/audacious/files/digest-audacious-0.2.2
new file mode 100644
index 000000000000..4f7999084277
--- /dev/null
+++ b/media-sound/audacious/files/digest-audacious-0.2.2
@@ -0,0 +1,6 @@
+MD5 c7552c96df2d3076a2a6fbcfa0980030 audacious-0.2.2.tgz 3216937
+RMD160 88f23cd86677193ad2616ee334cb88566f7ddc75 audacious-0.2.2.tgz 3216937
+SHA256 b47d82650538847ab732e5d0e1d4b1cf6e4e0a4f4cd1a5fbe4606a0251ab9a0c audacious-0.2.2.tgz 3216937
+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