summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Henke <Jan.Henke@taujhe.de>2018-01-18 15:52:27 +0100
committerPatrice Clement <monsieurp@gentoo.org>2018-01-22 22:51:41 +0100
commitaa71e140d4960cc1f8b11630674c6cb29901f9f6 (patch)
treeadea6db78daa51ffc6ae5699f488fa9cc5010cad /dev-cpp/ms-gsl
parentmedia-libs/openimageio: version bump to 1.8.7. (diff)
downloadgentoo-aa71e140d4960cc1f8b11630674c6cb29901f9f6.tar.gz
gentoo-aa71e140d4960cc1f8b11630674c6cb29901f9f6.tar.bz2
gentoo-aa71e140d4960cc1f8b11630674c6cb29901f9f6.zip
dev-cpp/gsl: renamed to dev-cpp/ms-gsl.
Package-Manager: Portage-2.3.19, Repoman-2.3.6 Closes: https://bugs.gentoo.org/644944 Closes: https://github.com/gentoo/gentoo/pull/6897
Diffstat (limited to 'dev-cpp/ms-gsl')
-rw-r--r--dev-cpp/ms-gsl/Manifest1
-rw-r--r--dev-cpp/ms-gsl/files/gsl-0_pre20180108-use_system_catch-636828.patch21
-rw-r--r--dev-cpp/ms-gsl/metadata.xml16
-rw-r--r--dev-cpp/ms-gsl/ms-gsl-0_pre20180108.ebuild31
4 files changed, 69 insertions, 0 deletions
diff --git a/dev-cpp/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest
new file mode 100644
index 00000000000..de636c28048
--- /dev/null
+++ b/dev-cpp/ms-gsl/Manifest
@@ -0,0 +1 @@
+DIST ms-gsl-0_pre20180108.tar.gz 57335 BLAKE2B 7221828d433dfe13e500b57b1da5b828aadc95b0c210327dd25713ce7f5b0629a7067cd8ed2ef30e11c8b8a58fa424b1edc3d374440770ee814c4c3e372038d6 SHA512 7684c8ae7ad9d0624d2f1e3531b942e7a98960f60698e4c212998ddc2ac4651fccfe5fea66d1a22133b9cba4567ba4253b022f8826f069d2e2633b3074d4f640
diff --git a/dev-cpp/ms-gsl/files/gsl-0_pre20180108-use_system_catch-636828.patch b/dev-cpp/ms-gsl/files/gsl-0_pre20180108-use_system_catch-636828.patch
new file mode 100644
index 00000000000..12d92605dda
--- /dev/null
+++ b/dev-cpp/ms-gsl/files/gsl-0_pre20180108-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 00000000000..7b3ec3f962e
--- /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-0_pre20180108.ebuild b/dev-cpp/ms-gsl/ms-gsl-0_pre20180108.ebuild
new file mode 100644
index 00000000000..1bfdc9e3c5a
--- /dev/null
+++ b/dev-cpp/ms-gsl/ms-gsl-0_pre20180108.ebuild
@@ -0,0 +1,31 @@
+# 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
+}