gentoo resync : 01.10.2021

3 files changed, 8 insertions, 33 deletions

diff --git a/dev-libs/pegtl/Manifest b/dev-libs/pegtl/Manifest
index de0daa6cb7df..8a79d819df84 100644
--- a/dev-libs/pegtl/Manifest
+++ b/dev-libs/pegtl/Manifest
@@ -1,8 +1,8 @@
 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
-AUX pegtl-3.2.0-no-werror.patch 2200 BLAKE2B d202ab63aef347bc627d2c791a44e9051e98b624529cf7454cd9e210fc49e0c0e9432d19e72eae7b42735da1a94ac81cd7568d41db98842cb592e89334bfdc70 SHA512 82263553435fec96bc24ac269875c92c119dbd02c701f60db6040a8f6dbda7e8681595b774915e37673cd48bed6318bed0eca6b9bad4d23be86cd7128c36d214
+AUX pegtl-3.2.1-werror.patch 1486 BLAKE2B 86a1b3e9a40c19a5f959d9a3c100eb4417edff831c92629806ee0e78be602a5457b4fa9dc60eaa4cb143fd4a06343d7c0845ed775a74b6bdfa9b2d3524aa9c4a SHA512 4a1dd50fd206045c1c78a577f792c481edd5e1d2220ce4428074c2cc3b78e9cc67d8f3f5830477cbe8ce76b13f3ba9f0dc280aaff4bd072ae5715eee6d14bdd1
 DIST pegtl-2.8.3.tar.gz 201531 BLAKE2B 093d1b5f7d1f95fa00abdae9c24d24ba9ffd8510d6512c3460374f19b12d50403c19301645c5f6fc4d697cc687079c5b0d23c32b5775b30fbf05a154aeec2c19 SHA512 9f7644b86741dfe61716bbc43b2ea0a02cfc21eaf229c47cc71a49e2f08bf2c1ff37d2b2242a1bcf518b1893be6b82c27b0e9010a1b47ef8df87ffd90d280f71
-DIST pegtl-3.2.0.tar.gz 233138 BLAKE2B 9be2cfcd90249fd57e08944533cb336f0617957c5571ef3d5371aa6da756a350ccb192b6e4e35da22b7b4e88b07e42f54eb5296c496a6b0feb544269a490f928 SHA512 3ec457e37d87d95f3a89c550abbf611a1ce094c2f05f6d23086e70079a9cabddb4c75e9121e764ad1768845a39e62ab49ca658ffed0f09d0e9a0e36501a162ae
+DIST pegtl-3.2.1.tar.gz 244746 BLAKE2B f1d4ab0bfbc0be09affc83ffdf07796705be949e1addd06e241b8c06dd34bea3844a34b6dfe143269e110279615238afa606944c52af32f8cf6ea34398c40c7b SHA512 6297adea085bb3043a60c28eb3a868a7c2d203b351f907ea3fdc4ef34c63f87a5786ac7d297531f8b8c8c3414f5ddef658a025a7bae2515bdc750e974975f6ff
 EBUILD pegtl-2.8.3-r1.ebuild 735 BLAKE2B 954e7a6b26792e51e8cfcc80a3fa9923a117e36cd9afe091322501eefd06c3398796de9b50ec3d63bc015333e67ec4de840ca868b11d3428c655389856f385e2 SHA512 dbdf8f3c6eccc8992800b3261c220d8394ccf03f4142baf4b3ab2f3347be1c5901039d9efca36d47a6baf05977b78544b5114cf5ba693eaae2aa9935331535f7
