gentoo resync : 23.09.2020

6 files changed, 2 insertions, 156 deletions

diff --git a/dev-libs/libhid/Manifest b/dev-libs/libhid/Manifest
index ab9134333d62..1584929acc60 100644
--- a/dev-libs/libhid/Manifest
+++ b/dev-libs/libhid/Manifest
@@ -1,10 +1,5 @@
-AUX libhid-0.2.16-gentoo.patch 628 BLAKE2B 6c2a25cb230a50c5eceff0229d9d6bf3860c5ff4c4c5075d6dd062cdb600dd2dda70979303ef62422fb65e3a441fa4e1487ee173c78343d4bcca4b061f5bd0b0 SHA512 a756d99b115e1903ff633e511c8b9c2de1743b9d8c5050ba422281aea6c4d330b70632e45f688177d8d06ba4077574193e7e378f0e0a79924d2463f5e1584d40
-AUX libhid-0.2.16-libusb.patch 421 BLAKE2B 8b3283ddf9ca120bb77af75fb5aae88ca6d45904a425fdc90f4ca7fda8bd111f37deea5454d692499156337f473bdbd3731d7bf45ea7b80af5c359478cb96c69 SHA512 0fa3be119d1ab3efa428c81b96709a0cee4fd40fa4515d255a64be095a4e26f68a2c8175beda6615c720aaa593edc5aaaa2909bfc5ab9e7f9b818d8c507b9fde
-AUX libhid-0.2.16-swig.patch 1424 BLAKE2B afc3bbaedcd83c87b3186742872681a7a74780873d7aea8fe5fb1df9c69aa66e8265af58200476a2c85f7c0f7abc8036cd569e8827cfb239cb60262758618784 SHA512 62ff58921aa99947f8b33b0d1c02cf30f19fd3f75393cbb681846266b67af49bf6a2e70a995c9a7252b27c67e573e2c198b366830c15ca3c5e87a93325a849cb
 AUX libhid-0.2.17-configure.patch 651 BLAKE2B 734aec3525837a5179fe75057628fa5c9276603b62d5075a95f49c1813f2bbff94dde8a538fe82a25c07a0b101a6ace518e5f496b261c8b9d8063bedea001766 SHA512 da06305f3846c24e5faac1bd3f69f2527801a0e2bff127414fecd78ff658a6c25221441a61c24a97d465523b44bd8c8d7e3396fe20b11ad6ff3a5b96902740fb
 AUX libhid-0.2.17-man.patch 500 BLAKE2B 404b7163651258a28369458a76cdcc591ebc8285b53b60e84c41f899d3449e6493b191ff6411668ad168a9ea91b024b5c6d738ca86c91a49f115ba58bf7b01c0 SHA512 de3364eeff10e5e0dc287b4c04bc680ab44c487cd539d3642ef72ebc11384713021bff750f6bf1a46819e59842ad51c37e2eec0d0d9e20afb8a194b5844fe1ce
-DIST libhid-0.2.16.tar.gz 435245 BLAKE2B 9bd06b226e42ed0dbbf4395824636dbfaa796ce9c0170ad7af561741ec3f494b92ec09c548f3bc7c698a32aa78d82d4da4094231fbb810de5a67d3066947fd97 SHA512 3c9348f9d63e0e1577e983c65ff8e6acbaee0d5f43ecb29b7004654a7e9d14a94176aa029f259e0b8576fc30e8a9af6d1df34912dd582bfadc2b29f9b87eb52b
 DIST libhid-0.2.17.tar.gz 218501 BLAKE2B d7110dc1854829023531f1fd58fd6668f5d15dc3b98f9a6c799b3bc4725ded907de645921d17161a37cde8d9759ec371f96caf4fbb8d6f7bd480dfe2a352b399 SHA512 d82ef95871460e22e26f4fddb88edb83c262a8d0cd70beb7e65cacb443bfc21e12f868d50b8b4ea0ee00acce7c2d0f5bd06437b69cf89ef39dd118c21c73b977
