gentoo resync : 18.11.2019

6 files changed, 212 insertions, 34 deletions

diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index aaf609c0d6ba..3fdbfeb91c64 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,6 +1,8 @@
 DIST audacious-plugins-3.10.1.tar.bz2 1715477 BLAKE2B fda3940e6c06aadd93a3e1538be747083fcc969cf3118cf3e942787906b9ee0a13bd3c30d15ba19cb713559cdf8f7b71d7b961173b1619f0aafbdea5deb75ac3 SHA512 454e9ce4061e92a0ecda40f562d4cc7453fc0019fd76b25dbe9e319319fa37c22f9785cb29563e8074de8a88e6130106aca1e431790297e1b4636dc974fde565
 DIST audacious-plugins-3.9-gtk3.tar.bz2 1842950 BLAKE2B 55f373be204a9b4c9cff41d41d43c4776f680ab203643e90e5d338bec2e7f8a4c60cda9caa08e461089a475f3ec1bc237538f781718eb0d26a4365743337e977 SHA512 e2529af761bc97e589cac08689b16db657096b1bbfcc802789726ae1b472746025bec1b492de52eef755d7b50574d09b9250761bf701b1ca37f8a0e8db0f207b
-EBUILD audacious-plugins-3.10.1.ebuild 4289 BLAKE2B 8d27f4bbbba260be7182cb8f2b287a9b717f0c0394a8b980895864a952e8726aa846c724e6b1ae54bc3462c5e9d62e91742a0f5fb670b853d9982ebbb2ef6557 SHA512 d836d8eea63c8651c4b742e6fd58d02d55e68de1954fe8abda83b18b631e28666af6012c47a8e532e4a0bdbcdce00a135f371e8a729c2d29a926d29acb8b0d32
-EBUILD audacious-plugins-3.9-r2.ebuild 3686 BLAKE2B 1aadcffb6133fcfce85acb06cd1e520b5da20365396c99e968c364f7455430a3233ce760638c0800b16301e601b9a5788b1b724d6a30d9e7976c9ff9f6f96ea2 SHA512 3356517402b4434d74488b2bca1f58e1119453d676bd073bed97408e218606fb390ceede95bef4132d29eab7bff01739b728719c1b55c737af0595202dca92ea
-EBUILD audacious-plugins-9999.ebuild 4289 BLAKE2B 8d27f4bbbba260be7182cb8f2b287a9b717f0c0394a8b980895864a952e8726aa846c724e6b1ae54bc3462c5e9d62e91742a0f5fb670b853d9982ebbb2ef6557 SHA512 d836d8eea63c8651c4b742e6fd58d02d55e68de1954fe8abda83b18b631e28666af6012c47a8e532e4a0bdbcdce00a135f371e8a729c2d29a926d29acb8b0d32
-MISC metadata.xml 1333 BLAKE2B f27c5c2d94c45688e56a6a48382c6b5fb3e05bfbbdff613af56ce386af8f607b6d24f5eedfebe221274fe5f56d0d13cc1cba21c11007ff9b5ceb5080f36dde64 SHA512 2c31199cc1f095d0108223e15584dd901fedc88aa02820bf4749cbb1014eeec5af04e1df9688efdd2c2b78a4f27658dec3a73a7c3e6e3968fc8ab659611e9c81
+DIST audacious-plugins-4.0-beta1.tar.bz2 1731865 BLAKE2B 0187137f25b19f672fe580c13ab0050d1968fc95886fa66e42a83ff674e37463f19fc29a0603afc1a0f25b54ae535b12089c44b6c7a45f23022dc71f5a366062 SHA512 4d365967478c926db3c71b68b8c4bf0333da551f1581b01f860d0846162d6f6d1564a9fc627ce3cfcea4e47c02133dbd37407dedc283d9945e60c4f472e9dd41
+EBUILD audacious-plugins-3.10.1.ebuild 4291 BLAKE2B eb44cea093e8395fdd4603a64c88e1449069ed729df9cd1013e2494dbafb789a01e79575a23feb201a9b7a41fe785bceef483537084405134c08037203bf6e4a SHA512 82036373ebe6599ff638f6a4f681c6ad2d442b6d020c8c4b83a4a4185b8a56335c94f02c25c37a02d5b8a8d66cfb50bf3a5df19e163a1f723cfeb6a60eaf8a34
+EBUILD audacious-plugins-3.9-r2.ebuild 3690 BLAKE2B e62cdee5db3cd27a5e75f0db1cfd154dd589a09512930bf2126c2a460a63cd1914aa8cfa4181d0772a738ecde06e9cfaf1cf80efe05d36354fe791c017aef6e8 SHA512 4f1555d09c925c8d950759591e49f5039134dd48f110ba572151caa8579a283df2c46c7433058d9458be682f1cc77ba31b3d6538267c32f475f55276230aba6d
+EBUILD audacious-plugins-4.0_beta1.ebuild 4097 BLAKE2B 37fc776ce81cdbd5614257b278f60e9acb78b86402f07f6d9ac4b9b4df92464fe66691eeef7388420eecb88e8e920c6595004a1965c809d6ccc36acb087d36c2 SHA512 403292d2ebb6e34bcbc69acd8f5bdf34e65c3102e8d70431d5c8e1e484a75d80f7bef546cf860473562ca7085759871b51a1da0a4882569cc57e60d31de4fc7e
+EBUILD audacious-plugins-9999.ebuild 4445 BLAKE2B f2d07e0780bbae46510f5d7f219562d2c29bb5b0430ab5f8a401f96ab8633807c36bb471060092ea0ba4356df4c98a23c2175d9f0389ca26880c01f91854ad09 SHA512 5babc868d4997e962f3c8a25bfa430fa1c64f776215b83d25d945ef5dfc877151eb4dd7dedfdfb97c9fda94d53df407a5374d7d12c069817ff0578a25de9df5c
+MISC metadata.xml 1464 BLAKE2B 203b5318b5e7e9e3a4e2b5804b1085ed384e3467e8ab8c7ea8a110ea2dc0e6e1d027b47d6f02900d3847b9e107dac02a6b71676319cdeffb2252b7671017ac9f SHA512 b56fcde4db2650796f2e7eb0086617950b081cdd77196013444e693b99b1ab2dfb2a6bfdc36149d795d5be84beb80e5a236348f4f473f3158b29e2a72c311126
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.10.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.10.1.ebuild
index c5831e1e045b..23c7267d5bb8 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.10.1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.10.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git"
 else
 	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DESCRIPTION="Lightweight and versatile audio player"
 HOMEPAGE="https://audacious-media-player.org/"