-EBUILD pegtl-3.2.0.ebuild 693 BLAKE2B 8c16f80abe747f59aa7e03508064f6c5b03d0307697637df125140176edf6f622896d431cc57945454bf4d13617692e54f4eebd1307e6c3bf9b278b823765cc4 SHA512 03db97ee727fad813729146c971ebfde7bc79c0205ebaddd753b193677a932ce3d5e4a492bc3130d9ac9bc55f7d33f31e54efbef7337207c2e9a26479b72f6ca
+EBUILD pegtl-3.2.1.ebuild 644 BLAKE2B f13a446fd6c4a49de02f678a2035835ab231c7a638de5ed37b0c81f565c3818de36687f3dfdf8c26ec63787270cbec90a26382309974eda7a44e78fd5620bd80 SHA512 bff8430db834d07082d0437909858730ff4e22863925b72d9f30186f08944d4bd9dffb75c19c31c901ef4f9ab926679f937d7972d8791d0bb8f602eb8c81af05
 MISC metadata.xml 331 BLAKE2B 12e6c4cfaaa53a618b8522bd05d8405f2a302d4e191350442839e393e2f97163444670d63b30afa6d103978d5f5218b40b4222a928cea413de52853108cba66e SHA512 b21bb068dca39dc56e95bf6ae50da18a0b9662e70bc3bc7896919b92a204c695baa7152312ad9a7db857bb42ca35b01cbdd78bc3e697a4aac617459dc8ae3e20
diff --git a/dev-libs/pegtl/files/pegtl-3.2.0-no-werror.patch b/dev-libs/pegtl/files/pegtl-3.2.1-werror.patch
index 32bc4b5103ef..776936bd3991 100644
--- a/dev-libs/pegtl/files/pegtl-3.2.0-no-werror.patch
+++ b/dev-libs/pegtl/files/pegtl-3.2.1-werror.patch
@@ -1,19 +1,3 @@
-https://bugs.gentoo.org/787854
-
-From b807854fc6573d59350551578375075fc61a21e1 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 15 Jun 2021 01:31:40 +0000
-Subject: [PATCH] Drop -Werror
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- Makefile                         | 2 +-
- src/example/pegtl/CMakeLists.txt | 2 +-
- src/test/pegtl/CMakeLists.txt    | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 3ecca07..2b8fa20 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -30,7 +30,7 @@ endif
@@ -25,8 +9,6 @@ index 3ecca07..2b8fa20 100644
  
  HEADERS := $(shell find include -name '*.hpp')
  SOURCES := $(shell find src -name '*.cpp')
-diff --git a/src/example/pegtl/CMakeLists.txt b/src/example/pegtl/CMakeLists.txt
-index d416731..4d1a417 100644
 --- a/src/example/pegtl/CMakeLists.txt
 +++ b/src/example/pegtl/CMakeLists.txt
 @@ -60,7 +60,7 @@ foreach(examplesourcefile ${example_sources})
@@ -34,23 +16,18 @@ index d416731..4d1a417 100644
      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)
++    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow )
    endif()
  endforeach()
  
-diff --git a/src/test/pegtl/CMakeLists.txt b/src/test/pegtl/CMakeLists.txt
-index 577e310..84a8ab8 100644
 --- a/src/test/pegtl/CMakeLists.txt
 +++ b/src/test/pegtl/CMakeLists.txt
-@@ -146,7 +146,7 @@ foreach(testsourcefile ${test_sources})
+@@ -150,7 +150,7 @@ foreach(testsourcefile ${test_sources})
    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)
++    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow )
    endif()
    if(ANDROID)
      add_test(NAME ${exename} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} "-DANDROID_NDK=${ANDROID_NDK}" "-DTEST_RESOURCES_DIR=${CMAKE_SOURCE_DIR}" "-DTEST_RESOURCES=src/test/pegtl/data;src/test/pegtl/file_data.txt;Makefile" "-DUNITTEST=${exename}" -P ${CMAKE_CURRENT_SOURCE_DIR}/ExecuteOnAndroid.cmake)
--- 
-2.32.0
-
diff --git a/dev-libs/pegtl/pegtl-3.2.0.ebuild b/dev-libs/pegtl/pegtl-3.2.1.ebuild
index 439aa90eed58..09fd47749d97 100644
--- a/dev-libs/pegtl/pegtl-3.2.0.ebuild
+++ b/dev-libs/pegtl/pegtl-3.2.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -13,11 +13,9 @@ S="${WORKDIR}/${P^^}"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.0-no-werror.patch
+	"${FILESDIR}"/${P}-werror.patch
 )
 
 src_configure() {