Port to distutils-r1. Thanks to Ian Delaney <idella4@gentoo.org> for the patch. Fixes...

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x5D21B852895192F9

diff --git a/net-misc/pssh/ChangeLog b/net-misc/pssh/ChangeLog
index 00cc53b8394e38809a28c4c2d5053cf94825c2bd..339d43d4c4a49835dcaf8bc98c7bba508b44d4ba 100644 (file)
--- a/net-misc/pssh/ChangeLog
+++ b/net-misc/pssh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/pssh
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pssh/ChangeLog,v 1.8 2014/08/10 20:46:29 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pssh/ChangeLog,v 1.9 2015/03/08 20:18:06 xarthisius Exp $
+
+  08 Mar 2015; Kacper Kowalik <xarthisius@gentoo.org> -pssh-2.2.2.ebuild,
+  pssh-2.3.1.ebuild:
+  Port to distutils-r1. Thanks to Ian Delaney <idella4@gentoo.org> for the
+  patch. Fixes bug #542438. Drop old
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> pssh-2.1.1.ebuild,
   pssh-2.2.2.ebuild:

diff --git a/net-misc/pssh/Manifest b/net-misc/pssh/Manifest
index fdce8266c317f0dc6146c72bc507f3f362daafd2..8437a484f2df9b88fa0a3b1f307ccf34befafe2b 100644 (file)
--- a/net-misc/pssh/Manifest
+++ b/net-misc/pssh/Manifest
@@ -2,17 +2,25 @@
 Hash: SHA256
 
 DIST pssh-2.1.1.tar.gz 18366 SHA256 63c317f114abae8c29c8f8e99f329d2b4dc36790a4821aeb4ee924da58100ca2
-DIST pssh-2.2.2.tar.gz 21440 SHA256 9b2e7fa6ee1185d668ddb0e049a9f6f8a7bc07738c341c43be674fea6109a97a SHA512 22125988898bd93ae46588743540425f861921f4ef4e4884a88977074dc93fae9373384b8391ee0e11bb9bf1b528d1de52991d7946c28e9c8220fdbadf778616 WHIRLPOOL b446f4e05527f78f14ba10f540274990a3775964ad34c7cd58fda497c88c4b9b3e55163d94159b8ef8e0b28a551b7db1fb5dcd13e9b801b65cf916475db60bc5
 DIST pssh-2.3.1.tar.gz 23427 SHA256 539f8d8363b722712310f3296f189d1ae8c690898eca93627fc89a9cb311f6b4 SHA512 c39e1c2b0a3bc2bd736f1e7d2f402db6a128e81d6a80ce7e97f39e7fae93f7a20037b43b5725bed5ba911f54e36a9b65c509d858a53c696989b76b1322e7680f WHIRLPOOL ff5eb7c2d11b47d74793f44acc9091cc3f0707b7a70a1d0d4074d2d19a4d0cebe381b30d211a140ff9ebfa90f1cee566f0b9c42a354fef9a4f2099e5c1aee7c7
 EBUILD pssh-2.1.1.ebuild 705 SHA256 d82d8a56bb7c360a071e023e9619bea4e285d7b746d8a4c4e92ae3af859d1eb0 SHA512 69df079ef07cfe466c378dc1a8adaf90e783e22452770ace89be0331528453123aee3fde624ea11fb8aac78a2d9d69c392b86183a04f1c5d11747cd0a7594086 WHIRLPOOL 0bc9bf05189f5af5744e9ee703dcd5181ea4af2b67bd8ccb8e1eba4d019f4506fd6ff98fa6457f0c50c2c6ba3722a18ecde3ea729faebd6a4798e4c87b063439
