| 1 |
commit: 389efddf0c61a8f935afd48cc84f27801789605f |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 28 16:47:48 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 28 16:48:03 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=389efddf |
| 7 |
|
| 8 |
media-libs/vigra: Sync cmake.eclass and python3_9 to live ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.16, Repoman-3.0.2 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
media-libs/vigra/vigra-9999.ebuild | 20 ++++++++++---------- |
| 14 |
1 file changed, 10 insertions(+), 10 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild |
| 17 |
index c445f2e401c..9ffac6b73b0 100644 |
| 18 |
--- a/media-libs/vigra/vigra-9999.ebuild |
| 19 |
+++ b/media-libs/vigra/vigra-9999.ebuild |
| 20 |
@@ -1,11 +1,11 @@ |
| 21 |
-# Copyright 1999-2020 Gentoo Authors |
| 22 |
+# Copyright 1999-2021 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
EAPI=7 |
| 26 |
|
| 27 |
-PYTHON_COMPAT=( python3_{7,8} ) |
| 28 |
+PYTHON_COMPAT=( python3_{7,8,9} ) |
| 29 |
PYTHON_REQ_USE="threads(+),xml" |
| 30 |
-inherit cmake-utils python-r1 |
| 31 |
+inherit cmake python-r1 |
| 32 |
|
| 33 |
DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures" |
| 34 |
HOMEPAGE="https://ukoethe.github.io/vigra/" |
| 35 |
@@ -83,7 +83,7 @@ src_prepare() { |
| 36 |
fi |
| 37 |
} |
| 38 |
|
| 39 |
- cmake-utils_src_prepare |
| 40 |
+ cmake_src_prepare |
| 41 |
|
| 42 |
if [[ ${PV} != *9999 ]]; then |
| 43 |
rm -r doc || die "failed to remove shipped docs" |
| 44 |
@@ -101,7 +101,7 @@ src_prepare() { |
| 45 |
|
| 46 |
if ! use test; then |
| 47 |
cmake_comment_add_subdirectory test |
| 48 |
- sed -e "/ADD_SUBDIRECTORY.*test/s/^/#DONT /" -i vigranumpy/CMakeLists.txt || die |
| 49 |
+ cmake_run_in vigranumpy cmake_comment_add_subdirectory test |
| 50 |
fi |
| 51 |
} |
| 52 |
|
| 53 |
@@ -116,7 +116,7 @@ src_configure() { |
| 54 |
-DWITH_VALGRIND=$(usex valgrind) |
| 55 |
-DWITH_VIGRANUMPY=$(usex python) |
| 56 |
) |
| 57 |
- cmake-utils_src_configure |
| 58 |
+ cmake_src_configure |
| 59 |
} |
| 60 |
|
| 61 |
if use python; then |
| 62 |
@@ -131,7 +131,7 @@ src_configure() { |
| 63 |
src_compile() { |
| 64 |
local VIGRA_BUILD_DIR |
| 65 |
vigra_compile() { |
| 66 |
- cmake-utils_src_compile |
| 67 |
+ cmake_src_compile |
| 68 |
VIGRA_BUILD_DIR="${BUILD_DIR}" |
| 69 |
} |
| 70 |
if use python; then |
| 71 |
@@ -150,17 +150,17 @@ src_compile() { |
| 72 |
|
| 73 |
src_install() { |
| 74 |
if use python; then |
| 75 |
- python_foreach_impl cmake-utils_src_install |
| 76 |
+ python_foreach_impl cmake_src_install |
| 77 |
python_optimize |
| 78 |
else |
| 79 |
- cmake-utils_src_install |
| 80 |
+ cmake_src_install |
| 81 |
fi |
| 82 |
} |
| 83 |
|
| 84 |
src_test() { |
| 85 |
# perhaps disable tests (see #390447) |
| 86 |
vigra_test() { |
| 87 |
- PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake-utils_src_test |
| 88 |
+ PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake_src_test |
| 89 |
} |
| 90 |
if use python; then |
| 91 |
python_foreach_impl vigra_test |
Archives