gentoo resync : 12.05.2022

3 files changed, 4 insertions, 8 deletions

diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index b50930376962..78cefd74f64c 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,5 +1,5 @@
 AUX dolphin-5.0_p20210506-musl.patch 779 BLAKE2B 5f962082cf58377801a266ec987417b731332e31ce6d79bb8e66204f6299dc1912aea760a9545ac671b090e6a3625c54b9e00583695790bd5c51ba54d524e0d7 SHA512 7a611de89b84e0f706c37d2aacdfb62cb4115098ad1b31daa4e40bd47e3793ab59f626fced184965361ba776891a63d02d66a54f8b69f675b6b88047a283bd9e
 DIST dolphin-5.0_p20210506.tar.gz 42098693 BLAKE2B bb9e5b5eb344bd944753c0198d5835109399fdfae46e6858833e5f279ff1979d39e0c512bedb96a91a1241fff525c6f945d16ce1a6b6cc22798490d73b853862 SHA512 5d23e9356995011a0e7b07622d58c8dddc5134a4ec83b3d9343b9eca8d0d2c200ea8c9a299c6aa2550ca74d8e28e258531368f7c167fe620053eb2a0f73b1f2f
-EBUILD dolphin-5.0_p20210506-r3.ebuild 4472 BLAKE2B 0f0aca8dc6006577c4a3502c5eafad8a2b53ffc3db9eb0e075f1ecc94d57fa1c449c9873daeceb64dacf4cda0b89a441d958a410b53bc074c83e85c1fc11bdf5 SHA512 a6a2693218edcdc36d3d984237e51984e648d71d850390b52cd8c903c2edab5c7bb9fa11b375adfa16ce60fdc6475d729d56b20f52f213bb19182fbded5788be
-EBUILD dolphin-9999.ebuild 4581 BLAKE2B 0916ddcb96434f5bc1d024c02c50d736b43ef1ff705a4d812d56fa50b081b16da818d4dcdfe3aaaa21a5d3b5e502e7435dace176c1e6d62870a62253cc606ffd SHA512 3a950ba0209df836b60524e87744fb948eebdf842ccf74ce672773a5876a50ab061b7c1a2aacaa919a6bb79b892b990061f1a376958b20111992695c4a7def83
+EBUILD dolphin-5.0_p20210506-r3.ebuild 4464 BLAKE2B 55c1c06f54b6f1b0cb97d17bfc79e88fe639f0a11c4d6c67e77b51576b4cab883a9f64410805ebb99ffdcb70b75bad1e0abfe9b621f3e10e46202b194873d153 SHA512 2078b5dd79e4828ef4685351cd5764ca0dfdceec6c3db11405d1636e1385d8536b1bd06f5a571f8f460304c398164c458e52994f3a31f6e741bd726aca130aa3
+EBUILD dolphin-9999.ebuild 4581 BLAKE2B d4f3db6f02d525e954df6d0e702794561388164333b3a8fe1ff87b20055b41e5d85908769cf2e2d9f8c9b470525636cf64b426bba6d764c4d4e58bfd828d06f9 SHA512 541ceff0c46f76d6de91dbbf2e83be76dbc729fa65debe2a2c7980687d6a5e60de1e225b9380ea21d0bad17d7f4bb1d587201fc9d5e9df9c64f4692d6e58e421
 MISC metadata.xml 1014 BLAKE2B dd84038010d16d37449491e1df7236b95a7dc30097264a9f9d1a542b59feffe3b1e6a6dba318fe856eaac7b7470a1c316c5378dabcccd8ef6f7f101f5ee683c5 SHA512 87b4cb7475697d7fad526c3dcae604aa9d4f8facf68b0bcdbb1c931a839c998a34977acdd1aec9cacfa7f9a8b7d3f9e33d6f1253a0f1899fa2e3439f1ebc08a6
diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild b/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
index ec22c67307fc..33218b7db9b5 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
@@ -21,8 +21,7 @@ fi
 DESCRIPTION="Gamecube and Wii game emulator"
 HOMEPAGE="https://dolphin-emu.org/"
 
-# NB: appended below
-LICENSE="GPL-2+"
+LICENSE="GPL-2+ Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT ZLIB"
 SLOT="0"
 IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg +gui log
 	profile pulseaudio systemd upnp vulkan"
@@ -108,7 +107,6 @@ declare -A KEEP_BUNDLED=(
 	# No code to detect shared library.
 	[zstd]=BSD
 )
-LICENSE+=" ${KEEP_BUNDLED[*]}"
 
 src_prepare() {
 	cmake_src_prepare
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
index a6b3ce256bbc..c62f0305347a 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.ebuild
@@ -22,8 +22,7 @@ fi
 DESCRIPTION="Gamecube and Wii game emulator"
 HOMEPAGE="https://dolphin-emu.org/"
 
-# NB: appended below
-LICENSE="GPL-2+"
+LICENSE="GPL-2+ Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 ZLIB"
 SLOT="0"
 IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg +gui log mgba
 	profile pulseaudio systemd upnp vulkan"
@@ -110,7 +109,6 @@ declare -A KEEP_BUNDLED=(
 	# This is a stripped-down mGBA for integrated GBA support
 	[mGBA]=MPL-2.0
 )
-LICENSE+=" ${KEEP_BUNDLED[*]}"
 
 src_prepare() {
 	cmake_src_prepare