[gentoo-commits] repo/gentoo:master commit in: dev-cpp/ms-gsl/, dev-cpp/ms-gsl/files/

[Patrice Clement]

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@××××××.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"
 )