summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2012-11-09 02:13:38 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2012-11-09 02:13:38 +0000
commit0e6b012b18d1eef6941843d60a2951a032703da9 (patch)
tree6521e8cb6787d9270f60a0f8bc88538935fd96b0
parentBeta channel bump. (diff)
downloadgentoo-2-0e6b012b18d1eef6941843d60a2951a032703da9.tar.gz
gentoo-2-0e6b012b18d1eef6941843d60a2951a032703da9.tar.bz2
gentoo-2-0e6b012b18d1eef6941843d60a2951a032703da9.zip
Roll chromium package masks (24 -> 25).
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask22
2 files changed, 15 insertions, 12 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 3a37f3b6a2ab..3132292257a6 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.7122 2012/11/08 16:12:51 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7123 2012/11/09 02:13:38 phajdan.jr 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!
+ 09 Nov 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> package.mask:
+ Roll chromium package masks (24 -> 25).
+
08 Nov 2012; Tony Vroon <chainsaw@gentoo.org> package.mask:
Remove Asterisk 11 branch mask; the second release is out and initial tests
have been very positive.
diff --git a/profiles/package.mask b/profiles/package.mask
index ab8c1687a0fd..c99e38af64be 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14204 2012/11/08 16:12:51 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14205 2012/11/09 02:13:38 phajdan.jr 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 ---
+# Pawel Hajdan jr <phajdan.jr@gentoo.org> (08 Nov 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-25
+>=www-client/google-chrome-25
+
+# Pawel Hajdan jr <phajdan.jr@gentoo.org> (08 Nov 2012)
+# Mask v8 versions used for www-client/chromium dev channel releases.
+>=dev-lang/v8-3.15
+
# Christian Ruppert <idl0r@gentoo.org> (06 Nov 2012)
# Mask for testing
=app-admin/puppet-3*
@@ -284,16 +294,6 @@ app-i18n/ibus-table-cantonese
app-i18n/ibus-table-xingma
app-i18n/ibus-table-yinma
-# Mike Gilbert <floppym@gentoo.org> (02 Oct 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-24
->=www-client/google-chrome-24
-
-# Mike Gilbert <floppym@gentoo.org> (02 Oct 2012)
-# Mask v8 versions used for www-client/chromium dev channel releases.
->=dev-lang/v8-3.14
-
# Samuli Suominen <ssuominen@gentoo.org> (25 Sep 2012)
# Only package in tree incompatible with the new libmp4v2 API
# Bug 424089