gentoo resync : 14.05.2020

5 files changed, 14 insertions, 26 deletions

diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 97bafbef0ecc..4f2cb113e45f 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,8 +1,8 @@
 DIST qmmp-1.3.2.tar.bz2 1221919 BLAKE2B 3081aa6b3ef4712ea064d5bb23e9ac7da5e102fde820c378438c13723bd007fe8e79ac351b0ad01ca0aa22c50f6b6773965ce418742cf1386d2ae1d7ba7b1758 SHA512 5c68d87650abf10d03dc8638df73a6694e470af1121a936bb983bcbcea04d95616ad8a55d87e8874b51b7424a890dad2c5353afe65db7029f6513a382e2144e4
-DIST qmmp-1.3.5.tar.bz2 1248522 BLAKE2B f59b948fc2805b376784cef429693bf2d70ba21af8699959a31b74e2c4aad2499927b48f4e5ae6166c9d9f35132418717dff8f3f9d9d447af411d97700932236 SHA512 fbf4173e6dcd78e02ee52e53d80f4477bd840047f96ef8c0bd23f56eec5efa11ac52cc458cfeae65b46cda357b986ba30e1ec4e06d35f4f96cab9a915095d735
-DIST qmmp-1.3.6.tar.bz2 1250131 BLAKE2B ddcce7f55dddfb667c2a2005172c5b8de2f11babb8cd18114099416c1c916048e525262fb25c5e994d0b21b4fa23a308be973bf4cb731e64ee300849700a7d70 SHA512 83600b3116a62200d6751b4c6a526cd0af842b943d8d2979e16803ad788ee826a52a25ac0736f337a8fa739affcba361e6cfd1947c5135aef963d128dcb7e3b9
-EBUILD qmmp-1.3.2-r1.ebuild 4257 BLAKE2B d5b73b6d30e1b01f5a113079b9510852e9f5c83ea4dc7f40f7918adaea36fb27ae7a2f8341e34ca6f4d25b07056c22ac27082c64d21d20c64dd6a44bda1256c4 SHA512 36dbde290c0d57d2481bb79b3f4ae24bc743a01e614ab77c6443a4af82cba716fef9ad9146c6f4d27270658d2d26a13dfc77777e8c565f8d2871758a168d176f
-EBUILD qmmp-1.3.5-r1.ebuild 4231 BLAKE2B 4e016f2ceba435464481b9a8e3efbaa36eaf7f8430cd7367e0aa9a60327848328992ee60abac06a45c847c1945617be4e7ef6355849180d57da73b27319987e3 SHA512 088d02e2695a4d69138d861dc0ed8a38d74ef5c40881bbc4068ecacc190e9912908fffeedbda9277b9b02f6c0582344a8b6d49b2a2607167e55ac54c940cf06f
-EBUILD qmmp-1.3.6-r1.ebuild 4231 BLAKE2B 4e016f2ceba435464481b9a8e3efbaa36eaf7f8430cd7367e0aa9a60327848328992ee60abac06a45c847c1945617be4e7ef6355849180d57da73b27319987e3 SHA512 088d02e2695a4d69138d861dc0ed8a38d74ef5c40881bbc4068ecacc190e9912908fffeedbda9277b9b02f6c0582344a8b6d49b2a2607167e55ac54c940cf06f
-EBUILD qmmp-9999.ebuild 4231 BLAKE2B 4e016f2ceba435464481b9a8e3efbaa36eaf7f8430cd7367e0aa9a60327848328992ee60abac06a45c847c1945617be4e7ef6355849180d57da73b27319987e3 SHA512 088d02e2695a4d69138d861dc0ed8a38d74ef5c40881bbc4068ecacc190e9912908fffeedbda9277b9b02f6c0582344a8b6d49b2a2607167e55ac54c940cf06f
+DIST qmmp-1.3.7.tar.bz2 1250192 BLAKE2B bb94234beefbe44606d8db8cc95bd712b4c766d498c1de0549414b728fd9eb88e238bcffde9a3bd74e75adf106b6bf4fcb120547a83892c0bca8da17bf18f2ee SHA512 a67185fcdc7419c8542e64fd54eea3302dcf44c5d8d0c3b739ce3115b00811733234807460d39585ee57b7e105a52285ee3aafa9f24d86d2af09e881ebf2e068
+DIST qmmp-1.4.0.tar.bz2 1293438 BLAKE2B 9da3a00a31dd0ad03f3405dbae65f55d7b4fbde2a3a030d2cbe8d11ac9b5660754e519aff19431dada792f2ebb02e40fa05e177ad6bedc37e3aa5d7e2a441642 SHA512 b4ae764c223e1ce28477e86493ba409429e191ff51ef11d9b7c4fa356f90e5ff7e390bc8d1dcaf7779b231d59bf668d64000ea196b4020a7255eeb009706643d
+EBUILD qmmp-1.3.2-r1.ebuild 4203 BLAKE2B b2ef63f7fc9f580b9acba8fbb91ceb243a701c23813cbf827a9304700fcc1c2ec2f2ac60d842d55280ee6cef61615f7ed9d19521d7494ee7703e951164f4fa62 SHA512 261846c7d2a4ec4a0d2f10b2aec542deac3ef6f6fc11b606fe880e9c2ff3c0416c6f9e44d0a8e712e7f87e0252ce09bae6f13ec60bbd5f63eb20a01055690046
+EBUILD qmmp-1.3.7.ebuild 4177 BLAKE2B 6697495dc802bd80a4f754974feb9adf2a0f1caf90c9e794a5cfbe538952490113db003787e23c68ef67496acc73afe92f837447afffb092ca8dc18b7613f165 SHA512 ce5e8de71be4b72e6aad59fd859dcf85457eacfc7aa7941e607539b738c40c8e7db4737cf6f68113ba0e22960675ba955245d46348e92adf430cda18539bc185
+EBUILD qmmp-1.4.0.ebuild 4177 BLAKE2B 6697495dc802bd80a4f754974feb9adf2a0f1caf90c9e794a5cfbe538952490113db003787e23c68ef67496acc73afe92f837447afffb092ca8dc18b7613f165 SHA512 ce5e8de71be4b72e6aad59fd859dcf85457eacfc7aa7941e607539b738c40c8e7db4737cf6f68113ba0e22960675ba955245d46348e92adf430cda18539bc185
+EBUILD qmmp-9999.ebuild 4177 BLAKE2B 6697495dc802bd80a4f754974feb9adf2a0f1caf90c9e794a5cfbe538952490113db003787e23c68ef67496acc73afe92f837447afffb092ca8dc18b7613f165 SHA512 ce5e8de71be4b72e6aad59fd859dcf85457eacfc7aa7941e607539b738c40c8e7db4737cf6f68113ba0e22960675ba955245d46348e92adf430cda18539bc185
 MISC metadata.xml 1821 BLAKE2B 7be33caff246653b25e3f211638a6a4da075ee1edf6605ad802b533db4cd649bad69a6bbfdf27c1cf203873362f30591fa4b72851db600e4f3040bcd0df80295 SHA512 17b548bd21cc90817f2e5c710bdb22c527350bf2e3b4ac91070d0578a34e0acf371a97fedfb62287628c5c21b53912712fcbf00a4e66e5a3debad565536a722c
