gentoo resync : 29.12.2022

4 files changed, 62 insertions, 26 deletions

diff --git a/dev-cpp/doctest/Manifest b/dev-cpp/doctest/Manifest
index 8bc654e070cb..4d47c501cd1b 100644
--- a/dev-cpp/doctest/Manifest
+++ b/dev-cpp/doctest/Manifest
@@ -1,8 +1,7 @@
 AUX doctest-2.4.6-remove-unused-bla2.patch 665 BLAKE2B 2c91d9905421944f5c2d1fd5ee557203d0ffa949e60ef0899257899b378d50b69b51c368bdd16a6b9db1de588b1c4ee056c738d6085f698b01777301219ec8f3 SHA512 7bd083866864afe4c6afd647489978b973015a38917d368cf26c76e5ecebc038b7cc819b7ed28b5aaaf6a4673b5f53dd60696a14cb850e0ea6184ecc8fd47dfe
+AUX doctest-2.4.8-move-only-types-fix.patch 2460 BLAKE2B e2bb6e7cc1e921503d177529de4dbe80440745bf6404605df0b9512c43720c2e8508c48fb79b8a8d734dba9549bad65bd371c1bbbb5374b8f4b6f2b3c2032a7b SHA512 02b5cf8188e946ff5e6eebd4b72a3c2fd24485e21e81739225bfbd28b19483423787c9d4f6747248ce936e601c0d9ca7376b050b6ce6d45469c77d2a78077b59
 DIST doctest-2.4.6.tar.gz 2277281 BLAKE2B e6835ad33522273a3151ccfa1e760a150e2f0ccc15fb739cb518d8c9b4258f4b1529537bb6f41b285660aa00f1791b30a7db14155d9f23ea54dd11bfdeb81ec3 SHA512 a5cccf085af946003140af688f071a6407d42fc685324a537e3b704ef9de0f2228bd06eabfd1df8da70dec001420dd0b2813e5e4320b5c1da450cb0aadd63788
-DIST doctest-2.4.7.tar.gz 2281756 BLAKE2B 9e10a30ca20ab08c4b5e7bc65e6d89e7fde45da7e6ff8ecbf9e848c7c61a7864bc4fbb49b0b1d2d6eeab16da2b4a2d935d06a593dab9be1fdb400e8ab641af7e SHA512 bb2d410397700aa7be1161fcf26949524d4f7c333bb9ffe7d223dfd14e770d6eeff75336f27fe0c8051dcb6c403c6b3af506872f6ba207d2d86cc9e9d1d2bfbf
 DIST doctest-2.4.8.tar.gz 2275833 BLAKE2B 334ed6fda624788adf07fb92a773f3fa69addfbff389e3669e58f66271536d42ff8d20e73e20a4f1d3eee59233d476e527680bb19dcae1d9a6d062e6feedfde5 SHA512 f9b40abfd756331f9b667f3c1e7dcf2652effacac70523834dd3946522f01459c095bdbad04651ad2ad155977e1395025f868ed4dcf5d5712aae9807afb5699c
 EBUILD doctest-2.4.6.ebuild 602 BLAKE2B 901726397e929185369fce55da53dfd2b2abb58ee00ceab766cddd8e9b907813f24f50d1355f43db29a618364b136ed47cb6b279a99b0d507ee8e068cc8c5145 SHA512 518556cd10a57ff0bba1def28183045ef03d4f755462c9448e41a446b47085458695f5e5a9faacd203e49dc7c6d9814e2fdeea70149364bf94ddd88db2cf72fe
-EBUILD doctest-2.4.7.ebuild 543 BLAKE2B cf7173e37f68eee74297a15d35eba3d5a096d2bf230df8de4965f8c18b56575828feb7e1e991f57247b3ee235460732c7e0858bf39bb5046325c1ab48d99aa48 SHA512 0a9885b2bd2795fb8a48107f56a11f1d45304ad175204f7caee4675e2879e6a4279bcd98098adb0d7de7051caf966d2aa85140c00f4777632d14fada56babc28
-EBUILD doctest-2.4.8.ebuild 544 BLAKE2B f6315f245067139c3f11d95a4fcc426cb40fa7b938442d6518d65a293dab19d056ac23c8009181bf5aaf4757dd9c6065e38f896527c7f663d2b2e31bf80159bf SHA512 5f6467ce06518c8e20d6451569f4df412afc9e30198f43fff446a0d5395b881aa57465d802cf3a5970fba042db33534386faf91f279d70dfcf8c53a656ee64c8
+EBUILD doctest-2.4.8-r1.ebuild 616 BLAKE2B e4c6e825425e713b3aa1e4ad00e7ca2e34afff7e9ca58134e504bd3168077834c383e014e3884c69de3b2fdf29ce91eaccc2738e22f8d5d8989e36d250da8074 SHA512 0766087c7e7d404d0237824d5f630ec4e1dc96e121368d8a34af636fb794ee08cd68e5d2941700b98af83ca5b2413efbc202d38626cfffd400fefdb8a80f57ca
 MISC metadata.xml 471 BLAKE2B 530d91c53109b2e99bf3b5ef79fb1343f1cf37bc48aaae35da5468c304c8a2e38c439e79a43c139b5dca5dca8dd9231e7a9020b6f1f12d2074d92b95542bbf31 SHA512 5d143f4ba813a3de07351c5e45cec1aa66d395806fdbc9a04151c0adf1c74dff8192b7993d767e2e82da54090f7c3948ce33c747d6bd030333fc35329203083c
