1 |
arfrever 09/12/30 01:40:59 |
2 |
|
3 |
Modified: ChangeLog pyxml-0.8.4-r2.ebuild |
4 |
Log: |
5 |
Fix tests with Python 2.7 (bug #298930). |
6 |
(Portage version: 15154-svn/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.60 dev-python/pyxml/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyxml/ChangeLog?rev=1.60&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyxml/ChangeLog?rev=1.60&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyxml/ChangeLog?r1=1.59&r2=1.60 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/pyxml/ChangeLog,v |
18 |
retrieving revision 1.59 |
19 |
retrieving revision 1.60 |
20 |
diff -u -r1.59 -r1.60 |
21 |
--- ChangeLog 11 Oct 2009 11:31:35 -0000 1.59 |
22 |
+++ ChangeLog 30 Dec 2009 01:40:59 -0000 1.60 |
23 |
@@ -1,6 +1,10 @@ |
24 |
# ChangeLog for dev-python/pyxml |
25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxml/ChangeLog,v 1.59 2009/10/11 11:31:35 grobian Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxml/ChangeLog,v 1.60 2009/12/30 01:40:59 arfrever Exp $ |
28 |
+ |
29 |
+ 30 Dec 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o> |
30 |
+ pyxml-0.8.4-r2.ebuild: |
31 |
+ Fix tests with Python 2.7 (bug #298930). |
32 |
|
33 |
11 Oct 2009; Fabian Groffen <grobian@g.o> pyxml-0.8.4-r2.ebuild: |
34 |
Merge from Prefix |
35 |
|
36 |
|
37 |
|
38 |
1.12 dev-python/pyxml/pyxml-0.8.4-r2.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyxml/pyxml-0.8.4-r2.ebuild?rev=1.12&view=markup |
41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyxml/pyxml-0.8.4-r2.ebuild?rev=1.12&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyxml/pyxml-0.8.4-r2.ebuild?r1=1.11&r2=1.12 |
43 |
|
44 |
Index: pyxml-0.8.4-r2.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/pyxml/pyxml-0.8.4-r2.ebuild,v |
47 |
retrieving revision 1.11 |
48 |
retrieving revision 1.12 |
49 |
diff -u -r1.11 -r1.12 |
50 |
--- pyxml-0.8.4-r2.ebuild 11 Oct 2009 11:31:35 -0000 1.11 |
51 |
+++ pyxml-0.8.4-r2.ebuild 30 Dec 2009 01:40:59 -0000 1.12 |
52 |
@@ -1,6 +1,6 @@ |
53 |
# Copyright 1999-2009 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxml/pyxml-0.8.4-r2.ebuild,v 1.11 2009/10/11 11:31:35 grobian Exp $ |
56 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxml/pyxml-0.8.4-r2.ebuild,v 1.12 2009/12/30 01:40:59 arfrever Exp $ |
57 |
|
58 |
EAPI="2" |
59 |
SUPPORT_PYTHON_ABIS="1" |
60 |
@@ -29,7 +29,11 @@ |
61 |
|
62 |
src_prepare(){ |
63 |
distutils_src_prepare |
64 |
+ |
65 |
epatch "${FILESDIR}/${P}-python-2.6.patch" |
66 |
+ |
67 |
+ # Delete internal copy of old version of unittest module. |
68 |
+ rm -f test/unittest.py |
69 |
} |
70 |
|
71 |
src_compile() { |
72 |
@@ -42,7 +46,7 @@ |
73 |
fi |
74 |
|
75 |
# use the already-installed shared copy of libexpat |
76 |
- distutils_src_compile --with-libexpat="${EPREFIX}"/usr ${myconf} |
77 |
+ distutils_src_compile --with-libexpat="${EPREFIX}/usr" ${myconf} |
78 |
} |
79 |
src_test() { |
80 |
cd test |
81 |
@@ -53,7 +57,7 @@ |
82 |
} |
83 |
|
84 |
src_install() { |
85 |
- [[ -z ${ED} ]] && local ED=${D} |
86 |
+ [[ -z "${ED}" ]] && local ED="${D}" |
87 |
distutils_src_install |
88 |
|
89 |
doman doc/man/* |
90 |
@@ -61,5 +65,5 @@ |
91 |
dohtml -A api,web -r doc/* |
92 |
insinto /usr/share/doc/${PF} && doins doc/*.tex |
93 |
fi |
94 |
- use examples && cp -r demo "${ED}"/usr/share/doc/${PF} |
95 |
+ use examples && cp -r demo "${ED}usr/share/doc/${PF}" |
96 |
} |