1 |
patrick 15/01/31 02:49:39 |
2 |
|
3 |
Modified: ChangeLog distutils-r1.eclass |
4 |
Log: |
5 |
Fix for setuptools failures #534058 etc. |
6 |
|
7 |
Revision Changes Path |
8 |
1.1518 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1518&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1518&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1517&r2=1.1518 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.1517 |
18 |
retrieving revision 1.1518 |
19 |
diff -u -r1.1517 -r1.1518 |
20 |
--- ChangeLog 29 Jan 2015 09:59:51 -0000 1.1517 |
21 |
+++ ChangeLog 31 Jan 2015 02:49:39 -0000 1.1518 |
22 |
@@ -1,6 +1,9 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1517 2015/01/29 09:59:51 pacho Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1518 2015/01/31 02:49:39 patrick Exp $ |
27 |
+ |
28 |
+ 31 Jan 2015; Patrick Lauer <patrick@g.o> distutils-r1.eclass: |
29 |
+ Fix for setuptools failures #534058 etc. |
30 |
|
31 |
29 Jan 2015; Pacho Ramos <pacho@g.o> gnome2.eclass: |
32 |
Drop support for eapi0 and 1 (#530046) |
33 |
|
34 |
|
35 |
|
36 |
1.110 eclass/distutils-r1.eclass |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.110&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.110&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?r1=1.109&r2=1.110 |
41 |
|
42 |
Index: distutils-r1.eclass |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v |
45 |
retrieving revision 1.109 |
46 |
retrieving revision 1.110 |
47 |
diff -u -r1.109 -r1.110 |
48 |
--- distutils-r1.eclass 13 Jan 2015 21:34:55 -0000 1.109 |
49 |
+++ distutils-r1.eclass 31 Jan 2015 02:49:39 -0000 1.110 |
50 |
@@ -1,6 +1,6 @@ |
51 |
# Copyright 1999-2015 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.109 2015/01/13 21:34:55 mgorny Exp $ |
54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.110 2015/01/31 02:49:39 patrick Exp $ |
55 |
|
56 |
# @ECLASS: distutils-r1 |
57 |
# @MAINTAINER: |
58 |
@@ -754,11 +754,18 @@ |
59 |
fi |
60 |
} |
61 |
|
62 |
+_clean_egg_info() { |
63 |
+ # Work around for setuptools test behavior (bug 534058). |
64 |
+ # https://bitbucket.org/pypa/setuptools/issue/292 |
65 |
+ rm -rf "${BUILD_DIR}"/lib/*.egg-info |
66 |
+} |
67 |
+ |
68 |
distutils-r1_src_test() { |
69 |
debug-print-function ${FUNCNAME} "${@}" |
70 |
|
71 |
if declare -f python_test >/dev/null; then |
72 |
_distutils-r1_run_foreach_impl python_test |
73 |
+ _distutils-r1_run_foreach_impl _clean_egg_info |
74 |
fi |
75 |
|
76 |
if declare -f python_test_all >/dev/null; then |