diff options
Diffstat (limited to 'dev-cpp/ms-gsl')
| -rw-r--r-- | dev-cpp/ms-gsl/Manifest | 2 | ||||
| -rw-r--r-- | dev-cpp/ms-gsl/files/ms-gsl-1.0.0-use_system_catch-636828.patch | 21 | ||||
| -rw-r--r-- | dev-cpp/ms-gsl/metadata.xml | 7 | ||||
| -rw-r--r-- | dev-cpp/ms-gsl/ms-gsl-4.0.0.ebuild (renamed from dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild) | 15 | ||||
| -rw-r--r-- | dev-cpp/ms-gsl/ms-gsl-9999.ebuild | 13 |
5 files changed, 17 insertions, 41 deletions
diff --git a/dev-cpp/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest index 12fa4185c34d..cff79bbcb244 100644 --- a/dev-cpp/ms-gsl/Manifest +++ b/dev-cpp/ms-gsl/Manifest @@ -1 +1 @@ -DIST ms-gsl-2.0.0.tar.gz 64726 BLAKE2B ab40725aa38af7c5651e22ebf32d4bd9c27a10be2e206fd4c3c0173ad21da262beddef022b7b158653b185cfc3269f2b6e80d99fe65f601ffc3e770b143b03f8 SHA512 7339527222c8a97a94c0bb4038b3d142045ec5d80995e628574ac96f4d9d13c41ad70fbe0d8390586dc0db8d9ea55107dbc95de80f7335eb78ef9d2e7047d726 +DIST ms-gsl-4.0.0.tar.gz 55846 BLAKE2B 4391f8865f8dc044e5a48826e84919df8e32fc80815a260e9c892aa6d155d278a9b7742c17e4455bcba3fc3164118c14ef160353913814ba48a83bc7de40c123 SHA512 7fa7446796c6bf82fb3bff09f86a69c446a27be528bef3b17c8bc5ad2f24d5cf86bdb3d3813ecb44726e8f395020180e97e41027330d1fbf545cc0f0b44aac29 diff --git a/dev-cpp/ms-gsl/files/ms-gsl-1.0.0-use_system_catch-636828.patch b/dev-cpp/ms-gsl/files/ms-gsl-1.0.0-use_system_catch-636828.patch deleted file mode 100644 index 12d92605dda8..000000000000 --- a/dev-cpp/ms-gsl/files/ms-gsl-1.0.0-use_system_catch-636828.patch +++ /dev/null @@ -1,21 +0,0 @@ -Add CMake option to disable upstream's catch download, we always want to use the -system wide installed version. Gentoo bug 636828. - -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 86ce5a4..b36df56 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -10,7 +10,9 @@ list(APPEND CATCH_CMAKE_ARGS - "-DNO_SELFTEST=true" - ) - --if(GIT_FOUND) -+option(FORCE_SYSTEM_CATCH "Force usage of system-wide catch install" OFF) -+ -+if(NOT ${FORCE_SYSTEM_CATCH} AND GIT_FOUND) - # add catch - ExternalProject_Add( - catch --- -2.13.6 - diff --git a/dev-cpp/ms-gsl/metadata.xml b/dev-cpp/ms-gsl/metadata.xml index 7b3ec3f962e5..64119c11cd7d 100644 --- a/dev-cpp/ms-gsl/metadata.xml +++ b/dev-cpp/ms-gsl/metadata.xml @@ -1,15 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>gentoo@taujhe.de</email> <name>Jan Henke</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> - <longdescription>Microsoft's implmentation of the Guidelines Support Library.</longdescription> <upstream> <remote-id type="github">Microsoft/GSL</remote-id> </upstream> diff --git a/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild b/dev-cpp/ms-gsl/ms-gsl-4.0.0.ebuild index 5eccf76caa0d..f5b298484aa1 100644 --- a/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild +++ b/dev-cpp/ms-gsl/ms-gsl-4.0.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit cmake-utils +inherit cmake DESCRIPTION="Guideline Support Library implementation by Microsoft" HOMEPAGE="https://github.com/Microsoft/GSL" @@ -13,15 +13,15 @@ S="${WORKDIR}/GSL-${PV}" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" IUSE="test" +RESTRICT="!test? ( test )" # header only library RDEPEND="" -DEPEND="test? ( dev-cpp/catch:1 )" +DEPEND="test? ( >=dev-cpp/gtest-1.9.0_pre20190607 )" PATCHES=( - "${FILESDIR}/${PN}-1.0.0-use_system_catch-636828.patch" "${FILESDIR}/${PN}-1.0.0-disable_Werror-644042.patch" ) @@ -29,6 +29,5 @@ src_configure() { local mycmakeargs=( -DGSL_TEST=$(usex test) ) - use test && mycmakeargs+=( -DFORCE_SYSTEM_CATCH=ON ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/dev-cpp/ms-gsl/ms-gsl-9999.ebuild b/dev-cpp/ms-gsl/ms-gsl-9999.ebuild index 3568adaea6b7..79f60335475e 100644 --- a/dev-cpp/ms-gsl/ms-gsl-9999.ebuild +++ b/dev-cpp/ms-gsl/ms-gsl-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit cmake-utils git-r3 +inherit cmake git-r3 DESCRIPTION="Guideline Support Library implementation by Microsoft" HOMEPAGE="https://github.com/Microsoft/GSL" @@ -14,13 +14,13 @@ LICENSE="MIT" SLOT="0" KEYWORDS="" IUSE="test" +RESTRICT="!test? ( test )" # header only library RDEPEND="" -DEPEND="test? ( dev-cpp/catch:1 )" +DEPEND="test? ( >=dev-cpp/gtest-1.9.0_pre20190607 )" PATCHES=( - "${FILESDIR}/${PN}-1.0.0-use_system_catch-636828.patch" "${FILESDIR}/${PN}-1.0.0-disable_Werror-644042.patch" ) @@ -28,6 +28,5 @@ src_configure() { local mycmakeargs=( -DGSL_TEST=$(usex test) ) - use test && mycmakeargs+=( -DFORCE_SYSTEM_CATCH=ON ) - cmake-utils_src_configure + cmake_src_configure } |