Merge updates from master

17 files changed, 227 insertions, 18 deletions

diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index ccbf55ce056f..0aaec1ebd968 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,2 +1,2 @@
 DIST libuv-1.35.0.tar.gz 1253950 BLAKE2B 81ed766d0ca6fc0f8d2ed0b530b9a43104a2f985f86974a30b2d0abe08327cfeb7dfdd7c5b31619fbfcd8f9ca2e03987e16856d8abfef8b9eb9afa7f8c7b0b27 SHA512 a05bfd7cab6ae74022e7120a48772a6594522fb5bc467c8c05eb4809d7c78b68fa4843d86e2e34a68d439767a27dbc49f3b1dcbc8df85bec64471c1b459989c3
-DIST libuv-1.36.0.tar.gz 1249354 BLAKE2B 5dbd41fce69de623e30d3355751d134bd020df93dec6433f7eb13b63f0305900b9446ebb3da43ea6c52651ad659d26de9006f2a5abb689c47f89b92be0963d10 SHA512 17ccffc5b1b99a05f38d56388d0f5e8c5ac099994a7f34636ba89e9e3fe1ceb139ed43b4ef75b8dd262381f7dec4d30c0ea9cb9deeda88231710c249319bf874
+DIST libuv-1.37.0.tar.gz 1249701 BLAKE2B 4c48e2062eaaa259623908db99e3ca4b63f27dcbae097b05af542b32860d79aa5aaf5b388c48902a1927b9c4ad6e88b1c2dc2c052815e1321c3e17932c7f09c6 SHA512 ae0d864f5455696507b3a7680170d26e0e333aaeeb74dc2647fc9774a89912ba8ac2be056dbd5cd2b0224ec36ef7bb223fbc851a77302be82c531f8ea01545e0
diff --git a/dev-libs/libuv/libuv-1.36.0.ebuild b/dev-libs/libuv/libuv-1.37.0.ebuild
index 3deb47fd69a0..3deb47fd69a0 100644
--- a/dev-libs/libuv/libuv-1.36.0.ebuild
+++ b/dev-libs/libuv/libuv-1.37.0.ebuild
diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
index f86afdc09ebf..cff3ce62a672 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -1 +1,2 @@
 DIST arrow-0.13.1.tar.gz 148509 BLAKE2B 7a47f8886cc2f50f6dda682daab37c599aad15c7e4a0c76b1324f9fe3a1b8168e3a2b29352bdc9c4daf0fa3b3843fa919d5256997c673bcb24ca033312242b60 SHA512 4933e02fe4ef7a632d55e5c6d2cbcefe6840467c809e0377be92f02d0dc10b5b2421cea2be7ddd5158236ec80f44848125253bfeef5a2ae635a3b9c5761fa105
+DIST arrow-0.15.5.tar.gz 82264 BLAKE2B 2091e16921a5f9f944de3f25ce853b50973d970d982b880fafa75ee37f98110dde05bfd02bb8ce27518ed17600e5bcfb8602c353d7e3af249aa4bfc4b642356d SHA512 cb147a1f2976e6cedddbf2d2d0d5ce69a4a609d4c0c3d68f96b317fc2af334552cb0c1a94aa5bb38e6d74ca7e1beab1ae8a325920a15efd79c35835c92df2409
diff --git a/dev-python/arrow/arrow-0.15.5.ebuild b/dev-python/arrow/arrow-0.15.5.ebuild
new file mode 100644
index 000000000000..2c705f6d9bde
--- /dev/null
+++ b/dev-python/arrow/arrow-0.15.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Better dates and times for Python"
+HOMEPAGE="https://github.com/crsmithdev/arrow/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	test? (
+		dev-python/chai[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests setup.py
+
+PATCHES=(
+	"${FILESDIR}"/arrow-0.15.5-remove-dateparser.patch
+)
diff --git a/dev-python/arrow/files/arrow-0.15.5-remove-dateparser.patch b/dev-python/arrow/files/arrow-0.15.5-remove-dateparser.patch
new file mode 100644
index 000000000000..ea3b7847964b
--- /dev/null
+++ b/dev-python/arrow/files/arrow-0.15.5-remove-dateparser.patch
@@ -0,0 +1,39 @@
+From 00b34547e99259eda92d7bd1ca406e74693d6861 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 19 Apr 2020 18:30:20 +0200
+Subject: [PATCH] Remove test requiring dateparser
+
+---
+ tests/factory_tests.py | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/tests/factory_tests.py b/tests/factory_tests.py
+index abdd0d0..65fa1bb 100644
+--- a/tests/factory_tests.py
++++ b/tests/factory_tests.py
+@@ -2,7 +2,6 @@
+ import time
+ from datetime import date, datetime
+ 
+-import dateparser
+ from chai import Chai
+ from dateutil import tz
+ 
+@@ -113,14 +112,6 @@ class GetTests(Chai):
+ 
+         assertDtEqual(self.factory.get(tz.gettz("US/Pacific")), self.expected)
+ 
+-    # regression test for issue #658
+-    def test_one_arg_dateparser_datetime(self):
+-        expected = datetime(1990, 1, 1).replace(tzinfo=tz.tzutc())
+-        # dateparser outputs: datetime.datetime(1990, 1, 1, 0, 0, tzinfo=<StaticTzInfo 'UTC\+00:00'>)
+-        parsed_date = dateparser.parse("1990-01-01T00:00:00+00:00")
+-        dt_output = self.factory.get(parsed_date)._datetime.replace(tzinfo=tz.tzutc())
+-        self.assertEqual(dt_output, expected)
+-
+     def test_kwarg_tzinfo(self):
+ 
+         self.expected = (
+-- 
+2.26.1
+
diff --git a/dev-python/binaryornot/Manifest b/dev-python/binaryornot/Manifest
index e5d95ea85442..0f6a5a4dc045 100644
--- a/dev-python/binaryornot/Manifest
+++ b/dev-python/binaryornot/Manifest
@@ -1 +1,2 @@
 DIST binaryornot-0.4.3.tar.gz 372299 BLAKE2B c4ae99b9ccb66da8925d74fad68b8df4713822acc74d852e2f584e5c157eb465bc6418b0e0085533479ba1ee937c3d2716dea66ce3bd517d49a490ab4615f694 SHA512 bdb918b921fc46d056572b84126dbdc6605ec98cf13aac84f6f64ce07d083839be40bf7a08185eaabfbe136a9bcf0c1acc8041a23a6bb2843e8e72981222ebaa
+DIST binaryornot-0.4.4.tar.gz 372361 BLAKE2B cb2099313f602915bacd5b463642f16430fcb0ab62dcaae546cb854780996526fb777c0b730b4b89e664ec7f995ddd2d2f632cfbac2dadca45958cfd1dd7a410 SHA512 31dfb79bb5847e12487d94519a357dece4572f7ed064686d53a49c2de5a51d6441be64523c98cca6221ed89be5bf26e54866dd3b79ac8d89fd5019a5b4d75a45
diff --git a/dev-python/binaryornot/binaryornot-0.4.4.ebuild b/dev-python/binaryornot/binaryornot-0.4.4.ebuild
new file mode 100644
index 000000000000..ec80214fe93e
--- /dev/null
+++ b/dev-python/binaryornot/binaryornot-0.4.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Ultra-lightweight pure Python package to guess whether a file is binary or text"
+HOMEPAGE="https://github.com/audreyr/binaryornot"
+SRC_URI="https://github.com/audreyr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
+
+DOCS=( README.rst HISTORY.rst CONTRIBUTING.rst )
+
+PATCHES=(
+	# https://github.com/audreyr/binaryornot/commit/38dee57986c6679d9936a1da6f6c8182da3734f8
+	"${FILESDIR}"/${P}-tests.patch
+)
+
+distutils_enable_tests unittest
diff --git a/dev-python/binaryornot/files/binaryornot-0.4.4-tests.patch b/dev-python/binaryornot/files/binaryornot-0.4.4-tests.patch
new file mode 100644
index 000000000000..2070485b6a0d
--- /dev/null
+++ b/dev-python/binaryornot/files/binaryornot-0.4.4-tests.patch
@@ -0,0 +1,22 @@
+From 38dee57986c6679d9936a1da6f6c8182da3734f8 Mon Sep 17 00:00:00 2001
+From: Greg <gregobinna@gmail.com>
+Date: Sat, 10 Aug 2019 15:10:33 +0000
+Subject: [PATCH] fix failing test
+
+---
+ tests/test_check.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_check.py b/tests/test_check.py
+index 1ea31a4..f800583 100755
+--- a/tests/test_check.py
++++ b/tests/test_check.py
+@@ -216,7 +216,7 @@ def bytes_in_file(data):
+ 
+ 
+ class TestDetectionProperties(unittest.TestCase):
+-    @given(binary(average_size=512))
++    @given(binary(max_size=512))
+     def test_never_crashes(self, data):
+         with bytes_in_file(data) as f:
+             is_binary(f)
diff --git a/dev-python/jinja2-time/files/jinja2-time-0.2.0-arrow-compat.patch b/dev-python/jinja2-time/files/jinja2-time-0.2.0-arrow-compat.patch
new file mode 100644
index 000000000000..04d2993c453f
--- /dev/null
+++ b/dev-python/jinja2-time/files/jinja2-time-0.2.0-arrow-compat.patch
@@ -0,0 +1,38 @@
+From aa4af9af0a0a5111a8ad21bc1b43bbdb586ee8af Mon Sep 17 00:00:00 2001
+From: Vincent Bernat <vincent@bernat.ch>
+Date: Sun, 3 Nov 2019 07:48:08 +0100
+Subject: [PATCH] Use shift() instead of replace() to modify dates
+
+Previously, the `replace()` method from arrow was shifting the date
+when the arguments were using the plural form. Since Arrow 0.9.0, this
+has been deprecated in favor of a `shift()` method. Arrow 0.14.5
+completely removed the ability for `replace()` to shift dates. This
+leads to errors like `AttributeError: unknown attribute: "hours"` when
+using plural form.
+
+This commit replace the use of `replace()` by `shift()` since the
+intent is always to shift the current date.
+---
+ jinja2_time/jinja2_time.py | 6 +++---
+ setup.py                   | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/jinja2_time/jinja2_time.py b/jinja2_time/jinja2_time.py
+index ce713cb..717c8a0 100755
+--- a/jinja2_time/jinja2_time.py
++++ b/jinja2_time/jinja2_time.py
+@@ -19,11 +19,11 @@ def _datetime(self, timezone, operator, offset, datetime_format):
+         d = arrow.now(timezone)
+ 
+         # Parse replace kwargs from offset and include operator
+-        replace_params = {}
++        shift_params = {}
+         for param in offset.split(','):
+             interval, value = param.split('=')
+-            replace_params[interval.strip()] = float(operator + value.strip())
+-        d = d.replace(**replace_params)
++            shift_params[interval.strip()] = float(operator + value.strip())
++        d = d.shift(**shift_params)
+ 
+         if datetime_format is None:
+             datetime_format = self.environment.datetime_format
diff --git a/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild b/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild
index eed27c8c8b51..ece803b2e17c 100644
--- a/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild
+++ b/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Jinja2 Extension for Dates and Times"
@@ -13,15 +13,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/arrow[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]"
-DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/freezegun[${PYTHON_USEDEP}]
-	${RDEPEND} )"
+BDEPEND="test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
 
-python_test() {
-	py.test || die
-}
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-arrow-compat.patch
+)
diff --git a/dev-python/poyo/Manifest b/dev-python/poyo/Manifest
index 1ad32e8a146d..21d39a1780f5 100644
--- a/dev-python/poyo/Manifest
+++ b/dev-python/poyo/Manifest
@@ -1 +1,2 @@
 DIST poyo-0.4.1.tar.gz 10960 BLAKE2B 0020e10e3d29978398930a861352138bc11c491f70cae864618734a1382470a7df6d865de89bac144535db391022748559db874f6325e64430abbc3ff52420f7 SHA512 e2dfc504ec9cea8e43363556b875f9b01fbda506ee8e70916d4a018941e4e347a4e8a78a245f980b9c41b20731948fc9e5e131b415856b31593e44b805acc768
