gentoo resync : 29.03.2018

5 files changed, 120 insertions, 0 deletions

diff --git a/dev-python/google-apitools/Manifest b/dev-python/google-apitools/Manifest
index 593d8f6b0d8c..ee4958b907c1 100644
--- a/dev-python/google-apitools/Manifest
+++ b/dev-python/google-apitools/Manifest
@@ -1,3 +1,8 @@
+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
 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
 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
 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
new file mode 100644
index 000000000000..cae369deefc3
--- /dev/null
+++ b/dev-python/google-apitools/files/google-apitools-0.5.22-drop-cli.patch
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 000000000000..48688543a9fe
--- /dev/null
+++ b/dev-python/google-apitools/files/google-apitools-0.5.22-use-friendy-version-checks.patch
@@ -0,0 +1,13 @@
+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.22-r1.ebuild b/dev-python/google-apitools/google-apitools-0.5.22-r1.ebuild
new file mode 100644
index 000000000000..cf9076ca560b
--- /dev/null
+++ b/dev-python/google-apitools/google-apitools-0.5.22-r1.ebuild
@@ -0,0 +1,48 @@
+# 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
new file mode 100644
index 000000000000..d848410aa32c
--- /dev/null
+++ b/dev-python/google-apitools/google-apitools-0.5.22.ebuild
@@ -0,0 +1,33 @@
+# 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
+)