From: Michał Górny <mgorny@gentoo.org>
Date: Mon, 5 Nov 2012 08:32:05 +0000 (+0100)
Subject: COLLISION_IGNORE jython compiled modules as well.
X-Git-Tag: v2.2.0_alpha143~48
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b7bab7e4ba071e2a23d124b476698fd12741c4c4;p=portage.git

COLLISION_IGNORE jython compiled modules as well.

Jython names its compiled modules *$py.class.
---

diff --git a/cnf/make.globals b/cnf/make.globals
index 47ee787c6..80a68f7d6 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -63,7 +63,7 @@ FEATURES="assume-digests binpkg-logs
 # Ignore file collisions for unowned *.pyo and *.pyc files, this helps during
 # transition from compiling python modules in live file system to compiling
 # them in src_install() function.
-COLLISION_IGNORE="/lib/modules/* *.py[co]"
+COLLISION_IGNORE="/lib/modules/* *.py[co] *\$py.class"
 UNINSTALL_IGNORE="/lib/modules/*"
 
 # By default wait 5 secs before cleaning a package