Add AGPL-3, APSL-2, as-is, CPAL-1.0, DB, EUPL-1.1, LPPL-1.3c, NOSA, OFL-1.1, OracleDB, PHP-3, PHP-3.01, POSTGRESQL, and W3C to OSI-APPROVED. Remove LPPL-1.3c, PHP-3, and POSTGRESQL from MISC-FREE. Remove PSF-2.2, PSF-2.3, PSF-2.4, and PYTHON from OSI-APPROVED.

2 files changed, 10 insertions, 4 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 3f08fbb8b49c..ebc6a435a6b2 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,17 @@
 # ChangeLog for profile directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5879 2011/11/07 13:15:27 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5880 2011/11/07 21:28:02 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!
 
+  07 Nov 2011; Ulrich Mueller <ulm@gentoo.org> license_groups:
+  Add AGPL-3, APSL-2, as-is, CPAL-1.0, DB, EUPL-1.1, LPPL-1.3c, NOSA, OFL-1.1,
+  OracleDB, PHP-3, PHP-3.01, POSTGRESQL, and W3C to OSI-APPROVED. Remove
+  LPPL-1.3c, PHP-3, and POSTGRESQL from MISC-FREE. Remove PSF-2.2, PSF-2.3,
+  PSF-2.4, and PYTHON from OSI-APPROVED.
+
   07 Nov 2011; Alexis Ballier <aballier@gentoo.org> package.mask:
   remove mask for texlive packages that are now gone
 
diff --git a/profiles/license_groups b/profiles/license_groups
index 08578555e40e..dbab2fd5daab 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.80 2011/11/06 10:14:10 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.81 2011/11/07 21:28:02 ulm Exp $
 
 # Please report bugs or other requests at bugs.gentoo.org and assign to
 # licenses@gentoo.org
@@ -14,7 +14,7 @@ GPL-COMPATIBLE AGPL-3 Apache-2.0 Artistic-2 as-is Boost-1.0 BSD BSD-2 CeCILL-2 C
 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
 
 # http://www.opensource.org/licenses
-OSI-APPROVED AFL-3.0 Apache-2.0 APL-1.0 Artistic Artistic-2 Boost-1.0 BSD BSD-2 CDDL CNRI CPL-1.0 EPL-1.0 GPL-2 GPL-3 IBM IPAfont ISC LGPL-2.1 LGPL-3 MIT MPL-1.1 Ms-PL nethack OGTSL PSF-2 PSF-2.2 PSF-2.3 PSF-2.4 PYTHON QPL SPL wxWinLL-3 wxWinLL-3.1 ZLIB ZPL
+OSI-APPROVED AFL-3.0 AGPL-3 Apache-2.0 APL-1.0 APSL-2 Artistic Artistic-2 as-is Boost-1.0 BSD BSD-2 CDDL CNRI CPAL-1.0 CPL-1.0 DB EPL-1.0 EUPL-1.1 GPL-2 GPL-3 IBM IPAfont ISC LGPL-2.1 LGPL-3 LPPL-1.3c MIT MPL-1.1 Ms-PL nethack NOSA OFL-1.1 OGTSL OracleDB PHP-3 PHP-3.01 POSTGRESQL PSF-2 QPL SPL W3C wxWinLL-3 wxWinLL-3.1 ZLIB ZPL
 
 # Misc licenses that are probably free software, i.e. follow the
 # Free Software Definition at http://www.gnu.org/philosophy/free-sw.html
@@ -23,7 +23,7 @@ OSI-APPROVED AFL-3.0 Apache-2.0 APL-1.0 Artistic Artistic-2 Boost-1.0 BSD BSD-2
 # 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 BZIP2 CC0-1.0-Universal CDDL-Schily CMake CPL-0.5 CRACKLIB cryptopp dom4j eGenixPublic-1.1 ElementTree Emacs EPL FastCGI FLEX FLTK FVWM gmtp 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 LPPL-1.3c lsof NCSA-HDF OpenSoftware otter PBZIP2 perforce PHP-2.02 PHP-3 POSTGRESQL 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 BZIP2 CC0-1.0-Universal CDDL-Schily CMake CPL-0.5 CRACKLIB cryptopp dom4j eGenixPublic-1.1 ElementTree Emacs EPL FastCGI FLEX FLTK FVWM gmtp 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
 # The following are NOT valid in @MISC-FREE:
 # arj - usage restrictions
 # freedist - Doesn't grant the right to do modifications.