From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 23 Jun 2012 20:39:27 +0000 (-0700)
Subject: Skip unmerge of libdir symlinks for bug #423127.
X-Git-Tag: v2.2.0_alpha112
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e0fa8f389867d78438451ed4a8b1af1ea89b65b6;p=portage.git

Skip unmerge of libdir symlinks for bug #423127.
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index e2b1b9bb2..020240d61 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2181,6 +2181,12 @@ class dblink(object):
 						ignore = True
 						break
 
+				if not ignore:
+					if islink and f_match in \
+						("/lib", "/usr/lib", "/usr/local/lib"):
+						# Ignore libdir symlinks for bug #423127.
+						ignore = True
+
 				if ignore:
 					show_unmerge("---", unmerge_desc["cfgpro"], file_type, obj)
 					continue