License Wordnet-2.1 replaced by Princeton, bug 301186. Add Emacs to MISC-FREE.

2 files changed, 15 insertions, 8 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 3f3a581386d3..378a514dd90c 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.3795 2010/01/16 11:38:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3796 2010/01/16 15:07:44 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 Jan 2010; Ulrich Mueller <ulm@gentoo.org> license_groups:
+  License Wordnet-2.1 replaced by Princeton, bug 301186. Comment changes.
+  Add Emacs to MISC-FREE.
+
   16 Jan 2010; <hwoarang@gentoo.org> package.mask:
   Remove masking wrt bug #301105
 
diff --git a/profiles/license_groups b/profiles/license_groups
index ff08cd80b0f3..dd5dec9f20d0 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -1,20 +1,22 @@
-# Copyright 2007 Gentoo Foundation
+# Copyright 2007-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.27 2010/01/16 08:05:11 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.28 2010/01/16 15:07:44 ulm Exp $
 
 # GLEP-0023
 # http://www.gentoo.org/proj/en/glep/glep-0023.html
-# http://www.fsf.org/licensing/licenses/index_html
 
+# http://www.fsf.org/licensing/licenses/
 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 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 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
-# 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 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
+# Misc licenses that are probably free software but not approved by
+# either FSF or OSI. 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 ElementTree Emacs 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 Princeton pysqlite RSA-MD4 RSA-MD5 Scintilla SMAIL Subversion tcp_wrappers_license TeX w3m wxWinLL-3 Xdebug ZSH
 
 # Metaset for all free software
 FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE
@@ -27,7 +29,8 @@ FSF-APPROVED-OTHER Arphic CCPL-Attribution-2.0 CCPL-Attribution-ShareAlike-2.0 D
 # http://freedomdefined.org/
 FREE-DOCUMENTS @FSF-APPROVED-OTHER BitstreamVera CC-PD CCPL-Attribution-3.0 CCPL-Attribution-ShareAlike-2.5 CCPL-Attribution-ShareAlike-3.0 man-pages-posix myspell-en_CA-KevinAtkinson
 
-# Collection of all licenses with the freedom to use, share, modify and share modifications
+# Collection of all licenses with the freedom to use, share, modify
+# and share modifications
 FREE @FREE-SOFTWARE @FREE-DOCUMENTS
 
 EULA BCS Broadcom dlj-1.1 DOOM3 ETQW IBM-J1.4 IBM-J1.5 IBM-J1.6 Introversion jrockit Livestation-EULA LOKI-EULA LRCTF MARBLEBLAST Nero-EULA-US Pando-EULA POMPOM postal2 PUEL Q3AEULA QUAKE4 RTCW RTCW-ETEULA skype-eula sun-bcla-java-vm sun-prerelease-jdk6 sun-prerelease-jdk7 THINKTANKS ut2003 ut2003-demo