From 4dd796748cf5b8455513b658d813a1765e987a68 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Thu, 7 Nov 2019 15:47:19 +0100
Subject: [PATCH] sys-process/daemontools: EAPI-7 revbump

Closes: https://bugs.gentoo.org/697166
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---
 ...6-r7.ebuild => daemontools-0.76-r8.ebuild} | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)
 rename sys-process/daemontools/{daemontools-0.76-r7.ebuild => daemontools-0.76-r8.ebuild} (78%)

diff --git a/sys-process/daemontools/daemontools-0.76-r7.ebuild b/sys-process/daemontools/daemontools-0.76-r8.ebuild
similarity index 78%
rename from sys-process/daemontools/daemontools-0.76-r7.ebuild
rename to sys-process/daemontools/daemontools-0.76-r8.ebuild
index 5f2a20bcb1e3..98a029774410 100644
--- a/sys-process/daemontools/daemontools-0.76-r7.ebuild
+++ b/sys-process/daemontools/daemontools-0.76-r8.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 flag-o-matic qmail
+inherit flag-o-matic qmail
 
 DESCRIPTION="Collection of tools for managing UNIX services"
 HOMEPAGE="http://cr.yp.to/daemontools.html"
@@ -19,14 +19,16 @@ DEPEND=""
 RDEPEND="selinux? ( sec-policy/selinux-daemontools )
 	!app-doc/daemontools-man"
 
-S="${WORKDIR}"/admin/${P}/src
+S="${WORKDIR}/admin/${P}/src"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+PATCHES=(
+	"${FILESDIR}"/${PV}-errno.patch
+	"${FILESDIR}"/${PV}-warnings.patch
+)
+
+src_prepare() {
+	default
 
-	epatch "${FILESDIR}"/${PV}-errno.patch
-	epatch "${FILESDIR}"/${PV}-warnings.patch
 	ht_fix_file Makefile print-{cc,ld}.sh
 
 	use static && append-ldflags -static
@@ -34,14 +36,14 @@ src_unpack() {
 }
 
 src_compile() {
-	touch home
-	emake || die
+	touch home || die
+	emake
 }
 
 src_install() {
 	keepdir /service
 
-	dobin $(<../package/commands) || die
+	dobin $(<../package/commands)
 	dodoc CHANGES ../package/README TODO
 	doman "${WORKDIR}"/${PN}-man/*.8
 
-- 
2.26.2