[gentoo-commits] repo/gentoo:master commit in: app-emulation/spectemu/files/, app-emulation/spectemu/

[Sam James]

commit:     0ed9aab19dd619b2e985e5f20675e1e54b985219
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 19:44:05 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 19:44:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ed9aab1

app-emulation/spectemu: bump to EAPI 7

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../spectemu/files/spectemu-0.99.3-automagic.patch |  4 ++--
 .../spectemu/files/spectemu-0.99.3-build.patch     |  4 ++--
 app-emulation/spectemu/spectemu-0.99.3-r1.ebuild   | 26 ++++++++++++++--------
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/app-emulation/spectemu/files/spectemu-0.99.3-automagic.patch b/app-emulation/spectemu/files/spectemu-0.99.3-automagic.patch
index 6e813d6373e..0fd6ebc7e6f 100644
--- a/app-emulation/spectemu/files/spectemu-0.99.3-automagic.patch
+++ b/app-emulation/spectemu/files/spectemu-0.99.3-automagic.patch
@@ -1,5 +1,5 @@
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -121,13 +121,22 @@
  dnl -----------------------------------------------------------
  dnl Check for SVGALIB

diff --git a/app-emulation/spectemu/files/spectemu-0.99.3-build.patch b/app-emulation/spectemu/files/spectemu-0.99.3-build.patch
index 1c354a5fa93..9c5ac95c594 100644
--- a/app-emulation/spectemu/files/spectemu-0.99.3-build.patch
+++ b/app-emulation/spectemu/files/spectemu-0.99.3-build.patch
@@ -1,5 +1,5 @@
---- Makefile.in
-+++ Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -44,17 +44,19 @@
  	./mkinstalldirs $(i_bindir) $(i_mandir)
  

diff --git a/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild b/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild
index 14d08363068..907f557d003 100644
--- a/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild
+++ b/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="48k ZX Spectrum Emulator"
 HOMEPAGE="http://kempelen.iit.bme.hu/~mszeredi/spectemu/spectemu.html"
@@ -16,17 +16,25 @@ IUSE="readline svga +X"
 
 REQUIRED_USE="|| ( svga X )"
 
-DEPEND="X? ( x11-base/xorg-proto
+DEPEND="
+	X? (
+		x11-base/xorg-proto
 		>=x11-libs/libX11-1.0.0
 		>=x11-libs/libXext-1.0.0
-		>=x11-libs/libXxf86vm-1.0.0 )
-	readline? ( sys-libs/readline )"
+		>=x11-libs/libXxf86vm-1.0.0
+	)
+	readline? ( sys-libs/readline:= )
+"
 RDEPEND="${DEPEND}
 	svga? ( media-libs/svgalib )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-automagic.patch
+	"${FILESDIR}"/${P}-build.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-automagic.patch
-	epatch "${FILESDIR}"/${P}-build.patch
+	default
 	eautoreconf
 }
 
@@ -38,5 +46,5 @@ src_configure() {
 }
 
 src_install() {
-	emake install_root="${D}" install
+	emake install_root="${ED}" install
 }