summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2012-01-05 20:31:00 +0000
committerMike Gilbert <floppym@gentoo.org>2012-01-05 20:31:00 +0000
commite9c6443c83a8835a5be02c3cc3e8f9b1f6c2abe2 (patch)
tree1a8d6a40c2c38afee9bce66a57f06191f29c8cdd /profiles
parentBeta channel bump. (diff)
downloadgentoo-2-e9c6443c83a8835a5be02c3cc3e8f9b1f6c2abe2.tar.gz
gentoo-2-e9c6443c83a8835a5be02c3cc3e8f9b1f6c2abe2.tar.bz2
gentoo-2-e9c6443c83a8835a5be02c3cc3e8f9b1f6c2abe2.zip
Update mask for chrome dev channel; 17.x is now the beta channel.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask27
2 files changed, 15 insertions, 17 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 5fad9f0b41b0..907a5955a9bd 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.6076 2012/01/05 19:03:47 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6077 2012/01/05 20:31:00 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!
+ 05 Jan 2012; Mike Gilbert <floppym@gentoo.org> package.mask:
+ Update mask for chrome dev channel; 17.x is now the beta channel.
+
05 Jan 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
package.mask:
Mask one more x11 prerelease package.
diff --git a/profiles/package.mask b/profiles/package.mask
index 68e485f00fbc..da8d0daf8d4f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13376 2012/01/05 19:03:47 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13377 2012/01/05 20:31:00 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> (05 Jan 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-18
+>=www-client/google-chrome-18
+
+# Mike Gilbert <floppym@gentoo.org> (05 Jan 2012)
+# Mask v8 versions used for www-client/chromium dev channel releases.
+>=dev-lang/v8-3.8
+
# Mike Pagano <mpagano@gentoo.org> (04 Jan 2012)
# Mask for testing
>=app-portage/portpeek-2.0.17
@@ -278,21 +288,6 @@ net-mail/vmailmgr-tools
# Pre-releases of vlc 1.2. Mask it until final version is out
>=media-video/vlc-1.2_pre
-# Mike Gilbert <floppym@gentoo.org> (03 Nov 2011)
-# Dev channel releases are only for people who are developers or want more
-# experimental features and accept a more unstable release.
->=www-client/google-chrome-17
-
-# Pawel Hajdan jr <phajdan.jr@gentoo.org> (03 Nov 2011)
-# Dev channel releases are only for people who are developers or want more
-# experimental features and accept a more unstable release.
->=www-client/chromium-17
-
-# Pawel Hajdan jr <phajdan.jr@gentoo.org> (03 Nov 2011)
-# Mask v8 versions used for www-client/chromium dev channel releases.
-# Currently v8-3.7 versions are used for chromium-17.x versions.
->=dev-lang/v8-3.7
-
# Markos Chandras <hwoarang@gentoo.org> (31 Oct 2011)
# Masking 4.8 rc release. The ebuilds are still work in
# progress.