gentoo resync : 19.04.2018

10 files changed, 11 insertions, 343 deletions

diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index b78a57a84427..faecf6736e8d 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/dispad/Manifest b/app-laptop/dispad/Manifest
index 8cca070ea0b2..28a061514883 100644
--- a/app-laptop/dispad/Manifest
+++ b/app-laptop/dispad/Manifest
@@ -1,3 +1,3 @@
 DIST dispad-0.3.1.tar.gz 97952 BLAKE2B 87c9866a396e9319aca5b4b68db6be4f937412e09b444736fd27e0a0150b7a19c56b87b60fda83881b902dfba042ca3cede18226562996912d20147ad8e4069e SHA512 fa9666e79de31f79f3567ae3b529c6df3cf56c134c1fe30d62b7d863d623c89abd6b1153de972507a3795c20001f11caf1e49926a402d145a048014aa97cd400
-EBUILD dispad-0.3.1.ebuild 535 BLAKE2B 0fa3395f8484454ed76bd3813171cd7daa04fb61b527b9a7db7bd84d1bd5b9dee8768b7ae5a80d16a1e266d3a536495558999c33da39ef3985773e6c30b217cf SHA512 07fd3f15382a0724cd94833a6a94095453f98212cf410f8de4c50c036498d6ee82dc77446b4f8b09df00066b3cb2349b38df7b96cfc031dbe732ace6acf025d5
+EBUILD dispad-0.3.1-r1.ebuild 547 BLAKE2B 5922ed255f1590a931fa7d42daa10b3115638653a38140c1421c696e3640c68153abbee8206d927e09c6b70fa2ae06a90342ba49f966d2cdd9ea76215b62bddf SHA512 5f28500868a7f2293b23f3cde6f84a40211147eb4536f0afbe659ba62334fb9c36727b6dc76856d0a86372c63b864b2c14cf0339febd03d2df4ce08cd661f8e0
 MISC metadata.xml 311 BLAKE2B f8f66bf0e47dd752b5ea040471d4f4ac065b6ecd0c11d371f3bd2b3240cf7dbd3b786e905a97f440c47a2f387bdfdc316e68b5993342ad1a7b04aa595173270e SHA512 7a28487c5bcdd8518abf28120e0f060c7b1c12d25c98759dd0d7254ae6c10ba0e7276cd240627aac07b5e462fa29ba2b8681f4cdb78cf8a465c6c928961293f1
diff --git a/app-laptop/dispad/dispad-0.3.1.ebuild b/app-laptop/dispad/dispad-0.3.1-r1.ebuild
index ea39e4aed2b1..f2e739c0d3a1 100644
--- a/app-laptop/dispad/dispad-0.3.1.ebuild
+++ b/app-laptop/dispad/dispad-0.3.1-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
+
 inherit autotools
 
 DESCRIPTION="Daemon to disable trackpads while typing"
@@ -15,11 +16,13 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-DEPEND="x11-libs/libX11
-	x11-libs/libXi
-	dev-libs/confuse"
+DEPEND="
+	dev-libs/confuse
+	x11-libs/libX11
+	x11-libs/libXi"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	default
 	eautoreconf -i
 }
