[gentoo-commits] repo/gentoo:master commit in: app-misc/g15macro/

[Lars Wendler]

commit:     d9bd2366a1e5fb8670fd8e3823047d221e6c4b46
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  9 11:26:23 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Sep  9 12:29:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9bd2366

app-misc/g15macro: Convert to EAPI-7

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 app-misc/g15macro/g15macro-1.0.3-r2.ebuild | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/app-misc/g15macro/g15macro-1.0.3-r2.ebuild b/app-misc/g15macro/g15macro-1.0.3-r2.ebuild
index c86e4550bd2..4a2436d7c32 100644
--- a/app-misc/g15macro/g15macro-1.0.3-r2.ebuild
+++ b/app-misc/g15macro/g15macro-1.0.3-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils
+EAPI=7
+inherit autotools
 
 DESCRIPTION="Macro recording plugin to G15daemon"
 HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
@@ -23,10 +23,14 @@ RDEPEND="${DEPEND}
 	sys-libs/zlib
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-Makefile.am.patch
+	"${FILESDIR}"/${P}-configure.in.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-Makefile.am.patch
-	epatch "${FILESDIR}"/${P}-configure.in.patch
-	mv configure.in configure.ac || die
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
@@ -36,5 +40,5 @@ src_configure() {
 
 src_install() {
 	default
-	rm -rf "${ED}"/usr/share/doc/${P}
+	rm -rf "${ED}"/usr/share/doc/${P} || die
 }