| 1 |
commit: 909cba127b3fe89b8668e186654a2e26cd2a6d28 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 6 15:02:35 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 6 22:20:01 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=909cba12 |
| 7 |
|
| 8 |
sci-libs/vtk: Remove PREFIX setting for CMake |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/4555 |
| 12 |
|
| 13 |
sci-libs/vtk/vtk-6.1.0-r3.ebuild | 2 +- |
| 14 |
sci-libs/vtk/vtk-6.1.0-r4.ebuild | 4 ++-- |
| 15 |
2 files changed, 3 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-libs/vtk/vtk-6.1.0-r3.ebuild b/sci-libs/vtk/vtk-6.1.0-r3.ebuild |
| 18 |
index 6bac474feaf..7367f5ccbe6 100644 |
| 19 |
--- a/sci-libs/vtk/vtk-6.1.0-r3.ebuild |
| 20 |
+++ b/sci-libs/vtk/vtk-6.1.0-r3.ebuild |
| 21 |
@@ -291,7 +291,7 @@ src_configure() { |
| 22 |
-DSIP_INCLUDE_DIR="$(python_get_includedir)" |
| 23 |
-DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)" |
| 24 |
-DVTK_PYTHON_LIBRARY="$(python_get_library_path)" |
| 25 |
- -DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${PREFIX} --root=${D}" |
| 26 |
+ -DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${EPREFIX}/usr --root=${D}" |
| 27 |
) |
| 28 |
fi |
| 29 |
|
| 30 |
|
| 31 |
diff --git a/sci-libs/vtk/vtk-6.1.0-r4.ebuild b/sci-libs/vtk/vtk-6.1.0-r4.ebuild |
| 32 |
index 11c77033d08..9f22a8e6793 100644 |
| 33 |
--- a/sci-libs/vtk/vtk-6.1.0-r4.ebuild |
| 34 |
+++ b/sci-libs/vtk/vtk-6.1.0-r4.ebuild |
| 35 |
@@ -1,4 +1,4 @@ |
| 36 |
-# Copyright 1999-2016 Gentoo Foundation |
| 37 |
+# Copyright 1999-2017 Gentoo Foundation |
| 38 |
# Distributed under the terms of the GNU General Public License v2 |
| 39 |
|
| 40 |
EAPI=5 |
| 41 |
@@ -290,7 +290,7 @@ src_configure() { |
| 42 |
-DSIP_INCLUDE_DIR="$(python_get_includedir)" |
| 43 |
-DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)" |
| 44 |
-DVTK_PYTHON_LIBRARY="$(python_get_library_path)" |
| 45 |
- -DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${PREFIX} --root=${D}" |
| 46 |
+ -DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${EPREFIX}/usr --root=${D}" |
| 47 |
) |
| 48 |
fi |
Archives