summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2011-08-27 17:55:45 +0000
committerMike Gilbert <floppym@gentoo.org>2011-08-27 17:55:45 +0000
commit868d62f23ce6ac340d27929dd4a038a04a184971 (patch)
treee7e457ab56011866e6a4bc376bf2ffd729bc7969 /profiles
parentFix bug #380425. (diff)
downloadgentoo-2-868d62f23ce6ac340d27929dd4a038a04a184971.tar.gz
gentoo-2-868d62f23ce6ac340d27929dd4a038a04a184971.tar.bz2
gentoo-2-868d62f23ce6ac340d27929dd4a038a04a184971.zip
Add EULA for www-client/google-chrome
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 30bd5d825996..004b418eed00 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5657 2011/08/27 16:38:32 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5658 2011/08/27 17:55:45 floppym 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!
+ 27 Aug 2011; Mike Gilbert <floppym@gentoo.org> license_groups:
+ Add EULA for www-client/google-chrome
+
27 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> package.mask:
Mask kde-misc/kcm_gtk for removal
diff --git a/profiles/license_groups b/profiles/license_groups
index f819d361615e..8aae02f2f153 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.69 2011/08/27 06:55:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.70 2011/08/27 17:55:45 floppym Exp $
# Please report bugs or other requests at bugs.gentoo.org and assign to
# licenses@gentoo.org
@@ -39,7 +39,7 @@ FREE-DOCUMENTS @FSF-APPROVED-OTHER BitstreamVera CC-PD CCPL-Attribution-3.0 CCPL
# and share modifications
FREE @FREE-SOFTWARE @FREE-DOCUMENTS
-EULA AdobeFlash-10 AdobeFlash-10.1 AdobeFlash-9.0.31.0 BCS Broadcom cadsoft dlj-1.1 DOOM3 ETQW googleearth google-talkplugin IBM-J1.5 IBM-J1.6 Introversion jrockit Livestation-EULA LOKI-EULA LRCTF MARBLEBLAST nauty Nero-EULA-US Nero-AAC-EULA Pando-EULA POMPOM postal2 PUEL Q3AEULA QUAKE4 RTCW RTCW-ETEULA SCM-MICRO skype-eula spin-commercial spin-educational sun-bcla-java-vm sun-prerelease-jdk6 sun-prerelease-jdk7 THINKTANKS ut2003 ut2003-demo
+EULA AdobeFlash-10 AdobeFlash-10.1 AdobeFlash-9.0.31.0 BCS Broadcom cadsoft dlj-1.1 DOOM3 ETQW google-chrome googleearth google-talkplugin IBM-J1.5 IBM-J1.6 Introversion jrockit Livestation-EULA LOKI-EULA LRCTF MARBLEBLAST nauty Nero-EULA-US Nero-AAC-EULA Pando-EULA POMPOM postal2 PUEL Q3AEULA QUAKE4 RTCW RTCW-ETEULA SCM-MICRO skype-eula spin-commercial spin-educational sun-bcla-java-vm sun-prerelease-jdk6 sun-prerelease-jdk7 THINKTANKS ut2003 ut2003-demo
# As proposed: http://archives.gentoo.org/gentoo-dev/msg_6c950b46c50fe72ebc5e650bbf70f77c.xml
# Excerpt of the rules for this license group: