gentoo resync : 13.10.2019

17 files changed, 50 insertions, 333 deletions

diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 8f7373ae220a..4c343db885f4 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/awstats/Manifest b/www-misc/awstats/Manifest
index 87c53b2f51f0..1edd69a186fc 100644
--- a/www-misc/awstats/Manifest
+++ b/www-misc/awstats/Manifest
@@ -3,7 +3,7 @@ AUX awstats-perl-5.22.patch 1981 BLAKE2B 7198b110b2688a989aeecd8ddeb364ab485e615
 DIST awstats-7.1_p20121017.tar.gz 1258135 BLAKE2B 0a43154d044346acdf4e71e96b05f9b8914d0df8a3812c6a20edb33a0b9d8b6f0aadc065466f1ee23c0469e41eda9622c380bd35c579b887a6547fd6749e9bd4 SHA512 171ff3118955c8b73c968a23983885d967632d2c6e95a45f71e5f6fea74afe34d869c9cc901e2e739419068babc96385d7d7df1e8ca10074be7388fbe5c51f53
 DIST awstats-7.4.tar.gz 2936102 BLAKE2B 2bc7f9619e4d6b13d3909869d642c347d6b9cddbbb3b49d58494ce108c8fe25d59b27198d5a42f8b81c06fdaf1a2e135c82883ec8604e53c6c5adbac07223b66 SHA512 5bce97c71aabeab35e4ff5e5168531e4955d7c1474322c7b4a47d1d06e06ebd0e74d1def73826498e6253f24aeca99309777617b7a914685c927bb6e1c020e1a
 DIST awstats-7.5.tar.gz 2936644 BLAKE2B 666e4d50e8011315351e1aff538ec56507c5bc8e4fb4890c29aee1f73985b8466f346982a6022ae1689e30d587b21ee0f2038f46783e4f25454dfa6e5fe39771 SHA512 d69a66b5ef94d8a7378ece0453a3617f71ad030d81c45cff926fae1319eacdcdcbe2e68513153cd7444d77cbb950827964b0157ce74c04be76781c071f016a35
-EBUILD awstats-7.1_p20121017.ebuild 3345 BLAKE2B d322c3658a07a94e3f58cbb6262ab3cce2c5119fa28861bbc3614a2e3897281b05a884eecc4c6be70d29112147afb8170f0be314d92980f7a930c740e25ffa5e SHA512 ffc8cb30424bde66392ac433b589b6f1b7374c3006e63c96e85456ea99a8d9c6f00092f5c885c65b134186c8f99066c824190b2e82c2547859240196b63e692a
-EBUILD awstats-7.4.ebuild 3388 BLAKE2B 5b26c630546f1719aa9b98fe8461404ff29f3799e187e8dd1a48e946121cd0c628695763d14d845b591ced1026f63151b49a5a318ab2bdafc7d1935dcbc3690c SHA512 44ba5a936f9176537e90706e3d529bff573f1cfbffed83e3ceb75735701abca921fa51c97fd6f5d1ed01477195dd7f0c3af83d0e9610cdc445ae8a5c151e4650
-EBUILD awstats-7.5.ebuild 3378 BLAKE2B d36e19979e90efea2762d7ca997a96575b84a5cc4439709758e26935c7e2e191e0d7edf4fe8b177815b9c2db0e1ac3af07c57313e393f6152cb1a29ebbb1f75c SHA512 b63153954625ecd184951ee0cfaa092c82b7c5508adbf9bd6e344c6f6d58349c56118f44cf92a09c049fba008ec65ec5313f1da2b7affc8b73135a081c08f8db
+EBUILD awstats-7.1_p20121017.ebuild 3335 BLAKE2B 4bbeeeaf68ab3930a0e1c836453a28eee9cadfe5273523f8004d03c04a6bdefe625811b8a8472ee8d9065a85f46eabaa74ac4679ce51089f287e71ad49c45c9e SHA512 74fdff6cf6df0bc552f37a999594237205046cded90780c718e70ce15fcc797df05875cff8899a9bbe24f5f65817c8c14d2f17a6815a2f34950edffe045b5a17
+EBUILD awstats-7.4.ebuild 3378 BLAKE2B 9b96bd6c41ecd000b811dc80f98d7736f74b1ff630e7cf9d6c6ccb1de8cece1115c168a95fb9d129541d859dac41d9d17759c318ce98da9194c89468acdaa20a SHA512 6e66923a9e6f6ea6449584d55039299da0b913fcf7e7c20b395eb5be64bb62e1172e351a62592f4bef0d62facd15095548c96b824b84e8de013de01e1f7d6e75
+EBUILD awstats-7.5.ebuild 3368 BLAKE2B ce32b2b1d0175a4188af5e73082784863ba7ecf811932c7fdbddab99cbbffa66e21168f13b4a71660729f69d04aa7d629815bd1b95264af42f46eeeba99089e0 SHA512 4ce90a7349112747b85de9622c0553a72fc3c6dd5a448b29b5780896af24b5f18171447d88347b3421d104b2a7ae5aa3ae0f879e9e57d469a7e35ae479c784b6
 MISC metadata.xml 254 BLAKE2B 53495a638333fedaee2d8d838a705aaa610797eae56298aa35ad3c965af321b3d8e9b12643d1c3564f4232ca4a7ec44182ee7b35aada373750beee6b1c2a8a12 SHA512 b4674c7f9d0dc24c25846b3fe716415b648a61099b8d2f7eb099cf14f9a8f4670af4638349f953fe1b32b9d357911e533b72eaf4bbf14f54827512fd9bbb0ee8
