gentoo resync : 25.08.2020

4 files changed, 10 insertions, 63 deletions

diff --git a/dev-python/oauth2client/Manifest b/dev-python/oauth2client/Manifest
index 14f403133881..90d1db0afb64 100644
--- a/dev-python/oauth2client/Manifest
+++ b/dev-python/oauth2client/Manifest
@@ -1,5 +1,4 @@
 AUX oauth2client-4.1.3-py38.patch 1782 BLAKE2B 751b62649cd7222230f809c7e957636e351cddb3588c1da112443b09067c73cc6ada588697dd36f9b6ed2115238f8f811bc5502b17c75b2f65be655b4199dc9f SHA512 3e03d7105e76206e63858a32a25dfd5bbf997ced6abafd75d0f4973528ee91cb28200854ccfa519945573992f454c18d2acad5784693acffc7509ddcb13908a8
 DIST oauth2client-4.1.3.tar.gz 185589 BLAKE2B 6cd61448e0d55cef7f2ba640c8cbb50ac83e76d0993391eb0acb3e156f937fcdee80576c9d45d505235a9f266495069664ccbfafd649a4e2d7a0990517ee8cb6 SHA512 80f49e09a6dd6767307a2c278544926fbf20b4f55e4cf83563ac7a7c1043622bd3c8c7fcf6de62896b623ca8c7947b309a5e6bf2b7cb0fccff3ff7634386b287
-EBUILD oauth2client-4.1.3-r1.ebuild 1813 BLAKE2B 1171899000256d0f2da45c687ffafb7749d061ba1c0c8f454b9c00c4decaec3e57e8d6dc4e1340705d886533240fe3267c1a09a7753939368f5ff750c9dfb2f1 SHA512 50946e1f0a41b47f792b5018ab22394c8205273190834b91f3528f2f1b6dc0676a03d9f26863a2701a4b1efd01149218936630109ddac66764a736cd4acc66da
-EBUILD oauth2client-4.1.3.ebuild 1683 BLAKE2B d2b335f5dbb376a877641711b27aa0be0f3475f403fc110219cf66114dea7b49d658eaae8fb28a2174710e8ca740aa20d2d560d6fdcf33801afb9e434ebae14f SHA512 e93763a8b6fb6944123ebb1fa52fdfd0a3e591dbd68cfefdb7fd6704546753cf5e84d20872cda9eab21a9629197699e63424dc088019ffd548c5626ff1dbb3e1
-MISC metadata.xml 338 BLAKE2B 83fcd745b218d67169e4c38046821df108a4fe02d6ea671ef3ea5a317b21499d20ebbfb1d0575e651c34ccf9c907e281bdafa98c6cbde62eb5df86ce092b9285 SHA512 2148a99b18eff64225de89dfe5de617b5584423483a6265f1f7247adceb62ea53b3dabe2d185ff51a535494e81bdec3dda2de59c83320ce1f4febd665d101a3a
+EBUILD oauth2client-4.1.3-r1.ebuild 1720 BLAKE2B aa1429a130493987dc7b7970135d55edbc45502866bc8bbb187874a4b117365dbc3c7f50ed53c08483efd976297aa72740b068da03470d77ea1d46cbc5b3572c SHA512 4770227dc48a378f76cd6cb8397a7824cacbe31f6437f6917286f20b70547bed1d19df2564db794b216f351a2f76051aa11dea106882f254e2a07b193174fbb2
+MISC metadata.xml 363 BLAKE2B 7c5e946ba58960ecbb9458b57dde2175f003d827f4178c51c2746053333af96d55d973a81668d7bae5c7d4e706e870678da540467d23b5d43c020691552314da SHA512 4058fc7b16017ed09f27da96d66e9d142dbffd476c8c7d4c2b31127ee2dc43b002e0f431391784465101a329d172bf7650c5ee42e09a1edd21c11be8a191ab6a
diff --git a/dev-python/oauth2client/metadata.xml b/dev-python/oauth2client/metadata.xml
index 9083df5a2ff2..84013d57af40 100644
--- a/dev-python/oauth2client/metadata.xml
+++ b/dev-python/oauth2client/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">googleapis/oauth2client</remote-id>
   </upstream>
diff --git a/dev-python/oauth2client/oauth2client-4.1.3-r1.ebuild b/dev-python/oauth2client/oauth2client-4.1.3-r1.ebuild
index 3563b832a5a6..d9457f52e90b 100644
--- a/dev-python/oauth2client/oauth2client-4.1.3-r1.ebuild
+++ b/dev-python/oauth2client/oauth2client-4.1.3-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -13,10 +13,7 @@ S="${WORKDIR}"/${P/_p/-post}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( $(python_gen_useflags 'python*') )"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
@@ -27,13 +24,15 @@ RDEPEND="
 	dev-python/keyring[${PYTHON_USEDEP}]
 	!<=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
 "
-BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
+BDEPEND="
+	test? (
+		dev-python/flask[${PYTHON_USEDEP}]
 		dev-python/sqlalchemy[${PYTHON_USEDEP}]
 	)
 "
 
+distutils_enable_tests nose
+
 PATCHES=(
 	"${FILESDIR}/oauth2client-4.1.3-py38.patch"
 )
diff --git a/dev-python/oauth2client/oauth2client-4.1.3.ebuild b/dev-python/oauth2client/oauth2client-4.1.3.ebuild
deleted file mode 100644
index 5901030b4f92..000000000000
--- a/dev-python/oauth2client/oauth2client-4.1.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for accessing resources protected by OAuth 2.0"
-HOMEPAGE="https://github.com/googleapis/oauth2client"
-SRC_URI="https://github.com/googleapis/oauth2client/archive/v${PV/_p/-post}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( $(python_gen_useflags 'python*') )"
-
-RDEPEND="
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	!<=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}"/${P/_p/-post}
-
-python_prepare() {
-	# keyring is not fuly supported by pypy yet, because dbus-python can't support pypy
-	# oauth2client -> keyring -> secretstorage -> dbus-python
-	# https://github.com/mitya57/secretstorage/issues/10
-	case $PYTHON in
-		pypy|*pypy|*pypy3|pypy3) \
-			find "${BUILD_DIR}/.." -name '*keyring*py' -delete ;;
-	esac
-}
-
-python_test() {
-	nosetests -e appengine -e django_util -e test_multiprocess_file_storage -e test_bad_positional || die
-	# appengine - requires appengine
-	# django_util - requires django
-	# test_multiprocess_file_storage - requires fasteners
-	# test_bad_positional - expects TypeError, gets ValueError
-}