commit:     11d3671efe81ed8697c006f438dc917d566c1bcb
Author:     strategictraveler <strategictraveler <AT> proton <DOT> me>
AuthorDate: Sat Feb  1 19:55:43 2025 +0000
Commit:     strategictraveler <strategictraveler <AT> proton <DOT> 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 <strategictraveler <AT> 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 )"

Reply via email to