1 |
arfrever 10/04/30 18:21:16 |
2 |
|
3 |
Modified: m2crypto-0.20.2.ebuild ChangeLog |
4 |
Log: |
5 |
Fix building with openssl-1.0.0 (bug #310461). |
6 |
(Portage version: HEAD/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.13 dev-python/m2crypto/m2crypto-0.20.2.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/m2crypto/m2crypto-0.20.2.ebuild?rev=1.13&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/m2crypto/m2crypto-0.20.2.ebuild?rev=1.13&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/m2crypto/m2crypto-0.20.2.ebuild?r1=1.12&r2=1.13 |
14 |
|
15 |
Index: m2crypto-0.20.2.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.20.2.ebuild,v |
18 |
retrieving revision 1.12 |
19 |
retrieving revision 1.13 |
20 |
diff -u -r1.12 -r1.13 |
21 |
--- m2crypto-0.20.2.ebuild 14 Feb 2010 18:00:53 -0000 1.12 |
22 |
+++ m2crypto-0.20.2.ebuild 30 Apr 2010 18:21:16 -0000 1.13 |
23 |
@@ -1,12 +1,13 @@ |
24 |
# Copyright 1999-2010 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.20.2.ebuild,v 1.12 2010/02/14 18:00:53 arfrever Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.20.2.ebuild,v 1.13 2010/04/30 18:21:16 arfrever Exp $ |
28 |
|
29 |
-EAPI="2" |
30 |
+EAPI="3" |
31 |
PYTHON_DEPEND="2" |
32 |
SUPPORT_PYTHON_ABIS="1" |
33 |
+DISTUTILS_SRC_TEST="setup.py" |
34 |
|
35 |
-inherit distutils eutils multilib portability |
36 |
+inherit distutils eutils |
37 |
|
38 |
MY_PN="M2Crypto" |
39 |
|
40 |
@@ -26,30 +27,34 @@ |
41 |
dev-python/setuptools" |
42 |
RESTRICT_PYTHON_ABIS="3.*" |
43 |
|
44 |
-PYTHON_MODNAME="${MY_PN}" |
45 |
- |
46 |
S="${WORKDIR}/${MY_PN}-${PV}" |
47 |
|
48 |
DOCS="CHANGES" |
49 |
+PYTHON_MODNAME="${MY_PN}" |
50 |
|
51 |
-src_test() { |
52 |
- testing() { |
53 |
- PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib*)" "$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" test |
54 |
- } |
55 |
- python_execute_function testing |
56 |
+src_prepare() { |
57 |
+ distutils_src_prepare |
58 |
+ epatch "${FILESDIR}/${P}-openssl-1.0.0.patch" |
59 |
+} |
60 |
+ |
61 |
+src_compile() { |
62 |
+ distutils_src_compile |
63 |
+ |
64 |
+ if use doc; then |
65 |
+ cd doc |
66 |
+ einfo "Generation of documentation" |
67 |
+ PYTHONPATH="$(ls -d ../build-$(PYTHON -f --ABI)/lib.*)" epydoc --html --output=api --name=M2Crypto M2Crypto || die "Generation of documentation failed" |
68 |
+ fi |
69 |
} |
70 |
|
71 |
src_install() { |
72 |
- [[ -z ${ED} ]] && local ED=${D} |
73 |
distutils_src_install |
74 |
|
75 |
if use doc; then |
76 |
- cd "${S}/demo" |
77 |
- treecopy . "${ED}/usr/share/doc/${PF}/example" |
78 |
- |
79 |
- einfo "Generating API documentation..." |
80 |
- cd "${S}/doc" |
81 |
- PYTHONPATH="${ED}$(python_get_sitedir -f)" epydoc --html --output=api --name=M2Crypto M2Crypto |
82 |
+ pushd demo > /dev/null |
83 |
+ insinto /usr/share/doc/${PF}/example |
84 |
+ doins -r * |
85 |
+ popd > /dev/null |
86 |
fi |
87 |
- dohtml -r * |
88 |
+ dohtml -r doc/* |
89 |
} |
90 |
|
91 |
|
92 |
|
93 |
1.59 dev-python/m2crypto/ChangeLog |
94 |
|
95 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/m2crypto/ChangeLog?rev=1.59&view=markup |
96 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/m2crypto/ChangeLog?rev=1.59&content-type=text/plain |
97 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/m2crypto/ChangeLog?r1=1.58&r2=1.59 |
98 |
|
99 |
Index: ChangeLog |
100 |
=================================================================== |
101 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v |
102 |
retrieving revision 1.58 |
103 |
retrieving revision 1.59 |
104 |
diff -u -r1.58 -r1.59 |
105 |
--- ChangeLog 14 Feb 2010 18:00:53 -0000 1.58 |
106 |
+++ ChangeLog 30 Apr 2010 18:21:16 -0000 1.59 |
107 |
@@ -1,6 +1,10 @@ |
108 |
# ChangeLog for dev-python/m2crypto |
109 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
110 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.58 2010/02/14 18:00:53 arfrever Exp $ |
111 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.59 2010/04/30 18:21:16 arfrever Exp $ |
112 |
+ |
113 |
+ 30 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o> |
114 |
+ m2crypto-0.20.2.ebuild, +files/m2crypto-0.20.2-openssl-1.0.0.patch: |
115 |
+ Fix building with openssl-1.0.0 (bug #310461). |
116 |
|
117 |
14 Feb 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o> |
118 |
m2crypto-0.20.2.ebuild: |