Merge updates from master

10 files changed, 156 insertions, 56 deletions

diff --git a/dev-libs/libhid/Manifest b/dev-libs/libhid/Manifest
index 007ca6de453e..74d879346aa1 100644
--- a/dev-libs/libhid/Manifest
+++ b/dev-libs/libhid/Manifest
@@ -1 +1,2 @@
 DIST libhid-0.2.16.tar.gz 435245 BLAKE2B 9bd06b226e42ed0dbbf4395824636dbfaa796ce9c0170ad7af561741ec3f494b92ec09c548f3bc7c698a32aa78d82d4da4094231fbb810de5a67d3066947fd97 SHA512 3c9348f9d63e0e1577e983c65ff8e6acbaee0d5f43ecb29b7004654a7e9d14a94176aa029f259e0b8576fc30e8a9af6d1df34912dd582bfadc2b29f9b87eb52b
+DIST libhid-0.2.17.tar.gz 218501 BLAKE2B d7110dc1854829023531f1fd58fd6668f5d15dc3b98f9a6c799b3bc4725ded907de645921d17161a37cde8d9759ec371f96caf4fbb8d6f7bd480dfe2a352b399 SHA512 d82ef95871460e22e26f4fddb88edb83c262a8d0cd70beb7e65cacb443bfc21e12f868d50b8b4ea0ee00acce7c2d0f5bd06437b69cf89ef39dd118c21c73b977
diff --git a/dev-libs/libhid/files/libhid-0.2.17-configure.patch b/dev-libs/libhid/files/libhid-0.2.17-configure.patch
new file mode 100644
index 000000000000..5318aa2d89fe
--- /dev/null
+++ b/dev-libs/libhid/files/libhid-0.2.17-configure.patch
@@ -0,0 +1,36 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -59,9 +59,10 @@
+ MD_CHECK_OS
+ 
+ MD_CHECK_LIBUSB018B
++LIBS="$LIBS $LIBUSB_LIBS"
++INCLUDES="$INCLUDES $LIBUSB_CFLAGS"
+ 
+ AC_PROG_CC
+-MD_CHECK_GCC3
+ 
+ dnl MD_CONF_DISTCC
+ dnl MD_CONF_CCACHE
+@@ -78,7 +79,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")
+@@ -98,13 +98,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.17-man.patch b/dev-libs/libhid/files/libhid-0.2.17-man.patch
new file mode 100644
index 000000000000..4fe5677c107a
--- /dev/null
+++ b/dev-libs/libhid/files/libhid-0.2.17-man.patch
@@ -0,0 +1,11 @@
+--- a/m4/md_conf_db2man.m4
++++ b/m4/md_conf_db2man.m4
+@@ -3,7 +3,7 @@
+     for file in \
+       /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl \
+       /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/*/manpages/docbook.xsl \
+-      /usr/share/{x,sg}ml/docbook/xsl-stylesheets-*/manpages/docbook.xsl \
++      /usr/share/{x,sg}ml/docbook/xsl-stylesheets*/manpages/docbook.xsl \
+       /sw/share/xml/xsl/docbook-xsl/manpages/docbook.xsl; do
+ 
+       test -r $file && db2man_file=$file
diff --git a/dev-libs/libhid/libhid-0.2.17.ebuild b/dev-libs/libhid/libhid-0.2.17.ebuild
new file mode 100644
index 000000000000..bfc00287f463
--- /dev/null
+++ b/dev-libs/libhid/libhid-0.2.17.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+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://dev.gentoo.org/~conikost/files/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+RDEPEND="virtual/libusb:0="
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-configure.patch
+	"${FILESDIR}"/${P}-man.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	export OS_LDFLAGS="${LDFLAGS}"
+
+	myeconfargs=(
+		"--disable-static"
+		"--disable-swig"
+		"--disable-warnings"
+		"--disable-werror"
+		"$(use_with doc doxygen)"
+	)
+
+	econf ${myeconfargs[@]}
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		docinto html
+		dodoc -r doc/html/.
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/libhid/metadata.xml b/dev-libs/libhid/metadata.xml
index 8ab798976991..8e5545cdf11e 100644
--- a/dev-libs/libhid/metadata.xml
+++ b/dev-libs/libhid/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription lang="en">
-libhid provides a generic and flexible way to access and interact with USB
-HID devices, much like libusb does for plain USB devices. It is based on
-libusb, thus it requires no HID support in the kernel and provides means to
-take control over a device even if the kernel governs it.
-</longdescription>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
+		Libhid provides a generic and flexible way to access and interact with
+		USB HID devices, much like libusb does for plain USB devices.
+		It is based on libusb, thus it requires no HID support in the kernel
+		and provides means to take control over a device even if the kernel governs it.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-perl/Mojolicious/Manifest b/dev-perl/Mojolicious/Manifest
index de3392cd06a3..0842184b9648 100644
--- a/dev-perl/Mojolicious/Manifest
+++ b/dev-perl/Mojolicious/Manifest
@@ -1,3 +1,4 @@
 DIST Mojolicious-7.57.tar.gz 706093 BLAKE2B 13212367fe09a437a97093668558ded1216465b25dd145ecf7e62256f05f129a434164a346bb3e928482fc041acfd68350e9e71ac088c49f679df43221917f73 SHA512 2bb830ca14cda5571a614ad74144c047dd96fafe49b530b1e6e19115c43cc3b8f4f174f549fdb8816183e42f26620fcf36b47f7c05ae592273c74c38dfaa4c0b
 DIST Mojolicious-7.60.tar.gz 708129 BLAKE2B bac0f8ac75255ed6d0597cc2d00eeca9da66e9c7548942daf50cca3d24875306a8e19934ae10b2e5b3bd727b1bb531b31a665938c32f861aacba6456fedf7779 SHA512 3e6e0ea266caf8e19546e587ce7bf4d8ef86fa0f2503ef7a1b97b2f4f4f55f9775894d1ad74dd4e84760a3c976f6b94451aa29260f9854d5cc3cefec512428a2
 DIST Mojolicious-7.70.tar.gz 711260 BLAKE2B 0f471c2039b94ad74d60471d879c9993e2dbf16ed23c710c02786ffe6056d613ee4095668d0c34919fc9649815905d4d771cc4adb832ed2b37b3016d6398884e SHA512 2cda5b378d5c1899d78c199c7f1d3439a6fd697ab885bb4d337270256534ec68f9d73267199a6f72e9677049cf9cd6f239451cac31aebcf4743229419a82dd8b
+DIST Mojolicious-7.80.tar.gz 718598 BLAKE2B 955fb6253ef2957b9ef6828cd261374fd2f17386c4a426f9a3d73fc734e02f4297d088b70daa8c5e67892d4f4fc491b4a227e7f1420e461f5c2161eac5f0ff19 SHA512 f1149c4675377de09bd6db4355c251f3a8db2a81688a906e80c1978d6854a9d89120b39c824aef49934da48ac29d9e62e28940752ec608084dd2ffeee9116553
diff --git a/dev-perl/Mojolicious/Mojolicious-7.800.0.ebuild b/dev-perl/Mojolicious/Mojolicious-7.800.0.ebuild
new file mode 100644
index 000000000000..276c1aa9f5d0
--- /dev/null
+++ b/dev-perl/Mojolicious/Mojolicious-7.800.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=SRI
+DIST_VERSION=7.80
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Real-time web framework"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="test minimal"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!minimal? (
+		>=dev-perl/EV-4.0.0
+	)
+	>=virtual/perl-IO-Socket-IP-0.370.0
+	>=virtual/perl-JSON-PP-2.271.30
+	>=virtual/perl-Pod-Simple-3.90.0
+	>=virtual/perl-Time-Local-1.200.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
+PERL_RM_FILES=(
+	t/pod.t
+	t/pod_coverage.t
+)
diff --git a/dev-python/pynacl/files/pynacl-1.3.0-hypothesis-4.patch b/dev-python/pynacl/files/pynacl-1.3.0-hypothesis-4.patch
deleted file mode 100644
index 9b7a5a905d41..000000000000
--- a/dev-python/pynacl/files/pynacl-1.3.0-hypothesis-4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From af2d8c241872318baba42d7f5fbfb1869de91baa Mon Sep 17 00:00:00 2001
-From: Valentin Heidelberger <github@valentinsblog.com>
-Date: Thu, 27 Sep 2018 22:36:34 +0200
-Subject: [PATCH] Remove average_size hypothesis setting from test_bindings.py
-
----
- tests/test_bindings.py | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/tests/test_bindings.py b/tests/test_bindings.py
-index 22930cc7..d7951a21 100644
---- a/tests/test_bindings.py
-+++ b/tests/test_bindings.py
-@@ -306,7 +306,6 @@ def test_unpad_not_padded():
- 
- 
- @given(binary(min_size=0,
--              average_size=128,
-               max_size=2049),
-        integers(min_value=16,
-                 max_value=256)
-@@ -320,7 +319,6 @@ def test_pad_sizes(msg, bl_sz):
- 
- 
- @given(binary(min_size=0,
--              average_size=128,
-               max_size=2049),
-        integers(min_value=16,
-                 max_value=256)
diff --git a/dev-python/responses/files/responses-0.10.7-tests.patch b/dev-python/responses/files/responses-0.10.7-tests.patch
deleted file mode 100644
index 764b22ab3af3..000000000000
--- a/dev-python/responses/files/responses-0.10.7-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/test_responses.py b/test_responses.py
-index c2a4f01..2b85172 100644
---- a/test_responses.py
-+++ b/test_responses.py
-@@ -928,6 +928,7 @@ def _quote(s):
-     return responses.quote(responses._ensure_str(s))
- 
- 
-+@pytest.mark.skipif(six.PY2, reason="Broken on python2")
- def test_cookies_from_headers():
-     text = "こんにちは/世界"
-     quoted_text = _quote(text)
diff --git a/x11-misc/gpaste/metadata.xml b/x11-misc/gpaste/metadata.xml
index 306c2a798778..b673fd439b9f 100644
--- a/x11-misc/gpaste/metadata.xml
+++ b/x11-misc/gpaste/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>leho@kraav.com</email>
-		<name>Leho Kraav </name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="applet">Enable gpaste-applet</flag>
 		<flag name="gnome">Enable proper gnome support and