| 1 |
jlec 10/04/25 10:00:50 |
| 2 |
|
| 3 |
Modified: vtk-5.4.2-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Python ABI fixes, #316229 |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.7 sci-libs/vtk/vtk-5.4.2-r1.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?rev=1.7&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?rev=1.7&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild?r1=1.6&r2=1.7 |
| 14 |
|
| 15 |
Index: vtk-5.4.2-r1.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v |
| 18 |
retrieving revision 1.6 |
| 19 |
retrieving revision 1.7 |
| 20 |
diff -u -r1.6 -r1.7 |
| 21 |
--- vtk-5.4.2-r1.ebuild 26 Mar 2010 12:40:16 -0000 1.6 |
| 22 |
+++ vtk-5.4.2-r1.ebuild 25 Apr 2010 10:00:50 -0000 1.7 |
| 23 |
@@ -1,9 +1,11 @@ |
| 24 |
# Copyright 1999-2010 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v 1.6 2010/03/26 12:40:16 yngwin Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v 1.7 2010/04/25 10:00:50 jlec Exp $ |
| 28 |
|
| 29 |
EAPI="2" |
| 30 |
-inherit eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2 python qt4 cmake-utils |
| 31 |
+ |
| 32 |
+PYTHON_DEPEND="python? 2" |
| 33 |
+inherit cmake-utils eutils flag-o-matic java-pkg-opt-2 python qt4 versionator toolchain-funcs |
| 34 |
|
| 35 |
# Short package version |
| 36 |
SPV="$(get_version_component_range 1-2)" |
| 37 |
@@ -17,7 +19,7 @@ |
| 38 |
LICENSE="BSD LGPL-2" |
| 39 |
KEYWORDS="~amd64 ~x86" |
| 40 |
SLOT="0" |
| 41 |
-IUSE="boost cg doc examples mpi patented python tcl tk threads qt4" |
| 42 |
+IUSE="boost cg doc examples mpi patented python qt4 tcl tk threads" |
| 43 |
RDEPEND="mpi? ( || ( |
| 44 |
sys-cluster/openmpi |
| 45 |
sys-cluster/lam-mpi |
| 46 |
@@ -58,9 +60,8 @@ |
| 47 |
|
| 48 |
java-pkg-opt-2_pkg_setup |
| 49 |
|
| 50 |
- if use qt4; then |
| 51 |
- qt4_pkg_setup |
| 52 |
- fi |
| 53 |
+ use python && python_set_active_version 2 |
| 54 |
+ use qt4 && qt4_pkg_setup |
| 55 |
} |
| 56 |
|
| 57 |
src_prepare() { |
| 58 |
@@ -129,7 +130,7 @@ |
| 59 |
fi |
| 60 |
|
| 61 |
if use python; then |
| 62 |
- python_version |
| 63 |
+ PYVER="$(python_get_version)" |
| 64 |
mycmakeargs+=( |
| 65 |
-DVTK_WRAP_PYTHON=ON |
| 66 |
-DPYTHON_INCLUDE_PATH=/usr/include/python${PYVER} |
| 67 |
|
| 68 |
|
| 69 |
|
| 70 |
1.65 sci-libs/vtk/ChangeLog |
| 71 |
|
| 72 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.65&view=markup |
| 73 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.65&content-type=text/plain |
| 74 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/ChangeLog?r1=1.64&r2=1.65 |
| 75 |
|
| 76 |
Index: ChangeLog |
| 77 |
=================================================================== |
| 78 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v |
| 79 |
retrieving revision 1.64 |
| 80 |
retrieving revision 1.65 |
| 81 |
diff -u -r1.64 -r1.65 |
| 82 |
--- ChangeLog 26 Mar 2010 12:40:16 -0000 1.64 |
| 83 |
+++ ChangeLog 25 Apr 2010 10:00:50 -0000 1.65 |
| 84 |
@@ -1,6 +1,9 @@ |
| 85 |
# ChangeLog for sci-libs/vtk |
| 86 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 87 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.64 2010/03/26 12:40:16 yngwin Exp $ |
| 88 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.65 2010/04/25 10:00:50 jlec Exp $ |
| 89 |
+ |
| 90 |
+ 25 Apr 2010; Justin Lecher <jlec@g.o> vtk-5.4.2-r1.ebuild: |
| 91 |
+ Python ABI fixes, #316229 |
| 92 |
|
| 93 |
26 Mar 2010; Ben de Groot <yngwin@g.o> vtk-5.4.2.ebuild, |
| 94 |
vtk-5.4.2-r1.ebuild: |
Archives