gentoo resync : 19.03.2019

4 files changed, 3 insertions, 74 deletions

diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index 9e550ae4dc2c..db721d8c1021 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -1,10 +1,8 @@
-AUX catch-2.2.2-python-automagic.patch 1096 BLAKE2B c1c5ae6cc0fa4f8066255581ab29bed966f4051eea79941c0a0f3e51f3639894b216dcc229de2ca932f0e41b8c3277f687d5d4dd2d226a2872f58ea486b9315f SHA512 d6b7198f60e45a52a40496eeecc1b34f5394af5dcccbaa7b2afa3af674d83f05a258311f151147ee8fcacae7764c4d742a92591c910a7beedfba5c71f547dfdc
-AUX catch-2.2.2-test-python3.patch 1521 BLAKE2B 6329f5d4995216e685c3404ef99fea1deed0be3e5f4849e7b24448b7a6c3d2aab47442a29dadbf0684888360c4a5a2e09667d765182a8a5f9245e64c7723cb34 SHA512 ca4ba7bfd87edcd06775d4d3fc7f19eb7188f95c73f4f26a08ddddd63a86249e2f4e3380b6a7cf449f1d6a32a6181557d5f82af6f79ca0c315b72fa9f7198166
 AUX catch-2.3.0-python-automagic.patch 1007 BLAKE2B 33a5c7fb715e5b312c28216ded81c2384abd4849d550f6be44604175f3645e2570d3cf17f863ad6e3b2b8d966a2427baf69fbf26440780c5ea458b9e5eea350b SHA512 dc0fd7ed133bbbca14f06ec05e867a7de41e5ef92e7644118daa96d283dac4b4f77c4d1367ab3af990643cbc38f7107eca204730d67851bf9264bc4010f04b28
 DIST Catch-1.12.2.tar.gz 377265 BLAKE2B bc27b4daee950f8fb93d65f3aed032e72bc856ee27a8dc28c35b89e33f414d68ba4cf00951e476688eddf9e4c0514036bd6916fa6cfa9e3359e6c625984f114f SHA512 ed963cdca9fe307ee02928677f81cafcb41cd607faaa315182fdf898d0f2aa28f0be2141bd642f46fdfac400c38f6d065e00a595a1e5879fe2335c4a3851e844
 DIST Catch2-2.3.0.tar.gz 506374 BLAKE2B f692eb0933ca578edf0f15cb83139d2fab03390b3980a686ea495101165d612c848b642ad1e7233bce5bb164c80958c9cbfbc229e72a1ae6947aa4dffdf27556 SHA512 e9a089b504c339e87bda0fb1a4040d9d19c932a4bc7dca41bdad6edfcf8c428f4152ff1e0c898dfdf6b20bd5d901c343bed00ad89351fa5182f3c106e0fb4b03
 DIST Catch2-2.5.0.tar.gz 549328 BLAKE2B a32941a043a654228cc541dc675ad789f5b938ebc2d3177d1657f66f68fb175bec8c88a60ecba00e84eca74a7506dc83aed74ac89f7dde83213284eb4a497225 SHA512 420f1d1a5ea7b69be9fb316a8abe1fb7c7e78d44a982e883748f1e0c8d2a435c1518b6022742716019558a740f8b31977ed6a786b0293e0504206b016801cfe8
-EBUILD catch-1.12.2.ebuild 805 BLAKE2B 77b0fa114ad31a26e3dcbb150f12f14f72487b3f6615d81bc31f22605be87bdd48a5b4e7a9922d890cce9486624abde7595a4dd50ff36ea65775c5640614143b SHA512 4e6b9291038587546d4345a252e5933146e4ca70f42048fd8cdad5f019f1f5e5a2543ce99bd044940c813511e7e6dab3c67f7e8848821cb749d5f19451f98089
+EBUILD catch-1.12.2.ebuild 804 BLAKE2B 7e640284ac14bb08909f6f1d3cb1c8f9c0c44b84f68b03dd3b3b65a27f43a10440b4c0ef734d27c425d27bd39b38cc7825e5a99a2a6a333abbb82316e395a47b SHA512 09f4944ae6b0a95b89c310ab8e9df3461efa4674f833274498d18f94a999785862274aaaaaa6cacce1c8b9c59365d3426e602b0d3735fe829e4a63a9dc935ad0
 EBUILD catch-1.9999.ebuild 805 BLAKE2B 77b0fa114ad31a26e3dcbb150f12f14f72487b3f6615d81bc31f22605be87bdd48a5b4e7a9922d890cce9486624abde7595a4dd50ff36ea65775c5640614143b SHA512 4e6b9291038587546d4345a252e5933146e4ca70f42048fd8cdad5f019f1f5e5a2543ce99bd044940c813511e7e6dab3c67f7e8848821cb749d5f19451f98089
 EBUILD catch-2.3.0.ebuild 1029 BLAKE2B 472cd9eb3b96e8c7bf766b42477f881ff3421dcd81617905fda7e6c530a457150f2dc4d543bfb73aa352a49713960d1db3a9758a55714b1dc100b697fc039ddd SHA512 7523558c0b75881959da3aec3d529c8bffb33f5d3bd9bbe409726845cde139b9a166d348a36e0e6742e045677f2142580925b950b605b7b4e318b1aaf5f8d276
 EBUILD catch-2.5.0.ebuild 918 BLAKE2B 6a64f80865b8d399a9f24885eacc2538985c224ff1eb9cde10a3e0c6aeaa08c84ce2e69dbcad48d8f69cd8fadd732bd01c0f97f87873ac3080491372ab567730 SHA512 4f053c94484263c8dc6240cfbe42458fdf393605b5dcbaa4425648a8c3871cd8928f6ed0fd8c13e904c37089b9483bd60dc6b71809699b5fe1e98fdc2177def5
