From 574793820feeb95986a058cf5756dea2b4886d7d Mon Sep 17 00:00:00 2001
From: Jan Henke <Jan.Henke@taujhe.de>
Date: Wed, 24 Jan 2018 11:08:28 +0100
Subject: dev-cpp/ms-gsl: Fix patch file name for new atom name

Closes: https://bugs.gentoo.org/645476
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/6945
---
 .../gsl-0_pre20180108-use_system_catch-636828.patch | 21 ---------------------
 ...-gsl-0_pre20180108-use_system_catch-636828.patch | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 21 deletions(-)
 delete mode 100644 dev-cpp/ms-gsl/files/gsl-0_pre20180108-use_system_catch-636828.patch
 create mode 100644 dev-cpp/ms-gsl/files/ms-gsl-0_pre20180108-use_system_catch-636828.patch

(limited to 'dev-cpp/ms-gsl')

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
deleted file mode 100644
index 12d92605dda8..000000000000
--- a/dev-cpp/ms-gsl/files/gsl-0_pre20180108-use_system_catch-636828.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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/files/ms-gsl-0_pre20180108-use_system_catch-636828.patch b/dev-cpp/ms-gsl/files/ms-gsl-0_pre20180108-use_system_catch-636828.patch
new file mode 100644
index 000000000000..12d92605dda8
--- /dev/null
+++ b/dev-cpp/ms-gsl/files/ms-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
+
-- 
cgit v1.2.3-65-gdbad