Add new revision with pulseaudio useflag, disable pulseaudio from previous ebuild.

(Portage version: 2.1.2_pre1)

4 files changed, 110 insertions, 2 deletions

diff --git a/media-plugins/audacious-plugins/ChangeLog b/media-plugins/audacious-plugins/ChangeLog
index bae7d320c493..78417c4e64d1 100644
--- a/media-plugins/audacious-plugins/ChangeLog
+++ b/media-plugins/audacious-plugins/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/audacious-plugins
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.1 2006/09/18 21:18:55 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.2 2006/09/19 20:45:30 flameeyes Exp $
+
+*audacious-plugins-1.2.0-r1 (19 Sep 2006)
+
+  19 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
+  audacious-plugins-1.2.0.ebuild, +audacious-plugins-1.2.0-r1.ebuild:
+  Add new revision with pulseaudio useflag, disable pulseaudio from previous
+  ebuild.
 
 *audacious-plugins-1.2.0 (18 Sep 2006)
 
diff --git a/media-plugins/audacious-plugins/audacious-plugins-1.2.0-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..b8ed866e0976
--- /dev/null
+++ b/media-plugins/audacious-plugins/audacious-plugins-1.2.0-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-1.2.0-r1.ebuild,v 1.1 2006/09/19 20:45:30 flameeyes Exp $
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="aac alsa arts esd flac gnome jack lirc mmx modplug mp3 musepack nls oss sid sndfile timidity vorbis wma pulseaudio"
+
+RDEPEND="app-arch/unzip
+	dev-libs/libxml2
+	net-misc/curl
+	media-libs/musicbrainz
+	>=media-sound/audacious-1.2.0_rc1
+	>=x11-libs/gtk+-2.6
+	>=gnome-base/libglade-2.3.1
+	>=dev-cpp/libbinio-1.4
+	media-libs/taglib
+	alsa? ( >=media-libs/alsa-lib-1.0.9_rc2 )
+	arts? ( kde-base/arts )
+	esd? ( >=media-sound/esound-0.2.30 )
+	flac? ( >=media-libs/libvorbis-1.0
+		>=media-libs/flac-1.1.2 )
+	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 )
+	sid? ( media-libs/libsidplay )
+	sndfile? ( media-libs/libsndfile )
+	timidity? ( media-sound/timidity++ )
+	vorbis? ( >=media-libs/libvorbis-1.0
+		  >=media-libs/libogg-1.0 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )"
+
+DEPEND="${RDEPEND}
+	nls? ( dev-util/intltool )
+	>=dev-util/pkgconfig-0.9.0"
+
+mp3_warning() {
+	if ! useq mp3 ; then
+		echo
+		ewarn "MP3 support is now optional, you may want to enable the mp3 USE-flag"
+		echo
+	fi
+}
+
+src_compile() {
+	mp3_warning
+
+	# 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 \
+		$(use_enable mmx simd) \
+		$(use_enable vorbis) \
+		$(use_enable esd) \
+		$(use_enable mp3) \
+		$(use_enable nls) \
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		$(use_enable arts) \
+		$(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) \
+		$(use_enable timidity) \
+		$(use_enable pulseaudio pulse) \
+		|| die
+
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS NEWS
+}
+
+pkg_postinst() {
+	mp3_warning
+}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-1.2.0.ebuild b/media-plugins/audacious-plugins/audacious-plugins-1.2.0.ebuild
index 8c8079ec479e..48cb419d34ea 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-1.2.0.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-1.2.0.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-plugins/audacious-plugins/audacious-plugins-1.2.0.ebuild,v 1.1 2006/09/18 21:18:55 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-1.2.0.ebuild,v 1.2 2006/09/19 20:45:30 flameeyes Exp $
 
 inherit flag-o-matic
 
@@ -80,6 +80,7 @@ src_compile() {
 		$(use_enable musepack) \
 		$(use_enable jack) \
 		$(use_enable timidity) \
+		--disable-pulse \
 		|| die
 
 	emake || die "make failed"
diff --git a/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.2.0-r1 b/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.2.0-r1
new file mode 100644
index 000000000000..153385ca3ef2
--- /dev/null
+++ b/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.2.0-r1
@@ -0,0 +1,3 @@
+MD5 8d25bdbe0f59a524429923d5b91e5b83 audacious-plugins-1.2.0.tgz 2113254
+RMD160 3522f0d0916206238c94137b4fa07a777b2a344d audacious-plugins-1.2.0.tgz 2113254
+SHA256 c7867879e6567916b52fba71cbec8a3ed47444261f29ab0ebc18bd7956cd6f69 audacious-plugins-1.2.0.tgz 2113254