summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haubenwallner <haubi@gentoo.org>2009-07-02 13:36:33 +0000
committerMichael Haubenwallner <haubi@gentoo.org>2009-07-02 13:36:33 +0000
commit7430a3b730d2245e9bc429dbc36a929214892bf4 (patch)
treed27d40ac4fbb9a3a93421812a5f07e66a9c033ea /profiles
parentRestrict testing (bug #276210). Fix one grammatical error. (diff)
downloadgentoo-2-7430a3b730d2245e9bc429dbc36a929214892bf4.tar.gz
gentoo-2-7430a3b730d2245e9bc429dbc36a929214892bf4.tar.bz2
gentoo-2-7430a3b730d2245e9bc429dbc36a929214892bf4.zip
Mask =sys-apps/portage-2.2.00.13734, does merge in reverse order with --nodeps.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/prefix/ChangeLog6
-rw-r--r--profiles/prefix/package.mask6
2 files changed, 10 insertions, 2 deletions
diff --git a/profiles/prefix/ChangeLog b/profiles/prefix/ChangeLog
index 96a70abace78..433a67098198 100644
--- a/profiles/prefix/ChangeLog
+++ b/profiles/prefix/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for profiles/prefix
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Id: ChangeLog,v 1.20 2009/06/30 16:39:18 darkside Exp $
+# $Id: ChangeLog,v 1.21 2009/07/02 13:36:33 haubi Exp $
+
+ 02 Jul 2009; Michael Haubenwallner <haubi@gentoo.org> package.mask:
+ Mask =sys-apps/portage-2.2.00.13734, does merge in reverse order with
+ --nodeps.
30 Jun 2009; Jeremy Olexa <darkside@gentoo.org> linux/make.defaults:
Remove sandbox being enabled by default on linux prefix platforms, users can
diff --git a/profiles/prefix/package.mask b/profiles/prefix/package.mask
index db24f3466a5a..cea57faf6775 100644
--- a/profiles/prefix/package.mask
+++ b/profiles/prefix/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Id: package.mask,v 1.7 2009/06/30 15:57:34 darkside Exp $
+# $Id: package.mask,v 1.8 2009/07/02 13:36:33 haubi Exp $
# When you add an entry to this file, add your name, the date, and an
# explanation of why something is getting masked. This file is for
# Prefix profiles only!
@@ -32,6 +32,10 @@
#--- END OF EXAMPLES ---
+# Michael Haubenwallner <haubi@gentoo.org> (02 Jul 2009)
+# Does merge in reverse order with --nodeps.
+=sys-apps/portage-2.2.00.13734
+
# Jeremy Olexa <darkside@gentoo.org> (30 Jun 2009)
# The PAM auth system just will not work in Gentoo Prefix, instead the host auth
# system should be used.