gentoo resync : 03.03.2021

4 files changed, 32 insertions, 63 deletions

diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index b5c66809b16a..9abe8d064cfb 100644
--- a/dev-python/jaraco-classes/Manifest
+++ b/dev-python/jaraco-classes/Manifest
@@ -1,5 +1,5 @@
-DIST jaraco.classes-3.1.0.tar.gz 11616 BLAKE2B 5b438f7582a9a93ca4fc97a71725c1fe3275e4bfb48f5e06b549f7ac8fb6900262165b1ad0638114d3a8d11c10f449b7930d4c2d66fa928665aaff820af88937 SHA512 697d892a01c4e8ad83f57e69dcd744f976cea67fa3efcd55b10eda02f6bf1916162c0fa952d0d711e62f62fdff62740ee55a93be9fc46ebd4ab22416092f0ff6
 DIST jaraco.classes-3.2.0.tar.gz 12277 BLAKE2B 4512d2ef96a6dba8c5f226da5947e69beb21a7bef20402fc1ef3cd8a0495bedadaf261b1d47757af10838897923ce0561ac063cb2d6d53c2ebf2be909c335dc1 SHA512 89cc24826c647ebb4a08ceb76159e6d123b7067c7f725989195b073895f1482a04db82e3e52059faf825a6dec7c9b9201859267de06880d4a80d397a7ab209b6
-EBUILD jaraco-classes-3.1.0-r1.ebuild 1603 BLAKE2B b4f1903268d18089a5d1cd73ce6a55328918bc9310dbfac0bd48cbf614e2d3dd1c255d4ae43f4b0d356a3b91188059f36d6131291b5557ff2bc1dd3d1bbd9a23 SHA512 68c9604c0939d82a52f7b7b5d0160efa1d2f5474aa2397e97544e0016687f336acd7bbd93f26ab4d09a225ae15bf2fa88574b61082728cd1c257ad07518a24db
-EBUILD jaraco-classes-3.2.0.ebuild 721 BLAKE2B a5e0892315d5a070a4ee63c217b255d349d2ef6bfdbaa440689793f012dba3a6c277989d6075cf8d28d3f6f2f594316ff74762c321b78a75292e2e6b3e7aa2d4 SHA512 c1f9b5aeab60992e650c285da976b09329d59c9983c17d267fb1c0c71e9571497cf987b87c4df92c2564d1b7514ad3eb835ae9b1f86aae8ec1811d8b0f0e923e
+DIST jaraco.classes-3.2.1.tar.gz 12286 BLAKE2B c96162ecda1ca3e546b58ab147ea5b080f03e3570d6d59fe7372aeff290c683b68abad6560d7ebf57662009e4d9d8d9a6c1d768ba86e4bd24568794fdedf0534 SHA512 4c85cfdd1da88de01596867365147be6cadd7e1d230798683236fdfde579747e3309aac95ae4f3ef86c91bb4493f3096c4ecc14e3db764ef308aab41ead88e23
+EBUILD jaraco-classes-3.2.0.ebuild 713 BLAKE2B 95b97d38418d2e2ddd90f6cbc74e253438a0dffe48c286f81a1f3bc163471e77475b67862f02a421d1c00b5de07ba58e585c14c40102059f69e14ddf93887dc1 SHA512 5e4b282249fa3e6ebfd3dc4917f8eedbaac1541e48734278e34fc0874fc4502e152ca04018f3937da8c89efcaac402f7bba8f55c7593f14869488b1aea30747f
+EBUILD jaraco-classes-3.2.1.ebuild 721 BLAKE2B a5e0892315d5a070a4ee63c217b255d349d2ef6bfdbaa440689793f012dba3a6c277989d6075cf8d28d3f6f2f594316ff74762c321b78a75292e2e6b3e7aa2d4 SHA512 c1f9b5aeab60992e650c285da976b09329d59c9983c17d267fb1c0c71e9571497cf987b87c4df92c2564d1b7514ad3eb835ae9b1f86aae8ec1811d8b0f0e923e
 MISC metadata.xml 577 BLAKE2B 5daf4529f9a92c285bd3ae07a6e75f2ea5ebd4466721c65d529b51bf9b32b72d17181e5f89410182138b2e94f6b22eb6f1164744f5871585d38004cf6ee1ee3f SHA512 259deaabde7595f7978dfe12b2b90327263edec17aca918675f14fe87fc8ce041cc337632af1b6cfc55041338087c060d5e88b5b018bf2c1c2c21781f179c601
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.1.0-r1.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.1.0-r1.ebuild
deleted file mode 100644
index f3145026f6ea..000000000000
--- a/dev-python/jaraco-classes/jaraco-classes-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Tests fail with pypy
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Classes used by other projects by developer jaraco"
-HOMEPAGE="https://github.com/jaraco/jaraco.classes"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-
-python_prepare_all() {
-	# avoid a setuptools_scm dependency
-	sed -i "s:use_scm_version=True:version='${PV}':" setup.py || die
-	sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+)[[:space:]]*::" \
-		setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Avoid ImportMismatchError, override pytest options to skip flake8
-	pytest -vv "${BUILD_DIR}"/lib --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
-python_install() {
-	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
-	# note: eclass may default to --skip-build in the future
-	distutils-r1_python_install --skip-build
-}
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.2.0.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.2.0.ebuild
index 20b9ab27a6cb..4e4708f23252 100644
--- a/dev-python/jaraco-classes/jaraco-classes-3.2.0.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-3.2.0.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.2.1.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.2.1.ebuild
new file mode 100644
index 000000000000..20b9ab27a6cb
--- /dev/null
+++ b/dev-python/jaraco-classes/jaraco-classes-3.2.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+
+inherit distutils-r1
+
+MY_P="${P/-/.}"
+DESCRIPTION="Classes used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.classes"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/.}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+distutils_enable_tests pytest