diff --git a/dev-cpp/doctest/doctest-2.4.7.ebuild b/dev-cpp/doctest/doctest-2.4.7.ebuild
deleted file mode 100644
index ef28c59976ca..000000000000
--- a/dev-cpp/doctest/doctest-2.4.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="The fastest feature-rich C++11/14/17/20 single-header testing framework"
-HOMEPAGE="https://github.com/doctest/doctest"
-SRC_URI="https://github.com/doctest/doctest/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDOCTEST_WITH_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-cpp/doctest/doctest-2.4.8.ebuild b/dev-cpp/doctest/doctest-2.4.8-r1.ebuild
index fa60bdec8854..e611f524f5fa 100644
--- a/dev-cpp/doctest/doctest-2.4.8.ebuild
+++ b/dev-cpp/doctest/doctest-2.4.8-r1.ebuild
@@ -15,6 +15,10 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-move-only-types-fix.patch" # bug 830624
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DDOCTEST_WITH_TESTS=$(usex test)
diff --git a/dev-cpp/doctest/files/doctest-2.4.8-move-only-types-fix.patch b/dev-cpp/doctest/files/doctest-2.4.8-move-only-types-fix.patch
new file mode 100644
index 000000000000..1a0343282685
--- /dev/null
+++ b/dev-cpp/doctest/files/doctest-2.4.8-move-only-types-fix.patch
@@ -0,0 +1,56 @@
+This patch is derived from upstream commit ce13bc44b99c ("Fix move-only
+types failing to decompose correctly (#634)").
+
+Upstream-PR: https://github.com/doctest/doctest/pull/634
+
+diff --git a/doctest/doctest.h b/doctest/doctest.h
+index d25f526..31096ff 100644
+--- a/doctest/doctest.h
++++ b/doctest/doctest.h
+@@ -1320,7 +1320,7 @@ DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wunused-comparison")
+         assertType::Enum m_at;
+ 
+         explicit Expression_lhs(L&& in, assertType::Enum at)
+-                : lhs(doctest::detail::forward<L>(in))
++                : lhs(static_cast<L&&>(in))
+                 , m_at(at) {}
+ 
+         DOCTEST_NOINLINE operator Result() {
+@@ -1394,8 +1394,8 @@ DOCTEST_CLANG_SUPPRESS_WARNING_POP
+         // https://github.com/catchorg/Catch2/issues/870
+         // https://github.com/catchorg/Catch2/issues/565
+         template <typename L>
+-        Expression_lhs<const L> operator<<(const L &&operand) {
+-            return Expression_lhs<const L>(doctest::detail::forward<const L>(operand), m_at);
++        Expression_lhs<L> operator<<(L&& operand) {
++            return Expression_lhs<L>(static_cast<L&&>(operand), m_at);
+         }
+ 
+         template <typename L,typename enable_if<!doctest::detail::is_rvalue_reference<L>::value,void >::type* = nullptr>
+diff --git a/doctest/parts/doctest_fwd.h b/doctest/parts/doctest_fwd.h
+index b0d786f..ff9fed0 100644
+--- a/doctest/parts/doctest_fwd.h
++++ b/doctest/parts/doctest_fwd.h
+@@ -1317,7 +1317,7 @@ DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wunused-comparison")
+         assertType::Enum m_at;
+ 
+         explicit Expression_lhs(L&& in, assertType::Enum at)
+-                : lhs(doctest::detail::forward<L>(in))
++                : lhs(static_cast<L&&>(in))
+                 , m_at(at) {}
+ 
+         DOCTEST_NOINLINE operator Result() {
+@@ -1391,8 +1391,8 @@ DOCTEST_CLANG_SUPPRESS_WARNING_POP
+         // https://github.com/catchorg/Catch2/issues/870
+         // https://github.com/catchorg/Catch2/issues/565
+         template <typename L>
+-        Expression_lhs<const L> operator<<(const L &&operand) {
+-            return Expression_lhs<const L>(doctest::detail::forward<const L>(operand), m_at);
++        Expression_lhs<L> operator<<(L&& operand) {
++            return Expression_lhs<L>(static_cast<L&&>(operand), m_at);
+         }
+ 
+         template <typename L,typename enable_if<!doctest::detail::is_rvalue_reference<L>::value,void >::type* = nullptr>
+-- 
+2.35.1
+