diff --git a/dev-cpp/catch/catch-1.12.2.ebuild b/dev-cpp/catch/catch-1.12.2.ebuild
index f8b78e009959..66c092f781d0 100644
--- a/dev-cpp/catch/catch-1.12.2.ebuild
+++ b/dev-cpp/catch/catch-1.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MY_P=${PN^}-${PV}
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 
 	S="${WORKDIR}/${PN^}2-${PV}"
 fi
diff --git a/dev-cpp/catch/files/catch-2.2.2-python-automagic.patch b/dev-cpp/catch/files/catch-2.2.2-python-automagic.patch
deleted file mode 100644
index ecc99905d7f0..000000000000
--- a/dev-cpp/catch/files/catch-2.2.2-python-automagic.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -308,6 +308,9 @@
- 
- include(CTest)
- 
-+# Approval tests require python 2.7 or 3
-+find_package(PythonInterp)
-+
- if (BUILD_TESTING AND NOT_SUBPROJECT)
-     add_executable(SelfTest ${TEST_SOURCES} ${IMPL_SOURCES} ${REPORTER_SOURCES} ${SURROGATE_SOURCES} ${HEADERS})
-     target_include_directories(SelfTest PRIVATE ${HEADER_DIR})
-@@ -384,7 +387,11 @@
-     set_tests_properties(NoTest PROPERTIES PASS_REGULAR_EXPRESSION "No test cases matched")
- 
-     # AppVeyor has a Python 2.7 in path, but doesn't have .py files as autorunnable
--    add_test(NAME ApprovalTests COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/scripts/approvalTests.py $<TARGET_FILE:SelfTest>)
-+    if(NOT ${PYTHONINTERP_FOUND})
-+        message(FATAL_ERROR "Python not found, but required for running tests!")
-+    endif()
-+
-+    add_test(NAME ApprovalTests COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/scripts/approvalTests.py $<TARGET_FILE:SelfTest>)
-     set_tests_properties(ApprovalTests PROPERTIES FAIL_REGULAR_EXPRESSION "Results differed")
- 
-     if (CATCH_USE_VALGRIND)
diff --git a/dev-cpp/catch/files/catch-2.2.2-test-python3.patch b/dev-cpp/catch/files/catch-2.2.2-test-python3.patch
deleted file mode 100644
index 0712f1577077..000000000000
--- a/dev-cpp/catch/files/catch-2.2.2-test-python3.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From dc6b83bec9bdcc149db08711cc9dfd555a8620fa Mon Sep 17 00:00:00 2001
-From: Tom Hughes <tom@compton.nu>
-Date: Fri, 6 Apr 2018 13:59:08 +0100
-Subject: [PATCH] Support Python3 in approval tests
-
----
- scripts/approvalTests.py | 15 +++++++++++----
- 1 file changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/scripts/approvalTests.py b/scripts/approvalTests.py
-index a2ab5d5a2..16cc7b7d2 100755
---- a/scripts/approvalTests.py
-+++ b/scripts/approvalTests.py
-@@ -72,10 +72,17 @@
- 
- overallResult = 0
- 
-+def openFile(file, mode):
-+    try:
-+        return open(file, mode, encoding='utf-8', errors='surrogateescape')
-+    except TypeError:
-+        import io
-+        return io.open(file, mode, encoding='utf-8', errors='surrogateescape')
-+
- def diffFiles(fileA, fileB):
--    with open(fileA, 'r') as file:
-+    with openFile(fileA, 'r') as file:
-         aLines = [line.rstrip() for line in file.readlines()]
--    with open(fileB, 'r') as file:
-+    with openFile(fileB, 'r') as file:
-         bLines = [line.rstrip() for line in file.readlines()]
- 
-     shortenedFilenameA = fileA.rsplit(os.sep, 1)[-1]
-@@ -139,8 +146,8 @@ def approve(baseName, args):
-     subprocess.call(args, stdout=f, stderr=f)
-     f.close()
- 
--    rawFile = open(rawResultsPath, 'r')
--    filteredFile = open(filteredResultsPath, 'w')
-+    rawFile = openFile(rawResultsPath, 'r')
-+    filteredFile = openFile(filteredResultsPath, 'w')
-     for line in rawFile:
-         filteredFile.write(filterLine(line).rstrip() + "\n")
-     filteredFile.close()