commit: f24ab2d290da6f8a530e2b3aff17c14b714517bc Author: Aaron Bauman <bman <AT> gentoo <DOT> org> AuthorDate: Thu May 31 00:04:46 2018 +0000 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> CommitDate: Thu May 31 12:57:04 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f24ab2d2
x11-terms/xvt: bump EAPI and drop flag-o-matic eclass Package-Manager: Portage-2.3.40, Repoman-2.3.9 x11-terms/xvt/files/xvt-int-main.patch | 4 ++-- x11-terms/xvt/files/xvt-makefile.patch | 4 ++-- x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff | 4 ++-- x11-terms/xvt/xvt-2.1-r3.ebuild | 23 +++++++++++++---------- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/x11-terms/xvt/files/xvt-int-main.patch b/x11-terms/xvt/files/xvt-int-main.patch index 81baa76ce5e..a0874e45f41 100644 --- 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 368fdeeb00b..b147d9d8c2b 100644 --- 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 a858250c1d8..1cc370b94d7 100644 --- 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 51aaecb8326..1c3076cf225 100644 --- 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 }
