diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2020-11-19 12:30:51 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2020-11-19 12:30:51 +0000 |
| commit | b157cf9966e13649bad441b513f344fb115f7dc2 (patch) | |
| tree | fbe6244c668ab143f634dfb1861a888cb61bbfcf /dev-cpp | |
| parent | 4574bf2af81b445d76035d272bb4bec2324a44a0 (diff) | |
| download | baldeagleos-repo-b157cf9966e13649bad441b513f344fb115f7dc2.tar.gz baldeagleos-repo-b157cf9966e13649bad441b513f344fb115f7dc2.tar.xz baldeagleos-repo-b157cf9966e13649bad441b513f344fb115f7dc2.zip | |
Updating liguros repo
Diffstat (limited to 'dev-cpp')
| -rw-r--r-- | dev-cpp/catch/Manifest | 3 | ||||
| -rw-r--r-- | dev-cpp/catch/catch-2.13.3.ebuild (renamed from dev-cpp/catch/catch-2.9.1.ebuild) | 6 | ||||
| -rw-r--r-- | dev-cpp/catch/catch-2.7.0.ebuild | 44 | ||||
| -rw-r--r-- | dev-cpp/catch/catch-9999.ebuild | 9 |
4 files changed, 9 insertions, 53 deletions
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest index 078ea1be0db8..55fca7ae5df5 100644 --- a/dev-cpp/catch/Manifest +++ b/dev-cpp/catch/Manifest @@ -1,4 +1,3 @@ DIST Catch-1.12.2.tar.gz 377265 BLAKE2B bc27b4daee950f8fb93d65f3aed032e72bc856ee27a8dc28c35b89e33f414d68ba4cf00951e476688eddf9e4c0514036bd6916fa6cfa9e3359e6c625984f114f SHA512 ed963cdca9fe307ee02928677f81cafcb41cd607faaa315182fdf898d0f2aa28f0be2141bd642f46fdfac400c38f6d065e00a595a1e5879fe2335c4a3851e844 +DIST Catch2-2.13.3.tar.gz 655431 BLAKE2B 4343dab41818a4c85b875752b8d86a0dd1a46ce8c94d6773cee210a133f164b669053973c6678228b3afb356e25a3e705c8220b138c247a230e624b3f2412784 SHA512 caf0e3a39a2b5983346c2709ce06113da62881780117021c64db987d6c5190c41a9070fb70caa0ee6957cfef0baad87fff4e6558c9fea4fa464e82882fe17d55 DIST Catch2-2.5.0.tar.gz 549328 BLAKE2B a32941a043a654228cc541dc675ad789f5b938ebc2d3177d1657f66f68fb175bec8c88a60ecba00e84eca74a7506dc83aed74ac89f7dde83213284eb4a497225 SHA512 420f1d1a5ea7b69be9fb316a8abe1fb7c7e78d44a982e883748f1e0c8d2a435c1518b6022742716019558a740f8b31977ed6a786b0293e0504206b016801cfe8 -DIST Catch2-2.7.0.tar.gz 569753 BLAKE2B cec11d79c85ac8a5577467ceb4722a2441a1dbd2fbe42fb06324113d2a6f9fadc12de351735900817274520bf8533ec245ba0a3686c8c1b4813cf3136d6d552f SHA512 ab6c816642a92418c76c8ddabf17eb0c19bef1dc6ac2405c820280d670ef1d78c9ae89909f5a36bf063f0939d253b7c6b5e845c1ac4e63b338927e125dee950d -DIST Catch2-2.9.1.tar.gz 626539 BLAKE2B b68f17dba65cc8d1a842b105e5aa6a32e713df8d34c32b918e0588e6b87b8e3ae56f9130d1590795489afe2e29035c262a05795d0ee44c9e9ace2e814801821d SHA512 ea18eef1fece72518c8a46b89727f5d0545a15038957087324abe6421c682693379476ff46106132f080677ebcc1c9ead51a9cf25dced3bb576a33e4f6fae4f6 diff --git a/dev-cpp/catch/catch-2.9.1.ebuild b/dev-cpp/catch/catch-2.13.3.ebuild index 0a7a3331d891..c16b51f93c36 100644 --- a/dev-cpp/catch/catch-2.9.1.ebuild +++ b/dev-cpp/catch/catch-2.13.3.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{5,6,7,8,9} ) -inherit cmake-utils python-any-r1 +inherit cmake python-any-r1 if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -15,7 +15,7 @@ else SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" - S=${WORKDIR}/${MY_P} + S="${WORKDIR}/${MY_P}" fi DESCRIPTION="Modern C++ header-only framework for unit-tests" @@ -40,5 +40,5 @@ src_configure() { use test && mycmakeargs+=(-DPYTHON_EXECUTABLE="${PYTHON}") - cmake-utils_src_configure + cmake_src_configure } diff --git a/dev-cpp/catch/catch-2.7.0.ebuild b/dev-cpp/catch/catch-2.7.0.ebuild deleted file mode 100644 index ec8b6b093a51..000000000000 --- a/dev-cpp/catch/catch-2.7.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{5,6,7,8,9} ) - -inherit cmake-utils python-any-r1 - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/catchorg/Catch2.git" -else - MY_P=${PN^}2-${PV} - SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" - KEYWORDS="~amd64 ~x86" - - S=${WORKDIR}/${MY_P} -fi - -DESCRIPTION="Modern C++ header-only framework for unit-tests" -HOMEPAGE="https://github.com/catchorg/Catch2" - -LICENSE="Boost-1.0" -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) - ) - use test && - mycmakeargs+=(-DPYTHON_EXECUTABLE="${PYTHON}") - - cmake-utils_src_configure -} diff --git a/dev-cpp/catch/catch-9999.ebuild b/dev-cpp/catch/catch-9999.ebuild index ed27d61b4f04..fafe8d95232c 100644 --- a/dev-cpp/catch/catch-9999.ebuild +++ b/dev-cpp/catch/catch-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{5,6,7,8,9} ) -inherit cmake-utils python-any-r1 +inherit cmake python-any-r1 if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -13,9 +13,9 @@ if [[ ${PV} == *9999 ]]; then else MY_P=${PN^}2-${PV} SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" - KEYWORDS="~amd64 ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" - S=${WORKDIR}/${MY_P} + S="${WORKDIR}/${MY_P}" fi DESCRIPTION="Modern C++ header-only framework for unit-tests" @@ -36,9 +36,10 @@ src_configure() { local mycmakeargs=( -DCATCH_ENABLE_WERROR=OFF -DBUILD_TESTING=$(usex test) + -DCATCH_DEVELOPMENT_BUILD=$(usex test) ) use test && mycmakeargs+=(-DPYTHON_EXECUTABLE="${PYTHON}") - cmake-utils_src_configure + cmake_src_configure } |