5 files changed, 20 insertions, 46 deletions
diff --git a/dev-python/proto-plus/Manifest b/dev-python/proto-plus/Manifest
index a2dcec16c746..bf7fcb64c497 100644
--- a/dev-python/proto-plus/Manifest
+++ b/dev-python/proto-plus/Manifest
@@ -1,9 +1,7 @@
-DIST proto-plus-1.19.2.gh.tar.gz 61183 BLAKE2B 8c1c0a70ae573fc8c64004e4bd923f403bf82dbb3f9aef19239770fcd316e513ba11e6e47c56bda65c88e476072f0d90af02c83eb0fe8a4045cf3ceeccca3fc7 SHA512 c3cfb1b6aabeb4eab7f6c2c16551c1f9fbf29dc3199b496bc4b47b4b80cbe4684e5c97abe26fa4c1afd03c844a2e8f006f16c24932d2a7cf8190452943c2fad0
-DIST proto-plus-1.19.7.gh.tar.gz 64614 BLAKE2B 918bb04a084cff8a2188a68c31f08aebd25443fd399d69ba9734d002f773df2769904e4aa551cd1d93586ee4710f2b7160e6a8eb4160fe1bb846be18155a7b29 SHA512 118187a852a998deba3b5d7e700cd084eab966b549c7dba6150f318e9602f950a9533e27d775f9f0bca2fedaed6375b592bae42c55cf5aee8b52708fcc4691c8
-DIST proto-plus-1.19.8.gh.tar.gz 64668 BLAKE2B d90ba4bd2404a0b05325e08e9ec39de0b819af00e9229ca54a7173364a99e0cedb584696093f3df7720d96f8291fad4f26b9963171de8ebd44396550dc932e17 SHA512 e9bd790ec7d2cc7fa54e5c8be374e4a7bc5c92899c5259e6985024fe1c9e25768c1355b808a9a4c38b132026412b2e7d91c5fe0098af661b1dac604b84aaf2ee
-DIST proto-plus-1.19.9.gh.tar.gz 64845 BLAKE2B 82f6021b912140c49e8625c51050a384f8375a3619a78537f6aadded03ce7524687e8f118cd4081c9a8376b3756c608ed781cac9808fb2c8d0bad9e32d2063ec SHA512 671dad31faf33a81bc90d98ffac599b51930f1f4f17c10c9a1dd5f242b3c55d04b9e59080197cdd42c1c430a72e1e812aadafbcf20cfb5da2fcd17c20e5a69e3
-EBUILD proto-plus-1.19.2.ebuild 796 BLAKE2B febdcd4febceb93400eceaa862b7142656ca78c33bce0fe616de0e6a285da6fb046bc04dcbb765a6dac56871d1863fe48e42c07d9cb4c9354cea0fcafa0492d6 SHA512 f6945c6740a07b2fd687cd7d11829395b715ef7093a78a39e80863acbb4b7e36cbdc8b42a6cb2f1cd880870f8645f0b972a6011d3e26d35a35970db2c53915cf
-EBUILD proto-plus-1.19.7.ebuild 796 BLAKE2B febdcd4febceb93400eceaa862b7142656ca78c33bce0fe616de0e6a285da6fb046bc04dcbb765a6dac56871d1863fe48e42c07d9cb4c9354cea0fcafa0492d6 SHA512 f6945c6740a07b2fd687cd7d11829395b715ef7093a78a39e80863acbb4b7e36cbdc8b42a6cb2f1cd880870f8645f0b972a6011d3e26d35a35970db2c53915cf
-EBUILD proto-plus-1.19.8.ebuild 796 BLAKE2B febdcd4febceb93400eceaa862b7142656ca78c33bce0fe616de0e6a285da6fb046bc04dcbb765a6dac56871d1863fe48e42c07d9cb4c9354cea0fcafa0492d6 SHA512 f6945c6740a07b2fd687cd7d11829395b715ef7093a78a39e80863acbb4b7e36cbdc8b42a6cb2f1cd880870f8645f0b972a6011d3e26d35a35970db2c53915cf
-EBUILD proto-plus-1.19.9.ebuild 834 BLAKE2B 3fdcd159b52f5536561a97585d5a28ddb85e4b018982b0fe6e334d8625ecc2755a7acaee2e2d707fe1ea1f563ce4f6572ca7000359cc48e3ec899a55e27e1ef1 SHA512 c6d1bf3af3bfe55ec0f636d98e249198a375c69c01132443378af8b147c49bf68fd8823067c19875a97f1614245ea5348e79520f89f796744deb5335d7d5acac
+DIST proto-plus-1.20.0.gh.tar.gz 65648 BLAKE2B 19cfcfde913896de83d17c36bacd7799a9f28ea20c4681266b2194c6521aef116f6a594df8be8912bdf55558d84a0ab09d283ec444ba114592ebb7017db257fe SHA512 1e399bc0ac686f33242c1d15c15255ec1815e94eaf87de03e5145cc6ed249048c3b8af081b70964cb7b6baf8286f6be2f461c3638331a2269a5b2d89976ffa6a
+DIST proto-plus-1.20.1.gh.tar.gz 66180 BLAKE2B ee0299c8e9c9882ce417f6f885df18cd833dfbad80e0e92ca4e589eea794b0b00577d4c01fa69790f97f31d8bdfd20f07f4c7601bdf6ee28a7427f0e56714eb4 SHA512 12d9f76230d592c68083421bbb40c4b57741545c238227a743c275820a4d7ae53ea45d7ae5e73495b14736a95aa96250e243220f8b9bb5c988c12a2f84f654d6
+DIST proto-plus-1.20.3.gh.tar.gz 66941 BLAKE2B 359d95d37b8a4dad282cb9b33909982ffedca25cd3907583d689996d6e516143c0e4eb2b9bb06bc50e12fabe197f0622a3488cf21136decefe676980b20c7a9e SHA512 411089eb76508a5ca94d6b4228dd4bc1f8d01d4f5209bb2ab0e6e240d8061761c9c76cd03b3a4da7771b45a30df3b0ca4c17f7fca3ed6e710a9724ab7bc0f60d
+EBUILD proto-plus-1.20.0.ebuild 1022 BLAKE2B 8da6815a92a64d5a90058920490521511ad51946550f6a876febaa010a87635a3bc7c284269469a7335f3c2de476e0d1234a8815ecc82d50837eeff56a853baf SHA512 33cab9bd304ea4349e48d045989b6ccb238589383d495a184abbce4e6534382eb7a39143d8ef875a3283ebf9619f10ed28e0ebe8b52d13b94931e01b00dff315
+EBUILD proto-plus-1.20.1.ebuild 834 BLAKE2B 3fdcd159b52f5536561a97585d5a28ddb85e4b018982b0fe6e334d8625ecc2755a7acaee2e2d707fe1ea1f563ce4f6572ca7000359cc48e3ec899a55e27e1ef1 SHA512 c6d1bf3af3bfe55ec0f636d98e249198a375c69c01132443378af8b147c49bf68fd8823067c19875a97f1614245ea5348e79520f89f796744deb5335d7d5acac
+EBUILD proto-plus-1.20.3.ebuild 847 BLAKE2B 8a3fe45d9d07efcbfcb369e7d65665783f2b36e2df3d3b4043e4d8f9b7901959428e80d4c8bdbab9431500784b5ac796d3d2ac6c85911ad99055fdb559d20025 SHA512 83e8c4ce2c74fc4dab14524d4457152c9fe08c0e9cfb1135a654c2e07fcaaa4627c5e0334cb7d1f03b255a13a2359dd351ff52f083684299996de3c49f0f357f
 MISC metadata.xml 447 BLAKE2B d440be836b8a2823ab3beb7f76cbe7ff3f027ec512dff3f7d920eefea3f18329e1aa910ca16e006b1424cbd780f3fad80b8ccdc632c08ade651afd815369e9d0 SHA512 d64b8d2eeac9916ec2faab3b038082155e46e8c379ce06d7f554de763318539fa9040d15f90a3a95f337937c90f4b4042f51b1ea1cd11727e5fd971a0af5280c
