Skip to content

Commit

Permalink
games-emulation/dolphin: Don't use variable in LICENSE
Browse files Browse the repository at this point in the history
Closes: https://bugs.gentoo.org/840598
Signed-off-by: James Le Cuirot <[email protected]>
  • Loading branch information
chewi committed Apr 27, 2022
1 parent 401f81f commit cb0810b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
4 changes: 1 addition & 3 deletions games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -108,7 +107,6 @@ declare -A KEEP_BUNDLED=(
# No code to detect shared library.
[zstd]=BSD
)
LICENSE+=" ${KEEP_BUNDLED[*]}"

src_prepare() {
cmake_src_prepare
Expand Down
4 changes: 1 addition & 3 deletions games-emulation/dolphin/dolphin-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit cb0810b

Please sign in to comment.