Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/catch/
Date: Sat, 19 Jan 2019 14:21:37
Message-Id: 1547907652.d13c7357a618c539ad0bb4de3ecb50bf945fa528.soap@gentoo
1 commit: d13c7357a618c539ad0bb4de3ecb50bf945fa528
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 19 14:20:52 2019 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 19 14:20:52 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d13c7357
7
8 dev-cpp/catch: Remove old
9
10 Package-Manager: Portage-2.3.56, Repoman-2.3.12
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 dev-cpp/catch/Manifest | 2 --
14 dev-cpp/catch/catch-1.11.0.ebuild | 34 ---------------------------
15 dev-cpp/catch/catch-2.2.2.ebuild | 49 ---------------------------------------
16 3 files changed, 85 deletions(-)
17
18 diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
19 index 2d9261de67d..9ccecc2df55 100644
20 --- a/dev-cpp/catch/Manifest
21 +++ b/dev-cpp/catch/Manifest
22 @@ -1,5 +1,3 @@
23 -DIST Catch-1.11.0.tar.gz 376132 BLAKE2B 23a1a6292dd91ec1c71923b4902b42b59ff6be5227b666f68ef0dc33756a58a63edd70a9b139dda0b1860c2b7a0cfec7ab9262e6447eff3184cfe28ea9b0aa77 SHA512 33085c2671f78c7562eace909564b2730eabcaf4490cd463402e66ab4ac2be1fe4fe360916c11aa589ba4a010622444126ee2ae747783b5869b5d7276361f132
24 DIST Catch-1.12.2.tar.gz 377265 BLAKE2B bc27b4daee950f8fb93d65f3aed032e72bc856ee27a8dc28c35b89e33f414d68ba4cf00951e476688eddf9e4c0514036bd6916fa6cfa9e3359e6c625984f114f SHA512 ed963cdca9fe307ee02928677f81cafcb41cd607faaa315182fdf898d0f2aa28f0be2141bd642f46fdfac400c38f6d065e00a595a1e5879fe2335c4a3851e844
25 -DIST Catch2-2.2.2.tar.gz 497244 BLAKE2B d5073d56b9399bd7f50bafc7758e60e31ba4434e229f92ca92cd04257f4a54cec925ad3180cc964c4f69edbaa7fc14f8af8e828421e2bb2b4f6c59eaea5cc06d SHA512 ab91036c6c3ace087d0382ce99f26b2c30a4b75d52f285619ca282a618470fe388afe47495f3b2764268d600c6834c60ba464483d06f3a1c4316c099477c8e38
26 DIST Catch2-2.3.0.tar.gz 506374 BLAKE2B f692eb0933ca578edf0f15cb83139d2fab03390b3980a686ea495101165d612c848b642ad1e7233bce5bb164c80958c9cbfbc229e72a1ae6947aa4dffdf27556 SHA512 e9a089b504c339e87bda0fb1a4040d9d19c932a4bc7dca41bdad6edfcf8c428f4152ff1e0c898dfdf6b20bd5d901c343bed00ad89351fa5182f3c106e0fb4b03
27 DIST Catch2-2.5.0.tar.gz 549328 BLAKE2B a32941a043a654228cc541dc675ad789f5b938ebc2d3177d1657f66f68fb175bec8c88a60ecba00e84eca74a7506dc83aed74ac89f7dde83213284eb4a497225 SHA512 420f1d1a5ea7b69be9fb316a8abe1fb7c7e78d44a982e883748f1e0c8d2a435c1518b6022742716019558a740f8b31977ed6a786b0293e0504206b016801cfe8
28
29 diff --git a/dev-cpp/catch/catch-1.11.0.ebuild b/dev-cpp/catch/catch-1.11.0.ebuild
30 deleted file mode 100644
31 index afc65f924e9..00000000000
32 --- a/dev-cpp/catch/catch-1.11.0.ebuild
33 +++ /dev/null
34 @@ -1,34 +0,0 @@
35 -# Copyright 1999-2017 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=6
39 -
40 -inherit cmake-utils
41 -
42 -DESCRIPTION="Modern C++ header-only framework for unit-tests"
43 -HOMEPAGE="https://github.com/catchorg/Catch2"
44 -SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${P^}.tar.gz"
45 -
46 -LICENSE="Boost-1.0"
47 -SLOT="0"
48 -KEYWORDS="~amd64 ~x86"
49 -IUSE=""
50 -
51 -S=${WORKDIR}/${P^}
52 -
53 -# CMake is only used to build & run tests, so override phases
54 -src_configure() { :; }
55 -src_compile() { :; }
56 -
57 -src_test() {
58 - cmake-utils_src_configure
59 - cmake-utils_src_compile
60 - cmake-utils_src_test
61 -}
62 -
63 -src_install() {
64 - # same location as used in fedora
65 - insinto /usr/include/catch
66 - doins -r include/.
67 - dodoc -r docs/.
68 -}
69
70 diff --git a/dev-cpp/catch/catch-2.2.2.ebuild b/dev-cpp/catch/catch-2.2.2.ebuild
71 deleted file mode 100644
72 index 2cce0298b3a..00000000000
73 --- a/dev-cpp/catch/catch-2.2.2.ebuild
74 +++ /dev/null
75 @@ -1,49 +0,0 @@
76 -# Copyright 1999-2018 Gentoo Foundation
77 -# Distributed under the terms of the GNU General Public License v2
78 -
79 -EAPI=6
80 -
81 -PYTHON_COMPAT=( python2_7 python3_{5,6} )
82 -
83 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
84 -inherit cmake-utils python-any-r1
85 -
86 -if [[ ${PV} == *9999 ]]; then
87 - inherit git-r3
88 - EGIT_REPO_URI="https://github.com/catchorg/Catch2.git"
89 -else
90 - MY_P=${PN^}2-${PV}
91 - SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
92 - KEYWORDS="~amd64 ~x86"
93 -
94 - S=${WORKDIR}/${MY_P}
95 -fi
96 -
97 -DESCRIPTION="Modern C++ header-only framework for unit-tests"
98 -HOMEPAGE="https://github.com/catchorg/Catch2"
99 -
100 -LICENSE="Boost-1.0"
101 -SLOT="0"
102 -IUSE="test"
103 -RESTRICT="!test? ( test )"
104 -
105 -DEPEND="test? ( ${PYTHON_DEPS} )"
106 -
107 -PATCHES=(
108 - "${FILESDIR}"/${PN}-2.2.2-test-python3.patch
109 - "${FILESDIR}"/${PN}-2.2.2-python-automagic.patch
110 -)
111 -
112 -pkg_setup() {
113 - use test && python-any-r1_pkg_setup
114 -}
115 -
116 -src_configure() {
117 - local mycmakeargs=(
118 - -DCATCH_ENABLE_WERROR=OFF
119 - -DBUILD_TESTING=$(usex test)
120 - -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
121 - -DPYTHON_EXECUTABLE="${PYTHON}"
122 - )
123 - cmake-utils_src_configure
124 -}