diff --git a/dev-python/proto-plus/proto-plus-1.19.8.ebuild b/dev-python/proto-plus/proto-plus-1.19.8.ebuild
deleted file mode 100644
index 762787eae60d..000000000000
--- a/dev-python/proto-plus/proto-plus-1.19.8.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Beautiful, Pythonic protocol buffers"
-HOMEPAGE="https://pypi.org/project/proto-plus/ https://github.com/googleapis/proto-plus-python"
-SRC_URI="
-	https://github.com/googleapis/proto-plus-python/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}-python-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/google-api-core[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
diff --git a/dev-python/proto-plus/proto-plus-1.19.7.ebuild b/dev-python/proto-plus/proto-plus-1.20.0.ebuild
index 762787eae60d..228d58940454 100644
--- a/dev-python/proto-plus/proto-plus-1.19.7.ebuild
+++ b/dev-python/proto-plus/proto-plus-1.20.0.ebuild
@@ -1,9 +1,11 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..9} )
+
 inherit distutils-r1
 
 DESCRIPTION="Beautiful, Pythonic protocol buffers"
@@ -32,3 +34,9 @@ BDEPEND="
 distutils_enable_tests pytest
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme
+
+src_prepare() {
+	# https://github.com/pytest-dev/pytest/issues/9637#issuecomment-1031997415
+	sed -i -e '/staticmethod/d' tests/test_datetime_helpers.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/proto-plus/proto-plus-1.19.9.ebuild b/dev-python/proto-plus/proto-plus-1.20.1.ebuild
index dc2848b431d0..dc2848b431d0 100644
--- a/dev-python/proto-plus/proto-plus-1.19.9.ebuild
+++ b/dev-python/proto-plus/proto-plus-1.20.1.ebuild
diff --git a/dev-python/proto-plus/proto-plus-1.19.2.ebuild b/dev-python/proto-plus/proto-plus-1.20.3.ebuild
index 762787eae60d..eeb0c597e244 100644
--- a/dev-python/proto-plus/proto-plus-1.19.2.ebuild
+++ b/dev-python/proto-plus/proto-plus-1.20.3.ebuild
@@ -1,9 +1,11 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
 inherit distutils-r1
 
 DESCRIPTION="Beautiful, Pythonic protocol buffers"
@@ -16,7 +18,7 @@ S="${WORKDIR}/${PN}-python-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/protobuf-python[${PYTHON_USEDEP}]