summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2012-08-23 19:23:59 +0000
committerMike Gilbert <floppym@gentoo.org>2012-08-23 19:23:59 +0000
commitf10e6705c84a95e92d6885947d995a46f0f65f75 (patch)
tree5cae912d045352d566c4b77b996e28cf9ed5ff97 /profiles
parentRemove old; revision bump: implement munin-asyncd support properly with an in... (diff)
downloadgentoo-2-f10e6705c84a95e92d6885947d995a46f0f65f75.tar.gz
gentoo-2-f10e6705c84a95e92d6885947d995a46f0f65f75.tar.bz2
gentoo-2-f10e6705c84a95e92d6885947d995a46f0f65f75.zip
Adjust chromium dev channel mask for chromium-23.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask23
2 files changed, 15 insertions, 13 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index a76e6f8f251e..3ccd47ca8092 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.6917 2012/08/22 23:42:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6918 2012/08/23 19:23:59 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!
+ 23 Aug 2012; Mike Gilbert <floppym@gentoo.org> package.mask:
+ Adjust chromium dev channel mask for chromium-23.
+
22 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> package.mask:
Remove mask on freeipmi. New version is in tree.
diff --git a/profiles/package.mask b/profiles/package.mask
index 0f0537617c67..0bfceea09073 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14069 2012/08/22 23:42:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14070 2012/08/23 19:23:59 floppym 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,16 @@
#--- END OF EXAMPLES ---
+# Mike Gilbert <floppym@gentoo.org> (23 Aug 2012)
+# Dev channel releases are only for people who are developers or want more
+# experimental features and accept a more unstable release.
+>=www-client/chromium-23
+>=www-client/google-chrome-23
+
+# Mike Gilbert <floppym@gentoo.org> (23 Aug 2012)
+# Mask v8 versions used for www-client/chromium dev channel releases.
+>=dev-lang/v8-3.13
+
# Julian Ospald <hasufell@gentoo.org> (19 Aug 2012)
# Masked for removal in 30 days
# games-strategy/megaglest supersedes games-strategy/glest
@@ -173,13 +183,6 @@ dev-ruby/mail:0
# binary package in his overlay. (layman -a xmw)
=app-misc/jbidwatcher-1*
-# Mike Gilbert <floppym@gentoo.org> (09 Jul 2012)
-# Dev channel releases are only for people who are developers or want more
-# experimental features and accept a more unstable release.
->=www-client/chromium-22
->=www-client/google-chrome-22
->=dev-lang/nacl-toolchain-newlib-0_p9093
-
# Diego Elio Pettenò <flameeyes@gentoo.org> (08 Jul 2012)
# Dead upstream (domain is gone as well), very bad code.
# If possible use net-ftp/tftp-hpa; if that is not possible, we're
@@ -219,10 +222,6 @@ dev-python/sexy-python
# dead on upstream, fails on gcc-4.7
=media-plugins/vdr-cdda-0.1.0-r1
-# Mike Gilbert <floppym@gentoo.org> (29 Jun 2012)
-# Mask v8 versions used for www-client/chromium dev channel releases.
->=dev-lang/v8-3.12
-
# Michael Weber <xmw@gentoo.org> (29 Jun 2012)
# Masking for security reasons (bug 424025, CVE-2012-3366)
# Users of trigger plugin, update asap.