@@ -58,10 +58,10 @@ DEPEND="
 	bs2b? ( media-libs/libbs2b )
 	cdda? (
 		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
+		dev-libs/libcdio-paranoia:=
 		>=media-libs/libcddb-1.2.1
 	)
-	cue? ( media-libs/libcue )
+	cue? ( media-libs/libcue:= )
 	ffmpeg? ( >=virtual/ffmpeg-0.7.3 )
 	flac? (
 		>=media-libs/flac-1.2.1-r1
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.9-r2.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.9-r2.ebuild
index 82afc3d0bfca..93bf6d8de500 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.9-r2.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.9-r2.ebuild
@@ -46,10 +46,10 @@ RDEPEND="
 	bs2b? ( media-libs/libbs2b )
 	cdda? (
 		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
+		dev-libs/libcdio-paranoia:=
 		>=media-libs/libcddb-1.2.1
 	)
-	cue? ( media-libs/libcue )
+	cue? ( media-libs/libcue:= )
 	ffmpeg? ( >=virtual/ffmpeg-0.7.3 )
 	flac? (
 		>=media-libs/flac-1.2.1-r1
diff --git a/media-plugins/audacious-plugins/audacious-plugins-4.0_beta1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-4.0_beta1.ebuild
new file mode 100644
index 000000000000..b815a044cb5f
--- /dev/null
+++ b/media-plugins/audacious-plugins/audacious-plugins-4.0_beta1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${P/_/-}"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git"
+else
+	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+DESCRIPTION="Lightweight and versatile audio player"
+HOMEPAGE="https://audacious-media-player.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac adplug +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth http gme
+	jack lame libav libnotify libsamplerate lirc mms modplug mp3 nls opengl
+	pulseaudio qtmedia scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
+REQUIRED_USE="
+	|| ( alsa jack pulseaudio qtmedia sdl )
+	ampache? ( http )"
+
+# 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
+BDEPEND="
+	dev-util/gdbus-codegen
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )
+"
+DEPEND="
+	app-arch/unzip
+	dev-libs/dbus-glib
+	dev-libs/glib
+	dev-libs/libxml2:2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	~media-sound/audacious-${PV}
+	aac? ( >=media-libs/faad2-2.7 )
+	adplug? ( media-libs/adplug )
+	alsa? ( >=media-libs/alsa-lib-1.0.16 )
+	ampache? ( =media-libs/ampache_browser-1* )
+	bs2b? ( media-libs/libbs2b )
+	cdda? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia:=
+		>=media-libs/libcddb-1.2.1
+	)
+	cue? ( media-libs/libcue:= )
+	ffmpeg? ( >=virtual/ffmpeg-0.7.3 )
+	flac? (
+		>=media-libs/flac-1.2.1-r1
+		>=media-libs/libvorbis-1.0
+	)
+	fluidsynth? ( media-sound/fluidsynth:= )
+	http? ( >=net-libs/neon-0.26.4 )
+	jack? (
+		>=media-libs/bio2jack-0.4
+		virtual/jack
+	)
+	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 )
+	opengl? ( dev-qt/qtopengl:5 )
+	qtmedia? ( dev-qt/qtmultimedia:5 )
+	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 )
+	speedpitch? ( media-libs/libsamplerate:= )
+	vorbis? (
+		>=media-libs/libogg-1.1.3
+		>=media-libs/libvorbis-1.2.0
+	)
+	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	use mp3 || ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
+}
+
+src_prepare() {
+	default
+	if ! use nls; then
+		sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698
+	fi
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-mpris2
+		--enable-qt
+		--enable-songchange
+		--disable-gtk
+		--disable-openmpt # not packaged
+		--disable-oss4
+		--disable-coreaudio
+		--disable-sndio
+		$(use_enable aac)
+		$(use_enable adplug)
+		$(use_enable alsa)
+		$(use_enable ampache)
+		$(use_enable bs2b)
+		$(use_enable cdda cdaudio)
+		$(use_enable cue)
+		$(use_enable flac)
+		$(use_enable flac filewriter)
+		$(use_enable fluidsynth amidiplug)
+		$(use_enable gme console)
+		$(use_enable http neon)
+		$(use_enable jack)
+		$(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 opengl qtglspectrum)
+		$(use_enable pulseaudio pulse)
+		$(use_enable qtmedia qtaudio)
+		$(use_enable scrobbler scrobbler2)
+		$(use_enable sdl sdlout)
+		$(use_enable sid)
+		$(use_enable sndfile)
+		$(use_enable soxr)
+		$(use_enable speedpitch)
+		$(use_enable vorbis)
+		$(use_enable wavpack)
+		$(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg))
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
index c5831e1e045b..8ca80a9cf2be 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
@@ -17,11 +17,14 @@ HOMEPAGE="https://audacious-media-player.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac adplug +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth http gme jack lame libav libnotify libsamplerate
-	lirc mms modplug mp3 nls opengl pulseaudio qt5 qtmedia scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
+IUSE="aac adplug +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gtk http gme
+	jack lame libav libnotify libsamplerate lirc mms modplug mp3 nls opengl
+	pulseaudio qtmedia scrobbler sdl sid sndfile soxr speedpitch streamtuner
+	vorbis wavpack"
 REQUIRED_USE="
 	|| ( alsa jack pulseaudio qtmedia sdl )
