gentoo resync : 25.11.2020

2 files changed, 19 insertions, 21 deletions

diff --git a/net-misc/netkit-rsh/Manifest b/net-misc/netkit-rsh/Manifest
index ffd350c2675c..f478c8774ef4 100644
--- a/net-misc/netkit-rsh/Manifest
+++ b/net-misc/netkit-rsh/Manifest
@@ -7,5 +7,5 @@ AUX rsh.xinetd 279 BLAKE2B db403023417d537fb944c677553f71e782d80dfe08dc5f9388156
 DIST netkit-rsh-0.17-patches-3.tar.lzma 13875 BLAKE2B 80470c4a9fdbfebd351217e48ec178c1d2c58e49f454eadd514ed76e3653fde1d21cd19f7a3400762e6fb4d4bb2f9cfefebbf042ef5bf1903d67ebbe17254515 SHA512 0d9c6a8a8d13264b8f2eb6b62e6c65b67cf8b09bd36043acae405c7b2154724733db15d653e4f7ac7d21feebcfa6cd365ca89993fc77eabc5a709d7a6383b187
 DIST netkit-rsh-0.17.tar.gz 58268 BLAKE2B 7790a91f95c51f4aa538ad614e65ecba5a565e4761c7d8167f4d175bb8bcc27cb48b569f93064285dad983e602f03bcb816da58b02b54290adcd9cabe73cd88e SHA512 0d8da4a779da137f7b3f158ad010b71f2357c86a2160dbd19331cbf45f86a46110cdfdfd3c4ba2d19ddf3634917bf981eb91bfde02c3cdbc946df8695db75218
 DIST rexec-1.5.tar.gz 18469 BLAKE2B cbb694520332a0768b8337e854baf232271a30ac328dcf4b8b16d28dc3710ad58173e135cb9eb9726b07709bcd78ef627cea550c98e00dc86bea7c64e52aa3d1 SHA512 7ed455a921ad71749154bd8e586ac2a624f357b56be17db73b9ed7c1ca1bc19cfb9aee748f79cc649184dfb535ffe5e887643b73a25c3fb6520d4e19fae7333a
-EBUILD netkit-rsh-0.17-r10.ebuild 1758 BLAKE2B 98376fc94edca1888267ce9a94c1b2d4a175fb2aa91f853f3c625004b5a801f37bae804ca40643588dc5aee731c1acb72196e099297a844d45926fbeea749c93 SHA512 ca727808d05be4ff1dc04bbfaf895cd38a96126bb247c698f0eec3de9aaa77a73a0d8d5f5a03de558e4837c4518caa299d400fb8868500150fa5e9e4cd81da6a
+EBUILD netkit-rsh-0.17-r10.ebuild 1725 BLAKE2B 7317968ab5b1aa667b0415938a600cf6dee2a85757eb8af146f5116bd9b8915b3a41ece7d2b6ad517e9824ab080de469954e76beca80f3203b78197898dcdb6e SHA512 d799b685f0e09de5ad017b42add240a6886327a9aecd7ab562f5b490f1ca11f9064f40f370ccbd79865b3b11fbc31925521b16d18f100e344cc90ed533ac55f7
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild
index ca08fdef4cd7..673104c20ba8 100644
--- a/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild
+++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils pam toolchain-funcs fcaps
+inherit pam toolchain-funcs fcaps
 
 PATCHVER="3"
+
 DESCRIPTION="Netkit's Remote Shell Suite: rexec{,d} rlogin{,d} rsh{,d}"
 HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
 SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz
@@ -17,29 +18,24 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="pam"
 
-RDEPEND=">=sys-libs/ncurses-5.2
+RDEPEND="
+	sys-libs/ncurses:0
 	pam? ( >=sys-auth/pambase-20080219.1 )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-FILECAPS=(
-	cap_net_bind_service usr/bin/r{cp,login,sh}
-)
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/xz-utils"
 
-src_unpack() {
-	default
-
-	cd "${S}"
-	rm -rf rexec
-	mv ../rexec rexec
-}
+FILECAPS=( cap_net_bind_service usr/bin/r{cp,login,sh} )
 
 src_prepare() {
-	[[ -n ${PATCHVER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
+	rm -r rexec || die
+	mv ../rexec rexec || die
+
+	[[ -n ${PATCHVER} ]] && eapply "${WORKDIR}"/patch
+	eapply_user
 
 	if tc-is-cross-compiler ; then
 		# Can't do runtime tests when cross-compiling
-		sed -i -e "s|./__conftest|: ./__conftest|" configure
+		sed -i -e "s|./__conftest|: ./__conftest|" configure || die
 	fi
 }
 
@@ -55,8 +51,9 @@ src_configure() {
 }
 
 src_install() {
-	local b exe
 	insinto /etc/xinetd.d
+
+	local b
 	for b in rcp rexec{,d} rlogin{,d} rsh{,d} ; do
 		if [[ ${b} == *d ]] ; then
 			dosbin ${b}/${b}
@@ -65,12 +62,13 @@ src_install() {
 		else
 			dobin ${b}/${b}
 			doman ${b}/${b}.1
-			if [[ ${b} != "rcp" ]]; then
+			if [[ ${b} != rcp ]]; then
 				newins "${FILESDIR}"/${b}.xinetd ${b}
 				newpamd "${FILESDIR}/${b}.pamd-pambase" ${b}
 			fi
 		fi
 	done
+
 	dodoc README ChangeLog BUGS
 	newdoc rexec/README README.rexec
 }