diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2009-11-08 22:12:39 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2009-11-08 22:12:39 +0000 |
| commit | 35db0cd36746a5b296f4dc95b73af659cf4cd898 (patch) | |
| tree | aa5db229c8355dfa3c5da13e434eca38c44e7ca6 /profiles | |
| parent | Add net-news to metadata.xml too. (diff) | |
| download | gentoo-2-35db0cd36746a5b296f4dc95b73af659cf4cd898.tar.gz gentoo-2-35db0cd36746a5b296f4dc95b73af659cf4cd898.tar.bz2 gentoo-2-35db0cd36746a5b296f4dc95b73af659cf4cd898.zip | |
Add IBM JDK licenses to @EULA.
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 3296c86c25b3..2018ad6e7992 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,14 @@ # ChangeLog for profile directory # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3527 2009/11/08 19:57:30 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3528 2009/11/08 22:12:39 caster 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! + 08 Nov 2009; Vlastimil Babka <caster@gentoo.org> license_groups: + Add IBM JDK licenses to @EULA. + 08 Nov 2009; Alexey Shvetsov <alexxy@gentoo.org> package.mask: Mask kde 4.2.4 since we gonna drop it from tree diff --git a/profiles/license_groups b/profiles/license_groups index 8734a5c57868..653e1dbaa963 100644 --- a/profiles/license_groups +++ b/profiles/license_groups @@ -1,12 +1,12 @@ # 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.12 2009/11/08 12:50:02 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.13 2009/11/08 22:12:39 caster Exp $ # GLEP-0023 # http://www.gentoo.org/proj/en/glep/glep-0023.html # http://www.fsf.org/licensing/licenses/index_html -EULA BCS Broadcom dlj-1.1 DOOM3 ETQW ETQW Introversion Livestation-EULA.txt LOKI-EULA LOKI-EULA LOKI-EULA LOKI-EULA LRCTF MARBLEBLAST Nero-EULA-US Pando-EULA POMPOM POMPOM postal2 PUEL Q3AEULA QUAKE4 RTCW RTCW-ETEULA sun-prerelease-jdk6 sun-prerelease-jdk7 THINKTANKS ut2003 ut2003 ut2003-demo +EULA BCS Broadcom dlj-1.1 DOOM3 ETQW ETQW IBM-J1.4 IBM-J1.5 IBM-J1.6 Introversion Livestation-EULA.txt LOKI-EULA LOKI-EULA LOKI-EULA LOKI-EULA LRCTF MARBLEBLAST Nero-EULA-US Pando-EULA POMPOM POMPOM postal2 PUEL Q3AEULA QUAKE4 RTCW RTCW-ETEULA sun-prerelease-jdk6 sun-prerelease-jdk7 THINKTANKS ut2003 ut2003 ut2003-demo 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 GPL-COMPATIBLE Apache-2.0 Artistic Artistic-2 as-is BSD BSD-2 Boost-1.0 CeCILL-2 FTL GPL-2 GPL-3 Intel ISC libX11 LGPL-2.1 LGPL-3 lsof MIT OPENLDAP OracleDB PYTHON PSF-2.2 PSF-2.3 PSF-2.4 Ruby unicode vim W3C W3C-document WTFPL-2 X11 ZLIB public-domain ZPL 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 |