From: Michał Górny Date: Thu, 9 Aug 2018 07:44:38 +0000 (+0200) Subject: profiles/base: Remove COLLISION_IGNORE for Python compiled mods X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=a75834757ba6574c49ade0c1c8edf00f56e05f07;p=gentoo.git profiles/base: Remove COLLISION_IGNORE for Python compiled mods Remove the obsolete COLLISION_IGNORE entries for compiled Python modules. Those entries were historically added to ease the migration from python.eclass to python-r1 which involved taking ownership of compiled module files. Nowadays they are rather irrelevant given that python.eclass is gone for a while, and protect-owned is the default. Also, the Jython variant happens to have invalid syntax. Closes: https://bugs.gentoo.org/663170 --- diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults index 01744a72fa90..a0a1d4f977ba 100644 --- a/profiles/base/make.defaults +++ b/profiles/base/make.defaults @@ -135,10 +135,9 @@ PYTHON_SINGLE_TARGET="python3_6" # Michał Górny (10 Aug 2013) # Moved from portage's make.globals. # 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). +# 2,3) removed wrt bug #663170, # 4) protect /var/{run,lock} symlinks for bug 519620 -COLLISION_IGNORE="/lib/modules/* *.py[co] *\$py.class */dropin.cache" +COLLISION_IGNORE="/lib/modules/*" UNINSTALL_IGNORE="/lib/modules/* /var/run /var/lock" # Andreas K. Hüttel (23 Aug 2013)