gentoo resync : 25.11.2020

5 files changed, 56 insertions, 49 deletions

diff --git a/dev-python/ansi2html/Manifest b/dev-python/ansi2html/Manifest
index 82f63c3b0802..09e258eda0c7 100644
--- a/dev-python/ansi2html/Manifest
+++ b/dev-python/ansi2html/Manifest
@@ -1,4 +1,5 @@
 DIST ansi2html-1.5.2.tar.gz 27124 BLAKE2B 0d02e8cea46622c4d2cbd06f06fd31b3c7e93d61f6b9eadb37815d2ee490b6ce4233fb019f175f61465ef89520a944bbe14543627a6421a64304b58dc038c0ca SHA512 163d5784d04e6eea0847676b967051382fa74a354c19462d1b73980fd1b0a7eb45ce1f1bd88cca803356e7767ccab1bbce6de4152c98aec98534f4ed7d65a83f
-EBUILD ansi2html-1.5.2-r1.ebuild 895 BLAKE2B e6dfb3970f37f8219e7ef910d8b06bbda4b407405ff1f0341201522e37b328fbfed0d1b4bfb1562c85cbfc32339ed1a17f0671a38761c2589be8b47f4103b8f9 SHA512 3e315f50ff68bce0ece556af6b5089a3eabd53df323cd61afd8becf060539ca6cc20640ae81f3af4fd63003f7ddc2efab23e00bca5028c314dba74c708215879
-EBUILD ansi2html-1.5.2-r2.ebuild 715 BLAKE2B b1d23886870004271f835579114cfe0185a12f8a6365928a53b01e8510b868df20444e311c1701c509ead3201f29142337a5ab547c7a8fdabbf76895ab1eee27 SHA512 8679e25a833119a71cd68ec1a8bfd457ca0df20a2e0f5b64e9de6127222b3798ee453b9fd6b8de385adac55434d9dad59ebb5d7cf10f161eb63e963700dcee84
-MISC metadata.xml 392 BLAKE2B 13621595cc083a069522c51b4e29b362f7217698c194d5247d73a3acdaca7ca8b13a3afb0e9b0671785ce246219d44bd8511c5ef243111d43067b138635f5963 SHA512 a17684f5bd76762a832cba99a1edcd2b2ebb1abdd27f36528fb4d2ded639b6223f60495c6dd2ee548826f3a2e177238318c02962d2300ace37eaa881e76cf095
+DIST ansi2html-1.6.0.tar.gz 36053 BLAKE2B deb63c6c9f431ff225cfcbbd2995f0fce9535736dba7d8c92f1f2e51d525640e69bc4269ab073438239edb35815288fa17b2d69c89cca7627ba2b5096009611f SHA512 35e5fb6cee96fe41a658c005734a58b08bc05e8ad5903ad18684c316bdad351a70c534b4162416225bc2ca774d01b4ac1bb8a8dad3170d0738aa7b3daf46b3c0
+EBUILD ansi2html-1.5.2-r2.ebuild 712 BLAKE2B 84148cd9cd8bb6563a1221a7df58c8549d7d60ed48ebeecfc3cba50558b9b7cc16e610b74806c04019874f8a8d18627f354deb5f11020713370c0d3c2368367a SHA512 4bf830f1298ce1cb2811a030ca5010a44ed5748bfb0e6c7080b410c8cbabcc5d633b9a44bd4f7b2dcca174ef37378f1dae596914e1a3c7a053924c84e7ea85f6
+EBUILD ansi2html-1.6.0.ebuild 1159 BLAKE2B 5e65b4dd14bdb0ad521fa5331b64b7030a6fcacb16b5abbd5e6e6e7657b26aa8def643c1e64cb655fd04e854807330540e99a32975025c4778af07e695e2b33c SHA512 011fdbbb4bc6e8f9ca15d534fb345af15f28010196804af3c48affce19cbe1d37e2f91bb9099f4a08a830b815031ed64036dfb05859510c5073f98c34f59e3d8
+MISC metadata.xml 417 BLAKE2B 899c93436bc8c598562daa050717316bf82fe7fa39bcc1e508e5a34db76d37664ec98480877834d40736102b1aa7cbd8bd314817439a41eae9f6956072defb86 SHA512 ec20e040aaa60e8069ea9462424b5e67688feeb245fc11f5d08b4c99e9a38daf0aa995009b0b67221151c2928ab979bf6bcb75d3123ce9176e81a481e65acad9
diff --git a/dev-python/ansi2html/ansi2html-1.5.2-r1.ebuild b/dev-python/ansi2html/ansi2html-1.5.2-r1.ebuild
deleted file mode 100644
index aacd6affe8b5..000000000000
--- a/dev-python/ansi2html/ansi2html-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Convert text with ANSI color codes to HTML"
-HOMEPAGE="https://pypi.org/project/ansi2html/ https://github.com/ralphbean/ansi2html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-	"
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-python_test() {
-	chmod -x "${S}"/tests/* || die
-	esetup.py check
-	esetup.py test
-}
-
-python_install_all() {
-	doman man/${PN}.1
-	DOCS=( README.rst man/${PN}.1.txt )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/ansi2html/ansi2html-1.5.2-r2.ebuild b/dev-python/ansi2html/ansi2html-1.5.2-r2.ebuild
index 6bcbcf7230e1..a46faa16351e 100644
--- a/dev-python/ansi2html/ansi2html-1.5.2-r2.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.5.2-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 
 RDEPEND=">=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/ansi2html/ansi2html-1.6.0.ebuild b/dev-python/ansi2html/ansi2html-1.6.0.ebuild
new file mode 100644
index 000000000000..5af0de4bf9fe
--- /dev/null
+++ b/dev-python/ansi2html/ansi2html-1.6.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+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 pytest  # for BDEPEND
+
+python_install_all() {
+	use doc && doman man/${PN}.1
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
+
+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/metadata.xml b/dev-python/ansi2html/metadata.xml
index 6d3ac65af5f1..5ea83a06dfa1 100644
--- a/dev-python/ansi2html/metadata.xml
+++ b/dev-python/ansi2html/metadata.xml
@@ -5,6 +5,7 @@
     <email>sping@gentoo.org</email>
     <name>Sebastian Pipping</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">ansi2html</remote-id>
     <remote-id type="github">ralphbean/ansi2html</remote-id>