gentoo auto-resync : 30:10:2022 - 15:03:33

15 files changed, 62 insertions, 163 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 53b73b009a83..635ad8f7dc72 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/dbus-c++/Manifest b/dev-libs/dbus-c++/Manifest
index e243ec94c156..6d294fe757cc 100644
--- a/dev-libs/dbus-c++/Manifest
+++ b/dev-libs/dbus-c++/Manifest
@@ -1,7 +1,8 @@
+AUX dbus-c++-0.9.0-enable-tests.patch 641 BLAKE2B 852026a02e06b6792196cab0b92a57f559df9cdbac54ecab6287dc4fe6bc3a1dd478b60ea4b0464a776f1ff0c78c8311d4bebfd0373a09e0595ae0cfa5679d66 SHA512 da1395231903c723a1648dcbcd5a01465600388541d4006a824055da3795117b236b91455ae46add97bd87257b9a45c4e7309d464f87ab81ea98d022e5759e6f
 AUX dbus-c++-0.9.0-gcc-4.7.patch 1073 BLAKE2B 2cc43e4d23c14646adfffae77bc1168b69d4e3e2049ae8d3b5283d41f8214fd6884500fc014b66dfbc86dc1928c7e5c33024833e4b2bb28ddad6d17e443db2d1 SHA512 3625f7473db8ee069009655f5c8b68bd7290d622be56ace8e1472bd93b0a946a000bf0d728839cd6309414cbcb925247bfee888bb58fda8316e906fe5a8e25b2
 AUX dbus-c++-0.9.0-gcc12.patch 2555 BLAKE2B 4c8d9740a200eb1a0060dd0c3684cf8fc24c61cb5db9bfefdf353f73b1e62b6e84df140e0b05091bd4a1f94786c3f3a980fb0369c5b2fe7acfdcd36e9fcccc50 SHA512 0e73e8295a8d88988fac65b43b44ffa380721881c5bc1af05267a12d856ad752f241ffab3e7de10c17d1dd0a71d006b7de5f327b10cf4150de2fb67633d236bc
 AUX dbus-c++-gcc7.patch 891 BLAKE2B e3f1c902b52cbec776849c86d2d4c7a13acbc907355c380cad7eabdfe670d9058a1ddd3687af9bcbbd4d815affea21728d8296f5a87122bc6b5fc99396ea0428 SHA512 b8c67af11620c2414d482cb3d77784f7c9831e64e0bc9cb9b946e13b0ad13135f06cfb894667fb9b184e6fc7e750df0769a2d4c09df4f430c2189c2c3804fbae
 DIST libdbus-c++-0.9.0.tar.gz 466362 BLAKE2B 401e266286fef383754c945f3adcf8e68a1169e55d33614f1e11227c324fe1219db7043674b5894d548f827d0b673ab4f012babbb4a395c212f6e17ef6d0e281 SHA512 7acebbb4254b2886cc0f05c5ddeeeac0b5863c5552d32249463b89380b0b95b8225c80bd98b8c7fcaada42ab770b5eff41b15390cd0d78bf1ee322ac6c2de319
 EBUILD dbus-c++-0.9.0-r4.ebuild 1539 BLAKE2B aaa663650fd9946ae8c86017ad580aad58a0ff2b9d8ad96b02513afc55140a80c91443be935aed33556456b905e7bab67fa3683629d09ea9737c681c2efd1bd4 SHA512 7cc9abda1a97042fe011ae6dca6a002ca62726286d35ae0f929352d023caa3cd00b4fe6810e776482d2565538d92772417a8a29b3c27c0bc90579e8f1df2ee15
-EBUILD dbus-c++-0.9.0-r5.ebuild 1589 BLAKE2B 0191a6c6f22374da733d6073136772e8eafba172fba41107a670d866884a87d07a3b223c9c48e77a658817d662761ca175d7d6641b83ca5e83d5f69a90e8721e SHA512 d851f8efc3d00651dd87d78c987f3982179649e8e223246671f6c0e2b0442af54b3b10fc0fd23ae121ccda7dac37ca37f90466f5683433710b8374c6117f9fa0
+EBUILD dbus-c++-0.9.0-r5.ebuild 1799 BLAKE2B fce09e19c424c097a9e40192c04b5cb8ace4e9af54d8c0585ee99f565886326ff98eeab81ab9647f03a2fca626cc622ee187c93d2df60916674d822e6a22ec6a SHA512 39c21e7caf4824e3a5210be6a432c49670f7cd1298cf8a5a978cad3e5e10b5b448be1dcf4c1d88023dd125346f0fe7d675f0c1fb0efaa5e24f1b5a5acec9637b
 MISC metadata.xml 365 BLAKE2B 0522c37f8ab0c117b0d65e7c5e198a05644bc2332b837569a1665f60147453937bc6f9db546f341f2d9f48b61078e41dd35e0b71539cb29808365091b3a4c758 SHA512 446fe1ccce403eeb4f46c114fdb3f7d9bfaf845849873f2c9807781980c20b226160bfc8d3b039629ad4649119c7d22032bf095cdfd5636db5460fc8a541ca23