-	ampache? ( qt5 http ) qtmedia? ( qt5 )"
+	ampache? ( http )
+	gtk? ( !ampache !qtmedia !streamtuner )"
 
 # The following plugins REQUIRE a GUI build of audacious, because non-GUI
 # builds do NOT install the libaudgui library & headers.
@@ -50,7 +53,7 @@ DEPEND="
 	dev-libs/dbus-glib
 	dev-libs/glib
 	dev-libs/libxml2:2
-	~media-sound/audacious-${PV}[qt5=]
+	~media-sound/audacious-${PV}[gtk=]
 	aac? ( >=media-libs/faad2-2.7 )
 	adplug? ( media-libs/adplug )
 	alsa? ( >=media-libs/alsa-lib-1.0.16 )
@@ -58,16 +61,27 @@ DEPEND="
 	bs2b? ( media-libs/libbs2b )
 	cdda? (
 		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
+		dev-libs/libcdio-paranoia:=
 		>=media-libs/libcddb-1.2.1
 	)
-	cue? ( media-libs/libcue )
+	cue? ( media-libs/libcue:= )
 	ffmpeg? ( >=virtual/ffmpeg-0.7.3 )
 	flac? (
 		>=media-libs/flac-1.2.1-r1
 		>=media-libs/libvorbis-1.0
 	)
 	fluidsynth? ( media-sound/fluidsynth:= )
