x11-terms/xvt: bump EAPI and drop flag-o-matic eclass

Package-Manager: Portage-2.3.40, Repoman-2.3.9

diff --git a/x11-terms/xvt/files/xvt-int-main.patch b/x11-terms/xvt/files/xvt-int-main.patch
index 81baa76ce5e0cb07895a8dfa5b3d5e75e0d5337a..a0874e45f4196b8194f2a37abe50505a7f8afa9a 100644 (file)
--- a/x11-terms/xvt/files/xvt-int-main.patch
+++ b/x11-terms/xvt/files/xvt-int-main.patch
@@ -1,5 +1,5 @@
---- xvt-1.0/xvt.c.orig 2009-09-04 15:49:13.000000000 +0200
-+++ xvt-1.0/xvt.c      2009-09-04 15:49:13.000000000 +0200
+--- a/xvt.c
++++ b/xvt.c
 @@ -41,9 +41,9 @@
  #endif /* UKC_LOCATIONS */
  

diff --git a/x11-terms/xvt/files/xvt-makefile.patch b/x11-terms/xvt/files/xvt-makefile.patch
index 368fdeeb00beb3d04fbf0ca5cf7e78f7709cde83..b147d9d8c2b98c1c5aab243c60682fe71dd022ca 100644 (file)
--- a/x11-terms/xvt/files/xvt-makefile.patch
+++ b/x11-terms/xvt/files/xvt-makefile.patch
@@ -1,5 +1,5 @@
---- xvt-1.0/Makefile.orig      2009-09-04 15:45:08.000000000 +0200
-+++ xvt-1.0/Makefile   2009-09-04 15:46:00.000000000 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -27,7 +27,7 @@
  #ARCH=AIX3
  #ARCH=ULTRIX

diff --git a/x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff b/x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff
index a858250c1d8a5b521aca78b5f1dc4e46c8991f10..1cc370b94d7a26a5fc48dffb54ed99c50f720ef4 100644 (file)
--- a/x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff
+++ b/x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff
@@ -1,5 +1,5 @@
---- ttyinit.c  2004-08-24 18:51:18.510722064 +0100
-+++ ttyinit.c.new      2004-08-24 18:50:30.539014872 +0100
+--- a/ttyinit.c
++++ b/ttyinit.c
 @@ -46,6 +46,7 @@
  #include <pwd.h>
  #include <errno.h>

diff --git a/x11-terms/xvt/xvt-2.1-r3.ebuild b/x11-terms/xvt/xvt-2.1-r3.ebuild
index 51aaecb83268793e48245ae15f4ab21fb6c3067b..1c3076cf22579504e1434588e2ff2c9fed2eacad 100644 (file)
--- a/x11-terms/xvt/xvt-2.1-r3.ebuild
+++ b/x11-terms/xvt/xvt-2.1-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A tiny vt100 terminal emulator for X"
 HOMEPAGE="ftp://ftp.x.org/R5contrib/xvt-1.0.README"
@@ -21,27 +21,30 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${PN}-1.0
 
-src_prepare() {
+PATCHES=(
        # this brings the distribution upto version 2.1
-       epatch "${WORKDIR}"/${P}.diff
+       "${WORKDIR}"/${P}.diff
 
        # fix #61393
-       epatch "${FILESDIR}/${PN}-ttyinit-svr4pty.diff"
+       "${FILESDIR}/${PN}-ttyinit-svr4pty.diff"
 
        # CFLAGS, CC #241554
-       epatch "${FILESDIR}/${PN}-makefile.patch"
+       "${FILESDIR}/${PN}-makefile.patch"
 
        # int main, not void main
-       epatch "${FILESDIR}/${PN}-int-main.patch"
+       "${FILESDIR}/${PN}-int-main.patch"
 
        # fix segfault (bug #363883)
-       epatch "${FILESDIR}/${PN}-pts.patch"
+       "${FILESDIR}/${PN}-pts.patch"
+)
 
+src_prepare() {
+       default
        tc-export CC
 }
 
 src_install() {
-       dobin xvt || die "dobin failed"
+       dobin xvt
        doman xvt.1
-       dodoc README
+       einstalldocs
 }