gentoo resync : 05.02.2020

7 files changed, 2 insertions, 151 deletions

diff --git a/dev-python/google-apitools/Manifest b/dev-python/google-apitools/Manifest
index 60eb71dc28d4..9b78549ee881 100644
--- a/dev-python/google-apitools/Manifest
+++ b/dev-python/google-apitools/Manifest
@@ -1,11 +1,4 @@
-AUX google-apitools-0.5.22-drop-cli.patch 788 BLAKE2B eec24eadd85439bb978502dab49204849d9007a18866e64b1a472f40d12a45cef4e1c1b0ba23026a484870c7f3bb958e3f6d858d79c3c859e2b5c2ceccdba3dd SHA512 575140294dbcf3c1b0d5acc0b528db4dcee7625353e9a202fd3916f8082bdedf88fc77d1ab38a004604db92cfc0da949ec8796ecaebb1690ec62448c7b0e24c1
-AUX google-apitools-0.5.22-use-friendy-version-checks.patch 328 BLAKE2B cc25ec61871ac5ffbe068167b625eb20f0d3cbf32e32e014e4a17af276970cc5f71bbeaefc908a407a982a72ccadf188ff7c40b6a2c9704dbb5d682d2a8d34a2 SHA512 a21b43ab16678caf0ab1b18bb373fedb204dc3630aac26f584221ce0d5fa2834a1f44646c0f5eff6b8d9e7a3436c29dbd412ecca1cf354a6429040f308232a45
 AUX google-apitools-0.5.30-skip-enum-test-on-new-python.patch 807 BLAKE2B 7753d11545ffbf40abd7003e3efa777ec7245151eae2a3ee825e4fd5905af99cee3d5306a9b745d749785f818f6cf6daeca1f25895a179d2ac5aca2a58c18865 SHA512 a614ebefabc75ced727dece6a5a531e857b1282c7e7053c4a5fff90514f8240177ebfac8af8d000791f2adf69d624a2e5d68c16bfd1ec8e1083e354121d6f434
-DIST google-apitools-0.5.16.tar.gz 405331 BLAKE2B 9bd086a68e5787f6dcd426887bb5e0af23ac985f851471da61567266fe52dc254054f0f2fb49e08b461c9281a32c25a764a7b751e10fe6ccca13c2758cdc4637 SHA512 cda60ec21622368c67cc47900218ceaa4137e6d602ee5196f59dac82aa87d35382785323971cc7e4aedf9d69e0a1baf8017c5d941d05171df9e1d5eea15570eb
-DIST google-apitools-0.5.22.tar.gz 422977 BLAKE2B 1734f7e19ff90ff5997921ec1e57a29eec13f20dac4d7c84015d40f13147429ad93400a2eaa6038fdbf3ff2b5700dc1a0f6da6cca0706598b3a1eb5abba341b1 SHA512 f184b0ccc17ae80e8436727afab62a3e655ddecc37bde23dd144cc285461b80846fb1df24f21d75f06f521dbc28e8f3e9d5838d769ac52aff83c0aa8d1be66d5
 DIST google-apitools-0.5.30.tar.gz 363524 BLAKE2B ed8477c85911f5855a449abe81b465635d3cc4e08d2915de5e882608e634f3dd9ffdda929bd8b25eb3daa5922851aa9304ffe07778cdf3a3aa629e215633515a SHA512 2dffffada829b9b962c64aab22b19cd227981819128c34f3e32515ee599297b3d5e8c97152d954110c2ef27c02737d3c30c785840b9f9767068688f62dc0b5c7
-EBUILD google-apitools-0.5.16.ebuild 772 BLAKE2B cc645f6a373240dfd8d9eb5ecd3206604e99cec1477b54b0e343732b99a5e0e4ea8f21577d4c6498a1e9a7a8486cf3f82693233e7463b6737cbe540224ddd8ad SHA512 025f4583be50f927853dd96e2b6f22f840c6cb4301636297c3eb3917065509a2cdfd49b89a03b9caf0cab56ac517187b8cbb91759a329acb6a85869437a5f7f3
-EBUILD google-apitools-0.5.22-r1.ebuild 1324 BLAKE2B 0a405e8294c51afad152754c9cd18e31f4e0ce4f9f3b346b65c693760c619fbca198d32d25f74c4e92aaade17a9978cf810757471096e5818dbfeb421e33bdcf SHA512 97e700ec57791ad16b6c81d72a4d18c706aa7dd2a20a82fc7d56a87dc54c8ed19f564ed1a493bde81e8b92a1e3849d510c6a572de4a2f7f7dd1853feaf948c33
-EBUILD google-apitools-0.5.22.ebuild 957 BLAKE2B f4a0e09a1aed739804e17d3c922a90821f306edb160cb7262fddf28a0aa4a497002059e3d99630489fad0caebfa035509395aa7f81f7c8c17818c71b7e7ae5da SHA512 c3782afb5070813298da99148c64bb675bcddb197673908a56cd7ff340dd0fcba6efc4299a830182658a8bcfc8ed4585e8ae27450700147e653b7e9ea6305c63
-EBUILD google-apitools-0.5.30.ebuild 1096 BLAKE2B cd1683a3e379a8c08d91ba7168d47c0f902ab78a9a9aa1799151b13dcde3878d85f5ab5ffa88747fec4959d59ce69f49b572b6ecf2b3dcb99e489e8d3b7302ee SHA512 b5c6f2e4b5df36721f0fd825de127019b9a9a260b2894b626470323b78e8002692136063aaf4ebd29828839437025e850de59904b8c501b6163b36bc8b919ac0
+EBUILD google-apitools-0.5.30.ebuild 1090 BLAKE2B 5b6813000245adf540e121feee48a2ec40a9bc348e037e026ab2f8cf16d485c1cb265d015753be4c820fe57e5a7a3ca5212e305fb4ade1a586be0a488a6b29af SHA512 be5adf34dca5f7b5d4d3b8df01d3ea014a79e08d146b3b5676154b72b5aba04f426f69e24388ea428ca79a1832f66c436db8b1d193d19d3a8fd122109b93d054
 MISC metadata.xml 330 BLAKE2B cea2ae09b3468b95764b84c8891b9840e918db4961a77f4d514a4c15a33248a011b79f235728883e31a968c69a07c436a31a282f1e4a2baed2cbb2c7ba3c4982 SHA512 a4b6c01f3d8c411c5e96b911585770af30c8a1f262e92bf01748447111798a8e6ede7aa5979f16c3cf7068b3f158842023546e234049e2345f1a2f2891e51296
