net-misc/netkit-telnetd: [QA] fix src_prepare failure

- change epatch to eapply, remove eutils eclass
- add default ( eapply_user )
- change patch to -p1

Package-Manager: Portage-2.3.40, Repoman-2.3.9

diff --git a/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-cflags-gnu_source.patch b/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-cflags-gnu_source.patch
index 1ebbda77c0782b272adb0d4e6f45fc33d1bac56f..31be21deac1480c2a0b0f1c95809527a761abb42 100644 (file)
--- a/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-cflags-gnu_source.patch
+++ b/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-cflags-gnu_source.patch
@@ -1,5 +1,5 @@
---- telnetd/Makefile.orig      2004-09-29 22:16:50.175839840 -0500
-+++ telnetd/Makefile   2004-09-29 22:09:30.439689896 -0500
+--- a/telnetd/Makefile 2004-09-29 22:16:50.175839840 -0500
++++ b/telnetd/Makefile 2004-09-29 22:09:30.439689896 -0500
 @@ -10,7 +10,7 @@
  
  CFLAGS += '-DISSUE_FILE="/etc/issue.net"' -DPARANOID_TTYS \
@@ -9,8 +9,8 @@
  # LIBS += $(LIBTERMCAP)
  
  OBJS = telnetd.o state.o termstat.o slc.o sys_term.o utility.o \
---- telnet/Makefile.orig    2004-11-01 15:23:29 -0500
-+++ telnet/Makefile     2004-11-01 16:05:05 -0500
+--- a/telnet/Makefile    2004-11-01 15:23:29 -0500
++++ b/telnet/Makefile     2004-11-01 16:05:05 -0500
 @@ -6,7 +6,7 @@
  #CXXFLAGS:=$(patsubst -O2, -g, $(CXXFLAGS))
  

diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild
index 47aac67eb810622235f807117e1406e1fc73f0be..e041e858c76c50a22f4453fe80296549dbbc2db5 100644 (file)
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 PATCHLEVEL=41
 DESCRIPTION="Standard Linux telnet client and server"
@@ -36,18 +36,19 @@ src_prepare() {
        # better to just stay in sync with debian's own netkit-telnet
        # package. Lots of bug fixes by them over time which were not in
        # our telnetd.
-       EPATCH_FORCE="yes" EPATCH_SUFFIX="diff" epatch "${WORKDIR}"/debian/patches
+       EPATCH_FORCE="yes" EPATCH_SUFFIX="diff" eapply "${WORKDIR}"/debian/patches
 
        # Patch: [1]
        # after the deb patch we need to add a small patch that defines
        # gnu source. This is needed for gcc-3.4.x (needs to be pushed
        # back to the deb folk?)
-       epatch "${FILESDIR}"/netkit-telnetd-0.17-cflags-gnu_source.patch
+       eapply "${FILESDIR}"/netkit-telnetd-0.17-cflags-gnu_source.patch
 
        # Fix portability issues.
        sed -i \
                -e 's:echo -n:printf %s:' \
                configure || die
+       default
 }
 
 src_configure() {