Make libsamplerate dependency both explicit & optional. Patch by Rafa? Mu?y?o closes bug #348837 by Mike Gilbert.

Package-Manager: portage-2.1.9.35/cvs/Linux x86_64

3 files changed, 123 insertions, 12 deletions

diff --git a/media-plugins/audacious-plugins/ChangeLog b/media-plugins/audacious-plugins/ChangeLog
index c83bf76cc6c9..535ed399dc03 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.190 2011/01/12 17:47:26 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.191 2011/01/29 22:33:58 chainsaw Exp $
+
+*audacious-plugins-2.4.3-r1 (29 Jan 2011)
+
+  29 Jan 2011; Tony Vroon <chainsaw@gentoo.org>
+  +audacious-plugins-2.4.3-r1.ebuild:
+  Make libsamplerate dependency both explicit & optional. Patch by Rafał Mużyło
+  closes bug #348837 by Mike Gilbert.
 
 *audacious-plugins-2.4.3 (12 Jan 2011)
 
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index 8bc6e01655d8..2d0260926fa7 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.2-jackcompat.patch 811 RMD160 4d8ddf51be312903175a22c4cdc877f5518a8e58 SHA1 1c4d8ae53b150f194ce7f8d46be444bed5049e4d SHA256 5979809ed82980df98372bb7852e958d45c0b99fcc3fae5994da6367b2656c55
 DIST audacious-plugins-2.2.tgz 3135776 RMD160 3b57282efc1f69319c0b3d0e196023a0b00f8d8f SHA1 f70ef19d397a7d72c00ee9a5c18ae4242e6e412b SHA256 aee812b34aa057bfff9e38dda29f1261e8e8cbdde65cf5fe553ab6b6a9ae33c8
 DIST audacious-plugins-2.4.0.tgz 3369517 RMD160 0f4760e14de2bb2252d86efa591552c0be4c9b9b SHA1 bd59c31ffb439380fcfec028dcf10b49cb82ad5f SHA256 c5a9b5efe0315e4c34e0e1922a8852561ea5608974d0adb0f9ce91c20e743a13
@@ -11,13 +8,7 @@ EBUILD audacious-plugins-2.2-r2.ebuild 3489 RMD160 a14fda1e7a8249206709f61dda06e
 EBUILD audacious-plugins-2.4.0.ebuild 3281 RMD160 ee3ca0f2e85b8550a74633b026e63d6ad5c34327 SHA1 c5a5d3e8a338bf33cbf434f4cb5e35b260e7b396 SHA256 4832227d3afed510029be8b3ea33b2a857f555a2dc6a2ab0148bcdd8268d9295
 EBUILD audacious-plugins-2.4.1.ebuild 3262 RMD160 9f246106be6b682f3960c3b6c0c805fafa3d95ca SHA1 7b9bb955590d2eda2e60fe7f7dc148bcb1d24eb3 SHA256 2eeb4799fb6488cd206d0209f3476ef7447dec747556f4a05bad015c4faf40e6
 EBUILD audacious-plugins-2.4.2.ebuild 3262 RMD160 36fbc2c1a55e59fc1aafcc15931792e707f7d996 SHA1 756103601d31bafe97c11f83af598927373bed40 SHA256 e8666a5ec9be367a9014a231d42a5772a2704604681ac0a2c33a456432eb94d0
+EBUILD audacious-plugins-2.4.3-r1.ebuild 3365 RMD160 425d2b3d21bfc942a6843bf6c446b9c88954ccb0 SHA1 f75f781fa5af86d85bea551c3d2f54b32d42376a SHA256 93e475222586fa6abcb9d24d238dda0425e7d4d129ea8aaa72a8353697fbe707
 EBUILD audacious-plugins-2.4.3.ebuild 3262 RMD160 950e25cad2bbabe7f274eb05b3f009a6f18a6003 SHA1 1fca515fdf52734f32f913b306199d6184b51c58 SHA256 58686230369d1effd215498d38a5c435e5c07e229fa5ca5178277bf5c68be1dc
-MISC ChangeLog 39698 RMD160 3746e88e9c967c1c87973fdab4fa8ae9076ba4f5 SHA1 781ce711759fc1af67917164c8c80c284d5aa482 SHA256 d461334dc880f19ee6d867e789384e4b369f020f120099d95e39419cae2ab915
+MISC ChangeLog 39949 RMD160 d78b2b51cef6acc8b63db0e2917386dd72fa254f SHA1 8143cd5acde15ca85f28de35fd0be38bea3675e3 SHA256 c5507ffac7653eb9351d8ed7e70d12867e8686622454274938935c481b4c8e3c
 MISC metadata.xml 917 RMD160 e907a79bb77f7b9f090076e0dbe4e21a556478b9 SHA1 b5e4dc32491e9395e05eee404b944fa7fba53135 SHA256 d321e023ce0b65c38eb24f5fa544f0095fde03038e433e0d081463e6fd0c07c6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk0t6TQACgkQp5vW4rUFj5rJJQCcDzyo5Orrj59v53HE7vogTJSF
-sSEAn1nGzM9jRWua0/UmRc+Ykueke9cL
-=SJdW
------END PGP SIGNATURE-----
diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.4.3-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.4.3-r1.ebuild
new file mode 100644
index 000000000000..53942bc55340
--- /dev/null
+++ b/media-plugins/audacious-plugins/audacious-plugins-2.4.3-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-2.4.3-r1.ebuild,v 1.1 2011/01/29 22:33:58 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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="aac adplug alsa aqua bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack
+lame libsamplerate lirc midi mp3 mtp nls oss pulseaudio scrobbler sdl sid sndfile sse2 vorbis wavpack"
+
+RDEPEND="app-arch/unzip
+	>=dev-libs/dbus-glib-0.60
+	dev-libs/libxml2
+	>=media-sound/audacious-2.4.3
+	>=net-libs/neon-0.26.4
+	>=x11-libs/gtk+-2.14
+	aac? ( >=media-libs/faad2-2.7 )
+	adplug? ( >=dev-cpp/libbinio-1.4 )
+	alsa? ( >=media-libs/alsa-lib-1.0.16 )
+	bs2b? ( media-libs/libbs2b )
+	cdda? ( >=media-libs/libcddb-1.2.1
+		>=dev-libs/libcdio-0.79-r1 )
+	cue? ( media-libs/libcue )
+	ffmpeg? ( media-video/ffmpeg )
+	flac? ( >=media-libs/libvorbis-1.0
+		>=media-libs/flac-1.2.1-r1 )
+	fluidsynth? ( media-sound/fluidsynth )
+	jack? ( >=media-libs/bio2jack-0.4
+		media-sound/jack-audio-connection-kit )
+	lame? ( media-sound/lame )
+	libsamplerate? ( media-libs/libsamplerate )
+	lirc? ( app-misc/lirc )
+	mp3? ( >=media-sound/mpg123-1.12.1 )
+	mtp? ( media-libs/libmtp )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
+	scrobbler? ( net-misc/curl )
+	sdl? (  >=media-libs/libsdl-1.2.5 )
+	sid? ( >=media-libs/libsidplay-2.1.1-r2 )
+	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
+	vorbis? ( >=media-libs/libvorbis-1.2.0
+		  >=media-libs/libogg-1.1.3 )
+	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
+
+DEPEND="${RDEPEND}
+	nls? ( dev-util/intltool )
+	>=dev-util/pkgconfig-0.9.0"
+
+mp3_warning() {
+	if ! use mp3 ; then
+		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
+	fi
+}
+
+src_compile() {
+	mp3_warning
+
+	econf \
+		--enable-chardet \
+		--enable-dbus \
+		--enable-modplug \
+		--enable-neon \
+		--disable-projectm \
+		--disable-projectm-1.0 \
+		$(use_enable adplug) \
+		$(use_enable aac) \
+		$(use_enable alsa) \
+		$(use_enable alsa bluetooth) \
+		$(use_enable alsa amidiplug-alsa) \
+		$(use_enable aqua coreaudio) \
+		$(use_enable aqua dockalbumart) \
+		$(use_enable bs2b) \
+		$(use_enable cdda cdaudio) \
+		$(use_enable cue) \
+		$(use_enable ffmpeg ffaudio) \
+		$(use_enable flac flacng) \
+		$(use_enable fluidsynth amidiplug-flsyn) \
+		$(use_enable flac filewriter_flac) \
+		$(use_enable ipv6) \
+		$(use_enable jack) \
+		$(use_enable gnome gnomeshortcuts) \
+		$(use_enable lame filewriter_mp3) \
+		$(use_enable libsamplerate resample) \
+		$(use_enable lirc) \
+		$(use_enable mp3) \
+		$(use_enable midi amidiplug) \
+		$(use_enable mtp mtp_up) \
+		$(use_enable nls) \
+		$(use_enable oss) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable scrobbler) \
+		$(use_enable sdl paranormal) \
+		$(use_enable sid) \
+		$(use_enable sndfile) \
+		$(use_enable sse2) \
+		$(use_enable vorbis) \
+		$(use_enable vorbis filewriter_vorbis) \
+		$(use_enable wavpack)
+
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS
+}