-EBUILD pssh-2.2.2.ebuild 778 SHA256 331abf2b32965b95fdf84e12f631834e3f5e567216b51e4d80df1222285d8355 SHA512 799803bbd50312dc50efa9265a4b6d5b3959fc7a03d436c836d55bfc88c336853e45db0877d52db02d90ed607199436b55708beca1397c48078b0ea7530e946e WHIRLPOOL 031e3366380e201c55d3d7907cbf12052d0565f4a1155ccfd5d4165513f56aee037abfb6fdf88f7d923f479c7f02e287c7662fea0f66d67c9bf668d6c687a146
-EBUILD pssh-2.3.1.ebuild 798 SHA256 14c41c15d96607543e52f39edc376841b42fd228d385467adacfb4d23415a905 SHA512 44868669f9e1afa08a545c345db1bfbceeff110c9a35faf8dbdc335e196b6e571847c985f113461091435dd0368235a4260c73aa2fa23a2bebca02011942dd4d WHIRLPOOL 9ec9d2505938d9860e5f09a642c03c2479187b7a1b078e2f8abcafe03188dd14d8cc5b7dc123dcd59ea0b59a0199239c3ed1ee056902a5ec0f0a08719788ce68
-MISC ChangeLog 3315 SHA256 afd97c2c855931eb9d111d133c8378646c50430772e2c569b964e3f64d017898 SHA512 1589d2fbd377a9334d147113ee5c78fcdaf8f2efff7f6fac39cb8e0c75c1678f13a594350c51f5b6a0dfd6d7c5b5feb80788d005470fa3b885d1dcd1f114e0e8 WHIRLPOOL 867bfc43dc20b209114f27a95bd9f5e760060772c9b8fcf362f9e01ca8f83210f9f28b851d6201ec0f0cdad8d27d0cd2d0e4bcd56e4f3f57b0aa47b31bec916f
+EBUILD pssh-2.3.1.ebuild 894 SHA256 107b95e789356a76396c9eca800d8b4de2a5dae0f991bbb6c4505b2424d5177f SHA512 90864ca46fa3039c768c01dc12670e3d7607dcb0fd3c50e9842fd99aa149896c2974132e0cf7723e0e4c9d6d060fadcd24740d4aca5cac6ceeb16b92c3ea2eac WHIRLPOOL 8bab81d4ef828acea2f7ed17d4f9223cb62b04c553eb6830a8265cb68a469beb37e7f5679142a6fbea643b5f624ac4c6b6c42ecd89eb84727e604fb5a255f3c3
+MISC ChangeLog 3527 SHA256 712b10fe2bc8def756bca618e8aad9cd93f99e24a2f24f6c43976ff456ef38ee SHA512 df48a7661bb51c70db073ed50bedd99b4c8c9fbebd1e9843d33e5c4ac66511fb20a811825f7a122385908a9b044b62393e7b9308118c4a36d485005dab51161c WHIRLPOOL 9ceb39cc462ffc34446ed7bce3f533d12ac1169c1dcd7469034e958fec24928457ad63b214c96bce7e0e01195f41a3dc3386a7b4efd18331b202c7e3a28285a7
 MISC metadata.xml 243 SHA256 886add73597c1729daea359fb1960b6f576efdb2ea351c14a47ca1f9d794f2f7 SHA512 04d02e4bc18ba377149f752d3a452144882ffff65d604e8fbec3f535e803fd82ed207c39f42569068dab1b6049928eab96716128444db21fff4b2fda296aec99 WHIRLPOOL 11bd2ccf4ebfc7b4b0ece934c565f51044674f0e5c138e527761f62a207a3f236ff60264908501a3653daae6e21fd789b26b055b8337821254852cfeb67a7964
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn2iYACgkQcaHudmEf86oqjQCfWfYcgFqgFwseyNkRFGR/qZCC
-+20AoIGCMVY2Yetd8+Tam40yVZhPLXun
-=60P8
+iQIcBAEBCAAGBQJU/K6CAAoJEF0huFKJUZL5omQP/RgcCZlLhfJFbZNjci5xCPvP
+uZZ6mB3RF5mMaKYpaqaZde0Xp5PqmLvO9Kqk8dOpHSP1xYda19k5lWnt6ZJ0nTLu
+9o+zCkEhQEqACsQzNulT6mKxVwyc+gnwyICdHX6YZ3dlZdRs4BEgM+oqQF7GpGzF
+z/9w1e0v3a6ai9U6uL0Y5Nw0DUfVIKk5LpC+5dMAMv16Lep8nkNSEYd9BNkUsVED
+C2V3AuFFfyfMRZJuBrXPryNCrPWZkKTXb83je1zazFQkAYVEBwaZuedD8sNYYT/U
+rqhpusshQVt7CNFvSPXgUHiP9yFsXGEXLFRi05v0GT9+FC3XGdalJS3nL/Ciu6B9
+/goPbz4m8jRrtALndJ3GoEw65i8IPusWB+cFblITT4ozGqB9ciW/kqcPoVlVstD+
+zZw63VPV47PwunMawmva1qJUvBZxLsPaDyy0dIx+9clHXsbACtyAIaKtCsTBJ2v9
+Dnf7Pnr3NxbB5dGLlMkqaw/tIRqyciwjzrJMUa5Fn2nCNUN1LN5FZP0q0uG+Hdov
+E9ExtTIeWl7wnPMwCjH+lT9c/3Fpwe1+VNlFgENf7MqMJap7PiRIUsGKS8Fr0FBC
+0XdckDsCBly6rUwuYRytu6uBwnblelg5A/lQIDttj3cL1z+8woNCvQ31W8h7gX0+
+01B3K+nJNi37CqpmpU0w
+=fLUj
 -----END PGP SIGNATURE-----

