diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2010-02-06 12:03:06 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2010-02-06 12:03:06 +0000 |
| commit | a0f5d3be679ba8b8c1d19fa5d597c250a44114c9 (patch) | |
| tree | a0f6461358f09f84a25232ad84c5ed9b6509a4ad /profiles | |
| parent | We have to repect selection of USE="-openmp", fixed path in setup file. (diff) | |
| download | gentoo-2-a0f5d3be679ba8b8c1d19fa5d597c250a44114c9.tar.gz gentoo-2-a0f5d3be679ba8b8c1d19fa5d597c250a44114c9.tar.bz2 gentoo-2-a0f5d3be679ba8b8c1d19fa5d597c250a44114c9.zip | |
Remove Intel license, duplicate of BSD, bug 301123.
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 d9218bcc2d05..cfdfc7b7cd68 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,14 @@ # ChangeLog for profile directory # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3863 2010/02/05 22:19:05 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3864 2010/02/06 12:03:06 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 Feb 2010; Ulrich Mueller <ulm@gentoo.org> license_groups: + Remove Intel license, duplicate of BSD, bug 301123. + 05 Feb 2010; Ulrich Mueller <ulm@gentoo.org> license_groups: Remove IPL-1 license, duplicate of IBM, bug 301180. diff --git a/profiles/license_groups b/profiles/license_groups index f80011d99a12..20f5ad6d68d9 100644 --- a/profiles/license_groups +++ b/profiles/license_groups @@ -1,6 +1,6 @@ # 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.36 2010/02/05 22:19:05 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.37 2010/02/06 12:03:06 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 DB FTL 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 Intel ISC LGPL-2 LGPL-2.1 LGPL-3 MIT OPENLDAP OracleDB PSF-2.2 PSF-2.3 PSF-2.4 public-domain PYTHON Ruby SGI-B-2.0 unicode UoI-NCSA vim W3C WTFPL-2 X11 ZLIB ZPL +GPL-COMPATIBLE AGPL-3 Apache-2.0 Artistic-2 as-is Boost-1.0 BSD BSD-2 CeCILL-2 DB FTL 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-3 MIT OPENLDAP OracleDB PSF-2.2 PSF-2.3 PSF-2.4 public-domain PYTHON Ruby SGI-B-2.0 unicode UoI-NCSA 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 |