gentoo resync : 28.04.2021

4 files changed, 19 insertions, 16 deletions

diff --git a/www-client/netrik/Manifest b/www-client/netrik/Manifest
index 556b2e37498f..5a325b4e3bfd 100644
--- a/www-client/netrik/Manifest
+++ b/www-client/netrik/Manifest
@@ -1,5 +1,5 @@
-AUX netrik-1.16.1-configure.patch 1671 BLAKE2B bce74b94cd6014848066ed68c9e92beff86080c8fdbec8c40d7dc60bd7d60029b8420a633b4f6403226455b81f320f95b8e19db047bd092412a8a83bba63d0af SHA512 1954428316b8ad5bdd0707bac62d7e298f2282eda1df31cbd9d8b88fc8cc5b38a85cd87ec85f10fb24bfb18840e4c678eb03a4daae438e753095bb8552b1ab21
-AUX netrik-1.16.1-ncurses-tinfo.patch 334 BLAKE2B e44a5401060d3aa9532c17907b90811971fdc7419e80baa4bed46fb545e9edfd82bd111e6aacd454cd85cf7305f67ec30dab2c69db49ba032a1027405c2df711 SHA512 6aa6c276e7052ccf887893b285254aa27947f3554cc8a2f31a4e1b22ebdee950fcef6dd586c953638f8a6864ad402d3fd2ada563f2d1b8521ef8a4c5d22987e4
+AUX netrik-1.16.1-configure.patch 1598 BLAKE2B ab512408ebc804feecb523cb8a17a6af4ed6b7f151de2612ecad46fe105556e2ab1afa8e9fbf2f86e5cf28832fdac2e52a9a4d5db4912ee88ef73bc1731de795 SHA512 fd03a8b9d627e79d5eb962228fe78f31281a67fbd2f68b7a839c5ee36f73af5a9cb7636ef8fda7ccd51406415408cbef393d556373b7118b5083d21b75f90cf8
+AUX netrik-1.16.1-ncurses-tinfo.patch 261 BLAKE2B f5ca6b454ed26d16e88de7fa08f0c74e7165071377217e093b57c646ce02dcc7f4c5f059e23374cf16516947a252897cd8132efc993c73b000ed8a4cc065e492 SHA512 82b10cccff84b83613f312f9d644a5de3b10f68fd27295cada67a53d4d081f6469f79276c0c601c75937be95d38a9161416c0ecf334ef4b4a590c765130c1509
 DIST netrik-1.16.1.tar.gz 476669 BLAKE2B dc0b9f0ccaaa81def843b8df3b9b70db9c48667e306e992d7e3161800666b92714f5137d38f56719a652022160a5fda835eb31dad71a93a66331bf35e83ea6d7 SHA512 73e754f8ce34226446b47c9438fb45dcc094c19ca8a2933a6cc68ed32e9cf40c9ace3189c8e63bd4537d286b608c515efd8433f795d4238ad30bd6612dd850e7
-EBUILD netrik-1.16.1-r1.ebuild 875 BLAKE2B d7c190668a87400be49ae2a71468d40d51550de8f9b06b1a7a9ee482ec3004f2078f93f8c7ab969947778c6fecf1227ca6dd86643c4dc30f9bac0a7b62bd2b88 SHA512 3927a0447b00d34ababbae087a873a3f626d5253429dad81e6696bb98c48ad4a11a6f25b34becdda8bdf8d578edd686373cac8c250fa730ff040531adae90fe9
+EBUILD netrik-1.16.1-r1.ebuild 870 BLAKE2B b6eb8e524e85ef4e7a7aee8e7d8d89288181eee5ae9259fdb05f19d095f3d4804eaf4374a0cb3cf1609e69b1d123455856d158a488f998b713cee572ee77d8f7 SHA512 04a856feb6b6d4943ac85cb8e5d0178a487c65145be269cafb47763c4338c70d4dc95125aaf99c362a0707c729f939745ea9b450b25b2665b88a6b4327b23366
 MISC metadata.xml 303 BLAKE2B fc4bfef2b83e524928195e57df9d65cc43ed9361cef2444558d8ed22cdc9a78661cf5b106c098368f5b6fb2c5b09ac3c56447823f0c45d5114f7a629b3ddbb17 SHA512 dd51a4b51ad9fa0bfac8f2486d96a5a40790c8c50e0e28e54edce8e2aee67a72121ed93d9ec3d628d18b91da473bdde672121e5cb2fcc7350f05c5b2968d8f24
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 45a0368d69d7..c4b24b710ffc 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 193b0af5cd0b..5ed1b449bfc0 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 116c516ba939..039318f9d3e6 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-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools eutils
+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
 }