summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Albertson <ramereth@gentoo.org>2010-03-07 21:50:37 +0000
committerLance Albertson <ramereth@gentoo.org>2010-03-07 21:50:37 +0000
commit2d9e5402991553d76a88b5e6cbad5cd2dcea34fb (patch)
tree0442dc4152796e050f79e625438ed820897ec98f /profiles
parentversion bump, bug #308125 (diff)
downloadgentoo-2-2d9e5402991553d76a88b5e6cbad5cd2dcea34fb.tar.gz
gentoo-2-2d9e5402991553d76a88b5e6cbad5cd2dcea34fb.tar.bz2
gentoo-2-2d9e5402991553d76a88b5e6cbad5cd2dcea34fb.zip
Add >=net-misc/cfengine-3 mask for testing
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask7
2 files changed, 10 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 82f0b617e7fa..1515794f6a74 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4006 2010/03/07 18:35:46 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4007 2010/03/07 21:50:37 ramereth 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!
+ 07 Mar 2010; Lance Albertson <ramereth@gentoo.org> package.mask:
+ Add >=net-misc/cfengine-3 mask for testing
+
07 Mar 2010; Mark Loeser <halcy0n@gentoo.org> package.mask:
Add <sys-fs/e2fsprogs-1.41.9 to the e2fsprogs mask
diff --git a/profiles/package.mask b/profiles/package.mask
index a2d409e8d78b..f7c48899e51d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11321 2010/03/07 18:35:46 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11322 2010/03/07 21:50:37 ramereth 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 ---
+# Lance Albertson <ramereth@gentoo.org> (07 Mar 2010)
+# Cfengine 3 is mostly incompatible with Cfengine 2, so lets mask 3.x
+# for a while until a sane upgrade path can be assumed in Gentoo.
+>=net-misc/cfengine-3
+
# Mike Frysinger <vapier@gentoo.org> (07 Mar 2010)
# Very old packages that people should have upgraded away from
# long ago. Courtesy mask ... time to upgrade.