From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BFCF6138359 for ; Sat, 24 Oct 2020 13:21:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE8ECE0924; Sat, 24 Oct 2020 13:21:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B65C8E0924 for ; Sat, 24 Oct 2020 13:21:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 55887340D54 for ; Sat, 24 Oct 2020 13:21:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ADEA53A9 for ; Sat, 24 Oct 2020 13:21:03 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1603545646.ffeeb13bfdcbdcd33023998e0491998d1381e8f9.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/netkit-rsh/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild X-VCS-Directories: net-misc/netkit-rsh/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: ffeeb13bfdcbdcd33023998e0491998d1381e8f9 X-VCS-Branch: master Date: Sat, 24 Oct 2020 13:21:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e9e7e760-316f-466e-a65e-fda48d3bc276 X-Archives-Hash: 7c4471d1fd0440b9543b5e3ec0efbc71 commit: ffeeb13bfdcbdcd33023998e0491998d1381e8f9 Author: David Seifert gentoo org> AuthorDate: Sat Oct 24 13:20:46 2020 +0000 Commit: David Seifert gentoo 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 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 }