commit: cb57c93e9c101cc219890e3aa2aa59c9f7423646 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Apr 19 22:55:25 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Apr 19 22:55:51 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb57c93e
www-client/netrik: port to EAPI 7 Signed-off-by: Sam James <sam <AT> gentoo.org> www-client/netrik/files/netrik-1.16.1-configure.patch | 4 ++-- .../netrik/files/netrik-1.16.1-ncurses-tinfo.patch | 4 ++-- www-client/netrik/netrik-1.16.1-r1.ebuild | 19 +++++++++++-------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/www-client/netrik/files/netrik-1.16.1-configure.patch b/www-client/netrik/files/netrik-1.16.1-configure.patch index 45a0368d69d..c4b24b710ff 100644 --- a/www-client/netrik/files/netrik-1.16.1-configure.patch +++ b/www-client/netrik/files/netrik-1.16.1-configure.patch @@ -1,5 +1,5 @@ ---- configure.ac.orig 2013-04-12 08:56:35.279744148 +0400 -+++ configure.ac 2013-04-12 08:57:09.576747084 +0400 +--- a/configure.ac ++++ b/configure.ac @@ -1,6 +1,3 @@ -dnl preserve initial CFLAGS -CFLAGS_OLD="$CFLAGS" diff --git a/www-client/netrik/files/netrik-1.16.1-ncurses-tinfo.patch b/www-client/netrik/files/netrik-1.16.1-ncurses-tinfo.patch index 193b0af5cd0..5ed1b449bfc 100644 --- a/www-client/netrik/files/netrik-1.16.1-ncurses-tinfo.patch +++ b/www-client/netrik/files/netrik-1.16.1-ncurses-tinfo.patch @@ -1,5 +1,5 @@ ---- configure.ac.orig 2013-04-10 13:39:02.514339066 +0400 -+++ configure.ac 2013-04-10 13:39:28.607341140 +0400 +--- a/configure.ac ++++ b/configure.ac @@ -18,8 +18,9 @@ AC_HEADER_STDC diff --git a/www-client/netrik/netrik-1.16.1-r1.ebuild b/www-client/netrik/netrik-1.16.1-r1.ebuild index c9110df5ca5..039318f9d3e 100644 --- a/www-client/netrik/netrik-1.16.1-r1.ebuild +++ b/www-client/netrik/netrik-1.16.1-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit autotools epatch +inherit autotools DESCRIPTION="A text based web browser with no ssl support" HOMEPAGE="http://netrik.sourceforge.net/"; @@ -17,7 +17,15 @@ RDEPEND=">=sys-libs/ncurses-5.1[unicode] sys-libs/readline" DEPEND="${RDEPEND}" +PATCHES=( + # bug #459660 + "${FILESDIR}"/${P}-ncurses-tinfo.patch + "${FILESDIR}"/${P}-configure.patch +) + src_prepare() { + default + sed -i -e "/^doc_DATA/s/COPYING LICENSE //" \ Makefile.am || die 'sed on Makefile.am failed' @@ -25,14 +33,9 @@ src_prepare() { sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \ configure.ac || die 'sed on configure.ac failed' - # bug #459660 - epatch "${FILESDIR}/${P}-ncurses-tinfo.patch" - epatch "${FILESDIR}/${P}-configure.patch" - epatch_user - eautoreconf } src_install() { - emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install + emake DESTDIR="${D}" docdir="${EPREFIX}"/usr/share/doc/${PF} install }
