diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2011-12-06 13:29:09 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2011-12-06 13:29:09 +0000 |
| commit | 278f58a1cd5ab7439bf379265cd8e79e07ee88f9 (patch) | |
| tree | e50fa2484c1253358a44fcaf28e0754ffd465530 /profiles | |
| parent | Mask USE="pic" in media-video/transcode here and unmask only for x86 arch. (diff) | |
| download | gentoo-2-278f58a1cd5ab7439bf379265cd8e79e07ee88f9.tar.gz gentoo-2-278f58a1cd5ab7439bf379265cd8e79e07ee88f9.tar.bz2 gentoo-2-278f58a1cd5ab7439bf379265cd8e79e07ee88f9.zip | |
Add Emacs-23-CEDET-grammars to FSF-APPROVED license group.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/license_groups | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index f42885bdb475..a17acbbab54a 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,14 @@ # ChangeLog for profile directory # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5986 2011/12/06 13:17:11 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5987 2011/12/06 13:29:09 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! + 06 Dec 2011; Ulrich Mueller <ulm@gentoo.org> license_groups: + Add Emacs-23-CEDET-grammars to FSF-APPROVED license group. + 06 Dec 2011; Alexis Ballier <aballier@gentoo.org> package.mask: mask for removal lyx2html, bug #388987 diff --git a/profiles/license_groups b/profiles/license_groups index 654e4700e815..f62d4a352a99 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.89 2011/12/03 18:05:06 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.90 2011/12/06 13:29:09 ulm Exp $ # Please report bugs or other requests at bugs.gentoo.org and assign to # licenses@gentoo.org @@ -11,7 +11,7 @@ # 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-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 +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 Emacs-23-CEDET-grammars 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 AGPL-3 Apache-1.1 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.0 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 |