gentoo resync : 14.07.2019

5 files changed, 73 insertions, 30 deletions

diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 2813e592c3e6..5828b369a490 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,3 +1,4 @@
-DIST importlib_resources-1.0.2.tar.gz 23605 BLAKE2B 813f913a779115575f3cab6f5be8f9e7ea706a6f0e47bc0bb29439901515b435c33975f6b1fd96d74140e488b0bd98aca3331e0d69940153b348891fd5f4f400 SHA512 3b7b254abdf2cb8ee0abf1608123c49de05d1eada081567a0e083d1f496f37643b81e771490b414dcf56672a7e7ea9aa6dd6b77ea8206d3a97e81ad69da7e927
-EBUILD importlib_resources-1.0.2.ebuild 573 BLAKE2B 9c8bc90c48618c297a23b686a0be60c4bbf4511831c67e7d62e172350baad85fbad75ccbcc482c422479accbf6fa78f3c3b89874810a3265db701c00f945d6ec SHA512 1bb242265d0edf1c10d75114e1586cb7800dff63b2d242664111bf3d138dceb9b5165fa211ff79c284f13b894298353285614dd28680e561f7da56692fefd15f
-MISC metadata.xml 778 BLAKE2B 36b7d03e0d72ed317bc10345d02b1ebb1386920178d662b7620f11917170f864e977a1b200630621bf178438384ca4598c562c9c4b7f07542cd5646a5285ad51 SHA512 f9b46228027302f61f527e6c8638150573cab5ead0d2942ec2d32b8cb9712e45a14e6157b0f8f1daee0e3f8e097e5abfd9b5f2bca948abc46a6863d785a85dc9
+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 1182 BLAKE2B ac2d16f3e2d5247a13490083c3f89fb987e5a30208d4e0ce63eb5e1fc7a254f80bc8d71f086c4ff26a16223742869dd0f7d262ad55a4b11fa6438545fc9a0caf SHA512 09e57e97cfc798deedbbb26e8053c4a250337eb183ecf6ebdd6bcedf6b12f317ac9b933bf5ee65df432cbc98f75205ff7ededb5dfbecb3a79f8d06a6314e63f0
+MISC metadata.xml 1121 BLAKE2B 51c2d6c7fbdd7da49d9eb489e8268cb7d5ac85c0ed2505784b377cafed49c29fbc895ae5aa831418175f6f826822a92b6491fc82cbffea428a33b9cba76d0408 SHA512 99fd2fc5abc3deafdfc7eab5e159c80836c3b58ddab63e9bf74f102ca917567be0c5068870206410e82937cdb05d68cb9964402bae9291bc3028417cd316f8cf
diff --git a/dev-python/importlib_resources/files/importlib_resources-1.0.2-skip-wheel.patch b/dev-python/importlib_resources/files/importlib_resources-1.0.2-skip-wheel.patch
new file mode 100644
index 000000000000..1cff1fafeaf1
--- /dev/null
+++ b/dev-python/importlib_resources/files/importlib_resources-1.0.2-skip-wheel.patch
@@ -0,0 +1,12 @@
+diff --git a/setup.cfg b/setup.cfg
+index c9ef791..412b1a9 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -19,7 +19,6 @@ classifiers =
+ python_requires = >=2.7,!=3.0,!=3.1,!=3.2,!=3.3
+ setup_requires = 
+ 	setuptools
+-	wheel
+ install_requires = 
+ 	pathlib2; python_version < '3'
+ 	typing; python_version < '3.5'
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
new file mode 100644
index 000000000000..5ebc09e8110e
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-1.0.2-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 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=( pypy{,3} python{2_7,3_{5,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="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
+	virtual/python-typing[${PYTHON_USEDEP}]
+"
+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.0.2.ebuild b/dev-python/importlib_resources/importlib_resources-1.0.2.ebuild
deleted file mode 100644
index 830ec759d0b0..000000000000
--- a/dev-python/importlib_resources/importlib_resources-1.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read resources from Python packages"
-HOMEPAGE="https://importlib-resources.readthedocs.io/en/latest/"
-SRC_URI="https://gitlab.com/python-devs/${PN}/-/archive/${PV}/${P}.tar.gz"
-LICENSE="Apache-2.0"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]"
-
-RDEPEND="${DEPEND}"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/importlib_resources/metadata.xml b/dev-python/importlib_resources/metadata.xml
index af87c20668a9..0370da6b8726 100644
--- a/dev-python/importlib_resources/metadata.xml
+++ b/dev-python/importlib_resources/metadata.xml
@@ -9,6 +9,14 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>sbraz@gentoo.org</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 		Backport of Python 3.7’s standard library importlib.resources
 		module for Python 2.7, and 3.4 through 3.6. Users of Python
@@ -18,5 +26,7 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="gitlab">python-devs/importlib_resources</remote-id>
+		<remote-id type="pypi">importlib_resources</remote-id>
+		<bugs-to>https://gitlab.com/python-devs/importlib_resources/issues</bugs-to>
 	</upstream>
 </pkgmetadata>