4 files changed, 108 insertions, 0 deletions
diff --git a/dev-libs/pegtl/Manifest b/dev-libs/pegtl/Manifest
index 2131e8860ccb..0605b156fc01 100644
--- a/dev-libs/pegtl/Manifest
+++ b/dev-libs/pegtl/Manifest
@@ -1,3 +1,7 @@
+AUX pegtl-2.8.3-cmake.patch 1688 BLAKE2B d99c349dc31468cf84c2d2f3a26d514e5ae8c55bf72f444ce6def76cd858fe2ce58f7c4d5d305ab7ef3c150204895fcff8c3f662d78e40941a5344827ad587ff SHA512 076bc724a09edb3c1d1962a686da9e48d469a3fbfec056e1abbe401f80b9b2eee67aee06afdb7fd540c3997ae6f9cb6a33f63f713c5ee88825f75c6c488c581b
+AUX pegtl-2.8.3-gcc-10.patch 1499 BLAKE2B 55d866cd49d3c3ea157981c948127f7b1b29a7e9eef4f4f660aece9a322065faac2e0df8d1ed5f0c48b9ed009f94942b99e49eee13680ba5b2c25ef062a6ba2c SHA512 3a9255811d4c579aeb7552ff9eb6697e9401746ce0df031e2432266e946c6ff0b7e26792c37bf01c3ee3a89d31aaa8b39f4527025701ed0f6e6a49a96a93984f
+DIST pegtl-2.8.3.tar.gz 201531 BLAKE2B 093d1b5f7d1f95fa00abdae9c24d24ba9ffd8510d6512c3460374f19b12d50403c19301645c5f6fc4d697cc687079c5b0d23c32b5775b30fbf05a154aeec2c19 SHA512 9f7644b86741dfe61716bbc43b2ea0a02cfc21eaf229c47cc71a49e2f08bf2c1ff37d2b2242a1bcf518b1893be6b82c27b0e9010a1b47ef8df87ffd90d280f71
 DIST pegtl-3.2.0.tar.gz 233138 BLAKE2B 9be2cfcd90249fd57e08944533cb336f0617957c5571ef3d5371aa6da756a350ccb192b6e4e35da22b7b4e88b07e42f54eb5296c496a6b0feb544269a490f928 SHA512 3ec457e37d87d95f3a89c550abbf611a1ce094c2f05f6d23086e70079a9cabddb4c75e9121e764ad1768845a39e62ab49ca658ffed0f09d0e9a0e36501a162ae
+EBUILD pegtl-2.8.3-r1.ebuild 721 BLAKE2B 1b9ccb93bd4b593b8bd20636f14eacc6d5296646e8e76a1feee4c5858297f65c5ad60d0540683bf3b121c9c0dd7bb74a46c9348e78fc4f85869dbeb2c4c890fb SHA512 9960fef33434f9a272eda13e30a9dc8379f454922b46879a9e137a535e42e43cbb7be9f7ffe291a106e5ee47648b3a201168c8f6d37f6b5350c6007b500903b1
 EBUILD pegtl-3.2.0.ebuild 624 BLAKE2B 7e06d9933634b397cb7217c8558e0cfb0ccd9ba58301a38862d27a23a526200e3c9bc8f19bcb2a689978e9700e47590553aea555bc8607601365c4558d7fdd87 SHA512 0d4d90e70405a82918e28a04cb67361e838c523e8129e317f051b0285a2cbeb64acad998f4880adf746a0b66e5f62da7cc2be674f172580b88bd346a7d49b51c
 MISC metadata.xml 330 BLAKE2B 4b09139ea492f1fefc4b58c0afde7354d8f9f966932f5b0908c43c6fab7ae9e822ee8fe02905763d8fe69a128bb7159d4a8b3cea7b1ab087a8a30a57ab297f83 SHA512 721c1b987d580024e7c937f54c512c1e55351db3011675080fd8b1a36c42916eb216b30707f270655db76dea8bc9ee4548197270ffc51b570bbbc0fde33503bf
