app-misc/mouseremote: fix build w/ Clang 16

Closes: https://bugs.gentoo.org/874957
Signed-off-by: Sam James <sam@gentoo.org>

6 files changed, 72 insertions, 49 deletions

diff --git a/app-misc/mouseremote/files/mouseremote-0.90-fix-clang-16.patch b/app-misc/mouseremote/files/mouseremote-0.90-fix-clang-16.patch
new file mode 100644
index 000000000000..041a28041652
--- /dev/null
+++ b/app-misc/mouseremote/files/mouseremote-0.90-fix-clang-16.patch
@@ -0,0 +1,29 @@
+From 4363dd75d5df8c85869f0f6f5d3a22d561cff7e0 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 24 Oct 2022 17:28:49 +0100
+Subject: [PATCH] Fix build with Clang 16
+
+Bug: https://bugs.gentoo.org/874957
+--- a/MultiMouse/daemon.c
++++ b/MultiMouse/daemon.c
+@@ -78,6 +78,7 @@ int MakeMeDaemon()
+     setsid();
+     close(fileno(stderr));
+     kill(parent, SIGTERM);
++    return 0;
+ }
+ 
+ void SetSignals()
+--- a/MultiMouse/main.c
++++ b/MultiMouse/main.c
+@@ -30,6 +30,10 @@
+ 
+ #include "mumse.h"
+ 
++int MakeMeDaemon(void);
++void SetSignals(void);
++void Selection(int numMouse);
++
+ static
+ void InitMouse(int mfd, u_short baud, u_short cflag)
+ {
diff --git a/app-misc/mouseremote/files/mouseremote-0.90-fix-warnings.diff b/app-misc/mouseremote/files/mouseremote-0.90-fix-warnings.diff
deleted file mode 100644
index 63447b9bc4ce..000000000000
--- a/app-misc/mouseremote/files/mouseremote-0.90-fix-warnings.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur MultiMouse.orig/daemon.c MultiMouse/daemon.c
---- MultiMouse.orig/daemon.c	1999-10-09 20:08:58.000000000 +0000
-+++ MultiMouse/daemon.c	2016-04-27 22:36:59.133322312 +0000
-@@ -22,6 +22,7 @@
- #include <unistd.h>
- #include <sys/types.h>
- #include <signal.h>
-+#include <stdlib.h>
- 
- #include "mumse.h"
- 
-diff -ur MultiMouse.orig/main.c MultiMouse/main.c
---- MultiMouse.orig/main.c	1999-10-03 17:40:23.000000000 +0000
-+++ MultiMouse/main.c	2016-04-27 22:34:58.346647395 +0000
-@@ -25,6 +25,8 @@
- #include <sys/types.h>
- #include <sys/time.h>
- #include <signal.h>
-+#include <stdlib.h>
-+#include <string.h>
- 
- #include "mumse.h"
- 
diff --git a/app-misc/mouseremote/files/mouseremote-0.90-fix-warnings.patch b/app-misc/mouseremote/files/mouseremote-0.90-fix-warnings.patch
new file mode 100644
index 000000000000..11a7e63b850b
--- /dev/null
+++ b/app-misc/mouseremote/files/mouseremote-0.90-fix-warnings.patch
@@ -0,0 +1,21 @@
+--- a/MultiMouse/daemon.c
++++ b/MultiMouse/daemon.c
+@@ -22,6 +22,7 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <signal.h>
++#include <stdlib.h>
+ 
+ #include "mumse.h"
+ 
+--- a/MultiMouse/main.c
++++ b/MultiMouse/main.c
+@@ -25,6 +25,8 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <signal.h>
++#include <stdlib.h>
++#include <string.h>
+ 
+ #include "mumse.h"
+ 
diff --git a/app-misc/mouseremote/files/mouseremote-0.90-gentoo.diff b/app-misc/mouseremote/files/mouseremote-0.90-gentoo.patch
index d86902e37ed5..1d73ffeb8725 100644
--- a/app-misc/mouseremote/files/mouseremote-0.90-gentoo.diff
+++ b/app-misc/mouseremote/files/mouseremote-0.90-gentoo.patch
@@ -1,6 +1,5 @@
-diff -Naur MouseRemote.ORG/client/MouseRemote.conf MouseRemote/client/MouseRemote.conf
---- MouseRemote.ORG/client/MouseRemote.conf	Sat Oct  9 21:03:42 1999
-+++ MouseRemote/client/MouseRemote.conf	Sat May  4 16:04:43 2002
+--- a/client/MouseRemote.conf
++++ b/client/MouseRemote.conf
 @@ -61,3 +61,35 @@
  
  # Definitions for the DVD device
@@ -37,9 +36,8 @@ diff -Naur MouseRemote.ORG/client/MouseRemote.conf MouseRemote/client/MouseRemot
 +TxtOff
 +TxtTrns
 +Rec
-diff -Naur MouseRemote.ORG/client/MouseRemoteKeys.pl MouseRemote/client/MouseRemoteKeys.pl
---- MouseRemote.ORG/client/MouseRemoteKeys.pl	Sun Oct 10 00:09:42 1999
-+++ MouseRemote/client/MouseRemoteKeys.pl	Sat May  4 15:58:58 2002
+--- a/client/MouseRemoteKeys.pl
++++ b/client/MouseRemoteKeys.pl
 @@ -11,6 +11,7 @@
  	play =>		0x0d,
  	stop =>		0x0e,
diff --git a/app-misc/mouseremote/files/mouseremote-0.90-makefile.diff b/app-misc/mouseremote/files/mouseremote-0.90-makefile.patch
index 2f6fb8a81f15..560740c67a2e 100644
--- a/app-misc/mouseremote/files/mouseremote-0.90-makefile.diff
+++ b/app-misc/mouseremote/files/mouseremote-0.90-makefile.patch
@@ -1,5 +1,5 @@
---- MultiMouse/Makefile	1997-08-21 08:52:56.000000000 -0400
-+++ MultiMouse/Makefile	2010-08-13 00:05:47.000000000 -0400
+--- a/MultiMouse/Makefile
++++ b/MultiMouse/Makefile
 @@ -20,14 +20,13 @@
  	-DMOUSE_FIFO=\"$(FIFO)\"\
  	-DLOCKDIR=\"$(LOCKDIR)\"\
diff --git a/app-misc/mouseremote/mouseremote-0.90-r3.ebuild b/app-misc/mouseremote/mouseremote-0.90-r3.ebuild
index 5827c8e764a0..3c211b40c07a 100644
--- a/app-misc/mouseremote/mouseremote-0.90-r3.ebuild
+++ b/app-misc/mouseremote/mouseremote-0.90-r3.ebuild
@@ -1,36 +1,34 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="X10 MouseRemote"
 HOMEPAGE="http://www4.pair.com/gribnif/ha/"
 SRC_URI="http://www4.pair.com/gribnif/ha/MouseRemote.tar.gz"
+S="${WORKDIR}"/MouseRemote
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 
-DEPEND="virtual/perl-Time-HiRes"
-
-S="${WORKDIR}/MouseRemote"
+RDEPEND="virtual/perl-Time-HiRes"
 
-src_prepare() {
-	eapply -p0 "${FILESDIR}"/${P}-makefile.diff
-	eapply "${FILESDIR}"/${P}-gentoo.diff
-	eapply -p0 "${FILESDIR}"/${P}-fix-warnings.diff
-
-	eapply_user
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-fix-warnings.patch
+	"${FILESDIR}"/${P}-fix-clang-16.patch
+)
 
 src_compile() {
-	cd MultiMouse && emake \
+	emake -C MultiMouse \
 		CC="$(tc-getCC)" \
 		PREFIX=/usr \
 		LOCKDIR=/var/lock \
-	    JMANDIR=/usr/share/man/ja_JP.ujis
+		JMANDIR=/usr/share/man/ja_JP.ujis
 }
 
 src_install() {
@@ -48,8 +46,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	[ -e /dev/mumse ] || mkfifo "${ROOT}"/dev/mumse
-	[ -e /dev/x10fifo ] || mkfifo "${ROOT}"/dev/x10fifo
+	[[ -e /dev/mumse ]] || mkfifo "${ROOT}"/dev/mumse
+	[[ -e /dev/x10fifo ]] || mkfifo "${ROOT}"/dev/x10fifo
 
 	elog "To use the mouse function in X, add the following to your XF86Config"
 	elog "Section \"InputDevice\""
@@ -64,7 +62,7 @@ pkg_postinst() {
 	elog
 	elog "Enable the daemon with \"rc-update add mouseremote default\"."
 	elog
-	elog "Configure the daemon is run in /etc/conf.d/mouseremote."
+	elog "Configure the daemon is run in ${EROOT}/etc/conf.d/mouseremote."
 	elog
-	elog "See /usr/share/doc/${PF} on how to configure the buttons."
+	elog "See ${EROOT}/usr/share/doc/${PF} on how to configure the buttons."
 }