gentoo resync : 29.12.2022

4 files changed, 38 insertions, 80 deletions

diff --git a/dev-python/utidylib/Manifest b/dev-python/utidylib/Manifest
index 39930ba0295d..d7237ed39074 100644
--- a/dev-python/utidylib/Manifest
+++ b/dev-python/utidylib/Manifest
@@ -1,5 +1,3 @@
-DIST uTidylib-0.6.tar.gz 15771 BLAKE2B 9d4fe57d985ea6e52680bd528862d3236137221227a23fe05b886d01d240e21d7159dbf7d6da3af8020009ca45c60c2297e374bb7aa05cb6b5a8eaf444710c58 SHA512 a85506ef8824f66ee326ad651020dc3b4e00190e20dcd3814984fa27ff319f492fe5bac781b7c43c8694cbfc63409e3abda18981969c9be2c3cd023fe7a4f2f8
-DIST utidylib-0.7.gh.tar.gz 15203 BLAKE2B c32f23ab3a94191423655f9b6a99bd85aca7072fcfea7507c5d4efb19c4ee22114afe136c6299e8322e15195c4f938094e49483b1a40d05522f2d232dd9a6acd SHA512 69b22671223cc9e1888a1be19b418e883baa79401bcf3856fa48cca441ae7fa414047c296f8fc9ff35aa7407901fa64cd8ddfcc56657a98e8e188073dfc72172
-EBUILD utidylib-0.6-r2.ebuild 947 BLAKE2B ab2f8992859158a7862d7ced5989e8ed14ce07bc191b0e618f475185873aa4470149d04f49869665d30614447c3877edbd7a25f0a5138703be7d46890a99b9bd SHA512 8c0011ff066ec75ebb7f1ebadfd2d9eba9ce181fbf7fda45c7902db4cb816706fa50a896f34d8b6c0e5a77782a8e831bc8cb7de2297853fdbc65e1244f030c5a
-EBUILD utidylib-0.7-r2.ebuild 682 BLAKE2B eab3b36cc8cd0e48da36d4d481a445f52b196ed033899228cf10d105d18f1804d2c7235904d90947fe66abdb21f3c4de717f30788b4e2a6f994ebfd54800deac SHA512 975c635db3128c22311058e30c97d6ad1498ddd960189bea6f368eecfda6c0f69de1cc4506bfce605c59f39a2860bca1a34e0d526d464020dbfd64de0b38ad3e
+DIST utidylib-0.8.gh.tar.gz 15285 BLAKE2B 85f0ec1a969f31cb952e326a5bce5f51d9a5bacdf33d7e703cc3a464621df86f568921a9dd17755be67d49c02631782cdabb4112ee7cf8e321079656bb362122 SHA512 cb9c868337e1bbfa80ac36ca1b3f85c4e35f62acb67dbd321167d568da17d9e562fdca6b777d88c08e03107401fbadc7cdebf243654bcde9825259117e36392f
+EBUILD utidylib-0.8.ebuild 739 BLAKE2B 5be301b3c591c5390e35a0cf10463952436a73fd40c4ff1feba8a96bb7c89290d65e19c2b3ee868237f249e0fd23c4bef301d7d699adf30a83df96a5ab9920f6 SHA512 7417a9e7ae3157b55245164036b28fc9ae76a560ff3743f167d6c7f41cde327214b2db16e48d46b36113e99c9fbc8d4b681f881f7e14e6af8340de467f6e67dc
 MISC metadata.xml 366 BLAKE2B bc4aba05448508a1d0a5e6972d253a3389a445627679c7946350ddf7e210b5b1232301e2b5c36822d946c1deb6669a763957982eed3440ab1c517747005d27af SHA512 7a68b5c21f50d81401bc5f0eb1d334679b71891d6aad08c7f1001140e15392482077b554a19e82f0ef451bc0c082b48300d54c32160f07bfb0d9ef0ab700c29a
diff --git a/dev-python/utidylib/utidylib-0.6-r2.ebuild b/dev-python/utidylib/utidylib-0.6-r2.ebuild
deleted file mode 100644
index 688f03a99a99..000000000000
--- a/dev-python/utidylib/utidylib-0.6-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-MY_P="uTidylib-${PV}"
-inherit distutils-r1
-
-DESCRIPTION="TidyLib Python wrapper"
-HOMEPAGE="https://cihar.com/software/utidylib/ https://pypi.org/project/uTidylib/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 x86"
-IUSE="doc test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-DEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=app-text/htmltidy-5.0.0
-"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/utidylib/utidylib-0.7-r2.ebuild b/dev-python/utidylib/utidylib-0.7-r2.ebuild
deleted file mode 100644
index acc23f255f9a..000000000000
--- a/dev-python/utidylib/utidylib-0.7-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-MY_P="uTidylib-${PV}"
-inherit distutils-r1
-
-DESCRIPTION="TidyLib Python wrapper"
-HOMEPAGE="https://cihar.com/software/utidylib/ https://pypi.org/project/uTidylib/"
-SRC_URI="https://github.com/nijel/utidylib/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc ~ppc64 ~riscv x86"
-
-RDEPEND=">=app-text/htmltidy-5.0.0"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-EPYTEST_DESELECT=(
-	# https://github.com/nijel/utidylib/issues/9
-	tidy/test_tidy.py::TidyTestCase::test_missing_load
-)
diff --git a/dev-python/utidylib/utidylib-0.8.ebuild b/dev-python/utidylib/utidylib-0.8.ebuild
new file mode 100644
index 000000000000..fe3261dc7a97
--- /dev/null
+++ b/dev-python/utidylib/utidylib-0.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="TidyLib Python wrapper"
+HOMEPAGE="
+	https://cihar.com/software/utidylib/
+	https://github.com/nijel/utidylib/
+	https://pypi.org/project/uTidylib/
+"
+SRC_URI="
+	https://github.com/nijel/utidylib/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm64 ppc ppc64 ~riscv x86"
+
+RDEPEND="
+	>=app-text/htmltidy-5.0.0
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+EPYTEST_DESELECT=(
+	# https://github.com/nijel/utidylib/issues/9
+	tidy/test_tidy.py::TidyTestCase::test_missing_load
+)