diff --git a/dev-python/google-apitools/files/google-apitools-0.5.22-drop-cli.patch b/dev-python/google-apitools/files/google-apitools-0.5.22-drop-cli.patch
deleted file mode 100644
index cae369deefc3..000000000000
--- a/dev-python/google-apitools/files/google-apitools-0.5.22-drop-cli.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-we don't have code currently that uses the CLI tools, and the CLI tools require
-the apputils project, and that doesn't currently work with python3.  drop it for
-now to get general python3 support.
-https://github.com/google/apitools/issues/8
-
---- a/setup.py
-+++ b/setup.py
-@@ -69,13 +69,7 @@ setuptools.setup(
-     author_email='craigcitro@google.com',
-     # Contained modules and scripts.
-     packages=setuptools.find_packages(),
--    entry_points={'console_scripts': CONSOLE_SCRIPTS},
-     install_requires=REQUIRED_PACKAGES,
--    tests_require=REQUIRED_PACKAGES + CLI_PACKAGES + TESTING_PACKAGES,
--    extras_require={
--        'cli': CLI_PACKAGES,
--        'testing': TESTING_PACKAGES,
--        },
-     # Add in any packaged data.
-     include_package_data=True,
-     package_data={
diff --git a/dev-python/google-apitools/files/google-apitools-0.5.22-use-friendy-version-checks.patch b/dev-python/google-apitools/files/google-apitools-0.5.22-use-friendy-version-checks.patch
deleted file mode 100644
index 48688543a9fe..000000000000
--- a/dev-python/google-apitools/files/google-apitools-0.5.22-use-friendy-version-checks.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index c0ab0b842899..2b21497dd088 100644
---- a/setup.py
-+++ b/setup.py
-@@ -36,7 +36,7 @@ REQUIRED_PACKAGES = [
- 
- CLI_PACKAGES = [
-     'google-apputils>=0.4.0',
--    'python-gflags==3.0.6',  # Starting version 3.0.7 py26 is not supported.
-+    'python-gflags>=3.0.6',
- ]
- 
- TESTING_PACKAGES = [
diff --git a/dev-python/google-apitools/google-apitools-0.5.16.ebuild b/dev-python/google-apitools/google-apitools-0.5.16.ebuild
deleted file mode 100644
index 389a7b7a8dba..000000000000
--- a/dev-python/google-apitools/google-apitools-0.5.16.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to manipulate Google APIs"
-HOMEPAGE="https://github.com/google/apitools"
-SRC_URI="https://github.com/google/apitools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/google-apputils-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-gflags-3.0.6[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/apitools-${PV}"
diff --git a/dev-python/google-apitools/google-apitools-0.5.22-r1.ebuild b/dev-python/google-apitools/google-apitools-0.5.22-r1.ebuild
deleted file mode 100644
index cf9076ca560b..000000000000
--- a/dev-python/google-apitools/google-apitools-0.5.22-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# We strip out the tests & cli code as it relies on google-apputils, and that
-# module hasn't been ported to python-3.  No one currently relies on them, so
-# we drop them for the sake of gaining python-3.
-# https://github.com/google/apitools/issues/8
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to manipulate Google APIs"
-HOMEPAGE="https://github.com/google/apitools"
-SRC_URI="https://github.com/google/apitools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.14[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]"
-# See comment above about py3 support.
-RESTRICT="test"
-
-S="${WORKDIR}/apitools-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.22-use-friendy-version-checks.patch
-	"${FILESDIR}"/${PN}-0.5.22-drop-cli.patch
-)
-
-src_unpack() {
-	default
-
-	# Nuke modules that we don't need.
-	cd "${S}"
-	rm -r samples || die
-	find -name '*_test.py' -delete || die
-	find -name testdata -exec rm -r {} + || die
-}
diff --git a/dev-python/google-apitools/google-apitools-0.5.22.ebuild b/dev-python/google-apitools/google-apitools-0.5.22.ebuild
deleted file mode 100644
index d848410aa32c..000000000000
--- a/dev-python/google-apitools/google-apitools-0.5.22.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-# Python 3 support: https://github.com/google/apitools/issues/8
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to manipulate Google APIs"
-HOMEPAGE="https://github.com/google/apitools"
-SRC_URI="https://github.com/google/apitools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.14[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/google-apputils-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-gflags-3.0.6[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/apitools-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.22-use-friendy-version-checks.patch
-)
diff --git a/dev-python/google-apitools/google-apitools-0.5.30.ebuild b/dev-python/google-apitools/google-apitools-0.5.30.ebuild
index 460f5faea92b..8401e3c8f33c 100644
--- a/dev-python/google-apitools/google-apitools-0.5.30.ebuild
+++ b/dev-python/google-apitools/google-apitools-0.5.30.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1