gentoo resync : 15.12.2019

5 files changed, 2 insertions, 155 deletions

diff --git a/dev-libs/libspnav/Manifest b/dev-libs/libspnav/Manifest
index 94b5dfb11b2d..eebf44a103d6 100644
--- a/dev-libs/libspnav/Manifest
+++ b/dev-libs/libspnav/Manifest
@@ -1,8 +1,4 @@
-AUX libspnav-0.2.2-custom-flags.patch 2151 BLAKE2B 90868c4c60627a16c247a99cf3dd1fb1d9a49b39f2062de22a7d35223b86be553b9f76f2b363ece3593dec976eb3144163d3ce3ab416d6f8436e79e97fb84144 SHA512 f0f2ea3dcd689168780d17ca94b7c20378afeae72442da9c62f1d618b29ad7877d6f6a78e06ed276cff67e1fc57c2bf6fe371f1545fda99ce74f5ee260baa320
-AUX libspnav-0.2.2-makefile.patch 926 BLAKE2B 28533b0e1b91de397d150302be3ea35dfab22fd1fe2235ff41c5a755db48a4eac2365e2f5b03306157336cd9b09b422877c63c9798ddd2d8525ece94af7d8697 SHA512 ebaa5f5685fc55c0f5c0783efd20b2970be8a4ce3e5564b23c65348b1c72e1840d8c2277843cb4d7d3899579810228835f4aa59f99188e79a5543dca93522a21
 AUX libspnav-0.2.3-makefile.patch 1329 BLAKE2B 8eccfcfa539703437326b4800597dc7b6074d7bda0246c27a819114969a6906901b6063a11cdf8dd29148cbf9ecef5d5301f842355b86600b3077b34d61cd6d0 SHA512 8cdc05d5b0d4aa16de59752d0ce204dd0db1df63554c53c2e0b9ea04a7a1b32a0fded8ba4f9f5fc94456f6d4b7b87213284f88944931903986f4df81784cc64f
-DIST libspnav-0.2.2.tar.gz 11615 BLAKE2B 470a533d9ae58b37cd1c1603381bfd3a3bca79b2fe15a81464727e2543433df2fdf32b8683464ade9aa9670f3c9af1ffddde58299678d89d977577ed324f1ebf SHA512 78b26e6fe4a98af579738743ac4bc2f1de5ccfa9316a103a58ebb935f281fba04b8c6c28c0d63abda15a52c0288e371231425a3a21b26c083a5de7ab101f1940
 DIST libspnav-0.2.3.tar.gz 11985 BLAKE2B 134a0c3f7c9a7ef7c4f68910e0266880958e2b74e253b75237b0fa8d3e482bcd1f42e715b85f0ffca3a62103530e854090818564d9c241bfc55de039cc4883ee SHA512 b2c452d979d455fc99bfdc172c8a2408a6e8dc40acc52964fa64f4d75a8ee77dda12e5e212c0c4e07a0a24d055f16f85bb6ce6287e24e6bd0665de457e37e6a7
-EBUILD libspnav-0.2.2.ebuild 1083 BLAKE2B dcd24705baba8b43e0cf62f92d5568a7edf84422851c0012349d45fbac7fc775be3d5f3014ec8b395612681565c6d16038392fcd3798ac46f241fb937f56959f SHA512 a6a7ff7c37d855cc4a53908b5dc6f4b9be3e176a409ba7431f9a068339470301d17dfb5e172daee032d7e7f09bcf23bc0d0ba5739f7dca5b2c380249c165bc16
-EBUILD libspnav-0.2.3.ebuild 897 BLAKE2B 1bf386e77eca6f20777979ff4ebac7b52bb4e8f74404108c51a732ab8fbc25531fcf05bf9810f2f7c94b0dc74c8de156ac39e3b32bd201de02bc898e1e2dfa44 SHA512 b452c5865b71a390455fbcfcce18e49d4865ef1f1be679d93431d5aa43799031147fbae168fb7e3ad0f9a60cb0d3f041df5f31fa0389be3e50d2b705c25d3a10
+EBUILD libspnav-0.2.3.ebuild 894 BLAKE2B 7069d849b8e936289ee7c66805c8122038e331503311a607b20dacb34db97529a11b38c7530af70def1073baad08e6505b97fc88823bce3b09367600613709c7 SHA512 e535b119a9a967f262d78e22ba82d438a78a97e8cc56f1cf37c73b6056b48c3bd4a0264bc5c38a3258950358b85ba1e60e8a692b8516c7fc1d0a3eeb52857cae
 MISC metadata.xml 811 BLAKE2B a39e9937eb3d7f59833369b4e983ac30dfdf7cce0e895916c5cb934b03fc41ea9b4a4fef3c7c8c8e98ffb0ff7398a3ed5c94015772481c2cd60a019f1fe714f4 SHA512 61f35f0ad4015cd020f0292d139bed2a5bb3c8ef7f11cc96c816ca6003941de0f8295a75ccd6da961bf4256988b788784ca4b41e98be0a9f96c04e0663d566e9
