commit: 989574e5106581c9ad11d120b1fc47122101d2b1
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 16:24:42 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 16:24:42 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=989574e5
dev-python/paramiko: remove dupe RESTRICT= and fix examples
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
dev-python/paramiko/paramiko-2.4.2.ebuild | 8 +++-----
dev-python/paramiko/paramiko-2.6.0.ebuild | 4 ++--
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/dev-python/paramiko/paramiko-2.4.2.ebuild
b/dev-python/paramiko/paramiko-2.4.2.ebuild
index 654acfc5f1d..751e6e4b1f1 100644
--- a/dev-python/paramiko/paramiko-2.4.2.ebuild
+++ b/dev-python/paramiko/paramiko-2.4.2.ebuild
@@ -18,6 +18,7 @@ LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint
~sparc-solaris"
IUSE="doc examples server test"
+# Depends on pytest-relaxed which is broken
RESTRICT="!test? ( test )"
RDEPEND="
@@ -31,9 +32,6 @@ BDEPEND="
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
"
-# Depends on pytest-relaxed which is broken.
-RESTRICT="test"
-
src_prepare() {
if ! use server; then
eapply "${FILESDIR}/${PN}-2.4.2-disable-server.patch"
@@ -51,7 +49,7 @@ python_install_all() {
distutils-r1_python_install_all
if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins demos/*
+ docinto examples
+ dodoc -r demos/*
fi
}
diff --git a/dev-python/paramiko/paramiko-2.6.0.ebuild
b/dev-python/paramiko/paramiko-2.6.0.ebuild
index 4f8705b38fe..f10cbe2018e 100644
--- a/dev-python/paramiko/paramiko-2.6.0.ebuild
+++ b/dev-python/paramiko/paramiko-2.6.0.ebuild
@@ -59,7 +59,7 @@ python_install_all() {
distutils-r1_python_install_all
if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins demos/*
+ docinto examples
+ dodoc -r demos/*
fi
}