gentoo resync : 20.03.2022

3 files changed, 6 insertions, 65 deletions

diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
index 58f62ece8229..84d12c0e5f73 100644
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -2,12 +2,10 @@ AUX monit.initd-5.0-r1 801 BLAKE2B adec89a1694095c128763bb3a2f31867d89b2a4ef1ab2
 AUX monit.logrotate 146 BLAKE2B 89bbe7c69f50dbca3f3c443d56da6eae6aab7a4976f90c209850b71410e5faa12c40d488d694a94635167ae245fd021cae6a855523dc6bcbb538bc6c29c07526 SHA512 bac426713adf8cc6dead70916cf3404229652cd85d0d4f4b436f9a4074a7a9cc3af03da6d91677645e349bcf6a614d0adf277676d04a54b7f67ba3ec6714903a
 AUX monit.pamd 120 BLAKE2B 76744f79babaa99fa2961f73158ca755f885e9ea8e20b76dcb29f8fd10be6b5804b09b3c90f59ada7ce81eab90713ba43d2b2f28a6abc278fdfc75b356af4e67 SHA512 75c5fbad1c04fc5c9c0de224df245d64f4e59e23f79f4037edcc94623795852900318747e8a71946cab406009834643e84e1cd40b27854951d5462e740712b5c
 AUX monit.service 226 BLAKE2B 3b3041900987acd5bb6faa770c6631f6554b2e4360520252369951b3f7f87a3dd96440a58c9d2c4973ce9980a00ab7085c92af1e6542ae10d679ba352d170b19 SHA512 3ca0499ebd21aee812b78883c144c0a346a8cb6106392544836bf76d594e96b7e77be4b32b8c3170273e8236b25000c268724148252d98a4b99131f8b0ce4e88
-DIST monit-5.27.2.tar.gz 1463790 BLAKE2B f00733261fd941f47ec04e63ed9e3617991cd8a069a14e59941e85d3a342537892019864d4716f821428adb57979aa270fcba9d57f573d49e897dfcd77cc133a SHA512 a45cbbf0905b165767e21d66103b460ea48948824d043881aba3de752e34a67bfb3b97f75153e3672d87a34a702d66ceee28160110654aa52fb82c668aa135b9
-DIST monit-5.28.1.tar.gz 1470342 BLAKE2B 134f63f4560cf26a563cb8e1f063b291dd6d87159878a1918aef62d8ffe6138a64b4e34c1713b46cb80bfd04eddb0abab725aa7cbe59331dac9e41d0f286f883 SHA512 2683084aea88567309b4693247c27312e1cb4225175cb8643a1f980ed8fc8ecd549818e157e1bb6c0feafc306bc9217bbd2c0c501cb75ea2425b646955076e5a
 DIST monit-5.29.0.tar.gz 1476102 BLAKE2B a4037c61e8d893b194317dc3c79d37f9b449d3524b91a06c0ff36a9c39016b12b0ce970c969fc10421412e6406c680714522379780cd80897a7a467f7b08450f SHA512 a69125bfa6fa9ea837f396e762a45e0cb41258c175d120c2af999ae1b500ce5cf5b57d774cc89299f70950a25ced5368c85455fffafd75677311c7912f86c49d
 DIST monit-5.30.0.tar.gz 1476979 BLAKE2B deb3d58770e2cd33cd33094bc43a9375df567d389542439920f16ed864c743c348915ed37730a3ceb217c9e435d4fb3ba42038406cfcdf52c1382e83ef31ca24 SHA512 4d73eaf3785f40de2789bd1feceda5363cbdc8cbeb4431b14d09d72c65483afe09f68257cef4492304ad87314cd3e5e631bf1165d69abea93a9f70f73767655f