diff --git a/www-misc/awstats/awstats-7.1_p20121017.ebuild b/www-misc/awstats/awstats-7.1_p20121017.ebuild
index 225a3d04175a..d9163b128103 100644
--- a/www-misc/awstats/awstats-7.1_p20121017.ebuild
+++ b/www-misc/awstats/awstats-7.1_p20121017.ebuild
@@ -23,7 +23,7 @@ fi
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 hppa ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 hppa ppc ~sparc x86"
 IUSE="geoip ipv6"
 
 SLOT="0"
diff --git a/www-misc/awstats/awstats-7.4.ebuild b/www-misc/awstats/awstats-7.4.ebuild
index 3e8cf18c8f75..b915d62d25db 100644
--- a/www-misc/awstats/awstats-7.4.ebuild
+++ b/www-misc/awstats/awstats-7.4.ebuild
@@ -23,7 +23,7 @@ fi
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
-KEYWORDS="~alpha amd64 hppa ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 hppa ppc ~sparc x86"
 IUSE="geoip ipv6"
 
 SLOT="0"
diff --git a/www-misc/awstats/awstats-7.5.ebuild b/www-misc/awstats/awstats-7.5.ebuild
index 537b396cee01..8e7b28821a6b 100644
--- a/www-misc/awstats/awstats-7.5.ebuild
+++ b/www-misc/awstats/awstats-7.5.ebuild
@@ -23,7 +23,7 @@ fi
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE="geoip ipv6"
 
 SLOT="0"
diff --git a/www-misc/htdig/Manifest b/www-misc/htdig/Manifest
index df54be57427c..e7861057d687 100644
--- a/www-misc/htdig/Manifest
+++ b/www-misc/htdig/Manifest
@@ -5,5 +5,5 @@ AUX htdig-3.2.0_beta6-gcc6.patch 3673 BLAKE2B 819647e4b323f795645e7375b301559ac7
 AUX htdig-3.2.0_beta6-musl.patch 1188 BLAKE2B f481706f23d60ff5c72086c4ff9539a280f1b0cde19e834edacfbc2bec080819ecb4d087147b182aaa60cbafa639de9194ce35473f5b4ccc33516f51346894f7 SHA512 2c766f4d49e941de8c56b3858ed32d9e90efff9f43ec699cd30c0a87c19bab786e113412087a5bec698de26b4454f5df4306a95f9e16c6cd829f5ef8572ea0a3
 AUX htdig-3.2.0_beta6-quoting.patch 1130 BLAKE2B 0257d3f79e544c13f4d17caa71bf4265aa7668c91e15f5c38b502fbc50415feb6a378430af6a147f6a2e3f087ad79fc2ab426b97b6191166a1c930e7a416e2e6 SHA512 7edadb8cecb378eac8352e43ce12d5fa6af711f847f1e1ca0a49303daedffb1cef9795b74eb8cd64120e981c57c947f082f60d857985ee5ac0d54537fd6b4181
 DIST htdig-3.2.0b6.tar.gz 3104936 BLAKE2B aa70026ce6fb10910c42b4091900980c78f81fc9d07b1dec4071811aee21c6d6a67a7fbb2ca59b785c457b13b508773f8ca8f96042f23def82b071fc40b00870 SHA512 29832f4aebd2b1f944cc4d800a5202342c8ce66936980476d49f679ec169c0268a902e85cd7440a3b6bea9db0a3b640bb1a9719c680d857ff00d34590af63064
-EBUILD htdig-3.2.0_beta6-r5.ebuild 1735 BLAKE2B 5258ec38af05466385f31522cc5c697f2d37d84e751b7865116e6d8d4656689c239e3e33f3ebdc9727038644f49027863ed6e133e74cc5232959f9bc11f8a476 SHA512 363fbb73975f4791364e6af66f20178e38c0f3a37cc717f8672419b17def7e7055c38678f31b80e5a49299eaca9008fb4abf24fd716f799b171086c29927663b
+EBUILD htdig-3.2.0_beta6-r5.ebuild 1713 BLAKE2B 85939cfafa6631ac7dc581778f4e41fa7fe96390aa9f78aa479b1fecae109a5ef32f0be761ee96a6170c9d3d456278deb4225e355c4572f34b1f6a265c0beb49 SHA512 e5e2917bd08a10963344213899695793a302c776354d5a5f93b5d284d85b51dcf53bda969e3e8033898ffee1901d79dca5136c66a388f2e6765ad2bd283256ab
 MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
diff --git a/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild b/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild
index eec36227e380..cac6067ae058 100644
--- a/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild
+++ b/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.htdig.org/files/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="libressl ssl"
 
 DEPEND="
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/"
-}
diff --git a/www-misc/profile-sync-daemon/Manifest b/www-misc/profile-sync-daemon/Manifest
index a49897d72947..fe896bcbeffd 100644
--- a/www-misc/profile-sync-daemon/Manifest
+++ b/www-misc/profile-sync-daemon/Manifest
@@ -2,7 +2,9 @@ AUX bad-substitution-fix.patch 476 BLAKE2B b7ff1d56a41c29a53c3650db1407707b61159
 AUX openrc-path.patch 554 BLAKE2B 9e43692ed6baabf1001c6423abea72f0265e94326adf4cd10590e27eda0b0a76ca628db88e396e4b6074de27ba71bab033139dd0e4ad13afe654a2f9645b061c SHA512 d64640d443c95bf9a771416f28edabcc63fb0b329b936ac5942734225da80f771b63d1d1b6d03209bbba1b0eece95d84872e182e4d1fb790f3aa965ba44dced9
 DIST profile-sync-daemon-5.75.tar.gz 27829 BLAKE2B b333688af27a7373f72e72a09dd18afc210f2196957a76f6fab59d46ecd4e9b905b833a66bf49001c0be307b05b06320d7ee2b754cee1b6559a113346717b82b SHA512 54c2a6c743bf3a3dd746862f6dc0448c8993c96fe0163f4f89885cee3e4c81ecac46414c0ca57d57ec0e9e6c646f9a39462d5d533a7515a952cc56276509bdc0
 DIST profile-sync-daemon-6.31.tar.gz 20490 BLAKE2B 6c65f414230051e71578d1d0d69dd266a6d2b6f741b9c3a0e6b3132945fbe8f98db12544ac145609c82e793e1a8d5e8cef278191e653cb5560c3451d6f158307 SHA512 7e7585e902c2428c28dc980c73ebf77ea7f2b39133a6ad0c82e714c2789811c42785ac5d403f965f1b3de8c685d7cba51810ea99206e2b7351dbd607a2cd0fdb
