[gentoo-commits] repo/gentoo:master commit in: dev-embedded/smdk-dltool/, dev-embedded/smdk-dltool/files/

[David Seifert]

commit:     4577523cc470ab0e8a7d55207afe1dc79057389b
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 18:18:11 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 18:18:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4577523c

dev-embedded/smdk-dltool: Port to EAPI 7

Closes: https://bugs.gentoo.org/742206
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../files/smdk-dltool-0.20-add-S3C64xx-support.patch |  8 ++++----
 .../smdk-dltool/files/smdk-dltool-0.20-build.patch   |  4 ++--
 dev-embedded/smdk-dltool/smdk-dltool-0.20-r4.ebuild  | 20 +++++++++++---------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-add-S3C64xx-support.patch b/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-add-S3C64xx-support.patch
index 5b615aeb119..f2864b012a2 100644
--- a/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-add-S3C64xx-support.patch
+++ b/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-add-S3C64xx-support.patch
@@ -6,13 +6,13 @@ Subject: [PATCH] Add S3C64xx support
 Author: unknown
 URL: http://dev.odroid.com/frs/download.php/22/Linux-dltool.tar.gz
 ---
- dltool/dltool.c |   19 ++++++++++++++-----
+ dltool.c |   19 ++++++++++++++-----
  1 files changed, 14 insertions(+), 5 deletions(-)
 
-diff --git a/dltool/dltool.c b/dltool/dltool.c
+diff --git a/dltool.c b/dltool.c
 index 4e2d238..e76e607 100644
---- a/dltool/dltool.c
-+++ b/dltool/dltool.c
+--- a/dltool.c
++++ b/dltool.c
 @@ -26,6 +26,8 @@ char *dl_file = "download.dat";
  char *dl_udev = NULL;
  char *dl_ubus = NULL;

diff --git a/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-build.patch b/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-build.patch
index c6e3b767394..9b7162d77cd 100644
--- a/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-build.patch
+++ b/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-build.patch
@@ -1,7 +1,7 @@
 respect env build settings
 
---- a/releases/smdk-tools-v0.20/dltool/Makefile
-+++ b/releases/smdk-tools-v0.20/dltool/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -7,8 +7,13 @@
  
  .PHONY:	clean

diff --git a/dev-embedded/smdk-dltool/smdk-dltool-0.20-r4.ebuild b/dev-embedded/smdk-dltool/smdk-dltool-0.20-r4.ebuild
index a0fec4846a4..ece10a6cf42 100644
--- a/dev-embedded/smdk-dltool/smdk-dltool-0.20-r4.ebuild
+++ b/dev-embedded/smdk-dltool/smdk-dltool-0.20-r4.ebuild
@@ -1,9 +1,9 @@
-# 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
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="Tool to communicate with Samsung SMDK boards"
 HOMEPAGE="http://www.fluff.org/ben/smdk/tools/"
@@ -13,18 +13,20 @@ SRC_URI="http://www.fluff.org/ben/smdk/tools/downloads/smdk-tools-v${PV}.tar.gz"
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 RESTRICT="mirror bindist"
 
 RDEPEND="virtual/libusb:1"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/releases/smdk-tools-v${PV}/dltool
+S="${WORKDIR}/releases/smdk-tools-v${PV}/dltool"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-add-S3C64xx-support.patch
-	epatch "${FILESDIR}"/${P}-build.patch
-	epatch "${FILESDIR}"/${P}-libusb-1.0-r1.patch
+PATCHES=(
+	"${FILESDIR}"/${P}-add-S3C64xx-support.patch
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-libusb-1.0-r1.patch
+)
+
+src_configure() {
 	tc-export CC PKG_CONFIG
 }