From 438a198cfab77e03758d42b20be284051395b03c Mon Sep 17 00:00:00 2001
From: Bertrand Jacquin <bertrand@jacquin.bzh>
Date: Sat, 26 Sep 2020 17:06:13 +0100
Subject: flx/flx: move to EAPI 7

Package-Manager: Portage-3.0.4, Repoman-3.0.1
---
 flx/flx/flx-0.1.35.ebuild | 15 +++++++--------
 flx/flx/flx-9999.ebuild   | 13 ++++++-------
 2 files changed, 13 insertions(+), 15 deletions(-)

(limited to 'flx')

diff --git a/flx/flx/flx-0.1.35.ebuild b/flx/flx/flx-0.1.35.ebuild
index 40257836..e4f5af61 100644
--- a/flx/flx/flx-0.1.35.ebuild
+++ b/flx/flx/flx-0.1.35.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit git-r3 toolchain-funcs eutils
 
 DESCRIPTION="Formilux Tools"
@@ -14,15 +14,14 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}/${PV}-MEDIUM-Remove-strip-and-uclibc.patch"
+	"${FILESDIR}/${PV}-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch"
+)
 
 src_prepare () {
 	default
 
-	eapply "${FILESDIR}/${PV}-MEDIUM-Remove-strip-and-uclibc.patch"
-	eapply "${FILESDIR}/${PV}-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch"
-
 	tc-export CC
 }
 
@@ -33,6 +32,6 @@ src_compile () {
 
 src_install () {
 	into /usr
-	dobin flx/flx
+	dobin "flx/${PN}"
 	dodoc flx/{AUTHORS,ChangeLog,NOTES,README,TODO}
 }
diff --git a/flx/flx/flx-9999.ebuild b/flx/flx/flx-9999.ebuild
index 6d8631bd..39026e96 100644
--- a/flx/flx/flx-9999.ebuild
+++ b/flx/flx/flx-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit git-r3 toolchain-funcs eutils
 
 DESCRIPTION="Formilux Tools"
@@ -13,15 +13,14 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}/${PV}-MEDIUM-Remove-strip-and-uclibc.patch"
+	"${FILESDIR}/${PV}-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch"
+)
 
 src_prepare () {
 	default
 
-	eapply "${FILESDIR}/${PV}-MEDIUM-Remove-strip-and-uclibc.patch"
-	eapply "${FILESDIR}/${PV}-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch"
-
 	tc-export CC
 }
 
@@ -32,6 +31,6 @@ src_compile () {
 
 src_install () {
 	into /usr
-	dobin flx/flx
+	dobin "flx/${PN}"
 	dodoc flx/{AUTHORS,ChangeLog,NOTES,README,TODO}
 }
-- 
cgit v1.2.3