gentoo resync : 14.07.2018

8 files changed, 148 insertions, 0 deletions

diff --git a/app-misc/spacenavd/files/99-space-navigator.rules b/app-misc/spacenavd/files/99-space-navigator.rules
new file mode 100644
index 000000000000..ef2640e65715
--- /dev/null
+++ b/app-misc/spacenavd/files/99-space-navigator.rules
@@ -0,0 +1,5 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2 or later
+
+# Start daemon on insertion of a SpaceNavigator device
+SUBSYSTEM=="usb", ACTION=="add", ATTRS{manufacturer}=="3Dconnexion", ATTRS{product}=="Space Navigator", RUN+="/etc/init.d/spacenavd --quiet start"
diff --git a/app-misc/spacenavd/files/99-space-navigator.rules-r1 b/app-misc/spacenavd/files/99-space-navigator.rules-r1
new file mode 100644
index 000000000000..fa5dc93fcca5
--- /dev/null
+++ b/app-misc/spacenavd/files/99-space-navigator.rules-r1
@@ -0,0 +1,6 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2 or later
+
+# Start daemon on insertion of a SpaceNavigator device
+SUBSYSTEM=="usb", ACTION=="add", ATTRS{manufacturer}=="3Dconnexion", ATTRS{product}=="Space Navigator", RUN+="/etc/init.d/spacenavd --quiet start"
+SUBSYSTEM=="usb", ACTION=="add", ATTRS{manufacturer}=="3Dconnexion", ATTRS{product}=="SpaceNavigator", TAG+="systemd", ENV{SYSTEMD_WANTS}+="spacenavd.service"
diff --git a/app-misc/spacenavd/files/99-space-navigator.rules-r2 b/app-misc/spacenavd/files/99-space-navigator.rules-r2
new file mode 100644
index 000000000000..47d013275b61
--- /dev/null
+++ b/app-misc/spacenavd/files/99-space-navigator.rules-r2
@@ -0,0 +1,6 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2 or later
+
+# Start daemon on insertion of a SpaceNavigator device
+SUBSYSTEM=="usb", ACTION=="add", ATTRS{manufacturer}=="3Dconnexion", ATTRS{product}=="Space*", RUN+="/etc/init.d/spacenavd --quiet start"
+SUBSYSTEM=="usb", ACTION=="add", ATTRS{manufacturer}=="3Dconnexion", ATTRS{product}=="Space*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="spacenavd.service"
diff --git a/app-misc/spacenavd/files/spacenavd-0.5-custom-flags.patch b/app-misc/spacenavd/files/spacenavd-0.5-custom-flags.patch
new file mode 100644
index 000000000000..3b834a43952d
--- /dev/null
+++ b/app-misc/spacenavd/files/spacenavd-0.5-custom-flags.patch
@@ -0,0 +1,67 @@
+diff -Npur spacenavd-0.5.orig/Makefile.in spacenavd-0.5/Makefile.in
+--- spacenavd-0.5.orig/Makefile.in	2012-01-31 22:22:20.460368687 +0100
++++ spacenavd-0.5/Makefile.in	2012-01-31 22:23:18.170367675 +0100
+@@ -6,8 +6,8 @@ ctl = spnavd_ctl
+ 
+ CC = gcc
+ INSTALL = install
+-CFLAGS = -pedantic -Wall $(dbg) $(opt) -fno-strict-aliasing -I$(srcdir)/src
+-LDFLAGS = $(xlib)
++CFLAGS = $(opt) -fno-strict-aliasing -I$(srcdir)/src
++LDFLAGS = $(ldopt) $(xlib)
+ 
+ $(bin): $(obj)
+ 	$(CC) -o $@ $(obj) $(LDFLAGS)
+diff -Npur spacenavd-0.5.orig/configure spacenavd-0.5/configure
+--- spacenavd-0.5.orig/configure	2012-01-31 22:22:20.460368687 +0100
++++ spacenavd-0.5/configure	2012-01-31 22:22:49.257368187 +0100
+@@ -28,6 +28,7 @@ test_kver() {
+ 
+ PREFIX=/usr/local
+ OPT=yes
++LDOPT=yes
+ DBG=yes
+ X11=yes
+ HOTPLUG=yes
+@@ -70,6 +71,11 @@ for arg; do
+ 	--disable-opt)
+ 		OPT=no;;
+ 
++	--enable-ldopt)
++		LDOPT=yes;;
++	--disable-ldopt)
++		LDOPT=no;;
++
+ 	--enable-debug)
+ 		DBG=yes;;
+ 	--disable-debug)
+@@ -95,6 +101,8 @@ for arg; do
+ 		echo '  --disable-hotplug: disable hotplug, fallback to polling for the device'
+ 		echo '  --enable-opt: enable speed optimizations (default)'
+ 		echo '  --disable-opt: disable speed optimizations'
++		echo '  --enable-ldopt: enable link optimizations (default)'
++		echo '  --disable-ldopt: disable link optimizations'
+ 		echo '  --enable-debug: include debugging symbols (default)'
+ 		echo '  --disable-debug: do not include debugging symbols'
+ 		echo 'all invalid options are silently ignored'
+@@ -105,6 +113,7 @@ done
+ 
+ echo "  prefix: $PREFIX"
+ echo "  optimize for speed: $OPT"
++echo "  optimize link: $LDOPT"
+ echo "  include debugging symbols: $DBG"
+ echo "  x11 communication method: $X11"
+ echo "  use hotplug: $HOTPLUG"
+@@ -128,7 +137,11 @@ if [ "$DBG" = 'yes' ]; then
+ fi
+ 
+ if [ "$OPT" = 'yes' ]; then
+-	echo 'opt = -O3' >>Makefile
++	echo "opt = ${CFLAGS:--O3}" >>Makefile
++fi
++
++if [ "$LDOPT" = 'yes' ]; then
++	echo "ldopt = ${LDFLAGS}" >>Makefile
+ fi
+ 
+ if [ "$X11" = 'yes' ]; then
diff --git a/app-misc/spacenavd/files/spacenavd-0.5-destdir.patch b/app-misc/spacenavd/files/spacenavd-0.5-destdir.patch
new file mode 100644
index 000000000000..5b2372242e14
--- /dev/null
+++ b/app-misc/spacenavd/files/spacenavd-0.5-destdir.patch
@@ -0,0 +1,16 @@
+diff -Npur spacenavd-0.5.orig/Makefile.in spacenavd-0.5/Makefile.in
+--- spacenavd-0.5.orig/Makefile.in	2011-11-16 21:43:53.210859753 +0100
++++ spacenavd-0.5/Makefile.in	2011-11-16 21:45:36.386857932 +0100
+@@ -24,9 +24,9 @@ clean:
+ 
+ .PHONY: install
+ install: $(bin)
+-	$(INSTALL) -d $(PREFIX)/bin
+-	$(INSTALL) -m 755 $(bin) $(PREFIX)/bin/$(bin)
+-	$(INSTALL) -m 755 $(srcdir)/$(ctl) $(PREFIX)/bin/$(ctl)
++	$(INSTALL) -d $(DESTDIR)$(PREFIX)/bin
++	$(INSTALL) -m 755 $(bin) $(DESTDIR)$(PREFIX)/bin/$(bin)
++	$(INSTALL) -m 755 $(srcdir)/$(ctl) $(DESTDIR)$(PREFIX)/bin/$(ctl)
+ 	cd $(srcdir) && ./setup_init --no-install
+ 
+ #	[ -d /etc/hal/fdi/policy ] && \
diff --git a/app-misc/spacenavd/files/spacenavd-0.5-no-x11.patch b/app-misc/spacenavd/files/spacenavd-0.5-no-x11.patch
new file mode 100644
index 000000000000..bbdd7d6196ec
--- /dev/null
+++ b/app-misc/spacenavd/files/spacenavd-0.5-no-x11.patch
@@ -0,0 +1,13 @@
+diff -Npur spacenavd-0.5.old/src/event.c spacenavd-0.5/src/event.c
+--- src/event.c	2012-03-21 22:15:37.093401293 +0100
++++ src/event.c	2012-03-21 22:14:10.734401301 +0100
+@@ -20,7 +20,9 @@ along with this program.  If not, see <h
+ #include <stdlib.h>
+ #include "event.h"
+ #include "client.h"
++#ifdef USE_X11
+ #include "proto_x11.h"
++#endif
+ #include "proto_unix.h"
+ #include "spnavd.h"
+ 
diff --git a/app-misc/spacenavd/files/spacenavd.service b/app-misc/spacenavd/files/spacenavd.service
new file mode 100644
index 000000000000..b9b14d80086a
--- /dev/null
+++ b/app-misc/spacenavd/files/spacenavd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=3Dconnexion Input Devices Userspace Driver
+
+[Service]
+ExecStart=/usr/bin/spacenavd -d
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-misc/spacenavd/files/spnavd b/app-misc/spacenavd/files/spnavd
new file mode 100644
index 000000000000..6bbe49a7bbf0
--- /dev/null
+++ b/app-misc/spacenavd/files/spnavd
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+depend() {
+        need localmount
+        after bootmisc
+}
+
+start() {
+        ebegin "Starting Spacenav system daemon"
+
+        start-stop-daemon --start --pidfile /var/run/spnavd.pid --exec /usr/bin/spacenavd
+        eend $?
+}
+
+stop() {
+        local retval
+
+        ebegin "Stopping Spacenav system daemon"
+
+        start-stop-daemon --stop --pidfile /var/run/spnavd.pid
+        retval=$?
+
+        eend ${retval}
+        return ${retval}
+}