summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2014-04-16 19:45:44 +0000
committerMike Gilbert <floppym@gentoo.org>2014-04-16 19:45:44 +0000
commitb651e6933d59346a1d14bb3b0f8c0eb9c70103f4 (patch)
tree8d9cb980a40a8e38b476dded6771865570153e5b
parentDev channel bump. (diff)
downloadgentoo-2-b651e6933d59346a1d14bb3b0f8c0eb9c70103f4.tar.gz
gentoo-2-b651e6933d59346a1d14bb3b0f8c0eb9c70103f4.tar.bz2
gentoo-2-b651e6933d59346a1d14bb3b0f8c0eb9c70103f4.zip
Roll dev channel mask for chromium-36.
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask12
2 files changed, 10 insertions, 7 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index a9ef8a11be10..1a2378f04ffc 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8826 2014/04/16 07:34:41 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8827 2014/04/16 19:45:44 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!
+ 16 Apr 2014; Mike Gilbert <floppym@gentoo.org> package.mask:
+ Roll dev channel mask for chromium-36.
+
16 Apr 2014; Alexey Shvetsov <alexxy@gentoo.org> desc/ofed_drivers.desc:
Add new ib drivers description
diff --git a/profiles/package.mask b/profiles/package.mask
index e787a94c0d37..fa282a7bccd3 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15570 2014/04/15 15:49:30 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15571 2014/04/16 19:45:44 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
@@ -30,6 +30,11 @@
#--- END OF EXAMPLES ---
+# Mike Gilbert <floppym@gentoo.org> (16 Apr 2014)
+# Dev channel releases are only for people who are developers or want more
+# experimental features and accept a more unstable release.
+>=www-client/chromium-36
+
# Johannes Huber <johu@gentoo.org> (14 Apr 2014)
# Masked for removal in 30 days. Superseeded by kde-misc/plasma-nm.
# Acknowledged and marked as deprecated by upstream.
@@ -420,11 +425,6 @@ dev-libs/libgcrypt:11
>=sys-apps/file-5.18-r1
>=app-emulation/emul-linux-x86-baselibs-20131008-r22
-# Pawel Hajdan jr <phajdan.jr@gentoo.org> (27 Feb 2014)
-# Dev channel releases are only for people who are developers or want more
-# experimental features and accept a more unstable release.
->=www-client/chromium-35
-
# Tom Wijsman <TomWij@gentoo.org> (21 Feb 2014)
# MATE Desktop Environment >=1.7 introduction mask:
#