commit: 33e0ab8b38afd3d91de960a390153282ed3dc75f Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Sep 19 18:02:41 2020 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Sep 19 18:10:38 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33e0ab8b
app-emulation/hercules: port to EAPI 7 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Sam James <sam <AT> gentoo.org> app-emulation/hercules/hercules-3.10.ebuild | 17 +++++++++++------ app-emulation/hercules/hercules-3.12.ebuild | 17 +++++++++++------ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/app-emulation/hercules/hercules-3.10.ebuild b/app-emulation/hercules/hercules-3.10.ebuild index c28944bdf92..d165c020c39 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 b9b49d82dbf..d121c6a69fa 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 }
