Merge remote-tracking branch 'github/pr/654'.

2 files changed, 154 insertions, 0 deletions

diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index 1b79e8668389..a1173460ed3b 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -10,3 +10,5 @@ DIST audacious-plugins-3.4.1.tar.bz2 1765085 SHA256 ad86b31a69bd3305aa4e65bb9dae
 DIST audacious-plugins-3.5.1.tar.bz2 1714137 SHA256 e6da3346df520f3c6cee3c3706eb09290840ea12dfff28d6bec32e5842dc9e26 SHA512 6359edd6c89220f110dc20cf52418b741cfbbce4618f6ba4e4c97d6656216575aba1dfa8e7de4f11a24a28a27cc008e2f7e551759185972a17748f7e043b8823 WHIRLPOOL e4885108904f0badf81411040e1a5098190ab4dd4b53b14ddb5c39148dc01f982a95d1143ff2d8dd9e9cfbad75fa40654791dcf2a7e21d95e80c3ec0d484d218
 DIST audacious-plugins-3.6.2-gtk3.tar.bz2 1788886 SHA256 943d94c1ea09817caba627b6abbf0de301c3cd19f2c8c0afae1ebc4dbe31fc95 SHA512 1745c48ec5a71ed92d938fc56d0ae06fbbd43b2ef62652dd06178a3c739e2f8c701ee55249db135ee8afca663151482bb9a2b8c83f1d5bbfcd0408b0594d5847 WHIRLPOOL 2ff212a964c959d1acaf4c9d35e3ce0e3ef7261054ccef3f8174e6188d1bfb9215b780bd17df9e4c6848d4e3fd2e29d8847d3cf37e4203430a87b9fd439080a3
 DIST audacious-plugins-3.6.2.tar.bz2 1786338 SHA256 e7798936249e1601177503d148a3dd59edd289579f3f1667351eb0ba463642e8 SHA512 d0715bdc819b115e55daafc6715a770a9e2d8d61d19b9a9485195774e8ace672144dc7852f71bd0b796d26bfcb82766252f65d58a2a061e7a0228a1dda3148c5 WHIRLPOOL 055be62da6c7f8ddacf2c3ef18194ba09bf63dc3699919f6e5068740c0fc6db2b370da999ffe8724e62c60363928ae87ca86d526458fa93b9a3cce37799b12af
