gentoo resync : 14.07.2018

5 files changed, 109 insertions, 0 deletions

diff --git a/dev-cpp/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest
new file mode 100644
index 000000000000..8d1dfba7625e
--- /dev/null
+++ b/dev-cpp/ms-gsl/Manifest
@@ -0,0 +1,5 @@
+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 740 BLAKE2B 064e283ba501e9fb3ad9dd3fd28576c4138ebab6d5c532cecbe6b416d3a468a96b9fcc94bddc6987562b3c9897c7623f874c2bd791568d59bf7fe2cb463756d7 SHA512 0f4ba6a3e412749c33ea001645cc3b43b4cc509ed9190e56201a9b2ad8f055431df55d7a2e77e85c2180fe542e4b60042e58618cb4840fd5187fdd2eda9201cd
+MISC metadata.xml 533 BLAKE2B 997b40261c13283f190b7fe70b87e9d42b2b05c267afdbfc1de3a7b56bfb968736fd1a1163abc723985919fd201048fc69905cdaa6d6e4a8f938bac42495d13e SHA512 01522dee3ebdbe7e5f533a64859c8f215f8653ab6d7775f1488efa9aa813840ae7c2112cd4865b007feb1a296f74aeac123389881608e169f5d0f417dacd7719
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 000000000000..35c8177cad8a
--- /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/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
new file mode 100644
index 000000000000..12d92605dda8
--- /dev/null
+++ b/dev-cpp/ms-gsl/files/ms-gsl-1.0.0-use_system_catch-636828.patch
@@ -0,0 +1,21 @@
+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/metadata.xml b/dev-cpp/ms-gsl/metadata.xml
new file mode 100644
index 000000000000..7b3ec3f962e5
--- /dev/null
+++ b/dev-cpp/ms-gsl/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@taujhe.de</email>
+		<name>Jan Henke</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>Microsoft's implmentation of the Guidelines Support Library.</longdescription>
+	<upstream>
+		<remote-id type="github">Microsoft/GSL</remote-id>
+	</upstream>
+</pkgmetadata>
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 000000000000..cde182b5ba10
--- /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}/${P}-use_system_catch-636828.patch"
+	"${FILESDIR}/${P}-disable_Werror-644042.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DGSL_TEST=$(usex test)
+	)
+	use test && mycmakeargs+=( -DFORCE_SYSTEM_CATCH=ON )
+	cmake-utils_src_configure
+}