gentoo resync : 04.01.2022

3 files changed, 6 insertions, 73 deletions

diff --git a/app-admin/supervisor/Manifest b/app-admin/supervisor/Manifest
index 547bd6a4aa51..eeca4230212a 100644
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@@ -2,10 +2,8 @@ AUX conf.d-r1 182 BLAKE2B eae951b6dc0252ee7b13988d65addb667d24dc452a2c50644a7857
 AUX init.d-r2 553 BLAKE2B 270ff81ca5bac99f22b49bf47ec64d73b4328804ea264e99301de3d563d2479a3640a0f5e35b2553d679e97a85480d273db170b741638b0a90929fccb490deb2 SHA512 d8d7d6165445fb4bef75454dd2b03c866fb4942c19d6ae4a8b36a900bdd9ee3a55cade02304d49d6e0095df885a1a4fa52694012a7d85d67cc1b181aaf69d8cc
 AUX supervisord.conf 2525 BLAKE2B d36d6ef6b952a99ccfd61976c21eb54922555db4802288d9364f02331da5e693bce3862869248f7c0b81285576ca633e679a26acf75f03b2e620e16eea963909 SHA512 1ce55ef1f9a4cd7592645007af5e0f18147e8dca1c324ac2e48bf58aa2191ec657cfa68d7e6bdc9ba8e0747b32f4e6a44009e8c55a7bd77b265ac8593f51eeb7
 AUX supervisord.service 404 BLAKE2B 87c99a2b388befb04f1d8e3442a5c0b6d802837047c45da2bb7017631bf4af4b858bc4d7964f1d64937e331728884bc21e62e9d01b11cca46aaea389372c6bad SHA512 0fe777d1f0bf70dc9b49132102ac90083261321850f80e9e323459c894c55f722ab8470eba3ba7bb35a9d69ad411a3247546066d6cba5801c9b289350ea4bed5
-DIST supervisor-4.2.0.tar.gz 456056 BLAKE2B 51b66cfc34505b937c47c9b510d81bcc777b9372fdeb2e08fc25153d2718cd2682258b812630160954587ceb992e1a528cdd5bf0d270139f7ffac9463ac2f015 SHA512 626d806f4b03be7cbff795afd1bdb3ff5ca5ecf44f035909ea1aa9360da9fa3047b2fe05543190bf1442f01dcdd403be19fcd907519bf7e26615900bc4bf9d0f
-DIST supervisor-4.2.1.tar.gz 460935 BLAKE2B 0c65f904599c1e8a04cd3a71085e2b2a5460691c2bfd790d3b7c10449cae08472bcd72a870cbe611801434624f405ea3e245f156cab93f25a8df784b58d948d7 SHA512 c560ef959f8d580fb20c1812aa2a838c9feaeb3726a754e8084fa8c7406ff9258139b55b081558b8d8f33e4672cdfad40695170f55412a5e85a6c1aed0f11657
 DIST supervisor-4.2.2.tar.gz 463657 BLAKE2B 766feffcbd70b575b6b7dfd6ed98e3510e0fd9362c423b677d44a2b5dd23ded14a349a279d3d28d4fd9e04a2175c8f00e24c07df310b61d34c7f69f60d26a4ac SHA512 f787206e6c6a5d3dfc4284974a4a87cbcaeac0c705afb2b8eae53f066413bd9e68095c5309e29625e01469a4748613370e1ac0d7be84b9d72c3623244bdd2eb3
