Version bump, as requested by Joe Kappus in bug #538414. Implement REQUIRED_USE restrictions as pointed out by Diego Elio Pettenò in bug #526182. Drop compatibility USE-flag midi triggering fluidsynth due to errors as flagged up by Teodor Petrov in bug #518938. Make neon dependency optional as requested by Harvey Mittens in bug #525056.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xB5058F9A

4 files changed, 154 insertions, 18 deletions

diff --git a/media-plugins/audacious-plugins/ChangeLog b/media-plugins/audacious-plugins/ChangeLog
index 5bff64135086..f68a3fe15868 100644
--- a/media-plugins/audacious-plugins/ChangeLog
+++ b/media-plugins/audacious-plugins/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-plugins/audacious-plugins
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.281 2015/01/29 18:15:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.282 2015/08/04 23:32:58 chainsaw Exp $
+
+*audacious-plugins-3.6.2 (04 Aug 2015)
+
+  04 Aug 2015; Tony Vroon <chainsaw@gentoo.org>
+  +audacious-plugins-3.6.2.ebuild:
+  Version bump, as requested by Joe Kappus in bug #538414. Implement
+  REQUIRED_USE restrictions as pointed out by Diego Elio Pettenò in bug
+  #526182. Drop compatibility USE-flag midi triggering fluidsynth due to errors
+  as flagged up by Teodor Petrov in bug #518938. Make neon dependency optional
+  as requested by Harvey Mittens in bug #525056.
 
   29 Jan 2015; Michał Górny <mgorny@gentoo.org>
   audacious-plugins-2.4.4-r1.ebuild, audacious-plugins-2.5.4.ebuild:
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index 908c3d756505..8bf22d635b59 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -17,6 +17,8 @@ DIST audacious-plugins-3.3.3.tar.bz2 1740185 SHA256 3906a70090edb09b94504fa37c82
 DIST audacious-plugins-3.3.4.tar.bz2 1756149 SHA256 b66dd84ab092d9fb64182599706ed60a3c382c904a77e23285e1e271f007afd0 SHA512 4e3ba9adc4f44c3f02934a98d5c3225ae560e062b1e1f93e478770c8ea7f6e741a9cf83ae2ec34a05ac4c40dd08d0cf732e41029fa88bc37014bb8bbe1c1a681 WHIRLPOOL a96db513d671f656a5c8747cf1e8c300a6043e4decf3b3b939e07ec7b49b583289793da2d7ac9b52f4ceedae14ed3fa3d076831ec0fd38300f28b7c99663e605
 DIST audacious-plugins-3.4.1.tar.bz2 1765085 SHA256 ad86b31a69bd3305aa4e65bb9daea7429b51674b6ecd9b7ead36816074cf3b0a SHA512 7919a87a7aac9cfa0820a96e2eb937c70ee4d7f1091cdb3c1097b9849551cadea820e5e51877092590a8d49534be83fbc5b3147c3a2a482d4d47a2d3fd079dd6 WHIRLPOOL 5e46099b7970d64042e0bdf928c5bd658b0c065e4ea06b53f7d67db0332b554a0417b1efaad73e66df7816596e2c1735d22c06025e56634efe215fd27a94c301
 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
 EBUILD audacious-plugins-2.4.4-r1.ebuild 3634 SHA256 f848017bc339096ff94b0f208efcd5f7cfde1f1296827f9713870fe49d8f3e1b SHA512 7674cd286cea4fc641b30efc205c1870b9e8fb20a8be38c7a5ac4d7ee6a617407b5117477a8b4dee24ae40f736189bc8115cffeeef2faf3e97f78cb481e3f6a6 WHIRLPOOL 0e0c6fd705af2ab1a9d5738f6b1277fcc386f47a65a7d31a9e0e03972c8bc23082fa81746dc33ff14dfa9d0bbe3e00b34c2bebfeb9c9db252ef9275958743849
 EBUILD audacious-plugins-2.5.4.ebuild 3592 SHA256 7701548d1c2b62bbfb7155f144b5e3f5357d4ceefbbf4c1a4c9abcc91837425c SHA512 19531a3df35e5a7a70949fbb1ca9e82fed5a285db891ca4ef67b4395af4feac7126ff33d87e14f31c21d45a18780fac5058f4e024433cff4ac3a5c7b26b58137 WHIRLPOOL 17e0a26907dadd4160a9fb4eb0984088af070ea1fe932b7653ff794b340b7e56d0dd06253eba80aadf31138f5f38a88cf18f427121135576c64988bb2c034d22
 EBUILD audacious-plugins-3.1.1.ebuild 3419 SHA256 7e38ce3d0a98bae82ccec208babeed40159bf4366530e2643f2a12d930e3a095 SHA512 330859d650f0a5cffcf01e29a67e7a783e7be9d591b7ce03b572588d52312fbe0a0c6601c57c28cbc0e22f0d3d8a958af3b20c299b92fe34c37a0a79501fdcf4 WHIRLPOOL a6f01f05df2b758dbc4f6b105a40b7ebc138e58f4b83325d23eb59f182ecfc779ec092ffe218a336376045aba7100a9a975ca029c3b31025231258a5a152fa02
