From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 474F8138359 for ; Sat, 19 Sep 2020 18:10:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80FF5E078A; Sat, 19 Sep 2020 18:10:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 55920E078A for ; Sat, 19 Sep 2020 18:10:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 08538340D92 for ; Sat, 19 Sep 2020 18:10:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 76789EC for ; Sat, 19 Sep 2020 18:10:41 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1600539038.33e0ab8b38afd3d91de960a390153282ed3dc75f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/hercules/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/hercules/hercules-3.10.ebuild app-emulation/hercules/hercules-3.12.ebuild X-VCS-Directories: app-emulation/hercules/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 33e0ab8b38afd3d91de960a390153282ed3dc75f X-VCS-Branch: master Date: Sat, 19 Sep 2020 18:10:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 650e3917-40c6-4c66-b8c9-e80316f20f89 X-Archives-Hash: 41c4bf52e44af1cd575f17946420775f commit: 33e0ab8b38afd3d91de960a390153282ed3dc75f Author: Sam James gentoo org> AuthorDate: Sat Sep 19 18:02:41 2020 +0000 Commit: Sam James gentoo 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 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 }