gentoo resync : 23.09.2020

3 files changed, 24 insertions, 14 deletions

diff --git a/app-emulation/hercules/Manifest b/app-emulation/hercules/Manifest
index c09e204d1d30..2ff2a50eb597 100644
--- a/app-emulation/hercules/Manifest
+++ b/app-emulation/hercules/Manifest
@@ -4,7 +4,7 @@ AUX hercules-3.13-unbundle-libltdl.patch 12565 BLAKE2B fe5e78dbd91b8bb4ca8d7f128
 DIST hercules-3.10.tar.gz 2608321 BLAKE2B df6dd9c93531ee3d68efbfad5b0152ef984e1804e211861e86ea5f7b271081abbd29664d4e97d0e887af10315549bdd7e890ec741baa7b69336f1f08be63c6cf SHA512 de8b3e2e90fdb745dea9c8ce4dbe506de2aba3bf08b3e937605798e6a8020576a949d6ea3496b7c42bd23d617fc96648d2d8ec05a66e8ed174ce46a3bc31c5d1
 DIST hercules-3.12.tar.gz 2569617 BLAKE2B e6b6dc2406bc198e25ddcbdc5dbf141e52cd15ddd690711fdd4ed69ca5baaddd582c437e28aa7793ac667c03f7617adb3bdf3a00cc7c3a28e3f28984f665eb9a SHA512 81d6e151c1c8534753f2db532a0a7bd36fb3806c1ffbab5d6e4a9af3eecea46b95105c37574910714dcfc0fe9b74a72140d573099c24fd44021159ce697414ef
 DIST hercules-3.13.tar.gz 2640742 BLAKE2B 1a84ceab346a591c494fb133d1654ffa73e44f73183564167a74f68eb3e5f3f187cc2f66cef444b951645fa85c111da261b9dd8907594ccb770f5b743f891649 SHA512 76f75ef3f1eb10c0fac0d6fa1ab9809b8d1dfe3deccbcd69366b05ee58f1ecb8ea0f387f7201ab4722b121478676f00e707ad27b6ecf1980fb09e900de63d718
-EBUILD hercules-3.10.ebuild 1302 BLAKE2B f2e0c09ae8e4201aeabcf1672670e5afdcd0c15c381f8f5ecee78f2badb374506cd9c9cbfeb28e4e530943e3c8844e47e2181fe837bd7d1a4d4ca8648f543521 SHA512 1c13039323733edf679bf7ac576377a90ee0970da171eb0c53044d072f46ffacdd2323e9e8c9e76ca9cab0c6aba0e4a2a4af9f070d3365439e55137737738861
-EBUILD hercules-3.12.ebuild 1310 BLAKE2B 5c300f1edec6212e11378a1de38040bead9e6a25027e4091ccb322c134eefbd843eda1d54324d057a02b86c77abbbf45f454b22917b0482a8318ef9d62799be2 SHA512 58c6e557e0a1a2961af9b0941aa5c1486abaea72179900e22dc680bbad9969ab2d26487bd41e943e2dbc8fc23229de410a81f37aa2eb347fdd32550720458978
+EBUILD hercules-3.10.ebuild 1329 BLAKE2B cc125e40bf7b9ef56607c8a57f9eae6a21bb4147df43b6f5e5d743a3a971fcaa0e1c425f93f8e3ae19e082be8b0a41c35fcf7eae86f8374a849d75af545ecb34 SHA512 1a8652538c4bba69f5e49730b8a1d85a2db40be86272a0fb9a907818a579145dca8edbc9512644447c88af03406168e45823960899a7b0d6449cddc4ec5944a6
+EBUILD hercules-3.12.ebuild 1333 BLAKE2B 03bb3e8021278258c7ecfdd452e6c3e2194fcb49e20bdcbaf939d195877b704e9e68d242b5e11348c8566170f316af12b5e2477b469b5041c050323da6b7a756 SHA512 54ec4d1b54ff19745716115df1b671c5870300c442cfbb5710bd96b97d31d8390bf7ca636e41e417d969ee027aeab6fc94d6360d7d89c8518a062d21feafb518
 EBUILD hercules-3.13.ebuild 1223 BLAKE2B c0f8377cf12d9c0bd6d15e50f2c1369ef1371e27e7b4536af85fe0169eacded2fb7aa200e71cc1a23fed8fae2ff85d9a07e6d368000b1e2aa099feae58593c83 SHA512 62ba727d1aaf6b22cbd6f53ef8799b6a0be28c40b01c534b18d732d41098be27db1cdf18526be4545cebaab46d3685d4623fd0a46d9d9a10cf701e1f01766ad0
 MISC metadata.xml 580 BLAKE2B 7b8d677b252db63214074827db7e3ba8bf2a93362c62793321d436268f8bc4c79a2c9a2fcfe92b17c2107ad61afa6bd2340441fb04a3ba786c7c01c449d7c1fa SHA512 ac91e21edfcaefcf36af5c15336d3371f503c43e727a92df3eb14a11279e0a66719a8879725c34d10ac17e80b83f940ac5a90fffe38448918d0a665408416794
