1 |
commit: 07c63b0b1358df3fc474a140b3b39a4cb6ff6bf2 |
2 |
Author: Jan Henke <Jan.Henke <AT> taujhe <DOT> de> |
3 |
AuthorDate: Mon Jan 8 19:28:24 2018 +0000 |
4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 8 19:57:56 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07c63b0b |
7 |
|
8 |
dev-cpp/gsl: New git snapshot and correctly patch catch use |
9 |
|
10 |
This updates the ebuild to a more recent snapshot and also fixes the patching to |
11 |
use the system wide catch instead of downloading it during build. |
12 |
|
13 |
Closes: https://bugs.gentoo.org/643422 |
14 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
15 |
|
16 |
dev-cpp/gsl/Manifest | 1 + |
17 |
...gsl-0_pre20180108-use_system_catch-636828.patch | 21 +++++++++++++++ |
18 |
dev-cpp/gsl/gsl-0_pre20180108.ebuild | 31 ++++++++++++++++++++++ |
19 |
dev-cpp/gsl/metadata.xml | 2 +- |
20 |
4 files changed, 54 insertions(+), 1 deletion(-) |
21 |
|
22 |
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest |
23 |
index eb36ecd5112..601be068e06 100644 |
24 |
--- a/dev-cpp/gsl/Manifest |
25 |
+++ b/dev-cpp/gsl/Manifest |
26 |
@@ -1 +1,2 @@ |
27 |
DIST gsl-0_pre20171105.tar.gz 55870 BLAKE2B cc26a8a304a65cd6a487d22369b5b23169e07144a7629388fffdbf263619c0849f00efcc1a072408e3e89dd933e3309c15049d0fec30de07267b5b693c5c9657 SHA512 0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a |
28 |
+DIST gsl-0_pre20180108.tar.gz 57335 BLAKE2B 7221828d433dfe13e500b57b1da5b828aadc95b0c210327dd25713ce7f5b0629a7067cd8ed2ef30e11c8b8a58fa424b1edc3d374440770ee814c4c3e372038d6 SHA512 7684c8ae7ad9d0624d2f1e3531b942e7a98960f60698e4c212998ddc2ac4651fccfe5fea66d1a22133b9cba4567ba4253b022f8826f069d2e2633b3074d4f640 |
29 |
|
30 |
diff --git a/dev-cpp/gsl/files/gsl-0_pre20180108-use_system_catch-636828.patch b/dev-cpp/gsl/files/gsl-0_pre20180108-use_system_catch-636828.patch |
31 |
new file mode 100644 |
32 |
index 00000000000..12d92605dda |
33 |
--- /dev/null |
34 |
+++ b/dev-cpp/gsl/files/gsl-0_pre20180108-use_system_catch-636828.patch |
35 |
@@ -0,0 +1,21 @@ |
36 |
+Add CMake option to disable upstream's catch download, we always want to use the |
37 |
+system wide installed version. Gentoo bug 636828. |
38 |
+ |
39 |
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt |
40 |
+index 86ce5a4..b36df56 100644 |
41 |
+--- a/tests/CMakeLists.txt |
42 |
++++ b/tests/CMakeLists.txt |
43 |
+@@ -10,7 +10,9 @@ list(APPEND CATCH_CMAKE_ARGS |
44 |
+ "-DNO_SELFTEST=true" |
45 |
+ ) |
46 |
+ |
47 |
+-if(GIT_FOUND) |
48 |
++option(FORCE_SYSTEM_CATCH "Force usage of system-wide catch install" OFF) |
49 |
++ |
50 |
++if(NOT ${FORCE_SYSTEM_CATCH} AND GIT_FOUND) |
51 |
+ # add catch |
52 |
+ ExternalProject_Add( |
53 |
+ catch |
54 |
+-- |
55 |
+2.13.6 |
56 |
+ |
57 |
|
58 |
diff --git a/dev-cpp/gsl/gsl-0_pre20180108.ebuild b/dev-cpp/gsl/gsl-0_pre20180108.ebuild |
59 |
new file mode 100644 |
60 |
index 00000000000..95ee05e9cd3 |
61 |
--- /dev/null |
62 |
+++ b/dev-cpp/gsl/gsl-0_pre20180108.ebuild |
63 |
@@ -0,0 +1,31 @@ |
64 |
+# Copyright 1999-2018 Gentoo Foundation |
65 |
+# Distributed under the terms of the GNU General Public License v2 |
66 |
+ |
67 |
+EAPI=6 |
68 |
+ |
69 |
+inherit cmake-utils vcs-snapshot |
70 |
+ |
71 |
+DESCRIPTION="Guideline Support Library implementation by Microsoft" |
72 |
+HOMEPAGE="https://github.com/Microsoft/GSL" |
73 |
+SRC_URI="https://github.com/Microsoft/${PN}/tarball/9d65e74400976b3509833f49b16d401600c7317d -> ${P}.tar.gz" |
74 |
+ |
75 |
+LICENSE="MIT" |
76 |
+SLOT="0" |
77 |
+KEYWORDS="~amd64 ~x86" |
78 |
+IUSE="test" |
79 |
+ |
80 |
+# header only library |
81 |
+RDEPEND="" |
82 |
+DEPEND="test? ( >=dev-cpp/catch-1.11.0 )" |
83 |
+ |
84 |
+PATCHES=( |
85 |
+ "${FILESDIR}/${P}-use_system_catch-636828.patch" |
86 |
+) |
87 |
+ |
88 |
+src_configure() { |
89 |
+ local mycmakeargs=( |
90 |
+ -DGSL_TEST=$(usex test) |
91 |
+ -DFORCE_SYSTEM_CATCH=ON |
92 |
+ ) |
93 |
+ cmake-utils_src_configure |
94 |
+} |
95 |
|
96 |
diff --git a/dev-cpp/gsl/metadata.xml b/dev-cpp/gsl/metadata.xml |
97 |
index 57bf76b9210..b1f7b8de77f 100644 |
98 |
--- a/dev-cpp/gsl/metadata.xml |
99 |
+++ b/dev-cpp/gsl/metadata.xml |
100 |
@@ -3,7 +3,7 @@ |
101 |
<pkgmetadata> |
102 |
<maintainer type="person"> |
103 |
<email>gentoo@××××××.de</email> |
104 |
- <description>Jan Henke</description> |
105 |
+ <name>Jan Henke</name> |
106 |
</maintainer> |
107 |
<maintainer type="project"> |
108 |
<email>proxy-maint@g.o</email> |