diff options
| author |   Tom Wijsman <tomwij@gentoo.org> | 2013-03-24 12:54:41 +0000 |
|---|---|---|
| committer | Tom Wijsman <tomwij@gentoo.org> | 2013-03-24 12:54:41 +0000 |
| commit | 28bd61eaf9ddc11a44e820c26101cfc78b1c68fa (patch) | |
| tree | 5684507e0504a6c46d6870ed4b9fe3d9ab686f02 /net-proxy | |
| parent | udev no longer creates device nodes (diff) | |
| download | gentoo-2-28bd61eaf9ddc11a44e820c26101cfc78b1c68fa.tar.gz gentoo-2-28bd61eaf9ddc11a44e820c26101cfc78b1c68fa.tar.bz2 gentoo-2-28bd61eaf9ddc11a44e820c26101cfc78b1c68fa.zip | |
EAPI 5. Removed paramiko version check, fixes bug #453786 reported by flameeyes.
(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Diffstat (limited to 'net-proxy')
| -rw-r--r-- | net-proxy/sshproxy/ChangeLog | 9 | ||||
| -rw-r--r-- | net-proxy/sshproxy/sshproxy-0.6.0_beta2-r1.ebuild | 15 |
2 files changed, 15 insertions, 9 deletions
diff --git a/net-proxy/sshproxy/ChangeLog b/net-proxy/sshproxy/ChangeLog index e4a5e84b1534..572bbc06472a 100644 --- a/net-proxy/sshproxy/ChangeLog +++ b/net-proxy/sshproxy/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-proxy/sshproxy -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/sshproxy/ChangeLog,v 1.15 2011/04/05 21:46:43 arfrever Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/sshproxy/ChangeLog,v 1.16 2013/03/24 12:54:41 tomwij Exp $ + + 24 Mar 2013; Tom Wijsman <TomWij@gentoo.org> sshproxy-0.6.0_beta2-r1.ebuild: + EAPI 5. Removed paramiko version check, fixes bug #453786 reported by + flameeyes. 05 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> sshproxy-0.6.0_beta2-r1.ebuild: @@ -76,4 +80,3 @@ +metadata.xml, +sshproxy-0.4.2.ebuild: Initial import from bug #138058, thanks to David Guerizec <david@guerizec.net> which is also the author of sshproxy. - diff --git a/net-proxy/sshproxy/sshproxy-0.6.0_beta2-r1.ebuild b/net-proxy/sshproxy/sshproxy-0.6.0_beta2-r1.ebuild index ebab2bcef866..f4246022c62f 100644 --- a/net-proxy/sshproxy/sshproxy-0.6.0_beta2-r1.ebuild +++ b/net-proxy/sshproxy/sshproxy-0.6.0_beta2-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/sshproxy/sshproxy-0.6.0_beta2-r1.ebuild,v 1.4 2011/04/05 21:46:43 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/sshproxy/sshproxy-0.6.0_beta2-r1.ebuild,v 1.5 2013/03/24 12:54:41 tomwij Exp $ -EAPI="3" +EAPI="5" PYTHON_DEPEND="2" inherit distutils eutils @@ -21,7 +21,7 @@ IUSE="client-only mysql minimal" # client-only: install only the client wrappers DEPEND="!client-only? ( - >=dev-python/paramiko-1.6.2 + >=dev-python/paramiko-1.6.3 mysql? ( >=dev-python/mysql-python-1.2.0 ) )" RDEPEND="${DEPEND} @@ -46,11 +46,14 @@ src_prepare() { mv doc/pssh.1 doc/spssh.1 || die "failed to rename pscp or pssh files" ewarn "For avoiding conflicts with net-misc/putty and net-misc/pssh," ewarn "pscp and pssh scripts have been renamed as spscp respectively spssh." + + sed -i -e 's/if paramiko.__version_info__ < (1, 6, 3):/if False:/g' "${S}"/sshproxy/__init__.py || die 'Sed failed.' } src_install () { - dobin bin/spssh dobin bin/spscp + dobin bin/spssh + if ! use client-only; then distutils_src_install @@ -105,7 +108,7 @@ src_install () { else rm -rf "${D}/usr/lib/sshproxy/mysql_db" sed -i -e 's/[ \t]\+mysql//' \ - "${D}/etc/init.d/sshproxyd" + "${D}/etc/init.d/sshproxyd" || die 'Sed failed.' fi fi } |