[gentoo-commits] repo/gentoo:master commit in: sys-boot/cromwell/

[gentoo-commits] repo/gentoo:master commit in: sys-boot/cromwell/

[David Seifert]

commit:     a4d5afce5c8f5632cc612a73e244ef22c685d933
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 15:39:44 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 15:39:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4d5afce

sys-boot/cromwell: Port to EAPI 7

Closes: https://bugs.gentoo.org/742122
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sys-boot/cromwell/cromwell-2.40-r3.ebuild | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/sys-boot/cromwell/cromwell-2.40-r3.ebuild b/sys-boot/cromwell/cromwell-2.40-r3.ebuild
index 7ce7e1fd24b..e5c32e94d69 100644
--- a/sys-boot/cromwell/cromwell-2.40-r3.ebuild
+++ b/sys-boot/cromwell/cromwell-2.40-r3.ebuild
@@ -1,29 +1,32 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils mount-boot toolchain-funcs flag-o-matic
+inherit mount-boot toolchain-funcs flag-o-matic
 
 DESCRIPTION="Xbox boot loader"
 HOMEPAGE="http://www.xbox-linux.org/wiki/Cromwell"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
+SRC_URI="
+	mirror://gentoo/${P}.tar.bz2
 	mirror://gentoo/${PF}-cvs-fixes.patch.lzma"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* x86"
-IUSE=""
 RESTRICT="strip"
 
 src_prepare() {
-	epatch "${WORKDIR}"/${PF}-cvs-fixes.patch
-	epatch "${FILESDIR}"/${P}-gcc-4.6.patch #363535
+	eapply "${WORKDIR}"/${PF}-cvs-fixes.patch
+	eapply "${FILESDIR}"/${P}-gcc-4.6.patch #363535
+	eapply_user
+
 	sed -i 's:-Werror:-m32:' Makefile Rules.make || die
 	sed -i '/^EXTRA_CFLAGS/s:$: -m32:' Rules.make boot_rom/Makefile || die
 	sed -i \
 		-e '/^bin.imagebld:/,$s:\<gcc\>:${CC}:' \
 		Makefile || die
+
 	append-flags -m32
 }