[gentoo-commits] repo/gentoo:master commit in: dev-cpp/catch/

[David Seifert]

commit:     7086420c2788668e1e6e82cfc33aa7d52185b5cd
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 11:35:00 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 11:35:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7086420c

dev-cpp/catch: Sync live ebuild

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-cpp/catch/catch-9999.ebuild | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/dev-cpp/catch/catch-9999.ebuild b/dev-cpp/catch/catch-9999.ebuild
index 07de51f3252..338bc2c2b37 100644
--- a/dev-cpp/catch/catch-9999.ebuild
+++ b/dev-cpp/catch/catch-9999.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
-inherit cmake-utils python-any-r1
+inherit cmake python-any-r1
 
 if [[ ${PV} == *9999 ]]; then
        inherit git-r3
@@ -13,9 +13,9 @@ if [[ ${PV} == *9999 ]]; then
 else
        MY_P=${PN^}2-${PV}
        SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> 
${MY_P}.tar.gz"
-       KEYWORDS="~amd64 ~ppc64 ~x86"
+       KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
-       S=${WORKDIR}/${MY_P}
+       S="${WORKDIR}/${MY_P}"
 fi
 
 DESCRIPTION="Modern C++ header-only framework for unit-tests"
@@ -36,9 +36,10 @@ src_configure() {
        local mycmakeargs=(
                -DCATCH_ENABLE_WERROR=OFF
                -DBUILD_TESTING=$(usex test)
+               -DCATCH_DEVELOPMENT_BUILD=$(usex test)
        )
        use test &&
                mycmakeargs+=(-DPYTHON_EXECUTABLE="${PYTHON}")
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }