summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Popov <pinkbyte@gentoo.org>2012-12-13 08:47:16 +0000
committerSergey Popov <pinkbyte@gentoo.org>2012-12-13 08:47:16 +0000
commit2513a17a263efdf72276c787c572b4445e70dac8 (patch)
treea1b97e2e82a5a0bacd91385502f5bb6bc081aaf2 /profiles
parentSync live ebuild with 4.1.1 (diff)
downloadgentoo-2-2513a17a263efdf72276c787c572b4445e70dac8.tar.gz
gentoo-2-2513a17a263efdf72276c787c572b4445e70dac8.tar.bz2
gentoo-2-2513a17a263efdf72276c787c572b4445e70dac8.zip
Unmask sys-cluster/ploop and sys-cluster/vzctl
Diffstat (limited to 'profiles')
-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 cb618270a4c5..b4b6ce0a8e91 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.7245 2012/12/12 15:55:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7246 2012/12/13 08:47:16 pinkbyte 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!
+ 13 Dec 2012; Sergey Popov <pinkbyte@gentoo.org> package.mask:
+ Unmask sys-cluster/ploop and sys-cluster/vzctl
+
12 Dec 2012; Jeroen Roovers <jer@gentoo.org> package.mask:
Fix www-client/opera-12.12 mask.
diff --git a/profiles/package.mask b/profiles/package.mask
index 21dae48f2aee..70184431c7ae 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14293 2012/12/12 17:00:54 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14294 2012/12/13 08:47:16 pinkbyte 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,11 +31,6 @@
#--- END OF EXAMPLES ---
-# Sergey Popov <pinkbyte@gentoo.org> (10 Dec 2012)
-# Mask new vzctl and ploop until all deps will be fixed
->=sys-cluster/ploop-1.5
->=sys-cluster/vzctl-4.0
-
# Michał Górny <mgorny@gentoo.org> (07 Dec 2012)
# Experimental version disabling XDM-AUTHENTICATION-1 (in favor
# of MIT-MAGIC-COOKIE-1). It should fix bug #306223 but it can also