gentoo auto-resync : 24:10:2022 - 21:52:37

7 files changed, 77 insertions, 53 deletions

diff --git a/app-misc/mouseremote/Manifest b/app-misc/mouseremote/Manifest
index 4031ae11629d..3f784701cc91 100644
--- a/app-misc/mouseremote/Manifest
+++ b/app-misc/mouseremote/Manifest
@@ -1,8 +1,9 @@
-AUX mouseremote-0.90-fix-warnings.diff 631 BLAKE2B ca0d5dfc9cdcb51a9a7426be220113a21aa12d2100503632cc6c7e56cee58174b2c81bc885abd152a67dbd7cd5fd35969434e429a6e83c128b20bfda77246733 SHA512 203b8df256510e98e5f46365c308b12c80fb7c92f164663ace8627e1ff9ae0e47c69912fe562e92466f289c0827d46f295b776ce43859d94b272ff6f8cf35a6f
-AUX mouseremote-0.90-gentoo.diff 1130 BLAKE2B f219bba9912a620a02a91881e6bce1d0558dfec032d1b926b4be7439b25a224a8655de2f054230a0705fa1a5777d1e997dde7f9c07f5d542937519e3cf178921 SHA512 607483c622f3347d3fad6de2f8c9eacd3a4f389baaa2bed94e72a6d5db65006c67231b92962ad08b1756983fe6af7d599b93bba880558867a032840942654e6b
-AUX mouseremote-0.90-makefile.diff 507 BLAKE2B c93decf07db9ad8f25c9ee8902b1e9841fe29e10c26cb1dc0c49736a3755edc25cd8545190b25aafc1b36d903e381f24e01fbf1a80efd04983f815883cdba09e SHA512 160efb2db998c42ab2efb34e8b462f3b709a03b8d4a8bf0be4c6c45c8204285e67bc6e5cecc4dd25ee71c6625b3e7653f83a2be8c51ed09103e2f119102b2ec0
+AUX mouseremote-0.90-fix-clang-16.patch 657 BLAKE2B e2895fae5d77955da31c150475311d49f2ed10bf8297a5f1d44c67a991ccecf1ffd9c91ec431ca6a6ba3816545011b538222dd111d677ea30b34f12563d0bd7a SHA512 fc91ef87a5bd918779601a89636f4df5ff0cc2db477e2c6dcc970f798a8e471ed095d0925c419b9a5256db76b161ebeaa0668f1a609a9fb3e06df8b99b3a01ca
+AUX mouseremote-0.90-fix-warnings.patch 381 BLAKE2B 54e7ed74c5dd232ab27faa5e9b8841a3e8262ea0e29cea31d85920c9863aea8bea1db15664109f4b0a87169ab4830ddd4a8aa9ce864fc66b32b6f2d3a2ba42bf SHA512 d0744b28ee5f45aece227fbe42ae3ba073b0855c282372169dc261e888a42fc263367689deae3309173a29e0e2c947ae0abe10a558091c6d3676dbb68ee6dc6f
+AUX mouseremote-0.90-gentoo.patch 804 BLAKE2B 5fb6bea89179c1ba0f5752ca6d72952d4a2da10f6ed20a32451c2a25af1f210ea1b174bb0d62c32c425607756c62eb4dff71b7595a8a2f11e2415020907ff487 SHA512 e7a01110d59b1f50d533d942098d3c2aabca3a61866a9f2cb6881a22a6759ab6b2105ce694003adade9a0e492f79c3a0e3296fdf0723825f2c1936ae3fc39cb5
+AUX mouseremote-0.90-makefile.patch 439 BLAKE2B e882c266ee4a04d461d9aef6fdfec8c595ee8cbfdb3b610f9c834c62ed12f0ad45858b27a47e5dcc58a7a254c173318c52e8ceeb658e31e4cd6df0a21761dd3a SHA512 874317c9b6ab47584b4c82973aa222e0d6bba693735f3bcf0aa3e90fb929e0871d1c3393ae87f3a00f8e191ce6be33b3b223dbae1cad20c541a518eab6ab0d79
 AUX mouseremote.conf 461 BLAKE2B 323401e37e6824b581ac63c947f5551b96bea35b9901310a039f86754ab35648b09b49fe5a01ce80be518fc6841b424d65c5ae5d1e64c8864035ca080183325a SHA512 b1e99866c0aec8036ea6bbd0e831afca79a5530ab1635fa1f6f407f7c49df5aa1df9c14e7e864fd6503063c05fc882792f6da4785e694865e4ef90d459a8e1f4
 AUX mouseremote.start-r1 607 BLAKE2B 5a260f70faf0fe6ff119c83193e04a497b9865616763de970b978a92e53c63a2ca4e7c36a9e35403ee2b23fe23baf8610bf17d07fd3b0d57eca6d8ef872418d6 SHA512 41783d068e8c3a2d835edde5b8e3d5f124418a80abeadd770d1b62d3fb2b7a654ae62a6008bfac074640fd61307f56dff66d953a234dc4aaa5a6cadd85bdfdc0
 DIST MouseRemote.tar.gz 41752 BLAKE2B 90e80bf4d6584db567e035c293460bbf4d30592fa6c25a6cf97769f4e9879b935ef597d8073f429e630e3fb4947f9e8cbdff7450cb5c3b64d0f482e576e2905d SHA512 d92ec4a1efda7e63cc02283b2aabcd6b42bedba17539371856e6ca3b6b5feaf9c306604db9a781836375afb6da226c16b8031f5f749d367857c2cde28e097483
-EBUILD mouseremote-0.90-r3.ebuild 1939 BLAKE2B a299b4475ce5029fa010e4acb82c8ee70754749cce9f87c74fc7a8e91b4040ddb91555bf844791fac83daa5c7d4f1b362bfe44da51e5842ab08cfd182e2cdc3f SHA512 7ee05d7a0faacdf0edfae7a43d343722fbbd23b4ae34d9159846fd0e4d052bfb6a77840795e60111ea2ecd808453433fd328067dd52bcd8c2ae4435a229942e2
+EBUILD mouseremote-0.90-r3.ebuild 1946 BLAKE2B 6247de2685888c1f6f3ffb03db47be2d337d064411cf0e6d6a470e7374dda1112e50c62b8ce99519e5091570a89e290feaad8b494a0a99dbf9085727890fe7eb SHA512 92672ad450b85454fa349d45fdc9ec38f27e8f151c40ba43b269f1fa707eb868b8a39de4f03be8540f37511380ec8664eebe2e95e477cbc615b621c09933aa04
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
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."
 }