summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-01-06 19:20:20 +0000
committerUlrich Müller <ulm@gentoo.org>2013-01-06 19:20:20 +0000
commit63cf10fa2f5f5f935d845fe17836eb7eef9cc350 (patch)
treec58c4033ab1b8d16366df126d72e1cad58f77e4a /profiles
parentall updated to 2013 in header, in 1.2.0-r1; SetSetup updated to encapsulate a... (diff)
downloadgentoo-2-63cf10fa2f5f5f935d845fe17836eb7eef9cc350.tar.gz
gentoo-2-63cf10fa2f5f5f935d845fe17836eb7eef9cc350.tar.bz2
gentoo-2-63cf10fa2f5f5f935d845fe17836eb7eef9cc350.zip
Add mpich2 license to MISC-FREE, bug 449344.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/license_groups4
2 files changed, 6 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 52dcedffb213..d0669251efae 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7330 2013/01/06 16:29:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7331 2013/01/06 19:20:20 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 Jan 2013; Ulrich Müller <ulm@gentoo.org> license_groups:
+ Add mpich2 license to MISC-FREE, bug 449344.
+
06 Jan 2013; Jeroen Roovers <jer@gentoo.org> package.mask:
Mask =dev-libs/libnl-3.2.17 (bug #450504).
diff --git a/profiles/license_groups b/profiles/license_groups
index fabea7f6c8a9..44903b796c51 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.166 2013/01/05 07:35:39 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.167 2013/01/06 19:20:20 ulm Exp $
# Please report bugs or other requests at bugs.gentoo.org and assign to
# licenses@gentoo.org
@@ -30,7 +30,7 @@ OSI-APPROVED AFL-3.0 AGPL-3 Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artist
# TODO: maybe add a category for BSD-alike MISC-FREE licenses for easy
# separation?
# BSD-4 alikes: dom4j FastCGI icu JDOM
-MISC-FREE Allegro ANTLR bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution bufexplorer.vim BZIP2 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB cryptopp czyborra DES docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh FLEX FLTK freemarker FVWM gd gnuplot gsm HTML-Tidy htmlc iASL IBPP-1.1 icu IDPL IJG imagemagick Info-ZIP inner-net ipadic Ispell JasPer2.0 JDOM JNIC JOVE libmng libpng libtiff LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib md2k7-asyouwish MIT-with-advertising NCSA-HDF noweb openafs-krb5-a OpenSoftware Openwall otter PCRE perforce PHP-2.02 Princeton psutils pysqlite rc regexp-UofT RSA Scintilla Sendmail skype-4.0.0.7-third-party_attributions.txt SMAIL SNIA SSLeay Subversion SVFL tcltk tcp_wrappers_license TeX TeX-other-free w3m wxWinLL-3 x2x xboing Xdebug xtrs YaTeX zpaq ZSH
+MISC-FREE Allegro ANTLR bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution bufexplorer.vim BZIP2 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB cryptopp czyborra DES docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh FLEX FLTK freemarker FVWM gd gnuplot gsm HTML-Tidy htmlc iASL IBPP-1.1 icu IDPL IJG imagemagick Info-ZIP inner-net ipadic Ispell JasPer2.0 JDOM JNIC JOVE libmng libpng libtiff LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib md2k7-asyouwish MIT-with-advertising mpich2 NCSA-HDF noweb openafs-krb5-a OpenSoftware Openwall otter PCRE perforce PHP-2.02 Princeton psutils pysqlite rc regexp-UofT RSA Scintilla Sendmail skype-4.0.0.7-third-party_attributions.txt SMAIL SNIA SSLeay Subversion SVFL tcltk tcp_wrappers_license TeX TeX-other-free w3m wxWinLL-3 x2x xboing Xdebug xtrs YaTeX zpaq ZSH
# The following are NOT valid in @MISC-FREE:
# arj - usage restrictions
# freedist - Doesn't grant the right to do modifications.