-EBUILD libhid-0.2.16-r4.ebuild 1254 BLAKE2B 169b8bad85fac93966d558c789456389e8451f409a216fd953f081fccbe30c2fe1d35e8cd990ede83ff8f0fd9ee43e686bcb549fe8a330f5e030374ede5c86e2 SHA512 12547eb12fc9ef71b81d0733386cf1ef9aaea9d685c6971c69a7653dc0bdf92e96f78ce4aabc8d553f0d9f7c026fd736a4210224506787310491d1ef092d88b9
-EBUILD libhid-0.2.17.ebuild 1026 BLAKE2B c5d659a89affd44286f3dc200d5cac4c4947732bc3eb8cbe8bbe05e76952acff8e1004a831328fbb97a07695e58b03c194081759a172e5f7e3400d9e409af639 SHA512 d9419ed0dbf1eed9dae9e45c2c60ea3789303f07823d2d49ed78d25e726fb7225c032176b6ab19c7764b3c6c10877aa82002fb0eeba8c2d0d8c47d12b8cc7f70
+EBUILD libhid-0.2.17.ebuild 1024 BLAKE2B cdeb236a4725dca98dfa3f6f95cefc6f9607f553aa237c68c0170d21308f45a149fa6377c500b1bad6695e40303e1b5dc717a8494198137f7f5db674d94d5d44 SHA512 1f9340e799f490c16d1b24cc56ac3d6f032875a0bb88ac76510162715f1e6cf04ccee418068d953da7e6da5f8d984de6dd2d49f084fdc8d538ab4fdd3db776e5
 MISC metadata.xml 579 BLAKE2B c06739bd7822f74c3721fb2848c6b91e2904a2731478bbdda4b7500dff9882d2d885983ad017191bf9ac3217ce1e200db82663c3dec29777f995358dc6bcab28 SHA512 5ee3274cd0351f5d4a7853a1392bc538c85b9539b1964cf420b00c7e9dcbcb20534b74b641e7c4ed7ccb2218ffea9ef42b06d6ffebf1c1402337c66a8c9c7bce
diff --git a/dev-libs/libhid/files/libhid-0.2.16-gentoo.patch b/dev-libs/libhid/files/libhid-0.2.16-gentoo.patch
deleted file mode 100644
index b5960af5d7d6..000000000000
--- a/dev-libs/libhid/files/libhid-0.2.16-gentoo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -78,7 +78,6 @@
- AC_C_BIGENDIAN
- AC_C_STRINGIZE
- 
--MD_CONF_DEBUGGING
- MD_CONF_COMPILER
- AM_CONDITIONAL(OS_LINUX, test "$MD_OS" = "linux")
- AM_CONDITIONAL(OS_BSD, test "$MD_OS" = "bsd")
---- a/m4/md_check_gcc3.m4
-+++ b/m4/md_check_gcc3.m4
-@@ -1,7 +1,7 @@
- AC_DEFUN([MD_CHECK_GCC3],
-   [
-     if [[ "$GCC" = "yes" ]]; then
--      ver=$(gcc -dD -E - < /dev/null | sed -ne 's,.*__GNUC__ ,,p')
-+      ver=$(${CC} -dD -E - < /dev/null | sed -ne 's,.*__GNUC__ ,,p')
-       case $ver in
-         *[[^[:digit:]]]*)
-           AC_MSG_WARN([Could not determine compiler version. Trying our luck...])
diff --git a/dev-libs/libhid/files/libhid-0.2.16-libusb.patch b/dev-libs/libhid/files/libhid-0.2.16-libusb.patch
deleted file mode 100644
index aa49205ec75d..000000000000
--- a/dev-libs/libhid/files/libhid-0.2.16-libusb.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -59,6 +59,8 @@
- MD_CHECK_OS
- 
- MD_CHECK_LIBUSB018B
-+LIBS="$LIBS $LIBUSB_LIBS"
-+INCLUDES="$INCLUDES $LIBUSB_CFLAGS"
- 
- AC_PROG_CC
- MD_CHECK_GCC3
-@@ -97,13 +99,6 @@
- 
- MD_CHECK_DOXYGEN
- 
--MD_CONF_FLAGS(
--  [],
--  [$OS_CFLAGS $LIBUSB_CFLAGS],
--  [],
--  [$OS_LDFLAGS $LIBUSB_LIBS]
--)
--
- MD_CONF_DB2MAN
- 
- ##### OUTPUT #################################################################
diff --git a/dev-libs/libhid/files/libhid-0.2.16-swig.patch b/dev-libs/libhid/files/libhid-0.2.16-swig.patch
deleted file mode 100644
index ce5dae7481b9..000000000000
--- a/dev-libs/libhid/files/libhid-0.2.16-swig.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -88,8 +87,8 @@
- if test "${ac_cv_enable_swig}" = "no" ; then
-   AM_CONDITIONAL(HAVE_SWIG, false)
- else
--  AC_PROG_SWIG(1.3)
--  AM_CONDITIONAL(HAVE_SWIG, "$SWIG" -version)
-+  AC_CHECK_PROG(SWIG,swig,swig,false)
-+  AM_CONDITIONAL(HAVE_SWIG, "$ac_cv_prog_SWIG" -version)
-   if test -z "${HAVE_SWIG_TRUE}" ; then
-     AM_PATH_PYTHON
-     SWIG_PYTHON
---- a/swig/Makefile.am
-+++ b/swig/Makefile.am
-@@ -1,7 +1,7 @@
- # AM_MAKEFLAGS = @MAKEFLAGS@
- ACLOCAL_AMFLAGS = -I m4
- 
--AM_CPPFLAGS = $(SWIG_PYTHON_CPPFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/hidparser -DHID_INTERNAL -DSWIG
-+AM_CPPFLAGS = $(SWIG_PYTHON_CPPFLAGS) -iquote$(top_srcdir)/include -I$(top_srcdir)/hidparser -DHID_INTERNAL -DSWIG
- AM_CFLAGS = -fPIC -fno-strict-aliasing
- AM_LDFLAGS = -shared ../src/libhid.la -lusb
- 
-@@ -29,7 +29,7 @@ __init__.py: hid.py
- 
- %_wrap.c %.py: %.i $(top_srcdir)/include/hid.h
- 	$(SWIG) $(SWIG_PYTHON_OPT) $(SWIG_INC) -o $@ $<
--	echo '#include <compiler.h>' > tmp.c
-+	echo '#include "compiler.h"' > tmp.c
- 	sed -e 's/PyObject \*self/& UNUSED/' \
- 	    -e 's/int flags)/int flags UNUSED)/' < $@ >> tmp.c \
- 	&& mv tmp.c $@
---- a/swig/hid.i
-+++ b/swig/hid.i
-@@ -1,7 +1,7 @@
- %module(docstring="libhid is a user-space USB HID access library built on libusb.", "threads"=1) hid 
- %{
--#include <compiler.h>
--#include <hid.h>
-+#include "compiler.h"
-+#include "hid.h"
- %}
- 
- %feature("autodoc","0");
diff --git a/dev-libs/libhid/libhid-0.2.16-r4.ebuild b/dev-libs/libhid/libhid-0.2.16-r4.ebuild
deleted file mode 100644
index 4f67990368ad..000000000000
--- a/dev-libs/libhid/libhid-0.2.16-r4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils ltprune python-single-r1
-
-DESCRIPTION="Provides a generic and flexible way to access and interact with USB HID devices"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="https://alioth-archive.debian.org/releases/${PN}/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="doc python static-libs"
-
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-	virtual/libusb:0
-"
-
-DEPEND="
-	${RDEPEND}
-	doc? ( app-doc/doxygen )
-	python? ( dev-lang/swig )
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-swig.patch
-	epatch "${FILESDIR}"/${P}-libusb.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	export OS_LDFLAGS="${LDFLAGS}"
-	use python && export PYTHON_LDFLAGS=$(${EPYTHON}-config --ldflags)
-
-	econf \
-		$(use_enable python swig) \
-		$(use_enable static-libs static) \
-		$(use_with doc doxygen) \
-		--disable-debug \
-		--disable-werror
-}
-
-DOCS=( AUTHORS ChangeLog NEWS README README.licence TODO )
-
-src_install() {
-	default
-
-	use doc && dohtml -r doc/html/*
-
-	prune_libtool_files
-}
diff --git a/dev-libs/libhid/libhid-0.2.17.ebuild b/dev-libs/libhid/libhid-0.2.17.ebuild
index 02407fa58f13..ee87c17c2674 100644
--- a/dev-libs/libhid/libhid-0.2.17.ebuild
+++ b/dev-libs/libhid/libhid-0.2.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~conikost/files/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="doc"
 
 RDEPEND="virtual/libusb:0="