From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9F58C15808E for ; Wed, 27 Apr 2022 22:10:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C953AE08A2; Wed, 27 Apr 2022 22:10:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A2E17E08A2 for ; Wed, 27 Apr 2022 22:10:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 85FDE341743 for ; Wed, 27 Apr 2022 22:10:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EDD8735A for ; Wed, 27 Apr 2022 22:10:20 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1651097395.cb0810b6683c41e9f179c32f86844f4c7fbb9898.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild games-emulation/dolphin/dolphin-9999.ebuild X-VCS-Directories: games-emulation/dolphin/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: cb0810b6683c41e9f179c32f86844f4c7fbb9898 X-VCS-Branch: master Date: Wed, 27 Apr 2022 22:10:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 36766580-fec1-47d3-9014-71f89031e2fd X-Archives-Hash: c0109a3880c1cec457f8c1a0eafa0823 commit: cb0810b6683c41e9f179c32f86844f4c7fbb9898 Author: James Le Cuirot gentoo org> AuthorDate: Wed Apr 27 22:09:55 2022 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Wed Apr 27 22:09:55 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb0810b6 games-emulation/dolphin: Don't use variable in LICENSE Closes: https://bugs.gentoo.org/840598 Signed-off-by: James Le Cuirot gentoo.org> games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild | 4 +--- games-emulation/dolphin/dolphin-9999.ebuild | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) 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