gentoo Easter resync : 12.04.2020

5 files changed, 4 insertions, 78 deletions

diff --git a/dev-python/html2text/Manifest b/dev-python/html2text/Manifest
index fef0a85637df..a3520d1718b8 100644
--- a/dev-python/html2text/Manifest
+++ b/dev-python/html2text/Manifest
@@ -1,9 +1,5 @@
-DIST html2text-2018.1.9-1.tar.gz 51173 BLAKE2B a21cd3e579d47081e669fda3f3147fc28d816478885942565a1b93b86292e2729e93bfea6b5326703e575f209f5bd7dd905d72011b8153b8c40d31c83acf9057 SHA512 773b508864a2fa31e961e132118702429f5b7836e90bd521db2ed6b4215de49d63991a99b7ad7d5aac3074a3c14e4d384557a4eb5b43c7e2aada46d5434ed229
-DIST html2text-2019.8.11.tar.gz 48721 BLAKE2B 6a63a9608c29374a510d7026717de4b94eb63d366513990623b9bfbf679680c85f5cf06ec7076143397d160a5c484bf5dfef3e24b1862be09e0cc0d7cd86051a SHA512 f405bccea18b2898fc8816483e8fa8912b2d508f139d7a65c54218acc87006d8b89e00a12018dc7b911f729036fe4e8a5069242dc00edb40171d4bc149e39ba6
 DIST html2text-2019.9.26.tar.gz 48634 BLAKE2B efece48c7b05171f9bae833663292d7804838b5a791f1f734b3a258843a71616ada2ebee7cee406e0bfa1a3dce67040d41621bd87be100a2c0d4ca6d75829aa9 SHA512 4c6a52e96d3997a6ebe41c2955e2f6bd5189f49aadd7d7afbe67b85a2f61a0aafd0fc09fef184cb9407b9ab26f120ef235294e4e9d8f41e3b6b8f6fc29aa386d
 DIST html2text-2020.1.16.tar.gz 49464 BLAKE2B f0331daa63b9e5d7508e0446e19b4dd4d05e5f7af0279efd71dc43b633f8273666189899a27cb598e8afdd5bd8ffb3d566b97327d82870ef44a81310d8e7e7c9 SHA512 14453c98e81d05afb3241b04a9e50caf63e4b6f857337b4bd9f53e6b8fa7146aa6a1f4f64777db9fa350316b19fe62a0033dce5748191ca9fbd17a8757002855
-EBUILD html2text-2018.1.9.ebuild 924 BLAKE2B b7a75f3a201c2d92932a7eb9645c2d28873198abeea9bd6f9dac6b0a42fe0220ca5aa541fec5a41d4024f35f188a8462abcda409aaec1d74df2f81cc7e04ea69 SHA512 824e0a4e2a8661d8c95af2e4bde31b32f0f511767898b69db31ab7beb5d105677a58363c86e6078ea3dd7b01f37a7a3a3297dff739ac41856275c0bd53c3016a
-EBUILD html2text-2019.8.11.ebuild 968 BLAKE2B d861330b70b4f21fbf613761dc1fcf86a6b90e32f93dd04f4e434f14ad94002cbd670eaa0826cc085c69aead51f9cfcbfeb1dc1a3a7a66d0dc9c6a5a80506943 SHA512 8b57279ec09840e878d2b904f9e04c496aebbb156b203d642fbe63c72a2e0feb6b8a17cf107a33357ab9437fcb7fee42c281c3cd265815dc10ac3eca111a65aa
-EBUILD html2text-2019.9.26.ebuild 964 BLAKE2B db29ccb09dd222b28a386238cf72560e938cf4f70617c928fe7ebd5bec9a80bd8a6bfb3c0a670ffb737ce73efc07a32f69d54f56984088fc68fa2bf1c160a8ee SHA512 9c81869b0157a53819585ae3ff85da615e2984e703ceee2f34d2bef1d1641ee08301347a28b26d8f361a8a4ce73b7e5cf7fd9ad7a08d41adb4207a4e22263689
-EBUILD html2text-2020.1.16.ebuild 732 BLAKE2B 70b55bf9951face5355eb2e6e0bdb04fcee206c5901154c5f7bb08713028ae44d7e1cf5c16033eb7366652c892411e2028a7928978ff25221fa067e66dcad7cf SHA512 208d41d878cf7941425c041c87c712be6d99a9c5fa44bf921140426e1624487f9f6c8cd4f072cae9e1e8404f47f0d0e0865cbe5ab89facd4ce43e802e014c838
+EBUILD html2text-2019.9.26.ebuild 962 BLAKE2B 0f0a17eaefd4ee45dc6ba7c66fa6291b954e60d1b2b240b356418ab7d67a3b5fdf88d20a56d6ba08810526768b3a4fcc4e981444c5f22589b77b0f6584e0d677 SHA512 02851edb28d19b25f68604b7e192102dc8c0ce86c03b225d4394e5ba79a7dfbbd4a48bb7721f6502b078842e0e27b2218f8a004b105e7cefee17f4dd1625b4c2
+EBUILD html2text-2020.1.16-r1.ebuild 733 BLAKE2B 2af3aa431411c6c336b193d49a59b6dda62bd2fa71f25a85eb2ee5572a0079e5b9d1af16164c78dc2a1535316b3db7e43058c0e8bf1de0b1e8a31fbc876599b6 SHA512 1a023076b410302e5d8175dce9eaa59f5c32fa4d4a4f96b6f90950e3fc447be631a2ffeb81a51761c02e0eb9b590fdd97e08d0f8e94e26eaa3c432a8d960fba1
 MISC metadata.xml 369 BLAKE2B d4f2c4f645c20a9e803e76df75ca78b79d8ccebe56ee8430d38abdcc096be85397b6541ddc2f25cb2c79d955b9ee913437edda69956cb78c1f0c38256b311be5 SHA512 dfa2834eca444d2c56f36b11a193c4e6b012b3a3afab08034c87d9ebb442010f2454788416380a4caf78ebaf47feb2212643977aab3100971fa99f29fe29955e
diff --git a/dev-python/html2text/html2text-2018.1.9.ebuild b/dev-python/html2text/html2text-2018.1.9.ebuild
deleted file mode 100644
index c14248bc9280..000000000000
--- a/dev-python/html2text/html2text-2018.1.9.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-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}-1.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.8.11.ebuild b/dev-python/html2text/html2text-2019.8.11.ebuild
deleted file mode 100644
index f88d915c253a..000000000000
--- a/dev-python/html2text/html2text-2019.8.11.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_{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 ~arm ~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/html2text-2019.9.26.ebuild b/dev-python/html2text/html2text-2019.9.26.ebuild
index 5f3b2785c167..f90b514257eb 100644
--- a/dev-python/html2text/html2text-2019.9.26.ebuild
+++ b/dev-python/html2text/html2text-2019.9.26.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/html2text/html2text-2020.1.16.ebuild b/dev-python/html2text/html2text-2020.1.16-r1.ebuild
index d0b10482441f..41f000eb1eed 100644
--- a/dev-python/html2text/html2text-2020.1.16.ebuild
+++ b/dev-python/html2text/html2text-2020.1.16-r1.ebuild
@@ -22,6 +22,6 @@ distutils_enable_tests pytest
 
 python_prepare_all() {
 	# naming conflict with app-text/html2text, bug 421647
-	sed -i 's/html2text = html2text.cli:main/py\0/' setup.py || die
+	sed -i 's/html2text = html2text.cli:main/py\0/' setup.cfg || die
 	distutils-r1_python_prepare_all
 }