summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask3
2 files changed, 6 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 2f9f018adff3..707fc82d92a6 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.7112 2012/11/06 11:23:39 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7113 2012/11/06 22:30:01 tampakrap 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!
+ 06 Nov 2012; Theo Chatzimichos <tampakrap@gentoo.org> package.mask:
+ Add puppet-syntax in p.mask as well
+
06 Nov 2012; Eray Aslan <eras@gentoo.org> package.mask:
mail-mta/nbsmtp is no longer in the tree - remove mask
diff --git a/profiles/package.mask b/profiles/package.mask
index 05c0e31f2d41..00b29c8bb1a9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14197 2012/11/06 19:05:05 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14198 2012/11/06 22:30:01 tampakrap 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
@@ -34,6 +34,7 @@
# Christian Ruppert <idl0r@gentoo.org> (06 Nov 2012)
# Mask for testing
=app-admin/puppet-3*
+=app-vim/puppet-syntax-3*
# Diego Elio Pettenò <flameeyes@gentoo.org> (05 Nov 2012)
# Masked for testing