1 |
commit: cb0810b6683c41e9f179c32f86844f4c7fbb9898 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 27 22:09:55 2022 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 27 22:09:55 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb0810b6 |
7 |
|
8 |
games-emulation/dolphin: Don't use variable in LICENSE |
9 |
|
10 |
Closes: https://bugs.gentoo.org/840598 |
11 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
12 |
|
13 |
games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild | 4 +--- |
14 |
games-emulation/dolphin/dolphin-9999.ebuild | 4 +--- |
15 |
2 files changed, 2 insertions(+), 6 deletions(-) |
16 |
|
17 |
diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild b/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild |
18 |
index ec22c67307fc..33218b7db9b5 100644 |
19 |
--- a/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild |
20 |
+++ b/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild |
21 |
@@ -21,8 +21,7 @@ fi |
22 |
DESCRIPTION="Gamecube and Wii game emulator" |
23 |
HOMEPAGE="https://dolphin-emu.org/" |
24 |
|
25 |
-# NB: appended below |
26 |
-LICENSE="GPL-2+" |
27 |
+LICENSE="GPL-2+ Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT ZLIB" |
28 |
SLOT="0" |
29 |
IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg +gui log |
30 |
profile pulseaudio systemd upnp vulkan" |
31 |
@@ -108,7 +107,6 @@ declare -A KEEP_BUNDLED=( |
32 |
# No code to detect shared library. |
33 |
[zstd]=BSD |
34 |
) |
35 |
-LICENSE+=" ${KEEP_BUNDLED[*]}" |
36 |
|
37 |
src_prepare() { |
38 |
cmake_src_prepare |
39 |
|
40 |
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild |
41 |
index a6b3ce256bbc..c62f0305347a 100644 |
42 |
--- a/games-emulation/dolphin/dolphin-9999.ebuild |
43 |
+++ b/games-emulation/dolphin/dolphin-9999.ebuild |
44 |
@@ -22,8 +22,7 @@ fi |
45 |
DESCRIPTION="Gamecube and Wii game emulator" |
46 |
HOMEPAGE="https://dolphin-emu.org/" |
47 |
|
48 |
-# NB: appended below |
49 |
-LICENSE="GPL-2+" |
50 |
+LICENSE="GPL-2+ Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 ZLIB" |
51 |
SLOT="0" |
52 |
IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg +gui log mgba |
53 |
profile pulseaudio systemd upnp vulkan" |
54 |
@@ -110,7 +109,6 @@ declare -A KEEP_BUNDLED=( |
55 |
# This is a stripped-down mGBA for integrated GBA support |
56 |
[mGBA]=MPL-2.0 |
57 |
) |
58 |
-LICENSE+=" ${KEEP_BUNDLED[*]}" |
59 |
|
60 |
src_prepare() { |
61 |
cmake_src_prepare |