gentoo resync : 05.02.2020

5 files changed, 143 insertions, 3 deletions

diff --git a/app-misc/spacenavd/Manifest b/app-misc/spacenavd/Manifest
index 3221c4960b20..7708578e338a 100644
--- a/app-misc/spacenavd/Manifest
+++ b/app-misc/spacenavd/Manifest
@@ -4,11 +4,15 @@ AUX 99-space-navigator.rules-r2 461 BLAKE2B b97685a2c3c628bd5a52e66d044d2ef8123c
 AUX spacenavd-0.5-custom-flags.patch 2008 BLAKE2B 789dc350c1ef63c052e5ff298dcdd0c0ea4a2911153b51a01d3b933c855865d752e5cda72eb23fbdfa0c4170469b0858e205b724dc1cd4b52d497ea114748af1 SHA512 547d9f3098846901418acb71be996cec39bf18616e4a7eee5fc09bc201bfb2a534ff70f38d515b0f6c685330d002ea277c03b448ba70de4a3df65e6286780174
 AUX spacenavd-0.5-destdir.patch 649 BLAKE2B 7a3159e7820c03cc5d38ca54a732abc46c2436e277353283c0bd70fb3f0e3d60adc99f925b5c94d5873cb9a8234e12c86fa1dcf549f87c9fb008b6d46e18655e SHA512 4330ae7b49e661a60f01931716f9924c01cade4e169b3de48ec08039099ce10c6dfe5c8df9a3b01c1890ccb83b3c92d45ea06f5fd9465c3f1514902cc375e1f0
 AUX spacenavd-0.5-no-x11.patch 388 BLAKE2B 14c4cac74d5eb13d2c3619b5dde2296f934dfb6215dfe72538d2135eaddf39097100d6e048fe8dfe5e3acaddba02582d7195f7537a6e10b2bdd4e97864430a0a SHA512 d6cb2d6337b3e19ef56f5e0ccbfdc731b038009df852b3d1f7272001aa18e70a1701c3af2d1b4976cac7392a6176c0f4cee787d2c9b4b96ba029d1cc0db3d7ae
+AUX spacenavd-0.7-gcc10.patch 842 BLAKE2B f86fe95b3ac6936ca4be6712fd0712cc4c389502988739df6b06e6e5321d8420e6adb31befa373e647d1c10ee4fc9b8425d97a9677c85994eab09d05ebf06aac SHA512 72b27ba6731159fa795ddebe11f0bd2a212f3887909ca1af61d3d79fa55d3546ea31a5ced529a4558ea071d6fad3739270fcc4111282d7801ce59207fe5478b9
+AUX spacenavd-0.7-no-x11.patch 566 BLAKE2B a70e491277adce00ba0c42b088957a151bc5133abf75b52ed8c215eca5773b7ecdbe4ca8c0f17061b5e31b86066a75eb4e351aa84b43d23a9da9835736547eef SHA512 3ab741b594c5922221a34f4091665429da4735b0678c16ebc0d183c6317e1ee804e2b152e26042cb4981ff5487a49e283ce77c9a0232a13e38c87bb478f960a9
 AUX spacenavd.service 143 BLAKE2B 43621538a7362ccd655ed06517865b0b4f7b992aa6ded4765d8b4cba3a347e260c15d21792d4e0ee3d31cd7817a641cb2f8c42989bdc2a1f20d0fd4521fa2e20 SHA512 1f2fd8bf2bdffe3e52f5e2e53e0643e0d5ad5134bfd636ebc2c98f397da5c87bca3582fd76f9e987fb6ed3d17130196f4eee193998f97e388dc04877277c04d5
 AUX spnavd 580 BLAKE2B 948a29de5edffd17643ba2540b9a787e578e6114cef0d7536120f9a6f0b69e2dedb65a80cd8dc6827ae9f75500d1d13eadc83431927eda159cc3705f53f3bee5 SHA512 460ce173a1a68ab571fb39a0a00bdedcffaee5251037cc5787ecf90054f67333537087b3fabfd4a0e5b28acb5f72a7ef9b2bf50e9279336cdf95a18ecec13ce5
 DIST spacenavd-0.5.tar.gz 41746 BLAKE2B bd97cb9ad1ce684cbe0f39e03db0fe0a9cead9aa4a8142546632397fa923fc1067e2d33ea0270625b5bb06bc784c75f0e9ae49cfba7194d23537a7427abe1e68 SHA512 908f598e4ba5febbc1191cc32cd444817acd40c22e79b1f139c50787e1e25d4cd8328dc3fd6d9dde09bb80232b52f0e75ae429fb3345eb51fbe5a47577b038e2
 DIST spacenavd-0.6.tar.gz 54730 BLAKE2B 5d158ebb190359c6e6c2a20093f824f176e028c0d375ab4aadc635f7b26884df2ae58585e82dc3978892d04d139cc6c4704fedc300508f9314478f19d4ee11b6 SHA512 ff039e169805365ce8c1df1258eda6d263a0724c087b22a9e78269629455580817027d936e6bb7014b7654f48aa23232e8059585175003034e4bd3e0d6ed8200
