From f4f8ce915be8ff36f53cb5fed211427c03a90799 Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Fri, 14 Dec 2012 19:19:20 +0000 Subject: Add BSD-with-attribution to MISC-FREE license group. --- profiles/ChangeLog | 5 ++++- profiles/license_groups | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 0cb9c29ed6cd..4ff341c9eb0a 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,14 @@ # ChangeLog for profile directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7252 2012/12/14 15:26:11 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7253 2012/12/14 19:19: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! + 14 Dec 2012; Ulrich Müller license_groups: + Add BSD-with-attribution to MISC-FREE license group. + 14 Dec 2012; Michał Górny use.desc: Split the USE=upnp to port mapping- and a/v-specific flags, as discussed on the ml in September. diff --git a/profiles/license_groups b/profiles/license_groups index d2fad85a49be..328e4e193e72 100644 --- a/profiles/license_groups +++ b/profiles/license_groups @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.149 2012/12/14 11:51:01 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.150 2012/12/14 19:19:20 ulm Exp $ # Please report bugs or other requests at bugs.gentoo.org and assign to # licenses@gentoo.org @@ -25,7 +25,7 @@ OSI-APPROVED AFL-3.0 AGPL-3 Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artist # Licenses in this list should NOT appear directly or indirectly in @FSF-APPROVED or @OSI-APPROVED # TODO: maybe add a category for BSD-alike MISC-FREE licenses for easy seperation? # BSD-4 alikes: dom4j FastCGI icu jaxen JDOM saxpath -MISC-FREE Allegro ANTLR as-is bea.ri.jsr173 BEER-WARE BSD-1 BZIP2 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB cryptopp czyborra docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI FLEX FLTK freemarker FVWM gnuplot gsm HTML-Tidy htmlc iASL IBPP-1.1 icu IDPL imagemagick Info-ZIP ipadic Ispell JasPer2.0 jaxen JDOM JNIC JOVE libpng libtiff LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib md2k7-asyouwish mplus-fonts NCSA-HDF noweb OpenSoftware otter perforce PHP-2.02 Princeton psutils pysqlite rc RSA saxpath Scintilla Sendmail skype-4.0.0.7-third-party_attributions.txt SMAIL SNIA SSLeay Subversion SVFL tcltk tcp_wrappers_license TeX TeX-other-free UbuntuFontLicense-1.0 vlgothic w3m wxWinLL-3 Xdebug xtrs YaTeX zpaq ZSH +MISC-FREE Allegro ANTLR as-is bea.ri.jsr173 BEER-WARE BSD-1 BSD-with-attribution BZIP2 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB cryptopp czyborra docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI FLEX FLTK freemarker FVWM gnuplot gsm HTML-Tidy htmlc iASL IBPP-1.1 icu IDPL imagemagick Info-ZIP ipadic Ispell JasPer2.0 jaxen JDOM JNIC JOVE libpng libtiff LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib md2k7-asyouwish mplus-fonts NCSA-HDF noweb OpenSoftware otter perforce PHP-2.02 Princeton psutils pysqlite rc RSA saxpath Scintilla Sendmail skype-4.0.0.7-third-party_attributions.txt SMAIL SNIA SSLeay Subversion SVFL tcltk tcp_wrappers_license TeX TeX-other-free UbuntuFontLicense-1.0 vlgothic w3m wxWinLL-3 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. -- cgit v1.2.3-65-gdbad