Move all GPL*with*exception* type licenses to the GPL-COMPATIBLE group. Remove GPL-2-with-Linden-Lab-FLOSS-exception, it was removed from the tree.

2 files changed, 8 insertions, 4 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 1ef658a7bb22..adb17a69ee64 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for profile directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5925 2011/11/18 20:58:46 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5926 2011/11/18 21:36:38 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!
 
+  18 Nov 2011; Ulrich Mueller <ulm@gentoo.org> license_groups:
+  Move all GPL*with*exception* type licenses to the GPL-COMPATIBLE group.
+  Remove GPL-2-with-Linden-Lab-FLOSS-exception, it was removed from the tree.
+
   18 Nov 2011; Anthony G. Basile <blueness@gentoo.org> +hardened/README:
   Added README explaining the deprecation of old hardened/arches profiles
 
diff --git a/profiles/license_groups b/profiles/license_groups
index d3afa6795a83..2393e2dae537 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.86 2011/11/14 20:08:30 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.87 2011/11/18 21:36:38 ulm Exp $
 
 # Please report bugs or other requests at bugs.gentoo.org and assign to
 # licenses@gentoo.org
@@ -9,7 +9,7 @@
 # http://www.gentoo.org/proj/en/glep/glep-0023.html
 
 # http://www.fsf.org/licensing/licenses/
-GPL-COMPATIBLE AGPL-3 Apache-2.0 Artistic-2 as-is Boost-1.0 BSD BSD-2 CeCILL-2 Clarified-Artistic DB FTL gcc-runtime-library-exception-3.1 GPL-1 GPL-2 GPL-2-with-font-exception GPL-2-with-Linden-Lab-FLOSS-exception GPL-2-with-MySQL-FLOSS-exception GPL-3 GPL-3-with-font-exception ISC LGPL-2 LGPL-2.1 LGPL-2.1-FPC LGPL-3 libgcc libstdc++ MIT OPENLDAP OracleDB PSF-2 PSF-2.2 PSF-2.3 PSF-2.4 public-domain PYTHON Ruby SGI-B-2.0 tanuki-community unicode UoI-NCSA vim W3C WTFPL-2 ZLIB ZPL
+GPL-COMPATIBLE AGPL-3 Apache-2.0 Artistic-2 as-is Boost-1.0 BSD BSD-2 CeCILL-2 Clarified-Artistic DB FTL gcc-runtime-library-exception-3.1 GPL-1 GPL-2 GPL-2-with-exceptions GPL-2-with-font-exception GPL-2-with-linking-exception GPL-2-with-MySQL-FLOSS-exception GPL-3 GPL-3-with-font-exception ISC LGPL-2 LGPL-2.1 LGPL-2.1-FPC LGPL-3 libgcc libstdc++ MIT OPENLDAP OracleDB PSF-2 PSF-2.2 PSF-2.3 PSF-2.4 public-domain PYTHON Ruby SGI-B-2.0 tanuki-community unicode UoI-NCSA vim W3C WTFPL-2 ZLIB ZPL
 
 FSF-APPROVED @GPL-COMPATIBLE AFL-2.0 AFL-2.1 AFL-3.0 Apache-1.1 APSL-2 BitTorrent BSD-4 CDDL CNRI CPL-1.0 EPL-1.0 IBM LPPL-1.2 MPL-1.0 MPL-1.1 Ms-PL NPL-1.1 openssl OSL-1.1 OSL-2.0 OSL-2.1 PHP-3.01 QPL QPL-1.0 SPL
 
@@ -23,7 +23,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 bea.ri.jsr173 BEER-WARE BSD-1 BZIP2 CC0-1.0-Universal CDDL-Schily CMake CPL-0.5 CRACKLIB cryptopp dom4j eGenixPublic-1.1 ElementTree Emacs EPL FastCGI FLEX FLTK FVWM gnuplot GPL-2-with-exceptions GPL-2-with-linking-exception gsm HTML-Tidy iASL icu IDPL imagemagick Info-ZIP JamesClark JasPer2.0 jaxen JDOM JNIC LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof NCSA-HDF OpenSoftware otter PBZIP2 perforce PHP-2.02 Princeton pysqlite RSA-MD4 RSA-MD5 saxpath Scintilla Sendmail SMAIL Subversion tcp_wrappers_license TeX w3m wxWinLL-3 Xdebug zpaq ZSH
+MISC-FREE Allegro ANTLR bea.ri.jsr173 BEER-WARE BSD-1 BZIP2 CC0-1.0-Universal CDDL-Schily CMake CPL-0.5 CRACKLIB cryptopp dom4j eGenixPublic-1.1 ElementTree Emacs EPL FastCGI FLEX FLTK FVWM gnuplot gsm HTML-Tidy iASL icu IDPL imagemagick Info-ZIP JamesClark JasPer2.0 jaxen JDOM JNIC LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof NCSA-HDF OpenSoftware otter PBZIP2 perforce PHP-2.02 Princeton pysqlite RSA-MD4 RSA-MD5 saxpath Scintilla Sendmail SMAIL Subversion tcp_wrappers_license TeX w3m wxWinLL-3 Xdebug zpaq ZSH
 # The following are NOT valid in @MISC-FREE:
 # arj - usage restrictions
 # freedist - Doesn't grant the right to do modifications.