gentoo resync : 14.05.2020

5 files changed, 12 insertions, 24 deletions

diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index 04f41b15e5e6..a0897d2e55e8 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -2,8 +2,8 @@ AUX mgba-0.8.0-no_sdl.patch 1465 BLAKE2B 07ca5575da44b787ee1a25c41558f7e198bb89b
 DIST mgba-0.7.3.tar.gz 11228977 BLAKE2B 2b70bb97470558e6c10391b782f0f80e0466b2f16df07971ed378801d359157692ce56c61f4432640ed679d43dc2445a1ea45b3402c1b488fb534213d8594271 SHA512 131f850699f17a7496f7428b85b50f38b99acec4c87d5d28ba4e3af94f095a1b6d177ea731838b2971362b46c52accef9cbec98433ecfaccc080371092c7d789
 DIST mgba-0.8.0.tar.gz 11797469 BLAKE2B ddf1e7fe291c3bab0391a916e2e34b1adc280d6eb40ac730a5b6fe754f947061709103c480658f1fe90f9677a5cc7334200e6b16bc73d22bb178c93e8ef51de8 SHA512 47a267f7998535bbbe1fafb6e2a4d708bdafe9601f7bd50f16f37d79d78a991d49d360a2a571fc6b09ddd21450244a8c0bc37aa08d5e38b4896c25cc6f615bb2
 DIST mgba-0.8.1.tar.gz 11893993 BLAKE2B 0b5db35927111a23defaf33ea67b00613c01302940db8bfe6c21aab4ec39bdb089ddbd6238ca7ccd35010724b058f78cee3ca3cbc6d7fbe0047f25a152b208fa SHA512 7873bde6a74e8a1509a3b5bba602da1c747ca1eff72adcf11f7b2572298d94766570fea0b920cb28c8b63a7d8237a15876b9feb9169edbf331b2d72f340734e2
-EBUILD mgba-0.7.3.ebuild 2479 BLAKE2B 13c131f9073caef9a9aad3f0df1ae9a97fe424bd7595d95e821bcdc0983daff8a5902ca41191744b8104ce1fa1ea76f926f19e9c325fd5a6b42802b2a68e6ea1 SHA512 43b04d3c46ea1390653302b2bb8890d8db4cf6bc1f226b1863096272d5cf0e01fe46e0232f47f4e5d597e6510ed4ef671127c3753510c5c959d5fbac9906943c
-EBUILD mgba-0.8.0.ebuild 2579 BLAKE2B e1cbd44cc6400193eee9b41866ac582258d5be07d7c64b9e4b03845023ea6170a759d66b564de8dd3738a3c1493563c5cd0c18c0f1414c17a7cf872557562cba SHA512 d09c0620feb178d48a485ab15701e16b3f72a42b757402a75b7251965f317c912dc07cfe9ed9aa8e8a89d1fe7a81a04d1e47d6827671a9b1b80e4c1fe23e2197
-EBUILD mgba-0.8.1.ebuild 2525 BLAKE2B 5ae6a32fb577471e4f056af23dc933c32c2c4c2cd219032f6d758d419d4825b9ebd737156d398d2ffc754266256bd98e150907bffc5eb54df2e59399e086e96a SHA512 6b30157b4b45440526707a97e6b3f96918b523453b2068738ecfcef5de6ee8c0eda60b9efcbb9362471614a4bbc58146e3acabe4c8f21cf5217af349b0f51c65
-EBUILD mgba-9999.ebuild 2525 BLAKE2B 5ae6a32fb577471e4f056af23dc933c32c2c4c2cd219032f6d758d419d4825b9ebd737156d398d2ffc754266256bd98e150907bffc5eb54df2e59399e086e96a SHA512 6b30157b4b45440526707a97e6b3f96918b523453b2068738ecfcef5de6ee8c0eda60b9efcbb9362471614a4bbc58146e3acabe4c8f21cf5217af349b0f51c65
+EBUILD mgba-0.7.3.ebuild 2425 BLAKE2B cfa4b58b92702bf6a5e9d29f1f2428c78c9523b553a752ed8ff3707b5bcb1bb618b8bc2276eea95aa608172fe7b8bb579040d6e2838d2b38cd084d41144d6a13 SHA512 4e6332c4ac92832354ae6509b8d8ab512d6353e6df30e73ae9e1158fa907a9c96e214417cdebec51506e89e482504cb254cd8cdd1d37de3903d7f00c2b932d7a
+EBUILD mgba-0.8.0.ebuild 2525 BLAKE2B 4d4b24c5b4e0310505b3f779642c03f4455949f58f453542d0d210c9bf128959cccca9ddb15c9c246567fa340f95dca33762eb93cd03cc1b31428e13bea065b7 SHA512 e7cf1dd6e6283d819b59080a7812946fb290ab4534c2dab7c9feb4437dbc501f166f41f863668b3d23b9a620dc352ea57653e4d7fe129253902d0c62bbb59086
+EBUILD mgba-0.8.1.ebuild 2471 BLAKE2B b3cb801563d30d76ae973fc34ed752620463918d36f3ccdbab67dd7999656264dd26cbc7be1be450ee1d2571473f97d0b26d21d33a189f5a7b35cd2fe517885c SHA512 a94de95d49f83096808b4b0ba927ad751dfbf0951c84d3698fa51f25377e5946b488b02ab96f866e8460524ee8bef456ee9c9087fc41da27cd1b9913df4138d4
+EBUILD mgba-9999.ebuild 2471 BLAKE2B b3cb801563d30d76ae973fc34ed752620463918d36f3ccdbab67dd7999656264dd26cbc7be1be450ee1d2571473f97d0b26d21d33a189f5a7b35cd2fe517885c SHA512 a94de95d49f83096808b4b0ba927ad751dfbf0951c84d3698fa51f25377e5946b488b02ab96f866e8460524ee8bef456ee9c9087fc41da27cd1b9913df4138d4
 MISC metadata.xml 504 BLAKE2B c297828f1153ba0fa214bd849c22af964f8d5c0134f361956c80ea6239424aeb5eeb83f98a65dc7c924f9f7238223064fa25b3ee048e0e456fb9cdc432500b17 SHA512 2f481e401b55e4aa7089851c9869ec9aee349321a0f720b038e673f3f815c59be9c4cd0db667330ca1273bc7ebaf9671733e2b53e9f2fc34bc655709fbebca15
