summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask7
2 files changed, 5 insertions, 7 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 3ff5051527bf..8ff6b267495a 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.7292 2012/12/25 14:05:13 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7293 2012/12/25 14:46:40 idl0r 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!
+ 25 Dec 2012; Christian Ruppert <idl0r@gentoo.org> package.mask:
+ Unmask puppet-3*, works very well so far
+
25 Dec 2012; Pacho Ramos <pacho@gentoo.org> package.mask:
Clean mask entries
diff --git a/profiles/package.mask b/profiles/package.mask
index f0d9f16fe204..5d40d9b02dbf 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14327 2012/12/25 14:05:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14328 2012/12/25 14:46:40 idl0r 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
@@ -169,11 +169,6 @@ dev-vcs/gitosis-gentoo
# 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*
-=app-vim/puppet-syntax-3*
-
# Joerg Bornkessel <hd_brummy@gentoo.org> (04 Nov 2012)
# masked for testing, bug #422605
=media-plugins/vdr-softdevice-0.5.0.20110417