gentoo resync : 30.05.2020

4 files changed, 23 insertions, 38 deletions

diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index 9f043b3322fd..1dbef847d01c 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,6 +1,6 @@
 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
-EBUILD audacious-plugins-3.10.1-r2.ebuild 4268 BLAKE2B 89595f04ce408acdbd1ac1603a29727d74e9400db3f41b1715de1935a21f7cb237f3172c674ca3c57fabd855f57b6c539498a87d1c2e2ea29c7d0baff5104d51 SHA512 e9e0a904d12bf6db1042cccfb2fb28a8f96c492df2722e9b9e61c1578b48b7ec7ff9bb472a55f980e06c952122853aad828a860439831dd5efa8b4ba3d7394f7
-EBUILD audacious-plugins-4.0.3.ebuild 4174 BLAKE2B 650562a5f819a58da73f6a291e05ce27f04668d5f9aefb71d63cdeb0cdd583bddf2be27f272849f6d5c907564e89bd9ce8bbd1cd436712b2a7da6c8797f9f3cc SHA512 ff9cc660ed95229aac78010683de5da5ac4aeaaae756561b3b42e551c47bad34bbf1a6d4602ec7234f423194a0404ee05ea003dc233cb94dd5a76b8023bde452
+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 1383 BLAKE2B cbd59fa551c1841640a017477023c49554180f8cb4aa2d4700973da93f7fa3208ea44127c56c7cece22e0542f2ee9f900876e962d4a375d1ddff159bfa59a651 SHA512 4338dbb924441a1f49dd4a37c22089772ca7638966127427d49fe128084ab3790b313edde2f07b73e2a8a48f6fb54369b45e0769273796eeda258a19a3da308c
+MISC metadata.xml 1317 BLAKE2B 49a347b9594d7f9c5fe658313e06205b419899f13af88a3d7ca8b03ffbf6359da8ea4c4645781c248f8f72c889e2e21d125e9469bad22da66df464b3002d2bbc SHA512 8b510eca153c546d9ed25466652b5318b220f9fb6ca3c07c61ecdc5595366bece42d6aeb938d3c522f775d6dd4ad54d60749b43d84dad1441d782628aa70dc3f
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.10.1-r2.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.10.1-r3.ebuild
index d0436f7ae10f..90d1e42911e3 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.10.1-r2.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.10.1-r3.ebuild
@@ -17,11 +17,9 @@ HOMEPAGE="https://audacious-media-player.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac +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"
-REQUIRED_USE="
-	|| ( alsa jack pulseaudio qtmedia sdl )
-	ampache? ( qt5 http ) qtmedia? ( qt5 )"
+IUSE="aac +alsa bs2b cdda cue ffmpeg flac fluidsynth http gme jack lame libnotify libsamplerate
+	lirc mms modplug mp3 nls opengl pulseaudio scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
+REQUIRED_USE="|| ( alsa jack pulseaudio sdl )"
 
 # The following plugins REQUIRE a GUI build of audacious, because non-GUI
 # builds do NOT install the libaudgui library & headers.
@@ -50,10 +48,12 @@ DEPEND="
 	dev-libs/dbus-glib
 	dev-libs/glib
 	dev-libs/libxml2:2
-	~media-sound/audacious-${PV}[qt5=]
+	~media-sound/audacious-${PV}[-qt5(-)]
+	x11-libs/gtk+:2
+	x11-libs/libXcomposite
+	x11-libs/libXrender
 	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:=
@@ -80,18 +80,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] )
 	sid? ( >=media-libs/libsidplayfp-1.0.0 )
@@ -122,13 +110,18 @@ src_configure() {
 	local myeconfargs=(
 		--enable-mpris2
 		--enable-songchange
+		--enable-aosd
+		--enable-gtk
+		--enable-hotkey
 		--disable-adplug # not packaged
-		--disable-oss4
+		--disable-ampache # needs Qt5
 		--disable-coreaudio
+		--disable-oss4
+		--disable-qt
+		--disable-qtaudio
 		--disable-sndio
 		$(use_enable aac)
 		$(use_enable alsa)
-		$(use_enable ampache)
 		$(use_enable bs2b)
 		$(use_enable cdda cdaudio)
 		$(use_enable cue)
@@ -147,11 +140,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)
 		$(use_enable sid)
@@ -160,9 +148,8 @@ src_configure() {
 		$(use_enable speedpitch)
 		$(use_enable vorbis)
 		$(use_enable wavpack)
-		$(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg))
+		$(use_with ffmpeg ffmpeg ffmpeg)
 	)
-	use qt5 && myeconfargs+=( $(usex opengl --enable-qtglspectrum --disable-qtglspectrum) )
 
 	econf "${myeconfargs[@]}"
 }
diff --git a/media-plugins/audacious-plugins/audacious-plugins-4.0.3.ebuild b/media-plugins/audacious-plugins/audacious-plugins-4.0.3.ebuild
index a911f9f7c86c..5dc53ffed93c 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-4.0.3.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-4.0.3.ebuild
@@ -10,17 +10,16 @@ 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/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack
-	lame libav libnotify libsamplerate lirc mms modplug mp3 nls opengl
-	pulseaudio qtmedia scrobbler sdl sid sndfile soxr speedpitch streamtuner
-	vorbis wavpack"
+IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack lame
+	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 )"
@@ -159,7 +158,7 @@ src_configure() {
 		$(use_enable streamtuner)
 		$(use_enable vorbis)
 		$(use_enable wavpack)
-		$(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg))
+		$(use_with ffmpeg ffmpeg ffmpeg)
 	)
 
 	econf "${myeconfargs[@]}"
diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml
index 7fee56dc3a5c..02bd0208b848 100644
--- a/media-plugins/audacious-plugins/metadata.xml
+++ b/media-plugins/audacious-plugins/metadata.xml
@@ -17,7 +17,6 @@
 		<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 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>