gentoo resync : 13.06.2020

4 files changed, 184 insertions, 33 deletions

diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index 1dbef847d01c..ee2ecc99a083 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-4.0.3.tar.bz2 1759123 BLAKE2B 7a389a1d8f1bc17ce53e4e8c2560291c00b305ca0988f7ee27ce8a15d4be200d380a3525d43d1c04f6de9d7653f73c91721ba985801dc49dfa64b56309145f9b SHA512 6aaf9ca1d70e211e779baa65de844118f2e3c5ecef2ce6342429748e64437ddc67286ea286fbd7b0282304747dab31972f73ccb0aa312968c19d832ac0e0a6fc
+DIST audacious-plugins-4.0.4.tar.bz2 1761281 BLAKE2B 36f77d19e2cac461cd5649589bc4cb19a76577c30d5de4015688da5bf21efe1c835e1160534bc377e9a6f495fc9c2650544cc6c7bafac61c2f7187991a4d7935 SHA512 d0b435658f5aff9318e521e85d335444e089f80a267c2b9391123365b1c95b535bfa668ea772d9c437ad2611288ec7961a2ecf1d8cf8687f3b32a3cb1e14ddf8
 EBUILD audacious-plugins-3.10.1-r3.ebuild 3849 BLAKE2B c829fdcb6a41aad4cf807ccf0719a1877789a06e1811fa64a574dad26838723cbafacf6645235417e2b68cecfeb2bb66b4a3d061816fcab8e554a8bc34a9c5c9 SHA512 7b5710f309e15c2e465531edf626238faa607369f2a46fb0b4defe3523286f04ae897c6016c0c4ff1f540e8701e7ee9ca15921840b32c8ae001257793b3dfd0d
 EBUILD audacious-plugins-4.0.3.ebuild 4145 BLAKE2B e05a4040a1c2f61f111ce4f4f3ef1e60c3e4594a292bc989dfc467fb8aefd2b30cfaca1576ef7ec582d1c851b89b75381e5a52a991809c75923629c5b3cd762c SHA512 5f6dae8d50a5a3641d27fa8edfe47b9fd5f56e05d984522a913c2211bc2885f45cc92a81ada71611220072166ec62122009804b086b6aeecfa898d68c2bc39de
-EBUILD audacious-plugins-9999.ebuild 4444 BLAKE2B 7d6b475ded94f7fcfe9ae74efb3a8558cd599686c14c02ed0498e2b8945e791392cc269bdeb28f437f4ec7671a396fae37e2d6680e7ba4fae4df438ab4a0626e SHA512 21c95c887368cf14dd32a2fe6405d02f66ab17e53163b6d9660e61adf99f31330f4e5a40e9be1abc14b2b88e14064e7472cca80c08b768a194edd5c16a878e88
-MISC metadata.xml 1317 BLAKE2B 49a347b9594d7f9c5fe658313e06205b419899f13af88a3d7ca8b03ffbf6359da8ea4c4645781c248f8f72c889e2e21d125e9469bad22da66df464b3002d2bbc SHA512 8b510eca153c546d9ed25466652b5318b220f9fb6ca3c07c61ecdc5595366bece42d6aeb938d3c522f775d6dd4ad54d60749b43d84dad1441d782628aa70dc3f
+EBUILD audacious-plugins-4.0.4.ebuild 4070 BLAKE2B 720c0ce91402ad2fef3c60411eb675c09c173f2bd7fb50213ff244c86a1eb67713a8d8d4db7adebb1012465321659a623eeb83e98f6009e4d65e729a910c541b SHA512 7c84ea8b62ad9d9d570ce182ddf35391a547bb3a6990d536de157b08eeea4af2e2ffcd5fa8a707b701472d28f194eaefa182eb37b5d464daf3a5697c9124d3e8
+EBUILD audacious-plugins-9999.ebuild 4128 BLAKE2B a4d64f7a16659e1cc4c939a9503756dfdc9f1297cdcf82e65204e768df1e6599596d4633ed2f2fdb406a01ca01c225ff73340051a92a81dcff63bc76a2b984d8 SHA512 c7c8861f1af4d563326ca9513101d48148c92fc0b90a545303cc8849e30debf689beb757dbb305f48606e3788832cb84dcda0af1a4e9511ae44ba0914ba7c3ac
+MISC metadata.xml 1251 BLAKE2B 1b67d43427b19c320e46b134c1780048def69a124aaa0c6d47ee1a55c7738a896cffae3a1f52fc2c5103d9d064fe6281d50f6bdcc839c046118b41b59f353d75 SHA512 145522b449bda87e294a0a63e95f4d12634695feea5d9d6f703079c9f742e7736cc232ecc7726e1d14740689b188ee473299d4fa5045e488f2fea5a4b4071d8e
diff --git a/media-plugins/audacious-plugins/audacious-plugins-4.0.4.ebuild b/media-plugins/audacious-plugins/audacious-plugins-4.0.4.ebuild
new file mode 100644
index 000000000000..76a54c61081b
--- /dev/null
+++ b/media-plugins/audacious-plugins/audacious-plugins-4.0.4.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2020 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 +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack
+	lame libnotify libsamplerate lirc mms modplug mp3 nls opengl pulseaudio
+	scrobbler sdl sid sndfile soxr speedpitch streamtuner vorbis wavpack"
+REQUIRED_USE="ampache? ( http ) streamtuner? ( 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/qtmultimedia:5
+	dev-qt/qtwidgets:5
+	~media-sound/audacious-${PV}
+	aac? ( >=media-libs/faad2-2.7 )
+	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? ( >=media-video/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 )
+	opengl? ( dev-qt/qtopengl:5 )
+	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 )
+	speedpitch? ( media-libs/libsamplerate:= )
+	streamtuner? ( dev-qt/qtnetwork:5 )
+	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-qtaudio
+		--enable-songchange
+		--disable-adplug # not packaged
+		--disable-gtk
+		--disable-openmpt # not packaged
+		--disable-oss4
+		--disable-coreaudio
+		--disable-sndio
+		$(use_enable aac)
+		$(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 scrobbler scrobbler2)
+		$(use_enable sdl sdlout)
+		$(use_enable sid)
+		$(use_enable sndfile)
+		$(use_enable soxr)
+		$(use_enable speedpitch)
+		$(use_enable streamtuner)
+		$(use_enable vorbis)
+		$(use_enable wavpack)
+		$(use_with ffmpeg ffmpeg ffmpeg)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
index f9b1ea0ec287..b915d2ebe95b 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
@@ -17,14 +17,10 @@ HOMEPAGE="https://audacious-media-player.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme gtk http
-	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? ( http ) streamtuner? ( http )
-	gtk? ( !ampache !qtmedia !streamtuner )"
+IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack
+	lame libnotify libsamplerate lirc mms modplug mp3 nls opengl pulseaudio
+	scrobbler sdl sid sndfile soxr speedpitch streamtuner vorbis wavpack X"
+REQUIRED_USE="ampache? ( http ) streamtuner? ( http )"
 
 # The following plugins REQUIRE a GUI build of audacious, because non-GUI
 # builds do NOT install the libaudgui library & headers.
