From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A3E27138359 for ; Fri, 10 Jul 2020 21:24:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E4AE3E084A; Fri, 10 Jul 2020 21:24:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CB1F2E084A for ; Fri, 10 Jul 2020 21:24:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D628134F798 for ; Fri, 10 Jul 2020 21:24:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 76E9B2D2 for ; Fri, 10 Jul 2020 21:24:00 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1594416224.0e85e56bbbf6cb26305aa96a8df7650dc85530f9.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/vigra/vigra-1.11.1-r3.ebuild X-VCS-Directories: media-libs/vigra/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0e85e56bbbf6cb26305aa96a8df7650dc85530f9 X-VCS-Branch: master Date: Fri, 10 Jul 2020 21:24:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 936a359b-dff7-44ac-8355-884528b77e46 X-Archives-Hash: 8045bea94947a58471727680ecb9b7f5 commit: 0e85e56bbbf6cb26305aa96a8df7650dc85530f9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Jul 10 20:58:52 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Jul 10 21:23:44 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e85e56b media-libs/vigra: Switch to cmake.eclass Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/vigra/vigra-1.11.1-r3.ebuild | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/media-libs/vigra/vigra-1.11.1-r3.ebuild b/media-libs/vigra/vigra-1.11.1-r3.ebuild index 05721485aa8..c9dfc49eed8 100644 --- a/media-libs/vigra/vigra-1.11.1-r3.ebuild +++ b/media-libs/vigra/vigra-1.11.1-r3.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8} ) PYTHON_REQ_USE="threads(+),xml" -inherit cmake-utils python-r1 +inherit cmake python-r1 DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures" HOMEPAGE="https://ukoethe.github.io/vigra/" @@ -81,7 +81,7 @@ src_prepare() { fi } - cmake-utils_src_prepare + cmake_src_prepare vigra_disable fftw fftw3 vigra_disable fftw fftw3f @@ -111,7 +111,7 @@ src_configure() { -DWITH_VALGRIND=$(usex valgrind) -DWITH_VIGRANUMPY=$(usex python) ) - cmake-utils_src_configure + cmake_src_configure } if use python; then @@ -124,7 +124,7 @@ src_configure() { src_compile() { local VIGRA_BUILD_DIR vigra_compile() { - cmake-utils_src_compile + cmake_src_compile VIGRA_BUILD_DIR="${BUILD_DIR}" } if use python; then @@ -136,17 +136,17 @@ src_compile() { src_install() { if use python; then - python_foreach_impl cmake-utils_src_install + python_foreach_impl cmake_src_install python_optimize else - cmake-utils_src_install + cmake_src_install fi } src_test() { # perhaps disable tests (see #390447) vigra_test() { - PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake-utils_src_test + PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake_src_test } if use python; then python_foreach_impl vigra_test