| 1 |
commit: f749843d9b856f9686d37e6cd6cd6ee7920af3d4 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 26 17:00:02 2019 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 26 17:00:02 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f749843d |
| 7 |
|
| 8 |
dev-cpp/catch: Remove old |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.64, Repoman-2.3.12 |
| 11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-cpp/catch/Manifest | 1 - |
| 14 |
dev-cpp/catch/catch-2.3.0.ebuild | 48 ---------------------- |
| 15 |
.../catch/files/catch-2.3.0-python-automagic.patch | 25 ----------- |
| 16 |
3 files changed, 74 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest |
| 19 |
index f5308e4ab98..55da757fdf1 100644 |
| 20 |
--- a/dev-cpp/catch/Manifest |
| 21 |
+++ b/dev-cpp/catch/Manifest |
| 22 |
@@ -1,4 +1,3 @@ |
| 23 |
DIST Catch-1.12.2.tar.gz 377265 BLAKE2B bc27b4daee950f8fb93d65f3aed032e72bc856ee27a8dc28c35b89e33f414d68ba4cf00951e476688eddf9e4c0514036bd6916fa6cfa9e3359e6c625984f114f SHA512 ed963cdca9fe307ee02928677f81cafcb41cd607faaa315182fdf898d0f2aa28f0be2141bd642f46fdfac400c38f6d065e00a595a1e5879fe2335c4a3851e844 |
| 24 |
-DIST Catch2-2.3.0.tar.gz 506374 BLAKE2B f692eb0933ca578edf0f15cb83139d2fab03390b3980a686ea495101165d612c848b642ad1e7233bce5bb164c80958c9cbfbc229e72a1ae6947aa4dffdf27556 SHA512 e9a089b504c339e87bda0fb1a4040d9d19c932a4bc7dca41bdad6edfcf8c428f4152ff1e0c898dfdf6b20bd5d901c343bed00ad89351fa5182f3c106e0fb4b03 |
| 25 |
DIST Catch2-2.5.0.tar.gz 549328 BLAKE2B a32941a043a654228cc541dc675ad789f5b938ebc2d3177d1657f66f68fb175bec8c88a60ecba00e84eca74a7506dc83aed74ac89f7dde83213284eb4a497225 SHA512 420f1d1a5ea7b69be9fb316a8abe1fb7c7e78d44a982e883748f1e0c8d2a435c1518b6022742716019558a740f8b31977ed6a786b0293e0504206b016801cfe8 |
| 26 |
DIST Catch2-2.7.0.tar.gz 569753 BLAKE2B cec11d79c85ac8a5577467ceb4722a2441a1dbd2fbe42fb06324113d2a6f9fadc12de351735900817274520bf8533ec245ba0a3686c8c1b4813cf3136d6d552f SHA512 ab6c816642a92418c76c8ddabf17eb0c19bef1dc6ac2405c820280d670ef1d78c9ae89909f5a36bf063f0939d253b7c6b5e845c1ac4e63b338927e125dee950d |
| 27 |
|
| 28 |
diff --git a/dev-cpp/catch/catch-2.3.0.ebuild b/dev-cpp/catch/catch-2.3.0.ebuild |
| 29 |
deleted file mode 100644 |
| 30 |
index 33544077cdf..00000000000 |
| 31 |
--- a/dev-cpp/catch/catch-2.3.0.ebuild |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,48 +0,0 @@ |
| 34 |
-# Copyright 1999-2018 Gentoo Authors |
| 35 |
-# Distributed under the terms of the GNU General Public License v2 |
| 36 |
- |
| 37 |
-EAPI=6 |
| 38 |
- |
| 39 |
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) |
| 40 |
- |
| 41 |
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja} |
| 42 |
-inherit cmake-utils python-any-r1 |
| 43 |
- |
| 44 |
-if [[ ${PV} == *9999 ]]; then |
| 45 |
- inherit git-r3 |
| 46 |
- EGIT_REPO_URI="https://github.com/catchorg/Catch2.git" |
| 47 |
-else |
| 48 |
- MY_P=${PN^}2-${PV} |
| 49 |
- SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" |
| 50 |
- KEYWORDS="amd64 x86" |
| 51 |
- |
| 52 |
- S=${WORKDIR}/${MY_P} |
| 53 |
-fi |
| 54 |
- |
| 55 |
-DESCRIPTION="Modern C++ header-only framework for unit-tests" |
| 56 |
-HOMEPAGE="https://github.com/catchorg/Catch2" |
| 57 |
- |
| 58 |
-LICENSE="Boost-1.0" |
| 59 |
-SLOT="0" |
| 60 |
-IUSE="test" |
| 61 |
-RESTRICT="!test? ( test )" |
| 62 |
- |
| 63 |
-DEPEND="test? ( ${PYTHON_DEPS} )" |
| 64 |
- |
| 65 |
-PATCHES=( |
| 66 |
- "${FILESDIR}"/${PN}-2.3.0-python-automagic.patch |
| 67 |
-) |
| 68 |
- |
| 69 |
-pkg_setup() { |
| 70 |
- use test && python-any-r1_pkg_setup |
| 71 |
-} |
| 72 |
- |
| 73 |
-src_configure() { |
| 74 |
- local mycmakeargs=( |
| 75 |
- -DCATCH_ENABLE_WERROR=OFF |
| 76 |
- -DBUILD_TESTING=$(usex test) |
| 77 |
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" |
| 78 |
- -DPYTHON_EXECUTABLE="${PYTHON}" |
| 79 |
- ) |
| 80 |
- cmake-utils_src_configure |
| 81 |
-} |
| 82 |
|
| 83 |
diff --git a/dev-cpp/catch/files/catch-2.3.0-python-automagic.patch b/dev-cpp/catch/files/catch-2.3.0-python-automagic.patch |
| 84 |
deleted file mode 100644 |
| 85 |
index c7fa4c6d22f..00000000000 |
| 86 |
--- a/dev-cpp/catch/files/catch-2.3.0-python-automagic.patch |
| 87 |
+++ /dev/null |
| 88 |
@@ -1,25 +0,0 @@ |
| 89 |
---- a/CMakeLists.txt |
| 90 |
-+++ b/CMakeLists.txt |
| 91 |
-@@ -36,7 +36,11 @@ |
| 92 |
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ENTRY:wmainCRTStartup") |
| 93 |
- endif() |
| 94 |
- |
| 95 |
-+find_package(PythonInterp) |
| 96 |
- if (BUILD_TESTING AND CATCH_BUILD_TESTING AND NOT_SUBPROJECT) |
| 97 |
-+ if (NOT PYTHONINTERP_FOUND) |
| 98 |
-+ message(FATAL_ERROR "Python not found, but required for tests") |
| 99 |
-+ endif() |
| 100 |
- add_subdirectory(projects) |
| 101 |
- endif() |
| 102 |
- |
| 103 |
---- a/projects/CMakeLists.txt |
| 104 |
-+++ b/projects/CMakeLists.txt |
| 105 |
-@@ -317,7 +317,7 @@ |
| 106 |
- set_tests_properties(NoTest PROPERTIES PASS_REGULAR_EXPRESSION "No test cases matched") |
| 107 |
- |
| 108 |
- # AppVeyor has a Python 2.7 in path, but doesn't have .py files as autorunnable |
| 109 |
--add_test(NAME ApprovalTests COMMAND python ${CATCH_DIR}/scripts/approvalTests.py $<TARGET_FILE:SelfTest>) |
| 110 |
-+add_test(NAME ApprovalTests COMMAND ${PYTHON_EXECUTABLE} ${CATCH_DIR}/scripts/approvalTests.py $<TARGET_FILE:SelfTest>) |
| 111 |
- set_tests_properties(ApprovalTests PROPERTIES FAIL_REGULAR_EXPRESSION "Results differed") |
| 112 |
- |
| 113 |
- if (CATCH_USE_VALGRIND) |
Archives