gentoo resync : 14.05.2020

5 files changed, 8 insertions, 68 deletions

diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 4e828c1e5610..d889f7165d08 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,8 +1,6 @@
 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
-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
+DIST importlib_resources-1.5.0.tar.gz 23660 BLAKE2B aed7a2d730f945505083812355a63d3a88e07b057cf46394f3475135143e535e33dc3ebded24d233797020c805dc35decf5c5ce53758798b093f03f2951daa87 SHA512 34d14c1ff3121cc6f9ef1d3d4417831e3476e9facfcc9b35152c28a59a2c75d7723f171f4b48852f79ec46cbf54b066580745744bc54d349e2bfe12a353a9aed
+EBUILD importlib_resources-1.4.0.ebuild 1274 BLAKE2B 0ba74e406c9d5f2ccec9f67c94ccecd96dc7a6d2905ae0c0183b8ec46bd9dff66dc1b4a3f166503900b04e5ffe931557bc0ed6dceb212b913e28b51c6fd7b441 SHA512 b376967818c52b3f023fe980f53fab238154327bdbe26fd70ee2b950b02a908d669f888f4c8cf4d7912761bfb625764f86d59d95ea0a7fd297fcba508c76e3fb
+EBUILD importlib_resources-1.5.0-r1.ebuild 1289 BLAKE2B 199f43187b4b4dcbe438fd6d1d59dbef10712cfa389cccb3285e1589c82bfab2acc1ab2f48e0436c6e2b577a55a55287cbc6d1f0141ae166c9594756c0ce2f53 SHA512 c917897a69f256365a8ff767b810c5383ed023853d1ca914483c301729a403071efeac1e3918af71fd927ac58caf8426f7ea443cb4fd9912cef5dbc9bfd44d22
+MISC metadata.xml 895 BLAKE2B fadc4adcee6471eb31d5a1b406c9a6a29e366a50abcee105a08456b432e9a42352afdf7d08f37c3ee6100f1f57080bce2a32770b3fda96bedebfa7958957975f SHA512 6802c03cfc8049146dbbef1ff6462cb2eb01f18048a857ff0050af8e15367bff8e40521c989fcdc68c95b2025d2b7af09015f99c279ee504d556165687d7fa36
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
deleted file mode 100644
index 1c9565f5b9dc..000000000000
--- a/dev-python/importlib_resources/importlib_resources-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pathlib2[${PYTHON_USEDEP}]
-		dev-python/typing[${PYTHON_USEDEP}]
-	' -2)
-"
-BDEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( ${RDEPEND} )
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-# https://gitlab.com/python-devs/importlib_resources/issues/71
-PATCHES=( "${FILESDIR}/${P}-skip-wheel.patch" )
-
-python_prepare_all() {
-	sed -i "/'sphinx.ext.intersphinx'/d" ${PN}/docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build ${PN}/docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/importlib_resources/importlib_resources-1.4.0.ebuild b/dev-python/importlib_resources/importlib_resources-1.4.0.ebuild
index 7000c2fb3a50..6bf25d466e98 100644
--- a/dev-python/importlib_resources/importlib_resources-1.4.0.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-1.4.0.ebuild
@@ -14,7 +14,7 @@ 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"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/importlib_resources/importlib_resources-1.3.1.ebuild b/dev-python/importlib_resources/importlib_resources-1.5.0-r1.ebuild
index 32dfa6ffe268..e86acf448e78 100644
--- a/dev-python/importlib_resources/importlib_resources-1.3.1.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-1.5.0-r1.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-# This is a backport of Python 3.7's importlib.resources
-PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
+# This is a backport of Python 3.9's importlib.resources
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
@@ -34,7 +34,7 @@ BDEPEND="
 "
 
 distutils_enable_tests unittest
-distutils_enable_sphinx importlib_resources/docs dev-python/rst-linker
+distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
 
 python_compile() {
 	distutils-r1_python_compile
diff --git a/dev-python/importlib_resources/metadata.xml b/dev-python/importlib_resources/metadata.xml
index 0370da6b8726..0ef87864b431 100644
--- a/dev-python/importlib_resources/metadata.xml
+++ b/dev-python/importlib_resources/metadata.xml
@@ -2,14 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>gentoo@seichter.de</email>
-		<name>Ralph Seichter</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>sbraz@gentoo.org</email>
 		<name>Louis Sautier</name>
 	</maintainer>