From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 49D64158B20 for ; Sat, 01 Feb 2025 20:07:28 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 2B223343106 for ; Sat, 01 Feb 2025 20:07:28 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 2BA8511046F; Sat, 01 Feb 2025 20:07:27 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 1D9601103B6 for ; Sat, 01 Feb 2025 20:07:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C0E0E343106 for ; Sat, 01 Feb 2025 20:07:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2C5C618F6 for ; Sat, 01 Feb 2025 20:07:25 +0000 (UTC) From: "strategictraveler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "strategictraveler" Message-ID: <1738440413.11d3671efe81ed8697c006f438dc917d566c1bcb.strategictraveler@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: games-roguelike/cataclysm-dda/ X-VCS-Repository: repo/proj/guru X-VCS-Files: games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild X-VCS-Directories: games-roguelike/cataclysm-dda/ X-VCS-Committer: strategictraveler X-VCS-Committer-Name: strategictraveler X-VCS-Revision: 11d3671efe81ed8697c006f438dc917d566c1bcb X-VCS-Branch: dev Date: Sat, 01 Feb 2025 20:07:25 +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: f2ba5bc2-0202-4fff-80f3-7f325ce77cae X-Archives-Hash: 081c93b224cbf787472c49abd14bd7c9 commit: 11d3671efe81ed8697c006f438dc917d566c1bcb Author: strategictraveler proton me> AuthorDate: Sat Feb 1 19:55:43 2025 +0000 Commit: strategictraveler proton me> CommitDate: Sat Feb 1 20:06:53 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=11d3671e games-roguelike/cataclysm-dda: update LICENSE Show main license first, make soundpack license USE-conditional. Add BSD license as per upstream d7e135a. Signed-off-by: strategictraveler proton.me> games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild | 3 +-- games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild b/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild index 231250609..94a7b52cc 100644 --- a/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild +++ b/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild @@ -29,8 +29,7 @@ else KEYWORDS="~amd64" fi -# CC-BY-SA-4.0 for soundpack -LICENSE="Apache-2.0 CC-BY-SA-3.0 CC-BY-SA-4.0 MIT OFL-1.1 Unicode-3.0" +LICENSE="CC-BY-SA-3.0 Apache-2.0 soundpack? ( CC-BY-SA-4.0 ) MIT OFL-1.1 Unicode-3.0" IUSE="debug doc ncurses nls +sound +soundpack test +tiles" REQUIRED_USE="soundpack? ( sound ) sound? ( tiles ) \ || ( tiles ncurses )" diff --git a/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild b/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild index 7d79bbd73..7ab9d3db1 100644 --- a/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild +++ b/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild @@ -29,8 +29,7 @@ else KEYWORDS="~amd64" fi -# CC-BY-SA-4.0 for soundpack -LICENSE="Apache-2.0 CC-BY-SA-3.0 CC-BY-SA-4.0 MIT OFL-1.1 Unicode-3.0" +LICENSE="CC-BY-SA-3.0 Apache-2.0 BSD soundpack? ( CC-BY-SA-4.0 ) MIT OFL-1.1 Unicode-3.0" IUSE="debug doc ncurses nls +sound +soundpack test +tiles" REQUIRED_USE="soundpack? ( sound ) sound? ( tiles ) \ || ( tiles ncurses )"