diff --git a/app-emulation/hercules/hercules-3.10.ebuild b/app-emulation/hercules/hercules-3.10.ebuild
index c28944bdf921..d165c020c390 100644
--- a/app-emulation/hercules/hercules-3.10.ebuild
+++ b/app-emulation/hercules/hercules-3.10.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit flag-o-matic eutils
+inherit flag-o-matic
 
 DESCRIPTION="Hercules System/370, ESA/390 and zArchitecture Mainframe Emulator"
 HOMEPAGE="http://www.hercules-390.eu/"
@@ -15,17 +15,21 @@ KEYWORDS="~alpha amd64 ppc sparc x86 ~x64-macos ~x86-macos"
 IUSE="bzip2 custom-cflags +suid"
 
 RDEPEND="bzip2? ( app-arch/bzip2 )
-	net-libs/libnsl:0
+	net-libs/libnsl:0=
 	sys-libs/zlib"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.09-aliasing.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.09-aliasing.patch
+	default
 
 	# The local modules need local libs, so when doing a parallel install
 	# of the modules and libs breaks during relinking.  Force the libs to
 	# install first, and then the modules that use those libs.  #488126
-	echo "install-modexecLTLIBRARIES: install-libLTLIBRARIES" >> Makefile.in
+	echo "install-modexecLTLIBRARIES: install-libLTLIBRARIES" >> Makefile.in || die
 }
 
 src_configure() {
@@ -44,5 +48,6 @@ src_install() {
 	insinto /usr/share/hercules
 	doins hercules.cnf
 	dodoc README.* RELEASE.NOTES
-	dohtml -r html
+	docinto html
+	dodoc -r html
 }
diff --git a/app-emulation/hercules/hercules-3.12.ebuild b/app-emulation/hercules/hercules-3.12.ebuild
index b9b49d82dbf8..d121c6a69fa7 100644
--- a/app-emulation/hercules/hercules-3.12.ebuild
+++ b/app-emulation/hercules/hercules-3.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit flag-o-matic eutils
+inherit flag-o-matic
 
 DESCRIPTION="Hercules System/370, ESA/390 and zArchitecture Mainframe Emulator"
 HOMEPAGE="http://www.hercules-390.eu/"
@@ -19,13 +19,17 @@ RDEPEND="bzip2? ( app-arch/bzip2 )
 	sys-libs/zlib"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.09-aliasing.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.09-aliasing.patch
+	default
 
 	# The local modules need local libs, so when doing a parallel install
 	# of the modules and libs breaks during relinking.  Force the libs to
 	# install first, and then the modules that use those libs.  #488126
-	echo "install-modexecLTLIBRARIES: install-libLTLIBRARIES" >> Makefile.in
+	echo "install-modexecLTLIBRARIES: install-libLTLIBRARIES" >> Makefile.in || die
 }
 
 src_configure() {
@@ -44,5 +48,6 @@ src_install() {
 	insinto /usr/share/hercules
 	doins hercules.cnf
 	dodoc README.* RELEASE.NOTES
-	dohtml -r html
+	docinto html
+	dodoc -r html
 }