@@ -28,24 +30,13 @@ EBUILD audacious-plugins-3.3.3.ebuild 3536 SHA256 65bd46dbf8e8e2bda635baf53cbf9a
 EBUILD audacious-plugins-3.3.4.ebuild 3494 SHA256 998f54cbfb344ea8c538b7fe0442d4482229a03c89f6dcd5326ad7b9a3574bbb SHA512 5ea382128aa322b3076e601f78deb3e63b6c40010d06bf67dc8d2ee0858deb42fed8c548331a6d82c0e9707e7cc289300574103c91cd2ac1cdaef62082dcd543 WHIRLPOOL c88e749d0c9a864ccd990b3190d04a1b7c875b22aac70c2292703d232475e2809ad8f92720310680f0c8c0c5d96a2204b62c4e83cafa9176a8ee4eec4a625343
 EBUILD audacious-plugins-3.4.1.ebuild 3511 SHA256 131a96eb2c25b9ae24df42ff9b4790e0ff5741b590da32aeb0086abfdacce081 SHA512 9ba5f61e137cb8b7e9902841002fbc82edc9632c9b3a6c0301aa58b89dd8f30f0b6694ec94bad5009985bb145e53a2688e04338df9165f3606ca128e2dafe6ee WHIRLPOOL 8360beedc394770d345d24058c0411461cc1b56fd0849ba556884640c172a95af5d0502d0fc53e5d1f5ae68aba3d37ac7a647b7ac3f5375373655a12f58d1444
 EBUILD audacious-plugins-3.5.1.ebuild 3660 SHA256 38895aa2d6a358be1739879ba60a14e73b9aac23022f5269acf0d2448ef1c5a1 SHA512 061f182758a46c255cc90ae35af9729a4e523f89a3328edbf8c06903f8cb153dc7dbbdf391814a584be2c232437871c67bf942e99ec623f37dcd39843e1613bd WHIRLPOOL d70b9879880d1d130182be73d12408e0f3bd83b07580ca233d61aeb9805667ed90b594498ceb8f86b6ae593e24b04a0cd0114e3d92c10a472f7d2af1711a2c68