diff --git a/dev-libs/dbus-c++/dbus-c++-0.9.0-r5.ebuild b/dev-libs/dbus-c++/dbus-c++-0.9.0-r5.ebuild
index bd749ca5481f..a2a4913da27c 100644
--- a/dev-libs/dbus-c++/dbus-c++-0.9.0-r5.ebuild
+++ b/dev-libs/dbus-c++/dbus-c++-0.9.0-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit multilib-minimal
+inherit multilib-minimal autotools virtualx
 
 DESCRIPTION="Provides a C++ API for D-BUS"
 HOMEPAGE="https://sourceforge.net/projects/dbus-cplusplus/"
@@ -24,7 +24,8 @@ DEPEND="${RDEPEND}
 	dev-util/cppunit[${MULTILIB_USEDEP}]"
 BDEPEND="
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen )
+	test? ( sys-apps/dbus[X,${MULTILIB_USEDEP}] )"
 
 S="${WORKDIR}/lib${P}"
 
@@ -32,8 +33,14 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gcc-4.7.patch #424707
 	"${FILESDIR}"/${PN}-gcc7.patch #622790
 	"${FILESDIR}"/${P}-gcc12.patch
+	"${FILESDIR}"/${PN}-0.9.0-enable-tests.patch #873487
 )
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 multilib_src_configure() {
 	# TODO : add ecore multilib support if/when it is multilibified
 	ECONF_SOURCE="${S}" econf \
@@ -55,6 +62,10 @@ multilib_src_configure() {
 	fi
 }
 
+src_test() {
+	virtx multilib-minimal_src_test
+}
+
 multilib_src_install_all() {
 	use doc && HTML_DOCS=( doc/html/. )
 	einstalldocs
diff --git a/dev-libs/dbus-c++/files/dbus-c++-0.9.0-enable-tests.patch b/dev-libs/dbus-c++/files/dbus-c++-0.9.0-enable-tests.patch
new file mode 100644
index 000000000000..827332c9f679
--- /dev/null
+++ b/dev-libs/dbus-c++/files/dbus-c++-0.9.0-enable-tests.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/873487
+https://github.com/gentoo/gentoo/pull/27679
+
+diff --git a/test/functional/Test1/Makefile.am b/test/functional/Test1/Makefile.am
+index 3269751..50dd2a9 100644
+--- a/test/functional/Test1/Makefile.am
++++ b/test/functional/Test1/Makefile.am
+@@ -40,3 +40,4 @@ AM_CPPFLAGS =
+ 
+ ## File created by the gnome-build tools
+ 
++TESTS = $(noinst_PROGRAMS)
+diff --git a/test/generator/Makefile.am b/test/generator/Makefile.am
+index 6c2403d..c6781aa 100644
+--- a/test/generator/Makefile.am
++++ b/test/generator/Makefile.am
+@@ -38,3 +38,5 @@ dist-hook:
+ 
+ MAINTAINERCLEANFILES = \
+ 	Makefile.in
++
++TESTS = $(noinst_PROGRAMS)
diff --git a/dev-libs/ding-libs/Manifest b/dev-libs/ding-libs/Manifest
index b942f76d2d12..a850226d5bd9 100644
--- a/dev-libs/ding-libs/Manifest
+++ b/dev-libs/ding-libs/Manifest
@@ -1,6 +1,3 @@
-AUX 0000-INI-Fix-detection-of-error-messages.patch 1761 BLAKE2B bc1002e9ff7963af408b8e9cc31415efc1c1679b2bb0f21a998a1d0e951708203778e7d03e58e19cadf760a8f4ff1050d53e1eadbd8b83d5fcf84c4e5d8dc9ba SHA512 f0ef79aa548aef09a1611bacd6dd69d765ab09fd19a498fb24b14c7a2882f2b6ca2f2246f99faa3c1796ef7d9bf43bf4e1412442ec6220c4e71607ab7f41ec9d
-AUX 0001-path_utils_ut-allow-single-as-well.patch 1247 BLAKE2B fb3be441ff1066010043a473c184bc0a4e3a85ead8eb89d38d9731c40f33045a47ac59a6b281223f69f4e173baa9193edd65db7980db9ea031db87ced6a191cf SHA512 1d8e5cd540cbb9be1422274ef9318edc256be3c439b5a320f53913b2322319f67acf58a3e2d308dea12b925ea4a3956d8454a0ec7680412dc68e2aea77b0f65b
-AUX 0002-validators_ut_check-Fix-fail-with-new-glibc.patch 1944 BLAKE2B cf1971b715eb37bdb7b5ff3fdc54b1df4d1c9afc5994f6c48b48955cb534573f38444af81971334c1d39883d2a44d635e014e8a5fe1e54f6a03d2e0d597362f8 SHA512 4bdd24c21d99497cdc751a2002bd6ff29d20d3e51b877d0519a7d3134a2cb4edd81fc33ca577d06b52039c87d520e3f81a56303e6a0cad214915503270599593
 DIST ding-libs-0.6.2.tar.gz 957577 BLAKE2B 7236706b0892e5b56506e89f67305cac54da648b2bd6f21dcf3c330d848e1bc556134c8e7d2efd0a9c8234ea41212d6bd2250ff7feaf84df12ff8ee6b56e0602 SHA512 566172e0addb0ee6e0ebd12874d3b72f2fa6bcb1ecc628c0c529984193290fae554efc40f52d2cec675bffab32a36183e47ec629db25e83ed2995f1049c64703
 EBUILD ding-libs-0.6.2-r1.ebuild 628 BLAKE2B cb6bca809b82229e0a8611f420a458e9374376f8f3ea672f8fe484dcfaa784e94f06cfc7435061e6beb5999770f93a8cc4088674548e46d3091cc1f7d0cef5b0 SHA512 da3182534777539b47bfd7d37c19ab08706e1762c797c4ee8864d9a63094c02a3d77fc1fd2faaf8873744e2d4762686ee34dd941df0f96b68fb4fc4ea9394d43
 MISC metadata.xml 247 BLAKE2B cb144c57b3bcd3ce9042d41d2c5fe955abd61d93f348e9bc249d6f8a41172bbdf4b28e83682b8817f202886e6daf757fa0bb825b39eb6409633a323a162ee9f0 SHA512 cb8ffcc6e9e67e555d82ca99bccc6479b0db6e211127a53452d07dc4b106e7e0633ff9c8e0af1b1eccd7b6154ae3d7f61a50e8dbec835fcdca7c070e8cde2f1d
diff --git a/dev-libs/ding-libs/files/0000-INI-Fix-detection-of-error-messages.patch b/dev-libs/ding-libs/files/0000-INI-Fix-detection-of-error-messages.patch
deleted file mode 100644
index 62e436c7c92a..000000000000
--- a/dev-libs/ding-libs/files/0000-INI-Fix-detection-of-error-messages.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 72c19bd018b107ecf5a80963b433e9922f7243fd Mon Sep 17 00:00:00 2001
-From: Lukas Slebodnik <lslebodn@redhat.com>
-Date: Wed, 3 Jan 2018 18:03:44 +0100
-Subject: [PATCH] INI: Fix detection of error messages
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-libc on BSD returns different error messages.
-
-Reviewed-by: Michal Židek <mzidek@redhat.com>
----
- ini/ini_validators_ut_check.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/ini/ini_validators_ut_check.c b/ini/ini_validators_ut_check.c
-index fa7105a..9ecde75 100644
---- a/ini/ini_validators_ut_check.c
-+++ b/ini/ini_validators_ut_check.c
-@@ -607,6 +607,12 @@ START_TEST(test_ini_allowed_options_wrong_regex)
-                  "[rule/options_for_foo]: Cannot compile regular expression "
-                  "from option 'section_re'. "
-                  "Error: 'Unmatched [ or [^'");
-+    if (ret != 0) {
-+        ret = strcmp(errmsg,
-+                     "[rule/options_for_foo]: Cannot compile regular expression "
-+                     "from option 'section_re'. "
-+                     "Error: 'brackets ([ ]) not balanced'");
-+    }
-     fail_unless(ret == 0, "Got msg: [%s]", errmsg);
-     ini_errobj_next(errobj);
- 
-@@ -1028,6 +1034,11 @@ START_TEST(test_ini_allowed_sections_wrong_regex)
-     ret = strcmp(errmsg,
-                  "[rule/section_list]: Validator failed to use regex "
-                  "[^foo\\(*$]:[Unmatched ( or \\(]");
-+    if (ret !=0) {
-+        ret = strcmp(errmsg,
-+                     "[rule/section_list]: Validator failed to use regex "
-+                     "[^foo\\(*$]:[parentheses not balanced]");
-+    }
-     fail_unless(ret == 0, "Got msg: [%s]", errmsg);
-     ini_errobj_next(errobj);
- 
--- 
-2.21.0
-
diff --git a/dev-libs/ding-libs/files/0001-path_utils_ut-allow-single-as-well.patch b/dev-libs/ding-libs/files/0001-path_utils_ut-allow-single-as-well.patch
deleted file mode 100644
index a9ca8e9edc2b..000000000000
--- a/dev-libs/ding-libs/files/0001-path_utils_ut-allow-single-as-well.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4236e323e8ab4f13770e1ac9e94666b304b693fb Mon Sep 17 00:00:00 2001
-From: Henrik Riomar <henrik.riomar@gmail.com>
-Date: Tue, 24 Jul 2018 21:59:36 +0000
-Subject: [PATCH 1/2] path_utils_ut: allow single / as well
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap03.html#tag_03_266
-  Multiple successive slashes are considered to be the same as one slash.
-
-When running the tests on a musl libc system
- get_dirname(p, PATH_MAX, "//foo//")
-actually results in a / and not //
-
-Reviewed-by: Michal Židek <mzidek@redhat.com>
----
- path_utils/path_utils_ut.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/path_utils/path_utils_ut.c b/path_utils/path_utils_ut.c
-index 27c99b6..061abfb 100644
---- a/path_utils/path_utils_ut.c
-+++ b/path_utils/path_utils_ut.c
-@@ -62,7 +62,7 @@ START_TEST(test_dirname)
-     fail_unless_str_equal(p, "//foo");
- 
-     fail_unless(get_dirname(p, PATH_MAX, "//foo//") == SUCCESS);
--    fail_unless_str_equal(p, "//");
-+    fail_unless(!strcmp(p, "/") || !strcmp(p, "//"));
- 
-     fail_unless(get_dirname(p, PATH_MAX, "foo//bar") == SUCCESS);
-     fail_unless_str_equal(p, "foo");
--- 
-2.21.0
-
diff --git a/dev-libs/ding-libs/files/0002-validators_ut_check-Fix-fail-with-new-glibc.patch b/dev-libs/ding-libs/files/0002-validators_ut_check-Fix-fail-with-new-glibc.patch
deleted file mode 100644
index 0524a128d620..000000000000
--- a/dev-libs/ding-libs/files/0002-validators_ut_check-Fix-fail-with-new-glibc.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 9f9a3ded23cc2bb917468939b745cc498cec523a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michal=20=C5=BDidek?= <mzidek@redhat.com>
-Date: Wed, 1 Aug 2018 17:48:10 +0200
-Subject: [PATCH 2/2] validators_ut_check: Fix fail with new glibc
-
-Error message was slightly change from previous version
-of glibc which caused fails in validators unit tests.
-
-Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
----
- ini/ini_validators_ut_check.c | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/ini/ini_validators_ut_check.c b/ini/ini_validators_ut_check.c
-index 9ecde75..3af8551 100644
---- a/ini/ini_validators_ut_check.c
-+++ b/ini/ini_validators_ut_check.c
-@@ -602,6 +602,8 @@ START_TEST(test_ini_allowed_options_wrong_regex)
-     fail_unless(ret == 0, "Got msg: [%s]", errmsg);
-     ini_errobj_next(errobj);
- 
-+    /* Different versions of libc produce slightly different error strings
-+     * in this case. For simplicity compare against all of them. */
-     errmsg = ini_errobj_get_msg(errobj);
-     ret = strcmp(errmsg,
-                  "[rule/options_for_foo]: Cannot compile regular expression "
-@@ -609,10 +611,17 @@ START_TEST(test_ini_allowed_options_wrong_regex)
-                  "Error: 'Unmatched [ or [^'");
-     if (ret != 0) {
-         ret = strcmp(errmsg,
--                     "[rule/options_for_foo]: Cannot compile regular expression "
--                     "from option 'section_re'. "
-+                     "[rule/options_for_foo]: Cannot compile regular "
-+		     "expression from option 'section_re'. "
-                      "Error: 'brackets ([ ]) not balanced'");
-     }
-+
-+    if (ret != 0) {
-+         ret = strcmp(errmsg,
-+                     "[rule/options_for_foo]: Cannot compile regular "
-+		     "expression from option 'section_re'. "
-+		     "Error: 'Unmatched [, [^, [:, [., or [='");
-+    }
-     fail_unless(ret == 0, "Got msg: [%s]", errmsg);
-     ini_errobj_next(errobj);
- 
--- 
-2.21.0
-
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index ca615f0231e1..2bc20b73f008 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1,9 +1,9 @@
 AUX 70protobuf-gentoo.el 170 BLAKE2B 6d9a92bd3310ca09d18dd762bc0bbd4b0b36184c17f95c80c02183c457fe4ff1142ca1e3207e5a77c078fe5f768cb3e85abc712abc1f4c85774ca1ebf178059b SHA512 ed73cd6b1bf6c0019e4da73c3a480b0f917e949dfad2696336e805263c81610b2a8a0514840e389db0f0e78252cf053d754c5e07731dc5e9c93c9e88f0b2923c
 AUX proto.vim 49 BLAKE2B 9b6d31105811a8f8cbcf76328172fda5b66b33351bb16573ed1ed08d4c553af2805962a6d6609fbdad4a2644bf9cecd1e771a557f138111ad2c0be959b497ee9 SHA512 65c1f49887c17973d1dfce07fa86d04c5079d2382826eaeb22e128570717f181c53d22ba50905252021f7e476a90ecd29f9d18799c1ccea64b01f4638323538e
-AUX protobuf-3.16.0-protoc_input_output_files.patch 10060 BLAKE2B e91d2e60ec9a901df0b0e11a8e51ff92b8765357e052231a915a2afa996c78096e18cf443708bf32e51b882c3fe2512e2ab9f7bb8ec1c6141f2c9bb7fb98af95 SHA512 03721151866f25564e203eb5af987649bf3c148ba7b9e1a2a837b336062b911d892714c4deaa5b19572a3ec47e3b309114ce67b0ec0adcff50d208b73283a7b5
+AUX protobuf-3.16.0-protoc_input_output_files.patch 10066 BLAKE2B c296f1696fae9f039baac8d3ac4836cf70d87b59f842caa2db73e474a950edc925f74534e7ec06d002f2ee1375c8a33d97ef8d60c6129ebb10c235a18bf6efcf SHA512 12c24ff2748bd49484cb4de08d0d5d8cc407e4efc41c77d4580912fde4d53e68fc06325a5491e472b9717a8395d96cd7c021902fa907377aa8b8130ded39329d
 AUX protobuf-3.19.0-disable_no-warning-test.patch 1620 BLAKE2B e4f324ed59b2c31662cc625e9d3f1fdb20ee2a25769dbf86093e5000f73a01e11f05459989aaefeaf0414648cd52f1f1025b9d4f1423cdca4844e42e96f54836 SHA512 8c4bc72976a7eb3418b51e7a1c45b49d7ffaeb91a86f440008e6f162773b1db7afed4a6ae1d0b3510d49361c369b6552a9ba4976d104d804d825227aa7113d95
 AUX protobuf-3.19.0-system_libraries.patch 7514 BLAKE2B 1ff5c226232c325ed48cf16e2c47652615c4bd1503f1be8560e7f2e8658ffefeffeef72a6baf4368f758e30a4a81d582769b61dd0b3e383c8188cd03bf409c01 SHA512 b6a58e483dbb1f6151c2f7c735fbd55f34bcf98d6370eabb425dbd96e10cb87e8dfbf5024ad8f888cb80a095bc26598aceb55d576d37166550ee62db41c51a44
-AUX protobuf-3.20.1-protoc_input_output_files.patch 10066 BLAKE2B 1a5c045cc1c30ddf520ce6f68495f373a2dc4265ae3629b2e2deb6abb37935aea4c17267977442b5fe4e5b81d1c9467fddf5ca5e9045b444a4212a28e31ffab1 SHA512 7ca9fa2d602d0a11eea35e8284cd11f12e4e3ad3e6b0bba99f8e2c47a804f3f196810f0507806fb8d559c44f73b87a771f8fa9e9ce2c0acf4405f44894f2d13a
+AUX protobuf-3.20.1-protoc_input_output_files.patch 10072 BLAKE2B 6f92674c60fa6fff181814cafb81fd456542567e7911784f9926947057e9920698935e7c464e05e7b7770a6640c669ca3f27fb1fa08dcce3fd8ea9862e02e71a SHA512 3a801b4e8fbee6706222157cc62a00df3fea1e38eed17675601d0e1156a38d6ec14cb021ca7c1b7f86472d599127341adc12f915083ada9bf899da0d6fe35738
 AUX protobuf-3.20.2-protoc_input_output_files.patch 10080 BLAKE2B f52ea613b1104aa703e5e10eb5f968e33e46f05523e13fe84369a24ccbc16cecbcce3221b64b1acd624500864d224ccb59d1ce626157a0d0d77870f79ea64bd8 SHA512 dcf5dbd7be4a025d9ee96ed9be4566452ae4f946d0e1ae4c411a0dc3b7071fc156aca796497c0f2b67563a8ee884bded1a931d712cd7a3727301bbe37ec646f0
 DIST protobuf-21.8.tar.gz 5110670 BLAKE2B 3c1b0c857a86e9586481d63896341d0cb11290dbd710d87a6f7889d34f5f262abe2986a29ed19a730f8fa5df0b5c62d77a4db6aa415a72b239f7483ae8d6380c SHA512 cb17be759311e91172801add1f88fe7a0291b547170c40d2e3303f5c248570dddeade96bd48740edd628215f55269c97475e2f4c4a41c50f1018d525f52036cb
 DIST protobuf-3.19.3.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6
diff --git a/dev-libs/protobuf/files/protobuf-3.16.0-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.16.0-protoc_input_output_files.patch
index 7295e805a196..60c450eb2822 100644
--- a/dev-libs/protobuf/files/protobuf-3.16.0-protoc_input_output_files.patch
+++ b/dev-libs/protobuf/files/protobuf-3.16.0-protoc_input_output_files.patch
@@ -1,7 +1,7 @@
 https://github.com/protocolbuffers/protobuf/pull/235
 
---- /src/google/protobuf/compiler/command_line_interface.cc
-+++ /src/google/protobuf/compiler/command_line_interface.cc
+--- a/src/google/protobuf/compiler/command_line_interface.cc
++++ b/src/google/protobuf/compiler/command_line_interface.cc
 @@ -1110,6 +1110,28 @@
    }
  
@@ -162,8 +162,8 @@ https://github.com/protocolbuffers/protobuf/pull/235
  
    if (mode_ == MODE_ENCODE) {
      // Input is text.
---- /src/google/protobuf/compiler/command_line_interface.h
-+++ /src/google/protobuf/compiler/command_line_interface.h
+--- a/src/google/protobuf/compiler/command_line_interface.h
++++ b/src/google/protobuf/compiler/command_line_interface.h
 @@ -292,7 +292,9 @@
        GeneratorContext* generator_context, std::string* error);
  
@@ -189,8 +189,8 @@ https://github.com/protocolbuffers/protobuf/pull/235
    // If --descriptor_set_out was given, this is the filename to which the
    // FileDescriptorSet should be written.  Otherwise, empty.
    std::string descriptor_set_out_name_;
---- /src/google/protobuf/compiler/command_line_interface_unittest.cc
-+++ /src/google/protobuf/compiler/command_line_interface_unittest.cc
+--- a/src/google/protobuf/compiler/command_line_interface_unittest.cc
++++ b/src/google/protobuf/compiler/command_line_interface_unittest.cc
 @@ -99,7 +99,7 @@
    virtual void SetUp();
    virtual void TearDown();
diff --git a/dev-libs/protobuf/files/protobuf-3.20.1-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.20.1-protoc_input_output_files.patch
index 812882cf6b09..39a68650a74a 100644
--- a/dev-libs/protobuf/files/protobuf-3.20.1-protoc_input_output_files.patch
+++ b/dev-libs/protobuf/files/protobuf-3.20.1-protoc_input_output_files.patch
@@ -1,7 +1,7 @@
 https://github.com/protocolbuffers/protobuf/pull/235
 
---- /src/google/protobuf/compiler/command_line_interface.cc
-+++ /src/google/protobuf/compiler/command_line_interface.cc
+--- a/src/google/protobuf/compiler/command_line_interface.cc
++++ b/src/google/protobuf/compiler/command_line_interface.cc
 @@ -1110,6 +1110,28 @@
    }
 
@@ -162,8 +162,8 @@ https://github.com/protocolbuffers/protobuf/pull/235
 
    if (mode_ == MODE_ENCODE) {
      // Input is text.
---- /src/google/protobuf/compiler/command_line_interface.h
-+++ /src/google/protobuf/compiler/command_line_interface.h
+--- a/src/google/protobuf/compiler/command_line_interface.h
++++ b/src/google/protobuf/compiler/command_line_interface.h
 @@ -292,7 +292,9 @@
        GeneratorContext* generator_context, std::string* error);
 
@@ -189,8 +189,8 @@ https://github.com/protocolbuffers/protobuf/pull/235
    // If --descriptor_set_out was given, this is the filename to which the
    // FileDescriptorSet should be written.  Otherwise, empty.
    std::string descriptor_set_out_name_;
---- /src/google/protobuf/compiler/command_line_interface_unittest.cc
-+++ /src/google/protobuf/compiler/command_line_interface_unittest.cc
+--- a/src/google/protobuf/compiler/command_line_interface_unittest.cc
++++ b/src/google/protobuf/compiler/command_line_interface_unittest.cc
 @@ -99,7 +99,7 @@
    virtual void SetUp();
    virtual void TearDown();
diff --git a/dev-libs/rapidjson/Manifest b/dev-libs/rapidjson/Manifest
index 4fc603ec4784..fa0944fd2c1a 100644
--- a/dev-libs/rapidjson/Manifest
+++ b/dev-libs/rapidjson/Manifest
@@ -1,7 +1,7 @@
 AUX rapidjson-1.1.0-gcc-7.patch 1393 BLAKE2B 71affc72ebbf714788e243b75f9157e9423dcc34eb43efb3479125e2e269c6fcdcfc4d9e9334979b3f5463d97e241dfa3f335d893729282109ce6c768023ec92 SHA512 4f24f37a3c106698b871438675f2b06f2389d724ab8484a616586b5810aec5d8bd11eed759772affa627493314d3f47757af3a54519f3659df1d218cd12c3cd9
-AUX rapidjson-1.1.0-system_gtest.patch 1270 BLAKE2B f34691f9449dec16c1c1852cb02a0652db195901bdbb811e682ee3f012b58caf436a3a317b9459d3a4a74e6c267d8110b06996689bef0d019c247e91957bbbec SHA512 2ae498dae5e10503edff590b470cfaaecaac78cbdef15a03cd647e3bf6d1dbae286bf381383e2524ea1c8655f377a68df899f4204dd4c31b3414faa1444d18cb
-AUX rapidjson-1.1.0-valgrind_optional.patch 814 BLAKE2B c12e3571050eb63da3e02eb025d0d79cfdca175168d8ad88d947cdf0ffd7b2bb7150563e6adc4f6f43c9e1513f7066e99ab41ffe151bf3503f2e279c1baff535 SHA512 edce6fa3433380487c321ba1b735f08c237d058abb59167b055985272acb83be863650141fcdca5c099b3f3b81f342531b8088e6ef66f71389f2d830b74074e1
-AUX rapidjson-1.1.1-valgrind_optional.patch 868 BLAKE2B 39e46efcd4ebea2f85b40531e46bfcf23eed894e93b6fe4cd8fcb7ac8c614d5e6e98c21c17304f3cf6c7c6415eadaa32b4c496f559f07fd56870820a027dc2c1 SHA512 a71016e4dc17d40afe18ea84c915ff52ce78a28c8e9a0d10342db34954993e2d65dbff7059c6683837334414c73ade934c805d0fa3d758358f7b236d1b57371d
+AUX rapidjson-1.1.0-system_gtest.patch 1274 BLAKE2B 69e69c60b5a2d2e913e1bf64cc62a5a1f6d3e3089be292d5d24a9ead77b58a714fa5e14ead14c091405575353bbe1bbd195c4fb29a81fa4012354c628ad50eba SHA512 456fafdc4b27b7df2ff243d6a8492a4e3f0d4076dc4a04c8d2c79e1757846070bccb6298dd07213ecc2e29a16bbe9f73126f429e36b4d2145d2a783dab664511
+AUX rapidjson-1.1.0-valgrind_optional.patch 816 BLAKE2B 95dc0748bad3042ac912ab57d423ada4c8ce3e19fb8a1b3fb2e9a0b9958355c5dd29325e3b238a34f9fe5ec1b6dbf7ba51e836211d1e9e1644f6ea2fddedbbd2 SHA512 b4841d4f7f19e264950fc56a0521bcf4268b8ab23c806d02cefe21d9f937eee90d9a7bb53e4522f24729a08d800e46b2a41be6d613ea2f06166b42eafafb315c
+AUX rapidjson-1.1.1-valgrind_optional.patch 870 BLAKE2B 6a08f2d33af7e29a60452d3cd9816b38b42a37e405997bb558481066af41244e15e9f1e2a3a2f50b9efbd2414b4e76d45507e58beeb811b82d9e6c47d3475bfa SHA512 b15a54c6b287d715289e3a758d1a9b768a2c0d5e0bea5626231dfe6c824febb8b12d30f654e6b29a72d79ad541af5948c6f6297bff9a67d762aaeb50b29e9ef1
 DIST rapidjson-1.1.0.tar.gz 1019402 BLAKE2B e1564b3cfa020f76437b0a35048a42ff2cd98b5ce285e63f228e158885182e5cecda13407cdf30c03fa39b47cbc579ff0065f6c2682d04b806e8f9ea8d36fc4e SHA512 2e82a4bddcd6c4669541f5945c2d240fb1b4fdd6e239200246d3dd50ce98733f0a4f6d3daa56f865d8c88779c036099c52a9ae85d47ad263686b68a88d832dff
 EBUILD rapidjson-1.1.0-r2.ebuild 1196 BLAKE2B e1f709ff94d5cf7cb1c581cce49415cc76e221f8a2134e5b7c3f2ececd39aa7ac86e945653e331523675c02ace4e1e2256221d700141815a83b61b8fc94ca01f SHA512 e4fab2177decc21c90598409eda202ca59ed4b2c8e99e920ec8ecab72c2a5f6aa30cbd3064af6ddd6f7e388f8523a61cb38d3ecfd63a6af02d59b3aeb02f1189
 EBUILD rapidjson-1.1.0-r3.ebuild 1400 BLAKE2B 0ded67bc026547dbb0ec4e6723bf97299912c7b333be7d870103a2f55e986214a1e0061ff68eeb5260a50c40873f0d0f63967316c5eac91509d4012a45cc2a6e SHA512 3a850c60cd93864b1d5c08162d8c2b3ca7d50fb76c408036529c48d34fb70811b74abde18dbb3786a77ea207767b2a8c838b6c702ab91b30ed8950643ea3541c
