From ba1d226e066c03d6d4db683b699c4763979a42b5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Sat, 19 Oct 2019 20:58:29 +0200
Subject: [PATCH] media-fonts/pcf2bdf: Bump to EAPI 7
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Bug: https://bugs.gentoo.org/697308
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild | 24 ++++++++++------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild b/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild
index ecaa05f44c6d..c27ad5f8f8e8 100644
--- a/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild
+++ b/media-fonts/pcf2bdf/pcf2bdf-1.04-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 toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="Converts PCF fonts to BDF fonts"
 HOMEPAGE="http://www.tsg.ne.jp/GANA/S/pcf2bdf/"
@@ -16,20 +16,18 @@ IUSE=""
 
 S=${WORKDIR}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-64bit.patch
-	epatch "${FILESDIR}"/${P}-gzip.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-64bit.patch
+	"${FILESDIR}"/${P}-gzip.patch
+)
 
 src_compile() {
-	emake -f Makefile.gcc CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" || die "emake failed"
+	emake -f Makefile.gcc CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}"
 }
 
 src_install() {
 	emake -f Makefile.gcc \
-		PREFIX="${D}/usr" \
-		MANPATH="${D}/usr/share/man/man1" \
-		install || die
+		PREFIX="${ED}/usr" \
+		MANPATH="${ED}/usr/share/man/man1" \
+		install
 }
-- 
2.26.2