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

[Mike Frysinger]

commit:     56962507dace3d8a5f32c250c72dfe11af2e1c82
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 12 15:55:34 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Aug 12 15:56:37 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56962507

net-misc/netkit-telnetd: update to EAPI=5

This way we can use subslots w/ncurses.

 .../netkit-telnetd/netkit-telnetd-0.17-r10.ebuild  | 45 ++++++++++++----------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild 
b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild
index a02cf27..7e7f7a2 100644
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+EAPI="5"
+
 inherit eutils toolchain-funcs
 
 PATCHLEVEL=36
@@ -21,15 +23,13 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-DEPEND=">=sys-libs/ncurses-5.2
+DEPEND=">=sys-libs/ncurses-5.2:=
        !net-misc/telnet-bsd"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/netkit-telnet-${PV}
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
+src_prepare() {
        # Patch: [0]
        # Gentoo lacks a maintainer for this package right now. And a
        # security problem arose. While reviewing our options for how
@@ -46,9 +46,10 @@ src_unpack() {
        epatch "${FILESDIR}"/netkit-telnetd-0.17-cflags-gnu_source.patch
 }
 
-src_compile() {
+src_configure() {
        tc-export CC CXX
 
+       # Not a real autoconf script.
        ./configure --prefix=/usr || die
 
        sed -i \
@@ -56,26 +57,28 @@ src_compile() {
                -e "s:^\(LDFLAGS=\).*:\1${LDFLAGS}:" \
                -e "s:-Wpointer-arith::" \
                MCONFIG || die
+}
 
-       emake || die
-       cd telnetlogin && emake || die
+src_compile() {
+       emake
+       emake -C telnetlogin
 }
 
 src_install() {
-       dobin telnet/telnet || die
+       dobin telnet/telnet
 
-       dosbin telnetd/telnetd || die
-       dosym telnetd /usr/sbin/in.telnetd || die
-       dosbin telnetlogin/telnetlogin || die
-       doman telnet/telnet.1 || die
-       doman telnetd/*.8 || die
-       doman telnetd/issue.net.5 || die
-       dosym telnetd.8 /usr/share/man/man8/in.telnetd.8 || die
-       doman telnetlogin/telnetlogin.8 || die
-       dodoc BUGS ChangeLog README || die
-       dodoc "${FILESDIR}"/net.issue.sample || die
-       newdoc telnet/README README.telnet || die
-       newdoc telnet/TODO TODO.telnet || die
+       dosbin telnetd/telnetd
+       dosym telnetd /usr/sbin/in.telnetd
+       dosbin telnetlogin/telnetlogin
+       doman telnet/telnet.1
+       doman telnetd/*.8
+       doman telnetd/issue.net.5
+       dosym telnetd.8 /usr/share/man/man8/in.telnetd.8
+       doman telnetlogin/telnetlogin.8
+       dodoc BUGS ChangeLog README
+       dodoc "${FILESDIR}"/net.issue.sample
+       newdoc telnet/README README.telnet
+       newdoc telnet/TODO TODO.telnet
        insinto /etc/xinetd.d
-       newins "${FILESDIR}"/telnetd.xinetd telnetd || die
+       newins "${FILESDIR}"/telnetd.xinetd telnetd
 }