From df5619fcc7f93558f4dc145492725748bad550ed Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Sun, 10 Nov 2019 12:43:36 +0100
Subject: sys-fs/arm-fdisk: Bump to EAPI 7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes: https://bugs.gentoo.org/697162
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'sys-fs/arm-fdisk')

diff --git a/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild b/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild
index 3a85f525491e..aaafaf93c51b 100644
--- a/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild
+++ b/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DEB_VER=6.2
 DESCRIPTION="edit disk partitions on Acorn machines"
@@ -16,30 +16,26 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc s390 sh sparc x86"
 IUSE=""
 
-DEPEND=""
+src_prepare() {
+	default
+	eapply "${WORKDIR}"/acorn-fdisk_${PV}-${DEB_VER}.diff
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/acorn-fdisk_${PV}-${DEB_VER}.diff
-
-	find "${S}" -name Makefile -print0 | xargs -0 \
-		sed -i \
+	find . -name Makefile -exec sed -i \
 		-e "s:-O2 -Wall\( -g\)\?::" \
 		-e "/^CFLAGS/s:=:+=:" \
 		-e "/^LDFLAGS/s:=:+=:" \
-		-e '/^STRIP/s:strip:true:'
+		-e '/^STRIP/s:strip:true:' {} + || die
 }
 
 src_compile() {
 	emake \
 		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" || die
+		AR="$(tc-getAR)"
 }
 
 src_install() {
 	into /
-	newsbin fdisk ${PN} || die "sbin failed"
+	newsbin fdisk ${PN}
 	dosym ${PN} /sbin/acorn-fdisk
 	dodoc ChangeLog README debian/changelog
 }
-- 
cgit v1.2.3-65-gdbad