Fix for setuptools failures #534058 etc.

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index fe8fa7ac4f7a94cda2d2269386f2b68baffa3eec..e3dcedeedb2ca86204918c764f3609ace3a9f844 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1517 2015/01/29 09:59:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1518 2015/01/31 02:49:39 patrick Exp $
+
+  31 Jan 2015; Patrick Lauer <patrick@gentoo.org> distutils-r1.eclass:
+  Fix for setuptools failures #534058 etc.
 
   29 Jan 2015; Pacho Ramos <pacho@gentoo.org> gnome2.eclass:
   Drop support for eapi0 and 1 (#530046)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 3c58c12c9732ca307379e1036e9db673e9c36382..8dade7b260b315b44f1cf33ed7ddf67e313c670a 100644 (file)
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -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/eclass/distutils-r1.eclass,v 1.109 2015/01/13 21:34:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.110 2015/01/31 02:49:39 patrick Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -754,11 +754,18 @@ distutils-r1_src_compile() {
        fi
 }
 
+_clean_egg_info() {
+       # Work around for setuptools test behavior (bug 534058).
+       # https://bitbucket.org/pypa/setuptools/issue/292
+       rm -rf "${BUILD_DIR}"/lib/*.egg-info
+}
+
 distutils-r1_src_test() {
        debug-print-function ${FUNCNAME} "${@}"
 
        if declare -f python_test >/dev/null; then
                _distutils-r1_run_foreach_impl python_test
+               _distutils-r1_run_foreach_impl _clean_egg_info
        fi
 
        if declare -f python_test_all >/dev/null; then