gentoo resync : 14.07.2018

2 files changed, 34 insertions, 0 deletions

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 = [