New upstream release, now with correct .so naming. Also added libmms to deps, so try the WMA streaming support. Thanks to Javier Villavicencio <the_paya@gentoo.org> for portability fixes. SDL USE-flag removed, closes bug #168570.

(Portage version: 2.1.2-r12)

9 files changed, 80 insertions, 242 deletions

diff --git a/media-plugins/audacious-plugins/ChangeLog b/media-plugins/audacious-plugins/ChangeLog
index 9ea22bb3396d..cc777ce48d3a 100644
--- a/media-plugins/audacious-plugins/ChangeLog
+++ b/media-plugins/audacious-plugins/ChangeLog
@@ -1,6 +1,18 @@
 # 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.33 2007/02/26 16:52:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.34 2007/02/27 15:28:04 chainsaw Exp $
+
+*audacious-plugins-1.3.0_rc2 (27 Feb 2007)
+
+  27 Feb 2007; Tony Vroon <chainsaw@gentoo.org>
+  +files/1.3.0_rc2-freebsd-portability.patch,
+  -audacious-plugins-1.3.0_alpha2.ebuild,
+  -audacious-plugins-1.3.0_alpha5.ebuild,
+  -audacious-plugins-1.3.0_rc1.ebuild, +audacious-plugins-1.3.0_rc2.ebuild:
+  New upstream release, now with correct .so naming. Also added libmms to
+  deps, so try the WMA streaming support. Thanks to Javier Villavicencio
+  <the_paya@gentoo.org> for portability fixes. SDL USE-flag removed, closes
+  bug #168570.
 
   26 Feb 2007; Jeroen Roovers <jer@gentoo.org>
   audacious-plugins-1.3.0_rc1.ebuild:
diff --git a/media-plugins/audacious-plugins/audacious-plugins-1.3.0_alpha2.ebuild b/media-plugins/audacious-plugins/audacious-plugins-1.3.0_alpha2.ebuild
deleted file mode 100644
index 868f84434c9c..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-1.3.0_alpha2.ebuild
+++ /dev/null
@@ -1,108 +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.3.0_alpha2.ebuild,v 1.2 2007/01/25 14:47:12 chainsaw Exp $
-
-inherit 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://static.audacious-media-player.org/release/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="aac alsa arts chardet esd flac jack lirc modplug mp3 musepack nls oss sid sndfile timidity vorbis wavpack wma pulseaudio"
-
-RDEPEND="app-arch/unzip
-	dev-libs/libxml2
-	net-misc/curl
-	>=media-sound/audacious-1.3.0_alpha3
-	>=x11-libs/gtk+-2.6
-	>=gnome-base/libglade-2.3.1
-	>=dev-cpp/libbinio-1.4
-	>=media-libs/libsdl-1.2.5
-	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
-		     ~media-libs/flac-1.1.3 )
-	      )
-	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 )
-	wavpack? ( >=media-sound/wavpack-4.31 )"
-
-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 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) \
-		$(use_enable chardet) \
-		$(use_enable wavpack) \
-		|| die
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS
-}
-
-pkg_postinst() {
-	mp3_warning
-	ewarn "This is alpha-quality software, and you have unmasked this software manually. Do *not* use the Gentoo bugtracker for this package."
-	elog "Note that you need to recompile *all* third-party plugins to use Audacious 1.3 alpha builds."
-	elog "Failure to do so may cause the player to crash."
-	elog "Any bug reports are to be made on: http://bugs-meta.atheme.org/"
-}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-1.3.0_rc1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-1.3.0_rc1.ebuild
deleted file mode 100644
index 02fb57d1bdeb..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-1.3.0_rc1.ebuild
+++ /dev/null
@@ -1,114 +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.3.0_rc1.ebuild,v 1.2 2007/02/26 16:52:57 jer Exp $
-
-inherit 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://static.audacious-media-player.org/release/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="aac adplug alsa arts chardet esd flac jack lirc mad modplug musepack nls opengl oss sid sndfile timidity tta vorbis wavpack wma pulseaudio sdl"
-
-RDEPEND="app-arch/unzip
-	dev-libs/libxml2
-	net-misc/curl
-	>=media-sound/audacious-1.3.0_rc1
-	>=x11-libs/gtk+-2.6
-	>=gnome-base/libglade-2.3.1
-	media-libs/taglib
-	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
-		|| ( ~media-libs/flac-1.1.2
-		     ~media-libs/flac-1.1.3 )
-	      )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-libs/libsamplerate
-		media-sound/jack-audio-connection-kit )
-	lirc? ( app-misc/lirc )
-	mad? ( media-libs/libmad )
-	musepack? ( media-libs/libmpcdec )
-	opengl? ( =media-libs/libprojectm-0.99* )
-	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 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	wavpack? ( >=media-sound/wavpack-4.31 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	>=dev-util/pkgconfig-0.9.0"
-
-mp3_warning() {
-	if ! useq mad ; then
-		echo
-		ewarn "MP3 support is optional, you may want to enable the mad 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 vorbis) \
-		$(use_enable esd) \
-		$(use_enable mad 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) \
-		$(use_enable chardet) \
-		$(use_enable wavpack) \
-		$(use_enable tta) \
-		$(use_enable opengl projectm) \
-		$(use_enable adplug) \
-		$(use_enable sdl paranormal) \
-		|| die
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS
-}
-
-pkg_postinst() {
-	mp3_warning
-	ewarn "This is alpha-quality software, and you have unmasked this software manually. Do *not* use the Gentoo bugtracker for this package."
-	elog "Note that you need to recompile *all* third-party plugins to use Audacious 1.3 alpha builds."
-	elog "Failure to do so may cause the player to crash."
-	elog "Any bug reports are to be made on: http://bugs-meta.atheme.org/"
-}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-1.3.0_alpha5.ebuild b/media-plugins/audacious-plugins/audacious-plugins-1.3.0_rc2.ebuild
index c9ccbe2db2ba..c5e6208c7ba8 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-1.3.0_alpha5.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-1.3.0_rc2.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_alpha5.ebuild,v 1.1 2007/02/16 11:21:07 chainsaw Exp $
+# $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 $
 
-inherit flag-o-matic
+inherit eutils flag-o-matic autotools
 
 MY_P=${P/_/-}
 S=${WORKDIR}/${MY_P}
@@ -13,13 +13,13 @@ SRC_URI="http://static.audacious-media-player.org/release/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="aac adplug alsa arts chardet esd flac jack lirc mad modplug musepack nls opengl oss sid sndfile timidity tta vorbis wavpack wma pulseaudio"
 
 RDEPEND="app-arch/unzip
 	dev-libs/libxml2
 	net-misc/curl
-	>=media-sound/audacious-1.3.0_alpha5
+	>=media-sound/audacious-1.3.0_rc2
 	>=x11-libs/gtk+-2.6
 	>=gnome-base/libglade-2.3.1
 	>=media-libs/libsdl-1.2.5
@@ -37,7 +37,6 @@ RDEPEND="app-arch/unzip
 		media-sound/jack-audio-connection-kit )
 	lirc? ( app-misc/lirc )
 	mad? ( media-libs/libmad )