diff --git a/dev-libs/pegtl/files/pegtl-2.8.3-cmake.patch b/dev-libs/pegtl/files/pegtl-2.8.3-cmake.patch
new file mode 100644
index 000000000000..140e1f5cfbb8
--- /dev/null
+++ b/dev-libs/pegtl/files/pegtl-2.8.3-cmake.patch
@@ -0,0 +1,29 @@
+--- a/CMakeLists.txt	2020-04-22 19:43:00.000000000 +0200
++++ b/CMakeLists.txt	2020-12-27 00:00:15.886046938 +0100
+@@ -78,4 +78,3 @@
+ 
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pegtl-config-version.cmake DESTINATION ${PEGTL_INSTALL_CMAKE_DIR})
+ install(DIRECTORY include/ DESTINATION ${PEGTL_INSTALL_INCLUDE_DIR})
+-install(FILES LICENSE DESTINATION ${PEGTL_INSTALL_DOC_DIR})
+--- a/src/test/pegtl/CMakeLists.txt	2020-04-22 19:43:00.000000000 +0200
++++ b/src/test/pegtl/CMakeLists.txt	2020-12-27 00:07:19.122766830 +0100
+@@ -123,7 +123,7 @@
+   if(MSVC)
+     target_compile_options(${exename} PRIVATE /W4 /WX /utf-8)
+   else()
+-    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow -Werror)
++    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow)
+   endif()
+   if(ANDROID)
+     add_test(NAME ${exename} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../.. COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} "-DTEST_RESOURCES=src/test/pegtl/data;src/test/pegtl/file_data.txt;Makefile" -DTEST_RESOURCES_DIR=${CMAKE_CURRENT_SOURCE_DIR}/../../.. -DUNITTEST=${CMAKE_CURRENT_BINARY_DIR}/${exename} -DTEST_PARAMETER=-all -P ${CMAKE_CURRENT_SOURCE_DIR}/ExecuteOnAndroid.cmake)
+--- a/src/example/pegtl/CMakeLists.txt	2020-04-22 19:43:00.000000000 +0200
++++ b/src/example/pegtl/CMakeLists.txt	2020-12-27 00:07:32.970832890 +0100
+@@ -48,7 +48,7 @@
+   if(MSVC)
+     target_compile_options(${exename} PRIVATE /W4 /WX /utf-8)
+   else()
+-    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow -Werror)
++    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow)
+   endif()
+ endforeach(examplesourcefile)
+ 
diff --git a/dev-libs/pegtl/files/pegtl-2.8.3-gcc-10.patch b/dev-libs/pegtl/files/pegtl-2.8.3-gcc-10.patch
new file mode 100644
index 000000000000..ef418e44254e
--- /dev/null
+++ b/dev-libs/pegtl/files/pegtl-2.8.3-gcc-10.patch
@@ -0,0 +1,43 @@
+From a3a292c2ba66bf09b4adc4cee8fcdfb1b1386067 Mon Sep 17 00:00:00 2001
+From: Daniel Frey <d.frey@gmx.de>
+Date: Mon, 11 May 2020 22:19:31 +0200
+Subject: [PATCH] Repair warning from GCC 10
+
+* Backported patch thx to Fedora.
+
+---
+ include/tao/pegtl/contrib/rep_one_min_max.hpp | 21 +++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/include/tao/pegtl/contrib/rep_one_min_max.hpp b/include/tao/pegtl/contrib/rep_one_min_max.hpp
+index 7ec4639e..ee0a3782 100644
+--- a/include/tao/pegtl/contrib/rep_one_min_max.hpp
++++ b/include/tao/pegtl/contrib/rep_one_min_max.hpp
+@@ -45,6 +45,27 @@ namespace tao
+             }
+          };
+ 
++         template< unsigned Max, char C >
++         struct rep_one_min_max< 0, Max, C >
++         {
++            using analyze_t = analysis::counted< analysis::rule_type::any, 0 >;
++
++            template< typename Input >
++            static bool match( Input& in )
++            {
++               const auto size = in.size( Max + 1 );
++               std::size_t i = 0;
++               while( ( i < size ) && ( in.peek_char( i ) == C ) ) {
++                  ++i;
++               }
++               if( i <= Max ) {
++                  bump_help< result_on_found::success, Input, char, C >( in, i );
++                  return true;
++               }
++               return false;
++            }
++         };
++
+          template< unsigned Min, unsigned Max, char C >
+          inline constexpr bool enable_control< rep_one_min_max< Min, Max, C > > = false;
+ 
diff --git a/dev-libs/pegtl/pegtl-2.8.3-r1.ebuild b/dev-libs/pegtl/pegtl-2.8.3-r1.ebuild
new file mode 100644
index 000000000000..207b474188a1
--- /dev/null
+++ b/dev-libs/pegtl/pegtl-2.8.3-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Header-only library for creating parsers according to Parsing Expression Grammar"
+HOMEPAGE="https://github.com/taocpp/PEGTL"
+SRC_URI="https://github.com/taocpp/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/PEGTL-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cmake.patch"
+	"${FILESDIR}/${P}-gcc-10.patch" # bug 733678
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DPEGTL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/${PN}"
+		-DPEGTL_INSTALL_DOC_DIR="share/doc/${PF}"
+	)
+	cmake_src_configure
+}