Add new license group MISC-FREE-DOCS for free documentation and other non-software. Move font licenses from MISC-FREE to it.

1 files changed, 20 insertions, 7 deletions

diff --git a/profiles/license_groups b/profiles/license_groups
index bd3f71229c97..bbebf328935d 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -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/profiles/license_groups,v 1.161 2013/01/02 23:22:40 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.162 2013/01/03 16:20:15 ulm Exp $
 
 # Please report bugs or other requests at bugs.gentoo.org and assign to
 # licenses@gentoo.org
@@ -8,6 +8,8 @@
 # GLEP-0023
 # http://www.gentoo.org/proj/en/glep/glep-0023.html
 
+######################################################################
+
 # http://www.gnu.org/licenses/license-list.html
 # GPL or LGPL with various exceptions are also included here, because
 # they are more permissive than the licenses they are based on.
@@ -22,10 +24,13 @@ OSI-APPROVED AFL-3.0 AGPL-3 Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artist
 # Free Software Definition at http://www.gnu.org/philosophy/free-sw.html
 # but are not approved by either FSF or OSI. Preferably on the long
 # term these should be cleared up and moved to other sets.
-# 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?
+# Licenses in this list should NOT appear directly or indirectly in
+# @FSF-APPROVED or @OSI-APPROVED.
+# Note: Licenses for fonts should be included in @MISC-FREE-DOCS.
+# TODO: maybe add a category for BSD-alike MISC-FREE licenses for easy
+# separation?
 # BSD-4 alikes: dom4j FastCGI icu JDOM
-MISC-FREE Allegro ANTLR as-is bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution bufexplorer.vim BZIP2 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB cryptopp czyborra docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh FLEX FLTK freemarker FVWM gnuplot gsm HTML-Tidy htmlc iASL IBPP-1.1 icu IDPL IJG imagemagick Info-ZIP inner-net ipadic Ispell JasPer2.0 JDOM JNIC JOVE libmng libpng libtiff LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib md2k7-asyouwish MIT-with-advertising mplus-fonts NCSA-HDF noweb openafs-krb5-a OpenSoftware Openwall otter PCRE perforce PHP-2.02 Princeton psutils pysqlite rc regexp-UofT RSA Scintilla Sendmail skype-4.0.0.7-third-party_attributions.txt SMAIL SNIA SSLeay Subversion SVFL tcltk 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 boehm-gc BSD-1 BSD-with-attribution bufexplorer.vim BZIP2 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB cryptopp czyborra docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh FLEX FLTK freemarker FVWM gnuplot gsm HTML-Tidy htmlc iASL IBPP-1.1 icu IDPL IJG imagemagick Info-ZIP inner-net ipadic Ispell JasPer2.0 JDOM JNIC JOVE libmng libpng libtiff LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib md2k7-asyouwish MIT-with-advertising NCSA-HDF noweb openafs-krb5-a OpenSoftware Openwall otter PCRE perforce PHP-2.02 Princeton psutils pysqlite rc regexp-UofT RSA Scintilla Sendmail skype-4.0.0.7-third-party_attributions.txt SMAIL SNIA SSLeay Subversion SVFL tcltk tcp_wrappers_license TeX TeX-other-free 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.
@@ -34,13 +39,21 @@ MISC-FREE Allegro ANTLR as-is bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-at
 # Metaset for all free software
 FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE
 
+######################################################################
+
 # FSF-approved licenses for "free documentation" and "works of
 # practical use besides software and documentation" (including fonts)
 FSF-APPROVED-OTHER Arphic CCPL-Attribution-2.0 CCPL-Attribution-ShareAlike-2.0 DSL FDL-1.1 FDL-1.1+ FDL-1.2 FDL-1.2+ FDL-1.3 FDL-1.3+ FreeArt GPL-1 GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ OFL OFL-1.1 OPL
 
-# Licenses for free documents, following the definition at
-# http://freedomdefined.org/
-FREE-DOCUMENTS @FSF-APPROVED-OTHER BitstreamVera CC-PD CCPL-Attribution-2.5 CCPL-Attribution-3.0 CCPL-Attribution-ShareAlike-2.5 CCPL-Attribution-ShareAlike-3.0 CCPL-ShareAlike-1.0 LDP-1 LDP-1a man-pages man-pages-posix MaxMind2 myspell-en_CA-KevinAtkinson Texinfo-manual wxWinFDL-3
+# Misc licenses for free documents and other works (including fonts)
+# that follow the definition at http://freedomdefined.org/ but are NOT
+# listed in @FSF-APPROVED-OTHER.
+MISC-FREE-DOCS BitstreamVera CC-PD CCPL-Attribution-2.5 CCPL-Attribution-3.0 CCPL-Attribution-ShareAlike-2.5 CCPL-Attribution-ShareAlike-3.0 CCPL-ShareAlike-1.0 LDP-1 LDP-1a man-pages man-pages-posix MaxMind2 mplus-fonts myspell-en_CA-KevinAtkinson Texinfo-manual UbuntuFontLicense-1.0 vlgothic wxWinFDL-3
+
+# Metaset for all free documents
+FREE-DOCUMENTS @FSF-APPROVED-OTHER @MISC-FREE-DOCS
+
+######################################################################
 
 # Collection of all licenses with the freedom to use, share, modify
 # and share modifications