commit: 9bd82aa423e18186ac2431e77a31bd3598cdaf62
Author: Sam James gentoo org>
AuthorDate: Mon Apr 19 04:10:50 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Apr 19 04:30:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bd82aa4
app-misc/actkbd: port to EAPI 7
Signed-off-by: Sam James gentoo.org>
app-misc/actkbd/actkbd-0.2.8-r2.ebuild | 20 +---
app-misc/actkbd/files/actkbd-0.2.7-amd64.patch | 10 --
2 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/app-misc/actkbd/actkbd-0.2.8-r2.ebuild
b/app-misc/actkbd/actkbd-0.2.8-r2.ebuild
index 021c813d7d6..28ba133c9bd 100644
--- a/app-misc/actkbd/actkbd-0.2.8-r2.ebuild
+++ b/app-misc/actkbd/actkbd-0.2.8-r2.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit linux-info epatch toolchain-funcs
+inherit linux-info toolchain-funcs
DESCRIPTION="A keyboard shortcut daemon"
HOMEPAGE="http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/;
@@ -12,16 +12,12 @@
SRC_URI="http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/files/${P}.tar
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
CONFIG_CHECK="~INPUT_EVDEV"
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.2.7-amd64.patch
-}
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.2.7-amd64.patch
+)
src_compile() {
emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
@@ -30,10 +26,12 @@ src_compile() {
src_install() {
dobin actkbd
dodoc AUTHORS ChangeLog FAQ README TODO
+
docinto samples
dodoc samples/actkbd.conf
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
- newinitd "${FILESDIR}/${PN}.initd" ${PN}
+
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
}
pkg_postinst() {
diff --git a/app-misc/actkbd/files/actkbd-0.2.7-amd64.patch
b/app-misc/actkbd/files/actkbd-0.2.7-amd64.patch
index b962d7e861a..574e341b5c7 100644
--- a/app-misc/actkbd/files/actkbd-0.2.7-amd64.patch
+++ b/app-misc/actkbd/files/actkbd-0.2.7-amd64.patch
@@ -1,8 +1,7 @@
# Try to fix pointer assigned to int and vice-versa problems. Written by Joe
Pelkey.
-diff -ru actkbd-0.2.7.orig/actkbd.h actkbd-0.2.7/actkbd.h
actkbd-0.2.7.orig/actkbd.h 2006-05-02 13:24:01.0 -0400
-+++ actkbd-0.2.7/actkbd.h 2006-10-27 03:37:37.0 -0400
+--- a/actkbd.h
b/actkbd.h
@@ -122,7 +122,7 @@
typedef struct _attr_t attr_t;
struct _attr_t {
@@ -12,9 +11,8 @@ diff -ru actkbd-0.2.7.orig/actkbd.h actkbd-0.2.7/actkbd.h
attr_t *next; /* The next node */
};
-diff -ru actkbd-0.2.7.orig/config.c actkbd-0.2.7/config.c
actkbd-0.2.7.orig/config.c 2006-08-20 07:05:36.0 -0400
-+++ actkbd-0.2.7/config.c 2006-10-27 03:55:21.0 -0400
+--- a/config.c
b/config.c
@@ -107,7 +107,7 @@
strtolower(attrs);
while ((tmp = strsep(, ", \t")) != NULL) {