Actually link in the inline FLAC library, from upstream bug #830. Explicitly block ugly plugins from the 1.2 branch as they will fail, closes bug #168883.

(Portage version: 2.1.2-r14)

5 files changed, 33 insertions, 14 deletions

diff --git a/media-plugins/audacious-plugins/ChangeLog b/media-plugins/audacious-plugins/ChangeLog
index 841c4c347a6c..c0b58962d5d9 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.36 2007/03/03 21:46:04 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.37 2007/03/04 15:56:45 chainsaw Exp $
+
+*audacious-plugins-1.3.0-r1 (04 Mar 2007)
+
+  04 Mar 2007; Tony Vroon <chainsaw@gentoo.org>
+  +files/1.3.0-unscrew-flac.patch, -audacious-plugins-1.3.0_rc2.ebuild,
+  +audacious-plugins-1.3.0-r1.ebuild:
+  Actually link in the inline FLAC library, from upstream bug #830. Explicitly
+  block ugly plugins from the 1.2 branch as they will fail, closes bug
+  #168883.
 
   03 Mar 2007; Tony Vroon <chainsaw@gentoo.org>
   audacious-plugins-1.3.0.ebuild:
diff --git a/media-plugins/audacious-plugins/audacious-plugins-1.3.0_rc2.ebuild b/media-plugins/audacious-plugins/audacious-plugins-1.3.0-r1.ebuild
index c5e6208c7ba8..2492e0d0b6a0 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-1.3.0_rc2.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-1.3.0-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.3.0_rc2.ebuild,v 1.1 2007/02/27 15:28:04 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-1.3.0-r1.ebuild,v 1.1 2007/03/04 15:56:45 chainsaw Exp $
 
-inherit eutils flag-o-matic autotools
+inherit eutils flag-o-matic
 
 MY_P=${P/_/-}
 S=${WORKDIR}/${MY_P}
@@ -18,8 +18,9 @@ IUSE="aac adplug alsa arts chardet esd flac jack lirc mad modplug musepack nls o
 
 RDEPEND="app-arch/unzip
 	dev-libs/libxml2
+	media-libs/libsamplerate
 	net-misc/curl
-	>=media-sound/audacious-1.3.0_rc2
+	>=media-sound/audacious-1.3.0
 	>=x11-libs/gtk+-2.6
 	>=gnome-base/libglade-2.3.1
 	>=media-libs/libsdl-1.2.5
@@ -28,10 +29,7 @@ RDEPEND="app-arch/unzip
 	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
-		     ~media-libs/flac-1.1.3 )
-	      )
+	flac? ( >=media-libs/libvorbis-1.0 )
 	jack? ( >=media-libs/bio2jack-0.4
 		media-libs/libsamplerate
 		media-sound/jack-audio-connection-kit )
@@ -51,7 +49,9 @@ RDEPEND="app-arch/unzip
 
 DEPEND="${RDEPEND}
 	nls? ( dev-util/intltool )
-	>=dev-util/pkgconfig-0.9.0"
+	>=dev-util/pkgconfig-0.9.0
+	!media-plugins/audacious-docklet
+	!=media-plugins/audacious-plugins-ugly-1.2.0"
 
 mp3_warning() {
 	if ! useq mad ; then
@@ -64,8 +64,7 @@ mp3_warning() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PV}-freebsd-portability.patch
-	eautoconf
+	epatch ${FILESDIR}/${PV}-unscrew-flac.patch
 }
 
 src_compile() {
diff --git a/media-plugins/audacious-plugins/files/1.3.0-unscrew-flac.patch b/media-plugins/audacious-plugins/files/1.3.0-unscrew-flac.patch
new file mode 100644
index 000000000000..7f3e3b01e190
--- /dev/null
+++ b/media-plugins/audacious-plugins/files/1.3.0-unscrew-flac.patch
@@ -0,0 +1,11 @@
+--- trunk/src/flac/plugin_common/Makefile	2007/02/25 00:17:26	1530
++++ trunk/src/flac/plugin_common/Makefile	2007/03/04 09:50:27	1656
+@@ -1,7 +1,7 @@
+ include ../../../mk/rules.mk
+ include ../../../mk/init.mk
+ 
+-CFLAGS += $(PICFLAGS) -I.. -I../../..
++CFLAGS += $(PICFLAGS) -I.. -I../../.. -I../libflac
+ 
+ OBJECTIVE_LIBS_NOINST = libplugin_common.a
+ 
diff --git a/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.3.0-r1 b/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.3.0-r1
new file mode 100644
index 000000000000..32dbdb5c2476
--- /dev/null
+++ b/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.3.0-r1
@@ -0,0 +1,3 @@
+MD5 b36b91f89a223a127ff67589d7497db8 audacious-plugins-1.3.0.tgz 2902694
+RMD160 01e9567ec0830ff9d8d002f7b7586e57535d17f7 audacious-plugins-1.3.0.tgz 2902694
+SHA256 03af577608aac62d66b5d12d116826e571ea9cf5e018209ed0acbb3f855efba6 audacious-plugins-1.3.0.tgz 2902694
diff --git a/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.3.0_rc2 b/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.3.0_rc2
deleted file mode 100644
index 0c73ec40da4e..000000000000
--- a/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.3.0_rc2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2081e834023c444748df557c46816318 audacious-plugins-1.3.0-rc2.tgz 2812648
-RMD160 d5764e474c1c79dc14780071b400086092443a17 audacious-plugins-1.3.0-rc2.tgz 2812648
-SHA256 5bf3bc0258161336f3ba43756228f6d82a3f2527fde7e6f7b91c6d40ce0b488c audacious-plugins-1.3.0-rc2.tgz 2812648