gentoo resync : 31.05.2021

5 files changed, 5 insertions, 11 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index f3a0f5a6214d..185443f06a6e 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest
index d14672439b3a..131c93282b2a 100644
--- a/net-proxy/dante/Manifest
+++ b/net-proxy/dante/Manifest
@@ -12,5 +12,5 @@ AUX sockd.conf-with-libwrap.patch 870 BLAKE2B 8c56ab479f99f6dff61882c01842ef0780
 AUX sockd.conf-with-pam.patch 295 BLAKE2B f41c2109e21878d2b473c6cffb4fe845d59ac0478f5196f7ccdc42baafd674e0960169e3a9dbc4fedb4a27cb7df8bd0dfc255595a72c39185c7ffb177fb53da8 SHA512 78728605362360650e6a20869744fc941782b75d149c0835542faaad931104cb32dda56de77a7b4f9a4fa683053139c551bcf77607a047fb1be68b6da9388630
 AUX socks.conf 4185 BLAKE2B cb41b40e858c83d06bd5e199c4fc991e8dda0ee64d48fd94e52d6ef836e79d6a6f5f50b6dd55074e92b6f96f20db65922f53869f08506100ae8b59b722643cdd SHA512 d15ea77e20ad750f10285a42c9c6305cbed48313dea205139d8cf59fda4a4640bdd5c5bd2c295b32e0015b774d463f9ad34fa5a22fb188ae921dba1a533553eb
 DIST dante-1.4.1.tar.gz 1284288 BLAKE2B 34c78007245339088d79e0b969b8f55d20b0ee59d89c1bf19510b563799ac3c54c6b8b5f37bfb64410d60e893beb0e2d1d79893c0264b7481aeb4cdab2037e90 SHA512 1c8e2966ba68c8584fb99ff76ae1d9c8dfe669c7e5e61c7e6e7f87295d1280c3e7849491a6369ce27795040f951dcc11f4f2b3d7e46c54219594c89315d0487e
-EBUILD dante-1.4.1-r2.ebuild 2686 BLAKE2B 7245d4262f24cbff7d3f9aeefb7dcd6496a48dda4624cdb3d6a32cea497ad05add1ecbe5efb3525d0b8c77d2517510c6e1873a504c6307ddb3ac5ea6c8b9fc46 SHA512 50bc837c737e5a3421e3e3d25582a71e60310f9279d0e6f3a0a3b518b5d2507ca23c2cc554b3893f95f980eb8e1fea10aaa7621f646134857d2e3d0108e4407a
+EBUILD dante-1.4.1-r2.ebuild 2699 BLAKE2B d083d4cc911f7bac3a91bb85d9cd9742498d9edef176989f7ac9c24c3408641ff254057cc70f645d8f5610e04116b1e8d26fd7dc96d557289d3600e89ab4f1dd SHA512 710a899e63feb49c042acb9c8e9ac92b10d49a3e597a18c0991814ed01f6165e7961d9e0ec13e2dfc2554796a7a17ecee9112177c8113b4a6f24ef2fbd2a02e4
 MISC metadata.xml 212 BLAKE2B 3fa0112dac8ca387a2efccd5fcf038abfa26b67a2a512f3eb68491666f2ccb3fd63d1aa63044b0911aa6e5a8e856c762b3120045946afbf256611526d102558e SHA512 81dddbd7e6951957aa574cacaea6594ca44449251e028abd1a34e45e0b32dce1948c815478a65b4ed504364e4dd09f5a2c39d1f7019fc9b827a9ba28f52aca00
diff --git a/net-proxy/dante/dante-1.4.1-r2.ebuild b/net-proxy/dante/dante-1.4.1-r2.ebuild
index 268abe481b9b..24d8800d13f8 100644
--- a/net-proxy/dante/dante-1.4.1-r2.ebuild
+++ b/net-proxy/dante/dante-1.4.1-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools ltprune systemd user
+inherit autotools systemd user
 
 DESCRIPTION="A free socks4,5 and msproxy implementation"
 HOMEPAGE="https://www.inet.no/dante/"
@@ -94,7 +94,7 @@ src_install() {
 	docinto examples
 	dodoc example/*.conf
 
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/net-proxy/sshuttle/Manifest b/net-proxy/sshuttle/Manifest
index 61c87bdb04d0..39cd27125978 100644
--- a/net-proxy/sshuttle/Manifest
+++ b/net-proxy/sshuttle/Manifest
@@ -1,3 +1,3 @@
 DIST sshuttle-1.0.5.tar.gz 88823 BLAKE2B 6a68be71a92c8245e2e60df1f425c6959547f8c2b972bdafcd774449c3779698c2549f2c7a3575c102158962ef9dd2edaaecec564f36f7f5cc84ed3f53b3daa3 SHA512 a9ebc8f8cf5ccc351796c2eb5b224b5d76908d23a367b768fa4e7b9cd8517ee7ff9c232c92ed4332f46d02d890ad8114f8beaa66876a8c0d7d4850c18ff4c2b3
-EBUILD sshuttle-1.0.5.ebuild 1434 BLAKE2B 1f70bc54cb5c2878a1f44a71212574029489d5ed51e528661dc8167eb3576e75aa74c47ad5226618d6cccf68dc65beb61cae42e88ee95f54703b3ded58640380 SHA512 f1207795daec7aefeba582820ada6b02fa44f90839f470a0b9d3ef3462a44c5606f15b4a24b44f805ec639926ae58ead461c3587e991dbed46192f6cb9ec9d55
+EBUILD sshuttle-1.0.5.ebuild 1253 BLAKE2B 2556300176070698643690dd446d33e1ec75cf942eda7877c54784b6abe00a5b036f8104c0c9af92c87761832e66236b1e59f137d4ee7f3a644a2270f00f8032 SHA512 757666de1ee44cf30776f1ccd5c1abbdb18c046de85811d52b55e68bb9943b9ea0cd2f4b16c5f8a3396f30cc3326b71a6cb0eba78abfc92461a40b49ff0ebe24
 MISC metadata.xml 367 BLAKE2B e6db2a33d62c995db709010a0ebe2a50dc0307a1e9d7f5554d4a7e95f571b9323277bb7842394ddfda09f69b7d6f7cad44d31f6e3f233dbd488a951a225ea242 SHA512 cd75ae162e2d7142e3af61e9df65d5bb9f1b857ac299d5f05d7f1b2bf7adcf1b05fd55496ffbb4ed9579a3fab31f16295793a50c0475c75d6c7348d4c7794e9a
diff --git a/net-proxy/sshuttle/sshuttle-1.0.5.ebuild b/net-proxy/sshuttle/sshuttle-1.0.5.ebuild
index 5cc44739a206..06ad52f2a3b9 100644
--- a/net-proxy/sshuttle/sshuttle-1.0.5.ebuild
+++ b/net-proxy/sshuttle/sshuttle-1.0.5.ebuild
@@ -48,13 +48,7 @@ python_compile_all() {
 python_install_all() {
 	HTML_DOCS=( docs/_build/html/. )
 
-	# Sphinx 4.0 changed the layout for installed man pages
-	# https://bugs.gentoo.org/789417
-	if has_version '>=dev-python/sphinx-4.0.0' ; then
-		doman docs/_build/man/1/*
-	else
-		doman docs/_build/man/*
-	fi
+	doman docs/_build/man/*
 
 	distutils-r1_python_install_all
 }