diff --git a/games-emulation/mgba/mgba-0.7.3.ebuild b/games-emulation/mgba/mgba-0.7.3.ebuild
index 9f37db304634..bf269f2432fb 100644
--- a/games-emulation/mgba/mgba-0.7.3.ebuild
+++ b/games-emulation/mgba/mgba-0.7.3.ebuild
@@ -16,7 +16,7 @@ else
 fi
 LICENSE="MPL-2.0"
 SLOT="0"
-IUSE="debug elf ffmpeg imagemagick libav opengl qt5 +sdl sqlite"
+IUSE="debug elf ffmpeg imagemagick opengl qt5 +sdl sqlite"
 REQUIRED_USE="|| ( qt5 sdl )
 		qt5? ( opengl )"
 
@@ -24,10 +24,7 @@ RDEPEND="
 	media-libs/libpng:0=
 	sys-libs/zlib[minizip]
 	elf? ( dev-libs/elfutils )
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:= )
-	)
+	ffmpeg? ( media-video/ffmpeg:= )
 	imagemagick? ( media-gfx/imagemagick:= )
 	opengl? ( virtual/opengl )
 	qt5? (
diff --git a/games-emulation/mgba/mgba-0.8.0.ebuild b/games-emulation/mgba/mgba-0.8.0.ebuild
index 15a46f8a7006..c8853a7ffd1b 100644
--- a/games-emulation/mgba/mgba-0.8.0.ebuild
+++ b/games-emulation/mgba/mgba-0.8.0.ebuild
@@ -19,7 +19,7 @@ else
 fi
 LICENSE="MPL-2.0"
 SLOT="0"
-IUSE="debug discord elf ffmpeg libav opengl qt5 +sdl sqlite"
+IUSE="debug discord elf ffmpeg opengl qt5 +sdl sqlite"
 REQUIRED_USE="|| ( qt5 sdl )
 		qt5? ( opengl )"
 
@@ -27,10 +27,7 @@ RDEPEND="
 	media-libs/libpng:0=
 	sys-libs/zlib[minizip]
 	elf? ( dev-libs/elfutils )
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:= )
-	)
+	ffmpeg? ( media-video/ffmpeg:= )
 	opengl? ( virtual/opengl )
 	qt5? (
 		dev-qt/qtcore:5
diff --git a/games-emulation/mgba/mgba-0.8.1.ebuild b/games-emulation/mgba/mgba-0.8.1.ebuild
index 1200fa57ed49..be2689f439b2 100644
--- a/games-emulation/mgba/mgba-0.8.1.ebuild
+++ b/games-emulation/mgba/mgba-0.8.1.ebuild
@@ -19,7 +19,7 @@ else
 fi
 LICENSE="MPL-2.0"
 SLOT="0"
-IUSE="debug discord elf ffmpeg libav opengl qt5 +sdl sqlite"
+IUSE="debug discord elf ffmpeg opengl qt5 +sdl sqlite"
 REQUIRED_USE="|| ( qt5 sdl )
 		qt5? ( opengl )"
 
@@ -27,10 +27,7 @@ RDEPEND="
 	media-libs/libpng:0=
 	sys-libs/zlib[minizip]
 	elf? ( dev-libs/elfutils )
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:= )
-	)
+	ffmpeg? ( media-video/ffmpeg:= )
 	opengl? ( virtual/opengl )
 	qt5? (
 		dev-qt/qtcore:5
diff --git a/games-emulation/mgba/mgba-9999.ebuild b/games-emulation/mgba/mgba-9999.ebuild
index 1200fa57ed49..be2689f439b2 100644
--- a/games-emulation/mgba/mgba-9999.ebuild
+++ b/games-emulation/mgba/mgba-9999.ebuild
@@ -19,7 +19,7 @@ else
 fi
 LICENSE="MPL-2.0"
 SLOT="0"
-IUSE="debug discord elf ffmpeg libav opengl qt5 +sdl sqlite"
+IUSE="debug discord elf ffmpeg opengl qt5 +sdl sqlite"
 REQUIRED_USE="|| ( qt5 sdl )
 		qt5? ( opengl )"
 
@@ -27,10 +27,7 @@ RDEPEND="
 	media-libs/libpng:0=
 	sys-libs/zlib[minizip]
 	elf? ( dev-libs/elfutils )
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:= )
-	)
+	ffmpeg? ( media-video/ffmpeg:= )
 	opengl? ( virtual/opengl )
 	qt5? (
 		dev-qt/qtcore:5