gentoo resync : 08.07.2021

4 files changed, 69 insertions, 4 deletions

diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 2157e34ad5c1..dbd783360298 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,5 +1,7 @@
 DIST google-api-python-client-2.11.0.tar.gz 25408815 BLAKE2B 9bc7d0163961f5b6341fcb43f41a91dfe12702254047ac2b418ce89dad4f8f40400a7df1fff5ce9d73a05c5249b7242a4d642b866b97a34140826901f74f9d6e SHA512 6d31e0ed926f87f12400b1ec244f8e193d6559c58d6775c34ef5747af3ba633e76e8a883983438e84c6d31fe81ea57ac522f924270b80993cc6396cb6f3ae60e
+DIST google-api-python-client-2.12.0.tar.gz 25476570 BLAKE2B 7d5f53c19f00878ef717515f406a56d22ce520a0de4f8c5b4142de56263a5bdef76aaa64b3b87301f8c704ad279554f66425c746c8bb869ef735c061fc5d1b6a SHA512 47bfebe8649a4dbf2f8570f71ec4a0c4ececccf6734138e3c84e0501328f949485b5476227c123493b5874e43cc0ab72622ce9fb44484502e21e364f6c8cea54
 DIST google-api-python-client-2.8.0.tar.gz 25286774 BLAKE2B b21aebda062984b9eb8f2f5c563016f0f8f663883dc8ddb913053ff3df32c652c6a83f924f3e19136e5edec085e12c43cc584bc9898630122c77a219810033bc SHA512 cc3c55438b2f5835b52d17d04a749919c4865991ff78cf95920d0941a55e1493eae502a13f6565cfe1db799ce9950659e8baaa690bada058d711309861c8d07e
-EBUILD google-api-python-client-2.11.0.ebuild 1516 BLAKE2B 92ffac38d44974386605333b6365839193e90fc123aa9f7294c51b0bdcc2319f0647b4f339e19a17bdc89379eca50fefc1c2988cc73d7387eb8ecd87279331b1 SHA512 c9ae187e029371279d9752b49dcfcd93b9fdfb19b148cbb0db7b349b9b4ce2e25b28d25be36ab9fcc4e4121f15b6bfc9c1ffbfb2713bfe34dd780d300f0cd712
-EBUILD google-api-python-client-2.8.0.ebuild 1514 BLAKE2B 2ca4862c12887b2889440be939e080eb52e45e952260ddc50bc2f27bf3cafb323536f77ecdc7a1f81a1c06dda44974f66bdb4c0fc9902b86696d2e9f95a97115 SHA512 8aa1fb69b289ee8506f5cf7f54060407d2595af84dd0a26fc532feacc85f5ae74136fe6ef234060fbc374d8e2c7251299d7350c7fe084d670b9cda359b644560
+EBUILD google-api-python-client-2.11.0.ebuild 1597 BLAKE2B 609d0be968a25f6a9c25ece4a5818f7a59c2613b0d69d5d06f5e9e7fcaef14aa0232b625065d239a8d942e6d6282a7a5241ee15eae00967e554f4b55565e5532 SHA512 3f7d210a01f471f95f6ca27d787bc6b63c45703210ef0d4d6ddf6809ff403ff8e61a3c27a8b0ae2fd52f1678454ff6f93d9a50a0a34eb1667e991906a6f8e83d
+EBUILD google-api-python-client-2.12.0.ebuild 1596 BLAKE2B 71224bf042ad3587892f68bdbc391941c3f172b3f1e748afc9b6c3a6e6065c2178d49598375a57e5ee3dc8c63c7d20ecb2d6cb9d41483a152abd7dfca014f7e0 SHA512 d39560f9b75602c06c531b0862d6e3bd40a7e81d6ce9b3bc698f847d5d6df9b95183aa24d31971a7a0a60f8a3a3acb9216c337021f6d7e30fc217f69b2859100
+EBUILD google-api-python-client-2.8.0.ebuild 1595 BLAKE2B a8b4a982d508bce1149197b8cdf1f692c9977d62ff9d49b70ea00d155d5f5aaa5deb3122c5c51fda73e465f86149282f233b5b9a8fbaa6795f8f46e2ff19e324 SHA512 a3d4b8ff6e569483d08b1eeedf1c6636a65d218f7967e8e2c89fc261ce5d70b0ce8a5f81064145ec9c3992615e0c114831081e558c4d2ee32bfc6aa0d6259524
 MISC metadata.xml 537 BLAKE2B 5cbf80edce906cc5e6907af3df5b67662713d2eb503bcc619f616a5e770f57143d36089c1f2dde53c9c78b8df8b974e27e61d056b01bb70e6d7b9bd18a061afc SHA512 4d050e4c5f9b8f2284d4025570f5e52619b5304be4d7f76f856cce782120d8e1c0dcd23b5699509cb57a7720840b019f2c9bb981a08a6071be56977115708aa3
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.11.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.11.0.ebuild
index 53fb37378258..08eb44b4eda8 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.11.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.11.0.ebuild
@@ -32,11 +32,16 @@ BDEPEND="
 		dev-python/oauth2client[${PYTHON_USEDEP}]
 		dev-python/pandas[${PYTHON_USEDEP}]
 		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
 	)"
 
 distutils_enable_tests --install pytest
 
+src_prepare() {
+	find tests -name '*.py' -exec \
+		sed -i -e 's:unittest2 as ::' {} + || die
+	distutils-r1_src_prepare
+}
+
 python_test() {
 	local deselect=(
 		# require Internet access (and credentials)
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.12.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.12.0.ebuild
new file mode 100644
index 000000000000..68ec1c0b8c12
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.12.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-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="Google API Client for Python"
+HOMEPAGE="https://github.com/googleapis/google-api-python-client"
+SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	dev-python/google-api-core[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.13.0[${PYTHON_USEDEP}]
+	<dev-python/six-2[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+src_prepare() {
+	find tests -name '*.py' -exec \
+		sed -i -e 's:unittest2 as ::' {} + || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local deselect=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	distutils_install_for_testing
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.8.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.8.0.ebuild
index 69b970850c57..e52f1f75567e 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.8.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.8.0.ebuild
@@ -32,11 +32,16 @@ BDEPEND="
 		dev-python/oauth2client[${PYTHON_USEDEP}]
 		dev-python/pandas[${PYTHON_USEDEP}]
 		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
 	)"
 
 distutils_enable_tests --install pytest
 
+src_prepare() {
+	find tests -name '*.py' -exec \
+		sed -i -e 's:unittest2 as ::' {} + || die
+	distutils-r1_src_prepare
+}
+
 python_test() {
 	local deselect=(
 		# require Internet access (and credentials)