-EBUILD monit-5.27.2-r1.ebuild 1162 BLAKE2B 71b1d1a5e10520af69bebfcab81f17c7a72e43753d7fe1f0c421c4d2e738d20248638f6860baa9bcddff82294d0855cb004d974430dcff6a5de6cf2d6546f753 SHA512 70657c77855021896681345dc5fc4d654d356e559bd83f7ac92561e5e154aa5ec12234699a7e85551e92cf19a6eff54bba956a41f0180f5af909c1515b0465a7
-EBUILD monit-5.28.1-r1.ebuild 1231 BLAKE2B 1de7222521a60adfaf6abc1a2fc8b3e75bfaa669d167734a4c0058aead6f419f38b63dc01a9aee6ddd8b9934a0e87cb7bc0d50ef454ab80792bf117ee5eb3e7a SHA512 cf682f1d976b4ec006ad9429c4e06948a7857802f35f767d2b12728186320053332a2e59b74cdb2f2b91ee54eaea5c19e770329e95e89e6e3c5c21a080c4a854
+DIST monit-5.31.0.tar.gz 1479644 BLAKE2B 3aee9e87acb287dbf9cdc26dd5cb5e693a52d7f88c4851f9c1101aec8060df250e75890815b7ec30e58324ec118bded8e25e6a17e694bec1c028941e2cff0141 SHA512 1259c57683389d7241db9524136cec7e42067e32dac79d97753211525c6451af2768c1023535d7d894dad7c5f6e7c3b3ac77bd8540bb53634f6d72587b522d42
 EBUILD monit-5.29.0.ebuild 1253 BLAKE2B 2a440a6e6097d2692265a17d332c5c14cf548207db9a6a5fb5541c1a3900150ea06f5b7282ee9a2fe697ea48c0ddea07431eea374ae17e98cc0230c883dc56b4 SHA512 e56de12294ab8ff06183191c1b0853302238237de38ffc5c63a61054f7324bce60255a54e607ab6b4f81200646ef2204e9071c9cfe9cf93228017f2c08df2a85
 EBUILD monit-5.30.0.ebuild 1256 BLAKE2B 23d6723791ffea29983d02e23a5bff87d71ae430a0cdada931c5aa4f981c207f7a13064bfc9dc609c6ed37544d0c5207eabff5c98cf4c16e4442ae56e2be6b8f SHA512 64d923cb2e93375852406630cf745182cf88621eb96773d3d5a4b220c6f325bbeb7dbbb9dc854d990e8cd3677cfd9c6e878cf05ce8cca79a9e32dfbdb3fe3d93
+EBUILD monit-5.31.0.ebuild 1256 BLAKE2B 23d6723791ffea29983d02e23a5bff87d71ae430a0cdada931c5aa4f981c207f7a13064bfc9dc609c6ed37544d0c5207eabff5c98cf4c16e4442ae56e2be6b8f SHA512 64d923cb2e93375852406630cf745182cf88621eb96773d3d5a4b220c6f325bbeb7dbbb9dc854d990e8cd3677cfd9c6e878cf05ce8cca79a9e32dfbdb3fe3d93
 MISC metadata.xml 360 BLAKE2B a3f81501eab241aa1c3450f92d97af3560fb1fcf37a8faf864088abf58da5421486b4634da20773484acfe72d8d289a8e902f03db8206a798fd2e5e518313896 SHA512 69c092cbe229b63fa3154ab6735d327ed939aaa205bca9ec4c7b0b3994054f39714d2197fba0fe89710911a382e70680d20b4335ec70e233eeaf0d01da3ae342
diff --git a/app-admin/monit/monit-5.27.2-r1.ebuild b/app-admin/monit/monit-5.27.2-r1.ebuild
deleted file mode 100644
index 7ed9b024d941..000000000000
--- a/app-admin/monit/monit-5.27.2-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 pam systemd
-
-DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system"
-HOMEPAGE="http://mmonit.com/monit/"
-SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux"
-IUSE="ipv6 pam ssl"
-
-RDEPEND="sys-libs/zlib:=
-	virtual/libcrypt:=
-	pam? ( sys-libs/pam )
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-"
-
-src_prepare() {
-	default
-	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with ipv6)
-		$(use_with pam)
-		$(use_with ssl)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	insinto /etc; insopts -m600; doins monitrc
-	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
-
-	dobashcomp system/bash/monit
-}
-
-pkg_postinst() {
-	elog "Sample configurations are available at:"
-	elog "http://mmonit.com/monit/documentation/"
-}
diff --git a/app-admin/monit/monit-5.28.1-r1.ebuild b/app-admin/monit/monit-5.31.0.ebuild
index d9f496af739c..54708e6c5d9e 100644
--- a/app-admin/monit/monit-5.28.1-r1.ebuild
+++ b/app-admin/monit/monit-5.31.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit bash-completion-r1 pam systemd
 
@@ -11,7 +11,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
 IUSE="ipv6 pam ssl"
 
 RDEPEND="sys-libs/zlib:=
@@ -47,7 +47,7 @@ src_install() {
 
 	insinto /etc; insopts -m600; doins monitrc
 	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
-	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_dounit system/startup/${PN}.service
 
 	use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}