gentoo resync : 10.11.2017

5 files changed, 380 insertions, 139 deletions

diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index 326e87025578..488b95be5e5c 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,16 +1,18 @@
 AUX audacious-plugins-3.7.1-gl-jack.patch 1152 SHA256 4f4cb4ba57c26668b137ff2bd2fe101a97e28d0335f81e9636354ef94933b081 SHA512 535fa23d8e3b6e0e8146f6c6b2bd3a34fdf3237ec3785438b605c8449ba7322898e6e69a9609b663f39ae274356f9c1cd0a1e9bc1b0bfe1d8cc52f9a30808613 WHIRLPOOL 7186e9959eaf9264d86d41a0eaedec32f7d9638ee7b10e38bb522781ee9d3d88c31c547e799a66d1f29aa089c361b295cf3f1ca66d95a58d800deaa6b610d13c
-DIST audacious-plugins-3.4.1.tar.bz2 1765085 SHA256 ad86b31a69bd3305aa4e65bb9daea7429b51674b6ecd9b7ead36816074cf3b0a SHA512 7919a87a7aac9cfa0820a96e2eb937c70ee4d7f1091cdb3c1097b9849551cadea820e5e51877092590a8d49534be83fbc5b3147c3a2a482d4d47a2d3fd079dd6 WHIRLPOOL 5e46099b7970d64042e0bdf928c5bd658b0c065e4ea06b53f7d67db0332b554a0417b1efaad73e66df7816596e2c1735d22c06025e56634efe215fd27a94c301
 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
 DIST audacious-plugins-3.8.2-gtk3.tar.bz2 1821924 SHA256 7849024beae61b8af3874b166cf3977905aec77859e53901158b531b31ef0cef SHA512 a5457cecc72ca4d57a3fad686b5ff42b2110d8ef65203fa49ad063c8944fc41af5d231b0870126e21c4cc8b3152de36c13726813075d26ba86450ef2132a6d33 WHIRLPOOL 0a75dd8a439dd30dce4764385fa60f317c521c3f45b5e4ae6c1d14f6a677774854d4c1650ba59facc7d204cbd53b7a8b3fca8dd94ee1b040fc2c8f444b179e4f
 DIST audacious-plugins-3.8.2.tar.bz2 1821558 SHA256 d7cefca7a0e32bf4e58bb6e84df157268b5e9a6771a0e8c2da98b03f92a5fdd4 SHA512 61be2ee962853ed05366d4089ae1bef96c282ff61a947dc32f06651a9b620035a33cf4d75f4c4d74821099f36f9124f2b2266940f4844d14ca43ef70a81cde08 WHIRLPOOL 9d87947da3a7d90f0e5262d27dcbbbff2cfc833d340e87448a11d7c5fdfd5a64d8e1f49823a50e7f6ff33214a93594051e561e75eab422aa6321402067076e75
