Fix up dependencies, thanks to Xavier Neys <neysx@gentoo.org> and Michael Sterrett <mr_bones_@gentoo.org>. This closes bug #197855.

(Portage version: 2.1.3.16)

5 files changed, 13 insertions, 109 deletions

diff --git a/media-plugins/audacious-plugins/ChangeLog b/media-plugins/audacious-plugins/ChangeLog
index e86497da3443..da2eefe1d81a 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.64 2007/11/01 23:50:50 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.65 2007/11/02 11:16:46 chainsaw Exp $
+
+*audacious-plugins-1.4.0_rc1-r1 (02 Nov 2007)
+
+  02 Nov 2007; Tony Vroon <chainsaw@gentoo.org>
+  -audacious-plugins-1.4.0_beta4.ebuild,
+  -audacious-plugins-1.4.0_rc1.ebuild,
+  +audacious-plugins-1.4.0_rc1-r1.ebuild:
+  Fix up dependencies, thanks to Xavier Neys <neysx@gentoo.org> and Michael
+  Sterrett <mr_bones_@gentoo.org>. This closes bug #197855.
 
 *audacious-plugins-1.4.0_rc1 (01 Nov 2007)
 
diff --git a/media-plugins/audacious-plugins/audacious-plugins-1.4.0_beta4.ebuild b/media-plugins/audacious-plugins/audacious-plugins-1.4.0_beta4.ebuild
deleted file mode 100644
index 98ce57888bc2..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-1.4.0_beta4.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2007 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.4.0_beta4.ebuild,v 1.1 2007/10/31 17:06:26 chainsaw Exp $
-
-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"
-IUSE="aac adplug alsa arts chardet esd flac gnome jack lirc modplug mp3 mtp musepack nls oss pulseaudio sdl sid sndfile timidity tta vorbis wavpack wma"
-
-RDEPEND="app-arch/unzip
-	>=dev-libs/libcdio-0.78.2
-	dev-libs/libxml2
-	>=gnome-base/libglade-2.3.1
-	media-libs/libsamplerate
-	>=media-sound/audacious-1.4.0_beta4
-	>=net-misc/neon-0.26.3
-	>=x11-libs/gtk+-2.6
-	adplug? ( >=dev-cpp/libbinio-1.4 )
-	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 )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit )
-	lirc? ( app-misc/lirc )
-	mad? ( media-libs/libmad )
-	mtp? ( >=media-libs/libmtp-0.2.3 )
-	musepack? ( media-libs/libmpcdec media-libs/taglib )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	sdl? (	>=media-libs/libsdl-1.2.5 )
-	sid? ( media-libs/libsidplay )
-	sndfile? ( media-libs/libsndfile )
-	timidity? ( media-sound/timidity++ )
-	tta? ( media-libs/libid3tag )
-	vorbis? ( >=media-libs/libvorbis-1.0
-		  >=media-libs/libogg-1.0 )
-	wavpack? ( >=media-sound/wavpack-4.31 )
-	wma? ( >=media-libs/libmms-0.3 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	>=dev-util/pkgconfig-0.9.0"
-
-mp3_warning() {
-	if ! useq mp3 ; then
-		echo
-		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-		echo
-	fi
-}
-
-src_compile() {
-	mp3_warning
-
-	econf \
-		--enable-cdaudio-ng \
-		--enable-neon \
-		$(use_enable aac) \
-		$(use_enable adplug) \
-		$(use_enable alsa) \
-		$(use_enable arts) \
-		$(use_enable chardet) \
-		$(use_enable esd) \
-		$(use_enable flac) \
-		$(use_enable jack) \
-		$(use_enable gnome gnomeshortcuts) \
-		$(use_enable lirc) \
-		$(use_enable mp3) \
-		$(use_enable modplug) \
-		$(use_enable musepack) \
-		$(use_enable mtp mtp_up) \
-		$(use_enable nls) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable sdl paranormal) \
-		$(use_enable sid) \
-		$(use_enable sndfile) \
-		$(use_enable timidity) \
-		$(use_enable tta) \
-		$(use_enable vorbis) \
-		$(use_enable wavpack) \
-		$(use_enable wma) \
-		|| 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.4.0_rc1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-1.4.0_rc1-r1.ebuild
index a5fd3ad0072c..5df97d7ebdd8 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-1.4.0_rc1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-1.4.0_rc1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.4.0_rc1.ebuild,v 1.1 2007/11/01 23:50:50 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-1.4.0_rc1-r1.ebuild,v 1.1 2007/11/02 11:16:46 chainsaw Exp $
 
 inherit eutils flag-o-matic
 
@@ -20,6 +20,7 @@ RDEPEND="app-arch/unzip
 	dev-libs/libxml2
 	>=gnome-base/libglade-2.3.1
 	media-libs/libsamplerate
+	>=media-libs/libcddb-1.2.1
 	>=media-sound/audacious-1.4.0_rc1
 	>=net-misc/neon-0.26.3
 	>=x11-libs/gtk+-2.6
@@ -31,7 +32,7 @@ RDEPEND="app-arch/unzip
 	jack? ( >=media-libs/bio2jack-0.4
 		media-sound/jack-audio-connection-kit )
 	lirc? ( app-misc/lirc )
-	mad? ( media-libs/libmad )
+	mp3? ( media-libs/libmad )
 	mtp? ( >=media-libs/libmtp-0.2.3 )
 	musepack? ( media-libs/libmpcdec media-libs/taglib )
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
diff --git a/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.4.0_beta4 b/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.4.0_beta4
deleted file mode 100644
index 4c74a377c7e3..000000000000
--- a/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.4.0_beta4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 070de7bd8988d57e28b3b83241b545e1 audacious-plugins-1.4.0-beta4.tgz 3154115
-RMD160 ca4520e898eb6e155ac8cddb1a1aee6989c561bc audacious-plugins-1.4.0-beta4.tgz 3154115
-SHA256 ab98ded339269030afe88d5b9050605ae3363040c756fc484c327d1dc092e663 audacious-plugins-1.4.0-beta4.tgz 3154115
diff --git a/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.4.0_rc1 b/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.4.0_rc1-r1
index 0d32987583ca..0d32987583ca 100644
--- a/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.4.0_rc1
+++ b/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.4.0_rc1-r1