x11-misc/spnavcfg: 1.1 + EAPI 8

Signed-off-by: Sebastian Pipping <sping@gentoo.org>

3 files changed, 72 insertions, 0 deletions

diff --git a/x11-misc/spnavcfg/Manifest b/x11-misc/spnavcfg/Manifest
index 2f8e6a85d95d..77bc7b18b217 100644
--- a/x11-misc/spnavcfg/Manifest
+++ b/x11-misc/spnavcfg/Manifest
@@ -1,2 +1,3 @@
 DIST spnavcfg-0.3.1.tar.gz 215460 BLAKE2B f2bd35022399ec085d5c8b08c7514fdac8e974b33e9923a79446fa9552827d5986abf136fdb95ed31d7dbec419eb34ce13039955c6255cff971ffedcd3cc8a02 SHA512 b5e0ef2036eebc971298d95e8a91bd89ade956933919a4a5dc062fd977ff159bba392b0092ac36142fb317a9758c26319b07680b473f9957eda0163146be5408
 DIST spnavcfg-1.0.tar.gz 496695 BLAKE2B 59d79cc1707881ba50e809c73a41cb94dbfd15e5e184114190efa2394fe4b53f25960a828611007a200687a3e9827bc4df30d3d06ca3764b23573a1f51fb2974 SHA512 271d1d66fdfb4aff9faa521c51c776dbccf77320b0783a5dbdcc4a28d4190ef3ba6c3d277d706dafc35e2e6ceed1d244d346d4a91cf8e1f5ba3141c24d065ea8
+DIST spnavcfg-1.1.tar.gz 497896 BLAKE2B 874489904970182f6f56d0a7bd63cc3847f101729b2c6866677fc0c17fab4bad42132ac0f93a39ef9a35654acde8ef6cd42a462756dd7f0c3914424a5fc54dd2 SHA512 4d5c9dc37d1906dbc99535a758554d9419e20ad773adcf2d2062795a8e194a88b68c360341a08e3ac236df08a2e389c4475f341b5bac662a4526dada0bb891a6
diff --git a/x11-misc/spnavcfg/files/spnavcfg-1.1-makefile.patch b/x11-misc/spnavcfg/files/spnavcfg-1.1-makefile.patch
new file mode 100644
index 000000000000..0476d7a10152
--- /dev/null
+++ b/x11-misc/spnavcfg/files/spnavcfg-1.1-makefile.patch
@@ -0,0 +1,23 @@
+From fd9aa10fb8e19a257398757943b3d8e79906e583 Mon Sep 17 00:00:00 2001
+From: John Tsiombikas <nuclear@member.fsf.org>
+Date: Sun, 8 Jan 2023 21:49:12 +0200
+Subject: [PATCH] Make sure there are no duplicate object files. Closes issue
+ #29
+
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index b760f4d..f66ba22 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -2,7 +2,7 @@ csrc = $(wildcard src/*.c)
+ ccsrc = $(wildcard src/*.cc)
+ mochdr = src/ui.h
+ mocsrc = $(mochdr:.h=.moc.cc)
+-obj = $(csrc:.c=.o) $(ccsrc:.cc=.o) $(mocsrc:.cc=.o) res.cc
++obj = $(sort $(csrc:.c=.o) $(ccsrc:.cc=.o) $(mocsrc:.cc=.o)) res.cc
+ dep = $(csrc:.c=.d) $(ccsrc:.cc=.d)
+ bin = spnavcfg
+ 
diff --git a/x11-misc/spnavcfg/spnavcfg-1.1.ebuild b/x11-misc/spnavcfg/spnavcfg-1.1.ebuild
new file mode 100644
index 000000000000..6d9bd749d265
--- /dev/null
+++ b/x11-misc/spnavcfg/spnavcfg-1.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs qmake-utils
+
+DESCRIPTION="Qt-based GUI to configure a space navigator device"
+HOMEPAGE="http://spacenav.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/spacenav/spacenavd%20config%20gui/${PN}%20${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND=">=dev-libs/libspnav-1[X]
+	dev-qt/qtcore
+	dev-qt/qtgui
+	dev-qt/qtwidgets
+	x11-libs/libX11"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	>=app-misc/spacenavd-1[X]"
+
+src_configure() {
+	# Note: Makefile uses $(add_cflags) inside $(CXXFLAGS)
+	CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		econf --disable-debug --disable-opt
+}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+)
+
+src_compile() {
+	local args=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		MOC="$(qt5_get_bindir)/moc"
+		RCC="$(qt5_get_bindir)/rcc"
+		UIC="$(qt5_get_bindir)/uic"
+		libpath="-L/usr/$(get_libdir)"
+	)
+	emake "${args[@]}"
+}