gentoo Easter resync : 12.04.2020

4 files changed, 13 insertions, 158 deletions

diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index 50bbd264666b..6d235fb79594 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,8 +1,6 @@
 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
-DIST audacious-plugins-4.0-beta1.tar.bz2 1731865 BLAKE2B 0187137f25b19f672fe580c13ab0050d1968fc95886fa66e42a83ff674e37463f19fc29a0603afc1a0f25b54ae535b12089c44b6c7a45f23022dc71f5a366062 SHA512 4d365967478c926db3c71b68b8c4bf0333da551f1581b01f860d0846162d6f6d1564a9fc627ce3cfcea4e47c02133dbd37407dedc283d9945e60c4f472e9dd41
+DIST audacious-plugins-4.0.tar.bz2 1741569 BLAKE2B 2be0bd0d48cda51788286385a1c75d9f9d5701fff325dab7fe0f63560051690f023d8e27d24d33b87aefeaa0d54cc5e6240736511d9b547aad9d260da0e9f471 SHA512 f9f7d249ff5b8337729ce59b24ec249b96842ed9986a6a42a4de179bed44a431316537311a5514d652c0f847d7e849afd18e0bb2a2a5628d24cc6d449c52095c
 EBUILD audacious-plugins-3.10.1-r1.ebuild 4264 BLAKE2B 7f428c8cb876672ef3190116b2d4fe11db5c3eb8e1695bc7122742f6f4321f58cb517542d3b2d73419e6032e2f444c62e45b7d4b0769ff0bb29d6b9a99d2694e SHA512 16ad541dd629fb5ac68851d2e7563b4e334addf53664a6c87da64f797c33b102fbdc7371ae189389500f296b47c339f2800bb408ffc2860dd4823cb33a030f44
-EBUILD audacious-plugins-3.9-r3.ebuild 3671 BLAKE2B e0e93e78dbe7a6e6795e1c5b24c1c30074f28c030b07a5303a390d5777f638532ed21bbd8824ebc023a72ee4bd76775011aa5d494426107d80869e0b903a3bd7 SHA512 6ae9a476365d60fed86bb8abf35e76955325a8192f58d732b4525ccbed52428a866825ee91209407aea6d1ea4a2859d940816c1b225a04be4e2ed07ace6965fb
-EBUILD audacious-plugins-4.0_beta1-r1.ebuild 4070 BLAKE2B 9ad765a0ae4daa19589cb5157f1fb7444ff3678f2993c1784b7559c5a2fdb5cdcf18bb180bdeecfc1969cdef7503c93a08bc01c362c6345f8718da51745b94d8 SHA512 d1b27a6b82a08a71d07dd0e3292262212a8105f9e5a1790b8d208cbcc4d85df560cacfe497552512d53e105784284eda1804cc461ce563888143bb9e2dbcee6a
-EBUILD audacious-plugins-9999.ebuild 4418 BLAKE2B a5d038850a7c486f3f08ae31f7e68d1c6b2349b08696eece5fc43905039c7cbe4a673664404c185d11eeb00eb5b1792cdc985d1d3ef13598f38db07cac1f41f1 SHA512 fb8cdeea416777f761e828e61367f565ea74882aebf8dea22a14e5a092665f1b50fe7badac79aac6d14de63d3364a9113a7806c806d8b69c6a4fd54d59adff37
+EBUILD audacious-plugins-4.0.ebuild 4170 BLAKE2B 4896885c16c2c9c45a0b81bd88ff1652e03d98be1b1804f6a18d634bfdbbf7d497ccbac458c86dc6796593d61caefd0d2ee563fee659075cecc547dbe2f3ada4 SHA512 ee5bde622419a840f4d038f4767dfc0152ae29d8f6b301799ff9286e3afe1fc24a1770028d503deb55ba0613ab3a8dc77464210efc91e0006043b492c57067fc
+EBUILD audacious-plugins-9999.ebuild 4440 BLAKE2B bdff723274a39f9073e1ed2d8255ea8a0333f25f7ad678e762128d66477707b0f9f04e906433193da5ed7ab6f0f6f0acd534aef0032b0ce14e46c8ad2d03d2cf SHA512 29bfda58cfed858a64440c18eed2941b51de9af1aa36159026305d9a789fb65c0d4bb539a38c8eddfddc7d5d7eaa678f363fd74282cfc5b774ffdcbfa25ffb1b
 MISC metadata.xml 1383 BLAKE2B cbd59fa551c1841640a017477023c49554180f8cb4aa2d4700973da93f7fa3208ea44127c56c7cece22e0542f2ee9f900876e962d4a375d1ddff159bfa59a651 SHA512 4338dbb924441a1f49dd4a37c22089772ca7638966127427d49fe128084ab3790b313edde2f07b73e2a8a48f6fb54369b45e0769273796eeda258a19a3da308c
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.9-r3.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.9-r3.ebuild
deleted file mode 100644
index 795d2dc4be8c..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-3.9-r3.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Lightweight and versatile audio player"
-HOMEPAGE="https://audacious-media-player.org/"
-SRC_URI="https://distfiles.audacious-media-player.org/${P}-gtk3.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="aac +alsa bs2b cdda cue ffmpeg flac fluidsynth gnome http gme jack lame libav libnotify libsamplerate
-	lirc mms modplug mp3 nls 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.
-# 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
-	dev-libs/libxml2:2
-	~media-sound/audacious-${PV}
-	x11-libs/gtk+:3
-	x11-libs/libXcomposite
-	x11-libs/libXrender
-	aac? ( >=media-libs/faad2-2.7 )
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	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 )
-	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 )
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )
-"
-
-S="${WORKDIR}/${P}-gtk3"
-
-src_prepare() {
-	default
-	if ! use nls; then
-		sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698
-	fi
-}
-
-src_configure() {
-	use mp3 || ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-
-	local myeconfargs=(
-		--enable-aosd
-		--enable-gtk
-		--enable-hotkey
-		--enable-mpris2
-		--enable-songchange
-		--disable-ampache
-		--disable-oss4
-		--disable-qt
-		--disable-qtaudio
-		--disable-qtglspectrum
-		--disable-coreaudio
-		--disable-sndio
-		$(use_enable aac)
-		$(use_enable alsa)
-		$(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 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 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-4.0_beta1-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-4.0.ebuild
index 1a3e8873b7b8..9344bbc04686 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-4.0_beta1-r1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-4.0.ebuild
@@ -17,12 +17,13 @@ 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 qtmedia scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
+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"
 REQUIRED_USE="
 	|| ( alsa jack pulseaudio qtmedia sdl )
-	ampache? ( http )"
+	ampache? ( http ) streamtuner? ( http )"
 
 # The following plugins REQUIRE a GUI build of audacious, because non-GUI
 # builds do NOT install the libaudgui library & headers.
@@ -83,8 +84,8 @@ DEPEND="
 	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 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
 	qtmedia? ( dev-qt/qtmultimedia:5 )
 	scrobbler? ( net-misc/curl )
 	sdl? ( media-libs/libsdl2[sound] )
@@ -92,6 +93,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
@@ -154,6 +156,7 @@ 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))
diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
index f67ab2bfe3f9..e2f2a9f90094 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
@@ -17,13 +17,13 @@ HOMEPAGE="https://audacious-media-player.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gtk http gme
+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 )
+	ampache? ( http ) streamtuner? ( http )
 	gtk? ( !ampache !qtmedia !streamtuner )"
 
 # The following plugins REQUIRE a GUI build of audacious, because non-GUI