* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/ms-gsl/, dev-cpp/ms-gsl/files/
@ 2018-03-19 15:57 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2018-03-19 15:57 UTC (permalink / raw
To: gentoo-commits
commit: db56cbbc4241fdd4aa19a7e09987334ba6fede80
Author: Jan Henke <Jan.Henke <AT> taujhe <DOT> de>
AuthorDate: Sat Mar 17 21:36:47 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Mar 19 15:45:37 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db56cbbc
dev-cpp/ms-gsl: Disable Werror when compiling tests
This lead to build failures due to new warnings being emmited by GCC 7
Closes: https://bugs.gentoo.org/644042
Closes: https://github.com/gentoo/gentoo/pull/7495
Package-Manager: Portage-2.3.24, Repoman-2.3.6
...s-gsl-0_pre20180304-disable_Werror-644042.patch | 27 ++++++++++++++++++++++
dev-cpp/ms-gsl/ms-gsl-0_pre20180304.ebuild | 1 +
2 files changed, 28 insertions(+)
diff --git a/dev-cpp/ms-gsl/files/ms-gsl-0_pre20180304-disable_Werror-644042.patch b/dev-cpp/ms-gsl/files/ms-gsl-0_pre20180304-disable_Werror-644042.patch
new file mode 100644
index 00000000000..9d2a43c223f
--- /dev/null
+++ b/dev-cpp/ms-gsl/files/ms-gsl-0_pre20180304-disable_Werror-644042.patch
@@ -0,0 +1,27 @@
+From 402dd069acc1944428fd9f4ed3620a157028f6cc Mon Sep 17 00:00:00 2001
+From: Jan Henke <Jan.Henke@taujhe.de>
+Date: Sat, 17 Mar 2018 19:47:52 +0100
+Subject: [PATCH] Disable -Werror when compiling tests
+
+GCC 7 generates new warnings on some of the test files, which lead to
+build failures. -Werror generally is helpful while developing to enforce
+a zero error policy, but not so much when packaging. Gentoo bug 644042
+---
+ tests/CMakeLists.txt | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 0e08d77..86e9af7 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -41,7 +41,6 @@ target_compile_options(gsl_tests_config INTERFACE
+ -Wcast-align
+ -Wconversion
+ -Wctor-dtor-privacy
+- -Werror
+ -Wextra
+ -Wno-missing-braces
+ -Wnon-virtual-dtor
+--
+2.16.1
+
diff --git a/dev-cpp/ms-gsl/ms-gsl-0_pre20180304.ebuild b/dev-cpp/ms-gsl/ms-gsl-0_pre20180304.ebuild
index c80cd2a3517..34943ad4bf8 100644
--- a/dev-cpp/ms-gsl/ms-gsl-0_pre20180304.ebuild
+++ b/dev-cpp/ms-gsl/ms-gsl-0_pre20180304.ebuild
@@ -20,6 +20,7 @@ DEPEND="test? ( >=dev-cpp/catch-1.11.0 )"
PATCHES=(
"${FILESDIR}/ms-gsl-0_pre20180108-use_system_catch-636828.patch"
+ "${FILESDIR}/ms-gsl-0_pre20180304-disable_Werror-644042.patch"
)
src_configure() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/ms-gsl/, dev-cpp/ms-gsl/files/
@ 2018-05-01 22:03 Patrice Clement
0 siblings, 0 replies; 5+ messages in thread
From: Patrice Clement @ 2018-05-01 22:03 UTC (permalink / raw
To: gentoo-commits
commit: 4d5de19e4a73863d8152ecb6df1ece5d3be7dcc7
Author: Jan Henke <Jan.Henke <AT> taujhe <DOT> de>
AuthorDate: Tue May 1 21:45:00 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue May 1 22:02:55 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d5de19e
dev-cpp/ms-gsl: drop old.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-cpp/ms-gsl/Manifest | 2 --
...s-gsl-0_pre20180304-disable_Werror-644042.patch | 27 ------------------
... => ms-gsl-1.0.0-use_system_catch-636828.patch} | 0
dev-cpp/ms-gsl/ms-gsl-0_pre20180108.ebuild | 31 ---------------------
dev-cpp/ms-gsl/ms-gsl-0_pre20180304.ebuild | 32 ----------------------
dev-cpp/ms-gsl/ms-gsl-1.0.0.ebuild | 2 +-
6 files changed, 1 insertion(+), 93 deletions(-)
diff --git a/dev-cpp/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest
index e22fc50b79d..605a6a2172e 100644
--- a/dev-cpp/ms-gsl/Manifest
+++ b/dev-cpp/ms-gsl/Manifest
@@ -1,3 +1 @@
-DIST ms-gsl-0_pre20180108.tar.gz 57335 BLAKE2B 7221828d433dfe13e500b57b1da5b828aadc95b0c210327dd25713ce7f5b0629a7067cd8ed2ef30e11c8b8a58fa424b1edc3d374440770ee814c4c3e372038d6 SHA512 7684c8ae7ad9d0624d2f1e3531b942e7a98960f60698e4c212998ddc2ac4651fccfe5fea66d1a22133b9cba4567ba4253b022f8826f069d2e2633b3074d4f640
-DIST ms-gsl-0_pre20180304.tar.gz 57458 BLAKE2B 642807c07d9d4dac2752a46178d46d275f62dbb1193bf78f54dfaa5ca18eab2998c3a6d7821cffab49a44d50b2ab72680e612827cad710b14aa823aa503f51e1 SHA512 def4ce81e8b5a720eb9319ca3662b0738fb155429018275eb1ada9388d8825ed167db0102cc425594b412c06850338f1a5e1f062bf7b8e2c91badfa7ed203553
DIST ms-gsl-1.0.0.tar.gz 58920 BLAKE2B 46b71ec1fe57ec311a53895498c375c2313ed1f2858cd6b67d19d92ef10230707ce14fb757c00c92ea3475d787cda400cc449c34d54a54a3d0123f71b87b11ad SHA512 cde55df9540fd08ca8d29a74b2cff360686aa75b01ee1c48bd9782a2d70d1b6eae712a51eaf9b60453f859e466df00345b0a2893137d16490cea8ee54362f7da
diff --git a/dev-cpp/ms-gsl/files/ms-gsl-0_pre20180304-disable_Werror-644042.patch b/dev-cpp/ms-gsl/files/ms-gsl-0_pre20180304-disable_Werror-644042.patch
deleted file mode 100644
index 9d2a43c223f..00000000000
--- a/dev-cpp/ms-gsl/files/ms-gsl-0_pre20180304-disable_Werror-644042.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 402dd069acc1944428fd9f4ed3620a157028f6cc Mon Sep 17 00:00:00 2001
-From: Jan Henke <Jan.Henke@taujhe.de>
-Date: Sat, 17 Mar 2018 19:47:52 +0100
-Subject: [PATCH] Disable -Werror when compiling tests
-
-GCC 7 generates new warnings on some of the test files, which lead to
-build failures. -Werror generally is helpful while developing to enforce
-a zero error policy, but not so much when packaging. Gentoo bug 644042
----
- tests/CMakeLists.txt | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 0e08d77..86e9af7 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -41,7 +41,6 @@ target_compile_options(gsl_tests_config INTERFACE
- -Wcast-align
- -Wconversion
- -Wctor-dtor-privacy
-- -Werror
- -Wextra
- -Wno-missing-braces
- -Wnon-virtual-dtor
---
-2.16.1
-
diff --git a/dev-cpp/ms-gsl/files/ms-gsl-0_pre20180108-use_system_catch-636828.patch b/dev-cpp/ms-gsl/files/ms-gsl-1.0.0-use_system_catch-636828.patch
similarity index 100%
rename from dev-cpp/ms-gsl/files/ms-gsl-0_pre20180108-use_system_catch-636828.patch
rename to dev-cpp/ms-gsl/files/ms-gsl-1.0.0-use_system_catch-636828.patch
diff --git a/dev-cpp/ms-gsl/ms-gsl-0_pre20180108.ebuild b/dev-cpp/ms-gsl/ms-gsl-0_pre20180108.ebuild
deleted file mode 100644
index 1bfdc9e3c5a..00000000000
--- a/dev-cpp/ms-gsl/ms-gsl-0_pre20180108.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils vcs-snapshot
-
-DESCRIPTION="Guideline Support Library implementation by Microsoft"
-HOMEPAGE="https://github.com/Microsoft/GSL"
-SRC_URI="https://github.com/Microsoft/gsl/tarball/9d65e74400976b3509833f49b16d401600c7317d -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-# header only library
-RDEPEND=""
-DEPEND="test? ( >=dev-cpp/catch-1.11.0 )"
-
-PATCHES=(
- "${FILESDIR}/${P}-use_system_catch-636828.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DGSL_TEST=$(usex test)
- -DFORCE_SYSTEM_CATCH=ON
- )
- cmake-utils_src_configure
-}
diff --git a/dev-cpp/ms-gsl/ms-gsl-0_pre20180304.ebuild b/dev-cpp/ms-gsl/ms-gsl-0_pre20180304.ebuild
deleted file mode 100644
index 34943ad4bf8..00000000000
--- a/dev-cpp/ms-gsl/ms-gsl-0_pre20180304.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils vcs-snapshot
-
-DESCRIPTION="Guideline Support Library implementation by Microsoft"
-HOMEPAGE="https://github.com/Microsoft/GSL"
-SRC_URI="https://github.com/Microsoft/gsl/tarball/6a33b97a84f9c0a60ede78b5db98647e9a48d6c9 -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-# header only library
-RDEPEND=""
-DEPEND="test? ( >=dev-cpp/catch-1.11.0 )"
-
-PATCHES=(
- "${FILESDIR}/ms-gsl-0_pre20180108-use_system_catch-636828.patch"
- "${FILESDIR}/ms-gsl-0_pre20180304-disable_Werror-644042.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DGSL_TEST=$(usex test)
- -DFORCE_SYSTEM_CATCH=ON
- )
- cmake-utils_src_configure
-}
diff --git a/dev-cpp/ms-gsl/ms-gsl-1.0.0.ebuild b/dev-cpp/ms-gsl/ms-gsl-1.0.0.ebuild
index 87622d29641..c1443565414 100644
--- a/dev-cpp/ms-gsl/ms-gsl-1.0.0.ebuild
+++ b/dev-cpp/ms-gsl/ms-gsl-1.0.0.ebuild
@@ -19,7 +19,7 @@ RDEPEND=""
DEPEND="test? ( >=dev-cpp/catch-1.11.0 )"
PATCHES=(
- "${FILESDIR}/ms-gsl-0_pre20180108-use_system_catch-636828.patch"
+ "${FILESDIR}/${P}-use_system_catch-636828.patch"
"${FILESDIR}/${P}-disable_Werror-644042.patch"
)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/ms-gsl/, dev-cpp/ms-gsl/files/
@ 2018-05-01 22:03 Patrice Clement
0 siblings, 0 replies; 5+ messages in thread
From: Patrice Clement @ 2018-05-01 22:03 UTC (permalink / raw
To: gentoo-commits
commit: 8ccfe39925a30b8f26d848f99c9361fe0502030e
Author: Jan Henke <Jan.Henke <AT> taujhe <DOT> de>
AuthorDate: Tue May 1 21:43:04 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue May 1 22:02:48 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ccfe399
dev-cpp/ms-gsl: version bump to 1.0.0.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/8237
dev-cpp/ms-gsl/Manifest | 1 +
.../files/ms-gsl-1.0.0-disable_Werror-644042.patch | 35 ++++++++++++++++++++++
dev-cpp/ms-gsl/ms-gsl-1.0.0.ebuild | 32 ++++++++++++++++++++
3 files changed, 68 insertions(+)
diff --git a/dev-cpp/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest
index 0349d9a457a..e22fc50b79d 100644
--- a/dev-cpp/ms-gsl/Manifest
+++ b/dev-cpp/ms-gsl/Manifest
@@ -1,2 +1,3 @@
DIST ms-gsl-0_pre20180108.tar.gz 57335 BLAKE2B 7221828d433dfe13e500b57b1da5b828aadc95b0c210327dd25713ce7f5b0629a7067cd8ed2ef30e11c8b8a58fa424b1edc3d374440770ee814c4c3e372038d6 SHA512 7684c8ae7ad9d0624d2f1e3531b942e7a98960f60698e4c212998ddc2ac4651fccfe5fea66d1a22133b9cba4567ba4253b022f8826f069d2e2633b3074d4f640
DIST ms-gsl-0_pre20180304.tar.gz 57458 BLAKE2B 642807c07d9d4dac2752a46178d46d275f62dbb1193bf78f54dfaa5ca18eab2998c3a6d7821cffab49a44d50b2ab72680e612827cad710b14aa823aa503f51e1 SHA512 def4ce81e8b5a720eb9319ca3662b0738fb155429018275eb1ada9388d8825ed167db0102cc425594b412c06850338f1a5e1f062bf7b8e2c91badfa7ed203553
+DIST ms-gsl-1.0.0.tar.gz 58920 BLAKE2B 46b71ec1fe57ec311a53895498c375c2313ed1f2858cd6b67d19d92ef10230707ce14fb757c00c92ea3475d787cda400cc449c34d54a54a3d0123f71b87b11ad SHA512 cde55df9540fd08ca8d29a74b2cff360686aa75b01ee1c48bd9782a2d70d1b6eae712a51eaf9b60453f859e466df00345b0a2893137d16490cea8ee54362f7da
diff --git a/dev-cpp/ms-gsl/files/ms-gsl-1.0.0-disable_Werror-644042.patch b/dev-cpp/ms-gsl/files/ms-gsl-1.0.0-disable_Werror-644042.patch
new file mode 100644
index 00000000000..35c8177cad8
--- /dev/null
+++ b/dev-cpp/ms-gsl/files/ms-gsl-1.0.0-disable_Werror-644042.patch
@@ -0,0 +1,35 @@
+From 683aacce5b642a3c735f8040601e0de345d028da Mon Sep 17 00:00:00 2001
+From: Jan Henke <Jan.Henke@taujhe.de>
+Date: Sat, 17 Mar 2018 19:47:52 +0100
+Subject: [PATCH] Disable -WError when compiling tests
+
+GCC 7 generates new warnings on some of the test files, which lead to
+build failures. -WError generally is helpful while developing to enforce
+a zero error policy, but not so much when packaging. Gentoo bug 644042
+---
+ tests/CMakeLists.txt | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 0e08d77..86e9af7 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -41,7 +41,6 @@ target_compile_options(gsl_tests_config INTERFACE
+ -Wcast-align
+ -Wconversion
+ -Wctor-dtor-privacy
+- -Werror
+ -Wextra
+ -Wno-missing-braces
+ -Wnon-virtual-dtor
+@@ -129,7 +128,6 @@ target_compile_options(gsl_tests_config_noexcept INTERFACE
+ -Wcast-align
+ -Wconversion
+ -Wctor-dtor-privacy
+- -Werror
+ -Wextra
+ -Wno-missing-braces
+ -Wnon-virtual-dtor
+--
+2.16.1
+
diff --git a/dev-cpp/ms-gsl/ms-gsl-1.0.0.ebuild b/dev-cpp/ms-gsl/ms-gsl-1.0.0.ebuild
new file mode 100644
index 00000000000..87622d29641
--- /dev/null
+++ b/dev-cpp/ms-gsl/ms-gsl-1.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils vcs-snapshot
+
+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"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# header only library
+RDEPEND=""
+DEPEND="test? ( >=dev-cpp/catch-1.11.0 )"
+
+PATCHES=(
+ "${FILESDIR}/ms-gsl-0_pre20180108-use_system_catch-636828.patch"
+ "${FILESDIR}/${P}-disable_Werror-644042.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DGSL_TEST=$(usex test)
+ -DFORCE_SYSTEM_CATCH=ON
+ )
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/ms-gsl/, dev-cpp/ms-gsl/files/
@ 2021-02-19 2:14 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2021-02-19 2:14 UTC (permalink / raw
To: gentoo-commits
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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/ms-gsl/, dev-cpp/ms-gsl/files/
@ 2023-02-01 19:27 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2023-02-01 19:27 UTC (permalink / raw
To: gentoo-commits
commit: c69ed8d630ea21cdda2bd6c020bfccc7aa3c7922
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 19:40:07 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 1 19:26:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c69ed8d6
dev-cpp/ms-gsl: drop 3.1.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-cpp/ms-gsl/Manifest | 1 -
.../files/ms-gsl-3.0.0-use_system_gtest.patch | 82 ----------------------
dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild | 34 ---------
3 files changed, 117 deletions(-)
diff --git a/dev-cpp/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest
index c1e82bb88d4d..cff79bbcb244 100644
--- a/dev-cpp/ms-gsl/Manifest
+++ b/dev-cpp/ms-gsl/Manifest
@@ -1,2 +1 @@
-DIST ms-gsl-3.1.0.tar.gz 78196 BLAKE2B 32334891a11004a6919645814154fdb108a4582a00ac0002c0af9a524978cc8316bebb07192e260b800f462d5424c476fc22be59cca59c0f3d9d7606ab8c4181 SHA512 2916df9ee165fc803ffae0a56518f2ba92870e279984913ff591559e1459943c3ffbc1f5a0d819ad8233f0c9034012de3616aa4e10557d87c7285d8425d10696
DIST ms-gsl-4.0.0.tar.gz 55846 BLAKE2B 4391f8865f8dc044e5a48826e84919df8e32fc80815a260e9c892aa6d155d278a9b7742c17e4455bcba3fc3164118c14ef160353913814ba48a83bc7de40c123 SHA512 7fa7446796c6bf82fb3bff09f86a69c446a27be528bef3b17c8bc5ad2f24d5cf86bdb3d3813ecb44726e8f395020180e97e41027330d1fbf545cc0f0b44aac29
diff --git a/dev-cpp/ms-gsl/files/ms-gsl-3.0.0-use_system_gtest.patch b/dev-cpp/ms-gsl/files/ms-gsl-3.0.0-use_system_gtest.patch
deleted file mode 100644
index fa8d09aafe74..000000000000
--- a/dev-cpp/ms-gsl/files/ms-gsl-3.0.0-use_system_gtest.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 727e9b8312c7ae011b667152606afc0e04ea197a Mon Sep 17 00:00:00 2001
-From: Jan Henke <Jan.Henke@taujhe.de>
-Date: Sun, 14 Jun 2020 14:12:02 +0200
-Subject: [PATCH] Use system gtest instead of downloading and building it
-
----
- CMakeLists.txt | 1 -
- tests/CMakeLists.txt | 30 ++++--------------------------
- 2 files changed, 4 insertions(+), 27 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 740cd31..f1bf7a2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.1.3...3.16)
- project(GSL VERSION 3.1.0 LANGUAGES CXX)
-
- include(ExternalProject)
--find_package(Git)
-
- # Use GNUInstallDirs to provide the right locations on all platforms
- include(GNUInstallDirs)
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 2bd1bbe..c42afb7 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -5,32 +5,9 @@ project(GSLTests CXX)
- # will make visual studio generated project group files
- set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-
--configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt)
--execute_process(
-- COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
-- RESULT_VARIABLE result
-- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download
--)
--if(result)
-- message(FATAL_ERROR "CMake step for googletest failed: ${result}")
--endif()
--
--execute_process(
-- COMMAND ${CMAKE_COMMAND} --build .
-- RESULT_VARIABLE result
-- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download
--)
--if(result)
-- message(FATAL_ERROR "CMake step for googletest failed: ${result}")
--endif()
--
- set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-
--add_subdirectory(
-- ${CMAKE_CURRENT_BINARY_DIR}/googletest-src
-- ${CMAKE_CURRENT_BINARY_DIR}/googletest-build
-- EXCLUDE_FROM_ALL
--)
-+find_package(GTest REQUIRED)
-
- if (MSVC AND (GSL_CXX_STANDARD EQUAL 17))
- set(GSL_CPLUSPLUS_OPT -Zc:__cplusplus -permissive-)
-@@ -139,7 +116,7 @@ endif(MSVC)
-
- # for tests to find the gtest header
- target_include_directories(gsl_tests_config SYSTEM INTERFACE
-- googletest/googletest/include
-+ ${GTest_INCLUDE_DIRS}
- )
-
- set_property(TARGET PROPERTY FOLDER "GSL_tests")
-@@ -149,7 +126,8 @@ function(add_gsl_test name)
- target_link_libraries(${name}
- GSL
- gsl_tests_config
-- gtest_main
-+ GTest::GTest
-+ GTest::Main
- )
- add_test(
- ${name}
---
-2.26.2
-
diff --git a/dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild b/dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild
deleted file mode 100644
index f5c2d7ee0cec..000000000000
--- a/dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# header only library
-RDEPEND=""
-DEPEND="test? ( >=dev-cpp/gtest-1.9.0_pre20190607 )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.0-disable_Werror-644042.patch"
- "${FILESDIR}/${PN}-3.0.0-use_system_gtest.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DGSL_TEST=$(usex test)
- )
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-02-01 19:27 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-01 22:03 [gentoo-commits] repo/gentoo:master commit in: dev-cpp/ms-gsl/, dev-cpp/ms-gsl/files/ Patrice Clement
-- strict thread matches above, loose matches on Subject: below --
2023-02-01 19:27 Andreas Sturmlechner
2021-02-19 2:14 Andreas Sturmlechner
2018-05-01 22:03 Patrice Clement
2018-03-19 15:57 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox