gentoo auto-resync : 14:06:2024 - 00:09:04

3 files changed, 25 insertions, 2 deletions

diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index e2d33df5b135..3e1f126d0be6 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -1,12 +1,13 @@
 AUX protobuf-python-3.20.3-python311.patch 3717 BLAKE2B f3a0b1b06bdbc2222fd3817b87f9b80cf609e9eb410770af31a069396eb68417f37c06603229ac8fc6aca958a9f8c0deec6b5f0812df6d7dac214b3f8622da29 SHA512 dd03b34b06e67aa4dc16281902e4676ee55169343d062b9515195ff9c92fc9cca4aaa24f83309b7f150f67a49356c41e22380bd68231dab7df04ac1c127f096f
 AUX protobuf-python-4.22.5-c++-17.patch 529 BLAKE2B 1d194a6de009b0f9f2dcb7a3d7813efe354e62c7ccaf26f272bff1eda6ae857380d8b7913552147e54da8d223f85e721e359cf2e078da5d8aed223e8787ef2d8 SHA512 2d408dd3592c26855e24b6968daed2db9b3b97272a94e115e775f4cda00fae0eaec61e266af28d82614dd029212be0fa16299130d7830c832b6ebd776db3da1b
+AUX protobuf-python-4.22.5-python.patch 1070 BLAKE2B aee5dfdbbbddfbd0ecf7dbc29490701c609347d32bac85916042aafadb5bf2bf803ec121bb4d7163f54a083eec571701c18775a97067a6cb8dcc6a46d265f241 SHA512 89f7a1563809a0c60bf5a49e4f28d0d58d04d7153d545bfcd3e54f76756372424813b8c520b3f05e10cdcb3e239217446326c34e8396d1640ac8065bc5a04a1f
 DIST protobuf-21.12.tar.gz 5141166 BLAKE2B 33500612d103afb817062486a741e8e5503f82c42c70054d47d1899e6bb79f3fdde2666cad5b8eff6e1bc539c3b0cdf9f2b125ce7e5d3a459a69e84d67ab535e SHA512 2dc8f552388438268d8b9f7a9e84c6abf1736be3d5031438c789c317410c9f4b5cedd25bf7da6d67b3ba32ca890869f9ddaab2284d6ac0e734a5b135ffbb1346
 DIST protobuf-21.9.tar.gz 5110670 BLAKE2B a4f5b7f58e1c5904ca990b100a72992f6f56177b28773f8de8c99e4158391d33cfb8aa8575915887fc9ae4294faf81d4ff6b470bc07b394bfd5885a09ba0fafe SHA512 6954b42d21921e630173b7848c056ab95635627d8eddec960f3db2ddda13eedde00520a9b350722e76e2998649eb8ebe10758e1db938b6a91e38ff3295b1b7c1
 DIST protobuf-22.5.tar.gz 4924661 BLAKE2B d69c73f4ebfddf45fd94b4f5f898faf00256fe674f2cbc0443c60a88d7a0f47fb96f2f6262879927c6da88095b4ea3ee7fd4c471c100bf42a2bae9edf48c07f1 SHA512 058ab2fec5b11007972e6043071056d1944c3b6fe1d31246cddba8eb57686e3b5280f6ad3d58e78940ca63005e74a8de3c72237f9f7c5066548c5a2513ddc584
 DIST protobuf-23.3.tar.gz 5043803 BLAKE2B ee2edee230969555c9ef95069c7b1d6c23c3d1f8ea1b2249fb3e9f6fcf63312c6e10e9da65b80629fb08d5fb08d05a19bb9c752c25b892c1e3fd6f18b9279eb3 SHA512 646af367dbc61b42e322cf0b335f360e428b272e2b1f5361b2f17c18d3dc9dddd615e1279436028b1a42275a0beadda37c2c934fc27d6c892131cc8d526d8b3b
 EBUILD protobuf-python-4.21.12.ebuild 1711 BLAKE2B eefe5bc310013fc007050f7baf0be7d3c4370ced384fae6ea824941bb3767af129fcb0a5828ed6a572010f623e733cc858f9d8e27de800f47d7655aed590a603 SHA512 b62a8d8920a68081ed7e1d6fabfbd71f92eec828d431b3a67adcba4bfd4bd8a53fe3004c507bea115f44bdcee4be0d0d8192318be90eadbba269819104e16739
 EBUILD protobuf-python-4.21.9.ebuild 1852 BLAKE2B f3b2977f5a058550d6d3ebe4f421da10e6c0f7dc58e2feee4b6d6198d339e1e6810426271b76fc14d9e2b27ed1ad5ddfe49637ff3cdbacdcdd7f4b26b3a5188b SHA512 844ab88f8d881310e05eaad54805a78834b93296b173947e9c55fc64a4e6ec1489219e1db4ef65da836d1ece782860b8b19d915a2e6da44b2582b9125971768e
-EBUILD protobuf-python-4.22.5.ebuild 1842 BLAKE2B 4fb6afc192a5d674a2a21c2a4050f5f6c3caedc31b7801617d2caedbdc80f6b68ea4cbc4a05152ff8a2ecc70ba21cbd674202754a70faa1e226e28ed9f3c2976 SHA512 6546f6e75704f7336ef43e2934c312e5eaf96b1eb6b4fcaf7bf2a33a78dda0921711c2bc1569857f91a9de1f41d62652efe19fdee1861d3710dc220a6bd04b59
+EBUILD protobuf-python-4.22.5.ebuild 1882 BLAKE2B 1e396eee398034d49bab504eb6872cb377a6324b1f4f2d172e2d4764d8d59116db84e0abdbde537704fb9329fa1bb8459988ce85c6e3303d6990fded37924647 SHA512 acf574eabebcca95529c94876b3bcaca16e84bde632194d145fb90487b1b980ab7ee1907bd247c4532394960eaa3c0c06db24111db6df518721247cc5f959e28
 EBUILD protobuf-python-4.23.3.ebuild 1681 BLAKE2B 099119c8de2ab49268795635c29f91b42d06ee6f3c14ac9680295ef305063286b244236f9a597e1a114896c1f9f9c70b66ee7f0fed4a9f1644e151aaad0d9961 SHA512 01dfac68ae987a264c0ce5c634ec5d2cc914c7381155270a518ef78656bae13dc95b04e8ebd30427339056307a85f82b5ace79b2aa85af8d2af30e2380ecab2e
 EBUILD protobuf-python-9999.ebuild 1674 BLAKE2B d658445906ce272fcaaefba477a7b300557f45698aea4874428e9a5dd368bb0485a8b4abd8c95195c71400f6fb610ae6d5bb0788223ab85aa97061b1feec7945 SHA512 ad459f34af37e0a478dcd41f2875481a20433a445e3f7bb41e13434f5c65f2720b630f89f923173e86c6ed239e71600b3893ee1d2c2ac700babe3cac705b8d79
 MISC metadata.xml 379 BLAKE2B 633742f2c32c646e3c7f065d269b5d17fc99b3adcae725493ca612cd9ce6bda0f2521274619c3433f68227428aad897e783ac4b91dbd983216c0355619015197 SHA512 7d3a14e66af994e2fae5509b7d84012b0004d124021f3eae1a1c112ad0e2a83f622de9d2c7a614f19bac8a15ba889fe1b4136c93c57b9dd910511587d3d09af9
diff --git a/dev-python/protobuf-python/files/protobuf-python-4.22.5-python.patch b/dev-python/protobuf-python/files/protobuf-python-4.22.5-python.patch
new file mode 100644
index 000000000000..65cb22d5f653
--- /dev/null
+++ b/dev-python/protobuf-python/files/protobuf-python-4.22.5-python.patch
@@ -0,0 +1,21 @@
+See also https://github.com/protocolbuffers/protobuf/pull/9098
+--- a/google/protobuf/internal/json_format_test.py
++++ b/google/protobuf/internal/json_format_test.py
+@@ -1060,7 +1060,7 @@ class JsonFormatTest(JsonFormatBase):
+   def testInvalidTimestamp(self):
+     message = json_format_proto3_pb2.TestTimestamp()
+     text = '{"value": "10000-01-01T00:00:00.00Z"}'
+-    self.assertRaisesRegexp(
++    self.assertRaisesRegex(
+         json_format.ParseError, 'Failed to parse value field: '
+         'time data \'10000-01-01T00:00:00\' does not match'
+         ' format \'%Y-%m-%dT%H:%M:%S\' at TestTimestamp.value.',
+@@ -1097,7 +1097,7 @@ class JsonFormatTest(JsonFormatBase):
+   def testInvalidOneof(self):
+     message = json_format_proto3_pb2.TestOneof()
+     text = '{"oneofInt32Value": 1, "oneofStringValue": "2"}'
+-    self.assertRaisesRegexp(
++    self.assertRaisesRegex(
+         json_format.ParseError, 'Message type "proto3.TestOneof"'
+         ' should not have multiple "oneof_value" oneof fields at "TestOneof".',
+         json_format.Parse, text, message)
diff --git a/dev-python/protobuf-python/protobuf-python-4.22.5.ebuild b/dev-python/protobuf-python/protobuf-python-4.22.5.ebuild
index 382ae922fc3a..59b4f648ed71 100644
--- a/dev-python/protobuf-python/protobuf-python-4.22.5.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-4.22.5.ebuild
@@ -24,7 +24,7 @@ else
 		https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz
 			-> ${PARENT_P}.tar.gz
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~mips ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Google's Protocol Buffers - Python bindings"
@@ -56,6 +56,7 @@ PARENT_PATCHES=(
 
 # Here for patches within "python/" subdirectory.
 PATCHES=(
+	"${FILESDIR}/${PN}-4.22.5-python.patch"
 )
 
 python_prepare_all() {