6 files changed, 17 insertions, 42 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 5859494e5857..77c1a329120f 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest
index e772e6926ce1..bcbc90f8adc8 100644
--- a/dev-cpp/ms-gsl/Manifest
+++ b/dev-cpp/ms-gsl/Manifest
@@ -1,7 +1,5 @@
-AUX ms-gsl-0_pre20180108-use_system_catch-636828.patch 559 BLAKE2B 899f98f0b3e9b0f04cf0db9e74931113ee1d5ef77d5e016df9969abc5ea02d6a90736fa3cb37b5f3cc6ec5b4092a2660f610f636386d5de3c6e6e9b61fce0501 SHA512 4bfd90b1567fa708d9c51c78edb51974aae9158f456077a305de5d7d279686d85e593bba5c2bae477eb50880f731626192765b6122db6afcd383596d1a1e00dc
-AUX ms-gsl-0_pre20180304-disable_Werror-644042.patch 867 BLAKE2B b56327113837e40512e5d19aeaeb9ea2a7770aa75a4583f29e3f332ed823f1ac9310044e7f211c688309fb877be55dd6f06f7a1199d9819a63ec5402dc2791b0 SHA512 4dd57cf54d7bf63c3aa5c98464e43517c856d3f9b8222c53a55e55f6587295d8fe22370bec24c7661a14eb414ccd34cfe2fd3268aaef44ca77b2994460f73498
-DIST ms-gsl-0_pre20180108.tar.gz 57335 BLAKE2B 7221828d433dfe13e500b57b1da5b828aadc95b0c210327dd25713ce7f5b0629a7067cd8ed2ef30e11c8b8a58fa424b1edc3d374440770ee814c4c3e372038d6 SHA512 7684c8ae7ad9d0624d2f1e3531b942e7a98960f60698e4c212998ddc2ac4651fccfe5fea66d1a22133b9cba4567ba4253b022f8826f069d2e2633b3074d4f640
-DIST ms-gsl-0_pre20180304.tar.gz 57458 BLAKE2B 642807c07d9d4dac2752a46178d46d275f62dbb1193bf78f54dfaa5ca18eab2998c3a6d7821cffab49a44d50b2ab72680e612827cad710b14aa823aa503f51e1 SHA512 def4ce81e8b5a720eb9319ca3662b0738fb155429018275eb1ada9388d8825ed167db0102cc425594b412c06850338f1a5e1f062bf7b8e2c91badfa7ed203553
-EBUILD ms-gsl-0_pre20180108.ebuild 691 BLAKE2B f9aad64c668fc74cb94d419dd3cc607ad3255a165a826b3033c387d96b83bd346dd4a7825da5c800f5fc64ba3d1f286cf57044cb347ac93365f14b778cc007ae SHA512 59dd335079191e874c5580183e57bcd02381deb3395716fe6bce126ddeb9674ac1f81ea947872e3eee6dfbafe21430d063f3a00e6cc5b527cd8d5106f049b52d
-EBUILD ms-gsl-0_pre20180304.ebuild 771 BLAKE2B 6bf1d6d7bdc7163108bb22ac638c5b50470575cc9cec51451d2ab266b0527ecdfba385650d130f4a5c3a1893c2499f759346528aadd8f9c1bc395aefedcea5f6 SHA512 6f7a55fb781ab12415556897c416c15d9a884aedf0b4a9019c99daa0d6722b6a0d856b4c236ef87bfe93f9a77ebd28f846422c785075961b9a859d7c2833d923
+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
+DIST ms-gsl-1.0.0.tar.gz 58920 BLAKE2B 46b71ec1fe57ec311a53895498c375c2313ed1f2858cd6b67d19d92ef10230707ce14fb757c00c92ea3475d787cda400cc449c34d54a54a3d0123f71b87b11ad SHA512 cde55df9540fd08ca8d29a74b2cff360686aa75b01ee1c48bd9782a2d70d1b6eae712a51eaf9b60453f859e466df00345b0a2893137d16490cea8ee54362f7da
+EBUILD ms-gsl-1.0.0.ebuild 712 BLAKE2B 35b8e5f1174101ebb1b34719c823254ad5dfa20c68f589f2dc08ffbfc1cedc31df262cc87be7638c3f633c11a25bbb607ab4c07bb030298b5e4fef3bdf4c570c SHA512 6d6ca0672b31cebd6239a5df0b2d076821ca1eb4252745eceb3217cd54ed897a2030b33144ce88da167d4bfbeceb14d983539b51cea8d3946e59c565bf217b08
 MISC metadata.xml 533 BLAKE2B 997b40261c13283f190b7fe70b87e9d42b2b05c267afdbfc1de3a7b56bfb968736fd1a1163abc723985919fd201048fc69905cdaa6d6e4a8f938bac42495d13e SHA512 01522dee3ebdbe7e5f533a64859c8f215f8653ab6d7775f1488efa9aa813840ae7c2112cd4865b007feb1a296f74aeac123389881608e169f5d0f417dacd7719
diff --git a/dev-cpp/ms-gsl/files/ms-gsl-0_pre20180304-disable_Werror-644042.patch b/dev-cpp/ms-gsl/files/ms-gsl-1.0.0-disable_Werror-644042.patch
index 9d2a43c223f3..35c8177cad8a 100644
--- a/dev-cpp/ms-gsl/files/ms-gsl-0_pre20180304-disable_Werror-644042.patch
+++ b/dev-cpp/ms-gsl/files/ms-gsl-1.0.0-disable_Werror-644042.patch
@@ -1,10 +1,10 @@
-From 402dd069acc1944428fd9f4ed3620a157028f6cc Mon Sep 17 00:00:00 2001
+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
+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
+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 --
@@ -22,6 +22,14 @@ index 0e08d77..86e9af7 100644
          -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/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
index 12d92605dda8..12d92605dda8 100644
--- 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
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 34943ad4bf80..000000000000
--- 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-0_pre20180108.ebuild b/dev-cpp/ms-gsl/ms-gsl-1.0.0.ebuild
index 1bfdc9e3c5a0..c14435654142 100644
--- a/dev-cpp/ms-gsl/ms-gsl-0_pre20180108.ebuild
+++ b/dev-cpp/ms-gsl/ms-gsl-1.0.0.ebuild
@@ -7,7 +7,7 @@ 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"
+SRC_URI="https://github.com/Microsoft/GSL/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -20,6 +20,7 @@ DEPEND="test? ( >=dev-cpp/catch-1.11.0 )"
 
 PATCHES=(
 	"${FILESDIR}/${P}-use_system_catch-636828.patch"
+	"${FILESDIR}/${P}-disable_Werror-644042.patch"
 )
 
 src_configure() {