From 702db76345b0e33dd7cf50b8994b3850b1aa8b4e Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Fri, 26 Feb 2016 09:36:52 +0100 Subject: dev-python/paramiko: Fix broken whitespacing in version declaration of deps * Add live version Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=575664 Package-Manager: portage-2.2.27 Signed-off-by: Justin Lecher --- .../files/paramiko-1.16.0-install_requires.patch | 18 ++++++++++ dev-python/paramiko/paramiko-1.16.0.ebuild | 6 +++- dev-python/paramiko/paramiko-9999.ebuild | 41 ++++++++++++++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 dev-python/paramiko/files/paramiko-1.16.0-install_requires.patch create mode 100644 dev-python/paramiko/paramiko-9999.ebuild diff --git a/dev-python/paramiko/files/paramiko-1.16.0-install_requires.patch b/dev-python/paramiko/files/paramiko-1.16.0-install_requires.patch new file mode 100644 index 000000000000..fde5e11b19e5 --- /dev/null +++ b/dev-python/paramiko/files/paramiko-1.16.0-install_requires.patch @@ -0,0 +1,18 @@ + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 629c28f..e987dc6 100644 +--- a/setup.py ++++ b/setup.py +@@ -41,8 +41,8 @@ try: + from setuptools import setup + kw = { + 'install_requires': [ +- 'pycrypto >= 2.1, != 2.4', +- 'ecdsa >= 0.11', ++ 'pycrypto >=2.1,!=2.4', ++ 'ecdsa >=0.11', + ], + } + except ImportError: diff --git a/dev-python/paramiko/paramiko-1.16.0.ebuild b/dev-python/paramiko/paramiko-1.16.0.ebuild index fa68870f3230..218aaba7e66a 100644 --- a/dev-python/paramiko/paramiko-1.16.0.ebuild +++ b/dev-python/paramiko/paramiko-1.16.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -28,6 +28,10 @@ DEPEND="${RDEPEND} # Required for testsuite DISTUTILS_IN_SOURCE_BUILD=1 +PATCHES=( + "${FILESDIR}"/${P}-install_requires.patch +) + python_test() { "${PYTHON}" test.py --verbose || die "Tests fail with ${EPYTHON}" } diff --git a/dev-python/paramiko/paramiko-9999.ebuild b/dev-python/paramiko/paramiko-9999.ebuild new file mode 100644 index 000000000000..0048727d1c5e --- /dev/null +++ b/dev-python/paramiko/paramiko-9999.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 git-r3 + +DESCRIPTION="SSH2 protocol library" +HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko/" +SRC_URI="" +EGIT_REPO_URI="https://github.com/paramiko/paramiko.git" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="" +IUSE="doc examples" + +RDEPEND=" + >=dev-python/pycrypto-2.1[${PYTHON_USEDEP}] + !=dev-python/pycrypto-2.4[${PYTHON_USEDEP}] + >=dev-python/ecdsa-0.11[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" + +# Required for testsuite +DISTUTILS_IN_SOURCE_BUILD=1 + +python_test() { + "${PYTHON}" test.py --verbose || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + use doc && local HTML_DOCS=( docs/. ) + use examples && dodoc -r demos + + distutils-r1_python_install_all +} -- cgit v1.2.3-65-gdbad