commit: 7ab150c0ab141bef4a8826fbf90e83af25ffdd9b Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sat Apr 20 09:30:35 2019 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Apr 20 11:12:08 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ab150c0
*/*: Remove last vestiges of python3_4 Closes: https://github.com/gentoo/gentoo/pull/11755 Signed-off-by: David Seifert <soap <AT> gentoo.org> app-crypt/acmebot/acmebot-2.3.0.ebuild | 2 +- app-crypt/acmebot/acmebot-9999.ebuild | 2 +- app-portage/gemato/gemato-14.0.ebuild | 4 ++-- app-portage/gemato/gemato-14.0m.ebuild | 4 ++-- app-portage/gemato/gemato-9999.ebuild | 4 ++-- app-portage/gemato/gemato-9999m.ebuild | 4 ++-- app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild | 2 +- dev-python/aiohttp-cors/aiohttp-cors-0.5.3.ebuild | 3 +-- dev-python/aiohttp-cors/aiohttp-cors-0.6.0.ebuild | 3 +-- dev-python/celery/celery-4.1.0.ebuild | 4 ++-- dev-python/configshell-fb/configshell-fb-1.1.25.ebuild | 2 +- dev-python/curtsies/curtsies-0.3.0-r1.ebuild | 2 +- dev-python/docker-py/docker-py-2.4.2.ebuild | 2 +- dev-python/docker-py/docker-py-2.7.0.ebuild | 2 +- dev-python/docker-py/docker-py-3.4.1.ebuild | 2 +- dev-python/docker-py/docker-py-3.5.0.ebuild | 2 +- dev-python/docker-py/docker-py-3.5.1.ebuild | 2 +- dev-python/docker-py/docker-py-3.6.0.ebuild | 2 +- dev-python/docker-py/docker-py-3.7.0.ebuild | 2 +- dev-python/docker-py/docker-py-3.7.1.ebuild | 2 +- dev-python/libcloud/libcloud-1.2.1.ebuild | 2 +- dev-python/libcloud/libcloud-1.5.0.ebuild | 2 +- dev-python/libcloud/libcloud-2.3.0.ebuild | 2 +- dev-python/networkx/networkx-1.11-r1.ebuild | 2 +- dev-python/networkx/networkx-1.11.ebuild | 2 +- dev-python/nose/nose-1.3.7-r3.ebuild | 2 +- dev-python/nose/nose-9999.ebuild | 2 +- dev-python/pathlib2/pathlib2-2.3.0.ebuild | 2 +- dev-python/pathlib2/pathlib2-2.3.2.ebuild | 2 +- dev-python/pbr/pbr-3.1.1.ebuild | 4 ++-- dev-python/pbr/pbr-4.2.0-r1.ebuild | 2 +- dev-python/pbr/pbr-4.2.0-r2.ebuild | 2 +- dev-python/pbr/pbr-5.1.1.ebuild | 2 +- dev-python/pytest/pytest-3.10.1.ebuild | 4 ++-- .../ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild | 16 +++++++--------- dev-python/twine/twine-1.11.0.ebuild | 2 +- .../gnome-settings-daemon-3.24.4.ebuild | 2 +- kde-apps/cantor/cantor-19.04.0.ebuild | 2 +- net-analyzer/netdata/netdata-1.14.0.ebuild | 2 +- sys-apps/portage-mgorny/portage-mgorny-2.3.51.1.ebuild | 2 +- sys-apps/portage-mgorny/portage-mgorny-9999.ebuild | 2 +- sys-apps/portage/portage-2.3.62-r1.ebuild | 4 ++-- sys-apps/portage/portage-2.3.62.ebuild | 4 ++-- sys-apps/portage/portage-2.3.63.ebuild | 4 ++-- sys-apps/portage/portage-2.3.64.ebuild | 4 ++-- sys-apps/portage/portage-9999.ebuild | 4 ++-- virtual/python-funcsigs/python-funcsigs-2.ebuild | 2 +- virtual/python-typing/python-typing-0-r1.ebuild | 2 +- www-servers/tornado/tornado-4.4.2-r1.ebuild | 4 ++-- www-servers/tornado/tornado-4.5.1.ebuild | 4 ++-- www-servers/tornado/tornado-4.5.3.ebuild | 4 ++-- www-servers/tornado/tornado-5.0.2.ebuild | 2 +- www-servers/tornado/tornado-5.1.ebuild | 2 +- 53 files changed, 74 insertions(+), 78 deletions(-) diff --git a/app-crypt/acmebot/acmebot-2.3.0.ebuild b/app-crypt/acmebot/acmebot-2.3.0.ebuild index f5ca97e79e0..80bd249ecd7 100644 --- a/app-crypt/acmebot/acmebot-2.3.0.ebuild +++ b/app-crypt/acmebot/acmebot-2.3.0.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=(python3_{4..6}) +PYTHON_COMPAT=(python3_{5,6}) EGIT_REPO_URI="https://github.com/plinss/${PN}.git"; [[ $PV == 9999 ]] && _scm=git-r3 diff --git a/app-crypt/acmebot/acmebot-9999.ebuild b/app-crypt/acmebot/acmebot-9999.ebuild index f5ca97e79e0..80bd249ecd7 100644 --- a/app-crypt/acmebot/acmebot-9999.ebuild +++ b/app-crypt/acmebot/acmebot-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=(python3_{4..6}) +PYTHON_COMPAT=(python3_{5,6}) EGIT_REPO_URI="https://github.com/plinss/${PN}.git"; [[ $PV == 9999 ]] && _scm=git-r3 diff --git a/app-portage/gemato/gemato-14.0.ebuild b/app-portage/gemato/gemato-14.0.ebuild index 833afe88524..ecb84bc3788 100644 --- a/app-portage/gemato/gemato-14.0.ebuild +++ b/app-portage/gemato/gemato-14.0.ebuild @@ -18,11 +18,11 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 IUSE="+blake2 bzip2 +gpg lzma sha3 test tools" MODULE_RDEPEND=" - blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) ) + blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) ) bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) ) gpg? ( app-crypt/gnupg ) lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) ) - sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )" + sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )" RDEPEND="${MODULE_RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/app-portage/gemato/gemato-14.0m.ebuild b/app-portage/gemato/gemato-14.0m.ebuild index 435a45db1f2..318a72bafc8 100644 --- a/app-portage/gemato/gemato-14.0m.ebuild +++ b/app-portage/gemato/gemato-14.0m.ebuild @@ -21,11 +21,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s IUSE="+blake2 bzip2 +gpg lzma sha3 test tools" MODULE_RDEPEND=" - blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) ) + blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) ) bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) ) gpg? ( app-crypt/gnupg ) lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) ) - sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )" + sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )" RDEPEND="${MODULE_RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/app-portage/gemato/gemato-9999.ebuild b/app-portage/gemato/gemato-9999.ebuild index 4615e46753a..eadfa2181db 100644 --- a/app-portage/gemato/gemato-9999.ebuild +++ b/app-portage/gemato/gemato-9999.ebuild @@ -19,11 +19,11 @@ KEYWORDS="" IUSE="+blake2 bzip2 +gpg lzma sha3 test tools" MODULE_RDEPEND=" - blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) ) + blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) ) bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) ) gpg? ( app-crypt/gnupg ) lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) ) - sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )" + sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )" RDEPEND="${MODULE_RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/app-portage/gemato/gemato-9999m.ebuild b/app-portage/gemato/gemato-9999m.ebuild index b86cc50fd41..d07e16ce862 100644 --- a/app-portage/gemato/gemato-9999m.ebuild +++ b/app-portage/gemato/gemato-9999m.ebuild @@ -20,11 +20,11 @@ KEYWORDS="" IUSE="+blake2 bzip2 +gpg lzma sha3 test tools" MODULE_RDEPEND=" - blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) ) + blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) ) bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) ) gpg? ( app-crypt/gnupg ) lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) ) - sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )" + sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )" RDEPEND="${MODULE_RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild b/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild index ab711abd29a..bd7dd809d77 100644 --- a/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild +++ b/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{4,5,6,7} pypy3 ) +PYTHON_COMPAT=( python3_{5,6,7} pypy3 ) inherit autotools python-single-r1 readme.gentoo-r1 diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.5.3.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.5.3.ebuild index f4dba43d46b..25e033410ba 100644 --- a/dev-python/aiohttp-cors/aiohttp-cors-0.5.3.ebuild +++ b/dev-python/aiohttp-cors/aiohttp-cors-0.5.3.ebuild @@ -17,8 +17,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="test" -RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python3_4)" +RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] test? ( diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.6.0.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.6.0.ebuild index 4c3301227c0..2ef943a0aea 100644 --- a/dev-python/aiohttp-cors/aiohttp-cors-0.6.0.ebuild +++ b/dev-python/aiohttp-cors/aiohttp-cors-0.6.0.ebuild @@ -17,8 +17,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="test" -RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python3_4)" +RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] test? ( diff --git a/dev-python/celery/celery-4.1.0.ebuild b/dev-python/celery/celery-4.1.0.ebuild index 7d885d9e5bc..23aeae4b730 100644 --- a/dev-python/celery/celery-4.1.0.ebuild +++ b/dev-python/celery/celery-4.1.0.ebuild @@ -52,8 +52,8 @@ DEPEND=" >=dev-python/sphinx_celery-1.3[${PYTHON_USEDEP}] dev-python/jinja[${PYTHON_USEDEP}] dev-python/sqlalchemy[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python2_7 python3_4) - )" + $(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python2_7) + )" # testsuite needs it own source DISTUTILS_IN_SOURCE_BUILD=1 diff --git a/dev-python/configshell-fb/configshell-fb-1.1.25.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.25.ebuild index 4fe6f47f509..c04e53c370b 100644 --- a/dev-python/configshell-fb/configshell-fb-1.1.25.ebuild +++ b/dev-python/configshell-fb/configshell-fb-1.1.25.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} ) +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) inherit distutils-r1 DESCRIPTION="A Python library for building configuration shells" diff --git a/dev-python/curtsies/curtsies-0.3.0-r1.ebuild b/dev-python/curtsies/curtsies-0.3.0-r1.ebuild index 7b1df83d4c2..d3cffb724a5 100644 --- a/dev-python/curtsies/curtsies-0.3.0-r1.ebuild +++ b/dev-python/curtsies/curtsies-0.3.0-r1.ebuild @@ -19,7 +19,7 @@ IUSE="test" RDEPEND=" >=dev-python/blessings-1.5[${PYTHON_USEDEP}] >=dev-python/wcwidth-0.1.4[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python{2_7,3_4}) + $(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python2_7) " DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] diff --git a/dev-python/docker-py/docker-py-2.4.2.ebuild b/dev-python/docker-py/docker-py-2.4.2.ebuild index 64d1256b9ee..4b5d48530b5 100644 --- a/dev-python/docker-py/docker-py-2.4.2.ebuild +++ b/dev-python/docker-py/docker-py-2.4.2.ebuild @@ -22,7 +22,7 @@ RDEPEND=" >=dev-python/requests-2.11.1[${PYTHON_USEDEP}] >=dev-python/six-1.4.0[${PYTHON_USEDEP}] >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' ) + $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' ) $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' ) " DEPEND=" diff --git a/dev-python/docker-py/docker-py-2.7.0.ebuild b/dev-python/docker-py/docker-py-2.7.0.ebuild index 10baf7d30ad..47ecce78b13 100644 --- a/dev-python/docker-py/docker-py-2.7.0.ebuild +++ b/dev-python/docker-py/docker-py-2.7.0.ebuild @@ -21,7 +21,7 @@ RDEPEND=" >=dev-python/requests-2.14.2[${PYTHON_USEDEP}] >=dev-python/six-1.4.0[${PYTHON_USEDEP}] >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' ) + $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' ) $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' ) " DEPEND=" diff --git a/dev-python/docker-py/docker-py-3.4.1.ebuild b/dev-python/docker-py/docker-py-3.4.1.ebuild index 0ee6d675b43..8e16af3feb1 100644 --- a/dev-python/docker-py/docker-py-3.4.1.ebuild +++ b/dev-python/docker-py/docker-py-3.4.1.ebuild @@ -21,7 +21,7 @@ RDEPEND=" >=dev-python/requests-2.14.2[${PYTHON_USEDEP}] >=dev-python/six-1.4.0[${PYTHON_USEDEP}] >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' ) + $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' ) $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' ) " DEPEND=" diff --git a/dev-python/docker-py/docker-py-3.5.0.ebuild b/dev-python/docker-py/docker-py-3.5.0.ebuild index 0ee6d675b43..8e16af3feb1 100644 --- a/dev-python/docker-py/docker-py-3.5.0.ebuild +++ b/dev-python/docker-py/docker-py-3.5.0.ebuild @@ -21,7 +21,7 @@ RDEPEND=" >=dev-python/requests-2.14.2[${PYTHON_USEDEP}] >=dev-python/six-1.4.0[${PYTHON_USEDEP}] >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' ) + $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' ) $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' ) " DEPEND=" diff --git a/dev-python/docker-py/docker-py-3.5.1.ebuild b/dev-python/docker-py/docker-py-3.5.1.ebuild index 0ee6d675b43..8e16af3feb1 100644 --- a/dev-python/docker-py/docker-py-3.5.1.ebuild +++ b/dev-python/docker-py/docker-py-3.5.1.ebuild @@ -21,7 +21,7 @@ RDEPEND=" >=dev-python/requests-2.14.2[${PYTHON_USEDEP}] >=dev-python/six-1.4.0[${PYTHON_USEDEP}] >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' ) + $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' ) $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' ) " DEPEND=" diff --git a/dev-python/docker-py/docker-py-3.6.0.ebuild b/dev-python/docker-py/docker-py-3.6.0.ebuild index 8d80df67cbf..c0ee1da6a19 100644 --- a/dev-python/docker-py/docker-py-3.6.0.ebuild +++ b/dev-python/docker-py/docker-py-3.6.0.ebuild @@ -21,7 +21,7 @@ RDEPEND=" >=dev-python/requests-2.14.2[${PYTHON_USEDEP}] >=dev-python/six-1.4.0[${PYTHON_USEDEP}] >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' ) + $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' ) $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' ) " DEPEND=" diff --git a/dev-python/docker-py/docker-py-3.7.0.ebuild b/dev-python/docker-py/docker-py-3.7.0.ebuild index 821513d1cdd..2573b1681c6 100644 --- a/dev-python/docker-py/docker-py-3.7.0.ebuild +++ b/dev-python/docker-py/docker-py-3.7.0.ebuild @@ -21,7 +21,7 @@ RDEPEND=" >=dev-python/requests-2.14.2[${PYTHON_USEDEP}] >=dev-python/six-1.4.0[${PYTHON_USEDEP}] >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' ) + $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' ) $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' ) " DEPEND=" diff --git a/dev-python/docker-py/docker-py-3.7.1.ebuild b/dev-python/docker-py/docker-py-3.7.1.ebuild index 821513d1cdd..2573b1681c6 100644 --- a/dev-python/docker-py/docker-py-3.7.1.ebuild +++ b/dev-python/docker-py/docker-py-3.7.1.ebuild @@ -21,7 +21,7 @@ RDEPEND=" >=dev-python/requests-2.14.2[${PYTHON_USEDEP}] >=dev-python/six-1.4.0[${PYTHON_USEDEP}] >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' ) + $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' ) $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' ) " DEPEND=" diff --git a/dev-python/libcloud/libcloud-1.2.1.ebuild b/dev-python/libcloud/libcloud-1.2.1.ebuild index 4a157b672ab..f9ddebeb994 100644 --- a/dev-python/libcloud/libcloud-1.2.1.ebuild +++ b/dev-python/libcloud/libcloud-1.2.1.ebuild @@ -23,7 +23,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/lockfile[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python{2_7,3_4} pypy) + $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy) )" S="${WORKDIR}/apache-${P}" diff --git a/dev-python/libcloud/libcloud-1.5.0.ebuild b/dev-python/libcloud/libcloud-1.5.0.ebuild index cccc27825a0..ab9abff3992 100644 --- a/dev-python/libcloud/libcloud-1.5.0.ebuild +++ b/dev-python/libcloud/libcloud-1.5.0.ebuild @@ -23,7 +23,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/lockfile[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python{2_7,3_4} pypy) + $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy) )" # Known test failures diff --git a/dev-python/libcloud/libcloud-2.3.0.ebuild b/dev-python/libcloud/libcloud-2.3.0.ebuild index e2e01390c87..2f396c21fbd 100644 --- a/dev-python/libcloud/libcloud-2.3.0.ebuild +++ b/dev-python/libcloud/libcloud-2.3.0.ebuild @@ -22,7 +22,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/lockfile[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python{2_7,3_4} pypy) + $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy) )" # Known test failures diff --git a/dev-python/networkx/networkx-1.11-r1.ebuild b/dev-python/networkx/networkx-1.11-r1.ebuild index e2a51f911ca..2f04d349b38 100644 --- a/dev-python/networkx/networkx-1.11-r1.ebuild +++ b/dev-python/networkx/networkx-1.11-r1.ebuild @@ -27,7 +27,7 @@ DEPEND=" dev-python/sphinx[${PYTHON_USEDEP}] dev-python/matplotlib[${PYTHON_USEDEP}] $(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' python2_7) - $(python_gen_cond_dep 'dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]' python2_7 python{3_3,3_4}) + $(python_gen_cond_dep 'dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]' python2_7) ) test? ( ${COMMON_DEPEND} diff --git a/dev-python/networkx/networkx-1.11.ebuild b/dev-python/networkx/networkx-1.11.ebuild index 8703e904fbc..f4f786cd4b1 100644 --- a/dev-python/networkx/networkx-1.11.ebuild +++ b/dev-python/networkx/networkx-1.11.ebuild @@ -27,7 +27,7 @@ DEPEND=" dev-python/sphinx[${PYTHON_USEDEP}] dev-python/matplotlib[${PYTHON_USEDEP}] $(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' python2_7) - $(python_gen_cond_dep 'dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]' python2_7 python{3_3,3_4}) + $(python_gen_cond_dep 'dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]' python2_7) ) test? ( ${COMMON_DEPEND} diff --git a/dev-python/nose/nose-1.3.7-r3.ebuild b/dev-python/nose/nose-1.3.7-r3.ebuild index ab420578785..e66f8269099 100644 --- a/dev-python/nose/nose-1.3.7-r3.ebuild +++ b/dev-python/nose/nose-1.3.7-r3.ebuild @@ -28,7 +28,7 @@ RDEPEND=" dev-python/setuptools[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] ) - test? ( || ( $(python_gen_cond_dep 'dev-python/twisted[${PYTHON_USEDEP}]' python2_7 python3_{4,5,6}) + test? ( || ( $(python_gen_cond_dep 'dev-python/twisted[${PYTHON_USEDEP}]' python2_7 python3_{5,6}) $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) ) )" diff --git a/dev-python/nose/nose-9999.ebuild b/dev-python/nose/nose-9999.ebuild index 49eecc641f2..03c347f62ba 100644 --- a/dev-python/nose/nose-9999.ebuild +++ b/dev-python/nose/nose-9999.ebuild @@ -29,7 +29,7 @@ RDEPEND=" dev-python/setuptools[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] ) - test? ( $(python_gen_cond_dep 'dev-python/twisted[${PYTHON_USEDEP}]' python2_7 python3_{4,5,6}) )" + test? ( $(python_gen_cond_dep 'dev-python/twisted[${PYTHON_USEDEP}]' python2_7 python3_{5,6}) )" pkg_setup() { use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) diff --git a/dev-python/pathlib2/pathlib2-2.3.0.ebuild b/dev-python/pathlib2/pathlib2-2.3.0.ebuild index bc9789b1873..ef3be1691a5 100644 --- a/dev-python/pathlib2/pathlib2-2.3.0.ebuild +++ b/dev-python/pathlib2/pathlib2-2.3.0.ebuild @@ -18,7 +18,7 @@ IUSE="test" RESTRICT="!test? ( test )" RDEPEND=" - $(python_gen_cond_dep 'dev-python/scandir[${PYTHON_USEDEP}]' -2 python3_4 ) + $(python_gen_cond_dep 'dev-python/scandir[${PYTHON_USEDEP}]' -2 ) dev-python/six[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] diff --git a/dev-python/pathlib2/pathlib2-2.3.2.ebuild b/dev-python/pathlib2/pathlib2-2.3.2.ebuild index 0e6a8414053..6ed4c6a561a 100644 --- a/dev-python/pathlib2/pathlib2-2.3.2.ebuild +++ b/dev-python/pathlib2/pathlib2-2.3.2.ebuild @@ -18,7 +18,7 @@ IUSE="test" RESTRICT="!test? ( test )" RDEPEND=" - $(python_gen_cond_dep 'dev-python/scandir[${PYTHON_USEDEP}]' -2 python3_4 ) + $(python_gen_cond_dep 'dev-python/scandir[${PYTHON_USEDEP}]' -2 ) dev-python/six[${PYTHON_USEDEP}] " BDEPEND=" diff --git a/dev-python/pbr/pbr-3.1.1.ebuild b/dev-python/pbr/pbr-3.1.1.ebuild index cb1f21eeb7b..e06a16813f6 100644 --- a/dev-python/pbr/pbr-3.1.1.ebuild +++ b/dev-python/pbr/pbr-3.1.1.ebuild @@ -28,8 +28,8 @@ DEPEND=" >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.5.1[$(python_gen_usedep 'python2_7' 'python3_4' 'python3_5' 'python3_6')] - !~dev-python/sphinx-1.6.1[$(python_gen_usedep 'python2_7' 'python3_4' 'python3_5' 'python3_6')] + >=dev-python/sphinx-1.5.1[$(python_gen_usedep 'python2_7' 'python3_5' 'python3_6')] + !~dev-python/sphinx-1.6.1[$(python_gen_usedep 'python2_7' 'python3_5' 'python3_6')] >=dev-python/six-1.9.0[${PYTHON_USEDEP}] >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}] diff --git a/dev-python/pbr/pbr-4.2.0-r1.ebuild b/dev-python/pbr/pbr-4.2.0-r1.ebuild index 9fe5cc4031b..c90343e05e0 100644 --- a/dev-python/pbr/pbr-4.2.0-r1.ebuild +++ b/dev-python/pbr/pbr-4.2.0-r1.ebuild @@ -35,7 +35,7 @@ DEPEND=" >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}] >=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}] - >=dev-python/stestr-2.1.0[$(python_gen_usedep python{2_7,3_4,3_5,3_6})] + >=dev-python/stestr-2.1.0[$(python_gen_usedep python{2_7,3_5,3_6})] dev-python/wheel[${PYTHON_USEDEP}] dev-vcs/git )" diff --git a/dev-python/pbr/pbr-4.2.0-r2.ebuild b/dev-python/pbr/pbr-4.2.0-r2.ebuild index 459ba62ee9e..ee6079aeb1c 100644 --- a/dev-python/pbr/pbr-4.2.0-r2.ebuild +++ b/dev-python/pbr/pbr-4.2.0-r2.ebuild @@ -35,7 +35,7 @@ DEPEND=" >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}] >=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}] - >=dev-python/stestr-2.1.0[$(python_gen_usedep python{2_7,3_4,3_5,3_6})] + >=dev-python/stestr-2.1.0[$(python_gen_usedep python{2_7,3_5,3_6})] dev-python/sphinx[${PYTHON_USEDEP}] dev-python/wheel[${PYTHON_USEDEP}] dev-vcs/git diff --git a/dev-python/pbr/pbr-5.1.1.ebuild b/dev-python/pbr/pbr-5.1.1.ebuild index 882b9376350..6b887279b33 100644 --- a/dev-python/pbr/pbr-5.1.1.ebuild +++ b/dev-python/pbr/pbr-5.1.1.ebuild @@ -36,7 +36,7 @@ DEPEND=" >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}] >=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}] - >=dev-python/stestr-2.1.0[$(python_gen_usedep python{2_7,3_4,3_5,3_6})] + >=dev-python/stestr-2.1.0[$(python_gen_usedep python{2_7,3_5,3_6})] >=dev-python/coverage-4.0[${PYTHON_USEDEP}] !~dev-python/coverage-4.4[${PYTHON_USEDEP}] dev-python/sphinx[${PYTHON_USEDEP}] diff --git a/dev-python/pytest/pytest-3.10.1.ebuild b/dev-python/pytest/pytest-3.10.1.ebuild index 2e608334790..1c3d5839d66 100644 --- a/dev-python/pytest/pytest-3.10.1.ebuild +++ b/dev-python/pytest/pytest-3.10.1.ebuild @@ -26,8 +26,8 @@ RDEPEND=" >=dev-python/attrs-17.4.0[${PYTHON_USEDEP}] $(python_gen_cond_dep '>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python2_7 ) $(python_gen_cond_dep '<dev-python/more-itertools-6.0.0[${PYTHON_USEDEP}]' python2_7 ) - $(python_gen_cond_dep '>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python3_{4,5,6,7} pypy{,3} ) - $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_{4,5} ) + $(python_gen_cond_dep '>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python3_{5,6,7} pypy{,3} ) + $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_5 ) >=dev-python/pluggy-0.7[${PYTHON_USEDEP}] >=dev-python/py-${PY_VER}[${PYTHON_USEDEP}] >=dev-python/setuptools-40[${PYTHON_USEDEP}] diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild index 4b62a6bae63..2b49051b9e2 100644 --- a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild +++ b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild @@ -7,9 +7,10 @@ PYTHON_COMPAT=( python3_{5,6} ) inherit distutils-r1 vcs-snapshot +MY_PN="${PN//-/.}" + DESCRIPTION="Ruamel enhancements to pathlib and pathlib2" HOMEPAGE="https://pypi.org/project/ruamel.std.pathlib/ https://bitbucket.org/ruamel/std.pathlib"; -MY_PN="${PN//-/.}" SRC_URI="https://bitbucket.org/${MY_PN/.//}/get/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" @@ -17,10 +18,7 @@ SLOT="0" KEYWORDS="amd64 ~arm64 ~x86" IUSE="test" -RDEPEND=" - ${PYTHON_DEPS} - $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python3_4) -" +RDEPEND="" DEPEND=" ${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] @@ -30,11 +28,11 @@ DEPEND=" ) " +python_test() { + py.test -v _test/test_*.py || die +} + python_install() { distutils-r1_python_install --single-version-externally-managed find "${ED}" -name '*.pth' -delete || die } - -python_test() { - py.test -v _test/test_*.py || die -} diff --git a/dev-python/twine/twine-1.11.0.ebuild b/dev-python/twine/twine-1.11.0.ebuild index 2cc35ad16d9..57447fb1ddf 100644 --- a/dev-python/twine/twine-1.11.0.ebuild +++ b/dev-python/twine/twine-1.11.0.ebuild @@ -30,7 +30,7 @@ RDEPEND="${CDEPEND} >=dev-python/pkginfo-1.4.2[${PYTHON_USEDEP}] >=dev-python/requests-2.5.0[${PYTHON_USEDEP}] >=dev-python/requests-toolbelt-0.8.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5}) + $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5}) " PATCHES=( "${FILESDIR}"/${P}-tests.patch ) diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild index dbde38ea937..20b059fb7b2 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild @@ -4,7 +4,7 @@ EAPI=6 GNOME2_EAUTORECONF="yes" GNOME2_LA_PUNT="yes" -#PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # https://bugzilla.gnome.org/show_bug.cgi?id=783186 +#PYTHON_COMPAT=( python{2_7,3_5,3_6} ) # https://bugzilla.gnome.org/show_bug.cgi?id=783186 PYTHON_COMPAT=( python2_7 ) inherit gnome2 python-any-r1 systemd udev virtualx diff --git a/kde-apps/cantor/cantor-19.04.0.ebuild b/kde-apps/cantor/cantor-19.04.0.ebuild index e83ae8c5a6b..5066ab17098 100644 --- a/kde-apps/cantor/cantor-19.04.0.ebuild +++ b/kde-apps/cantor/cantor-19.04.0.ebuild @@ -6,7 +6,7 @@ EAPI=7 KDE_HANDBOOK="forceoptional" KDE_TEST="forceoptional" PYTHON_COMPAT=( python2_7 ) -# FIXME: PYTHON_COMPAT=( python{2_7,3_4,3_5} ) +# FIXME: PYTHON_COMPAT=( python{2_7,3_5} ) inherit kde5 python-r1 DESCRIPTION="Interface for doing mathematics and scientific computing" diff --git a/net-analyzer/netdata/netdata-1.14.0.ebuild b/net-analyzer/netdata/netdata-1.14.0.ebuild index fecaccd2aaa..59396a96cc0 100644 --- a/net-analyzer/netdata/netdata-1.14.0.ebuild +++ b/net-analyzer/netdata/netdata-1.14.0.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) inherit autotools fcaps linux-info python-r1 systemd user diff --git a/sys-apps/portage-mgorny/portage-mgorny-2.3.51.1.ebuild b/sys-apps/portage-mgorny/portage-mgorny-2.3.51.1.ebuild index d2a55f78bda..7c190529617 100644 --- a/sys-apps/portage-mgorny/portage-mgorny-2.3.51.1.ebuild +++ b/sys-apps/portage-mgorny/portage-mgorny-2.3.51.1.ebuild @@ -30,7 +30,7 @@ RDEPEND=" >=app-portage/gemato-10[${PYTHON_USEDEP}] app-shells/bash:0[readline] $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ - python{2_7,3_4,3_5} pypy) + python{2_7,3_5} pypy) >=dev-python/lxml-3.6.0[${PYTHON_USEDEP}] >=sys-apps/sed-4.0.5 ) diff --git a/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild b/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild index 4d27edc0d69..6c03fc1f54e 100644 --- a/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild +++ b/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild @@ -31,7 +31,7 @@ RDEPEND=" >=app-portage/gemato-10[${PYTHON_USEDEP}] app-shells/bash:0[readline] $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ - python{2_7,3_4,3_5} pypy) + python{2_7,3_5} pypy) >=dev-python/lxml-3.6.0[${PYTHON_USEDEP}] >=sys-apps/sed-4.0.5 ) diff --git a/sys-apps/portage/portage-2.3.62-r1.ebuild b/sys-apps/portage/portage-2.3.62-r1.ebuild index 1d174220087..6cf03c9e61e 100644 --- a/sys-apps/portage/portage-2.3.62-r1.ebuild +++ b/sys-apps/portage/portage-2.3.62-r1.ebuild @@ -5,7 +5,7 @@ EAPI=5 PYTHON_COMPAT=( pypy - python3_4 python3_5 python3_6 python3_7 + python3_5 python3_6 python3_7 python2_7 ) PYTHON_REQ_USE='bzip2(+),threads(+)' @@ -43,7 +43,7 @@ RDEPEND=" app-shells/bash:0[readline] >=app-admin/eselect-1.2 $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ - python{2_7,3_4,3_5} pypy) + python{2_7,3_5} pypy) rsync-verify? ( >=app-portage/gemato-14[${PYTHON_USEDEP}] >=app-crypt/openpgp-keys-gentoo-release-20180706 diff --git a/sys-apps/portage/portage-2.3.62.ebuild b/sys-apps/portage/portage-2.3.62.ebuild index a1ed9cc43b2..7f8f6880e6f 100644 --- a/sys-apps/portage/portage-2.3.62.ebuild +++ b/sys-apps/portage/portage-2.3.62.ebuild @@ -5,7 +5,7 @@ EAPI=5 PYTHON_COMPAT=( pypy - python3_4 python3_5 python3_6 python3_7 + python3_5 python3_6 python3_7 python2_7 ) PYTHON_REQ_USE='bzip2(+),threads(+)' @@ -43,7 +43,7 @@ RDEPEND=" app-shells/bash:0[readline] >=app-admin/eselect-1.2 $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ - python{2_7,3_4,3_5} pypy) + python{2_7,3_5} pypy) rsync-verify? ( >=app-portage/gemato-14[${PYTHON_USEDEP}] >=app-crypt/openpgp-keys-gentoo-release-20180706 diff --git a/sys-apps/portage/portage-2.3.63.ebuild b/sys-apps/portage/portage-2.3.63.ebuild index 1d174220087..6cf03c9e61e 100644 --- a/sys-apps/portage/portage-2.3.63.ebuild +++ b/sys-apps/portage/portage-2.3.63.ebuild @@ -5,7 +5,7 @@ EAPI=5 PYTHON_COMPAT=( pypy - python3_4 python3_5 python3_6 python3_7 + python3_5 python3_6 python3_7 python2_7 ) PYTHON_REQ_USE='bzip2(+),threads(+)' @@ -43,7 +43,7 @@ RDEPEND=" app-shells/bash:0[readline] >=app-admin/eselect-1.2 $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ - python{2_7,3_4,3_5} pypy) + python{2_7,3_5} pypy) rsync-verify? ( >=app-portage/gemato-14[${PYTHON_USEDEP}] >=app-crypt/openpgp-keys-gentoo-release-20180706 diff --git a/sys-apps/portage/portage-2.3.64.ebuild b/sys-apps/portage/portage-2.3.64.ebuild index a2c63d7c6ef..e014d9402bb 100644 --- a/sys-apps/portage/portage-2.3.64.ebuild +++ b/sys-apps/portage/portage-2.3.64.ebuild @@ -5,7 +5,7 @@ EAPI=5 PYTHON_COMPAT=( pypy - python3_4 python3_5 python3_6 python3_7 + python3_5 python3_6 python3_7 python2_7 ) PYTHON_REQ_USE='bzip2(+),threads(+)' @@ -43,7 +43,7 @@ RDEPEND=" app-shells/bash:0[readline] >=app-admin/eselect-1.2 $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ - python{2_7,3_4,3_5} pypy) + python{2_7,3_5} pypy) rsync-verify? ( >=app-portage/gemato-14[${PYTHON_USEDEP}] >=app-crypt/openpgp-keys-gentoo-release-20180706 diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index 5ac144404c9..9950d305dc6 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -5,7 +5,7 @@ EAPI=6 PYTHON_COMPAT=( pypy - python3_4 python3_5 python3_6 python3_7 + python3_5 python3_6 python3_7 python2_7 ) PYTHON_REQ_USE='bzip2(+),threads(+)' @@ -43,7 +43,7 @@ RDEPEND=" app-shells/bash:0[readline] >=app-admin/eselect-1.2 $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ - python{2_7,3_4,3_5} pypy) + python{2_7,3_5} pypy) rsync-verify? ( >=app-portage/gemato-14[${PYTHON_USEDEP}] >=app-crypt/openpgp-keys-gentoo-release-20180706 diff --git a/virtual/python-funcsigs/python-funcsigs-2.ebuild b/virtual/python-funcsigs/python-funcsigs-2.ebuild index d9cd1ccbf4e..0ce85c8961e 100644 --- a/virtual/python-funcsigs/python-funcsigs-2.ebuild +++ b/virtual/python-funcsigs/python-funcsigs-2.ebuild @@ -14,4 +14,4 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" ${PYTHON_DEPS} - $(python_gen_cond_dep '>=dev-python/funcsigs-1[${PYTHON_USEDEP}]' python2_7 python3_{3,4,5} pypy{,3} )" + $(python_gen_cond_dep '>=dev-python/funcsigs-1[${PYTHON_USEDEP}]' python2_7 python3_5 pypy{,3} )" diff --git a/virtual/python-typing/python-typing-0-r1.ebuild b/virtual/python-typing/python-typing-0-r1.ebuild index 3e39057dd47..b0aea9d1141 100644 --- a/virtual/python-typing/python-typing-0-r1.ebuild +++ b/virtual/python-typing/python-typing-0-r1.ebuild @@ -14,4 +14,4 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} $(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' \ - 'python2*' python3_4 pypy)" + 'python2*' pypy)" diff --git a/www-servers/tornado/tornado-4.4.2-r1.ebuild b/www-servers/tornado/tornado-4.4.2-r1.ebuild index 2741861d9ff..3d603a22ae1 100644 --- a/www-servers/tornado/tornado-4.4.2-r1.ebuild +++ b/www-servers/tornado/tornado-4.4.2-r1.ebuild @@ -20,7 +20,7 @@ IUSE="doc examples test" CDEPEND=" dev-python/certifi[${PYTHON_USEDEP}] >=dev-python/pycurl-7.19.3.1[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4') + $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7') || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] ( $(python_gen_cond_dep 'dev-python/twisted-names[${PYTHON_USEDEP}]' 'python2_7') @@ -63,6 +63,6 @@ python_install_all() { insinto /usr/share/doc/${PF}/examples doins -r demos/. docompress -x /usr/share/doc/${PF}/examples -fi + fi distutils-r1_python_install_all } diff --git a/www-servers/tornado/tornado-4.5.1.ebuild b/www-servers/tornado/tornado-4.5.1.ebuild index aefbc12b140..43da253ccc0 100644 --- a/www-servers/tornado/tornado-4.5.1.ebuild +++ b/www-servers/tornado/tornado-4.5.1.ebuild @@ -20,7 +20,7 @@ IUSE="doc examples test" CDEPEND=" dev-python/certifi[${PYTHON_USEDEP}] >=dev-python/pycurl-7.19.3.1[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4') + $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7') || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] ( $(python_gen_cond_dep 'dev-python/twisted-names[${PYTHON_USEDEP}]' 'python2_7') @@ -63,6 +63,6 @@ python_install_all() { insinto /usr/share/doc/${PF}/examples doins -r demos/. docompress -x /usr/share/doc/${PF}/examples -fi + fi distutils-r1_python_install_all } diff --git a/www-servers/tornado/tornado-4.5.3.ebuild b/www-servers/tornado/tornado-4.5.3.ebuild index 498538e4c2e..b7cc6d4b6ee 100644 --- a/www-servers/tornado/tornado-4.5.3.ebuild +++ b/www-servers/tornado/tornado-4.5.3.ebuild @@ -20,7 +20,7 @@ IUSE="doc examples test" CDEPEND=" dev-python/certifi[${PYTHON_USEDEP}] >=dev-python/pycurl-7.19.3.1[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4') + $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7') || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] ( $(python_gen_cond_dep 'dev-python/twisted-names[${PYTHON_USEDEP}]' 'python2_7') @@ -63,6 +63,6 @@ python_install_all() { insinto /usr/share/doc/${PF}/examples doins -r demos/. docompress -x /usr/share/doc/${PF}/examples -fi + fi distutils-r1_python_install_all } diff --git a/www-servers/tornado/tornado-5.0.2.ebuild b/www-servers/tornado/tornado-5.0.2.ebuild index 535ce10119e..069b29f2dc0 100644 --- a/www-servers/tornado/tornado-5.0.2.ebuild +++ b/www-servers/tornado/tornado-5.0.2.ebuild @@ -62,6 +62,6 @@ python_install_all() { insinto /usr/share/doc/${PF}/examples doins -r demos/. docompress -x /usr/share/doc/${PF}/examples -fi + fi distutils-r1_python_install_all } diff --git a/www-servers/tornado/tornado-5.1.ebuild b/www-servers/tornado/tornado-5.1.ebuild index 5adb012454c..86ab2f2853a 100644 --- a/www-servers/tornado/tornado-5.1.ebuild +++ b/www-servers/tornado/tornado-5.1.ebuild @@ -57,6 +57,6 @@ python_install_all() { insinto /usr/share/doc/${PF}/examples doins -r demos/. docompress -x /usr/share/doc/${PF}/examples -fi + fi distutils-r1_python_install_all }