+	gtk? (
+		x11-libs/gtk+:2
+		x11-libs/libXcomposite
+		x11-libs/libXrender
+	)
+	!gtk? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
 	http? ( >=net-libs/neon-0.26.4 )
 	jack? (
 		>=media-libs/bio2jack-0.4
@@ -81,17 +95,6 @@ DEPEND="
 	modplug? ( media-libs/libmodplug )
 	mp3? ( >=media-sound/mpg123-1.12.1 )
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	!qt5? (
-		x11-libs/gtk+:2
-		x11-libs/libXcomposite
-		x11-libs/libXrender
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
 	qtmedia? ( dev-qt/qtmultimedia:5 )
 	scrobbler? ( net-misc/curl )
 	sdl? ( media-libs/libsdl2[sound] )
@@ -99,6 +102,7 @@ DEPEND="
 	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
 	soxr? ( media-libs/soxr )
 	speedpitch? ( media-libs/libsamplerate:= )
+	streamtuner? ( dev-qt/qtnetwork:5 )
 	vorbis? (
 		>=media-libs/libogg-1.1.3
 		>=media-libs/libvorbis-1.2.0
@@ -109,6 +113,10 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	use mp3 || ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
+}
+
 src_prepare() {
 	default
 	if ! use nls; then
@@ -118,11 +126,10 @@ src_prepare() {
 }
 
 src_configure() {
-	use mp3 || ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-
 	local myeconfargs=(
 		--enable-mpris2
 		--enable-songchange
+		--disable-openmpt # not packaged
 		--disable-oss4
 		--disable-coreaudio
 		--disable-sndio
@@ -137,6 +144,10 @@ src_configure() {
 		$(use_enable flac filewriter)
 		$(use_enable fluidsynth amidiplug)
 		$(use_enable gme console)
+		$(use_enable gtk aosd)
+		$(use_enable gtk gtk)
+		$(use_enable gtk hotkey)
+		$(use_enable !gtk qt)
 		$(use_enable http neon)
 		$(use_enable jack)
 		$(use_enable lame filewriter_mp3)
@@ -148,10 +159,6 @@ src_configure() {
 		$(use_enable mp3 mpg123)
 		$(use_enable nls)
 		$(use_enable pulseaudio pulse)
-		$(use_enable !qt5 aosd)
-		$(use_enable !qt5 gtk)
-		$(use_enable !qt5 hotkey)
-		$(use_enable qt5 qt)
 		$(use_enable qtmedia qtaudio)
 		$(use_enable scrobbler scrobbler2)
 		$(use_enable sdl sdlout)
@@ -159,11 +166,14 @@ src_configure() {
 		$(use_enable sndfile)
 		$(use_enable soxr)
 		$(use_enable speedpitch)
+		$(use_enable streamtuner)
 		$(use_enable vorbis)
 		$(use_enable wavpack)
 		$(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg))
 	)
-	use qt5 && myeconfargs+=( $(usex opengl --enable-qtglspectrum --disable-qtglspectrum) )
+	use !gtk && myeconfargs+=(
+		$(usex opengl --enable-qtglspectrum --disable-qtglspectrum)
+	)
 
 	econf "${myeconfargs[@]}"
 }
diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml
index cdc6bec65c66..ca584bce40c1 100644
--- a/media-plugins/audacious-plugins/metadata.xml
+++ b/media-plugins/audacious-plugins/metadata.xml
@@ -16,12 +16,14 @@
 		<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="gtk">Build with GTK interface instead of Qt5</flag>
 		<flag name="http">Support HTTP streams through neon</flag>
-		<flag name="qt5">Build with Qt5 interface instead Gtk+</flag>
+		<flag name="qt5">Build with Qt5 interface instead of GTK</flag>
 		<flag name="qtmedia">Enable playback via <pkg>dev-qt/qtmultimedia</pkg></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>
 		<flag name="speedpitch">Enable speed/pitch effects</flag>
+		<flag name="streamtuner">Build the streamtuner plugin</flag>
 	</use>
 </pkgmetadata>