gentoo resync : 25.08.2020

4 files changed, 4 insertions, 172 deletions

diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index ee2ecc99a083..7469cb561290 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-4.0.3.tar.bz2 1759123 BLAKE2B 7a389a1d8f1bc17ce53e4e8c2560291c00b305ca0988f7ee27ce8a15d4be200d380a3525d43d1c04f6de9d7653f73c91721ba985801dc49dfa64b56309145f9b SHA512 6aaf9ca1d70e211e779baa65de844118f2e3c5ecef2ce6342429748e64437ddc67286ea286fbd7b0282304747dab31972f73ccb0aa312968c19d832ac0e0a6fc
-DIST audacious-plugins-4.0.4.tar.bz2 1761281 BLAKE2B 36f77d19e2cac461cd5649589bc4cb19a76577c30d5de4015688da5bf21efe1c835e1160534bc377e9a6f495fc9c2650544cc6c7bafac61c2f7187991a4d7935 SHA512 d0b435658f5aff9318e521e85d335444e089f80a267c2b9391123365b1c95b535bfa668ea772d9c437ad2611288ec7961a2ecf1d8cf8687f3b32a3cb1e14ddf8
+DIST audacious-plugins-4.0.5.tar.bz2 1759133 BLAKE2B b806ac110875f94f6e0f1db757d2ec0c7a0391f83efeb068f3e79c7e994fa33d0045095669b5e7ec771714419aaa98b0d0125a5dd18a00f4ee23fc899142858f SHA512 90ab2edbfc797fa835aae9937b5f478a0ca575f31c443d9e8ba7394e1615f605beb417372872874c94d4f804dba7bea9fbae2078e162178386683d8a3e36c108
 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-4.0.4.ebuild 4070 BLAKE2B 720c0ce91402ad2fef3c60411eb675c09c173f2bd7fb50213ff244c86a1eb67713a8d8d4db7adebb1012465321659a623eeb83e98f6009e4d65e729a910c541b SHA512 7c84ea8b62ad9d9d570ce182ddf35391a547bb3a6990d536de157b08eeea4af2e2ffcd5fa8a707b701472d28f194eaefa182eb37b5d464daf3a5697c9124d3e8
+EBUILD audacious-plugins-4.0.5.ebuild 4068 BLAKE2B 468e953d5fbea584ae362fad99d08a011d10b463c7f22b327330b686b681da6f6a73d1a095c72b842088bd9b2de6c527870cee13282377f5d192e692c69e6230 SHA512 23cb363fd553122f519264d0f8fb1447d80248eb75fa6d9ed5a1e232a9a687dc23bd3df4f2416ae3e032cb4ab7ad40f32500c16006f63c63a4ac39e1b6931f9b
 EBUILD audacious-plugins-9999.ebuild 4128 BLAKE2B a4d64f7a16659e1cc4c939a9503756dfdc9f1297cdcf82e65204e768df1e6599596d4633ed2f2fdb406a01ca01c225ff73340051a92a81dcff63bc76a2b984d8 SHA512 c7c8861f1af4d563326ca9513101d48148c92fc0b90a545303cc8849e30debf689beb757dbb305f48606e3788832cb84dcda0af1a4e9511ae44ba0914ba7c3ac
-MISC metadata.xml 1251 BLAKE2B 1b67d43427b19c320e46b134c1780048def69a124aaa0c6d47ee1a55c7738a896cffae3a1f52fc2c5103d9d064fe6281d50f6bdcc839c046118b41b59f353d75 SHA512 145522b449bda87e294a0a63e95f4d12634695feea5d9d6f703079c9f742e7736cc232ecc7726e1d14740689b188ee473299d4fa5045e488f2fea5a4b4071d8e
+MISC metadata.xml 1170 BLAKE2B 80fb35c45bc273f65371a109969418bc8be28f23e2e5db6f78c0118b6c805975df1e689fc9c98ac47593e7da14546160a27c23a6534aa48ffdfc6a6323d0ad46 SHA512 b59877387bf2cdebdc227e0ca12b9b4cbfadaac816278d15e2ecde3e74f2a7af9d0af5d232972a311fdc7a0746b49136e60fc720c4fc4a86121e56c194a872a8
diff --git a/media-plugins/audacious-plugins/audacious-plugins-4.0.3.ebuild b/media-plugins/audacious-plugins/audacious-plugins-4.0.3.ebuild
deleted file mode 100644
index 5dc53ffed93c..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-4.0.3.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# 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 qtmedia
-	scrobbler sdl sid sndfile soxr speedpitch streamtuner vorbis wavpack"
-REQUIRED_USE="
-	|| ( alsa jack pulseaudio qtmedia sdl )
-	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/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 )
-	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:= )
-	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-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 qtmedia qtaudio)
-		$(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-4.0.4.ebuild b/media-plugins/audacious-plugins/audacious-plugins-4.0.5.ebuild
index 76a54c61081b..e606a1dd99ad 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-4.0.4.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-4.0.5.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/"
diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml
index 30eb5c5c92d9..7ed1e8c94e0d 100644
--- a/media-plugins/audacious-plugins/metadata.xml
+++ b/media-plugins/audacious-plugins/metadata.xml
@@ -16,7 +16,6 @@
 		<flag name="fluidsynth">Support FluidSynth as MIDI synth backend</flag>
 		<flag name="gme">Support various gaming console music formats</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>
 		<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
 		<flag name="soxr">Build with SoX Resampler support</flag>