gentoo resync : 12.05.2022

4 files changed, 3 insertions, 61 deletions

diff --git a/dev-python/googleapis-common-protos/Manifest b/dev-python/googleapis-common-protos/Manifest
index eb7588d92cc6..dbeac87d4a23 100644
--- a/dev-python/googleapis-common-protos/Manifest
+++ b/dev-python/googleapis-common-protos/Manifest
@@ -1,6 +1,3 @@
-DIST googleapis-common-protos-1.55.0.tar.gz 115218 BLAKE2B e0091aa07e42c56a0e8f9502d786b7d775672dab1b19dc9cff41e9dc4a0eb8b4aa05b2ba22d8353466ee6d1a40e94a423dd7ab94564166d0575f827a08dc5dd9 SHA512 3fe171bb54b9f508e524bf6e25e7533549346f3d70f0a55f2117c0031d823646b6384491ab059eddedfaf23ddcf7bdee4f6a66dcd50930403a1b7da5ee0ac9f8
 DIST googleapis-common-protos-1.56.0.tar.gz 132706 BLAKE2B a0adf6527c24aaa30922800a80ef4af8abf3d83c4639c227a859c92e02d248f44b408f98820387a51b310dedf005872cb0fa7824bd27ac6309f31f85810edd40 SHA512 ef6ed067457aad3b46d81bacbb66abe3b36b0640290e0047ef7c6d612dfd8bf865dad47c77275f0d5a1e03cd4e5dca32d08f44c7a7bfe7b264ee59e5c5bb9a27
-EBUILD googleapis-common-protos-1.55.0.ebuild 696 BLAKE2B e6eb8b2afed603f1478358b2d5e08dd77f3688c8b6bf2f816f906f9c32a8c412cb51ba55a63efe2cb15fe38a362aeeeca944f2e5a187fc306a65408e115fc28f SHA512 2438af0469bb0fc4b590284258f2b3dc762f8bc62193c3c7646ca3de046996b66a449aa28da17b7a8c4d22cfd28b857297de4d12bbbc2d0a3b790d8f2972e538
-EBUILD googleapis-common-protos-1.56.0-r1.ebuild 684 BLAKE2B 79270ea6fc5f223803b3548a71335dbcf0683d94616ca8aa306dc12238d292a7a8d29a799d236d8d5c2f0da7ee6e2126b5e31177ebdd699af63ea028e0c65221 SHA512 4b165d1245443a37fd19316b9eb0d5114dd59e4fb6247d4a28c7e93a552b50fec4744ce1cc1bf8b9b98cbb7d6ab30661fb67d8ea9ec65bab2cfb19c34ffd7f8c
-EBUILD googleapis-common-protos-1.56.0.ebuild 731 BLAKE2B f0c01a85626158810c098abba3a7e2945f4ffbe72cf82fe1540d1442431d72eb3e3378ef71bf484df766640fb32af660fb8389a0b84e5bc387d3fcd51a1a5146 SHA512 c9676d4cba7f1e3e1d9558bf66b6c2bdcd62d7c4577c392c5e947225159cdc2e186d5b608cafe42ea7baf5c65be961fefb59ce50a5f7ed7d7fd2680a68f9e2c3
+EBUILD googleapis-common-protos-1.56.0-r2.ebuild 712 BLAKE2B 6d7d17cb834cbddbbf677521ff88884d86bc8789f8c81c7b6bc2238060e5c8fcee5bc621ff31b711567ceff2bfa62c7e3a9dafb5c2d492c8737f61266b05677f SHA512 540f88de455fe5f0838f35e553df801bc7d2bab50b68502c07bbbb6bd94c505ace076f7e49207d65c24953054a69a0e98febff6bc9ee5ddc231407727eeb5467
 MISC metadata.xml 537 BLAKE2B 7b81f41f34a3c0fa53340ad298440f67727eb1830009899ffa10835485f66e727844735a88bed94b8a0bba14fa01a78d8a04f5ca3edf48a72781c7e1a797459e SHA512 6013da3540915e13a0cc60336bbefada12fbf71c04d4f40634f24015ada732d0d8b86600401bdadb2c7df2ea84f7097669f4efe6cf176ccca5efe46e9a3869d9
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.55.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.55.0.ebuild
deleted file mode 100644
index 0a47dd50e56c..000000000000
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.55.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="python classes generated from the common protos in the googleapis repository"
-HOMEPAGE="https://pypi.org/project/googleapis-common-protos/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.12.0[${PYTHON_USEDEP}]
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
-
-# no tests as this is all generated code
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.0-r1.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.0-r2.ebuild
index 66b5f36534ac..e2cd62f960b1 100644
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.0-r1.ebuild
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.0-r2.ebuild
@@ -14,10 +14,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/protobuf-python-3.12.0[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
 "
 
 python_compile() {
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.0.ebuild
deleted file mode 100644
index 1c0a1b2d5294..000000000000
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="python classes generated from the common protos in the googleapis repository"
-HOMEPAGE="https://pypi.org/project/googleapis-common-protos/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.12.0[${PYTHON_USEDEP}]
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
-
-# no tests as this is all generated code