-EBUILD audacious-plugins-3.4.1.ebuild 3344 SHA256 9665786156d12f2b47823276a231f6f423812fefdfecfd5da87334f488e802eb SHA512 23cc55bb479b0f7bd23f29213998508f1956911d301c7a132e231e5c261ec76b1d7e1ec83d4af0002e8126d808b30459ecfee2ca52a9bf813d06dfda947e1771 WHIRLPOOL d5a83fd43b65085a7cbe663862a7770ea5c1dcf7c50424f6414a46a78e090499c838258577b9c4916f213fa4c5564e33920cbca6c73d1efc39228993d7f48d39
+DIST audacious-plugins-3.9-gtk3.tar.bz2 1842950 SHA256 2ad7ec156df316a26d77918b9258133a8c08cb2ae78565336cfddb5bd81993bd SHA512 e2529af761bc97e589cac08689b16db657096b1bbfcc802789726ae1b472746025bec1b492de52eef755d7b50574d09b9250761bf701b1ca37f8a0e8db0f207b WHIRLPOOL 576acdaa673d174e956dd17142e70f867d53aec1974660f62f5cb9edd5cd7def334e163384e549e4e8b2393724b3d0ac7c43c6018e1339764b6823689e12a657
+DIST audacious-plugins-3.9.tar.bz2 1843084 SHA256 8bf7f21089cb3406968cc9c71307774aee7100ec4607f28f63cf5690d5c927b8 SHA512 00c8c53d69995ca1fedb91c7df609cc6c65b13e1af23b98a2fbda143c02ac554cc2c42c01f1c593af252e36bfb85b6324f2daca8632d3b672c69fb4dead2e3fa WHIRLPOOL e0b7cb6a6fb97d7cd69be4d2efc7867bb8510e6ea94af84055e3c61ffb8b06e716f7ac30b961155d560f4e646b82c7df894a7024cfe68c0ee47c64b9e66e9665
 EBUILD audacious-plugins-3.6.2-r1.ebuild 3883 SHA256 f9806fe31adcf41ab96b52652505d322a34f970d5559437dc2bc01bf9eb1ae2e SHA512 1ff0fac526e787b28029c711c1fd6739e35af0ee4f727e1757fe1645985f3967430fa5759d0d9880c22b2b6ace1e94edfc7f1cefea8b94b992464b234152839a WHIRLPOOL 123baa6d5816b27baf991480e8936059855d60d37c81e780b2f95e64a9e3b4f1aabe2ea52d3dbd226f0d076ece3290b81e048bae254f9ecca81c50795eccf8bf
 EBUILD audacious-plugins-3.7.1-r1.ebuild 4674 SHA256 31696f361eaaf95f07a64af00eacd45d02afef103fd29af59449ccbde5d0bc6b SHA512 2663757e39584dceef129102de9e0217e2d799ba9546afdb52f2b4cdcaddf7efdc2323d25a5bed99a0bbc016ad5bbe4fabe83f29699de1cb57b11bff7467aab3 WHIRLPOOL 929c59499ee8ae73478555741dd868cf673fb9a0667d4a362d178f77d72aed80cc5cf9ef9eaec0d79be4e071d88e3ff21622885bb908fffd58acd87c12e09466
 EBUILD audacious-plugins-3.7.1.ebuild 4150 SHA256 a65b8be32c77191d8a6b8be5982afe1b2e1b31ade10e3f11a9b4a7f7470fb543 SHA512 2f1ddbbffad8c71f1c52d17f2d423c142832ccc921c8337d3b2a4b4ef1f81629de1f22a56803cb950f8b8a15f0f90cdca118c8ce750c6f064d5dcc1de219b877 WHIRLPOOL e623e376e4b5545dea9009b42ac08aef7793db1f98c017e7fc163d83f8e8c0ef1dead4c93f316063a345c17e9467f94834abf3a98b11fe32894d3ea40c5cd34e
 EBUILD audacious-plugins-3.8.2.ebuild 4690 SHA256 a04555af471460af72d7b412f3a259d6774106b1d0df4d80a075fe5b1db999a1 SHA512 ebdb470887627beab02472528f8ac3b2bfe275e4a2699c444fa51b275928d9a24b2724ffc7e75c4aa2e292c40daf19a260a636a91b3e7e003f21b1cef12098de WHIRLPOOL 2f34500308f35f3cc4964a62abf0e43c9f4da0dd5fae18cd05b3f1e8406f1c7b05b028b399a88335dda14ef7aa1c91dc64384c72d2abb4336b60786d33797639
