dev-cpp/catch: Bump to EAPI 7

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: David Seifert <soap@gentoo.org>

diff --git a/dev-cpp/catch/catch-1.12.2.ebuild b/dev-cpp/catch/catch-1.12.2.ebuild
index f67c3c4193b567f17536db8587699f1b81c159b2..f8b78e0099596bc7c3abfdc861d8b2b22c803cdc 100644 (file)
--- a/dev-cpp/catch/catch-1.12.2.ebuild
+++ b/dev-cpp/catch/catch-1.12.2.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 inherit cmake-utils
 
 if [[ ${PV} == *9999 ]]; then

diff --git a/dev-cpp/catch/catch-1.9999.ebuild b/dev-cpp/catch/catch-1.9999.ebuild
index f67c3c4193b567f17536db8587699f1b81c159b2..f8b78e0099596bc7c3abfdc861d8b2b22c803cdc 100644 (file)
--- a/dev-cpp/catch/catch-1.9999.ebuild
+++ b/dev-cpp/catch/catch-1.9999.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 inherit cmake-utils
 
 if [[ ${PV} == *9999 ]]; then

diff --git a/dev-cpp/catch/catch-2.5.0.ebuild b/dev-cpp/catch/catch-2.5.0.ebuild
index 8249b5cedb5bd89508e1b94d2028fbbb3c11830c..5318b054d396403dbd171f1ded95ef7ca276eee0 100644 (file)
--- a/dev-cpp/catch/catch-2.5.0.ebuild
+++ b/dev-cpp/catch/catch-2.5.0.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 inherit cmake-utils python-any-r1
 
 if [[ ${PV} == *9999 ]]; then
@@ -27,7 +26,7 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="test? ( ${PYTHON_DEPS} )"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
 
 pkg_setup() {
        use test && python-any-r1_pkg_setup
@@ -37,7 +36,6 @@ src_configure() {
        local mycmakeargs=(
                -DCATCH_ENABLE_WERROR=OFF
                -DBUILD_TESTING=$(usex test)
-               -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
        )
        use test &&
                mycmakeargs+=(-DPYTHON_EXECUTABLE="${PYTHON}")

diff --git a/dev-cpp/catch/catch-9999.ebuild b/dev-cpp/catch/catch-9999.ebuild
index d7763c4ccaa99c20c72a381beedcc20900bb899c..5318b054d396403dbd171f1ded95ef7ca276eee0 100644 (file)
--- a/dev-cpp/catch/catch-9999.ebuild
+++ b/dev-cpp/catch/catch-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-inherit cmake-utils
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit cmake-utils python-any-r1
 
 if [[ ${PV} == *9999 ]]; then
        inherit git-r3
@@ -25,11 +26,19 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+       use test && python-any-r1_pkg_setup
+}
+
 src_configure() {
        local mycmakeargs=(
                -DCATCH_ENABLE_WERROR=OFF
                -DBUILD_TESTING=$(usex test)
-               -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
        )
+       use test &&
+               mycmakeargs+=(-DPYTHON_EXECUTABLE="${PYTHON}")
+
        cmake-utils_src_configure
 }