+DIST audacious-plugins-3.7.1-gtk3.tar.bz2 1838067 SHA256 75469b52694fcfce237a937c6c64c0d355aefa6a7b6c2504ab447d901afc073f SHA512 77b0e3c167d430ed97dfb2bd344d856de9a384a4667f7759ad59f47706de12d7b5b849455c381c27a58f82d3b423d08e922ac81f5e1bb0dd763b9a09bc3e53c6 WHIRLPOOL fbbc8e4a512b681ff2a87ea7c971b3496ff007dab5fdb534457e5608724ba43fc71642384a417190ded19d900b6e1dc20c1369f59882d91791bbcc637402c4a3
+DIST audacious-plugins-3.7.1.tar.bz2 1838045 SHA256 228a384f26afb000099166776d3454539956aa00fde90dcb4612ce8910ed4116 SHA512 2d22131babba572af235ec5f27135061a1602be55a2f709e327b7cd4052f7c11bc31398d01574a6f07197daa6b79cb42d5fa7b26f75764680420a46aede5cd9a WHIRLPOOL 026c355c6323aa6b56b09c119d9320ec5a7306f11b90504631f8a25c05b4f9bd1641ff223e0122a7b5be48f341a3820b759d1829ca60274285cfe19897c9edae
\ No newline at end of file
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.7.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.7.1.ebuild
new file mode 100644
index 000000000000..fc4405b56cfd
--- /dev/null
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.7.1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://audacious-media-player.org/"
+SRC_URI="!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
+	 gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="aac +adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome http gtk gtk3 jack
+lame libnotify libsamplerate lirc mms mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile vorbis wavpack"
+REQUIRED_USE="
+	?? ( gtk gtk3 qt5 )
+"
+
+RDEPEND="app-arch/unzip
+	>=dev-libs/dbus-glib-0.60
+	dev-libs/libxml2:2
+	media-libs/libmodplug
+	~media-sound/audacious-${PV}
+	( || ( >=dev-libs/glib-2.32.2[utils] dev-util/gdbus-codegen ) )
+	aac? ( >=media-libs/faad2-2.7 )
+	adplug? ( media-libs/adplug )
+	alsa? ( >=media-libs/alsa-lib-1.0.16 )
+	bs2b? ( media-libs/libbs2b )
+	cdda? ( >=media-libs/libcddb-1.2.1
+		dev-libs/libcdio-paranoia )
+	cue? ( media-libs/libcue )
+	ffmpeg? ( >=virtual/ffmpeg-0.7.3 )
+	flac? ( >=media-libs/libvorbis-1.0
+		>=media-libs/flac-1.2.1-r1 )
+	fluidsynth? ( media-sound/fluidsynth )
+	http? ( >=net-libs/neon-0.26.4 )
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3
+		media-libs/adplug )
+	qt5? ( dev-qt/qtcore:5
+	      dev-qt/qtgui:5
+	      dev-qt/qtmultimedia:5
+	      dev-qt/qtwidgets:5
+	      media-libs/adplug )
+	jack? ( >=media-libs/bio2jack-0.4
+		media-sound/jack-audio-connection-kit )
+	lame? ( media-sound/lame )
+	libnotify? ( x11-libs/libnotify )
+	libsamplerate? ( media-libs/libsamplerate )
+	lirc? ( app-misc/lirc )
+	mms? ( >=media-libs/libmms-0.3 )
+	mp3? ( >=media-sound/mpg123-1.12.1 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
+	scrobbler? ( net-misc/curl )
+	sdl? ( media-libs/libsdl[sound] )
+	sid? ( >=media-libs/libsidplayfp-1.0.0 )
+	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 )
+	virtual/pkgconfig"
+
+mp3_warning() {
+	if ! use mp3 ; then
+		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
+	fi
+}
+
+src_unpack() {
+	default
+	if use gtk3 ; then
+		mv "${MY_P}-gtk3" "${MY_P}"
+	fi
+}
+
+src_prepare() {
+	has_version "<dev-libs/glib-2.32" && \
+		cd "${S}"/src/mpris2 && \
+		gdbus-codegen --interface-prefix org.mpris. \
+			--c-namespace Mpris --generate-c-code object-core mpris2.xml && \
+		gdbus-codegen --interface-prefix org.mpris. \
+			--c-namespace Mpris \
+			--generate-c-code object-player mpris2-player.xml && \
+		cd "${S}"
+}
+
+src_configure() {
+	mp3_warning
+	if use qt5 ;then
+		notify="--disable-notify"
+        elif use libnotify ;then
+		notify="--enable-notify"
+        fi
+
+	if use gtk ;then
+		gtk="--enable-gtk"
+	elif use gtk3 ;then
+		gtk="--enable-gtk"
+	else
+		gtk="--disable-gtk"
+	fi
+
+	if use ffmpeg && has_version media-video/ffmpeg ; then
+		ffmpeg="--with-ffmpeg=ffmpeg"
+	elif use ffmpeg && has_version media-video/libav ; then
+		ffmpeg="--with-ffmpeg=libav"
+	else
+		ffmpeg="--with-ffmpeg=none"
+	fi
+
+	econf \
+		${ffmpeg} \
+		${gtk} \
+		${notify} \
+		--enable-modplug \
+		--enable-statusicon \
+		--disable-soxr \
+		$(use_enable adplug) \
+		$(use_enable aac) \
+		$(use_enable alsa) \
+		$(use_enable bs2b) \
+		$(use_enable cdda cdaudio) \
+		$(use_enable cue) \
+		$(use_enable flac flacng) \
+		$(use_enable fluidsynth amidiplug) \
+		$(use_enable flac filewriter_flac) \
+		$(use_enable http neon) \
+		$(use_enable jack) \
+		$(use_enable gnome gnomeshortcuts) \
+		$(use_enable lame filewriter_mp3) \
+		$(use_enable libsamplerate resample) \
+		$(use_enable lirc) \
+		$(use_enable mms) \
+		$(use_enable mp3) \
+		$(use_enable nls) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable qt5 qt) \
+		$(use_enable scrobbler scrobbler2) \
+		$(use_enable sdl sdlout) \
+		$(use_enable sid) \
+		$(use_enable sndfile) \
+		$(use_enable vorbis) \
+		$(use_enable wavpack)
+}