[gentoo-commits] repo/gentoo:master commit in: sys-firmware/vgabios/

["Sam James" <sam@gentoo.org>]

commit:     1e436a3ae4e0d35ed061fd61f061ad5d24f54211
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 25 23:12:36 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 23:18:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e436a3a

sys-firmware/vgabios: port to EAPI 7

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

 sys-firmware/vgabios/vgabios-0.7a-r1.ebuild | 18 +++++++-----------
 sys-firmware/vgabios/vgabios-0.7a.ebuild    | 17 +++++++----------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/sys-firmware/vgabios/vgabios-0.7a-r1.ebuild b/sys-firmware/vgabios/vgabios-0.7a-r1.ebuild
index 081c30ad69c..aa925da5018 100644
--- a/sys-firmware/vgabios/vgabios-0.7a-r1.ebuild
+++ b/sys-firmware/vgabios/vgabios-0.7a-r1.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 # Can't really call them backports when they're fixes that upstream
 # won't carry
 FIXES=1
 
-inherit eutils
-
 DESCRIPTION="VGA BIOS implementation"
 HOMEPAGE="http://www.nongnu.org/vgabios/"
 SRC_URI="https://savannah.gnu.org/download/${PN}/${P}.tgz
@@ -18,16 +16,14 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="binary debug"
-
-DEPEND="!binary? ( sys-devel/dev86 )"
-RDEPEND=""
+BDEPEND="!binary? ( sys-devel/dev86 )"
 
 src_prepare() {
-	[[ -n ${FIXES} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
+	if [[ -n ${FIXES} ]] ; then
+		eapply patches/*.patch
+	fi
 
-	epatch_user
+	default
 }
 
 src_compile() {

diff --git a/sys-firmware/vgabios/vgabios-0.7a.ebuild b/sys-firmware/vgabios/vgabios-0.7a.ebuild
index 0e794a42af9..85d6d4c72bc 100644
--- a/sys-firmware/vgabios/vgabios-0.7a.ebuild
+++ b/sys-firmware/vgabios/vgabios-0.7a.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 # Can't really call them backports when they're fixes that upstream
 # won't carry
 FIXES=1
 
-inherit eutils
-
 DESCRIPTION="VGA BIOS implementation"
 HOMEPAGE="http://www.nongnu.org/vgabios/"
 SRC_URI="https://savannah.gnu.org/download/${PN}/${P}.tgz
@@ -19,16 +17,15 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="debug"
 
-DEPEND="amd64? ( sys-devel/dev86 )
+BDEPEND="amd64? ( sys-devel/dev86 )
 	x86? ( sys-devel/dev86 )"
-RDEPEND=""
 
 src_prepare() {
-	[[ -n ${FIXES} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
+	if [[ -n ${FIXES} ]] ; then
+		eapply patches/*.patch
+	fi
 
-	epatch_user
+	default
 }
 
 src_compile() {