gentoo resync : 20.03.2022

3 files changed, 2 insertions, 48 deletions

diff --git a/dev-python/ansi2html/Manifest b/dev-python/ansi2html/Manifest
index fd16b7e0b30c..9b3b7365f3f9 100644
--- a/dev-python/ansi2html/Manifest
+++ b/dev-python/ansi2html/Manifest
@@ -1,5 +1,3 @@
-DIST ansi2html-1.6.0.tar.gz 36053 BLAKE2B deb63c6c9f431ff225cfcbbd2995f0fce9535736dba7d8c92f1f2e51d525640e69bc4269ab073438239edb35815288fa17b2d69c89cca7627ba2b5096009611f SHA512 35e5fb6cee96fe41a658c005734a58b08bc05e8ad5903ad18684c316bdad351a70c534b4162416225bc2ca774d01b4ac1bb8a8dad3170d0738aa7b3daf46b3c0
 DIST ansi2html-1.7.0.tar.gz 42189 BLAKE2B 91c7409b4f8b7503e719489b18e9d7267d80c5259b7481f127cb8d1e6429649249b0832746285efc3e8a4f90ca8f21b872b002634d47a4a54ddfdcc74df0f576 SHA512 bcae0de9874899bd8440853b8279f3b2c4ed46e24bf807221ddc9d1bfa39647e2efd178aefc2fd39bad27b53890270b6ff7c150a0b8e74581b8323ef7a16c977
-EBUILD ansi2html-1.6.0.ebuild 1017 BLAKE2B 14011b39f85e16a4eb5fd9d4bbd212fdada092701ba2abbaf8b176a59b5d4e4c79cd590f7c29131285f6e953e96ca93593117969d45b3e691291150d9c1c08b5 SHA512 66203032b334df2d92374575b697c1a3ed942cb4cd16a0c67ec195c1b55692fe0439790ee811dece0c87071ba25d3cb250bd3cefe7fdc3adb167aa39a50072c0
-EBUILD ansi2html-1.7.0.ebuild 1061 BLAKE2B a52c82ff8e4c3adb16d9bbf00651ea3d9ea1e7ca6848f6531bcc6cdfebaa7ec871020da0ae3952fca48db9c6f4c8d0b65205521ae77945e5023c4be5bc406255 SHA512 967faf4be538e68e53190a6ed91ce80fa3873bde06eabd75e18fab6583ac0e195dc63d0f62227767d88bf65b1c7e50cd6e3e0d54902ac25a2f9dc68647fe0562
+EBUILD ansi2html-1.7.0.ebuild 1023 BLAKE2B e96f16511669da00b1e96a77c8470c4ec515fc60a4db6c500d0c735c0de936754f36fadc84078fc4cc8e80101eb1daedb5b12e4301a8fbacd7803ad633e03060 SHA512 e03a9bc0d65049c416c9225f1ec3f8a5384c2a4ac295bd3753bb97123c9e041b0cc17a9c92febebc53e7172b0bbffb777fd14bc47871ec0e2056834c462e04fa
 MISC metadata.xml 406 BLAKE2B af6335def83547635dc916a45f1d9296faa0e1806237eeb76deac4ea28e701549bdc7fc9cab7e35b84e8f5c32e31ac7bb22c924865872326b70485acef36d517 SHA512 ebbf8d50e3c798cd2889bec1f5bd3f827bbedb9bafe4610b88fa18b1805514f156351786461ae558769f1ce299174d50ee06c864e008d013b26a6c1afb10792e
diff --git a/dev-python/ansi2html/ansi2html-1.6.0.ebuild b/dev-python/ansi2html/ansi2html-1.6.0.ebuild
deleted file mode 100644
index fceae73f627a..000000000000
--- a/dev-python/ansi2html/ansi2html-1.6.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Convert text with ANSI color codes to HTML"
-HOMEPAGE="https://pypi.org/project/ansi2html/ https://github.com/pycontribs/ansi2html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="doc"
-
-RDEPEND=">=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	doc? (
-		app-text/asciidoc
-	)
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_install_all() {
-	use doc && doman man/${PN}.1
-	distutils-r1_python_install_all
-}
-
-src_compile() {
-	# Upstream https://github.com/pycontribs/ansi2html/issues/124
-	use doc && emake man/ansi2html.1
-	distutils-r1_src_compile
-}
diff --git a/dev-python/ansi2html/ansi2html-1.7.0.ebuild b/dev-python/ansi2html/ansi2html-1.7.0.ebuild
index eff833585fbb..ca696089677e 100644
--- a/dev-python/ansi2html/ansi2html-1.7.0.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.7.0.ebuild
@@ -14,14 +14,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 IUSE="doc"
 
 RDEPEND=">=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
 	doc? (
 		app-text/asciidoc
 	)