diff --git a/dev-libs/rapidjson/files/rapidjson-1.1.0-system_gtest.patch b/dev-libs/rapidjson/files/rapidjson-1.1.0-system_gtest.patch
index bdc720e8cf86..a952a076dc47 100644
--- a/dev-libs/rapidjson/files/rapidjson-1.1.0-system_gtest.patch
+++ b/dev-libs/rapidjson/files/rapidjson-1.1.0-system_gtest.patch
@@ -1,5 +1,5 @@
---- /CMakeModules/FindGTestSrc.cmake
-+++ /CMakeModules/FindGTestSrc.cmake
+--- a/CMakeModules/FindGTestSrc.cmake
++++ b/CMakeModules/FindGTestSrc.cmake
 @@ -1,30 +1,9 @@
 -
 -SET(GTEST_SEARCH_PATH
@@ -32,8 +32,8 @@
  find_package_handle_standard_args(GTestSrc DEFAULT_MSG
 -    GTEST_SOURCE_DIR
      GTEST_INCLUDE_DIR)
---- /test/CMakeLists.txt
-+++ /test/CMakeLists.txt
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
 @@ -8,7 +8,6 @@
          set(gtest_force_shared_crt ON)
      endif()
diff --git a/dev-libs/rapidjson/files/rapidjson-1.1.0-valgrind_optional.patch b/dev-libs/rapidjson/files/rapidjson-1.1.0-valgrind_optional.patch
index 071a3d2392df..772eabe8c6df 100644
--- a/dev-libs/rapidjson/files/rapidjson-1.1.0-valgrind_optional.patch
+++ b/dev-libs/rapidjson/files/rapidjson-1.1.0-valgrind_optional.patch
@@ -1,7 +1,7 @@
 https://github.com/Tencent/rapidjson/issues/1808
 
---- /test/unittest/CMakeLists.txt
-+++ /test/unittest/CMakeLists.txt
+--- a/test/unittest/CMakeLists.txt
++++ b/test/unittest/CMakeLists.txt
 @@ -77,12 +77,15 @@
      COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest
      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
diff --git a/dev-libs/rapidjson/files/rapidjson-1.1.1-valgrind_optional.patch b/dev-libs/rapidjson/files/rapidjson-1.1.1-valgrind_optional.patch
index b40a39fb13db..e05c28000875 100644
--- a/dev-libs/rapidjson/files/rapidjson-1.1.1-valgrind_optional.patch
+++ b/dev-libs/rapidjson/files/rapidjson-1.1.1-valgrind_optional.patch
@@ -1,7 +1,7 @@
 https://github.com/Tencent/rapidjson/issues/1808
 
---- /test/unittest/CMakeLists.txt
-+++ /test/unittest/CMakeLists.txt
+--- a/test/unittest/CMakeLists.txt
++++ b/test/unittest/CMakeLists.txt
 @@ -78,12 +78,15 @@
      COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest
      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)