gentoo resync : 25.11.2020

6 files changed, 108 insertions, 2 deletions

diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 9ce7e7b96092..81c29698e049 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/buku/Manifest b/www-misc/buku/Manifest
index 15a6a5a0a194..43b92221f7be 100644
--- a/www-misc/buku/Manifest
+++ b/www-misc/buku/Manifest
@@ -1,6 +1,6 @@
 AUX buku-4.4-fix-tests.patch 1351 BLAKE2B 470f521fb2b38bfa0ba54abab1937d046f0526154ff6e5ee131c45b32ef81da63bf4f3f20f1c7158d98b6470fc3264711735512bcbf3a031017ef8927755446d SHA512 e734928264f8c84bedaa903556d9a509d7f12d5ec289fd5c8c9022fb0469d9de80dcb81ab63af24cf7bc2798be46fd7327ce2830c78adaa12c4c4ff9cfc00e29
 DIST buku-4.3.tar.gz 264480 BLAKE2B 8bddf640512e5741f80bb5bc073208d843cac32d3c3ade0bdf36241e93d6c81d47238ad03c651e924226933efa572e65d9a4c86f861acda68935c9e96d6e6fb4 SHA512 eabf45b1cc1700b20f2a95baf14940f49e2a2ad51aef0f870c488e67cb07fb110916d93037830cd83572317c5d0a8b05c0a5732f105face2a14facf6af02b690
 DIST buku-4.4.tar.gz 273207 BLAKE2B bff849f03ba6b2f8779a9445da26f64875ccc6a7cb1434cba51237742a7b9968d302ee0dd9f87fd2857922660fc304d07012a962c080704d7d99312e8672e4d0 SHA512 5ccd3e72b2256d4d3daf007ffc9279c9958eec6a5baa913cb31bf97d978db227e28311f882a930da737c002ec0750ee9f8cf0f7584e639154398ba5d486bd8ba
-EBUILD buku-4.3.ebuild 1661 BLAKE2B f319288aa0be9f9f9cf4e7e74fd0684001acb83d582fc70632543e42290e5dac607bfec7f6c6da845cc3b19bc3a073ad4b2805b2e01a231e4bf7cfee6f7ba878 SHA512 3c07c242385086450dd56e36b173c27e426c6fc923f43c39188596dcf5894c2dcb6ebe9448c2721d05412ca96fc06f70227b1d81eb5eaea9a7047eda3a86270f
-EBUILD buku-4.4.ebuild 2564 BLAKE2B 0904c7582b7e72140108266acb83eb12416f99e9961780608f4d27f54cdfeea783c98a42c0b1e0dd497acd659808aa0677885961748fc47f30dae81d9dd2e6f0 SHA512 7fd63e9218aa2bdfcff758af94efbb78ed0b091b317db35fa9a8027bdf4ab6e709795c67c0c1bc89a9341a526ba67639507531d7c74bc1f6e7eb18d34d740fc5
+EBUILD buku-4.3-r1.ebuild 1685 BLAKE2B a3dcd4c3bc4a53e66afa51de5adc2ba0e376ed9f4795a55556196bd0fce70a123927b5e1c8fb03591dd88d8692ef1b709d444cf14063d702ebdcbf3d4d6ed6bb SHA512 e61b189abe6c478bd289f1e5039df009e79e5721fa115140289b36cda18208fe9d61e93c2a6a6b847f21329b89096a4c9793dbddcbf662fb7a792fdc7238d73d
+EBUILD buku-4.4-r1.ebuild 2588 BLAKE2B e73bc3332b66b556d990e5c4bf7443031c7083f74b251bedfb55583789ab10bfa9e73cd465b0e3cdcaea7448e455aeb819ee49f45fcd24e01051c1b5bba7d6dc SHA512 7ce393065b288beb12b9869f15e2f657674a051b84270fb1c970c2f96101c265bd4545c87a17d042b3c24d52fe3a4a454a8bfd3c68e5bc60f6e7bfefc88faebc
 MISC metadata.xml 555 BLAKE2B d79b07af4359005c7e280f4f0e0162e75fe69cd6f838b97aa74398627890fffbfe6ef1d67d731e8c547aa2a61ea8cb113a235aed7a769f9367db38ae2d37d494 SHA512 c3edc1739fa142f98a2c1793bd47085af2d24f07872daf579ed16102917dca8449f2af148e493e078718eea4e28f1831349c86fc10ae60e2f8de8326db1dedb6
