gentoo resync : 03.03.2021

5 files changed, 2 insertions, 98 deletions

diff --git a/dev-cpp/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest
index 261c1f6f7801..325c394321a3 100644
--- a/dev-cpp/ms-gsl/Manifest
+++ b/dev-cpp/ms-gsl/Manifest
@@ -1,11 +1,6 @@
 AUX ms-gsl-1.0.0-disable_Werror-644042.patch 1110 BLAKE2B fd126ec96d9a378eb8489919c130a64da9548b712a6a01fea5256294dca39afce813013f78c1b43a251b5b7fbe8846493dd9860aea2b7578c39c2cf766247202 SHA512 eec47c7f4d28d7b14a3403d046dc111bb3ef9e02e9e797f74636f3f7d11bc865c94e246bd4f98d9f39540c66b751de0ca81d523be3d523017e94886ec474799b
-AUX ms-gsl-1.0.0-use_system_catch-636828.patch 559 BLAKE2B 899f98f0b3e9b0f04cf0db9e74931113ee1d5ef77d5e016df9969abc5ea02d6a90736fa3cb37b5f3cc6ec5b4092a2660f610f636386d5de3c6e6e9b61fce0501 SHA512 4bfd90b1567fa708d9c51c78edb51974aae9158f456077a305de5d7d279686d85e593bba5c2bae477eb50880f731626192765b6122db6afcd383596d1a1e00dc
 AUX ms-gsl-3.0.0-use_system_gtest.patch 2425 BLAKE2B 506560482fee97f85b14f8dc9c57b5cceac5fb0c99574c00a0bc6d4bcd7f340eb0bb452485422562549a909f0e9c85a060df468386e7d74f1a575d8554cc485f SHA512 fb4e32901d9fa7e511ccb84043c6df9d4dfb26f973c32d5d92fd389c0b20dadf3b6a749ef5b23660093cd20b280c8ade924f8e7e5af41c3a5695a3ca94c9e3c7
-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
-EBUILD ms-gsl-2.0.0.ebuild 789 BLAKE2B fac20f1d690ebc855a4e499968241ddd3a718389956488a4ac8ebdd9af9e06bd1ed7b88a203ab9290ab919c663ce4600fadc93af6ef48e6e5b259ed7567bd913 SHA512 56a1f4f52cb439a109e7c41a59266b6c0282ed1345265de6368a4e2caa57b31c1e9eb8091ebcbd1df4cfe8fa8b480479ecac59f31ff6f98e966f0775f7446b03
-EBUILD ms-gsl-2.1.0.ebuild 790 BLAKE2B 410765af2d63169d15543f3ce9bc2685f01737cddb0ab19631f516e8556bed80f851104d504bd9f4513f3b56ed74d58a094887a97e02f2fd2694bfb1b6826772 SHA512 e2ea2e252a7eae5e31a60611198ef39cb576d047efe601d782e98386bb336b014b94f5f13f2c9cf2ede9f52d0a6eac946f0a559408e4573c9f6816957d771612
-EBUILD ms-gsl-3.1.0.ebuild 740 BLAKE2B bce9304675cb403af4e9fae35b001b5c9a59b2a2bc2ee70cb070d32af165f0f9510320336a6a7a5193f7a549f8badda9b444e77a9b393c84b2c105b4f1c0ec01 SHA512 4d3d9e15706fa255fbb82fa6802041a2e2e1e0d3ca80871486444a808f40ca6cb68b054c1c5a3447d4cfd6e516b42b5b3404e5dd734efd13f328cf9f91581610
+EBUILD ms-gsl-3.1.0.ebuild 751 BLAKE2B ba4c998f295b9cdd3fe51b57cc011864862905d0843da29482a656ec9a6e4c4079e938c863b0528a89a307a944403367ceac5ac10cf5ce236f8851576d3a2ea9 SHA512 a3cfd04a72f02bb1830e2842d47f4f5a0d29c7057956d4de58977f345426c44120a2429acaecfa9e36f23a57048c6b1239cd42c7207d571a5aa601bc9b6e92da
 EBUILD ms-gsl-9999.ebuild 683 BLAKE2B fdc69062e3f12551daf1dd8e823f34fae876d36e503bb5cdb85e43ab3e038a6769b1812eaedd156d5cb4dccd96bba6c1c5dc6c1edf61dfddc421a603b3bb241e SHA512 38e1676ce4717b9d0891f2439670b482c97a7be9c543bf38117dbfe6d9f5e55de484a3393cf605d757b1b6f645148bee1a078fd2414eead31e03186d623aca03
 MISC metadata.xml 436 BLAKE2B a56035e3f8e1a7a9f174beab2295972c57525325689333227592ea19e1b641317909d4491b30889d621bbc6775062feacddca77e16ef3d45e8464d9a7dd9d87c SHA512 07428e8e2b2a76ae4ae6b083cf6c25fbca2508307f492f9e75d1d1786df2bdc785fb6cf773e1bb2016e0ad9c826b2dc24750f1389cca7b6692f811ba4a52f863
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/ms-gsl-2.0.0.ebuild b/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild
deleted file mode 100644
index c25d5f9efe51..000000000000
--- 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 a3c0c91b847f..000000000000
--- 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
-}
diff --git a/dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild b/dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild
index f6c803756798..3e690129c15a 100644
--- a/dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild
+++ b/dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/GSL-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"