diff --git a/app-laptop/lphdisk/Manifest b/app-laptop/lphdisk/Manifest
deleted file mode 100644
index 22795aa4fc1c..000000000000
--- a/app-laptop/lphdisk/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX lphdisk-0.9.1-gentoo.patch 8029 BLAKE2B c0f27d6a152117b876d6d7feb72e9c5e87859b7249d59c7aa72d6d3da02ef09904a23dd4aa834bea26046d08dee95bc21a2a2e908350175314144a27f241f234 SHA512 13617d95617e0a89a0f76a992247d2b9c4db104e8a409b0f23e51867789969f375596b082f75ad4c0a15dcef0ae809bf7938c5c150441c3165d1f1a612c17d81
-DIST lphdisk-0.9.1.tar.bz2 26343 BLAKE2B 4e75da917ff733d5f5dae188b301373bbed8f7772a48d0cfd6fa006987531c8124bcce8752216a49018c6a6db081b78d870d3588219c05435a6db9d9da861f76 SHA512 28bd93acd854e79009722e83f063c3704333ae97d7fadff194101f24bd9fdc81c98464a3c0e7bbaf6097a56bed19fc7798e108ec7872cc85f3e327fbfb942521
-EBUILD lphdisk-0.9.1-r2.ebuild 576 BLAKE2B caca950ff66ea248beea89bebc398d9006c5de3dff47c12091cbb05f4c2f4e84c536ca1248b539c00c1abbb01b58031edcaf0a86ec47c25a3930984da27285dd SHA512 1d7aa55d29399ea715e46e43990fd8917ec69da752dfcf2e47c3deee02e2f57dd6caf3e2a301bd16fc627f2540672a528db12aa4fd7410acba818339eeafab7f
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-laptop/lphdisk/files/lphdisk-0.9.1-gentoo.patch b/app-laptop/lphdisk/files/lphdisk-0.9.1-gentoo.patch
deleted file mode 100644
index 73e1b5a715f4..000000000000
--- a/app-laptop/lphdisk/files/lphdisk-0.9.1-gentoo.patch
+++ /dev/null
@@ -1,252 +0,0 @@
-diff -ur lphdisk-0.9.1.orig/lphdisk.c lphdisk-0.9.1/lphdisk.c
---- lphdisk-0.9.1.orig/lphdisk.c	2002-02-12 13:04:27.000000000 +0200
-+++ lphdisk-0.9.1/lphdisk.c	2008-12-08 12:21:29.000000000 +0200
-@@ -19,8 +19,10 @@
-       Be careful!
- */
- 
-+#define _LARGEFILE64_SOURCE
- #include <stdio.h>
- #include <stdlib.h>
-+#include <sys/types.h>
- #include <unistd.h>
- #include <string.h>
- #include <stdarg.h>
-@@ -29,8 +31,8 @@
- #include <fcntl.h>
- #include <sys/stat.h>
- #include <sys/io.h>
--#include "lrmi.h"
--#include "vbe.h"
-+#include <lrmi.h>
-+#include <vbe.h>
- 
- /* General Program Defines: */
- 
-@@ -100,58 +102,6 @@
- /*                      General Purpose Utility Routines                     */
- /*****************************************************************************/
- 
--/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
--/* The following is a hack to take advantage of the ext2 "_llseek" system    */
--/* call to do seeks to "long long" offsets under linux (this is needed to    */
--/* seek to sectors beyond 4194303 (2GB)).  This isn't directly supported by  */
--/* glibc, so we need to make our own interface function for it.  We should   */
--/* be able to get the _NR__llseek define from linux/unistd.h.  From this we  */
--/* can construct a wrapper to perform the right system call.                 */
--
--#include <linux/unistd.h>       /* for __NR__llseek */
--
--typedef long long lloff_t;
--
--#ifdef __NR__llseek
--
--static _syscall5(int,_llseek, unsigned int,fd, unsigned long,offset_high,
--                 unsigned long,offset_low, lloff_t *,result,
--                 unsigned int,origin)
--
--lloff_t llseek (unsigned int fd, lloff_t offset, unsigned int origin) {
--  lloff_t result;
--  int retval;
--
--  retval = _llseek (fd, ((unsigned long long) offset) >> 32,
--                   ((unsigned long long) offset) & 0xffffffff,
--                   &result, origin);
--  return (retval == -1 ? (lloff_t) retval : result);
--}
--
--#else /* __NR__llseek */
--
--/* Somehow, __NR__llseek wasn't in linux/unistd.h.  This shouldn't ever      */
--/* happen, but better safe than sorry.. The best we can do is emulate it     */
--/* with lseek, and hope we don't get an offset that's too large (throw an    */
--/* error if we do)                                                           */
--
--lloff_t llseek (unsigned int fd, lloff_t offset, unsigned int origin) {
--  off_t offt_offset = (off_t) offset;
--
--  if ((lloff_t)offt_offset != offset) {
--    /* converting to off_t and back yields different result, indicating an */
--    /* overflow.. */
--    errno = EINVAL;
--    return -1;
--  } else {
--    return lseek(fd, offt_offset, origin);
--  }
--}
--
--#endif /* __NR__llseek */
--
--/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
--
- #define get16(p) get_int_le(p,2)
- #define get32(p) get_int_le(p,4)
- 
-@@ -189,9 +139,9 @@
- /* success, nonzero on error. */
- 
- int seek_sector (int fd, size_t secno) {
--  lloff_t offset = (lloff_t) secno * SECTOR_SIZE;
-+  off64_t offset = (off64_t) secno * SECTOR_SIZE;
- 
--  if (llseek(fd, offset, SEEK_SET) == (lloff_t) -1)
-+  if (lseek64(fd, offset, SEEK_SET) == (off64_t) -1)
-     return -1;
- 
-   return 0;
-@@ -556,25 +506,29 @@
- 
- int meminfo_physmem(void) {
-   FILE *f;
--  unsigned int size;
-+  unsigned int size = 0;
-   int ramsize;
-+  char s[128];
- 
-   if (!(f = fopen(meminfo_filename, "r"))) {
-     debug("Unable to open %s: %s\n", meminfo_filename, strerror(errno));
-     return 0;
-   }
--  fscanf(f, "%*[^\n]\n");             /* Read the header line and discard it */
-  
--  if (fscanf(f, "Mem: %u", &size) != 1) {
-+  while (fgets(s, sizeof(s), f)) {
-+    if (sscanf(s, "MemTotal: %u", &size) == 1) {
-+      break;
-+    }
-+  }
-+  if (size == 0) {
-     debug("Parse of %s failed.\n", meminfo_filename);
-     return 0;
-   }
-   fclose(f);
- 
--  /* convert to KB and then round up to the next power of 2 (since RAM */
-+  /* size is in KB and then round up to the next power of 2 (since RAM */
-   /* sizes don't come in anything else, so this should correct for the */
-   /* kernel size, etc)                                                 */
--  size >>= 10;
-   debug("%s reports memory size of %d KB", meminfo_filename, size);
-   for (ramsize = 1; size; size >>= 1) ramsize <<= 1;
- 
-@@ -718,22 +672,22 @@
-   {"force",     0, 0, 'f'},
- {0,0,0,0}};
- 
--const char usage_string[] = "\
--Usage: %1$s [options] [device]
--Prepare a hibernation partition for APM suspend-to-disk.
--
--options:
--  -h, --help       Display brief usage and option information (this screen)
--  -p, --probeonly  Only calculate and display required size, do not format
--  -q, --quiet      Turn off informational messages, useful for scripts
--  -d, --debug      Turn on (verbose) debugging messages
--  -n, --nowrite    Do not actually write to the disk
--  -f, --force      **DANGEROUS**  Format without regard to potential problems
--
--'device' should be a raw disk device (not a partition).  The default device
--is /dev/hda.
--
--(%2$s)\n\n";
-+const char usage_string[] = ""
-+"Usage: %1$s [options] [device]\n"
-+"Prepare a hibernation partition for APM suspend-to-disk.\n"
-+"\n"
-+"options:\n"
-+"  -h, --help       Display brief usage and option information (this screen)\n"
-+"  -p, --probeonly  Only calculate and display required size, do not format\n"
-+"  -q, --quiet      Turn off informational messages, useful for scripts\n"
-+"  -d, --debug      Turn on (verbose) debugging messages\n"
-+"  -n, --nowrite    Do not actually write to the disk\n"
-+"  -f, --force      **DANGEROUS**  Format without regard to potential problems\n"
-+"\n"
-+"'device' should be a raw disk device (not a partition).  The default device\n"
-+"is /dev/hda.\n"
-+"\n"
-+"(%2$s)\n\n";
- 
- void print_usage (void) {
-   char *progname = rindex(argv0, '/');
-@@ -750,7 +704,7 @@
-   dev_t dev;
-   int partition;
-   int ramsize, vramsize, required_size;
--  size_t required_sectors;
-+  size_t required_sectors = 0;
- 
-   argv0 = argv[0];
- 
-@@ -821,9 +775,9 @@
-   }
- 
-   if (!required_size) {
--    if (!quiet_flag) printf("Reccomended partition size is unknown.\n");
-+    if (!quiet_flag) printf("Recommended partition size is unknown.\n");
-   } else {
--    if (!quiet_flag) printf("Reccomended partition size is %d MB"
-+    if (!quiet_flag) printf("Recommended partition size is %d MB"
-                             " (%d sectors)\n", ((required_size+1023) >> 10),
-                             required_sectors);
-   }
-@@ -923,7 +877,7 @@
- 
-   if ((pi[partition-1].size < required_sectors) && !quiet_flag) {
-     fprintf(stderr, "Warning: hibernate partition size (%d) is smaller than"
--                    " reccomended size (%d).\n", pi[partition-1].size,
-+                    " recommended size (%d).\n", pi[partition-1].size,
-             required_sectors);
-   }
- 
-diff -ur lphdisk-0.9.1.orig/Makefile lphdisk-0.9.1/Makefile
---- lphdisk-0.9.1.orig/Makefile	2002-02-12 11:06:46.000000000 +0200
-+++ lphdisk-0.9.1/Makefile	2008-12-08 12:26:49.000000000 +0200
-@@ -4,37 +4,28 @@
- #   lphdisk 0.9.1
- #
- 
--INSTALL_PREFIX = /usr/local
-+INSTALL_PREFIX = /usr
- 
--CFLAGS = -g -Wall
--LIBS =
--
--LRMIDIR = lrmi-0.6m
-+CFLAGS += -Wall
-+LIBS = -llrmi
- 
- all:       lphdisk
- 
--lphdisk:   lphdisk.o lrmi.o
--	$(CC) $(CFLAGS) -o lphdisk lphdisk.o lrmi.o $(LIBS)
--
--lphdisk.o: lphdisk.c lrmi.h vbe.h
--
--lrmi.o:
--	cd $(LRMIDIR) && $(MAKE) $@
--	cp $(LRMIDIR)/lrmi.o .
-+lphdisk:   lphdisk.o
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o lphdisk lphdisk.o $(LIBS)
- 
--%.h: $(LRMIDIR)/%.h
--	cp $^ $@
-+lphdisk.o: lphdisk.c
- 
- install: all
--	install -m 755 lphdisk $(INSTALL_PREFIX)/sbin
--	install -m 644 lphdisk.8 $(INSTALL_PREFIX)/man/man8
-+	mkdir -p $(DESTDIR)$(INSTALL_PREFIX)/sbin
-+	install -m 755 lphdisk $(DESTDIR)$(INSTALL_PREFIX)/sbin
-+	mkdir -p $(DESTDIR)$(INSTALL_PREFIX)/share/man/man8
-+	install -m 644 lphdisk.8 $(DESTDIR)$(INSTALL_PREFIX)/share/man/man8
- 
- clean:
--	cd $(LRMIDIR) && $(MAKE) $@
--	rm -f *.o lrmi.h vbe.h
-+	rm -f *.o
- 
- distclean: clean
--	cd $(LRMIDIR) && $(MAKE) $@
- 	rm -f lphdisk
- 
- .PHONY: all install clean distclean
diff --git a/app-laptop/lphdisk/lphdisk-0.9.1-r2.ebuild b/app-laptop/lphdisk/lphdisk-0.9.1-r2.ebuild
deleted file mode 100644
index 9139bb49d669..000000000000
--- a/app-laptop/lphdisk/lphdisk-0.9.1-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION="utility for preparing a hibernation partition for APM Suspend-To-Disk"
-HOMEPAGE="http://www.procyon.com/~pda/lphdisk/"
-SRC_URI="http://www.procyon.com/~pda/lphdisk/${P}.tar.bz2"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="sys-libs/lrmi"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_compile() {
-	tc-export CC
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
diff --git a/app-laptop/lphdisk/metadata.xml b/app-laptop/lphdisk/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-laptop/lphdisk/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-laptop/tp_smapi/Manifest b/app-laptop/tp_smapi/Manifest
index d9dd23107b91..2728a26c4f61 100644
--- a/app-laptop/tp_smapi/Manifest
+++ b/app-laptop/tp_smapi/Manifest
@@ -1,7 +1,7 @@
-AUX linux-4.15-timer_setup-fix.patch 1374 BLAKE2B 6d194a47b4b55bf27139d02b978ea99a5d095c20bf326b083134c3c4b0df4d489d03630edec055b92179f897709da6885706f5b33062bb64b1dad627f9a82b59 SHA512 9f4cf02891d051ecb04748f974b90b1d9228b3e9cff2c3c1715075cf7d23a75b5ecab375e80223f9456aede913c25bb88c7a49cac7022cf42141598c0f66b541
 AUX tp_smapi-0.40-confd 785 BLAKE2B da1e2a5ce6e441eebf1a3dffcce8a863688a525f6ee4c29537b1783e3283c5a0311e4317617cff4be8c35246accf69738778c6c34e4d2af77a18f23a1e84b363 SHA512 a08f0b15ea37f79e1a8b41b3a3a59421dcf26e482d2eaa269e7c3f728c142e68e8c130c8a53f4c14829436a20e1354318464de780d9fbe10777d7929d7944dca
 AUX tp_smapi-0.40-initd 1851 BLAKE2B 852fc13e2d74a570918c451966214ed8ca3daea9bdb66e856f48554261f4cafc8d8be7b76889a6a639f0dc1310d34036131a9982be0cdcf0e458707e7938b161 SHA512 ebf8ac628e00979f21e266fb6d187f02bfeeafc9482a0c5bed4fd4f092c7a27158747ccf629c802969ad2a8f13124276ef889927b3f1f01a7ce44fdcde103698
 DIST tp_smapi-0.42.tgz 39867 BLAKE2B 0f7285fe99766437d964780f3c9d88480a19ed07de155e1794b5c48f318846fbde4eb759e825af9f5da89fb20aee5e217f32e873a70c7d85f63e3a44b385b0f7 SHA512 1004b7ef961a9908c2144b26ea60b6dddabd83d60c11421a03e3b810f5b635415ef52656d6980915512d68f809f7bc3d662328f25d111537bd7e175d252cf83b
+DIST tp_smapi-0.43.tgz 40122 BLAKE2B e14caa05d741d14b03c56c57badc5900a47735bc58966b5195ca34269a6227ecc50518ee5ce8cf47a4aacb314a0ed0332b987098f3be024b6af9024df6efdf9b SHA512 ec2e40a248e7eb5bff2ad9e57087058a8b4706d564bd340daba5a4700ad8a5389d1f9ec29984516a1167827ae55c28240dafb558df29e1f758a4f7af80caa1e7
 EBUILD tp_smapi-0.42-r1.ebuild 1947 BLAKE2B 8b3ce3e2e96c025ee1236feb410019d9033b8633a476b346e6aae63d4b1a48940edf9a294de5d85c4e6eb2d337f654dfd5379439ed17548502fbec98ae03a872 SHA512 d09fe01652350951baaaf67af7ce32036515a1535cb9f774d2e0e2f92b0f79163babc3c19c554a37a15b5ddde3bf5a4904e95dfaa74274783911d2c5335fbbef
-EBUILD tp_smapi-0.42-r2.ebuild 2009 BLAKE2B 8ef125cc7f35bc868fed563da9bb880f3cc766c5df12a4d27e85c5e785132a715f02753d6b15882efeb11577b99f742c86831c4cf182e6cf213080cc0708b998 SHA512 9d851aa646bd312f5997e8b3a7d4c23b4d2e9ab4b18086d87fb5e8fbda32b449d6900b93ce4e45483c05ec3f3c40ee8e5b4952daf7d593ca1343172ce5c4f147
+EBUILD tp_smapi-0.43.ebuild 1949 BLAKE2B fa54b6dfafcb3dc842ca205e21deb68eab8f7f4c7fcc858680ed7742d3ab906e3f140aadbf736f4f92efc413b204a254017ea622e15432e2e3eb01712297ac4f SHA512 f88a84f395b578979f152437904224b5de061584e95fd4d635b014c1d4513b83af312d93914e804c7c96e75448d3649e6f2d41acf55267b23a00ab9cf6c2fff3
 MISC metadata.xml 473 BLAKE2B 9d19f4112fc0ac3e045c2d92e510bec52bbfbcd9bbca442d856598cc95f546592c4661b317215d35a6540a14e4bf68b3b826baa8c434a170e9841fce3706cc99 SHA512 21ce54c4cd204ddea9f1170f8e1b66e636bb2b541856ff541371bd572403519a09cf2367f5642a596684d66145bc9ab92396b102ef51086f2d22f96fc6c0b7af
diff --git a/app-laptop/tp_smapi/files/linux-4.15-timer_setup-fix.patch b/app-laptop/tp_smapi/files/linux-4.15-timer_setup-fix.patch
deleted file mode 100644
index 88c5580db181..000000000000
--- a/app-laptop/tp_smapi/files/linux-4.15-timer_setup-fix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 76c5120f7be4880cf2c6801f872327e4e70c449f Mon Sep 17 00:00:00 2001
-From: Jan Nordholz <jnordholz@sec.t-labs.tu-berlin.de>
-Date: Mon, 4 Dec 2017 03:27:11 +0100
-Subject: [PATCH] Adapt HDAPS driver to use the new timer_setup() interface.
-
-Linux 4.15 removed the ancient init_timer() API and changed the signature
-of the timer handler function.
-
-Signed-off-by: Jan Nordholz <jnordholz@sec.t-labs.tu-berlin.de>
-Closes: #31
----
- hdaps.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/hdaps.c b/hdaps.c
-index 0763c3a..76930a3 100644
---- a/hdaps.c
-+++ b/hdaps.c
-@@ -469,7 +469,11 @@ static void hdaps_calibrate(void)
- /* Timer handler for updating the input device. Runs in softirq context,
-  * so avoid lenghty or blocking operations.
-  */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
- static void hdaps_mousedev_poll(unsigned long unused)
-+#else
-+static void hdaps_mousedev_poll(struct timer_list *unused)
-+#endif
- {
- 	int ret;
- 
-@@ -779,8 +783,12 @@ static int __init hdaps_init(void)
- 			hdaps_invert = 0; /* default */
- 
- 	/* Init timer before platform_driver_register, in case of suspend */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
- 	init_timer(&hdaps_timer);
- 	hdaps_timer.function = hdaps_mousedev_poll;
-+#else
-+	timer_setup(&hdaps_timer, hdaps_mousedev_poll, 0);
-+#endif
- 	ret = platform_driver_register(&hdaps_driver);
- 	if (ret)
- 		goto out;
diff --git a/app-laptop/tp_smapi/tp_smapi-0.42-r2.ebuild b/app-laptop/tp_smapi/tp_smapi-0.43.ebuild
index e09bd1f674de..011865482566 100644
--- a/app-laptop/tp_smapi/tp_smapi-0.42-r2.ebuild
+++ b/app-laptop/tp_smapi/tp_smapi-0.43.ebuild
@@ -20,8 +20,6 @@ IUSE="hdaps"
 DEPEND="sys-apps/dmidecode"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/linux-4.15-timer_setup-fix.patch" )
-
 # This code is factored out of both pkg_pretend() and pkg_setup()
 # because the PMS states that ebuilds may not call phase functions
 # directly (see the "List of functions" section). This was bug #596616