diff --git a/www-misc/buku/buku-4.3.ebuild b/www-misc/buku/buku-4.3-r1.ebuild
index 6dcf64f9dd50..96a36a815879 100644
--- a/www-misc/buku/buku-4.3.ebuild
+++ b/www-misc/buku/buku-4.3-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit bash-completion-r1 distutils-r1
diff --git a/www-misc/buku/buku-4.4.ebuild b/www-misc/buku/buku-4.4-r1.ebuild
index a626d1b80273..6ea730152354 100644
--- a/www-misc/buku/buku-4.4.ebuild
+++ b/www-misc/buku/buku-4.4-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit bash-completion-r1 distutils-r1
diff --git a/www-misc/monitorix/Manifest b/www-misc/monitorix/Manifest
index 78a49f08bbba..e814a6b12af6 100644
--- a/www-misc/monitorix/Manifest
+++ b/www-misc/monitorix/Manifest
@@ -1,4 +1,6 @@
 AUX monitorix 794 BLAKE2B f0e4eb70ff867711b749fbdda5150ef0733f9622fceaf8499600bcae15bea3e6a987d7c5635987e0913a1bd28adc6be5e5273438c59ee434a80e2cb72d8e6bd1 SHA512 92f16de3398673046cb9aa27f70923f35d6f61a5a861bed37a61650371ad714aa6ad2be2eb9f770e4cb734db109a222182ba22eb4a6f9c5b228a8b96c1ef893c
 DIST monitorix-3.11.0.tar.gz 318741 BLAKE2B af190e716acea9dfa56ebf3976e387abc19d0254fbebf6b6b18deff98b989266bff7e7c59e57832ad8b29dff8abb220e19da079c004ec185b63845cf70fb2727 SHA512 81832ef569416cc2e587beff8dbd485a6d361c0b5f11611522bde58c06d3156888e8c7b49cb3205adafbf737cd2d2b22e6041cd8b94e6d8c78cb5a4c3b1587de
+DIST monitorix-3.12.0.tar.gz 348117 BLAKE2B 65f6e5a8ef4acba2e5dd015e3acab1c927a8964de6cf0bb56a426e6e2dc5843083177591f26db639ed36df798db9659cd6345ca38df4f25fc9a4759e84f0d553 SHA512 7cbdb27df1d84e87f0b99d310d3b3a7c27e369adc82c88e297966e36de82c2f800474447dd628041f2feb89817ee496cbae65a4b0e4942a2f75c900f16ccfcf1
 EBUILD monitorix-3.11.0.ebuild 2812 BLAKE2B 27b575b23cf890858fb9e96d960efdb7fcff2a3fe8aebff42c3f6a80b897499fc5b40ad2f3b5fedd8f43b1f62b93ad0075c892ac41786da75562e862db023df9 SHA512 e30226d4b1e32245e40c02995ee0890d62fd03d4dc958cdeae7837c2fee09c82a1bd1df49d5e7620aa451bdd0d40e669eaa70503c814ad7c7ad31d857026e857
+EBUILD monitorix-3.12.0.ebuild 2790 BLAKE2B be1f972e47615d7fcc9f225da6efea482e8390e5a5cf45bdbf3a1607b0aa7d64f0e04bd4c8fe1b774d910880b7dc51afa781d03aa573277670764e80ff06474f SHA512 786b7608dfe1ce3a0802461316ec64f64b46a9f72f067d1767446fd9f075e861c1e66c5b6a6c1a6fed0b2a37bddfe279e870a3785c5d0297d0f05c9636afc483
 MISC metadata.xml 456 BLAKE2B 8c25de0cdb102ae91def87ffd8722597b787de59402f14a1620649e38272d13ccba6fa1d97df4c587b0d145fef446e7b52b3200d176e30cb632c2702ef104c9e SHA512 1c6934a7ffa1f5cb38336a79dc886cbb0b193668316c4fd246dbee9a9dd071f2c30147163d0ebb97d7f4b9d52b9f048421a1babe85ba5ba7499ecd83f2f56b3c
diff --git a/www-misc/monitorix/monitorix-3.12.0.ebuild b/www-misc/monitorix/monitorix-3.12.0.ebuild
new file mode 100644
index 000000000000..f76b1892b920
--- /dev/null
+++ b/www-misc/monitorix/monitorix-3.12.0.ebuild
@@ -0,0 +1,102 @@
+# 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/"
+}