+EBUILD audacious-plugins-3.9.ebuild 4384 SHA256 a1ae4f10965d19d784febb6d52732557eaca2cc563348362ee4d3f0aa26c870d SHA512 76259281bc1261421376d36981b52dec0cadb040da45c7da5ed9ddfe72562a75f8fbf0c7b7b769a416b713507301c1ac57034db316347f4100192500554b18cc WHIRLPOOL bac10fb72103f845b854ec42a04171a09522a1e6dda397e5d9fd46b8b16b270246ef3888d3fdd3fc31d1ba37c666d041dd78cd77930138475b7feb07023eb3de
+EBUILD audacious-plugins-9999.ebuild 4384 SHA256 a1ae4f10965d19d784febb6d52732557eaca2cc563348362ee4d3f0aa26c870d SHA512 76259281bc1261421376d36981b52dec0cadb040da45c7da5ed9ddfe72562a75f8fbf0c7b7b769a416b713507301c1ac57034db316347f4100192500554b18cc WHIRLPOOL bac10fb72103f845b854ec42a04171a09522a1e6dda397e5d9fd46b8b16b270246ef3888d3fdd3fc31d1ba37c666d041dd78cd77930138475b7feb07023eb3de
 MISC ChangeLog 6166 SHA256 15805c49b05d880e4d283084ea89af8896ded1f46d15e2a5bee0efbc3f0a4ed9 SHA512 94caa4b34c4cb2cbc73d29f816248faaf026605db8732935b64cc2a28d3b459ea873d877fcaed465662fda231dd58443d64d8d370e416e76a36dde012d0ac0d9 WHIRLPOOL 67034f46dda55432cdad44e15805da6428234638f2f808d50ef96356e60a5429cb8bd46f69bb2bb76044297d9fe38ca0935930831ca3974eec05efa1c9185c46
 MISC ChangeLog-2015 57436 SHA256 41d7d70ec5933f3f981a2bfcae2d7db5377d27564a5bbe2604fc06eeb72db3ed SHA512 c8b6ea2b96bf70c38330eea2ee77185deae3139905f5d53f2aff58389071537bef88e41a16f7536589f798b635c00beb7fbce0d1715aab9b5c87c5e974f05c69 WHIRLPOOL b4baace48ff9e617aa27c776c914ead6a0434149930d8f6e3b826f8f9e1f230a9922d0bfb153f25dbdef8911bc381ff0d21035a93513b744e285dd8971710809
