summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2013-11-25 22:15:53 +0000
committerJulian Ospald <hasufell@gentoo.org>2013-11-25 22:15:53 +0000
commit61cc974589bf99df29ddba5872bb1afa6cca3976 (patch)
tree50dfe16a3bef35785b2a555afd67394b72555c28 /games-fps
parentversion bump (bug #483364) (diff)
downloadgentoo-2-61cc974589bf99df29ddba5872bb1afa6cca3976.tar.gz
gentoo-2-61cc974589bf99df29ddba5872bb1afa6cca3976.tar.bz2
gentoo-2-61cc974589bf99df29ddba5872bb1afa6cca3976.zip
fix licenses wrt #476366
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Diffstat (limited to 'games-fps')
-rw-r--r--games-fps/tremulous/ChangeLog5
-rw-r--r--games-fps/tremulous/tremulous-1.1.0-r4.ebuild13
2 files changed, 15 insertions, 3 deletions
diff --git a/games-fps/tremulous/ChangeLog b/games-fps/tremulous/ChangeLog
index 729196f27c1c..c47541baf292 100644
--- a/games-fps/tremulous/ChangeLog
+++ b/games-fps/tremulous/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for games-fps/tremulous
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/tremulous/ChangeLog,v 1.26 2013/08/18 12:25:43 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/tremulous/ChangeLog,v 1.27 2013/11/25 22:15:53 hasufell Exp $
+
+ 25 Nov 2013; Julian Ospald <hasufell@gentoo.org> tremulous-1.1.0-r4.ebuild:
+ fix licenses wrt #476366
18 Aug 2013; Alfredo Tupone <tupone@gentoo.org>
files/tremulous-1.1.0-ldflags.patch:
diff --git a/games-fps/tremulous/tremulous-1.1.0-r4.ebuild b/games-fps/tremulous/tremulous-1.1.0-r4.ebuild
index 34b99e3c0929..7342d48cf295 100644
--- a/games-fps/tremulous/tremulous-1.1.0-r4.ebuild
+++ b/games-fps/tremulous/tremulous-1.1.0-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/tremulous/tremulous-1.1.0-r4.ebuild,v 1.11 2013/02/07 22:07:55 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/tremulous/tremulous-1.1.0-r4.ebuild,v 1.12 2013/11/25 22:15:53 hasufell Exp $
EAPI=4
@@ -14,7 +14,16 @@ SRC_URI="http://dl.trem-servers.com/${PN}-gentoopatches-${PV}-r5.zip
ftp://ftp.wireplay.co.uk/pub/quake3arena/mods/${PN}/${P}.zip
mirror://sourceforge/${PN}/${P}.zip"
-LICENSE="GPL-2 CC-BY-SA-2.5"
+# most media: CC-BY-SA-2.5
+# shaderlab textures: shaderlab (relicensed to CC-BY-SA-2.5 wrt
+# http://lists.debian.org/debian-legal/2006/04/msg00229.html)
+# textures by yves allaire: CC-BY-ND-NC-1.0
+# most part of the code: GPL-2
+# src/game/bg_lib.c: BSD
+# src/qcommon/unzip.c: ZLIB
+# src/jpeg-6/* and src/renderer/jpeg_memsrc.c: IJG
+# src/client/snd_adpcm.c: HPND
+LICENSE="BSD CC-BY-NC-ND-1.0 CC-BY-SA-2.5 GPL-2 HPND IJG ZLIB"
SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE="dedicated openal +opengl +vorbis"