commit: a590530085753c27632458b7186d26dfc697e0fb
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 6 06:47:30 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jun 6 07:39:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5905300
dev-cpp/catch: Bump to 3.0.1
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-cpp/catch/Manifest | 1 +
dev-cpp/catch/{catch-9999.ebuild => catch-3.0.1.ebuild} | 12 +++++++-----
dev-cpp/catch/catch-9999.ebuild | 12 +++++++-----
3 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index b726e173bafc..739dd9a0cc57 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -1,2 +1,3 @@
DIST Catch-1.12.2.tar.gz 377265 BLAKE2B
bc27b4daee950f8fb93d65f3aed032e72bc856ee27a8dc28c35b89e33f414d68ba4cf00951e476688eddf9e4c0514036bd6916fa6cfa9e3359e6c625984f114f
SHA512
ed963cdca9fe307ee02928677f81cafcb41cd607faaa315182fdf898d0f2aa28f0be2141bd642f46fdfac400c38f6d065e00a595a1e5879fe2335c4a3851e844
DIST Catch2-2.13.8.tar.gz 661711 BLAKE2B
973cc73c1d158140645003e76c0baf85a65252041fdcae3c6ecb1857021f2d24d8e879fec5f00368f4f458e69b450603a1613ac587417725980f1dbfe3ff2e65
SHA512
68a45efa47beb3c85d2d7b8a8eba89b8ec1664b4a72bb223227fef1632778aeaf5cf5cc09f40e47aef50426c8661c7d6a69c2dab0b88fbbf7d9a6b2974d6e32e
+DIST Catch2-3.0.1.tar.gz 1020413 BLAKE2B
91c207bb67b9d97191fcd5b3f50df66c7d671aabb4deb989b6d838eba205e981d6dc51fb82d7c13d65751746215abc769a0274da9ee0512a53c4afbeb3540efb
SHA512
065094c19cdf98b40f96a390e887542f895495562a91cdc28d68ce03690866d846ec87d320405312a2b97eacaa5351d3e55f0012bb9de40073c8d4444d82b0a1
diff --git a/dev-cpp/catch/catch-9999.ebuild b/dev-cpp/catch/catch-3.0.1.ebuild
similarity index 74%
copy from dev-cpp/catch/catch-9999.ebuild
copy to dev-cpp/catch/catch-3.0.1.ebuild
index 339f89fdb860..cb72038e3adf 100644
--- a/dev-cpp/catch/catch-9999.ebuild
+++ b/dev-cpp/catch/catch-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ else
SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz ->
${MY_P}.tar.gz"
S="${WORKDIR}/${MY_P}"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86"
fi
DESCRIPTION="Modern C++ header-only framework for unit-tests"
@@ -34,11 +34,13 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
+ -DCATCH_DEVELOPMENT_BUILD=ON
-DCATCH_ENABLE_WERROR=OFF
- -DCATCH_DEVELOPMENT_BUILD=$(usex test)
+ -DCATCH_BUILD_TESTING=$(usex test)
+ )
+ use test && mycmakeargs+=(
+ -DPYTHON_EXECUTABLE="${PYTHON}"
)
- use test &&
- mycmakeargs+=( -DPYTHON_EXECUTABLE="${PYTHON}" )
cmake_src_configure
}
diff --git a/dev-cpp/catch/catch-9999.ebuild b/dev-cpp/catch/catch-9999.ebuild
index 339f89fdb860..cb72038e3adf 100644
--- a/dev-cpp/catch/catch-9999.ebuild
+++ b/dev-cpp/catch/catch-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ else
SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz ->
${MY_P}.tar.gz"
S="${WORKDIR}/${MY_P}"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86"
fi
DESCRIPTION="Modern C++ header-only framework for unit-tests"
@@ -34,11 +34,13 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
+ -DCATCH_DEVELOPMENT_BUILD=ON
-DCATCH_ENABLE_WERROR=OFF
- -DCATCH_DEVELOPMENT_BUILD=$(usex test)
+ -DCATCH_BUILD_TESTING=$(usex test)
+ )
+ use test && mycmakeargs+=(
+ -DPYTHON_EXECUTABLE="${PYTHON}"
)
- use test &&
- mycmakeargs+=( -DPYTHON_EXECUTABLE="${PYTHON}" )
cmake_src_configure
}
