base/make.defaults: Use UNINSTALL_IGNORE to protect /var/{run,lock} symlinks for...

diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index 7ba5fdbcd83770a1535f2d0fc090f956e9857061..2a6608d7b58d64cbcbefdff096b7c3c17c5a40d2 100644 (file)
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo base-profile
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.771 2015/02/18 07:41:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.772 2015/02/20 01:33:38 zmedico Exp $
+
+  20 Feb 2015; Zac Medico <zmedico@gentoo.org> make.defaults:
+  Use UNINSTALL_IGNORE to protect /var/{run,lock} symlinks for bug 519620.
 
   18 Feb 2015; Alexandre Rostovtsev <tetromino@gentoo.org> package.use.mask:
   Mask cairo[openvg], experimental backend, no longer supported with

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 62a16a5740af65a7598f5abf748e99abbc4f6d51..31614900e3e34b73518aac373a929e259f410e0f 100644 (file)
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.122 2015/02/01 20:02:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.123 2015/02/20 01:33:38 zmedico Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -132,8 +132,9 @@ PYTHON_SINGLE_TARGET="python2_7"
 # 1) do not uninstall kernel modules and therefore allow replacing them,
 # 2) allow replacing unowned compiled Python modules (python-r1 migration),
 # 3) allow replacing unowned dropin.cache files (twisted-r1 migration).
+# 4) protect /var/{run,lock} symlinks for bug 519620
 COLLISION_IGNORE="/lib/modules/* *.py[co] *\$py.class */dropin.cache"
-UNINSTALL_IGNORE="/lib/modules/*"
+UNINSTALL_IGNORE="/lib/modules/* /var/run /var/lock"
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (23 Aug 2013)
 # Make emerge messages default to English as per Council decision