-EBUILD profile-sync-daemon-5.75.ebuild 855 BLAKE2B 98d7311b54443ce829df3afe2ea00da6f9af6b958a6b57a47f606e9eaa1bb95b82b5cca94a90ac617fb49a683efe9900f11732c2608fb466cf2b3289f0a05774 SHA512 1ec236d79c2e1fbce9149544fc9d02848981eb2472b73a497e6b4169637892605a3779b4b72cbfbcfe98a528cd59a0f7784c7702e8fdac97abd509e7c222a449
+DIST profile-sync-daemon-6.35.tar.gz 20578 BLAKE2B f989682396f1423acf26719b74a356b0ee3933571aaf6a757620504392083d36bce278cfe9e0bb7a81dd1a95d51454c7bb039a556ce3670ce6b75b0c18e2bcea SHA512 e406d39c4edeabc8baa45320a97656791d4099cc8db84aac2cb9f72ef2ed034c82bba73d53457f4ae4201c945af106717d2d979df5a3f154e307f2e6cc41411a
+EBUILD profile-sync-daemon-5.75.ebuild 853 BLAKE2B d38982d9c5527c0654803ef47845e17905d92107ae49fa73823c052cbf85774c3d5670fe9c5e9c7d03d86c27529d9f48927861a2e0ebf51e966091b8b46da7f1 SHA512 b5c784779f283e2009ca2ad878da5c80c6b1602085059ce1fc2cce8403443ea9de2e704b116222aeac825517753ddb5dd189ffc1e7b856f54eeeb1372d9b9d6e
 EBUILD profile-sync-daemon-6.31.ebuild 782 BLAKE2B 9ac819f8a4f964d86bfb11f919c086ba77c6445f4f15ab095b3f2ac58373abf21f9df941ab4418cc928e5f0c601f996575db3a0401776743070d8a3d30187f29 SHA512 ac66b9cdb4d98afbaa3adc012a0acc282f2062ee6146d2cccc74bbb2c350f0650d7b8b34e55f7dbed66b9c4d50de4a53b138c97b210f527ff43d76705a0e9af4
+EBUILD profile-sync-daemon-6.35.ebuild 820 BLAKE2B 758a73e11a522f8e23454265a2f1eef530153def6433234db5f06ebacd5e2d0c9797a7675c9ba0865c34f1fb8ac1715ee4ed21f7b5ab74e30dacfe17dc0ae6e1 SHA512 4186f37ceb25b7f6b6ecdc33ff358ca1a6e9ac1e9c04be1696eac69b700bf0f65b3cb6532dd23785c290836922bb27b1b74574d2d60452ba59d2d03210d5cb6d
 EBUILD profile-sync-daemon-9999.ebuild 414 BLAKE2B 2d75908e1931749dd2c4681076ae33e01e05454a2817903f25ce5ddf591c1f2d28184271036d0d6073268a8e0c7faea5648416b9e594e10ff0f7c6ddd03b8612 SHA512 320f2c02f049c099bac9f319e8725b98b36e597357729e95ef70be6f42ccfef17fae32a7bb55826cf46bc72056b662af7573055dae67d1c725db0d7c020d233b
 MISC metadata.xml 454 BLAKE2B 6869a276397639246163d2a3e503b196390e3c52c00f8545ddd8d16257b93328bf14324b553b42fc17986cb9058ffc41325cf5f5c30da844aea41bac6212501e SHA512 7174ddac618332b4e0904a293c15a4b6ea2beb93e004ecdc454d2927958e2504df0e17069cc5577a8047e072b90bd6aa94af9634cb12ab075a31c9658efb81d6
diff --git a/www-misc/profile-sync-daemon/profile-sync-daemon-5.75.ebuild b/www-misc/profile-sync-daemon/profile-sync-daemon-5.75.ebuild
index 11e5f93ac552..b1dc3c521bf6 100644
--- a/www-misc/profile-sync-daemon/profile-sync-daemon-5.75.ebuild
+++ b/www-misc/profile-sync-daemon/profile-sync-daemon-5.75.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/graysky2/profile-sync-daemon/archive/v${PV}.tar.gz -
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="systemd"
 
 RDEPEND="
diff --git a/www-misc/profile-sync-daemon/profile-sync-daemon-6.35.ebuild b/www-misc/profile-sync-daemon/profile-sync-daemon-6.35.ebuild
new file mode 100644
index 000000000000..844169f700ae
--- /dev/null
+++ b/www-misc/profile-sync-daemon/profile-sync-daemon-6.35.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Symlinks and syncs browser profile dirs to RAM"
+HOMEPAGE="https://wiki.archlinux.org/index.php/Profile-sync-daemon"
+
+SRC_URI="https://github.com/graysky2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	app-shells/bash
+	net-misc/rsync[xattr]
+	sys-apps/systemd"
+
+src_install() {
+	emake DESTDIR="${D}" COMPRESS_MAN=0 install
+}
+
+pkg_postinst() {
+	local replacing
+	for replacing in ${REPLACING_VERSIONS}; do
+		if [[ "$(ver_cut 1 "${replacing}")" == "5" ]]; then
+			ewarn "${PN}-6 and later dropped OpenRC and /etc/psd.conf support"
+			ewarn "See https://github.com/graysky2/profile-sync-daemon#note-for-version-6"
+			break
+		fi
+	done
+}
diff --git a/www-misc/shellinabox/Manifest b/www-misc/shellinabox/Manifest
index 8c24030973d8..849fa28d2ac4 100644
--- a/www-misc/shellinabox/Manifest
+++ b/www-misc/shellinabox/Manifest
@@ -2,5 +2,5 @@ AUX shellinaboxd.conf 3564 BLAKE2B 82b42901c93e64b2f6f950af13a628c35a50b076c394e
 AUX shellinaboxd.init 1673 BLAKE2B 1489e72db618f71708cec4f576ca56fc7623b80bf5538b51578712f1c04365edc8957d34bce45acd0e083f30c24eb5f551bda5bc581fd880375b4e508be8bd26 SHA512 7fc79a4a7633c452277ebcfb871ce34f4f3350beae863ad0cf5540ca12c9c8f33367cedddd8777eb1ea75d3ef7816935ef176d8eefac700b3e2917d11bfd280b
 AUX shellinaboxd.service 420 BLAKE2B 89973ee0f64fce39603778afef8e0544313ff05f71c7668b5055edccffa552511278ab090aad50529e949e4b16e84291302f1404660d3ab5150ce5491f2fa4ca SHA512 cdb22177b92794c7cda2e10c461f1f31ed165ede156c682fec5b682afbd48f8c9c564420950f3d39f9943cbfbfdb864869a96a2dae60f2bbe1bd36bd61282aa5
 DIST shellinabox-2.20.zip 792359 BLAKE2B fd6ebde4d9f81314dd439126ad9ed6759556268c4af6dbe2094fb7aaef3956e8c484deb8c3b43a485bc28cf3a2c0105bee0f8b5c2efba1d3d7f0c0b6b3f6867a SHA512 0537b6400cb7f4880c76cce270e5eefd6f536eae7e27b5f7b12de0465a1e354f7980bb2f67230237eda1f7945afb1d3bb18013106bf7c3a02e7974532f0d9190
-EBUILD shellinabox-2.20-r1.ebuild 2696 BLAKE2B 1827477d2cc5b470ff9207200bdec0a7c07d3c1f7667eeaf442855df8046bb9cdd927f32ad993f1ad6ec10603798c4155291527023e75f72c2b5e7153d6c37a3 SHA512 470af184e4e1a98d2515e80025a57ba850609c52ad77d41130605d2c1d4be2b329353e93dc29f3437de0bb78d7a89a82375d071b176ed76e5c242f6a25d0b302
+EBUILD shellinabox-2.20-r1.ebuild 2694 BLAKE2B 39197dae01645b3f3fbaf0fbb1c46b4f3c5fcd960fb32c146af70daf2ca37a12e248f490f9d952b448ffd851121a38754f074efa39f97b12a47b6d25684c6a08 SHA512 325d00ec3c11c089550e72aaf31bc5bc6b60593348666f863d7cdfda6766b85f92f97ed77cc319b041779683d17d410c4628e0b635d45cb1e44dcd566df75233
 MISC metadata.xml 526 BLAKE2B 35b2638ace4b739a89974a6d9fcff93530172088c5a8ec49bff2f9949fd44220aeb8d1bffbed2d56b0550963625e99d52582926741517e612269495ca88242e8 SHA512 c9986b020184cb4393a1934b30dc2fce77ef6e926bd3f1f2f474adc201ae8302fe759c2b64e2775506b3ec0a097f10891490c39b9928359f31886d7818c8b64d
diff --git a/www-misc/shellinabox/shellinabox-2.20-r1.ebuild b/www-misc/shellinabox/shellinabox-2.20-r1.ebuild
index 11203d1d18cc..402d2b3c081b 100644
--- a/www-misc/shellinabox/shellinabox-2.20-r1.ebuild
+++ b/www-misc/shellinabox/shellinabox-2.20-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ IUSE="+pam"
 
 DEPEND="
 	dev-libs/openssl:0=
-	pam? ( virtual/pam )"
+	pam? ( sys-libs/pam )"
 
 SIAB_CERT_DIR="/etc/shellinabox/cert"
 SIAB_SSL_BASH="${SIAB_CERT_DIR}/gen_ssl_cert.bash"