summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2013-04-16 16:13:40 +0000
committerIan Stakenvicius <axs@gentoo.org>2013-04-16 16:13:40 +0000
commit417220cf1f80dd575764f59e8a3d9ab45c0779af (patch)
tree9199583d27de0ca4c6537ac507b0cf667a573e3e /profiles
parentPort to python-single-r1 eclass, thanks to Nikoli. (diff)
downloadgentoo-2-417220cf1f80dd575764f59e8a3d9ab45c0779af.tar.gz
gentoo-2-417220cf1f80dd575764f59e8a3d9ab45c0779af.tar.bz2
gentoo-2-417220cf1f80dd575764f59e8a3d9ab45c0779af.zip
Put FAH-EULA-2009 into the EULA group
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 e53de38631f7..fdf8fd80051f 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.7733 2013/04/16 07:21:22 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7734 2013/04/16 16:13:40 axs 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!
+ 16 Apr 2013; Ian Stakenvicius <axs@gentoo.org> license_groups:
+ Put FAH-EULA-2009 into the EULA group
+
16 Apr 2013; Sergey Popov <pinkbyte@gentoo.org> package.mask:
Mask live ebuild of mplayer2
diff --git a/profiles/license_groups b/profiles/license_groups
index 83f2102e30b5..2c6a33c3b93a 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.204 2013/04/14 20:44:08 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.205 2013/04/16 16:13:40 axs Exp $
# Please report bugs or other requests at bugs.gentoo.org and assign to
# licenses@gentoo.org
@@ -59,7 +59,7 @@ FREE-DOCUMENTS @FSF-APPROVED-OTHER @MISC-FREE-DOCS
# and share modifications
FREE @FREE-SOFTWARE @FREE-DOCUMENTS
-EULA AdobeFlash-10.3 AdobeFlash-11.x ArxFatalis-EULA-GOG ArxFatalis-EULA-JoWooD BCS Broadcom CAPYBARA-EULA cadsoft DOOM3 ETQW FraunhoferFDK GIMPS google-chrome googleearth Google-TOS IBM-J1.5 IBM-J1.6 Intel-SDP Introversion Livestation-EULA LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-EULA MSjdbcEULA40 Nero-AAC-EULA Nero-EULA-US Oracle-BCLA-JavaSE POMPOM postal2 PUEL Q3AEULA QUAKE4 RTCW RTCW-ETEULA SCM-MICRO skype-eula skype-4.0.0.7-copyright spin-commercial spin-educational sun-bcla-java-vm TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo
+EULA AdobeFlash-10.3 AdobeFlash-11.x ArxFatalis-EULA-GOG ArxFatalis-EULA-JoWooD BCS Broadcom CAPYBARA-EULA cadsoft DOOM3 ETQW FAH-EULA-2009 FraunhoferFDK GIMPS google-chrome googleearth Google-TOS IBM-J1.5 IBM-J1.6 Intel-SDP Introversion Livestation-EULA LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-EULA MSjdbcEULA40 Nero-AAC-EULA Nero-EULA-US Oracle-BCLA-JavaSE POMPOM postal2 PUEL Q3AEULA QUAKE4 RTCW RTCW-ETEULA SCM-MICRO skype-eula skype-4.0.0.7-copyright spin-commercial spin-educational sun-bcla-java-vm TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo
# As proposed: http://archives.gentoo.org/gentoo-dev/msg_6c950b46c50fe72ebc5e650bbf70f77c.xml
# Excerpt of the rules for this license group: