gentoo resync : 20.03.2022

4 files changed, 5 insertions, 201 deletions

diff --git a/www-misc/monitorix/Manifest b/www-misc/monitorix/Manifest
index 670c9c726ed2..986c70c16020 100644
--- a/www-misc/monitorix/Manifest
+++ b/www-misc/monitorix/Manifest
@@ -1,7 +1,4 @@
 AUX monitorix 794 BLAKE2B f0e4eb70ff867711b749fbdda5150ef0733f9622fceaf8499600bcae15bea3e6a987d7c5635987e0913a1bd28adc6be5e5273438c59ee434a80e2cb72d8e6bd1 SHA512 92f16de3398673046cb9aa27f70923f35d6f61a5a861bed37a61650371ad714aa6ad2be2eb9f770e4cb734db109a222182ba22eb4a6f9c5b228a8b96c1ef893c
-DIST monitorix-3.12.0.tar.gz 348117 BLAKE2B 65f6e5a8ef4acba2e5dd015e3acab1c927a8964de6cf0bb56a426e6e2dc5843083177591f26db639ed36df798db9659cd6345ca38df4f25fc9a4759e84f0d553 SHA512 7cbdb27df1d84e87f0b99d310d3b3a7c27e369adc82c88e297966e36de82c2f800474447dd628041f2feb89817ee496cbae65a4b0e4942a2f75c900f16ccfcf1
-DIST monitorix-3.13.1.tar.gz 364091 BLAKE2B 0e11d1df2d5cbc4a7ec7b448b24409411903370b5fc0f35f7395439b017d0ce27e3d86fe19db70939942165a9e4bf72583030fdcd1b9c0b5be484c1c71af021e SHA512 224ccedd608cda609ea161f62e11266c13f26536d7e3c50a3690ace693ed52c71422f2ef0acabb4e8d69551458a6af2c33e6b776b1dec73cbf621a7f40339573
-EBUILD monitorix-3.12.0.ebuild 2790 BLAKE2B be1f972e47615d7fcc9f225da6efea482e8390e5a5cf45bdbf3a1607b0aa7d64f0e04bd4c8fe1b774d910880b7dc51afa781d03aa573277670764e80ff06474f SHA512 786b7608dfe1ce3a0802461316ec64f64b46a9f72f067d1767446fd9f075e861c1e66c5b6a6c1a6fed0b2a37bddfe279e870a3785c5d0297d0f05c9636afc483
-EBUILD monitorix-3.13.1-r1.ebuild 2330 BLAKE2B 7e43faace1937967fbd0651583128e603413563ca5be529291acd315dec125d9eb63f72ea1c1cfb5baa2c1081b23da1c8fd308a363fd524233223f644ebc4e8f SHA512 d2c685a571d954e4294ded480f3cdfd10619bc99f7674a63e553048f21c2efe367c590634338bbe89fd4598610997397ea22cf75f7a2f316f3488e64739ac357
-EBUILD monitorix-3.13.1.ebuild 2278 BLAKE2B 856a1cfbd421ad3fc7ed497350d6f50b668655a6b7d49aa88085fc14721d3a50b49f64608ce15c193bec436e1e6bed5ec4dd4103d743afd074822c838d9583bb SHA512 ba4a38a51c01f4e9b3a8afb764e4360169e8afcba21fdec16fb9b5a319710840da9f77ec2b8a8f2023b5e2ec0b1dd52d79c5928f8301da38e3994f95f23ee75c
+DIST monitorix-3.14.0.tar.gz 393803 BLAKE2B 84a2b0a8417a405757e43c752b8e4aa0faf4c750895e5425801c3682f25671b8b4858ee4fdf94e4da181250c0ddbdc9237624af0d1dcbec4a29a8076f35a9fc6 SHA512 c7b11b2144b9cdcc5fdb33cfe208d5d5c7c8e27dfdacd51148a4077748632e592cf07dbecd5992c34ff4aea982e62a03a20d1920fe142da7f6ed5367729bfd2e
+EBUILD monitorix-3.14.0.ebuild 2320 BLAKE2B d95355985a92de4f72e08a2335a9973c6bff50fa92ae6b7be31cce999e537b993e11ae831c6690090d65dd3ec26ba2a666f2a71afbe9587a2ad59014bb234615 SHA512 a410ab6cc50413c805961a93aecf6eb9a9ef2b69159286841f58e598a38d573d6a2d465f4e37f31487ecf4f8b5daaef3727b75a01818a7517be7bf3fefc552d5
 MISC metadata.xml 487 BLAKE2B 6dade6679de9045464ce974db2e6b8a44bf64e97d689b566ded1342c5e1f2a578db10a6a95543bc9c2ab5189e33abb780540a2b4a5d0d687cc3c6c6bcbf9deda SHA512 0c0ffb4a7a744795f041f1bd515b73c251cfb11a50227104abde96d4d04bb837fbd1a550fc03c68ccd3414c6950f9addf934ef54b65ab193cd1833b90ced46ab
