summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Junghans <ottxor@gentoo.org>2011-11-16 02:32:07 +0000
committerChristoph Junghans <ottxor@gentoo.org>2011-11-16 02:32:07 +0000
commit33e071e1051e0ad3f26545ade0e1c3a770b07c8d (patch)
tree07daf688b9e2197adc100094f3fc10090b4d3bad /profiles
parentDisable gcc version check for binary merges, bug #383155. (diff)
downloadhistorical-33e071e1051e0ad3f26545ade0e1c3a770b07c8d.tar.gz
historical-33e071e1051e0ad3f26545ade0e1c3a770b07c8d.tar.bz2
historical-33e071e1051e0ad3f26545ade0e1c3a770b07c8d.zip
Added =www-plugins/google-talkplugin-9999 to package.mask
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask6
2 files changed, 9 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index e79ace789727..d9f0989e7262 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.5915 2011/11/15 22:11:58 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5916 2011/11/16 02:32:06 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!
+ 16 Nov 2011; Christoph Junghans <ottxor@gentoo.org> package.mask:
+ Added =www-plugins/google-talkplugin-9999 to package.mask
+
15 Nov 2011; Lars Wendler <polynomial-c@gentoo.org> package.mask:
Removed seamonkey-bin from p.mask. It has a new maintainer.
diff --git a/profiles/package.mask b/profiles/package.mask
index 9f268a7171ec..decaeb8ca2a2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13247 2011/11/15 22:11:58 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13248 2011/11/16 02:32:07 ottxor Exp $
#
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -31,6 +31,10 @@
#--- END OF EXAMPLES ---
+# Christoph Junghans <ottxor@gentoo.org> (15 Nov 2011)
+# current version of google-talkplugin never clear what you get
+=www-plugins/google-talkplugin-9999
+
# Ian Stakenvicius <axs@gentoo.org> (15 Nov 2011)
# Masking this version until spidermonkey-1.8.5 can be unmasked
# (tracker bug 376987)