gentoo resync : 13.10.2019

5 files changed, 1 insertions, 320 deletions

diff --git a/www-misc/monitorix/Manifest b/www-misc/monitorix/Manifest
index 36f88a45aab3..14f3df21e6bc 100644
--- a/www-misc/monitorix/Manifest
+++ b/www-misc/monitorix/Manifest
@@ -1,10 +1,4 @@
 AUX monitorix 794 BLAKE2B 59ff64344bf951cf38448acb260f8a4d30fd1ea0fbd810a8f79b3a1740cff2aeb7cb2647337ff101a5cf1ddfb3ffd44ee739d0f89bdef3175c02afb687616309 SHA512 02b1e9fef7991c226decca8fdb5a5ca3e3960e7530d60ed770ec207a4f199506edc3a20d0608de3bcfdc1c25b0027900efa5b3d1be1c89b8bb8680a79ecd4013
-DIST monitorix-3.10.0.tar.gz 309688 BLAKE2B 58345fbe02e24be48baecb1b91b4c24de8bec1960557e4713c4007c7c1649627d79caf823893eba4f9c9bc1330cc739f2c4e248421795235107ddf5164e998f5 SHA512 a313b25c4b8a614d62d67e9649227461a0faf83704baebb01318acb8d42dc336b747dd5f4a9fc5ddbd7ef10598d96577d1265c0022dfb0a94826e1da5cfc33d2
-DIST monitorix-3.10.1.tar.gz 313587 BLAKE2B 2dfc63499966346cf7e862a44d904f2599a6eb40544c511c9d64f1fa32684bccbecccbbfaff8d46cdb1c4af8b5904c2622ede8d3d8f955bd9bacc32848c2ef02 SHA512 b1e2a5c6a2992c6280129ec7fcdd72783902f475c3c98f09aab86b56305efacce7222732669639dc59b29da2fdf5cda49999ee159f4a95b12e4ee3a491d55c55
 DIST monitorix-3.11.0.tar.gz 318741 BLAKE2B af190e716acea9dfa56ebf3976e387abc19d0254fbebf6b6b18deff98b989266bff7e7c59e57832ad8b29dff8abb220e19da079c004ec185b63845cf70fb2727 SHA512 81832ef569416cc2e587beff8dbd485a6d361c0b5f11611522bde58c06d3156888e8c7b49cb3205adafbf737cd2d2b22e6041cd8b94e6d8c78cb5a4c3b1587de
-DIST monitorix-3.9.0.tar.gz 288443 BLAKE2B 6203f2950e0061d1ff268a2c42c31e7e14b5103e09ec82411f3ee3b957212c8799ba00710b269e0097ed0a3c060eb2d6972dd7b2c1af820bb09de2281113238c SHA512 599f3fa004c2e9657f255ca0ef0ae69ca63623976d17ebf8883a8c19b8a76193916634844f794da508439336edc37e424263aa6ccd8e06bb3584b6cf3cda783b
-EBUILD monitorix-3.10.0-r1.ebuild 2829 BLAKE2B 57e92a739ac167d873144bcaad9d91ec3f8c3b7ba0937dabc73efd7fbbaf2d745a7fda3cc61fc3d5c87e783a772b45ad0e78fc27d26b637d5fb2769c47e955f3 SHA512 20b8d8899e9cffafb41db15f16683edd19bd807cef91c3cd9dab5b619ba37e8fed08bb18080e1dc8eca5c3f99933a744b7a830f2296f6cae0a5b739186dc6d3e
-EBUILD monitorix-3.10.1.ebuild 2758 BLAKE2B f72f6baf4b8b5d75cbee89ab5e816446833c988b6940ee31f33cf48704fe50f65b888580fe68a0567f45112e7a2d467000154afdbe36642add26d17da3f39d69 SHA512 242f0d3d65f3589d7047683c52486cabd0a5893e650055e8e082aa03994e912a43f6137bea2a8f4bd4e8364c68e19dd7d185deff1b9ebfba19d5d090c5c32fbc
 EBUILD monitorix-3.11.0.ebuild 2851 BLAKE2B c5d11e04e38246b5530fe036f55457f9e502eb9a39f62bd3794b793f753555dec3d35a198d3b92de7e94c3210a42b395dbbbaa71e7b8b1517332764fe890e311 SHA512 5351de6272020c237524c05822298aecd3dbb14da89e6f102080a6c9d88673fb87f2309218c246ddc2af92c74eaa214bc3f6a8b0487f5f5184d3e8b98a67ce94
