[gentoo-commits] repo/gentoo:master commit in: net-misc/netkit-rsh/

[David Seifert]

commit:     ffeeb13bfdcbdcd33023998e0491998d1381e8f9
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 13:20:46 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 13:20:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffeeb13b

net-misc/netkit-rsh: Port to EAPI 7

Closes: https://bugs.gentoo.org/741456
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild | 38 ++++++++++++--------------
 1 file changed, 18 insertions(+), 20 deletions(-)

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 ca08fdef4cd..673104c20ba 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
 }