gentoo resync : 29.12.2022

4 files changed, 20 insertions, 56 deletions

diff --git a/dev-python/proto-plus/Manifest b/dev-python/proto-plus/Manifest
index 9de61d6eb087..b9c9b7592f70 100644
--- a/dev-python/proto-plus/Manifest
+++ b/dev-python/proto-plus/Manifest
@@ -1,7 +1,5 @@
-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 845 BLAKE2B 8214d5ada51ec352bbdd8bc095cbc9950c7da65cfc465bda2617d3d57af848ab21b0280c1693afb827ffa239a05de38df98e67c20158baae8326180fdbe9b051 SHA512 628b2274032b69f4af43d369a45e1486b45746467e5ddb5b082b5de3a355fe7706846db0c8e10aaba0266f0dfba9e71085be763f544db3ec1d69fdd0b109c798
+DIST proto-plus-1.20.5.gh.tar.gz 67573 BLAKE2B d764c8afb4608c38b050c256930a7ea37ee8d5393518e3146a66d11d4fee1cf3b35142426442d014483bd1ac5b815b6445b0f2c2c04f404136aeb6031a944e54 SHA512 bf612f23af3cf30cceaf8ee2027a721cc37dbe7e17d0ce643c31361397409171f92e92a6b53163e747931c3b0da66edca638ae4014c096bc0e3a8f1bc5dc8e80
+DIST proto-plus-1.20.6.gh.tar.gz 67697 BLAKE2B 88fbf1086bc9430360316c89baaf6216d3f395792fbc2bf1336c22aeb4f912dedd5a4af73c5a10cf6536cdc4cf285c89d1d0a86afd4ee21c7e40b26d34631240 SHA512 5da41a8ddabb34a4083b622d60e59532cd7cb97e4fd243b796aded06ee0f6d9ba5ac847434aa8141b90cb3481d45fbc703de2f905ff4f4676a5d86d77a01c44c
+EBUILD proto-plus-1.20.5.ebuild 917 BLAKE2B 0d6f5030b15ac4ed6a1bcf969bab8d0d700dbe274938b5c2f88b512b69ab493e4678a1bf2b74b1aef55727c13972d2c453b8c736a62c090d751b17d5cfeb2e84 SHA512 cdd555df32e78efeb385129ff7dfe301318c5b463d55266c9fb77c8c7b831c92ba6806f811c5b3c23f2ba0d6f954274458ea73c379d35f8fa6a6da5be8f5a347
+EBUILD proto-plus-1.20.6.ebuild 919 BLAKE2B 9d2e638037ab6e048257fb15d6e654d9c1dd4661e3875e1a2354582539311ad01baca958a454072a6c51e003a6bbf5a1bbf27e05b1cf2db78b7d3de9100aebfa SHA512 c306d37b44976b9fd4041c58458cf9cfb0d8c6af06ba456681221c291a4af6b80c9e47ff47203e9659638c7ee422299a82e353aac22d3c90c3e2128687d93ebe
 MISC metadata.xml 447 BLAKE2B d440be836b8a2823ab3beb7f76cbe7ff3f027ec512dff3f7d920eefea3f18329e1aa910ca16e006b1424cbd780f3fad80b8ccdc632c08ade651afd815369e9d0 SHA512 d64b8d2eeac9916ec2faab3b038082155e46e8c379ce06d7f554de763318539fa9040d15f90a3a95f337937c90f4b4042f51b1ea1cd11727e5fd971a0af5280c
diff --git a/dev-python/proto-plus/proto-plus-1.20.0.ebuild b/dev-python/proto-plus/proto-plus-1.20.0.ebuild
deleted file mode 100644
index 228d58940454..000000000000
--- a/dev-python/proto-plus/proto-plus-1.20.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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"
-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
-
-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.20.3.ebuild b/dev-python/proto-plus/proto-plus-1.20.5.ebuild
index e3ac839e6f05..ed70ce138c8d 100644
--- a/dev-python/proto-plus/proto-plus-1.20.3.ebuild
+++ b/dev-python/proto-plus/proto-plus-1.20.5.ebuild
@@ -9,7 +9,10 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Beautiful, Pythonic protocol buffers"
-HOMEPAGE="https://pypi.org/project/proto-plus/ https://github.com/googleapis/proto-plus-python"
+HOMEPAGE="
+	https://github.com/googleapis/proto-plus-python/
+	https://pypi.org/project/proto-plus/
+"
 SRC_URI="
 	https://github.com/googleapis/proto-plus-python/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
@@ -21,11 +24,12 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	<dev-python/protobuf-python-4[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.19.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
-		dev-python/google-api-core[${PYTHON_USEDEP}]
+		>=dev-python/google-api-core-1.31.5[${PYTHON_USEDEP}]
 		dev-python/grpcio[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/proto-plus/proto-plus-1.20.1.ebuild b/dev-python/proto-plus/proto-plus-1.20.6.ebuild
index dc2848b431d0..6be65f5713cd 100644
--- a/dev-python/proto-plus/proto-plus-1.20.1.ebuild
+++ b/dev-python/proto-plus/proto-plus-1.20.6.ebuild
@@ -4,12 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
 DESCRIPTION="Beautiful, Pythonic protocol buffers"
-HOMEPAGE="https://pypi.org/project/proto-plus/ https://github.com/googleapis/proto-plus-python"
+HOMEPAGE="
+	https://github.com/googleapis/proto-plus-python/
+	https://pypi.org/project/proto-plus/
+"
 SRC_URI="
 	https://github.com/googleapis/proto-plus-python/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
@@ -18,14 +21,15 @@ 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}]
+	<dev-python/protobuf-python-5[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.19.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
-		dev-python/google-api-core[${PYTHON_USEDEP}]
+		>=dev-python/google-api-core-1.31.5[${PYTHON_USEDEP}]
 		dev-python/grpcio[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 	)