-EBUILD monitorix-3.9.0.ebuild 2653 BLAKE2B eb2aa0539329608e83032342a16324f0224cfc10bc562ab52cf1a45b09c946316ed722aa00995d2c272db14e03c38371f23e9562293a9791c692e33b6348cefe SHA512 2fdb051ff113c569b9123f69af31b39de83472710684dde0fc25925a59bd38801baaa5a10835507fab3456590cf5c22b61512b2cf8db24c1ec055eba5367e237
-MISC metadata.xml 857 BLAKE2B 952d7eaa095fed062ac2662bf4750ecf002e0015642cc928e56964774aa354b445576aa9d04f8d9368c3454e2f41fa8746df9edcdc84ee2d53d5ee66e0af5c08 SHA512 c44c6e3357b95f174bd886a9373b7259d182a254af2d4ad3495c3d081279f76d5e682db8ae1d28f768d493bd2d85965303f9561b602abcb42248c264342c63b3
+MISC metadata.xml 529 BLAKE2B 9b1a98822a897286b468e359ad25aa357feed9f58b5214e4337c860a736fedf4b90d7f412fd7af998aa4c9c11406690c53a52c0d750af165a21de1c775ecdaa0 SHA512 cff03dcb6ab552c01a86f9ae29197f61cf6f5193053714b865398464ec3177a8d64041b30f6563c95d19c3a5a2102ec92687b24b20ea648d66cefa05ba01cc10
diff --git a/www-misc/monitorix/metadata.xml b/www-misc/monitorix/metadata.xml
index 08fea21bf0d9..b4fd693643c7 100644
--- a/www-misc/monitorix/metadata.xml
+++ b/www-misc/monitorix/metadata.xml
@@ -10,11 +10,6 @@
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
 	<longdescription>A lightweight system monitoring tool</longdescription>
-	<use>
-		<flag name="apcupsd">Make use of a daemon that controls APC UPSes with <pkg>sys-power/apcupsd</pkg>.</flag>
-		<flag name="httpd">Enables the CGI webserver with any package that satisfies <pkg>virtual/httpd-cgi</pkg>.</flag>
-		<flag name="postfix">Analyze postfix logs with <pkg>net-mail/pflogsumm</pkg>.</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mikaku/Monitorix</remote-id>
 	</upstream>
diff --git a/www-misc/monitorix/monitorix-3.10.0-r1.ebuild b/www-misc/monitorix/monitorix-3.10.0-r1.ebuild
deleted file mode 100644
index 7181ae3d0cc1..000000000000
--- a/www-misc/monitorix/monitorix-3.10.0-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit systemd user
-
-DESCRIPTION="A lightweight system monitoring tool"
-HOMEPAGE="https://www.monitorix.org/"
-SRC_URI="https://github.com/mikaku/Monitorix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-S="${WORKDIR}/Monitorix-${PV}"
-
-RDEPEND="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"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-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
-	eapply_user
-}
-
-# Override compile phase
-src_compile() { :; }
-
-src_install() {
-	dosbin ${PN}
-
-	newinitd "${FILESDIR}"/${PN}.init ${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
-
-	dodir /usr/lib/${PN}
-	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.10.1.ebuild b/www-misc/monitorix/monitorix-3.10.1.ebuild
deleted file mode 100644
index 6cfe49a36664..000000000000
--- a/www-misc/monitorix/monitorix-3.10.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit systemd user
-
-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="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"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-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
-	eapply_user
-}
-
-# Override compile phase
-src_compile() { :; }
-
-src_install() {
-	dosbin ${PN}
-
-	newinitd "${FILESDIR}"/${PN}.init ${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
-
-	dodir /usr/lib/${PN}
-	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.9.0.ebuild b/www-misc/monitorix/monitorix-3.9.0.ebuild
deleted file mode 100644
index 75df0a787d66..000000000000
--- a/www-misc/monitorix/monitorix-3.9.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit systemd user
-
-DESCRIPTION="A lightweight system monitoring tool"
-HOMEPAGE="https://www.monitorix.org/"
-SRC_URI="https://github.com/mikaku/Monitorix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="apcupsd hddtemp httpd lm-sensors postfix"
-S="${WORKDIR}/Monitorix-${PV}"
-
-RDEPEND="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
-	apcupsd? ( sys-power/apcupsd )
-	hddtemp? ( app-admin/hddtemp )
-	httpd? ( virtual/httpd-cgi )
-	lm-sensors? ( sys-apps/lm-sensors )
-	postfix? ( net-mail/pflogsumm dev-perl/MailTools )"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-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
-	eapply_user
-}
-
-# Override compile phase
-src_compile() { :; }
-
-src_install() {
-	dosbin ${PN}
-
-	newinitd "${FILESDIR}"/${PN}.init ${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
-
-	dodir /usr/lib/${PN}
-	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() {
-	elog "WARNING: ${PN} has changed its config format twice, in versions"
-	elog "3.0.0 and 3.4.0; this format may be incompatible with your existing"
-	elog "config file. Please take care if upgrading from an old version."
-	elog ""
-
-	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. If you wish to use your own web server,"
-	elog "the ${PN} web data can be found at:"
-	elog "${EROOT%/}/var/lib/${PN}/www/"
-
-	elog ""
-	elog "If you are not using monitorix built-in web server, please set"
-	elog "the correct user and group ownership of ${EROOT%/}/var/lib/${PN}/www/imgs/"
-}