-MISC metadata.xml 1130 SHA256 561026b3449e1c2a9dac7a6d8d2c23e14c8fed5ebe59d58e99dcd305f3f63372 SHA512 67dd211d37ca1d022941c6f29712dcede50313bd122f77360e960adec1592f93eef8b3810983dca3256f35e8b9cf07d17b51c17b410966ffe3b1e908f475bf9d WHIRLPOOL e8005db1f5ac2e78e0fbb3830e3ecc9ff35742416abf54a2607d4530da72c9d0ef59044476ae46de841ec36f3acba3aef50ba700d33845500ab788cbbf2d3cfd
+MISC metadata.xml 1368 SHA256 286486fdeffef7a735381fdfbf39b9eb2c754518cb3fd218cc00b510f16ba12f SHA512 8634f8f19bdcb98406cce8b678eb6cdf5557784a47046169c4645ac04dc268f587d19f9ec7e971e1c129db763c8bcbe15f19f1f6662282a5b23369f8ce9e99a4 WHIRLPOOL 28aeae70fd02a3b3dafe10bd1f7dcc237225dc10cd663f0ade73580723b961129131f6742c73414e46c9ba047e026a0405e2d6f572ded725ebae9873df59f562
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.4.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.4.1.ebuild
deleted file mode 100644
index 30a7b005c6c9..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-3.4.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack
-lame libnotify libsamplerate lirc midi mms mp3 nls pulseaudio scrobbler sdl sid sndfile vorbis wavpack"
-
-RDEPEND="app-arch/unzip
-	>=dev-libs/dbus-glib-0.60
-	dev-libs/libxml2:2
-	media-libs/libmodplug
-	~media-sound/audacious-3.4.1
-	>=net-libs/neon-0.26.4
-	x11-libs/gtk+:3
-	( || ( >=dev-libs/glib-2.32.2 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 )
-	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"
-
-DOCS="AUTHORS"
-
-mp3_warning() {
-	if ! use mp3 ; then
-		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-	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
-
-	econf \
-		--enable-modplug \
-		--disable-soxr \
-		--enable-neon \
-		$(use_enable adplug) \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable alsa amidiplug-alsa) \
-		$(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 libnotify notify) \
-		$(use_enable libsamplerate resample) \
-		$(use_enable lirc) \
-		$(use_enable mms) \
-		$(use_enable mp3) \
-		$(use_enable midi amidiplug) \
-		$(use_enable nls) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable scrobbler) \
-		$(use_enable sdl sdlout) \
-		$(use_enable sid) \
-		$(use_enable sndfile) \
-		$(use_enable vorbis) \
-		$(use_enable wavpack)
-}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.9.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.9.ebuild
new file mode 100644
index 000000000000..cc21399c3a93
--- /dev/null
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.9.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://audacious-media-player.org/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git"
+else
+	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 )"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth gnome hotkeys http gme gtk gtk3 jack lame libav
+	libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile soxr vorbis wavpack"
+REQUIRED_USE="
+	^^ ( gtk gtk3 qt5 )
+	qt5? ( !libnotify )
+	|| ( alsa jack pulseaudio sdl )"
+
+# The following plugins REQUIRE a GUI build of audacious, because non-GUI
+# builds do NOT install the libaudgui library & headers.
+# Plugins without a configure option:
+#   alarm
+#   albumart
+#   delete-files
+#   ladspa
+#   playlist-manager
+#   search-tool
+#   skins
+#   vtx
+# Plugins with a configure option:
+#   glspectrum
+#   gtkui
+#   hotkey
+#   notify
+#   statusicon
+RDEPEND="
+	app-arch/unzip
+	dev-libs/dbus-glib
+	dev-libs/glib[utils]
+	dev-libs/libxml2:2
+	~media-sound/audacious-${PV}[gtk?,gtk3?,qt5?]
+	aac? ( >=media-libs/faad2-2.7 )
+	alsa? ( >=media-libs/alsa-lib-1.0.16 )
+	ampache? ( www-apps/ampache )
+	aosd? (
+		x11-libs/libXrender
+		x11-libs/libXcomposite
+	)
+	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 )
+	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 )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( >=media-sound/mpg123-1.12.1 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
+	scrobbler? ( net-misc/curl )
+	sdl? ( media-libs/libsdl2[sound] )
+	sid? ( >=media-libs/libsidplayfp-1.0.0 )
+	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
+	soxr? ( media-libs/soxr )
+	vorbis? (
+		>=media-libs/libvorbis-1.2.0
+		>=media-libs/libogg-1.1.3
+	)
+	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
+
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+	else
+		default
+		if use gtk3; then
+			mv "${MY_P}"{-gtk3,} || die
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	if ! use mp3 ; then
+		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
+	fi
+
+	econf \
+		--enable-mpris2 \
+		--enable-songchange \
+		--enable-speedpitch \
+		--disable-oss4 \
+		--disable-qtaudio \
+		--disable-qtglspectrum \
+		--disable-coreaudio \
+		--disable-sndio \
+		$(use_enable aac) \
+		$(use_enable alsa) \
+		$(use_enable ampache) \
+		$(use_enable aosd) \
+		$(use_enable bs2b) \
+		$(use_enable cdda cdaudio) \
+		$(use_enable cue) \
+		$(use_enable flac) \
+		$(use_enable fluidsynth amidiplug) \
+		$(use_enable flac filewriter) \
+		$(use_enable gme console) \
+		$(use_enable $(usex gtk gtk gtk3) gtk) \
+		$(use_enable hotkeys hotkey) \
+		$(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 modplug) \
+		$(use_enable mp3 mpg123) \
+		$(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 soxr) \
+		$(use_enable vorbis) \
+		$(use_enable wavpack) \
+		$(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg))
+}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
new file mode 100644
index 000000000000..cc21399c3a93
--- /dev/null
+++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://audacious-media-player.org/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git"
+else
+	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 )"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth gnome hotkeys http gme gtk gtk3 jack lame libav
+	libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile soxr vorbis wavpack"
+REQUIRED_USE="
+	^^ ( gtk gtk3 qt5 )
+	qt5? ( !libnotify )
+	|| ( alsa jack pulseaudio sdl )"
+
+# The following plugins REQUIRE a GUI build of audacious, because non-GUI
+# builds do NOT install the libaudgui library & headers.
+# Plugins without a configure option:
+#   alarm
+#   albumart
+#   delete-files
+#   ladspa
+#   playlist-manager
+#   search-tool
+#   skins
+#   vtx
+# Plugins with a configure option:
+#   glspectrum
+#   gtkui
+#   hotkey
+#   notify
+#   statusicon
+RDEPEND="
+	app-arch/unzip
+	dev-libs/dbus-glib
+	dev-libs/glib[utils]
+	dev-libs/libxml2:2
+	~media-sound/audacious-${PV}[gtk?,gtk3?,qt5?]
+	aac? ( >=media-libs/faad2-2.7 )
+	alsa? ( >=media-libs/alsa-lib-1.0.16 )
+	ampache? ( www-apps/ampache )
+	aosd? (
+		x11-libs/libXrender
+		x11-libs/libXcomposite
+	)
+	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 )
+	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 )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( >=media-sound/mpg123-1.12.1 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
+	scrobbler? ( net-misc/curl )
+	sdl? ( media-libs/libsdl2[sound] )
+	sid? ( >=media-libs/libsidplayfp-1.0.0 )
+	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
+	soxr? ( media-libs/soxr )
+	vorbis? (
+		>=media-libs/libvorbis-1.2.0
+		>=media-libs/libogg-1.1.3
+	)
+	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
+
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+	else
+		default
+		if use gtk3; then
+			mv "${MY_P}"{-gtk3,} || die
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	if ! use mp3 ; then
+		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
+	fi
+
+	econf \
+		--enable-mpris2 \
+		--enable-songchange \
+		--enable-speedpitch \
+		--disable-oss4 \
+		--disable-qtaudio \
+		--disable-qtglspectrum \
+		--disable-coreaudio \
+		--disable-sndio \
+		$(use_enable aac) \
+		$(use_enable alsa) \
+		$(use_enable ampache) \
+		$(use_enable aosd) \
+		$(use_enable bs2b) \
+		$(use_enable cdda cdaudio) \
+		$(use_enable cue) \
+		$(use_enable flac) \
+		$(use_enable fluidsynth amidiplug) \
+		$(use_enable flac filewriter) \
+		$(use_enable gme console) \
+		$(use_enable $(usex gtk gtk gtk3) gtk) \
+		$(use_enable hotkeys hotkey) \
+		$(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 modplug) \
+		$(use_enable mp3 mpg123) \
+		$(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 soxr) \
+		$(use_enable vorbis) \
+		$(use_enable wavpack) \
+		$(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg))
+}
diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml
index 10ff70693716..1e9c7798ca0f 100644
--- a/media-plugins/audacious-plugins/metadata.xml
+++ b/media-plugins/audacious-plugins/metadata.xml
@@ -1,26 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>zx2c4@gentoo.org</email>
-  <name>Jason A. Donenfeld</name>
-</maintainer>
-<maintainer type="project">
-  <email>sound@gentoo.org</email>
-  <name>Gentoo Sound project</name>
-</maintainer>
-<use>
-	<flag name="adplug">Build with AdPlug (Adlib sound card emulation)
-		support</flag>
-	<flag name="aosd">Enable support for Audacious OSD</flag>
-	<flag name="bs2b">Enable Bauer Bauer stereophonic-to-binaural
-		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>
-	<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
-</use>
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+		<name>Jason A. Donenfeld</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="adplug">Build with AdPlug (Adlib sound card emulation) support</flag>
+		<flag name="ampache">Support controlling audacious via <pkg>www-apps/ampache</pkg></flag>
+		<flag name="aosd">Enable support for Audacious OSD</flag>
+		<flag name="bs2b">Enable Bauer Bauer stereophonic-to-binaural 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="gme">Support various gaming console music formats</flag>
+		<flag name="gtk3">Link against version 3 of the GIMP Toolkit instead of version 2 (x11-libs/gtk+)</flag>
+		<flag name="hotkeys">Enable support for controlling via hotkeys</flag>
+		<flag name="http">Support HTTP streams through neon</flag>
+		<flag name="scrobbler">Build with scrobbler/LastFM submission support</flag>
+		<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
+		<flag name="soxr">Build with SoX Resampler support</flag>
+	</use>
 </pkgmetadata>