diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2015-01-31 02:49:39 +0000 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2015-01-31 02:49:39 +0000 |
| commit | febb3c0145c5b50b81f2345b2005ee0f1141cdf9 (patch) | |
| tree | 737ea6f0d1ee0aca59501523201c24b088763bb7 /eclass | |
| parent | Move test deps to DEPEND, fix quoting, make repoman happy (diff) | |
| download | historical-febb3c0145c5b50b81f2345b2005ee0f1141cdf9.tar.gz historical-febb3c0145c5b50b81f2345b2005ee0f1141cdf9.tar.bz2 historical-febb3c0145c5b50b81f2345b2005ee0f1141cdf9.zip | |
Fix for setuptools failures #534058 etc.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/distutils-r1.eclass | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index fe8fa7ac4f7a..e3dcedeedb2c 100644 --- 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 3c58c12c9732..8dade7b260b3 100644 --- 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 |