diff --git a/media-sound/qmmp/qmmp-1.3.2-r1.ebuild b/media-sound/qmmp/qmmp-1.3.2-r1.ebuild
index 56dd403d4ac0..f11837f77b72 100644
--- a/media-sound/qmmp/qmmp-1.3.2-r1.ebuild
+++ b/media-sound/qmmp/qmmp-1.3.2-r1.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-2"
 SLOT="0"
 # KEYWORDS further up
 IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
-gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
 pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
 
 REQUIRED_USE="
@@ -51,10 +51,7 @@ RDEPEND="
 	curl? ( net-misc/curl )
 	dbus? ( dev-qt/qtdbus:5 )
 	enca? ( app-i18n/enca )
-	ffmpeg? (
-		!libav? ( media-video/ffmpeg:= )
-		libav? ( media-video/libav:= )
-	)
+	ffmpeg? ( media-video/ffmpeg:= )
 	flac? ( media-libs/flac )
 	game? ( media-libs/game-music-emu )
 	jack? (
diff --git a/media-sound/qmmp/qmmp-1.3.5-r1.ebuild b/media-sound/qmmp/qmmp-1.3.7.ebuild
index 1cb8b262455d..4c02d12db02d 100644
--- a/media-sound/qmmp/qmmp-1.3.5-r1.ebuild
+++ b/media-sound/qmmp/qmmp-1.3.7.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-2"
 SLOT="0"
 # KEYWORDS further up
 IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
-gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
 pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
 
 REQUIRED_USE="
@@ -50,10 +50,7 @@ RDEPEND="
 	curl? ( net-misc/curl )
 	dbus? ( dev-qt/qtdbus:5 )
 	enca? ( app-i18n/enca )
-	ffmpeg? (
-		!libav? ( media-video/ffmpeg:= )
-		libav? ( media-video/libav:= )
-	)
+	ffmpeg? ( media-video/ffmpeg:= )
 	flac? ( media-libs/flac )
 	game? ( media-libs/game-music-emu )
 	jack? (
diff --git a/media-sound/qmmp/qmmp-1.3.6-r1.ebuild b/media-sound/qmmp/qmmp-1.4.0.ebuild
index 1cb8b262455d..4c02d12db02d 100644
--- a/media-sound/qmmp/qmmp-1.3.6-r1.ebuild
+++ b/media-sound/qmmp/qmmp-1.4.0.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-2"
 SLOT="0"
 # KEYWORDS further up
 IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
-gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
 pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
 
 REQUIRED_USE="
@@ -50,10 +50,7 @@ RDEPEND="
 	curl? ( net-misc/curl )
 	dbus? ( dev-qt/qtdbus:5 )
 	enca? ( app-i18n/enca )
-	ffmpeg? (
-		!libav? ( media-video/ffmpeg:= )
-		libav? ( media-video/libav:= )
-	)
+	ffmpeg? ( media-video/ffmpeg:= )
 	flac? ( media-libs/flac )
 	game? ( media-libs/game-music-emu )
 	jack? (
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index 1cb8b262455d..4c02d12db02d 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-2"
 SLOT="0"
 # KEYWORDS further up
 IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
-gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
 pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
 
 REQUIRED_USE="
@@ -50,10 +50,7 @@ RDEPEND="
 	curl? ( net-misc/curl )
 	dbus? ( dev-qt/qtdbus:5 )
 	enca? ( app-i18n/enca )
-	ffmpeg? (
-		!libav? ( media-video/ffmpeg:= )
-		libav? ( media-video/libav:= )
-	)
+	ffmpeg? ( media-video/ffmpeg:= )
 	flac? ( media-libs/flac )
 	game? ( media-libs/game-music-emu )
 	jack? (