* [gentoo-commits] repo/gentoo:master commit in: app-misc/mouseremote/files/, app-misc/mouseremote/
@ 2016-04-26 20:19 Austin English
0 siblings, 0 replies; 3+ messages in thread
From: Austin English @ 2016-04-26 20:19 UTC (permalink / raw
To: gentoo-commits
commit: c25de1e5ab0c365ecee6a796bdd0693129957206
Author: Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 26 20:18:42 2016 +0000
Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 20:18:42 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c25de1e5
app-misc/mouseremote: use #!/sbin/openrc-run instead of #!/sbin/runscript
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=573846
Package-Manager: portage-2.2.26
app-misc/mouseremote/files/mouseremote.start | 4 +-
app-misc/mouseremote/mouseremote-0.90-r2.ebuild | 69 +++++++++++++++++++++++++
2 files changed, 71 insertions(+), 2 deletions(-)
diff --git a/app-misc/mouseremote/files/mouseremote.start b/app-misc/mouseremote/files/mouseremote.start
index e804e75..669fedf 100644
--- a/app-misc/mouseremote/files/mouseremote.start
+++ b/app-misc/mouseremote/files/mouseremote.start
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/app-misc/mouseremote/mouseremote-0.90-r2.ebuild b/app-misc/mouseremote/mouseremote-0.90-r2.ebuild
new file mode 100644
index 0000000..b0d3c1f
--- /dev/null
+++ b/app-misc/mouseremote/mouseremote-0.90-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+S="${WORKDIR}/MouseRemote"
+DESCRIPTION="X10 MouseRemote"
+HOMEPAGE="http://www4.pair.com/gribnif/ha/"
+SRC_URI="http://www4.pair.com/gribnif/ha/MouseRemote.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+DEPEND="virtual/perl-Time-HiRes"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ epatch "${FILESDIR}"/${P}-makefile.diff
+ epatch "${FILESDIR}"/${PN}-gentoo-${PVR}.diff
+}
+
+src_compile() {
+ cd MultiMouse && emake \
+ CC=$(tc-getCC) \
+ PREFIX=/usr \
+ LOCKDIR=/var/lock \
+ JMANDIR=/usr/share/man/ja_JP.ujis || die
+}
+
+src_install() {
+ dobin MultiMouse/multimouse || die
+ dosbin MultiMouse/multimoused || die
+
+ dodoc README MultiMouse/README.jis MultiMouse/README.newstuff || die
+ newdoc MultiMouse/README README.MultiMouse || die
+ newdoc client/MouseRemote.conf MouseRemote.conf.dist || die
+ newdoc client/MouseRemote.pl MouseRemote.pl.dist || die
+ newdoc client/MouseRemoteKeys.pl MouseRemoteKeys.pl.dist || die
+
+ newinitd "${FILESDIR}"/mouseremote.start mouseremote || die
+ newconfd "${FILESDIR}"/mouseremote.conf mouseremote || die
+}
+
+pkg_postinst() {
+ [ -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\""
+ elog " Identifier \"MouseREM\""
+ elog " Driver \"mouse\""
+ elog " Option \"Protocol\" \"MouseSystems\""
+ elog " Option \"Device\" \"/dev/mumse\""
+ elog "EndSection"
+ elog
+ elog "Don't forget to add the new device to the section \"ServerLayout\""
+ elog "like: InputDevice \"MouseREM\" \"SendCoreEvents\""
+ elog
+ elog "Enable the daemon with \"rc-update add mouseremote default\"."
+ elog
+ elog "Configure the daemon is run in /etc/conf.d/mouseremote."
+ elog
+ elog "See /usr/share/doc/${PF} on how to configure the buttons."
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/mouseremote/files/, app-misc/mouseremote/
@ 2021-03-24 16:07 Matt Turner
0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2021-03-24 16:07 UTC (permalink / raw
To: gentoo-commits
commit: e44a479a30ddad1e1617ea492714a7c3a56e6db8
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Sat Feb 13 01:25:20 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Mar 24 16:06:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e44a479a
app-misc/mouseremote: revbump for d-m-i
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/19438
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
app-misc/mouseremote/files/mouseremote.start-r1 | 28 ++++++++++
app-misc/mouseremote/mouseremote-0.90-r3.ebuild | 70 +++++++++++++++++++++++++
2 files changed, 98 insertions(+)
diff --git a/app-misc/mouseremote/files/mouseremote.start-r1 b/app-misc/mouseremote/files/mouseremote.start-r1
new file mode 100644
index 00000000000..fd6aa9c854f
--- /dev/null
+++ b/app-misc/mouseremote/files/mouseremote.start-r1
@@ -0,0 +1,28 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ use modules logger
+ before display-manager
+}
+
+checkconfig() {
+ [ -z "$DEV" ] || [ -z "$DRV" ] || return 0
+ eerror "You need to setup DEV and DRV in /etc/conf.d/mouseremote first"
+ return 1
+}
+
+start() {
+ checkconfig || return 1
+
+ ebegin "Starting X10 MouseRemote Server"
+ /usr/sbin/multimoused -${DRV} ${DEV} 2> /dev/null
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping X10 MouseRemote Server"
+ kill $(cat /var/lock/MultiMouse.pid)
+ eend ${?} "Failed to stop MouseRemote Server"
+}
diff --git a/app-misc/mouseremote/mouseremote-0.90-r3.ebuild b/app-misc/mouseremote/mouseremote-0.90-r3.ebuild
new file mode 100644
index 00000000000..a64b724d8b6
--- /dev/null
+++ b/app-misc/mouseremote/mouseremote-0.90-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="X10 MouseRemote"
+HOMEPAGE="http://www4.pair.com/gribnif/ha/"
+SRC_URI="http://www4.pair.com/gribnif/ha/MouseRemote.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="virtual/perl-Time-HiRes"
+
+S="${WORKDIR}/MouseRemote"
+
+src_prepare() {
+ eapply -p0 "${FILESDIR}"/${P}-makefile.diff
+ eapply "${FILESDIR}"/${P}-gentoo.diff
+ eapply -p0 "${FILESDIR}"/${P}-fix-warnings.diff
+
+ eapply_user
+}
+
+src_compile() {
+ cd MultiMouse && emake \
+ CC=$(tc-getCC) \
+ PREFIX=/usr \
+ LOCKDIR=/var/lock \
+ JMANDIR=/usr/share/man/ja_JP.ujis
+}
+
+src_install() {
+ dobin MultiMouse/multimouse
+ dosbin MultiMouse/multimoused
+
+ dodoc README MultiMouse/README.jis MultiMouse/README.newstuff
+ newdoc MultiMouse/README README.MultiMouse
+ newdoc client/MouseRemote.conf MouseRemote.conf.dist
+ newdoc client/MouseRemote.pl MouseRemote.pl.dist
+ newdoc client/MouseRemoteKeys.pl MouseRemoteKeys.pl.dist
+
+ newinitd "${FILESDIR}"/mouseremote.start-r1 mouseremote
+ newconfd "${FILESDIR}"/mouseremote.conf mouseremote
+}
+
+pkg_postinst() {
+ [ -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\""
+ elog " Identifier \"MouseREM\""
+ elog " Driver \"mouse\""
+ elog " Option \"Protocol\" \"MouseSystems\""
+ elog " Option \"Device\" \"/dev/mumse\""
+ elog "EndSection"
+ elog
+ elog "Don't forget to add the new device to the section \"ServerLayout\""
+ elog "like: InputDevice \"MouseREM\" \"SendCoreEvents\""
+ elog
+ elog "Enable the daemon with \"rc-update add mouseremote default\"."
+ elog
+ elog "Configure the daemon is run in /etc/conf.d/mouseremote."
+ elog
+ elog "See /usr/share/doc/${PF} on how to configure the buttons."
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/mouseremote/files/, app-misc/mouseremote/
@ 2022-10-24 19:26 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-10-24 19:26 UTC (permalink / raw
To: gentoo-commits
commit: ee51625a6652970c7e6fec02ab7ac65ab5403adf
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 24 16:35:25 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 24 19:21:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee51625a
app-misc/mouseremote: fix build w/ Clang 16
Closes: https://bugs.gentoo.org/874957
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/mouseremote-0.90-fix-clang-16.patch | 29 ++++++++++++++++++
.../files/mouseremote-0.90-fix-warnings.diff | 23 ---------------
.../files/mouseremote-0.90-fix-warnings.patch | 21 +++++++++++++
...0-gentoo.diff => mouseremote-0.90-gentoo.patch} | 10 +++----
...kefile.diff => mouseremote-0.90-makefile.patch} | 4 +--
app-misc/mouseremote/mouseremote-0.90-r3.ebuild | 34 ++++++++++------------
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
similarity index 60%
rename from app-misc/mouseremote/files/mouseremote-0.90-gentoo.diff
rename to 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
similarity index 76%
rename from app-misc/mouseremote/files/mouseremote-0.90-makefile.diff
rename to 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."
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-24 19:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-24 16:07 [gentoo-commits] repo/gentoo:master commit in: app-misc/mouseremote/files/, app-misc/mouseremote/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2022-10-24 19:26 Sam James
2016-04-26 20:19 Austin English
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox