summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2012-11-16 09:45:58 +0000
committerUlrich Müller <ulm@gentoo.org>2012-11-16 09:45:58 +0000
commitc7a84d089b065e10ff1c04bea9df2d0d5da994b6 (patch)
treeae8dfc64a3e38adcd24008f843c1c1337bf86e9f /profiles
parentmedia-gfx/nvidia-cg-toolkit: Don't add binary packages to global linker searc... (diff)
downloadgentoo-2-c7a84d089b065e10ff1c04bea9df2d0d5da994b6.tar.gz
gentoo-2-c7a84d089b065e10ff1c04bea9df2d0d5da994b6.tar.bz2
gentoo-2-c7a84d089b065e10ff1c04bea9df2d0d5da994b6.zip
Remove JamesClark from MISC-FREE license group, duplicate of MIT.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/license_groups4
2 files changed, 6 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 911a3cdc98ff..47e8c44514f8 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7148 2012/11/16 06:49:13 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7149 2012/11/16 09:45:58 ulm Exp $
#
# This ChangeLog should include records for all changes in profiles directory.
# Only typo fixes which don't affect portage/repoman behaviour could be avoided
# here. If in doubt put a record here!
+ 16 Nov 2012; Ulrich Müller <ulm@gentoo.org> license_groups:
+ Remove JamesClark from MISC-FREE license group, duplicate of MIT.
+
16 Nov 2012; Hans de Graaff <graaff@gentoo.org> package.mask:
Remove mask for experimental gherkin slots, now removed from the tree.
diff --git a/profiles/license_groups b/profiles/license_groups
index 5145c099062d..ce53041ef727 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.137 2012/11/04 20:49:38 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.138 2012/11/16 09:45:58 ulm Exp $
# Please report bugs or other requests at bugs.gentoo.org and assign to
# licenses@gentoo.org
@@ -25,7 +25,7 @@ OSI-APPROVED AFL-3.0 AGPL-3 Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artist
# Licenses in this list should NOT appear directly or indirectly in @FSF-APPROVED or @OSI-APPROVED
# TODO: maybe add a category for BSD-alike MISC-FREE licenses for easy seperation?
# BSD-4 alikes: dom4j FastCGI icu jaxen JDOM saxpath
-MISC-FREE Allegro ANTLR as-is bea.ri.jsr173 BEER-WARE BSD-1 BZIP2 CDDL-Schily CMake CPL-0.5 CRACKLIB cryptopp czyborra dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI FLEX FLTK freemarker FVWM gnuplot gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP ipadic JamesClark JasPer2.0 jaxen JDOM JNIC JOVE libpng LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib md2k7-asyouwish mplus-fonts NCSA-HDF noweb OpenSoftware otter perforce PHP-2.02 Princeton pysqlite rc RSA saxpath Scintilla Sendmail skype-4.0.0.7-third-party_attributions.txt SMAIL Subversion SVFL tcp_wrappers_license TeX TeX-other-free UbuntuFontLicense-1.0 vlgothic w3m wxWinLL-3 Xdebug xtrs YaTeX zpaq ZSH
+MISC-FREE Allegro ANTLR as-is bea.ri.jsr173 BEER-WARE BSD-1 BZIP2 CDDL-Schily CMake CPL-0.5 CRACKLIB cryptopp czyborra dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI FLEX FLTK freemarker FVWM gnuplot gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP ipadic JasPer2.0 jaxen JDOM JNIC JOVE libpng LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib md2k7-asyouwish mplus-fonts NCSA-HDF noweb OpenSoftware otter perforce PHP-2.02 Princeton pysqlite rc RSA saxpath Scintilla Sendmail skype-4.0.0.7-third-party_attributions.txt SMAIL Subversion SVFL tcp_wrappers_license TeX TeX-other-free UbuntuFontLicense-1.0 vlgothic w3m wxWinLL-3 Xdebug xtrs YaTeX zpaq ZSH
# The following are NOT valid in @MISC-FREE:
# arj - usage restrictions
# freedist - Doesn't grant the right to do modifications.