1 |
commit: 6a3f3e4a26efba4dede7603d9afc0eed7bc3120b |
2 |
Author: Jan Henke <Jan.Henke <AT> taujhe <DOT> de> |
3 |
AuthorDate: Mon Jan 8 19:29:09 2018 +0000 |
4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 8 19:57:58 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a3f3e4a |
7 |
|
8 |
dev-cpp/gsl: Drop old snapshot |
9 |
|
10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
11 |
|
12 |
dev-cpp/gsl/Manifest | 1 - |
13 |
...gsl-0_pre20171105-use_system_catch-636828.patch | 31 ---------------------- |
14 |
dev-cpp/gsl/gsl-0_pre20171105.ebuild | 28 ------------------- |
15 |
3 files changed, 60 deletions(-) |
16 |
|
17 |
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest |
18 |
index 601be068e06..5840dfcbf02 100644 |
19 |
--- a/dev-cpp/gsl/Manifest |
20 |
+++ b/dev-cpp/gsl/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST gsl-0_pre20171105.tar.gz 55870 BLAKE2B cc26a8a304a65cd6a487d22369b5b23169e07144a7629388fffdbf263619c0849f00efcc1a072408e3e89dd933e3309c15049d0fec30de07267b5b693c5c9657 SHA512 0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a |
23 |
DIST gsl-0_pre20180108.tar.gz 57335 BLAKE2B 7221828d433dfe13e500b57b1da5b828aadc95b0c210327dd25713ce7f5b0629a7067cd8ed2ef30e11c8b8a58fa424b1edc3d374440770ee814c4c3e372038d6 SHA512 7684c8ae7ad9d0624d2f1e3531b942e7a98960f60698e4c212998ddc2ac4651fccfe5fea66d1a22133b9cba4567ba4253b022f8826f069d2e2633b3074d4f640 |
24 |
|
25 |
diff --git a/dev-cpp/gsl/files/gsl-0_pre20171105-use_system_catch-636828.patch b/dev-cpp/gsl/files/gsl-0_pre20171105-use_system_catch-636828.patch |
26 |
deleted file mode 100644 |
27 |
index e72eae02311..00000000000 |
28 |
--- a/dev-cpp/gsl/files/gsl-0_pre20171105-use_system_catch-636828.patch |
29 |
+++ /dev/null |
30 |
@@ -1,31 +0,0 @@ |
31 |
-# Disable upstreams catch download, we always want to use the system installed |
32 |
-# version. Gentoo bug 636828. |
33 |
- |
34 |
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt |
35 |
-index 86ce5a4..9b7d4f7 100644 |
36 |
---- a/tests/CMakeLists.txt |
37 |
-+++ b/tests/CMakeLists.txt |
38 |
-@@ -10,21 +10,8 @@ list(APPEND CATCH_CMAKE_ARGS |
39 |
- "-DNO_SELFTEST=true" |
40 |
- ) |
41 |
- |
42 |
--if(GIT_FOUND) |
43 |
-- # add catch |
44 |
-- ExternalProject_Add( |
45 |
-- catch |
46 |
-- PREFIX ${CMAKE_BINARY_DIR}/catch |
47 |
-- GIT_REPOSITORY https://github.com/catchorg/Catch2.git |
48 |
-- GIT_TAG v2.0.1 |
49 |
-- CMAKE_ARGS ${CATCH_CMAKE_ARGS} |
50 |
-- LOG_DOWNLOAD 1 |
51 |
-- UPDATE_DISCONNECTED 1 |
52 |
-- ) |
53 |
--else() |
54 |
-- # assume catch is installed in a system directory |
55 |
-- add_custom_target(catch) |
56 |
--endif() |
57 |
-+# assume catch is installed in a system directory |
58 |
-+add_custom_target(catch) |
59 |
- |
60 |
- # this interface adds compile options to how the tests are run |
61 |
- # please try to keep entries ordered =) |
62 |
|
63 |
diff --git a/dev-cpp/gsl/gsl-0_pre20171105.ebuild b/dev-cpp/gsl/gsl-0_pre20171105.ebuild |
64 |
deleted file mode 100644 |
65 |
index ae775ff3f8c..00000000000 |
66 |
--- a/dev-cpp/gsl/gsl-0_pre20171105.ebuild |
67 |
+++ /dev/null |
68 |
@@ -1,28 +0,0 @@ |
69 |
-# Copyright 1999-2017 Gentoo Foundation |
70 |
-# Distributed under the terms of the GNU General Public License v2 |
71 |
- |
72 |
-EAPI=6 |
73 |
- |
74 |
-inherit cmake-utils vcs-snapshot |
75 |
- |
76 |
-DESCRIPTION="Guideline Support Library implementation by Microsoft" |
77 |
-HOMEPAGE="https://github.com/Microsoft/GSL" |
78 |
-SRC_URI="https://github.com/Microsoft/${PN}/tarball/d10ebc6555b627c9d1196076a78467e7be505987 -> ${P}.tar.gz" |
79 |
- |
80 |
-LICENSE="MIT" |
81 |
-SLOT="0" |
82 |
-KEYWORDS="~amd64 ~x86" |
83 |
-IUSE="test" |
84 |
- |
85 |
-# header only library |
86 |
-RDEPEND="" |
87 |
-DEPEND="test? ( >=dev-cpp/catch-1.11.0 )" |
88 |
- |
89 |
-PATCHES=( |
90 |
- "${FILESDIR}/${P}-use_system_catch-636828.patch" |
91 |
-) |
92 |
- |
93 |
-src_configure() { |
94 |
- local mycmakeargs=( -DGSL_TEST=$(usex test) ) |
95 |
- cmake-utils_src_configure |
96 |
-} |