app-emulation/docker-compose: Fix 1.25.0 for py27

Closes: https://bugs.gentoo.org/701394
Signed-off-by: Sebastian Pipping <sping@gentoo.org>
Package-Manager: Portage-2.3.78, Repoman-2.3.16

diff --git a/app-emulation/docker-compose/docker-compose-1.25.0.ebuild b/app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild
similarity index 90%
rename from app-emulation/docker-compose/docker-compose-1.25.0.ebuild
rename to app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild
index b90ebe18f8ebce94f890388238285ca1f93500c1..a6f8868eab7b381e17792d7edc88da3049296556 100644 (file)
--- a/app-emulation/docker-compose/docker-compose-1.25.0.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild
@@ -30,9 +30,11 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
        >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
        >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
        >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+       $(python_gen_cond_dep '>=dev-python/backports-shutil_get_terminal_size-1.0.0[${PYTHON_USEDEP}]' 'python2_7' )
+       $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
        $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
        $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-       $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )"
+       $(python_gen_cond_dep '>=dev-python/subprocess32-3.5.4[${PYTHON_USEDEP}]' 'python2_7' )"
 
 DEPEND="${RDEPEND}
        test? ( <dev-python/pytest-4[${PYTHON_USEDEP}]

diff --git a/app-emulation/docker-compose/files/docker-compose-1.25.0-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.25.0-setup-py.patch
index 029dc54bb8f785639f2e764a8bd5e51f19f53825..a56ad638198bd87d73f13895f073893ace36816b 100644 (file)
--- a/app-emulation/docker-compose/files/docker-compose-1.25.0-setup-py.patch
+++ b/app-emulation/docker-compose/files/docker-compose-1.25.0-setup-py.patch
@@ -1,14 +1,14 @@
-From 8f2924d4146ddb1131e98efbee13a68b5445b7f8 Mon Sep 17 00:00:00 2001
+From bd58c42fd01829e0dbf475179710e5465655f4b1 Mon Sep 17 00:00:00 2001
 From: Sebastian Pipping <sebastian@pipping.org>
 Date: Mon, 18 Nov 2019 23:34:51 +0100
 Subject: [PATCH] setup.py: Drop generic upper version boundaries
 
 ---
- setup.py | 36 ++++++++++++++++++------------------
- 1 file changed, 18 insertions(+), 18 deletions(-)
+ setup.py | 38 +++++++++++++++++++-------------------
+ 1 file changed, 19 insertions(+), 19 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 23ae08a..97a8fbe 100644
+index 23ae08a..3f6a46f 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -30,35 +30,35 @@ def find_version(*file_paths):
@@ -52,13 +52,14 @@ index 23ae08a..97a8fbe 100644
 -    ':python_version < "3.2"': ['subprocess32 >= 3.5.4, < 4'],
 -    ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'],
 -    ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'],
-+    ':python_version < "3.2"': ['subprocess32 >= 3.5.4'],
-+    ':python_version < "3.4"': ['enum34 >= 1.0.4'],
-+    ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
-     ':python_version < "3.3"': ['backports.shutil_get_terminal_size == 1.0.0',
+-    ':python_version < "3.3"': ['backports.shutil_get_terminal_size == 1.0.0',
 -                                'ipaddress >= 1.0.16, < 2'],
 -    ':sys_platform == "win32"': ['colorama >= 0.4, < 1'],
 -    'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
++    ':python_version < "3.2"': ['subprocess32 >= 3.5.4'],
++    ':python_version < "3.4"': ['enum34 >= 1.0.4'],
++    ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
++    ':python_version < "3.3"': ['backports.shutil_get_terminal_size >= 1.0.0',
 +                                'ipaddress >= 1.0.16'],
 +    ':sys_platform == "win32"': ['colorama >= 0.4'],
 +    'socks': ['PySocks >= 1.5.6, != 1.5.7'],