gentoo resync : 10.02.2020

4 files changed, 85 insertions, 4 deletions

diff --git a/app-misc/spacenavd/Manifest b/app-misc/spacenavd/Manifest
index 7708578e338a..b1dccbe23643 100644
--- a/app-misc/spacenavd/Manifest
+++ b/app-misc/spacenavd/Manifest
@@ -10,9 +10,11 @@ AUX spacenavd.service 143 BLAKE2B 43621538a7362ccd655ed06517865b0b4f7b992aa6ded4
 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.1.tar.gz 56703 BLAKE2B 99a918090cf8875e5b5cbb48ceffc383b415d9bbe297e49630c8e48ab78bd547244005b5a91e1bb7abc01382ae332758dfc01297bc8f6fb9a05247330cde8127 SHA512 6bfd76f9187ce77c09cb6ebb73bce45391e675cda51437b647510afef574aa6e3f947f467e03a464e245a5e44f699db1d197a58a06a64a2199686b1ab596517f
 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 2306 BLAKE2B 01eec5ed89107490cdd2bfe2072e20e158ba05496a3f0bf16df8c796c08273cbe0b049aa22bf4f926aad70c60ff24f5569dbd9f519478c6dae826b7846a6df18 SHA512 f7aba939a76ee95ebc349c9ede93f733465c2d18f82e3736a314633d196c9e54a0824327172682ae9523822f0e397937a98696ee92847269970ee6f29c47a5d2
-EBUILD spacenavd-0.7.ebuild 2318 BLAKE2B 65b96c40800e50e3843c3b0124680ab242352fd71f1577d97d325cc330e4077c69e37e62ccbbbf504eac189422c6c9b85eba9464166b5a56217499c89bf50367 SHA512 0c86a6419e8db433d1bab2fd78f88b7bb5e2b81b0dc42d6c3dbc8455e632ea4fff7747764b5b42eeedeb55a932842e24161e7d5b55240767efe3b994b1dc3a7e
+EBUILD spacenavd-0.6.ebuild 2357 BLAKE2B 7a42f3a0eddefebbf75a7a47b0ac13406ccfaaa6844478406261c70711237aa6606851cc74945547e808de2a3aa365040a848e4108869f603592da4be4ca7e07 SHA512 bd51d709b6d94a760b934e67dba6561fca07981035e537b0395457e698b3fc4db5381ea337b7b2bb21c2dc9d5ed7e5a249a01cce45ceddb235e481ebb9da750f
+EBUILD spacenavd-0.7.1.ebuild 2235 BLAKE2B 7bcc607477018b73bdf2438619a59ff5ff34e165724b970415a4b3324d1b9ace2fde4139d3c5c8a7fdd00d4ced21ebd43739a1f894b19c2280be3993ab14eff6 SHA512 1e89683c67d8cb0f70419954efdb6b8a1f1b07cfb7de29e3f4302930db8cc5bbb21a8268e6a70ccf04de22a89e33a305ac83da9d1e3d281b6dd901c22ab2e4c8
+EBUILD spacenavd-0.7.ebuild 2369 BLAKE2B f31dab2abf32e04436ca549895d26b48acc88da8f9fd62ea16bf6643f3579ebc4bd2bbd323fb4b7a3e586a7e6538612d954fb78de69f3b8fb926085372645299 SHA512 c6bd1eaa8dab75618417a7026c11a5f6d2a4982488ac484a266f07a14ad0941a0133bd428c8324181fe1eeb5f1e05dba9443734bfa58808ff47c8641033eb9c2
 MISC metadata.xml 804 BLAKE2B 88ee8f585c24c42670e3e251bd751d712752c0e9566828c8f00dadfda7d732ec75cf970398cfe73d9e81c3f556d74c48b1845bce4230f2fe524f5a8d7cd7a70a SHA512 edc302270122ef31692806ec2fec3836cd51afcb9eabeaf5f1fb8d66e2ab703eb615efa431b3f78fe6427a6f976b90f769cbd001dfe2832bc2ce9986731e26b0
diff --git a/app-misc/spacenavd/spacenavd-0.6.ebuild b/app-misc/spacenavd/spacenavd-0.6.ebuild
index bbf5b9cf9e04..bc0c390694e8 100644
--- a/app-misc/spacenavd/spacenavd-0.6.ebuild
+++ b/app-misc/spacenavd/spacenavd-0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-inherit epatch linux-info systemd toolchain-funcs udev
+inherit flag-o-matic epatch linux-info systemd toolchain-funcs udev
 
 MY_PN='spacenav'
 DESCRIPTION="The spacenavd daemon provides free alternative to the 3dxserv daemon"
@@ -37,6 +37,7 @@ src_configure() {
 }
 
 src_compile() {
+	append-cflags -fcommon  # bug 708648
 	emake CC="$(tc-getCC)" \
 		add_cflags="${CFLAGS}" \
 		add_ldflags="${LDFLAGS}"
diff --git a/app-misc/spacenavd/spacenavd-0.7.1.ebuild b/app-misc/spacenavd/spacenavd-0.7.1.ebuild
new file mode 100644
index 000000000000..e4ff48d27d98
--- /dev/null
+++ b/app-misc/spacenavd/spacenavd-0.7.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic 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}"
+
+pkg_setup() {
+	CONFIG_CHECK="~INPUT_EVDEV"
+	ERROR_CFG="Your kernel needs INPUT_EVDEV for the spacenavd to work properly"
+	check_extra_config
+}
+
+src_configure() {
+	append-cflags -fcommon  # bug 708648
+	econf \
+		--disable-debug \
+		--enable-hotplug \
+		--disable-opt \
+		$(use_enable X x11)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+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."
+}
diff --git a/app-misc/spacenavd/spacenavd-0.7.ebuild b/app-misc/spacenavd/spacenavd-0.7.ebuild
index 4c5a57fdbfa3..e9fef0e60869 100644
--- a/app-misc/spacenavd/spacenavd-0.7.ebuild
+++ b/app-misc/spacenavd/spacenavd-0.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit linux-info systemd toolchain-funcs udev
+inherit flag-o-matic linux-info systemd toolchain-funcs udev
 
 MY_PN='spacenav'
 DESCRIPTION="The spacenavd daemon provides free alternative to the 3dxserv daemon"
@@ -37,6 +37,7 @@ src_configure() {
 }
 
 src_compile() {
+	append-cflags -fcommon  # bug 708648
 	emake CC="$(tc-getCC)" \
 		add_cflags="${CFLAGS}" \
 		add_ldflags="${LDFLAGS}"