gentoo resync : 25.08.2020

4 files changed, 50 insertions, 13 deletions

diff --git a/dev-libs/unittest++/Manifest b/dev-libs/unittest++/Manifest
index d651b7fdf517..8045824d4422 100644
--- a/dev-libs/unittest++/Manifest
+++ b/dev-libs/unittest++/Manifest
@@ -1,5 +1,5 @@
-DIST unittest++-1.6.1.tar.gz 52536 BLAKE2B 0a5e7cbe1131565631c0537a1a262b6053b5010497eeaf76690f465cdbca45157feb6686faaf37a37f4554e37b54051161c3183651315509ada143975d7211f4 SHA512 2bb03def8b6ac84dbb6e5e440e5be8648199096fdc93d6666b704386e2c2279b329be6bda47c81bd8a8c485334059fb2a53fdd90358005a95b8add6f057c25ce
+AUX unittest++-2.0.0-fix-tests-with-clang.patch 1018 BLAKE2B 5913b010ceae5975b8cdcfe7656c137cfe47845ae92815d3b7fa66f429a712e686cb7accb400c43149458b6716020c7ff48f0a673a7c2b7bcc36f5cf0fcd40ae SHA512 dd77794e8c22e168235f14c3c00381bf7439bfe60a700ae038290c93e2f6faa276d4f45de17a159d7a1edbb182a40b078b7751a25e1dcf646e7d311fd33e31cf
 DIST unittest++-2.0.0.tar.gz 54100 BLAKE2B 5aceda6e76f4536054c8de0fb4a4a17027d0707101fb323883734d420f038aeb094fb6567e41145804f012c952a5807bdd6fe1bae1e4a09a6e36c5f1bbc5717e SHA512 39318f4ed31534c116679a3257bf1438a6c4b3bef1894dfd40aea934950c6c8197af6a7f61539b8e9ddc67327c9388d7e8a6f8a3e0e966ad26c07554e2429cab
-EBUILD unittest++-1.6.1.ebuild 808 BLAKE2B ef668c0aac98729d9f5aab1e1784c8003b33bc6de8d673115e1f327fea61a5ad99f897284919342b9ab6afdf976a7e84d089c95ec1cba2ce7f15412b51bf6ce1 SHA512 70c02578ddf917f2ad2b5614405b5cb23a0ed5d9d3ef67638dfaef1e192edbe9350e9dbd2a152fffb08981dd053ada940a36a2b25ccd82fe59f9e2b440e609ef
-EBUILD unittest++-2.0.0.ebuild 854 BLAKE2B 664366a4e93f8808b9ef366c45a00a741beb2e1b61be1547755d6eff93e20a9d9536caacdbc96982c192f8539cfd392751668d520d5b471cac9f17c46693eb4c SHA512 4d34c047f476ff0464602cb86da6a97f54da7b64e01c6d1f5675788b1b6c0201ac5b433886615df2876480e1f7a763b79e877a1a311fa6cc53dd2e05a7a042fe
+EBUILD unittest++-2.0.0-r1.ebuild 991 BLAKE2B e2534d3950b1398a4aef2985159eb52f80f7e5f4bc253e972044fbd4ba9d3c9ec8486715712a27937069553e394b6510953a596bc41ee788061b3d203ea5e039 SHA512 d05fd6971bcd8f7816eee1d6b44b07a35dd392322c2d2ac0a2d439688b8cf7c0be13d50ab3d4b4bc354628ea959862fe99b2bd62c11ab79716bc1967f727ec46
+EBUILD unittest++-2.0.0.ebuild 1007 BLAKE2B fe8d05aa14bbf52caba06854a459eeba25ca8db8c081adb0abf468ec8585370543286fd58424078c9b92a9a8b2b8a604c76bf2f11b5fdf389af6d50e2dd4aa29 SHA512 8abb78978aa9283e9901e909d46fd31d6f74d97cee1d8dbd0926f4c7ade5c2c2948acdc9fa334f26b7801fe681ec54f7751fea0e86647f1ce90e20afe48fbe35
 MISC metadata.xml 408 BLAKE2B 79c6d8551125de4ae8c262513a3c8a7fa46d1518418312aed741eebc9f60ca5be8032ad4df6ca08b67d5fe65a46b11eb99533817556248df44dd04da741bee88 SHA512 6fec64fc5f6ecc1971d0cf79caac9d3529b4e9a7cc32b0b1a39254761de8c487df692b9730221866276f44a79ab7bae0e4fc8cccdacbf7bfec8e4c372fdada25
diff --git a/dev-libs/unittest++/files/unittest++-2.0.0-fix-tests-with-clang.patch b/dev-libs/unittest++/files/unittest++-2.0.0-fix-tests-with-clang.patch
new file mode 100644
index 000000000000..201ff10de5a3
--- /dev/null
+++ b/dev-libs/unittest++/files/unittest++-2.0.0-fix-tests-with-clang.patch
@@ -0,0 +1,27 @@
+commit 2423fcac7668aa9c331a2dcf024c3ca06742942d
+Author: Dan Huantes <daniel.f.huantes@saic.com>
+Date:   Thu Aug 15 08:26:41 2019 -0500
+
+    CrasingTestsAreReportedAsFailures no longer core dumps on Clang Release
+    
+    Found that Crashing tests at some point in Clang
+    history were actually caught but testing on
+    Clang 6.0 and Clang 7.0 this is not the case.
+    So added Clang to the list of compilers that
+    don't run this tests.  Noted that several
+    other Pull Requests were failing for the same
+    reason.
+
+diff --git a/tests/TestTest.cpp b/tests/TestTest.cpp
+index 5a4e1ca..0db0650 100644
+--- a/tests/TestTest.cpp
++++ b/tests/TestTest.cpp
+@@ -72,7 +72,7 @@ namespace {
+       CHECK_EQUAL(1, results.GetFailureCount());
+    }
+ 
+-#if !defined(UNITTEST_MINGW) && !defined(UNITTEST_WIN32)
++#if !defined(UNITTEST_MINGW) && !defined(UNITTEST_WIN32) && !defined(__clang__)
+ // Skip this test in debug because some debuggers don't like it.
+ #if defined(NDEBUG)
+    TEST(CrashingTestsAreReportedAsFailures)
diff --git a/dev-libs/unittest++/unittest++-1.6.1.ebuild b/dev-libs/unittest++/unittest++-2.0.0-r1.ebuild
index 5bba0de8b8cc..0da36ef58d5e 100644
--- a/dev-libs/unittest++/unittest++-1.6.1.ebuild
+++ b/dev-libs/unittest++/unittest++-2.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 MY_PN="unittest-cpp"
 MY_P="${MY_PN}-${PV}"
@@ -11,6 +11,7 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="A lightweight unit testing framework for C++"
 HOMEPAGE="https://unittest-cpp.github.io/"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
@@ -18,15 +19,22 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-S="${WORKDIR}/${MY_P}"
+# https://github.com/unittest-cpp/unittest-cpp/commit/2423fcac7668aa9c331a2dcf024c3ca06742942d
+PATCHES=( "${FILESDIR}/${P}-fix-tests-with-clang.patch" )
 
 src_prepare() {
+	cmake_src_prepare
+
+	# https://github.com/unittest-cpp/unittest-cpp/pull/163
 	sed -i '/run unit tests as post build step/,/Running unit tests/d' \
 		CMakeLists.txt || die
-	use test || sed -i \
-		'/build the test runner/,/target_link_libraries(TestUnitTest++ UnitTest++/d' \
-		CMakeLists.txt || die
-	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUTPP_INCLUDE_TESTS_IN_BUILD=$(usex test)
+	)
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/dev-libs/unittest++/unittest++-2.0.0.ebuild b/dev-libs/unittest++/unittest++-2.0.0.ebuild
index af6ca1612495..88339de12284 100644
--- a/dev-libs/unittest++/unittest++-2.0.0.ebuild
+++ b/dev-libs/unittest++/unittest++-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="A lightweight unit testing framework for C++"
 HOMEPAGE="https://unittest-cpp.github.io/"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
@@ -18,7 +19,8 @@ KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-S="${WORKDIR}/${MY_P}"
+# https://github.com/unittest-cpp/unittest-cpp/commit/2423fcac7668aa9c331a2dcf024c3ca06742942d
+PATCHES=( "${FILESDIR}/${P}-fix-tests-with-clang.patch" )
 
 src_prepare() {
 	cmake-utils_src_prepare