Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/catch/
Date: Mon, 06 Jun 2022 07:39:49
Message-Id: 1654501181.a590530085753c27632458b7186d26dfc697e0fb.mgorny@gentoo
1 commit: a590530085753c27632458b7186d26dfc697e0fb
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 6 06:47:30 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 6 07:39:41 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5905300
7
8 dev-cpp/catch: Bump to 3.0.1
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-cpp/catch/Manifest | 1 +
13 dev-cpp/catch/{catch-9999.ebuild => catch-3.0.1.ebuild} | 12 +++++++-----
14 dev-cpp/catch/catch-9999.ebuild | 12 +++++++-----
15 3 files changed, 15 insertions(+), 10 deletions(-)
16
17 diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
18 index b726e173bafc..739dd9a0cc57 100644
19 --- a/dev-cpp/catch/Manifest
20 +++ b/dev-cpp/catch/Manifest
21 @@ -1,2 +1,3 @@
22 DIST Catch-1.12.2.tar.gz 377265 BLAKE2B bc27b4daee950f8fb93d65f3aed032e72bc856ee27a8dc28c35b89e33f414d68ba4cf00951e476688eddf9e4c0514036bd6916fa6cfa9e3359e6c625984f114f SHA512 ed963cdca9fe307ee02928677f81cafcb41cd607faaa315182fdf898d0f2aa28f0be2141bd642f46fdfac400c38f6d065e00a595a1e5879fe2335c4a3851e844
23 DIST Catch2-2.13.8.tar.gz 661711 BLAKE2B 973cc73c1d158140645003e76c0baf85a65252041fdcae3c6ecb1857021f2d24d8e879fec5f00368f4f458e69b450603a1613ac587417725980f1dbfe3ff2e65 SHA512 68a45efa47beb3c85d2d7b8a8eba89b8ec1664b4a72bb223227fef1632778aeaf5cf5cc09f40e47aef50426c8661c7d6a69c2dab0b88fbbf7d9a6b2974d6e32e
24 +DIST Catch2-3.0.1.tar.gz 1020413 BLAKE2B 91c207bb67b9d97191fcd5b3f50df66c7d671aabb4deb989b6d838eba205e981d6dc51fb82d7c13d65751746215abc769a0274da9ee0512a53c4afbeb3540efb SHA512 065094c19cdf98b40f96a390e887542f895495562a91cdc28d68ce03690866d846ec87d320405312a2b97eacaa5351d3e55f0012bb9de40073c8d4444d82b0a1
25
26 diff --git a/dev-cpp/catch/catch-9999.ebuild b/dev-cpp/catch/catch-3.0.1.ebuild
27 similarity index 74%
28 copy from dev-cpp/catch/catch-9999.ebuild
29 copy to dev-cpp/catch/catch-3.0.1.ebuild
30 index 339f89fdb860..cb72038e3adf 100644
31 --- a/dev-cpp/catch/catch-9999.ebuild
32 +++ b/dev-cpp/catch/catch-3.0.1.ebuild
33 @@ -1,4 +1,4 @@
34 -# Copyright 1999-2021 Gentoo Authors
35 +# Copyright 1999-2022 Gentoo Authors
36 # Distributed under the terms of the GNU General Public License v2
37
38 EAPI=8
39 @@ -15,7 +15,7 @@ else
40 SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
41 S="${WORKDIR}/${MY_P}"
42
43 - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
44 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
45 fi
46
47 DESCRIPTION="Modern C++ header-only framework for unit-tests"
48 @@ -34,11 +34,13 @@ pkg_setup() {
49
50 src_configure() {
51 local mycmakeargs=(
52 + -DCATCH_DEVELOPMENT_BUILD=ON
53 -DCATCH_ENABLE_WERROR=OFF
54 - -DCATCH_DEVELOPMENT_BUILD=$(usex test)
55 + -DCATCH_BUILD_TESTING=$(usex test)
56 + )
57 + use test && mycmakeargs+=(
58 + -DPYTHON_EXECUTABLE="${PYTHON}"
59 )
60 - use test &&
61 - mycmakeargs+=( -DPYTHON_EXECUTABLE="${PYTHON}" )
62
63 cmake_src_configure
64 }
65
66 diff --git a/dev-cpp/catch/catch-9999.ebuild b/dev-cpp/catch/catch-9999.ebuild
67 index 339f89fdb860..cb72038e3adf 100644
68 --- a/dev-cpp/catch/catch-9999.ebuild
69 +++ b/dev-cpp/catch/catch-9999.ebuild
70 @@ -1,4 +1,4 @@
71 -# Copyright 1999-2021 Gentoo Authors
72 +# Copyright 1999-2022 Gentoo Authors
73 # Distributed under the terms of the GNU General Public License v2
74
75 EAPI=8
76 @@ -15,7 +15,7 @@ else
77 SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
78 S="${WORKDIR}/${MY_P}"
79
80 - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
81 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
82 fi
83
84 DESCRIPTION="Modern C++ header-only framework for unit-tests"
85 @@ -34,11 +34,13 @@ pkg_setup() {
86
87 src_configure() {
88 local mycmakeargs=(
89 + -DCATCH_DEVELOPMENT_BUILD=ON
90 -DCATCH_ENABLE_WERROR=OFF
91 - -DCATCH_DEVELOPMENT_BUILD=$(usex test)
92 + -DCATCH_BUILD_TESTING=$(usex test)
93 + )
94 + use test && mycmakeargs+=(
95 + -DPYTHON_EXECUTABLE="${PYTHON}"
96 )
97 - use test &&
98 - mycmakeargs+=( -DPYTHON_EXECUTABLE="${PYTHON}" )
99
100 cmake_src_configure
101 }