diff --git a/www-misc/monitorix/monitorix-3.12.0.ebuild b/www-misc/monitorix/monitorix-3.12.0.ebuild
deleted file mode 100644
index f76b1892b920..000000000000
--- a/www-misc/monitorix/monitorix-3.12.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit systemd
-
-DESCRIPTION="A lightweight system monitoring tool"
-HOMEPAGE="https://www.monitorix.org/"
-SRC_URI="https://www.monitorix.org/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	acct-user/monitorix
-	acct-group/monitorix
-	dev-perl/Config-General
-	dev-perl/DBI
-	dev-perl/HTTP-Server-Simple
-	dev-perl/IO-Socket-SSL
-	dev-perl/libwww-perl
-	dev-perl/MIME-Lite
-	dev-perl/XML-Simple
-	net-analyzer/rrdtool[graph,perl]
-	dev-perl/CGI"
-
-src_prepare() {
-	# Put better Gentoo defaults in the configuration file.
-	sed -e "s|\(base_dir.*\)/usr/share/${PN}|\1/usr/share/${PN}/htdocs|" \
-		-e "s|\(secure_log.*\)/var/log/secure|\1/var/log/auth.log|" \
-		-e "s|nobody|${PN}|g" -i ${PN}.conf || die
-	# Update systemd binary location
-	sed -e "s|/usr/bin|/usr/sbin|g" -i docs/${PN}.service || die
-	eapply_user
-}
-
-# Override compile phase
-src_compile() { :; }
-
-src_install() {
-	dosbin ${PN}
-
-	newinitd "${FILESDIR}/monitorix" ${PN}
-
-	insinto /etc/monitorix
-	doins ${PN}.conf
-
-	keepdir /etc/${PN}/conf.d
-
-	insinto /etc/logrotate.d
-	newins docs/${PN}.logrotate ${PN}
-
-	dodoc Changes README{,.nginx} docs/${PN}-{alert.sh,apache.conf,lighttpd.conf}
-	doman man/man5/${PN}.conf.5
-	doman man/man8/${PN}.8
-
-	insinto /var/lib/${PN}/www
-	doins logo_bot.png logo_top.png ${PN}ico.png
-
-	keepdir /var/lib/${PN}/www/imgs
-	fowners monitorix:monitorix /var/lib/${PN}/www/imgs
-
-	exeinto /var/lib/${PN}/www/cgi
-	doexe ${PN}.cgi
-
-	exeinto /usr/lib/${PN}
-	doexe lib/*.pm
-
-	keepdir /var/lib/${PN}/usage
-	insinto /var/lib/${PN}/reports
-	doins -r reports
-
-	systemd_dounit docs/${PN}.service
-}
-
-pkg_postinst() {
-	if has_version '<=www-misc/monitorix-3.5.1' ; then
-		ewarn "WARNING: ${PN} has changed its config format twice, in versions"
-		ewarn "3.0.0 and 3.4.0; this format may be incompatible with your existing"
-		ewarn "config file. Please take care if upgrading from an old version."
-		ewarn
-		elog "${PN} includes its own web server as of version 3.0.0."
-		elog "For this reason, the dependency on the webapp framework"
-		elog "has been removed."
-		elog
-	fi
-	elog "Optional dependencies:"
-	elog "  app-admin/hddtemp   (disk drive temperatures and health)"
-	elog "  mail-mta/postfix    (email reports/statics)"
-	elog "  mail-mta/sendmail   (email reports/statics)"
-	elog "  sys-apps/lm-sensors (lm-sensors and GPU temperatures)"
-	elog "  sys-power/apcupsd   (APC UPS statistics)"
-	elog "  sys-power/nut       (Network UPS Tools statistics)"
-	elog
-	elog "If you wish to use your own web server:"
-	elog "  Web data can be found at: ${EROOT}/var/lib/${PN}/www/"
-	elog "  Also please check the correct user and group ownership"
-	elog "  of ${EROOT}/var/lib/${PN}/www/imgs/"
-}
diff --git a/www-misc/monitorix/monitorix-3.13.1.ebuild b/www-misc/monitorix/monitorix-3.13.1.ebuild
deleted file mode 100644
index 00607f99c0c6..000000000000
--- a/www-misc/monitorix/monitorix-3.13.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit systemd optfeature
-
-DESCRIPTION="A lightweight system monitoring tool"
-HOMEPAGE="https://www.monitorix.org/"
-SRC_URI="https://www.monitorix.org/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	acct-user/monitorix
-	acct-group/monitorix
-	dev-perl/Config-General
-	dev-perl/DBI
-	dev-perl/HTTP-Server-Simple
-	dev-perl/IO-Socket-SSL
-	dev-perl/libwww-perl
-	dev-perl/MIME-Lite
-	dev-perl/XML-Simple
-	net-analyzer/rrdtool[graph,perl]
-	dev-perl/CGI"
-
-src_prepare() {
-	# Put better Gentoo defaults in the configuration file.
-	sed -e "s|\(base_dir.*\)/usr/share/${PN}|\1/usr/share/${PN}/htdocs|" \
-		-e "s|\(secure_log.*\)/var/log/secure|\1/var/log/auth.log|" \
-		-e "s|nobody|${PN}|g" -i ${PN}.conf || die
-	# Update systemd binary location
-	sed -e "s|/usr/bin|/usr/sbin|g" -i docs/${PN}.service || die
-	eapply_user
-}
-
-# Override compile phase
-src_compile() { :; }
-
-src_install() {
-	dosbin ${PN}
-
-	newinitd "${FILESDIR}/monitorix" ${PN}
-
-	insinto /etc/monitorix
-	doins ${PN}.conf
-
-	keepdir /etc/${PN}/conf.d
-
-	insinto /etc/logrotate.d
-	newins docs/${PN}.logrotate ${PN}
-
-	dodoc Changes README{,.nginx} docs/${PN}-{alert.sh,apache.conf,lighttpd.conf}
-	doman man/man5/${PN}.conf.5
-	doman man/man8/${PN}.8
-
-	insinto /var/lib/${PN}/www
-	doins logo_bot.png logo_top.png ${PN}ico.png
-
-	keepdir /var/lib/${PN}/www/imgs
-	fowners monitorix:monitorix /var/lib/${PN}/www/imgs
-
-	exeinto /var/lib/${PN}/www/cgi
-	doexe ${PN}.cgi
-
-	exeinto /usr/lib/${PN}
-	doexe lib/*.pm
-
-	keepdir /var/lib/${PN}/usage
-	insinto /var/lib/${PN}/reports
-	doins -r reports
-
-	systemd_dounit docs/${PN}.service
-}
-
-pkg_postinst() {
-	optfeature "disk drive temperatures and health" app-admin/hddtemp
-	optfeature "email reports/statics" mail-mta/postfix mail-mta/sendmail
-	optfeature "lm-sensors and GPU temperatures" sys-apps/lm-sensors
-	optfeature "APC UPS statistics" sys-power/apcupsd
-	optfeature "Network UPS Tools statistics" sys-power/nut
-	elog
-	elog "If you wish to use your own web server:"
-	elog "  Web data can be found at: ${EROOT}/var/lib/${PN}/www/"
-	elog "  Also please check the correct user and group ownership"
-	elog "  of ${EROOT}/var/lib/${PN}/www/imgs/"
-}
diff --git a/www-misc/monitorix/monitorix-3.13.1-r1.ebuild b/www-misc/monitorix/monitorix-3.14.0.ebuild
index a6ac6b69d076..7c5126a6c23a 100644
--- a/www-misc/monitorix/monitorix-3.13.1-r1.ebuild
+++ b/www-misc/monitorix/monitorix-3.14.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 inherit systemd optfeature
 
@@ -11,8 +11,7 @@ SRC_URI="https://www.monitorix.org/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	acct-user/monitorix