Add a couple of licenses to MISC-FREE. Move DB (Sleepycat) to GPL-COMPATIBLE. Remove libX11 as the license is no longer in the tree.

2 files changed, 11 insertions, 7 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 686eeb79eaa5..d2fa585e94f3 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for profile directory
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3767 2010/01/10 15:24:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3768 2010/01/10 15:51:43 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!
 
+  10 Jan 2010; Ulrich Mueller <ulm@gentoo.org> license_groups:
+  Add a couple of licenses to MISC-FREE. Move DB (Sleepycat) to
+  GPL-COMPATIBLE. Remove libX11 as the license is no longer in the tree.
+
   10 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> package.mask:
   Mask net-libs/libmsn-4.0 for testing.
 
diff --git a/profiles/license_groups b/profiles/license_groups
index a7fec690f6fd..124eb955c718 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -1,20 +1,20 @@
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.24 2010/01/09 19:41:10 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.25 2010/01/10 15:51:43 ulm Exp $
 
 # GLEP-0023
 # http://www.gentoo.org/proj/en/glep/glep-0023.html
 # http://www.fsf.org/licensing/licenses/index_html
 
-GPL-COMPATIBLE Apache-2.0 Artistic Artistic-2 as-is BSD BSD-2 Boost-1.0 CeCILL-2 FTL GPL-1 GPL-2 GPL-3 Intel ISC libX11 LGPL-2 LGPL-2.1 LGPL-3 lsof MIT OPENLDAP OracleDB PYTHON PSF-2.2 PSF-2.3 PSF-2.4 SGI-B-2.0 Ruby unicode vim W3C WTFPL-2 X11 ZLIB public-domain ZPL
+GPL-COMPATIBLE Apache-2.0 Artistic Artistic-2 as-is Boost-1.0 BSD BSD-2 CeCILL-2 DB FTL GPL-1 GPL-2 GPL-3 Intel ISC LGPL-2 LGPL-2.1 LGPL-3 lsof MIT OPENLDAP OracleDB PSF-2.2 PSF-2.3 PSF-2.4 public-domain PYTHON Ruby SGI-B-2.0 unicode vim W3C WTFPL-2 X11 ZLIB ZPL
 
-FSF-APPROVED @GPL-COMPATIBLE AFL-2.0 AFL-2.1 AFL-3.0 Apache-1.1 APSL-2 BitTorrent BSD-4 CDDL CPL-1.0 EPL-1.0 IBM LPPL-1.2 Ms-PL MPL-1.0 MPL-1.1 NPL-1.1 OSL-1.1 OSL-2.0 OSL-2.1 openssl PHP-3.01 QPL QPL-1.0 SPL
+FSF-APPROVED @GPL-COMPATIBLE AFL-2.0 AFL-2.1 AFL-3.0 Apache-1.1 APSL-2 BitTorrent BSD-4 CDDL 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
 
-OSI-APPROVED AFL-3.0 APL-1.0 Apache-2.0 Artistic Artistic-2 BSD BSD-2 Boost-1.0 CDDL CPL-1.0 EPL EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 IPL-1 IBM ISC MIT Ms-PL MPL-1.1 nethack OGTSL PHP PSF-2.2 PSF-2.3 PSF-2.4 PYTHON QPL SPL wxWinLL-3 ZPL ZLIB
+OSI-APPROVED AFL-3.0 Apache-2.0 APL-1.0 Artistic Artistic-2 Boost-1.0 BSD BSD-2 CDDL CPL-1.0 EPL EPL-1.0 GPL-2 GPL-3 IBM IPL-1 ISC LGPL-2.1 LGPL-3 MIT MPL-1.1 Ms-PL nethack OGTSL PHP PSF-2.2 PSF-2.3 PSF-2.4 PYTHON QPL SPL wxWinLL-3 ZLIB ZPL
 
 # Misc licenses that are probably free software but not approved by either FSF or OSI
-# Preferrably on the long term these should be cleared up and moved to other sets
-MISC-FREE BZIP2 w3m CRACKLIB FLEX SMAIL tcp_wrappers_license cryptopp JamesClark Subversion DSNIFF wxWinLL-3 MaxMind PDFLite GPL-2-with-linking-exception GPL-2-with-exceptions imagemagick ElementTree OpenSoftware LLGPL-2.1 DB LPPL-1.3 Info-ZIP gnuplot CMake TeX WordNet-2.1 PHP-3 LPPL-1.3c gsm JNIC
+# Preferably on the long term these should be cleared up and moved to other sets
+MISC-FREE BEER-WARE BZIP2 CDDL-Schily CMake CRACKLIB cryptopp DSNIFF ElementTree FLEX FLTK gnuplot GPL-2-with-exceptions GPL-2-with-linking-exception gsm imagemagick Info-ZIP JamesClark JNIC LLGPL-2.1 LPPL-1.3 LPPL-1.3c MaxMind No-Problem-Bugroff OpenSoftware otter PBZIP2 PDFLite PHP-3 POSTGRESQL pysqlite RSA-MD4 RSA-MD5 Scintilla SMAIL Subversion tcp_wrappers_license TeX w3m WordNet-2.1 wxWinLL-3 Xdebug ZSH
 
 # Metaset for all free software
 FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE