commit: 26d42170078b94640529995563017831075669c2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Feb 19 02:09:39 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Feb 19 02:14:05 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26d42170
dev-cpp/ms-gsl: Drop 2.0.0 and 2.1.0 Bug: https://bugs.gentoo.org/770694 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-cpp/ms-gsl/Manifest | 2 -- .../ms-gsl-1.0.0-use_system_catch-636828.patch | 21 ------------- dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild | 35 ---------------------- dev-cpp/ms-gsl/ms-gsl-2.1.0.ebuild | 35 ---------------------- 4 files changed, 93 deletions(-) diff --git a/dev-cpp/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest index 3a53ce07497..978e15f0d16 100644 --- a/dev-cpp/ms-gsl/Manifest +++ b/dev-cpp/ms-gsl/Manifest @@ -1,3 +1 @@ -DIST ms-gsl-2.0.0.tar.gz 64726 BLAKE2B ab40725aa38af7c5651e22ebf32d4bd9c27a10be2e206fd4c3c0173ad21da262beddef022b7b158653b185cfc3269f2b6e80d99fe65f601ffc3e770b143b03f8 SHA512 7339527222c8a97a94c0bb4038b3d142045ec5d80995e628574ac96f4d9d13c41ad70fbe0d8390586dc0db8d9ea55107dbc95de80f7335eb78ef9d2e7047d726 -DIST ms-gsl-2.1.0.tar.gz 67289 BLAKE2B 5a247028b71521d7851a6aa5f24936dfb1c7f283854724d8d4bf2d9d9ac3a928c0e5b42a280d8a0a0254d9f6fa958bf1283dab674c649bdaaa7b38ef38f3b1ba SHA512 4382b8feadf4608b06b66a78ca51b0f60a6e8b41b183aec6ac8f8e2e9f0b39705dea513fd708012ed8390c1a4f88d7df454f05166b76bee24ae843835cd4a2ca DIST ms-gsl-3.1.0.tar.gz 78196 BLAKE2B 32334891a11004a6919645814154fdb108a4582a00ac0002c0af9a524978cc8316bebb07192e260b800f462d5424c476fc22be59cca59c0f3d9d7606ab8c4181 SHA512 2916df9ee165fc803ffae0a56518f2ba92870e279984913ff591559e1459943c3ffbc1f5a0d819ad8233f0c9034012de3616aa4e10557d87c7285d8425d10696 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 12d92605dda..00000000000 --- 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/ms-gsl-2.0.0.ebuild b/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild deleted file mode 100644 index c25d5f9efe5..00000000000 --- a/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="Guideline Support Library implementation by Microsoft" -HOMEPAGE="https://github.com/Microsoft/GSL"; -SRC_URI="https://github.com/Microsoft/GSL/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -S="${WORKDIR}/GSL-${PV}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~ppc64 x86" -IUSE="test" -RESTRICT="!test? ( test )" - -# header only library -RDEPEND="" -DEPEND="test? ( dev-cpp/catch:1 )" - -PATCHES=( - "${FILESDIR}/${PN}-1.0.0-use_system_catch-636828.patch" - "${FILESDIR}/${PN}-1.0.0-disable_Werror-644042.patch" -) - -src_configure() { - local mycmakeargs=( - -DGSL_TEST=$(usex test) - ) - use test && mycmakeargs+=( -DFORCE_SYSTEM_CATCH=ON ) - cmake-utils_src_configure -} diff --git a/dev-cpp/ms-gsl/ms-gsl-2.1.0.ebuild b/dev-cpp/ms-gsl/ms-gsl-2.1.0.ebuild deleted file mode 100644 index a3c0c91b847..00000000000 --- a/dev-cpp/ms-gsl/ms-gsl-2.1.0.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="Guideline Support Library implementation by Microsoft" -HOMEPAGE="https://github.com/Microsoft/GSL"; -SRC_URI="https://github.com/Microsoft/GSL/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -S="${WORKDIR}/GSL-${PV}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~ppc64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -# header only library -RDEPEND="" -DEPEND="test? ( dev-cpp/catch:1 )" - -PATCHES=( - "${FILESDIR}/${PN}-1.0.0-use_system_catch-636828.patch" - "${FILESDIR}/${PN}-1.0.0-disable_Werror-644042.patch" -) - -src_configure() { - local mycmakeargs=( - -DGSL_TEST=$(usex test) - ) - use test && mycmakeargs+=( -DFORCE_SYSTEM_CATCH=ON ) - cmake-utils_src_configure -}