+DIST spacenavd-0.7.tar.gz 55634 BLAKE2B a4257bc48e4b7973413cfc74fb4157cc93d27dd8e4c45142bfa0d8b30b94e517cff1e003c9b7216b498539a529bcfe623a5dfec48644a34c1bd300eb07d297a7 SHA512 241ed0ecf78fe683ae1ccda1e69afcee82f6ad55439516a5e02d3ff7eea1a4c5903e778e41f3e0d8b6f5dcbb8fec572a52e0be108a081bccb5a279af2277b615
 EBUILD spacenavd-0.5-r5.ebuild 2319 BLAKE2B 7f555ec38a828848ff3686def93a853a3a3b1c8af40274c7f040b3143f1d0f44c71d9931f0587db9c48a23aa8085fe3297c6d53fff4b9ffea23c4a894e362f4f SHA512 4fca63971153edfb5a69ca8cf40e543edcfd3f8c97ec729fc3afb550d00027566097f409a46c15bc2585dfe833e63208f709e3d713e58cdef2e730cd58c95444
 EBUILD spacenavd-0.5-r6.ebuild 2303 BLAKE2B 2acc81a1da275309f5fa0d9dd6931f9242107a7622467c23b37b0b0ff401bc6c560bae31a614c281527183e2464dd9ec09f95584a07a79b8b9e556f74cf6ebe0 SHA512 aeb2e1501a7a0c40f94c809994c29dc902a142362b5d5802d4a3354b62dd9c7880699eb2ba9c79a3f288cc301d453177e24ec9850c40b26758c2bfd82740d31b
-EBUILD spacenavd-0.6.ebuild 2230 BLAKE2B f536ec95b124cce754294a8e5664c0d3b23d907ef74d296ba910ef09a1e1fa12a4205719b9d72eadc07bed677e0ec0995cfea0c9f926cd819bdb01922b2cc413 SHA512 aa5c1d28e0f21c2a12abce33b32001df0b708d0424136694ca222b9016a701af08eadf7d78141483720c7b72871313389286abfd70bd3fbd573ab5d4d65be827
+EBUILD spacenavd-0.6.ebuild 2306 BLAKE2B 01eec5ed89107490cdd2bfe2072e20e158ba05496a3f0bf16df8c796c08273cbe0b049aa22bf4f926aad70c60ff24f5569dbd9f519478c6dae826b7846a6df18 SHA512 f7aba939a76ee95ebc349c9ede93f733465c2d18f82e3736a314633d196c9e54a0824327172682ae9523822f0e397937a98696ee92847269970ee6f29c47a5d2
+EBUILD spacenavd-0.7.ebuild 2318 BLAKE2B 65b96c40800e50e3843c3b0124680ab242352fd71f1577d97d325cc330e4077c69e37e62ccbbbf504eac189422c6c9b85eba9464166b5a56217499c89bf50367 SHA512 0c86a6419e8db433d1bab2fd78f88b7bb5e2b81b0dc42d6c3dbc8455e632ea4fff7747764b5b42eeedeb55a932842e24161e7d5b55240767efe3b994b1dc3a7e
 MISC metadata.xml 804 BLAKE2B 88ee8f585c24c42670e3e251bd751d712752c0e9566828c8f00dadfda7d732ec75cf970398cfe73d9e81c3f556d74c48b1845bce4230f2fe524f5a8d7cd7a70a SHA512 edc302270122ef31692806ec2fec3836cd51afcb9eabeaf5f1fb8d66e2ab703eb615efa431b3f78fe6427a6f976b90f769cbd001dfe2832bc2ce9986731e26b0
