Gentoo Archives: gentoo-commits

From: Jauhien Piatlicki <jauhien@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/petsc/
Date: Mon, 01 Sep 2014 13:06:36
Message-Id: 1409576737.da574aba923a790a2af6c043f5a3f94a0659bf53.jauhien@gentoo
1 commit: da574aba923a790a2af6c043f5a3f94a0659bf53
2 Author: Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 1 13:05:37 2014 +0000
4 Commit: Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 1 13:05:37 2014 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=da574aba
7
8 sci-mathematics/petsc: make configure work on systems with default python3 interpreter
9
10 ---
11 sci-mathematics/petsc/ChangeLog | 4 ++++
12 sci-mathematics/petsc/petsc-3.4.2.ebuild | 6 +++++-
13 sci-mathematics/petsc/petsc-3.5.1.ebuild | 6 +++++-
14 3 files changed, 14 insertions(+), 2 deletions(-)
15
16 diff --git a/sci-mathematics/petsc/ChangeLog b/sci-mathematics/petsc/ChangeLog
17 index f963803..a0fd4a7 100644
18 --- a/sci-mathematics/petsc/ChangeLog
19 +++ b/sci-mathematics/petsc/ChangeLog
20 @@ -2,6 +2,10 @@
21 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
22 # $Header: $
23
24 + 01 Sep 2014; Jauhien Piatlicki <jauhien@g.o> petsc-3.4.2.ebuild,
25 + petsc-3.5.1.ebuild:
26 + make configure work on systems with default python3 interpreter
27 +
28 06 Jan 2014; Justin Lecher <jlec@g.o> -petsc-3.3_p5.ebuild,
29 petsc-3.4.2.ebuild, metadata.xml:
30 Punt base.eclass
31
32 diff --git a/sci-mathematics/petsc/petsc-3.4.2.ebuild b/sci-mathematics/petsc/petsc-3.4.2.ebuild
33 index 5263263..065c95d 100644
34 --- a/sci-mathematics/petsc/petsc-3.4.2.ebuild
35 +++ b/sci-mathematics/petsc/petsc-3.4.2.ebuild
36 @@ -4,7 +4,9 @@
37
38 EAPI=5
39
40 -inherit eutils flag-o-matic fortran-2 toolchain-funcs versionator
41 +PYTHON_COMPAT=( python2_7 )
42 +
43 +inherit eutils flag-o-matic fortran-2 python-any-r1 toolchain-funcs versionator
44
45 MY_P="${PN}-$(replace_version_separator _ -)"
46
47 @@ -49,6 +51,7 @@ RDEPEND="
48 # imagemagick? ( media-gfx/imagemagick )
49
50 DEPEND="${RDEPEND}
51 + ${PYTHON_DEPS}
52 virtual/pkgconfig
53 dev-util/cmake
54 "
55 @@ -66,6 +69,7 @@ S="${WORKDIR}/${MY_P}"
56
57 src_prepare() {
58 epatch "${FILESDIR}"/${P%_*}-disable-rpath.patch
59 + sed -i -e 's%/usr/bin/env python%/usr/bin/env python2%' configure || die
60 }
61
62 src_configure() {
63
64 diff --git a/sci-mathematics/petsc/petsc-3.5.1.ebuild b/sci-mathematics/petsc/petsc-3.5.1.ebuild
65 index bacf55e..147c36b 100644
66 --- a/sci-mathematics/petsc/petsc-3.5.1.ebuild
67 +++ b/sci-mathematics/petsc/petsc-3.5.1.ebuild
68 @@ -4,7 +4,9 @@
69
70 EAPI=5
71
72 -inherit eutils flag-o-matic fortran-2 toolchain-funcs versionator
73 +PYTHON_COMPAT=( python2_7 )
74 +
75 +inherit eutils flag-o-matic fortran-2 python-any-r1 toolchain-funcs versionator
76
77 MY_P="${PN}-$(replace_version_separator _ -)"
78
79 @@ -50,6 +52,7 @@ RDEPEND="
80 # imagemagick? ( media-gfx/imagemagick )
81
82 DEPEND="${RDEPEND}
83 + ${PYTHON_DEPS}
84 virtual/pkgconfig
85 dev-util/cmake
86 "
87 @@ -67,6 +70,7 @@ S="${WORKDIR}/${MY_P}"
88
89 src_prepare() {
90 epatch "${FILESDIR}"/${P%_*}-disable-rpath.patch
91 + sed -i -e 's%/usr/bin/env python%/usr/bin/env python2%' configure || die
92 }
93
94 src_configure() {