summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2013-01-14 21:01:33 +0000
committerMike Gilbert <floppym@gentoo.org>2013-01-14 21:01:33 +0000
commit078dab256053da250469629a278c6d6183823dd0 (patch)
tree67786cab955a8143f29d9be55a6f4998a49cbcb3 /profiles
parentupdate the emerge procedure for udev consumers to use qfile. Thanks to Paul V... (diff)
downloadgentoo-2-078dab256053da250469629a278c6d6183823dd0.tar.gz
gentoo-2-078dab256053da250469629a278c6d6183823dd0.tar.bz2
gentoo-2-078dab256053da250469629a278c6d6183823dd0.zip
Update google-chrome mask; it is not affected by the masked dependencies.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask8
2 files changed, 10 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 534c51d58de2..2e5e6aca1ee8 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,12 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7358 2013/01/14 20:56:25 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7359 2013/01/14 21:01:33 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!
14 Jan 2013; Mike Gilbert <floppym@gentoo.org> package.mask:
+ Update google-chrome mask; it is not affected by the masked dependencies.
+
+ 14 Jan 2013; Mike Gilbert <floppym@gentoo.org> package.mask:
Revert last change due to bad dependencies.
14 Jan 2013; Mike Gilbert <floppym@gentoo.org> package.mask:
diff --git a/profiles/package.mask b/profiles/package.mask
index 739f47e524c1..b05122e0537b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14373 2013/01/14 20:56:25 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14374 2013/01/14 21:01:33 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,11 @@
#--- END OF EXAMPLES ---
+# Mike Gilbert <floppym@gentoo.org> (13 Jan 2013)
+# 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-26
+
# Tim Harder <radhermit@gentoo.org> (13 Jan 2013)
# Masked for testing
=mail-client/roundcube-0.9*
@@ -346,7 +351,6 @@ dev-vcs/gitosis-gentoo
# 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.