gentoo resync : 20.03.2021

4 files changed, 3 insertions, 93 deletions

diff --git a/x11-misc/spnavcfg/Manifest b/x11-misc/spnavcfg/Manifest
index 9da7005d549d..440983f87ed1 100644
--- a/x11-misc/spnavcfg/Manifest
+++ b/x11-misc/spnavcfg/Manifest
@@ -1,6 +1,3 @@
-AUX spnavcfg-0.3-custom-flags.patch 1568 BLAKE2B b4280b99137f36d9c3a191f25ea9a55785878a004fdf6d581ade55161e1cbd15bd5895ad8d61844a3a19f56e3ba6d226ad49ae6f31550317be0a5894e9e5c6bf SHA512 eaa831d7ef10227bf35b26f5ba32f793b382f6af7b14a147084ac93f4669e8018655cc1df711ed4ae5d0c560b34ea59abb1c1998c4fdb37a362f8130fed80632
 DIST spnavcfg-0.3.1.tar.gz 215460 BLAKE2B f2bd35022399ec085d5c8b08c7514fdac8e974b33e9923a79446fa9552827d5986abf136fdb95ed31d7dbec419eb34ce13039955c6255cff971ffedcd3cc8a02 SHA512 b5e0ef2036eebc971298d95e8a91bd89ade956933919a4a5dc062fd977ff159bba392b0092ac36142fb317a9758c26319b07680b473f9957eda0163146be5408
-DIST spnavcfg-0.3.tar.gz 214774 BLAKE2B aee45a796bd95761e4a7fe922cc5b65185c894e2fa366dea6d7677fc5ac3b7e0345b89eedef7bf8e446c598d66f161bb66fa695c07b433f5a6b7dce5055b6256 SHA512 a3411c32a6c7de2fd1cfa7960e1b0dade88e8c37435a39ded864b4b6f12fd3c8f518dad7a4ac5b465517484e74b3586f12d47e780f655fd7e4c3fea8d6186c80
-EBUILD spnavcfg-0.3.1.ebuild 631 BLAKE2B f8f8fac556180047074ce1669efdf1237d70cda815a2ee2fbd52bc06168030a9b572e84a47cd7d2aa84fdaf254cabe6aa29f81867b37d945f4d13fec754d9fdf SHA512 76850fbf0b33e739ba1633fe4548d4feb516034a61e22c0176461fecd10e0de1b082b22237ab25c02e03eb9f06c1a7ad795caaed58c0ce4fd82167691eaef043
-EBUILD spnavcfg-0.3.ebuild 625 BLAKE2B 6b2af2cb0be40861e6f944463fd63d74cf0e3d42e6c5c4bc969a1542440e960b5d73a2ca103ff9ec24e865fb05c9c3480ca63201d689ed063861463785966248 SHA512 6d4ec044c9b9d9318b4645e759436e7577179c0fba5934cda57850c6dca2da24bca939583aee098b746aafc5cfc2697f3f2cbb17ecda2f53628c165b395b11a2
+EBUILD spnavcfg-0.3.1.ebuild 629 BLAKE2B 871087fae76d853b5b57b8826905903386d74cdcdf660b4ef265cea031df8d93594695731cbd5b17791c3aadcb32b3e20ae5eaa159f9fa46fbb334a8869eddac SHA512 dda9498dadf18a137eba689191be6e7fe6fc9ce92ec0683dc7335d515716a391901756dd535b9701c985f16fde53d448fde44342f20b78645bac74c3b22f1a15
 MISC metadata.xml 513 BLAKE2B 5730394269a90ee628138e0a865b15053c020dea720f442c4718baed6d6bcf7d2ba55f567085d730ccb04907c2019dcadfb2d226b53e2f91a8bd549e28ab6462 SHA512 4aee293da64f4e77b69be1c4c937787e3e1794d51ef22e3d37a5f6c20e6a3507d27c87b75495406429fdd98cd4ef3ed0d85ec9a7418c13b42422b61beb1b5a04
diff --git a/x11-misc/spnavcfg/files/spnavcfg-0.3-custom-flags.patch b/x11-misc/spnavcfg/files/spnavcfg-0.3-custom-flags.patch
deleted file mode 100644
index d0ef0db6e711..000000000000
--- a/x11-misc/spnavcfg/files/spnavcfg-0.3-custom-flags.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From e994e67a6a5c4722bdc8140528a4dd258c785402 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Wed, 18 Jan 2017 18:45:11 +0100
-Subject: [PATCH] Respect custom CFLAGS/LDFLAGS
-
-Based on spnavcfg-0.2.1-custom-flags.patch
----
- Makefile.in |  4 ++--
- configure   | 13 +++++++++++++
- 2 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 06f23a6..296dd5d 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -7,8 +7,8 @@ warn = -Wall
- CC = gcc
- SED = sed
- INSTALL = install
--CFLAGS = -pedantic $(warn) $(dbg) $(opt) `pkg-config --cflags gtk+-2.0 gmodule-export-2.0`
--LDFLAGS = `pkg-config --libs gtk+-2.0 gmodule-export-2.0` -lX11
-+CFLAGS = $(user_cflags) `pkg-config --cflags gtk+-2.0 gmodule-export-2.0`
-+LDFLAGS = $(user_ldflags) `pkg-config --libs gtk+-2.0 gmodule-export-2.0` -lX11
- 
- $(bin): $(obj)
- 	$(CC) -o $@ $(obj) $(LDFLAGS)
-diff --git a/configure b/configure
-index e211d92..0fed776 100755
---- a/configure
-+++ b/configure
-@@ -43,6 +43,12 @@ done
- echo "  prefix: $PREFIX"
- echo "  optimize for speed: $OPT"
- echo "  include debugging symbols: $DBG"
-+if [ -n "$CFLAGS" ]; then
-+	echo "  cflags: $CFLAGS"
-+fi
-+if [ -n "$LDFLAGS" ]; then
-+	echo "  ldflags: $LDFLAGS"
-+fi
- echo
- 
- # create Makefile
-@@ -58,6 +64,13 @@ if [ "$OPT" = 'yes' ]; then
- 	echo 'opt = -O3' >>Makefile
- fi
- 
-+if [ -n "$CFLAGS" ]; then
-+        echo "user_cflags = $CFLAGS" >>Makefile
-+fi
-+if [ -n "$LDFLAGS" ]; then
-+	echo "user_ldflags = $LDFLAGS" >>Makefile
-+fi
-+
- cat "$srcdir/Makefile.in" >>Makefile
- 
- echo ''
--- 
-2.11.0
-
diff --git a/x11-misc/spnavcfg/spnavcfg-0.3.1.ebuild b/x11-misc/spnavcfg/spnavcfg-0.3.1.ebuild
index 3f3ca2c51ac4..ae66b2298782 100644
--- a/x11-misc/spnavcfg/spnavcfg-0.3.1.ebuild
+++ b/x11-misc/spnavcfg/spnavcfg-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/spacenav/spacenavd%20config%20gui/${PN}%20
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="x11-libs/gtk+:2"
diff --git a/x11-misc/spnavcfg/spnavcfg-0.3.ebuild b/x11-misc/spnavcfg/spnavcfg-0.3.ebuild
deleted file mode 100644
index 20345a3947af..000000000000
--- a/x11-misc/spnavcfg/spnavcfg-0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="GTK-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="x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	app-misc/spacenavd[X]"
-
-PATCHES=( "${FILESDIR}"/${P}-custom-flags.patch )
-
-src_compile() {
-	emake CC=$(tc-getCC)
-}