diff --git a/app-misc/spacenavd/files/spacenavd-0.7-gcc10.patch b/app-misc/spacenavd/files/spacenavd-0.7-gcc10.patch
new file mode 100644
index 000000000000..485aa6c59338
--- /dev/null
+++ b/app-misc/spacenavd/files/spacenavd-0.7-gcc10.patch
@@ -0,0 +1,24 @@
+From 081182f1675bb69eec58d92698f1ba2f23466d3f Mon Sep 17 00:00:00 2001
+From: John Tsiombikas <nuclear@member.fsf.org>
+Date: Sat, 1 Feb 2020 01:19:14 +0200
+Subject: [PATCH] GCC 10 changes the default from -fcommon to -fno-common, so
+ we need to set it explicitly now. Closes github bug #17.
+
+---
+ Makefile.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 9eba102..abf62c9 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -7,7 +7,8 @@ ctl = spnavd_ctl
+ 
+ CC = gcc
+ INSTALL = install
+-CFLAGS = -pedantic -Wall $(dbg) $(opt) -fno-strict-aliasing -I$(srcdir)/src -I/usr/local/include $(add_cflags)
++CFLAGS = -pedantic -Wall $(dbg) $(opt) -fno-strict-aliasing -fcommon \
++		 -I$(srcdir)/src -I/usr/local/include $(add_cflags)
+ LDFLAGS = -L/usr/local/lib $(xlib) $(add_ldflags)
+ 
+ $(bin): $(obj)
diff --git a/app-misc/spacenavd/files/spacenavd-0.7-no-x11.patch b/app-misc/spacenavd/files/spacenavd-0.7-no-x11.patch
new file mode 100644
index 000000000000..8dbdb7df3151
--- /dev/null
+++ b/app-misc/spacenavd/files/spacenavd-0.7-no-x11.patch
@@ -0,0 +1,24 @@
+From 3168b1dedf88c9026683ed43ea337814003d6802 Mon Sep 17 00:00:00 2001
+From: John Tsiombikas <nuclear@member.fsf.org>
+Date: Sat, 1 Feb 2020 22:08:43 +0200
+Subject: [PATCH] add a USE_X11 ifdef around the call to drop_xinput in
+ src/dev.c to fix non-X11 build. This should fix github issue #19.
+
+---
+ src/dev.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/dev.c b/src/dev.c
+index 8b72932..2074895 100644
+--- a/src/dev.c
++++ b/src/dev.c
+@@ -88,7 +88,9 @@ int init_devices(void)
+ 		return -1;
+ 	}
+ 
++#ifdef USE_X11
+ 	drop_xinput();
++#endif
+ 	return 0;
+ }
+ 
diff --git a/app-misc/spacenavd/spacenavd-0.6.ebuild b/app-misc/spacenavd/spacenavd-0.6.ebuild
index 86b0c8ae3156..bbf5b9cf9e04 100644
--- a/app-misc/spacenavd/spacenavd-0.6.ebuild
+++ b/app-misc/spacenavd/spacenavd-0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit linux-info systemd toolchain-funcs udev
+inherit epatch linux-info systemd toolchain-funcs udev
 
 MY_PN='spacenav'
 DESCRIPTION="The spacenavd daemon provides free alternative to the 3dxserv daemon"
@@ -23,6 +23,11 @@ pkg_setup() {
 	check_extra_config
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.7-gcc10.patch
+	default
+}
+
 src_configure() {
 	econf \
 		--disable-debug \
diff --git a/app-misc/spacenavd/spacenavd-0.7.ebuild b/app-misc/spacenavd/spacenavd-0.7.ebuild
new file mode 100644
index 000000000000..4c5a57fdbfa3
--- /dev/null
+++ b/app-misc/spacenavd/spacenavd-0.7.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info systemd toolchain-funcs udev
+
+MY_PN='spacenav'
+DESCRIPTION="The spacenavd daemon provides free alternative to the 3dxserv daemon"
+HOMEPAGE="http://spacenav.sourceforge.net/"
+SRC_URI="https://github.com/FreeSpacenav/spacenavd/releases/download/v${PV}/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="X"
+
+RDEPEND="X? ( x11-apps/xdpyinfo x11-libs/libXi )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc10.patch
+	"${FILESDIR}"/${P}-no-x11.patch
+)
+
+pkg_setup() {
+	CONFIG_CHECK="~INPUT_EVDEV"
+	ERROR_CFG="Your kernel needs INPUT_EVDEV for the spacenavd to work properly"
+	check_extra_config
+}
+
+src_configure() {
+	econf \
+		--disable-debug \
+		--enable-hotplug \
+		--disable-opt \
+		$(use_enable X x11)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		add_cflags="${CFLAGS}" \
+		add_ldflags="${LDFLAGS}"
+}
+
+src_install() {
+	# Config file
+	insinto /etc
+	newins "${S}/doc/example-spnavrc" spnavrc.sample
+
+	# Init script
+	newinitd "${FILESDIR}/spnavd" spacenavd
+	systemd_dounit "${FILESDIR}/spacenavd.service"
+
+	# Install udev rule but leave activiation to the user
+	# since Xorg may be configured to grab the device already
+	udev_newrules "${FILESDIR}"/99-space-navigator.rules-r2 99-space-navigator.rules.ignored
+
+	# Daemon
+	dobin "${S}/spacenavd"
+	use X && dobin "${S}/spnavd_ctl"
+}
+
+pkg_postinst() {
+	elog "To start the Spacenav daemon system-wide by default"
+	elog "you should add it to the default runlevel :"
+	elog "\`rc-update add spacenavd default\` (for openRC)"
+	elog "\`systemctl enable spacenavd\` (for systemd)"
+	elog
+	if use X; then
+		elog "To start generating Spacenav X events by default"
+		elog "you should add this command in your user startup"
+		elog "scripts such as .gnomerc or .xinitrc :"
+		elog "\`spnavd_ctl x11 start\`"
+		elog
+	fi
+	elog
+	elog "If you want to auto-start the daemon when you plug in"
+	elog "a SpaceNavigator device, activate the related udev rule :"
+	elog "\`sudo ln -s $(get_udevdir)/rules.d/99-space-navigator.rules.ignored /etc/udev/rules.d\`"
+	ewarn "You must restart spnavd \`/etc/init.d/spacenavd restart\` to run"
+	ewarn "the new version of the daemon or \`systemctl restart spacenavd\`"
+	ewarn "if using systemd."
+}