summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2018-08-09 09:44:38 +0200
committerMichał Górny <mgorny@gentoo.org>2018-08-09 10:40:01 +0200
commita75834757ba6574c49ade0c1c8edf00f56e05f07 (patch)
tree269cbb0f1a734786dbf7f845f8fcabf7fa8b1d8a /profiles
parentdev-ros/urg_c: bump to 1.0.405 (diff)
downloadgentoo-a75834757ba6574c49ade0c1c8edf00f56e05f07.tar.gz
gentoo-a75834757ba6574c49ade0c1c8edf00f56e05f07.tar.bz2
gentoo-a75834757ba6574c49ade0c1c8edf00f56e05f07.zip
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
Diffstat (limited to 'profiles')
-rw-r--r--profiles/base/make.defaults5
1 files changed, 2 insertions, 3 deletions
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 <mgorny@gentoo.org> (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 <dilfridge@gentoo.org> (23 Aug 2013)