+DIST poyo-0.5.0.tar.gz 15276 BLAKE2B 515e04ee365036c96646e1d7aeae273d541298d4d817713e04c4b8be5d7dd12938099a5ed8ab1dfd137d3ff0108a0e86163b99135ea2aa739eaae67ef74484c2 SHA512 aad4334a2aaf63cafab0ecdbdd6f94e9e3d412e6476d7ac13a4399b4af0f43b1eb910e6a3cc7438e84262bc39413fadbe91674534e1e66f446d738c1328b9905
diff --git a/dev-python/poyo/poyo-0.5.0.ebuild b/dev-python/poyo/poyo-0.5.0.ebuild
new file mode 100644
index 000000000000..a444d2233d60
--- /dev/null
+++ b/dev-python/poyo/poyo-0.5.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="A lightweight YAML Parser for Python"
+HOMEPAGE="https://github.com/hackebrot/poyo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/whichcraft/Manifest b/dev-python/whichcraft/Manifest
index 61fd73b85c1f..0fbab8895219 100644
--- a/dev-python/whichcraft/Manifest
+++ b/dev-python/whichcraft/Manifest
@@ -1 +1,2 @@
 DIST whichcraft-0.4.1.tar.gz 8095 BLAKE2B 666e4919698226e1f252f96323dd1fb56350e7b63424a0022fcf67f7afb83e3ec944b3689f1e58fbc29f1decbf8ce3d87aee9a9cb3a69621b2f65f235682068b SHA512 92633be99badd0ce06cf28b23366f89f2104ef2364ec8f637230fe46b378d1398a64f4d8b367358c833a2038159debc70b0498e94d2729918b95847defd59cae
+DIST whichcraft-0.6.1.tar.gz 8676 BLAKE2B c08dc453b1143da9c46f63d894526784724bff4861c1862a460f557c74e64bbde72c0127f9df0f6547a5c2183fe770e3ceaf417fed88ce70691ec28605f42e75 SHA512 3a8bf524437f3ee0b5b6ee16e4516ba1c75bee738edfef03316b1ef32a58d036734d75e626f113ad434acc29ccc0cce145668867148af7aa10de1fd5f739d5f6
diff --git a/dev-python/whichcraft/whichcraft-0.6.1.ebuild b/dev-python/whichcraft/whichcraft-0.6.1.ebuild
new file mode 100644
index 000000000000..a8eba54e66ad
--- /dev/null
+++ b/dev-python/whichcraft/whichcraft-0.6.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Cross-platform cross-python shutil.which functionality"
+HOMEPAGE="https://github.com/pydanny/whichcraft"
+SRC_URI="https://github.com/pydanny/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DOCS=( README.rst HISTORY.rst CONTRIBUTING.rst )
+
+distutils_enable_tests pytest
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index c72dad7ae361..e85aefda792a 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -341,10 +341,14 @@ _python_export() {
 				local val
 
 				case "${impl}" in
-					python*)
-						# python-2.7, python-3.2, etc.
+					python2*|python3.6|python3.7*)
+						# python* up to 3.7
 						val=$($(tc-getPKG_CONFIG) --libs ${impl/n/n-}) || die
 						;;
+					python*)
+						# python3.8+
+						val=$($(tc-getPKG_CONFIG) --libs ${impl/n/n-}-embed) || die
+						;;
 					*)
 						die "${impl}: obtaining ${var} not supported"
 						;;
diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh
index 377bb474a3ac..192c1183e800 100755
--- a/eclass/tests/python-utils-r1.sh
+++ b/eclass/tests/python-utils-r1.sh
@@ -101,6 +101,20 @@ fi
 test_var PYTHON_PKG_DEP python3_7 '*dev-lang/python*:3.7'
 test_var PYTHON_SCRIPTDIR python3_7 /usr/lib/python-exec/python3.7
 
+test_var EPYTHON python3_8 python3.8
+test_var PYTHON python3_8 /usr/bin/python3.8
+if [[ -x /usr/bin/python3.8 ]]; then
+	abiflags=$(/usr/bin/python3.8 -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS"))')
+	test_var PYTHON_SITEDIR python3_8 "/usr/lib/python3.8/site-packages"
+	test_var PYTHON_INCLUDEDIR python3_8 "/usr/include/python3.8${abiflags}"
+	test_var PYTHON_LIBPATH python3_8 "/usr/lib*/libpython3.8${abiflags}$(get_libname)"
+	test_var PYTHON_CONFIG python3_8 "/usr/bin/python3.8${abiflags}-config"
+	test_var PYTHON_CFLAGS python3_8 "*-I/usr/include/python3.8*"
+	test_var PYTHON_LIBS python3_8 "*-lpython3.8*"
+fi
+test_var PYTHON_PKG_DEP python3_8 '*dev-lang/python*:3.8'
+test_var PYTHON_SCRIPTDIR python3_8 /usr/lib/python-exec/python3.8
+
 test_var EPYTHON pypy3 pypy3
 test_var PYTHON pypy3 /usr/bin/pypy3
 if [[ -x /usr/bin/pypy3 ]]; then
diff --git a/profiles/package.mask b/profiles/package.mask
index 2f9e6026a526..7d1ed88415f9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -156,11 +156,6 @@ app-i18n/man-pages-de
 # Masked for removal in 30 days (bug #717744).
 app-i18n/man-pages-fr
 
-# Jeroen Roovers <jer@gentoo.org> (2020-04-16)
-# Breaks API, see https://bugs.gentoo.org/717728
-=dev-libs/libuv-1.36.0
-
-
 # Michał Górny <mgorny@gentoo.org> (2020-04-16)
 # Both packages have been last bumped mid-2018.  They depend
 # on pytest-relaxed plugin that has been removed due to breaking pretty