-EBUILD supervisor-4.2.0.ebuild 1715 BLAKE2B 39d6abc4da52b99db867c4f950a1f58ea4dea07b2f08c0de1963bd53059168d5831944ec56f2a99a129588947caf6400af4190ab1a5ead4c032e06e19e9f5e6a SHA512 fcae1d9fba0ddfbf13c93615e2f87322688723d91c8b8e47a999ae1efd3f8e64fb1d4bb1dc4036ce750ef6f4c60f0ecc35e23ac5905f224843852ccfbf86a8e4
-EBUILD supervisor-4.2.1.ebuild 1479 BLAKE2B f42a9c81f3d121288a5fea58b63dccbb58da73e69d8540701afe40df8765bdce9ad690ab674ed9b0ee61f4c43f898305b774be89123e7d0ae624603bd37e9cdf SHA512 0eb84905941c210c4b5ea22f1759a8e88aa0d624dea14ede0596b4773462f1a6da4b794de4d551bf4330a6399b760be285f47ba269ed17623cba76b93e82bc41
+DIST supervisor-4.2.4.tar.gz 465151 BLAKE2B 91b99a64950dc874bdc008ba53ca8b1962cc34981fee27c2fd82956d73ace9eaaf91439ef6be40530c4860fe1eee193e19b51ab81050f7368aa7d31f8444c785 SHA512 38c55aeadb8664337b667aad891a3a2134ae4af88e90d636054e6be9aebc8a3ef87d79d15fcafd2b9966af562deeedc96ac3730bde9439dde30208f0a874f2d7
 EBUILD supervisor-4.2.2.ebuild 1630 BLAKE2B 0d44a0cae21becac83a76e676ab725d5e9c3e625d1990bf0f1a08298fae0b60ff8328d68e6b4a1fa64e2eeeb70eb01076690c6bf4c4c290e8941851dad0a9447 SHA512 2f0aee14c668efcfbd85d29b698b12ad483fd8164978ae901cd3ef296c64149af8f10f53a0163fa568b49d0c9d513c54f8252583e5604903107e26379add17ae
+EBUILD supervisor-4.2.4.ebuild 1417 BLAKE2B 049226bddd7306895509c24ccb5614901e92814e2315fe3a8d522fb4138490af05f2df6481b035c51c9791641e22d93ab9da48271b6d92933de368e0949ba173 SHA512 9c729b047b829065fd96d2d841341e9dba99d314e7a79a77e6e9390337278be73fee776bd59e2591b5ccca5b45282790ec37363a26504902af22dd1d8b8b84b4
 MISC metadata.xml 624 BLAKE2B 6cb179a9284e7898dcfc4423e12e04d7bd4e805930f8f4e79e3528153180146aeb606040d087e3c5d127e6d7e3b42cbbd6f4b7c1bb2ad7fa414bf90a40a76502 SHA512 dfe5b6abb493cb69a2a2b2d93fbf9c66b4f21ca5d83d76a2da5066f3625a945c1834e876ce8b8b4368cec3e34a81003f7be47898b5e2bdbe796714ea8291f63a
diff --git a/app-admin/supervisor/supervisor-4.2.0.ebuild b/app-admin/supervisor/supervisor-4.2.0.ebuild
deleted file mode 100644
index 44d710173315..000000000000
--- a/app-admin/supervisor/supervisor-4.2.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7,8} )
-# xml.etree.ElementTree module required.
-PYTHON_REQ_USE="xml(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 systemd
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="A system for controlling process state under UNIX"
-HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="repoze ZPL BSD HPND GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="acct-group/supervisor"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Skip one test that currently fails
-	# https://github.com/Supervisor/supervisor/issues/1346
-	sed -i 's/test_prepare_socket/_&/' \
-		supervisor/tests/test_socket_manager.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	newinitd "${FILESDIR}/init.d-r2" supervisord
-	newconfd "${FILESDIR}/conf.d-r1" supervisord
-	dodoc supervisor/skel/sample.conf
-	keepdir /etc/supervisord.d
-	insinto /etc
-	doins "${FILESDIR}/supervisord.conf"
-	keepdir /var/log/supervisor
-	systemd_dounit "${FILESDIR}/supervisord.service"
-}
-
-pkg_preinst() {
-	fowners :supervisor /var/log/supervisor
-	fperms 750 /var/log/supervisor
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "You may install your configuration files in ${EROOT}/etc/supervisord.d"
-		elog "For config examples, see ${EROOT}/usr/share/doc/${PF}/sample.conf.bz2"
-		elog ""
-		elog "By default, only members of the supervisor group can run supervisorctl."
-	fi
-}
diff --git a/app-admin/supervisor/supervisor-4.2.1.ebuild b/app-admin/supervisor/supervisor-4.2.4.ebuild
index 999e761f2fc8..27a705ecefd4 100644
--- a/app-admin/supervisor/supervisor-4.2.1.ebuild
+++ b/app-admin/supervisor/supervisor-4.2.4.ebuild
@@ -1,21 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 # xml.etree.ElementTree module required.
 PYTHON_REQ_USE="xml(+)"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 systemd
 
-MY_PV="${PV/_beta/b}"
-
 DESCRIPTION="A system for controlling process state under UNIX"
 HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="repoze ZPL BSD HPND GPL-2"
 SLOT="0"