summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Junghans <ottxor@gentoo.org>2011-02-15 20:27:14 +0000
committerChristoph Junghans <ottxor@gentoo.org>2011-02-15 20:27:14 +0000
commit013a89e7de31cf83c1c2166012267d08c8d17e0e (patch)
tree189c5392efe78b3edc0b56f9a785c12b13dda1bc /profiles
parentDelete older ebuild. (diff)
downloadgentoo-2-013a89e7de31cf83c1c2166012267d08c8d17e0e.tar.gz
gentoo-2-013a89e7de31cf83c1c2166012267d08c8d17e0e.tar.bz2
gentoo-2-013a89e7de31cf83c1c2166012267d08c8d17e0e.zip
Add google-talkplugin to EULA license 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 852b71de33b6..ed7b6cf0fa2a 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.5051 2011/02/15 18:13:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5052 2011/02/15 20:27:14 ottxor 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!
+ 15 Feb 2011; Christoph Junghans <ottxor@gentoo.org> license_groups:
+ Add google-talkplugin to EULA license group
+
15 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> package.mask:
Lastrite app-office/qbankmanager and xfce-extra/xfce4-xkb-plugin.
diff --git a/profiles/license_groups b/profiles/license_groups
index 669435c178e1..bfbb5769d9b1 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.60 2011/02/08 17:12:58 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.61 2011/02/15 20:27:14 ottxor 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 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 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 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 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: