gentoo resync : 10.11.2019

5 files changed, 47 insertions, 81 deletions

diff --git a/dev-python/html2text/Manifest b/dev-python/html2text/Manifest
index 076924f042e9..b9350d882ac0 100644
--- a/dev-python/html2text/Manifest
+++ b/dev-python/html2text/Manifest
@@ -1,7 +1,5 @@
-DIST html2text-2016.5.29.tar.gz 46879 BLAKE2B 0e7ccae7ae4d90fb202d9fdb8edd81f74b204f81c2410f345eb923fe610f61fab6ba71bcc95138fb3706ee51007a2c72c76497cee48818032934e7f809fd46ae SHA512 58b71fda6ea6fd1a71dec757c91cf342265a2c89ff5c45e752436068419fb6c1faa1ca0d5a6baafaaa60186a85aefdd840989177ce30e55bcda1c6209fc375be
-DIST html2text-2017.10.4.tar.gz 50527 BLAKE2B 96b7060761a629cf4313104323517c4a9070aabfa02be43e80c89b56b92329785817abc7ab9fef4a8537cbde4a797926d3c1d444c11f3db6112074a31d8a8e61 SHA512 c7f9b765572b5eac72837aa757f0be07df0270b49f9b3a3ec8c3c65ff929505166b0510c106116ffdca484b56120b6c162f86b600d88a5a35e86d06cd6b6fa19
 DIST html2text-2018.1.9-1.tar.gz 51173 BLAKE2B a21cd3e579d47081e669fda3f3147fc28d816478885942565a1b93b86292e2729e93bfea6b5326703e575f209f5bd7dd905d72011b8153b8c40d31c83acf9057 SHA512 773b508864a2fa31e961e132118702429f5b7836e90bd521db2ed6b4215de49d63991a99b7ad7d5aac3074a3c14e4d384557a4eb5b43c7e2aada46d5434ed229
-EBUILD html2text-2016.5.29.ebuild 949 BLAKE2B 7f798b1e17bcbba0bf27a1f96f9b930e77c6fddab60f28a5d73cefebf7c28639e04261f9984eaecf21c606182fb20a5b1aa67e49ff706b692afde12c1156a603 SHA512 1aef1975618384e8bf682f1d6645abcf6d67d5a6aaecaf26691fe7914d4d4e12a4787311d321a9a5670b4dd337690462ec00eea6b3640dda115f7a7b79efc098
-EBUILD html2text-2017.10.4.ebuild 931 BLAKE2B 6816adf37fb0ab530aa9bc24c8ee07ddff0e3e3411a5f145c665b757d56dd07e5e835b143fbdbe9d3184193c7db2b31046a9750f88dda1216c3494b38e2542f7 SHA512 7ba02932349b69afbbcc56eac334ca638f2e2a1929680aa4c0e2b08d5937c6622432164ecfbf834ca8dd2f76dbd4b93d3c74b66f7563b5f4fdb2fbac0db73778
+DIST html2text-2019.9.26.tar.gz 48634 BLAKE2B efece48c7b05171f9bae833663292d7804838b5a791f1f734b3a258843a71616ada2ebee7cee406e0bfa1a3dce67040d41621bd87be100a2c0d4ca6d75829aa9 SHA512 4c6a52e96d3997a6ebe41c2955e2f6bd5189f49aadd7d7afbe67b85a2f61a0aafd0fc09fef184cb9407b9ab26f120ef235294e4e9d8f41e3b6b8f6fc29aa386d
 EBUILD html2text-2018.1.9.ebuild 931 BLAKE2B 57fb5d8bd7d7123eb81fff832f043229c1cc52cc061e422978af1d16a4970677d44fe5baca51e64d365930ae9019e9fa7c362e338db2420b54ced463a21d2157 SHA512 76caf8cacb1f38867d375561dde5b24fdd76607b624c972b584789fd7f3835475e621ce22aa4b0ada86427aa1a0e8963f1003cf153ee3e50ffbda7717017260c
-MISC metadata.xml 332 BLAKE2B 2df3c377697f219f255f69968f31426f716334507a858fc4ea27f0dcb09ab1f7b2d98d4da2760c94ced1747ad908896a6c7c6cc1cd89fb5877707b14e37f825d SHA512 2fea207556f26e64296d5804463e561410aff69312cf947dfb2eceee8c664980d86cbdb6b062a0457953e16018cb0304771311a3313056efe0183a85c8b2d5fc
+EBUILD html2text-2019.9.26.ebuild 961 BLAKE2B 5e77053b1534d403e58eaf4c8d1f703e6c4738c527476e2d3a1370ef413151e96ecefefb2e1fc6efbf9e8ec3eaaf598fc71ebcfb6d434ffd0811a03573ccda1b SHA512 e3b27394ff8e9dac8832e8fd30cb68748d343c5c3bf012ff8b55830e3c51aaf0861a331ec00fb6547ae771af6055a9adf982cc70d781a5719211b8c001ae0f8b
+MISC metadata.xml 369 BLAKE2B d4f2c4f645c20a9e803e76df75ca78b79d8ccebe56ee8430d38abdcc096be85397b6541ddc2f25cb2c79d955b9ee913437edda69956cb78c1f0c38256b311be5 SHA512 dfa2834eca444d2c56f36b11a193c4e6b012b3a3afab08034c87d9ebb442010f2454788416380a4caf78ebaf47feb2212643977aab3100971fa99f29fe29955e
diff --git a/dev-python/html2text/html2text-2016.5.29.ebuild b/dev-python/html2text/html2text-2016.5.29.ebuild
deleted file mode 100644
index a573db30529d..000000000000
--- a/dev-python/html2text/html2text-2016.5.29.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Turn HTML into equivalent Markdown-structured text"
-HOMEPAGE="https://github.com/html2text/html2text
-	https://github.com/Alir3z4/html2text https://pypi.org/project/html2text/"
-SRC_URI="https://github.com/Alir3z4/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/feedparser[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
-
-DOCS=( AUTHORS.rst ChangeLog.rst README.md )
-
-src_prepare() {
-	default
-
-	# naming conflict with app-text/html2text, bug 421647
-	sed -i 's/html2text=html2text.cli:main/py\0/' setup.py || die
-}
-
-python_test() {
-	"${PYTHON}" test/test_html2text.py -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/html2text/html2text-2017.10.4.ebuild b/dev-python/html2text/html2text-2017.10.4.ebuild
deleted file mode 100644
index 13cf26a86771..000000000000
--- a/dev-python/html2text/html2text-2017.10.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Turn HTML into equivalent Markdown-structured text"
-HOMEPAGE="https://github.com/Alir3z4/html2text https://pypi.org/project/html2text/"
-SRC_URI="https://github.com/Alir3z4/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/feedparser[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
-
-DOCS=( AUTHORS.rst ChangeLog.rst README.md )
-
-src_prepare() {
-	default
-
-	# naming conflict with app-text/html2text, bug 421647
-	sed -i 's/html2text=html2text.cli:main/py\0/' setup.py || die
-}
-
-python_test() {
-	"${PYTHON}" test/test_html2text.py -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/html2text/html2text-2019.9.26.ebuild b/dev-python/html2text/html2text-2019.9.26.ebuild
new file mode 100644
index 000000000000..8cb53b668f84
--- /dev/null
+++ b/dev-python/html2text/html2text-2019.9.26.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( pypy3 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Turn HTML into equivalent Markdown-structured text"
+HOMEPAGE="https://github.com/Alir3z4/html2text https://pypi.org/project/html2text/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# pkg_resources is used for entry points
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+DOCS=( AUTHORS.rst ChangeLog.rst README.md )
+
+python_prepare_all() {
+	# naming conflict with app-text/html2text, bug 421647
+	sed -i 's/html2text = html2text.cli:main/py\0/' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pytest -vv || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/html2text/metadata.xml b/dev-python/html2text/metadata.xml
index 3f2858f880fc..10cbc1a47a34 100644
--- a/dev-python/html2text/metadata.xml
+++ b/dev-python/html2text/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">Alir3z4/html2text</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Alir3z4/html2text</remote-id>
+		<remote-id type="pypi">html2text</remote-id>
+	</upstream>
 </pkgmetadata>