gentoo Easter resync : 12.04.2020

4 files changed, 73 insertions, 11 deletions

diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 12b014100d6c..4e828c1e5610 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,5 +1,8 @@
 AUX importlib_resources-1.0.2-skip-wheel.patch 305 BLAKE2B 741e9825c64a88696603d31d9b749fcd3756bcb44755730b12d22afddf911d178365904885d2323aa5b331f44f20b6e3306ad03adb60794c6c83cd1b0795c902 SHA512 6e3f90b1544c6de97768aaae708d1bc93494dcdf1cf10d59e48b55406c9a6c9bc9eb5f5c0d034bcff99eae5274c1f1a467a9bd2a4292f0eadf0686286b879f77
 DIST importlib_resources-1.0.2.tar.gz 23602 BLAKE2B 24c27b45ec56d3838b039baf2ebc1e0c5ec582d5cfdeb5cf26587255bf8b32aa1fcf43802cabca3b82b3ddec8cdf2616d10489c3c1aca77c9fa91af1f25ef9e7 SHA512 50bfc5130a2c9c9354efef1cd7132e805ed0f13467ba67172f83e11d907212bef3957aeef51fd904b73996c8280008d99c918637956a470448dfd67ef4807f82
-EBUILD importlib_resources-1.0.2-r1.ebuild 1254 BLAKE2B 295ecf68ea748305ab37ec0b1aa5703ebc9c62728b6a6053cf82561b44d09574d7e5c257b134fa33c7ce950a9f2b83a99bb0c6f21cc56396c97d1f1c8c085c47 SHA512 98e853072c15ebe11dd3091cc6d5a980b35e72b08e4a3330ddc2ecb718493fe87a3f9b9dc879b4bf391b64e53dbebb367ede494b27ede0abe4c5b018f63d4694
-EBUILD importlib_resources-1.0.2-r2.ebuild 1039 BLAKE2B 3419970975065c65ad0f1eeadbdb0eebaf74528391fca9958ed9d4cf7fb3de406b2a74b3a28d8a0e9c4cc4eba7c4d4a59bae2e4ee1ead8b21461f95d1a0bfc0c SHA512 91a66ea5b7046bcf65769e0c4a59ac1895be23d2073a0601c5583e7200c36b1fc0d3493c96e49ee0addd82ec4d24590168cbbd2cbac58924a0a09fd116aa531d
+DIST importlib_resources-1.3.1.tar.gz 23683 BLAKE2B c5c759a0aca53294e4ab945d918ec4e9f5b8ffa19e7185c5ee6c3db1589a7979242cebbaccad37c0125cccbcf96deeb8a7ac77a5419fa1cca2d0fc0baaeb7df8 SHA512 28661fff19475d27caaa420244a4e2a1fe12ce525eaea4f9892fad5f50a1b991be8c9764c34c1ca0bcc840d49535a963f9784caab221848f0ce0e43b9991dd3d
+DIST importlib_resources-1.4.0.tar.gz 23220 BLAKE2B d494615ba39620e772552b09637e280e0b72b16352387592423f824b67af315da1a0749e0dde8e55d3e0e04848a3c43802c12f20c79c5a067de0a3299510a199 SHA512 e482f109f387de79d66e69084fab70750ce472f7d665c3a617819ab604e376860c2832a0cab27867165b7ac60947db554ec686d73f182dcaa6935dc14ca3d935
+EBUILD importlib_resources-1.0.2-r1.ebuild 1257 BLAKE2B 7a8fc21f3ab87f36c105aa0293c1d8e8b104e25e2db2ca4ae98238c6ba4159bea3dbbcdc43a6a872167b77db1d2ca78b6539612e4a1ecfa1b6fb35e5f3df6f0d SHA512 bf7ea7cc217d7ac700957210772ad6062f984dcd24294ce03ce488898e9f9758147595cd63d22c20e435ec6c989d3b0df07e2ea33d8bd7613fa12a9fbe9ba72a
+EBUILD importlib_resources-1.3.1.ebuild 1275 BLAKE2B 7bbc702998e9a3372843439738d8365ab3b8a4e84f9f0c15ece2e9f22dbd8a9438e9d6df49c9ce96bfc7c2a3425102f93ae67fbca376a85b21c5bbdd39f47492 SHA512 889a6699eeb1fba1286b9a51c275b7edb0dafd96238c3d30d3cab74aa098ee5999f7de0b4cc4fa440659aa00a6e884364f89600eda2601e786041a797a1069ce
+EBUILD importlib_resources-1.4.0.ebuild 1283 BLAKE2B 78e189c2b665b3609cfe0b1f8ebaa3a957e423f0c61a1671c698043300e8286b0392173262e2baf52d29044c50aaa64a733977fc7a969ce642e929228dff02b8 SHA512 805f7fab515d85919a4a8c353641719ae738458aa7204c9064b1c1c5b5e98eccc35520d3e7a7dfb10b0f62fade7ffb79837f71f29625329860cc7287498dc8de
 MISC metadata.xml 1121 BLAKE2B 51c2d6c7fbdd7da49d9eb489e8268cb7d5ac85c0ed2505784b377cafed49c29fbc895ae5aa831418175f6f826822a92b6491fc82cbffea428a33b9cba76d0408 SHA512 99fd2fc5abc3deafdfc7eab5e159c80836c3b58ddab63e9bf74f102ca917567be0c5068870206410e82937cdb05d68cb9964402bae9291bc3028417cd316f8cf
diff --git a/dev-python/importlib_resources/importlib_resources-1.0.2-r1.ebuild b/dev-python/importlib_resources/importlib_resources-1.0.2-r1.ebuild
index 9fdb80048aa2..1c9565f5b9dc 100644
--- a/dev-python/importlib_resources/importlib_resources-1.0.2-r1.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-1.0.2-r1.ebuild
@@ -14,13 +14,15 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
-	virtual/python-typing[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		dev-python/typing[${PYTHON_USEDEP}]
+	' -2)
 "
 BDEPEND="
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
diff --git a/dev-python/importlib_resources/importlib_resources-1.0.2-r2.ebuild b/dev-python/importlib_resources/importlib_resources-1.3.1.ebuild
index d179907d9e97..32dfa6ffe268 100644
--- a/dev-python/importlib_resources/importlib_resources-1.0.2-r2.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-1.3.1.ebuild
@@ -17,15 +17,24 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND="
-	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
-	virtual/python-typing[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/contextlib2[${PYTHON_USEDEP}]
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		dev-python/singledispatch[${PYTHON_USEDEP}]
+		dev-python/typing[${PYTHON_USEDEP}]
+	' -2)
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+		dev-python/zipp[${PYTHON_USEDEP}]
+	' pypy3 python3_{6,7})
+"
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests unittest
-distutils_enable_sphinx importlib_resources/docs
-
-# https://gitlab.com/python-devs/importlib_resources/issues/71
-PATCHES=( "${FILESDIR}/${P}-skip-wheel.patch" )
+distutils_enable_sphinx importlib_resources/docs dev-python/rst-linker
 
 python_compile() {
 	distutils-r1_python_compile
diff --git a/dev-python/importlib_resources/importlib_resources-1.4.0.ebuild b/dev-python/importlib_resources/importlib_resources-1.4.0.ebuild
new file mode 100644
index 000000000000..7000c2fb3a50
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-1.4.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# This is a backport of Python 3.7's importlib.resources
+PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read resources from Python packages"
+HOMEPAGE="https://importlib-resources.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/contextlib2[${PYTHON_USEDEP}]
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		dev-python/singledispatch[${PYTHON_USEDEP}]
+		dev-python/typing[${PYTHON_USEDEP}]
+	' -2)
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+		dev-python/zipp[${PYTHON_USEDEP}]
+	' pypy3 python3_{6,7})
+"
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
+
+python_compile() {
+	distutils-r1_python_compile
+	if ! python_is_python3; then
+		rm "${BUILD_DIR}/lib/importlib_resources/_py3.py" || die
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install --skip-build
+}