-MISC ChangeLog 56960 SHA256 89cab34a4359addfadd67dafc44a44aa742b54d37b01b960dac7b9ad14943426 SHA512 bd0971af3b59afe0d020413fabb68f05b4ed7517dc296e77f4ea9caaa74beaea6c06d98f006e08250533ff2ee86f183b800cb248ccb199b24eaf69a4ddfb87d3 WHIRLPOOL 9dda82e09643515ce91556d25c41be9b0162a66b7223b0612ee17f177ab9bc9b8b687378a646869f62a6c86d9542b2c14bc1919586891b77df06a18ca74a6bf3
-MISC metadata.xml 899 SHA256 1940ed219acfa3c32a65c52b5e94ef955f8d9750bb62ca6d5143058cca99d47c SHA512 20c7963a7557e63559cbc120c2f3cf3b34d893b2332c1345e8742d903f3bdc25119c89c8f3e0e76704c86bf9774effe2c4dbe31b71ddf8448add8552aad89bd7 WHIRLPOOL 2db9abd7622f79b86344b03072c33312adbb290fa895681d3b1f76951b894bd44b739aa00619691e866279fbcf33d0a8fba2be36b3a71cdea4bcbe50b6327450
+EBUILD audacious-plugins-3.6.2.ebuild 4034 SHA256 e5f74665253b36fa0ca72fe41872eaa6575e948153bf762511378c009be819db SHA512 228fd3788717ec822fbe9f4536d3b3c82901b0342b7e24c59bcf7bb0a337b47848b5364e46aeea0192f1f5f96f86d0a666b7209096740e785cccc1c15abe9747 WHIRLPOOL c6827da893c689bdcfbd1534cc7e1f78d89c2ff87c9f59dd0b941a1535d13aed1ba1ccbf337ab69354cbb34e6c1684fd701b9d0621964d92ab66a9e193496e52
+MISC ChangeLog 57436 SHA256 41d7d70ec5933f3f981a2bfcae2d7db5377d27564a5bbe2604fc06eeb72db3ed SHA512 c8b6ea2b96bf70c38330eea2ee77185deae3139905f5d53f2aff58389071537bef88e41a16f7536589f798b635c00beb7fbce0d1715aab9b5c87c5e974f05c69 WHIRLPOOL b4baace48ff9e617aa27c776c914ead6a0434149930d8f6e3b826f8f9e1f230a9922d0bfb153f25dbdef8911bc381ff0d21035a93513b744e285dd8971710809
+MISC metadata.xml 959 SHA256 52147a062798101aacfd9e0a7dc78d0d4eda06467327773655fbedbffddc60ca SHA512 5050f8fff3cd40439be4b2cfe23ab1c516f4c10e8a1f5a595de8c45c0a4fe23250158072d0004ede36f889e06b0186b2d114ed97e0c127feedc9ea8f10d5b448 WHIRLPOOL 71c74b5b14a2e103c0e3553dbca7f1760ebcee22e525432652e1d1fb64b216098b31f7a19e3ac1438968b282e9f13e75d27cd8c6db3a6a730f3d22486a6231f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUynjeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOJJgQAIZwT1f4JDVYLn3Csrek/y/r
-nVqOJ/rfmDj0blmDuFRm0b2T3+Z7IHSUTdyxRGYbGfIFYxupfSgICVudvSQp8wvp
-5N7x/Pt+fq630lKTD6l+Tc3oXyU4eMgQdpQ9TzyelKieFL7qgFoVqV8EUpXRpKfi
-KLDp0wn0sgx5Me9vIOtHsYuECPSE+g+6VUsc4fjFQeoM8w2WpCE+Wh6vo+JodeIr
-FIllSCfVgIbZG30cmBYQQ+fuFGBIz0QqRfY8rRb2ajWtG07LcsXPtXuVs9d+lEm5
-+PlG56JhzVeUrU6pNNflIV85WbfZrZVBdkOBj0zf/ibW/7Tm6C12HBmOS5dbzqSu
-GfhjMoe7ftFWaQ76sQ1FutdDyVniK68s7dJXPkzO/r+jfIu3o2wic0Z1TVt2RSOp
-NGjLYLEHpa+gKAUR0Pc//UFENSk+KDIX0Gv7IlcXf4EjgkK9w6hOcf9KQUGh3jPC
-AjYgbdcYm/XPCO6LkFHMQ7R8VuYXpEx1Ptb8sRKJTkm1aYtiXy6AVE3NwSB+btr3
-tTlH2IEEfuscNRy50oFSOzjVj0lVNiH0kQaKi93y7fWsDPYDoaEdq8YEQ07ukk9C
-n0PQNyf6qy+r77f2a6PUYGrPTKvIeNmpxT8JLcPlEsfIDfeJqa1OUhfw5qbYJ5+y
-EdwHmWUCLKkSjTtHC3Ki
-=DSgr
+iEYEAREIAAYFAlXBS6wACgkQp5vW4rUFj5o8uQCeJ1DMTZE1yBPMrdEoDDyTmrVz
+sXEAoIWNQ04GsUFiYpbFdm71PI2MYUbH
+=IlH7
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.6.2.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.6.2.ebuild
new file mode 100644
index 000000000000..67c0ff1c4ee9
--- /dev/null
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.6.2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-3.6.2.ebuild,v 1.1 2015/08/04 23:32:58 chainsaw Exp $
+
+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="~amd64 ~arm ~hppa ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome http gtk3 jack
+lame libnotify libsamplerate lirc mms mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile vorbis wavpack"
+REQUIRED_USE="|| ( alsa flac lame jack pulseaudio qt5 sdl )"
+
+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? ( >=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-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 )
+	gtk3? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	qt5? ( dev-qt/qtcore:5
+	      dev-qt/qtgui:5
+	      dev-qt/qtmultimedia:5
+	      dev-qt/qtwidgets:5 )
+	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 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} \
+		--enable-modplug \
+		--disable-soxr \
+		--enable-neon \
+		$(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 libnotify notify) \
+		$(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)
+}
diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml
index 5dbd01c936ae..731f28e89c71 100644
--- a/media-plugins/audacious-plugins/metadata.xml
+++ b/media-plugins/audacious-plugins/metadata.xml
@@ -13,6 +13,7 @@
 		headphone filter</flag>
 	<flag name='cue'>Support CUE sheets using the libcue library</flag>
 	<flag name='fluidsynth'>Support FluidSynth as MIDI synth backend</flag>
+	<flag name='http'>Support HTTP streams through neon</flag>
 	<flag name="gtk3">Link against version 3 of the GIMP Toolkit instead of version 2 (x11-libs/gtk+)</flag>
 	<flag name='midi'>Build with amidi-plug (MIDI synth) support</flag>
 	<flag name='scrobbler'>Build with scrobbler/LastFM submission support</flag>