1 |
jlec 10/04/25 09:24:24 |
2 |
|
3 |
Modified: ChangeLog apbs-1.2.1b-r2.ebuild |
4 |
Log: |
5 |
Python ABI fixes, #316165 |
6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.28 sci-chemistry/apbs/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/ChangeLog?rev=1.28&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/ChangeLog?rev=1.28&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/ChangeLog?r1=1.27&r2=1.28 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v |
18 |
retrieving revision 1.27 |
19 |
retrieving revision 1.28 |
20 |
diff -u -r1.27 -r1.28 |
21 |
--- ChangeLog 30 Mar 2010 07:02:46 -0000 1.27 |
22 |
+++ ChangeLog 25 Apr 2010 09:24:23 -0000 1.28 |
23 |
@@ -1,6 +1,9 @@ |
24 |
# ChangeLog for sci-chemistry/apbs |
25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.27 2010/03/30 07:02:46 jlec Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.28 2010/04/25 09:24:23 jlec Exp $ |
28 |
+ |
29 |
+ 25 Apr 2010; Justin Lecher <jlec@g.o> apbs-1.2.1b-r2.ebuild: |
30 |
+ Python ABI fixes, #316165 |
31 |
|
32 |
30 Mar 2010; Justin Lecher <jlec@g.o> apbs-1.2.1b-r2.ebuild, |
33 |
metadata.xml: |
34 |
|
35 |
|
36 |
|
37 |
1.3 sci-chemistry/apbs/apbs-1.2.1b-r2.ebuild |
38 |
|
39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/apbs-1.2.1b-r2.ebuild?rev=1.3&view=markup |
40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/apbs-1.2.1b-r2.ebuild?rev=1.3&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/apbs-1.2.1b-r2.ebuild?r1=1.2&r2=1.3 |
42 |
|
43 |
Index: apbs-1.2.1b-r2.ebuild |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.2.1b-r2.ebuild,v |
46 |
retrieving revision 1.2 |
47 |
retrieving revision 1.3 |
48 |
diff -u -r1.2 -r1.3 |
49 |
--- apbs-1.2.1b-r2.ebuild 30 Mar 2010 07:02:46 -0000 1.2 |
50 |
+++ apbs-1.2.1b-r2.ebuild 25 Apr 2010 09:24:23 -0000 1.3 |
51 |
@@ -1,10 +1,10 @@ |
52 |
# Copyright 1999-2010 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.2.1b-r2.ebuild,v 1.2 2010/03/30 07:02:46 jlec Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.2.1b-r2.ebuild,v 1.3 2010/04/25 09:24:23 jlec Exp $ |
56 |
|
57 |
EAPI="3" |
58 |
|
59 |
-PYTHON_DEPEND="2" |
60 |
+PYTHON_DEPEND="python? 2" |
61 |
FORTRAN="g77 gfortran ifc" |
62 |
|
63 |
inherit autotools eutils flag-o-matic fortran python versionator |
64 |
@@ -24,7 +24,6 @@ |
65 |
DEPEND=" |
66 |
dev-libs/maloc[mpi=] |
67 |
blas? ( virtual/blas ) |
68 |
- python? ( dev-lang/python ) |
69 |
sys-libs/readline |
70 |
arpack? ( sci-libs/arpack ) |
71 |
mpi? ( virtual/mpi )" |
72 |
@@ -32,6 +31,10 @@ |
73 |
|
74 |
S="${WORKDIR}"/"${MY_P}-source" |
75 |
|
76 |
+pkg_setup() { |
77 |
+ use python && python_set_active_version 2 |
78 |
+} |
79 |
+ |
80 |
src_prepare() { |
81 |
epatch "${FILESDIR}"/${P}-openmp.patch |
82 |
epatch "${FILESDIR}"/${P}-install-fix.patch |
83 |
@@ -126,9 +129,9 @@ |
84 |
} |
85 |
|
86 |
pkg_postinst() { |
87 |
- python_mod_optimize /usr/$(python_get_sitedir)/${PN} |
88 |
+ python_mod_optimize ${EPREFIX}/usr/$(python_get_sitedir)/${PN} |
89 |
} |
90 |
|
91 |
pkg_postrm() { |
92 |
- python_mod_cleanup /usr/$(python_get_sitedir)/${PN} |
93 |
+ python_mod_cleanup ${EPREFIX}/usr/$(python_get_sitedir)/${PN} |
94 |
} |