@@ -53,7 +49,11 @@ DEPEND="
 	dev-libs/dbus-glib
 	dev-libs/glib
 	dev-libs/libxml2:2
-	~media-sound/audacious-${PV}[gtk=]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtwidgets:5
+	~media-sound/audacious-${PV}
 	aac? ( >=media-libs/faad2-2.7 )
 	alsa? ( >=media-libs/alsa-lib-1.0.16 )
 	ampache? ( =media-libs/ampache_browser-1* )
@@ -70,17 +70,6 @@ DEPEND="
 		>=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
@@ -93,8 +82,8 @@ DEPEND="
 	mms? ( >=media-libs/libmms-0.3 )
 	modplug? ( media-libs/libmodplug )
 	mp3? ( >=media-sound/mpg123-1.12.1 )
+	opengl? ( dev-qt/qtopengl:5 )
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	qtmedia? ( dev-qt/qtmultimedia:5 )
 	scrobbler? ( net-misc/curl )
 	sdl? ( media-libs/libsdl2[sound] )
 	sid? ( >=media-libs/libsidplayfp-1.0.0 )
@@ -107,6 +96,7 @@ DEPEND="
 		>=media-libs/libvorbis-1.2.0
 	)
 	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
+	X? ( dev-qt/qtx11extras:5 )
 "
 RDEPEND="${DEPEND}"
 
@@ -127,8 +117,11 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		--enable-mpris2
+		--enable-qt
+		--enable-qtaudio
 		--enable-songchange
 		--disable-adplug # not packaged
+		--disable-gtk
 		--disable-openmpt # not packaged
 		--disable-oss4
 		--disable-coreaudio
@@ -143,10 +136,6 @@ 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)
@@ -157,8 +146,8 @@ src_configure() {
 		$(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)
@@ -168,10 +157,8 @@ src_configure() {
 		$(use_enable streamtuner)
 		$(use_enable vorbis)
 		$(use_enable wavpack)
-		$(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg))
-	)
-	use !gtk && myeconfargs+=(
-		$(usex opengl --enable-qtglspectrum --disable-qtglspectrum)
+		$(use_enable X qthotkey)
+		$(use_with ffmpeg ffmpeg ffmpeg)
 	)
 
 	econf "${myeconfargs[@]}"
diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml
index 02bd0208b848..30eb5c5c92d9 100644
--- a/media-plugins/audacious-plugins/metadata.xml
+++ b/media-plugins/audacious-plugins/metadata.xml
@@ -15,7 +15,6 @@
 		<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="qtmedia">Enable playback via <pkg>dev-qt/qtmultimedia</pkg></flag>
 		<flag name="scrobbler">Build with scrobbler/LastFM submission support</flag>