commit:     de88be4628b88058929f63c62a0c8af43ac5066c
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 13 11:36:49 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Jan 13 11:40:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de88be46

dev-embedded/pk2cmd: Port to EAPI 8

Closes: https://bugs.gentoo.org/828732
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 .../files/pk2cmd-add-share-dir-for-dev-file-1.20.patch  |  4 ++--
 .../{pk2cmd-1.20.ebuild => pk2cmd-1.20-r1.ebuild}       | 17 +++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git 
a/dev-embedded/pk2cmd/files/pk2cmd-add-share-dir-for-dev-file-1.20.patch 
b/dev-embedded/pk2cmd/files/pk2cmd-add-share-dir-for-dev-file-1.20.patch
index 30d6b1e71a3e..2dfb014007f1 100644
--- a/dev-embedded/pk2cmd/files/pk2cmd-add-share-dir-for-dev-file-1.20.patch
+++ b/dev-embedded/pk2cmd/files/pk2cmd-add-share-dir-for-dev-file-1.20.patch
@@ -1,5 +1,5 @@
---- cmd_app.cpp.old    2009-01-31 21:23:30.000000000 +0100
-+++ cmd_app.cpp        2009-01-31 21:25:48.000000000 +0100
+--- a/cmd_app.cpp
++++ b/cmd_app.cpp
 @@ -88,7 +88,12 @@
                _tsearchenv_s("PK2DeviceFile.dat", "PATH", tempString);
                if (_tcslen(tempString) < 17)

diff --git a/dev-embedded/pk2cmd/pk2cmd-1.20.ebuild 
b/dev-embedded/pk2cmd/pk2cmd-1.20-r1.ebuild
similarity index 76%
rename from dev-embedded/pk2cmd/pk2cmd-1.20.ebuild
rename to dev-embedded/pk2cmd/pk2cmd-1.20-r1.ebuild
index a37ef5bd81df..db9537427e48 100644
--- a/dev-embedded/pk2cmd/pk2cmd-1.20.ebuild
+++ b/dev-embedded/pk2cmd/pk2cmd-1.20-r1.ebuild
@@ -1,27 +1,28 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit epatch toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="An application for working with the Microchip PicKit2 PIC 
programmer"
 HOMEPAGE="http://www.microchip.com/pickit2";
 
SRC_URI="http://ww1.microchip.com/downloads/en/DeviceDoc/${PN}v${PV}LinuxMacSource.tar.gz";
+S="${WORKDIR}/${PN}v${PV}LinuxMacSource"
 
 LICENSE="MicroChip-PK2"
 SLOT="0"
 KEYWORDS="~amd64 ppc ppc64 ~x86"
-IUSE=""
 
 DEPEND="virtual/libusb:0"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${PN}v${PV}LinuxMacSource
+PATCHES=(
+       "${FILESDIR}"/${PN}-add-share-dir-for-dev-file-${PV}.patch
+)
 
 src_prepare() {
-       # Patch adds /usr/share/pk2 to the default search for the device file
-       epatch "${FILESDIR}/${PN}-add-share-dir-for-dev-file-${PV}.patch"
+       default
 
        # Fix up the Makefile
        sed \
@@ -40,7 +41,7 @@ src_compile() {
 
 src_install() {
        # Copy the device files and PicKit2 OS
-       insinto "/usr/share/pk2"
+       insinto /usr/share/pk2
        doins PK2DeviceFile.dat PK2V023200.hex
        # Install the program
        dobin pk2cmd

Reply via email to