diff --git a/net-misc/pssh/pssh-2.2.2.ebuild b/net-misc/pssh/pssh-2.2.2.ebuild
deleted file mode 100644 (file)
index a22f72e..0000000
--- a/net-misc/pssh/pssh-2.2.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pssh/pssh-2.2.2.ebuild,v 1.4 2014/08/10 20:46:29 slyfox Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*:2.5"
-inherit distutils
-
-DESCRIPTION="This package provides parallel versions of the openssh tools"
-HOMEPAGE="http://code.google.com/p/parallel-ssh/"
-SRC_URI="http://parallel-ssh.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="net-misc/openssh
-       !net-misc/putty"
-DEPEND="${RDEPEND}
-       dev-python/setuptools"
-
-# Requires ssh access to run.
-RESTRICT="test"
-
-PYTHON_MODNAME=psshlib
-
-src_prepare() {
-       sed -i -e "s|man/man1'|share/&|g" setup.py || die
-}

diff --git a/net-misc/pssh/pssh-2.3.1.ebuild b/net-misc/pssh/pssh-2.3.1.ebuild
index c9b552aabda78e0da99482be62a4ada8b1359cc1..5a3f66a5eece629fb375dc577d08d48b4ec14d9b 100644 (file)
--- a/net-misc/pssh/pssh-2.3.1.ebuild
+++ b/net-misc/pssh/pssh-2.3.1.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pssh/pssh-2.3.1.ebuild,v 1.1 2012/08/18 10:33:33 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pssh/pssh-2.3.1.ebuild,v 1.2 2015/03/08 20:18:06 xarthisius Exp $
 
-EAPI=4
+EAPI=5
 
-PYTHON_DEPEND="*:2.5"
-inherit distutils
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
 
 DESCRIPTION="PSSH provides parallel versions of OpenSSH and related tools"
 HOMEPAGE="http://code.google.com/p/parallel-ssh/"
@@ -19,14 +21,16 @@ IUSE=""
 RDEPEND="net-misc/openssh
        !net-misc/putty"
 DEPEND="${RDEPEND}
-       dev-python/setuptools"
+       dev-python/setuptools[${PYTHON_USEDEP}]"
 
 # Requires ssh access to run.
 RESTRICT="test"
 
-PYTHON_MODNAME=psshlib
+pkg_setup() {
+       python-single-r1_pkg_setup
+}
 
-src_prepare() {
+python_prepare_all() {
        sed -i -e "s|man/man1'|share/&|g" setup.py || die
-       distutils_src_prepare
+       distutils-r1_python_prepare_all
 }