gentoo resync 08.09.2018

4 files changed, 4 insertions, 45 deletions

diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 3bfa101a48af..64f4126cd0a4 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,6 +1,5 @@
 DIST paramiko-2.1.2.tar.gz 1196746 BLAKE2B c184e171fe550fc231d67473867db283b706a93aebbd13ffb2503e10d69e43b9ab712237e6698fccae13472f0cb8135b6c015381ac687c4c20d4d1cb1620ae00 SHA512 465c5381b1b0a472d2ad8e690f0916a5f51713880486c7b94cadcf85ea0a52569e18337ccfee5440869e4a0c76bd2b1bc15c414128c07326b40ecd36ea021466
 DIST paramiko-2.4.1.tar.gz 285151 BLAKE2B 767c4ad11da77c5c6796165057715f318cab417c5bae72cd97b51af94ecbf233316fd4286e35b2f855027e05bcf195c869b45a87f66954bee3bb98ae9d0ef1a9 SHA512 5a580d25e7911937f228ef4a2b89b5a1efd771f576c6c68cf1c36e1abbc38adbc6ad5dc91400de7112238fcf7803f5f26c13fe10be4af8a2a86af9398da7a8de
-EBUILD paramiko-2.1.2.ebuild 1137 BLAKE2B 374effbff5f94803da9f7434196acfb2c03d97f77cc9ec86466db3fb4a500b4bfb7df827237f86bfecd8cb10fde1ec0cf6af817925b4c501c5810cc6c09f33eb SHA512 d4bb119212f37e5fb76613032fa36cfaf16db3fcf029cb12416e86d01a3fd2fb5e9153376373ff74115926dbfff744e8a9960b376dfc292c5e0f6b9ae8315f62
-EBUILD paramiko-2.4.1.ebuild 1522 BLAKE2B 7911299c48780acc09b1e857497108078566cb7c6dbf9d94687fc4e0c21f57422b0817467d46b4ff8732e76afef32858db583f35a35dacf3a755f903f7957ff7 SHA512 d59bf4ddb835fd09f259d1c8e734e5199b898130a0b25a8004ba22f456ed96517764fb919c3fc2d1c47bbd14c55638d476b60a50ce54926b30d5c0fe16e2574a
-EBUILD paramiko-9999.ebuild 969 BLAKE2B 22541133a12d81e8a3fb8c6a4826560dcca25801c860d1c598b0a4112ac58bc9f1c3f68a5d669c5fd559ce556e45e71d574f2d141a60bce299ea6d47257f89d8 SHA512 104606b66238ffa3bc6f7e7bfe2be89b3b618a84ea646c7d1bafbaa5f35e314a8524dee8c8233ec658dce266ed9067eb8c576254cd52fe5c5075f85edbac315f
+EBUILD paramiko-2.1.2.ebuild 1126 BLAKE2B b34574e42668a2ae2275ab09bf34207f1dcc81adf7576150060dd6d4c44b2e2682c79262861d14f85bb657d58a4e28e111c5a9701061922a2e7b235f5d269b4f SHA512 dcd0c120cf12e8d6927d772c569c92b0bd67738e6ce71fe7ef8f9bccfec9268e65f61e57f265635f129c9c1fbb8f3581c7d445251960c09c231ae6f74d2e07f6
+EBUILD paramiko-2.4.1.ebuild 1511 BLAKE2B efdf6865d253e622d1d987382581fb7caa20d0bc9f144899c49b184d2b9fb78eb1d43b9cd1b159eef6e41cd26fefcc9359ce5a21cab1fb9416ae8856a9260bbe SHA512 40a35eae3c02b09bdfd30f2fa21536f96ed28d42473639b2734a04b750d4497f16cdbd7320fb023a2146473d93395c03a50b314b57620c86b1e17b8aee2cfe68
 MISC metadata.xml 1236 BLAKE2B 5b1a6c8a5694722970f07206173fd1dec4a69d0be780ab408493c5c5ac96a058cd28ffcd3308390870244792b951e8fa76430fa3b2b081902e204055aadf4b2b SHA512 5cffe7297feb05b75be333fac0259655f6992baaa04248ccdb23f82790a0a807ecf328357207507a3b35944b7062d8a1aecb2daf5353d733646bb58d7a151529
diff --git a/dev-python/paramiko/paramiko-2.1.2.ebuild b/dev-python/paramiko/paramiko-2.1.2.ebuild
index 9e5b8f07f63b..0206b406c835 100644
--- a/dev-python/paramiko/paramiko-2.1.2.ebuild
+++ b/dev-python/paramiko/paramiko-2.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/paramiko/paramiko-2.4.1.ebuild b/dev-python/paramiko/paramiko-2.4.1.ebuild
index 842f76952d08..7460d9cfdd48 100644
--- a/dev-python/paramiko/paramiko-2.4.1.ebuild
+++ b/dev-python/paramiko/paramiko-2.4.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/paramiko/paramiko-9999.ebuild b/dev-python/paramiko/paramiko-9999.ebuild
deleted file mode 100644
index d1f4ddb6bd9c..000000000000
--- a/dev-python/paramiko/paramiko-9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-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.org/project/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
-}