-	modplug? ( media-libs/libmodplug )
 	musepack? ( media-libs/libmpcdec )
 	opengl? ( =media-libs/libprojectm-0.99* )
 	sid? ( media-libs/libsidplay )
@@ -47,7 +46,8 @@ RDEPEND="app-arch/unzip
 	vorbis? ( >=media-libs/libvorbis-1.0
 		  >=media-libs/libogg-1.0 )
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	wavpack? ( >=media-sound/wavpack-4.31 )"
+	wavpack? ( >=media-sound/wavpack-4.31 )
+	wma? ( >=media-libs/libmms-0.3 )"
 
 DEPEND="${RDEPEND}
 	nls? ( dev-util/intltool )
@@ -61,6 +61,13 @@ mp3_warning() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-freebsd-portability.patch
+	eautoconf
+}
+
 src_compile() {
 	mp3_warning
 
@@ -72,6 +79,7 @@ src_compile() {
 	econf \
 		--with-dev-dsp=/dev/sound/dsp \
 		--with-dev-mixer=/dev/sound/mixer \
+		--enable-paranormal \
 		$(use_enable vorbis) \
 		$(use_enable esd) \
 		$(use_enable mad mp3) \
@@ -107,8 +115,8 @@ src_install() {
 
 pkg_postinst() {
 	mp3_warning
-	ewarn "This is alpha-quality software, and you have unmasked this software manually. Do *not* use the Gentoo bugtracker for this package."
-	elog "Note that you need to recompile *all* third-party plugins to use Audacious 1.3 alpha builds."
-	elog "Failure to do so may cause the player to crash."
-	elog "Any bug reports are to be made on: http://bugs-meta.atheme.org/"
+	elog "Note that you need to recompile *all* third-party plugins to use Audacious 1.3 builds."
+	elog "To clarify, that means all plugins *not* contained in this ebuild. Failure to do so may cause "
+	elog "the player to crash. Rebuild, and if that fails, unmerge, any third-party plugins before you "
+	elog "report a bug."
 }
diff --git a/media-plugins/audacious-plugins/files/1.3.0_rc2-freebsd-portability.patch b/media-plugins/audacious-plugins/files/1.3.0_rc2-freebsd-portability.patch
new file mode 100644
index 000000000000..33b722e0fc4c
--- /dev/null
+++ b/media-plugins/audacious-plugins/files/1.3.0_rc2-freebsd-portability.patch
@@ -0,0 +1,46 @@
+diff -ruN audacious-plugins-1.3.0-rc2.orig/configure.ac audacious-plugins-1.3.0-rc2/configure.ac
+--- audacious-plugins-1.3.0-rc2.orig/configure.ac	2007-02-25 22:41:03 -0300
++++ audacious-plugins-1.3.0-rc2/configure.ac	2007-02-27 05:23:02 -0300
+@@ -876,7 +876,11 @@
+ AC_CHECK_HEADERS(wchar.h)
+ AC_CHECK_HEADERS(fts.h)
+ 
+-AC_CHECK_FUNCS([mkdtemp getmntinfo statvfs strtoul lrintf])
++AC_CHECK_DECL([lrintf],[AC_DEFINE(HAVE_LRINTF,1)],[AC_CHECK_FUNCS([lrintf])],[
++#define _ISOC9X_SOURCE
++#include <math.h>
++])
++AC_CHECK_FUNCS([mkdtemp getmntinfo statvfs strtoul])
+ 
+ 
+ if test "${ac_cv_header_linux_cdrom_h}" = "yes" || test "${ac_cv_header_sys_cdio_h}" = "yes"
+diff -ruN audacious-plugins-1.3.0-rc2.orig/src/aosd/ghosd.h audacious-plugins-1.3.0-rc2/src/aosd/ghosd.h
+--- audacious-plugins-1.3.0-rc2.orig/src/aosd/ghosd.h	2007-01-31 16:50:36 -0300
++++ audacious-plugins-1.3.0-rc2/src/aosd/ghosd.h	2007-02-27 03:18:36 -0300
+@@ -10,7 +10,7 @@
+ 
+ #include <cairo/cairo.h>
+ 
+-#include <values.h>  /* MAXINT */
++#include <limits.h>  /* INT_MAX */
+ #include <sys/time.h>  /* timeval */
+ 
+ typedef struct _Ghosd Ghosd;
+@@ -32,7 +32,7 @@
+ Ghosd *ghosd_new(void);
+ void   ghosd_destroy(Ghosd* ghosd);
+ 
+-#define GHOSD_COORD_CENTER MAXINT
++#define GHOSD_COORD_CENTER INT_MAX
+ void ghosd_set_transparent(Ghosd *ghosd, int transparent);
+ void ghosd_set_position(Ghosd *ghosd, int x, int y, int width, int height);
+ void ghosd_set_render(Ghosd *ghosd, GhosdRenderFunc render_func,
+diff -ruN audacious-plugins-1.3.0-rc2.orig/src/tta/id3.c audacious-plugins-1.3.0-rc2/src/tta/id3.c
+--- audacious-plugins-1.3.0-rc2.orig/src/tta/id3.c	2006-11-22 14:55:20 -0300
++++ audacious-plugins-1.3.0-rc2/src/tta/id3.c	2007-02-27 03:17:09 -0300
+@@ -1,5 +1,4 @@
+ #include <stdio.h>
+-#include <malloc.h>
+ #include <string.h>
+ #include "ttalib.h"
+ #include "id3genre.h"
\ No newline at end of file
diff --git a/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.3.0_alpha2 b/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.3.0_alpha2
deleted file mode 100644
index 5f5d67e8e778..000000000000
--- a/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.3.0_alpha2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b842c262c911c0ccaee767964798ebd0 audacious-plugins-1.3.0-alpha2.tgz 2584805
-RMD160 8d242b3262902cfa7eadd563bc6f3be3fb0b8e4a audacious-plugins-1.3.0-alpha2.tgz 2584805
-SHA256 e7e1831d6fa0bd9a3e29c5d32f3a814c41b91187e172df19b860fedcc1461646 audacious-plugins-1.3.0-alpha2.tgz 2584805
diff --git a/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.3.0_alpha5 b/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.3.0_alpha5
deleted file mode 100644
index bd4946616361..000000000000
--- a/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.3.0_alpha5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 39f77a95b392c76d031eba4a47bf0a05 audacious-plugins-1.3.0-alpha5.tgz 2647655
-RMD160 65d994a3ea7fef4edf90557f98b09d7108f61a6e audacious-plugins-1.3.0-alpha5.tgz 2647655
-SHA256 060b545f83fcd506f1794d5b74608610cb6a34128f544e8771745090e1bef59e audacious-plugins-1.3.0-alpha5.tgz 2647655
diff --git a/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.3.0_rc1 b/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.3.0_rc1
deleted file mode 100644
index b323c1ab1e5f..000000000000
--- a/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.3.0_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2bf5405369bfbfa52f8040af3adb0d24 audacious-plugins-1.3.0-rc1.tgz 2812645
-RMD160 f722942d612947389531b8f72e43f1a8cdf6e778 audacious-plugins-1.3.0-rc1.tgz 2812645
-SHA256 ccfac29e2449f2214bf5252a7c33b02531557fc795fc59157ac3da33062dab1e audacious-plugins-1.3.0-rc1.tgz 2812645
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
new file mode 100644
index 000000000000..0c73ec40da4e
--- /dev/null
+++ b/media-plugins/audacious-plugins/files/digest-audacious-plugins-1.3.0_rc2
@@ -0,0 +1,3 @@
+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