diff --git a/dev-libs/libspnav/files/libspnav-0.2.2-custom-flags.patch b/dev-libs/libspnav/files/libspnav-0.2.2-custom-flags.patch
deleted file mode 100644
index cc96655bf469..000000000000
--- a/dev-libs/libspnav/files/libspnav-0.2.2-custom-flags.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -Npur libspnav-0.2.2.orig/Makefile.in libspnav-0.2.2/Makefile.in
---- libspnav-0.2.2.orig/Makefile.in	2012-01-31 22:34:01.448356249 +0100
-+++ libspnav-0.2.2/Makefile.in	2012-01-31 22:39:20.229350669 +0100
-@@ -7,7 +7,8 @@ lib_so = $(soname).1
- 
- CC = gcc
- AR = ar
--CFLAGS = $(opt) $(dbg) -std=c89 -fpic -pedantic -Wall -fno-strict-aliasing -I.
-+CFLAGS = $(opt) -fpic -I.
-+LDFLAGS = $(ldopt) -shared -Wl,-soname,$(soname)
- 
- .PHONY: all
- all: $(lib_a) $(lib_so)
-@@ -16,7 +17,7 @@ $(lib_a): $(obj)
- 	$(AR) rcs $@ $(obj)
- 
- $(lib_so): $(obj)
--	$(CC) -shared -Wl,-soname,$(soname) -o $@ $(obj)
-+	$(CC) $(LDFLAGS) -o $@ $(obj)
- 
- %.o: $(srcdir)/%.c
- 	$(CC) $(CFLAGS) -c $< -o $@
-diff -Npur libspnav-0.2.2.orig/configure libspnav-0.2.2/configure
---- libspnav-0.2.2.orig/configure	2012-01-31 22:34:01.448356249 +0100
-+++ libspnav-0.2.2/configure	2012-01-31 22:34:39.703355615 +0100
-@@ -4,6 +4,7 @@ echo 'configuring spacenav library...'
- 
- PREFIX=/usr/local
- OPT=yes
-+LDOPT=yes
- DBG=yes
- X11=yes
- 
-@@ -26,6 +27,11 @@ for arg; do
- 	--disable-opt)
- 		OPT=no;;
- 
-+	--enable-ldopt)
-+		LDOPT=yes;;
-+	--disable-ldopt)
-+		LDOPT=no;;
-+
- 	--enable-debug)
- 		DBG=yes;;
- 	--disable-debug)
-@@ -44,6 +50,8 @@ for arg; do
- 		echo '  --disable-x11: disable X11 communication mode'
- 		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'
-@@ -54,6 +62,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 ""
-@@ -74,7 +83,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/dev-libs/libspnav/files/libspnav-0.2.2-makefile.patch b/dev-libs/libspnav/files/libspnav-0.2.2-makefile.patch
deleted file mode 100644
index f65300c5f58a..000000000000
--- a/dev-libs/libspnav/files/libspnav-0.2.2-makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Npur libspnav-0.2.2.orig/Makefile.in libspnav-0.2.2/Makefile.in
---- libspnav-0.2.2.orig/Makefile.in	2012-01-31 22:40:36.619349333 +0100
-+++ libspnav-0.2.2/Makefile.in	2012-01-31 22:41:52.554347975 +0100
-@@ -11,7 +11,7 @@ CFLAGS = $(opt) -I.
- LDFLAGS = $(ldopt) -shared -Wl,-soname,$(soname)
- 
- .PHONY: all
--all: $(lib_a) $(lib_so)
-+all: $(lib_so)
- 
- $(lib_a): $(obj)
- 	$(AR) rcs $@ $(obj)
-@@ -31,10 +31,10 @@ distclean:
- 	rm -f $(obj) $(lib_a) $(lib_so) Makefile
- 
- .PHONY: install
--install: $(lib_a) $(lib_so)
--	cp $(lib_a) $(PREFIX)/$(libdir)/$(lib_a)
--	cp $(lib_so) $(PREFIX)/$(libdir)/$(lib_so)
--	for h in $(hdr); do cp -p $(srcdir)/$$h $(PREFIX)/include/; done
-+install: $(lib_so)
-+	mkdir -p $(DESTDIR)$(PREFIX)/$(libdir) $(DESTDIR)$(PREFIX)/include
-+	cp $(lib_so) $(DESTDIR)$(PREFIX)/$(libdir)/$(lib_so)
-+	for h in $(hdr); do cp -p $(srcdir)/$$h $(DESTDIR)$(PREFIX)/include/; done
- 
- .PHONY: uninstall
- uninstall:
diff --git a/dev-libs/libspnav/libspnav-0.2.2.ebuild b/dev-libs/libspnav/libspnav-0.2.2.ebuild
deleted file mode 100644
index b97017ab74ea..000000000000
--- a/dev-libs/libspnav/libspnav-0.2.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit multilib eutils toolchain-funcs
-
-MY_PN='spacenav'
-DESCRIPTION="libspnav is a replacement for the magellan library with a cleaner API"
-HOMEPAGE="http://spacenav.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20library%20%28SDK%29/${PN}%20${PV}/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="X"
-
-RDEPEND="app-misc/spacenavd[X?]"
-DEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${P}-custom-flags.patch
-}
-
-src_configure() {
-	econf \
-		--enable-opt --enable-ldopt \
-		$(use_enable X x11)
-}
-
-src_compile() {
-	emake CC=$(tc-getCC)
-}
-
-src_install() {
-	default
-
-	# Use proper libdir
-	if [[ $(get_libdir) != lib ]]; then
-		mv "${D}"/usr/{lib,$(get_libdir)} || die
-	fi
-
-	# Create missing symlinks
-	local target=$(basename "${D}"/usr/$(get_libdir)/libspnav.so.*)
-	dosym ${target} /usr/$(get_libdir)/libspnav.so.0 || die
-	dosym ${target} /usr/$(get_libdir)/libspnav.so || die
-}
diff --git a/dev-libs/libspnav/libspnav-0.2.3.ebuild b/dev-libs/libspnav/libspnav-0.2.3.ebuild
index 0cde20cb7aa1..b4411a26466b 100644
--- a/dev-libs/libspnav/libspnav-0.2.3.ebuild
+++ b/dev-libs/libspnav/libspnav-0.2.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://spacenav.sourceforge.net/"
 SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20library%20%28SDK%29/${PN}%20${PV}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="X"
 
 CDEPEND="X? ( x11-libs/libX11 )"