gentoo resync : 28.04.2019

22 files changed, 301 insertions, 51 deletions

diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 3b3e3b152aef..b01c225ec647 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/buku/Manifest b/www-misc/buku/Manifest
index 6545103454bc..68191cc3f861 100644
--- a/www-misc/buku/Manifest
+++ b/www-misc/buku/Manifest
@@ -1,7 +1,7 @@
 DIST buku-3.5.tar.gz 93634 BLAKE2B 55c4b50b3bf8121c116554613768cd836080b363d702469eb2f76349c26d8d6246f73746248123030c5657006e09a9f72242354ce3af20d93b845f1870929bbc SHA512 b9f70665c83033ca030302e805ee051a524b2f0decae6c99ad54749b4a4bc91ae8261976018741361489525f359ea71c01ddb3e2d827ab9a052fb0acc98be8ed
 DIST buku-3.6.tar.gz 92012 BLAKE2B a92f45810acfb11493ca4c0ff75c57b81064627dea632bdf55ab5e33618e2721163ba0dcaa95d8cbec579605bc714d24ef894de10f4a10f3bf6ef5eb5aa42cc3 SHA512 77fabec93e85d6b6d5dbc0a3c4d095f26093f1d86aadb2a3c961a3947ac1c59acac69c94f732d30daec9943728e35d5e08bede1f0448c02d2db9136fe426186f
 DIST buku-3.7.tar.gz 98970 BLAKE2B 7227b5fb632d9ec92ef236d1889f2ba0872d67d2c3cfb302beab48b03e8d62a762d02e517014d5041a9f79deab74d0f5ceca12c315eb77922f73d359b58a48b5 SHA512 c515e11686aa8888231ffc8c1d6ec29d6143f1714eacdf640d8d3d3fa3fd469e111073762a3ba831dd673d63034afe3db181ec66501c18165e8ddd97cbc57c82
-EBUILD buku-3.5.ebuild 1055 BLAKE2B 056c83eef151c876f6cd0c21f7b5e4e864158dea22caf028cc98cf9c80f4c64794ac2363cc426e6e111197c808b39d5d59563b985c15276e065736a8de0da79d SHA512 80cf1ee215c3f7259f33fe903cb19a3786719d9b24943669e5a6384b30a381ef573c59ebc4812f096982f2afbe190710bd6346731b251ca6a21cfc0fc1e1bf4a
-EBUILD buku-3.6.ebuild 1055 BLAKE2B 056c83eef151c876f6cd0c21f7b5e4e864158dea22caf028cc98cf9c80f4c64794ac2363cc426e6e111197c808b39d5d59563b985c15276e065736a8de0da79d SHA512 80cf1ee215c3f7259f33fe903cb19a3786719d9b24943669e5a6384b30a381ef573c59ebc4812f096982f2afbe190710bd6346731b251ca6a21cfc0fc1e1bf4a
-EBUILD buku-3.7.ebuild 1008 BLAKE2B f4a6b1ece41f5f046e7c885cb80573ea80fda8655c9f9d8848f9339ee8884e5c350870becaba1e09539418b410f455ec7d02e9d1bd48b94e0989f42e0c58e99e SHA512 5b3e8940a6d50ba3851dda18527f3818095ceddec0cf5ba38a47b74334ca30bedb581c8303816d8ae86c6b20a3d34c2089402e6d90d56dfc28cbdd8f470990c1
+EBUILD buku-3.5.ebuild 1050 BLAKE2B 390057e137c762244ddbd699550412503143c13faeda856d434fbaacd25339d6c193086f460bfbd525402d878eb90166789cbe2a549b3a76ac37d50ce4855ea8 SHA512 792e2331f1ef77dc973682dacb54762f5bc9f526162823078212cbae4c969fea44fa671bc8a785f3fd47a68421eeb685bae4b5d52e18916bdd510112f912925e
+EBUILD buku-3.6.ebuild 1050 BLAKE2B 390057e137c762244ddbd699550412503143c13faeda856d434fbaacd25339d6c193086f460bfbd525402d878eb90166789cbe2a549b3a76ac37d50ce4855ea8 SHA512 792e2331f1ef77dc973682dacb54762f5bc9f526162823078212cbae4c969fea44fa671bc8a785f3fd47a68421eeb685bae4b5d52e18916bdd510112f912925e
+EBUILD buku-3.7.ebuild 1003 BLAKE2B 7014afc40d046d7d7f14736c5090bfada86d0292c120ee7f3abf33a8c2d492d3428a10beeeb25f3539853328684cd5dd003ae02c1988e8a548b2dd087584dd47 SHA512 6b41ed965b0cc0e9f2a77bd604fd615555b974e5faf3e4b0d731da2fe4e13f6bd8438c35326c3de6eb13193d4f8ccf70c2471c34b3345cdd8c74b2ca24ad1a15
 MISC metadata.xml 441 BLAKE2B 93ab0c34611cf0762ce76f03634d649ab3a7c0d9c3bdbcdcbd3dad1f228f72b522df12eae7731689d7848a7ad647330bfc26202fd8099ac57e98ce73bf1bf6cc SHA512 5f00313957370e1b01d486b6712b232b33bc408884a627df3ba337197208c08cdb8c334699993b65afb2ff598ca7c7c857622442dd46bcd8e3411493b6599f7b
diff --git a/www-misc/buku/buku-3.5.ebuild b/www-misc/buku/buku-3.5.ebuild
index ec2ba66f777d..4c586ac6b8d0 100644
--- a/www-misc/buku/buku-3.5.ebuild
+++ b/www-misc/buku/buku-3.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/www-misc/buku/buku-3.6.ebuild b/www-misc/buku/buku-3.6.ebuild
index ec2ba66f777d..4c586ac6b8d0 100644
--- a/www-misc/buku/buku-3.6.ebuild
+++ b/www-misc/buku/buku-3.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/www-misc/buku/buku-3.7.ebuild b/www-misc/buku/buku-3.7.ebuild
index ea918b0c806b..5534cfafa74e 100644
--- a/www-misc/buku/buku-3.7.ebuild
+++ b/www-misc/buku/buku-3.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/www-misc/monitorix/Manifest b/www-misc/monitorix/Manifest
index 307069572903..b2e7a0b17b50 100644
--- a/www-misc/monitorix/Manifest
+++ b/www-misc/monitorix/Manifest
@@ -1,8 +1,10 @@
-AUX monitorix.init 659 BLAKE2B 2e27776bc3b992b2962aabf315f6baebd4c316fcd228edfaeca174e6d48d87a7d45ced4837aa49055f02ebaf52042c429ada3acb6a8132310f66955c033ca663 SHA512 a33a62d698ae799d444bb8cc30b452ff78541fd7d721428e82943fb6cb898d84aa276b75fa069aa010ae712dcdba587ccd4ca6a211c87e36bb7674bc716f4fb8
+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 35b2cab57552086a6afc6e4709895be971504862e54bc7471272667eb02e70419148223a55557e6544538bc98ac1cbef032d0302e58eb49ad8cdd81e700c155b SHA512 d62c3705ac13ced472111d12cf5538bfed90e48613e254b07a6d374c62a8c0bc54eb6a8ca9364900016c32c63c739a3617242f04f2f18593e55ead51ab3e4a70
 EBUILD monitorix-3.10.1.ebuild 2758 BLAKE2B da5f92b0af54a146ad093fb2674b0aa332300835949d0a95bdbe6ae7eb9cbe4acdef5d7e316c4cbe2dcd49feaf3c22c25968a93ecca548d224031359d3717b9f SHA512 3a86040d73c2fa23ffaf2f5d43bb10a97b4cd1476bb6cac091e99814915adcb002e9bb7dec56a4cb09bf3500b08d1cb9f608c4ec5384f3406b5ba9e489ede6cd
+EBUILD monitorix-3.11.0.ebuild 2853 BLAKE2B 2f68d7a79ce9ef90aef5dbecfd6ef966b49a8ccc4115b5e005658b1632ed38537e9fecdd310fb0ed9808b330f2fd101a1cdb6d8fc2d59442ea105b85db6fece2 SHA512 0b5829d46b0b13d071649a2270b4bdb41ba3f9bddbdafac6a092fe89dd55ddf80c052d44073bd984e4881135af38500390ee9e91c48d1a7645c033d0c32b3a9a
 EBUILD monitorix-3.9.0.ebuild 2653 BLAKE2B 1231d79709465b94d2208a8497c993e1fa365b58433241d05dc0103b68bdf1385c41e5e37420663f4828390387e7b4fe0322c04407e273083f79226141bb1b65 SHA512 57f7b6aa48943f9f17c9f060dcc29dc505ad57b42378bfa108a9a8a44da6188049f9dd79d98f2e3adff12ec5f84dc16638d8511a6432a68c10e7d64df8290735
 MISC metadata.xml 860 BLAKE2B b5d8f4fcdb15dde12eac4eaa3aefe7b9ef83db36cfdab10cdde772b954ff52163b8d29c807feda524d862a0e244d52cd7d864fe8b992ba0b0ed5c35ca7fe184a SHA512 558f8c284a4045bbee9bdd149a85edc7d02e80f4de4e7f4610c1421d103bebc534e7e2bbf28421e20e7bc7b708b15ca3fd5b159cae6fbadff00b1b74dc00ebf2
diff --git a/www-misc/monitorix/files/monitorix b/www-misc/monitorix/files/monitorix
new file mode 100755
index 000000000000..389119e2e552
--- /dev/null
+++ b/www-misc/monitorix/files/monitorix
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="Monitorix"
+description="Monitorix is a lightweight system monitoring tool"
+command=/usr/sbin/monitorix
+command_args="-c /etc/monitorix/monitorix.conf -p /var/run/$name.pid"
+pidfile=/var/run/monitorix.pid
+
+checkconfig() {
+    if [[ ! -e /etc/monitorix/monitorix.conf ]]; then
+        eerror "Please check that the configuration file exists."
+        return 1
+    fi
+}
+
+start() {
+    checkconfig || return 1
+    ebegin "Starting $name"
+    start-stop-daemon --start --name $name --pidfile /var/run/$name.pid --exec $command -- $command_args
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping $name"
+    start-stop-daemon --stop --pidfile /var/run/$name.pid
+    eend $?
+}
+
diff --git a/www-misc/monitorix/files/monitorix.init b/www-misc/monitorix/files/monitorix.init
deleted file mode 100644
index a614bd0bd4a1..000000000000
--- a/www-misc/monitorix/files/monitorix.init
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-        need net
-}
-
-start() {
-        ebegin "Starting monitorix"
-        start-stop-daemon --start --exec /usr/sbin/monitorix --pidfile /var/run/monitorix.pid -- -c /etc/monitorix/monitorix.conf -p /var/run/monitorix.pid
-        local i=0
-        local timeout=5
-        while [ ! -f /var/run/monitorix.pid ] && [ $i -le $timeout ]; do
-                sleep 1
-                i=$(($i + 1))
-        done
-        [ $timeout -gt $i ]
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping monitorix"
-        start-stop-daemon --stop --signal QUIT --stop --exec /usr/sbin/monitorix --pidfile /var/run/monitorix.pid
-        eend $?
-}
diff --git a/www-misc/monitorix/monitorix-3.11.0.ebuild b/www-misc/monitorix/monitorix-3.11.0.ebuild
new file mode 100644
index 000000000000..efb99c9012a7
--- /dev/null
+++ b/www-misc/monitorix/monitorix-3.11.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+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
+	# 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
+
+	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/profile-sync-daemon/Manifest b/www-misc/profile-sync-daemon/Manifest
index e6dca4331e88..a49897d72947 100644
--- a/www-misc/profile-sync-daemon/Manifest
+++ b/www-misc/profile-sync-daemon/Manifest
@@ -1,4 +1,8 @@
+AUX bad-substitution-fix.patch 476 BLAKE2B b7ff1d56a41c29a53c3650db1407707b611597a35c7219d74320be278bac01a5a7e0458c10dfc95f728a58d98c520766b4c3bb86a9a726ddd9da95bc7655e719 SHA512 cfb61ab20ee6f19d596366eafd6557bec31a74754ad03b840aa14073af3c66ccd7de187d49107e3c1ad19bd38fabdbf3558703ece43fc6075fbef1c3643d1a21
+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
 EBUILD profile-sync-daemon-6.31.ebuild 782 BLAKE2B 9ac819f8a4f964d86bfb11f919c086ba77c6445f4f15ab095b3f2ac58373abf21f9df941ab4418cc928e5f0c601f996575db3a0401776743070d8a3d30187f29 SHA512 ac66b9cdb4d98afbaa3adc012a0acc282f2062ee6146d2cccc74bbb2c350f0650d7b8b34e55f7dbed66b9c4d50de4a53b138c97b210f527ff43d76705a0e9af4
 EBUILD profile-sync-daemon-9999.ebuild 414 BLAKE2B 2d75908e1931749dd2c4681076ae33e01e05454a2817903f25ce5ddf591c1f2d28184271036d0d6073268a8e0c7faea5648416b9e594e10ff0f7c6ddd03b8612 SHA512 320f2c02f049c099bac9f319e8725b98b36e597357729e95ef70be6f42ccfef17fae32a7bb55826cf46bc72056b662af7573055dae67d1c725db0d7c020d233b
-MISC metadata.xml 260 BLAKE2B 220a2f95bc7bde461342a6a7473f3639cc87564372edede01a4505a0aac38878320bbe26c37201c1c241b3f4e99847779d8e9a5d10a97cb789d7b50dd6b00cb5 SHA512 a5a602103d5329cac407769e8b94240601f1905c81ce7cd1de78f19a304eb97e05f17d838acdd983304306405d0ccaaebf574cd1549cfc2e35b2345629b60087
+MISC metadata.xml 454 BLAKE2B 6869a276397639246163d2a3e503b196390e3c52c00f8545ddd8d16257b93328bf14324b553b42fc17986cb9058ffc41325cf5f5c30da844aea41bac6212501e SHA512 7174ddac618332b4e0904a293c15a4b6ea2beb93e004ecdc454d2927958e2504df0e17069cc5577a8047e072b90bd6aa94af9634cb12ab075a31c9658efb81d6
diff --git a/www-misc/profile-sync-daemon/files/bad-substitution-fix.patch b/www-misc/profile-sync-daemon/files/bad-substitution-fix.patch
new file mode 100644
index 000000000000..7551b08157a6
--- /dev/null
+++ b/www-misc/profile-sync-daemon/files/bad-substitution-fix.patch
@@ -0,0 +1,11 @@
+--- a/common/profile-sync-daemon.in	2015-07-29 16:57:24.000000000 -0400
++++ b/common/profile-sync-daemon.in	2017-07-25 21:35:59.209639588 -0400
+@@ -581,7 +581,7 @@
+ 				# check that the LAST DIRECTORY in the full path is unique
+ 				unique_count=$(echo ${DIRArr[@]##*/} |
+ 				sed 's/ /\n/g' | sort -u | wc -l)
+-				if [[ ${#DIRArr[@]##*/} -eq $unique_count ]]; then
++				if [[ ${#DIRArr[@]} -eq $unique_count ]]; then
+ 					# no problems so do nothing
+ 					return
+ 				else
diff --git a/www-misc/profile-sync-daemon/files/openrc-path.patch b/www-misc/profile-sync-daemon/files/openrc-path.patch
new file mode 100644
index 000000000000..fc2d51b872d4
--- /dev/null
+++ b/www-misc/profile-sync-daemon/files/openrc-path.patch
@@ -0,0 +1,13 @@
+--- a/Makefile	2015-07-29 17:57:24.000000000 -0300
++++ b/Makefile	2017-02-02 15:08:06.720017266 -0300
+@@ -64,8 +64,8 @@
+ 
+ install-openrc:
+ 	$(Q)echo -e '\033[1;32mInstalling openrc files...\033[0m'
+-	$(INSTALL_DIR) "$(DESTDIR)$(DOCDIR)"
+-	$(INSTALL_SCRIPT) init/psd.openrc "$(DESTDIR)$(DOCDIR)/psd.openrc"
++	$(INSTALL_DIR) "$(DESTDIR)$(INITDIR_UPSTART)"
++	$(INSTALL_SCRIPT) init/psd.openrc "$(DESTDIR)$(INITDIR_UPSTART)/psd"
+ 	[ -f "$(DESTDIR)$(CONFDIR)/psd.conf" ] || $(INSTALL_DATA) common/psd.conf "$(DESTDIR)$(CONFDIR)/psd.conf"
+ 
+ install-systemd:
diff --git a/www-misc/profile-sync-daemon/metadata.xml b/www-misc/profile-sync-daemon/metadata.xml
index 9fad3221afac..aaa0192550e1 100644
--- a/www-misc/profile-sync-daemon/metadata.xml
+++ b/www-misc/profile-sync-daemon/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>jeffrey@icurse.nl</email>
+		<name>Jeffrey Lin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">graysky2/profile-sync-daemon</remote-id>
 	</upstream>
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
new file mode 100644
index 000000000000..11e5f93ac552
--- /dev/null
+++ b/www-misc/profile-sync-daemon/profile-sync-daemon-5.75.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/profile-sync-daemon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="systemd"
+
+RDEPEND="
+	app-shells/bash
+	net-misc/rsync[xattr]
+	systemd? ( sys-apps/systemd )"
+
+PATCHES=(
+	"${FILESDIR}/openrc-path.patch"
+	"${FILESDIR}/bad-substitution-fix.patch"
+)
+
+src_install() {
+	emake DESTDIR="${ED}" COMPRESS_MAN=0 \
+		"$(usex systemd "install-systemd-all" "install-openrc-all")"
+
+	use systemd || fperms -x /etc/cron.hourly/psd-update
+}
+
+pkg_postinst() {
+	use systemd || elog "The cronjob is -x by default. You might want to set it +x."
+}
diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index 2606411598d8..adbdf2f3ebb9 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -1,7 +1,8 @@
+AUX urlwatch-2.17-fix-yaml.load.patch 675 BLAKE2B 39198576b888d72ab9a21a99430cc32e22a113104e54008301f6caa4065d0c143116e46ed217fd5661489f0759c07399e9ca4ad06d27ac781da8f5a84ef93552 SHA512 300742195fdfed34a39b22b724ae53b9ccaa27857250c91fa431a8270eeeebbfa3ce81b72f0482a5fbea1636aa5ec78a202757fce45a3b71edae4129c6cb756c
 DIST urlwatch-2.13.tar.gz 34312 BLAKE2B 6ac618d4f1f78b0a3f6d17dd2283704e8d1fc7173ce6d79fcf0f9177f48463a610a4c20d8483a4a9c22e56eca67730ef25982981f310ca8e9927e48e298a1b1d SHA512 5ca6ad3de54c2e1d63cb545ae0d213a4483ef175dad947be00994bc990d047c7aec1f3b0a8b23290672db940001a9cc31c919aa7d9c280ab4792299e2dba684c
-DIST urlwatch-2.15.tar.gz 36839 BLAKE2B a474d93adb4ef95ad5c44b7cee4a077dd744caf09c84ec64b2e9f04635505a8ffd422f4ba56cb2069571b5b4b1e1f7df4b7412a716b5738388a0c55ea831e050 SHA512 3390a693656a89e75836f713249261650c03e1dc1d1819d82872d35eead7f29844502073d8674e92e97a32e44180347928e5dfada814798984d11e1ff4f0ac40
 DIST urlwatch-2.16.tar.gz 42713 BLAKE2B bee95c808b8705135112646ed7bf42c6606d716f447394e69fbc3355d38597e44b3e94ac91c6c2304fadcc5eb7d35349e6d54601721319c39268583fa8c7c042 SHA512 ffa9245bc4b8631e3105b1afd4ed3c3f5585bc30cd56c7531f9c2d0e4d61e36b56db3a69d62f851bed5fba9c9c332034b1757d70b32f4a4b0607ae59ed6cf887
-EBUILD urlwatch-2.13.ebuild 1456 BLAKE2B 1d598c7f7ca1176c1d259f214f6fa96ab4fc2f79845837ea9ee50fe353e20bd9c95cb77a05af21648291426c5c13d3a1f523e499b45afdcbbf537091ee0e0b80 SHA512 949c500620ec76076dbe0a7218e95f383b1aedab5799064569efaa1df52818477dbac7a3604e0c0d71582ad171d28f7b2f10dd21a43fba564acf6d80e1bf007d
-EBUILD urlwatch-2.15.ebuild 1490 BLAKE2B 056ddec4a14a17793044cb1bc8019467ca51d21d370458662cdf4e991d615862aaf7737582b02e6fd41a39e2c557f19a071ac7be54e1e0c4afa4296ad2e79589 SHA512 32131157fa3668eee2ac5fa5eaafd6b0cba532639d6d35151b92926d16b4c84aabb6ece38b246b778c25b4e00f8dfebf174fa75a9a5848bf57c671e1234a73df
-EBUILD urlwatch-2.16.ebuild 1530 BLAKE2B 7a200665942d25e0167d1c437c947941bba8d65b16059f9a247af60212a7635ecb98c72f8f4b14acb05865a91814882d6c4cb588bab41393063e0871a10adc50 SHA512 3b540101f4ad8e88016496c94241bdffdd9b4923e79496b6294881ad098eb8c20d77a3431ed02f41be7f944b422c7bf6e37a1fe2c1e1ee2ee8cb43db57fd7330
+DIST urlwatch-2.17.tar.gz 44178 BLAKE2B 46163b3305a50c3b5165da8f794c252aeb0a3581f16ba04cc1f0d920066accd02f7eba47718012e2ac0071f6bfa31019777a28840179a28a7fe365ae2e8f1d2c SHA512 635bca7e55641dd73447f5ec9ad429539decfaa8a1c19ab073c3bd46acfc518fa6012d855e0c37dd78654da28acf1446f580def611bcb85ae94fe13f567e3613
+EBUILD urlwatch-2.13.ebuild 1452 BLAKE2B 2079320ef673d4164ef5fe6dc1716caac14a23743081b62460106bb857200d5a14792e940ece3aeacfdcc975fc821f0ad0ff758c4c55a38be47fe6f01f1e5e8c SHA512 0bb97cb1f13d18528a6b1a0c5cf2d2a74e749c4af3f4ea4270fabf400a72b7ef16d7844a8e4632b2fc50bcf4f365bdd1867b04407e9465b6b497b7c85f9c8a62
+EBUILD urlwatch-2.16.ebuild 1533 BLAKE2B 4cc32bb54e9855766e07629ba4a94665fd0c4681cff7070b3a886151dcf1d5b8c7a0805db88ac6b84f57b98e7dba7d1f34ef505c33c275e265275a8747ced38c SHA512 b924226b5839f8db9b6cb3b1224fe304ca87916f461d23034520b9996a846fe6b6dbfa78eccfe6e45d00ad102d152c3785cefbc10a4e6a5601143b9de530e615
+EBUILD urlwatch-2.17.ebuild 1625 BLAKE2B 1cbb5fc13dac5c33a73a7905a2ff9e289a64730bf866b0baa3b0399d950cad8bbc7846bd1a6b26fb2a5a5a72e4540f94af1a554c9f895adfa844e47082b776e3 SHA512 928797d697d8666faf1d3ec8d4ee8fadc5b2150a64d3519e75788b99627fdb00afd6362e12d63392eb6092bf8dd0c76f10e6d9ecc7065bf6b6758f27a5224212
 MISC metadata.xml 540 BLAKE2B feb952d37175ef6a6ec17ae6ff1751d031cd14e3e8d98d5b6cdf44074c05068a1a6ce88b9447fdc0a8dec18f37f7d07232072ba81dd0ce6401a106e5e508cb92 SHA512 7c79bc952f7be46983f83c1f357f013df14d87f906df3a3e0f8690c32d296945729ebe9f95838d6a3c3c1e85b4fc8dde20b0ef12037d17967119e4cbaf652f2c
diff --git a/www-misc/urlwatch/files/urlwatch-2.17-fix-yaml.load.patch b/www-misc/urlwatch/files/urlwatch-2.17-fix-yaml.load.patch
new file mode 100644
index 000000000000..c8bd04ae932f
--- /dev/null
+++ b/www-misc/urlwatch/files/urlwatch-2.17-fix-yaml.load.patch
@@ -0,0 +1,18 @@
+commit d00041bacd6343cadf29c3d0a98817a7b9fda2a1
+Author: Louis Sautier <sautier.louis@gmail.com>
+Date:   Sun Apr 14 14:49:24 2019 +0200
+
+    Fix YAMLLoadWarning in tests
+
+diff --git a/test/test_filters.py b/test/test_filters.py
+index 3402616..da2393b 100644
+--- a/test/test_filters.py
++++ b/test/test_filters.py
+@@ -33,6 +33,6 @@ def test_filters():
+         eq_(result, expected_result)
+ 
+     with open(os.path.join(os.path.dirname(__file__), 'data/filter_tests.yaml'), 'r', encoding='utf8') as fp:
+-        filter_tests = yaml.load(fp)
++        filter_tests = yaml.load(fp, Loader=yaml.SafeLoader)
+     for test_name in filter_tests:
+         yield check_filter, test_name
diff --git a/www-misc/urlwatch/urlwatch-2.13.ebuild b/www-misc/urlwatch/urlwatch-2.13.ebuild
index feaa87c4b5e4..5d7b14fea6ec 100644
--- a/www-misc/urlwatch/urlwatch-2.13.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.13.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 inherit distutils-r1
 
@@ -19,7 +19,7 @@ RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
 	dev-python/keyring[${PYTHON_USEDEP}]
 	dev-python/minidb[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-5[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 "
 DEPEND="
diff --git a/www-misc/urlwatch/urlwatch-2.16.ebuild b/www-misc/urlwatch/urlwatch-2.16.ebuild
index be9149902a11..fd8b473177eb 100644
--- a/www-misc/urlwatch/urlwatch-2.16.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.16.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	dev-python/keyring[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/minidb[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-5[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/www-misc/urlwatch/urlwatch-2.15.ebuild b/www-misc/urlwatch/urlwatch-2.17.ebuild
index 5452ea80508e..240d4e646a36 100644
--- a/www-misc/urlwatch/urlwatch-2.15.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,6 +17,7 @@ IUSE="test"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/cssselect[${PYTHON_USEDEP}]
 	dev-python/keyring[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/minidb[${PYTHON_USEDEP}]
@@ -34,6 +35,9 @@ BDEPEND="
 
 DOCS=( CHANGELOG.md README.md )
 
+# https://github.com/thp/urlwatch/pull/382
+PATCHES=( "${FILESDIR}/${P}-fix-yaml.load.patch" )
+
 python_test() {
 	nosetests -v test || die "tests failed with ${EPYTHON}"
 }
diff --git a/www-misc/wsmake/Manifest b/www-misc/wsmake/Manifest
index 467af84045ff..02602c57d8b7 100644
--- a/www-misc/wsmake/Manifest
+++ b/www-misc/wsmake/Manifest
@@ -2,5 +2,6 @@ AUX wsmake-0.6.4-bv.diff 257 BLAKE2B bc346eb93541ab6e5a66b9fa69abbd3614492e23f2b
 AUX wsmake-0.6.4-fix-const-va_list.patch 781 BLAKE2B e73ff7c6c7fb2edd44c0d174ac3a738fe4aab3e15622eec5e6e3c3d7eb68a700b733548ab0c1e06f5304c092ba0813915b4ad2836c6b18c63418934b581f05ec SHA512 ceae38c3fc09f8e88d4ba9eb64467df5266b8332b365fe217354bf362343fa074e1e4407303d93de7f82b444a02f79d719dc0173156254501eba9144975f6867
 AUX wsmake-0.6.4-gcc43.patch 771 BLAKE2B 0eb6b683f2a50a3f7e65175fa4de9100109733e924d9a846fdeaaa0f80f8bb50f48f2750f798aa1160db8e0e8f1b188e83f6f214c5419930d62712de52d17817 SHA512 d155fd9b7bfe27bff396c2adaad39b9bcaa876d5a5b7dc77d0bb6932e548a65b088f79c36570036c7a06b1f1ae3d433716e696f57cea1bb74ac4fdb48fb9bee8
 DIST wsmake-0.6.4.tar.bz2 351688 BLAKE2B 4e810b1b5f697bc8a7bbb27a4023ff50f90fbcab5f9bf7890277ebb95d5fbf90cfaad51f181c4a76bd532f802fd4eaf07dbab6757a15ee242f80dbef19ce0b08 SHA512 0f5d125053222c624f9c19f4147f0d97311acb11050e09112ae7b13175ea64d0ba75942c5772e2ffe12d2913cea370ed663d7cb649eef67e0f8379775a3459c4
-EBUILD wsmake-0.6.4.ebuild 710 BLAKE2B 1ce9095841329b095e4a89a7a1194d32b2f318314bc06906440f71c573b9d7603ad66ea08d734fb232615de0ab29cb6a0ec0666911b7cf45d7bf49fd93aa290a SHA512 8a6a731562dea404f639ef6d7f8597a86061d1bc260cdfc5e0aebe6b0a218eb36503e66081cfcd63bc3368e45961338052c68d68a8b4280c5feab63dd5fdc512
+EBUILD wsmake-0.6.4-r1.ebuild 834 BLAKE2B 8729e8bf22b158b3e07d2e768809a69ed3ae665296c14e9fdb2bfbf3901f7096ea60462bd8c1758684d0ba2ec884a27d6462bf0e20b511a95da59295214a3ef6 SHA512 10ce56021d99d80fe4ebab6efecef14a72cd884d1b7c736c7cbf87f7d9227b3671cdea38c22139efdcdcdb28ec79ae20d8343fa11269c7b38325b56395df0937
+EBUILD wsmake-0.6.4.ebuild 756 BLAKE2B 2496884ecab4c2ead35415e30da6e539d069d58d27917c38be6d33aaf7be55a8c9f2f926f7f7c4ee86616b6a02f29a2d463e2cd6574849bb4b85222964f1dbfc SHA512 8490fb98588e666d3c33a7f061f9bd7b4f529165b157d02b4b51a23ec3d6f6581234625b58f0b6c16aa93db3b0178793c370309b7e9345f570a690439a176dd4
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/www-misc/wsmake/wsmake-0.6.4-r1.ebuild b/www-misc/wsmake/wsmake-0.6.4-r1.ebuild
new file mode 100644
index 000000000000..69070d300913
--- /dev/null
+++ b/www-misc/wsmake/wsmake-0.6.4-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Website pre-processor features tag substitution and page ordering"
+HOMEPAGE="https://sourceforge.net/projects/wsmake/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ Artistic"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="examples"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-bv.diff
+	"${FILESDIR}"/${P}-gcc43.patch	# 251745
+	"${FILESDIR}"/${P}-fix-const-va_list.patch
+)
+
+src_unpack() {
+	default
+
+	cd "${S}"/doc || die
+	tar -cf examples.tar examples || die
+}
+
+src_configure() {
+	tc-export CXX
+	default
+}
+
+src_install() {
+	default
+	dodoc doc/manual.txt
+
+	if use examples; then
+		rm -r doc/examples/CVS || die
+		dodoc -r doc/examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/www-misc/wsmake/wsmake-0.6.4.ebuild b/www-misc/wsmake/wsmake-0.6.4.ebuild
index 83c599488943..42834c03580f 100644
--- a/www-misc/wsmake/wsmake-0.6.4.ebuild
+++ b/www-misc/wsmake/wsmake-0.6.4.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-DESCRIPTION="Website Pre-processor"
-HOMEPAGE="http://www.wsmake.org/"
-SRC_URI="http://ftp.wsmake.org/pub/wsmake6/stable/${P}.tar.bz2"
+DESCRIPTION="Website pre-processor features tag substitution and page ordering"
+HOMEPAGE="https://sourceforge.net/projects/wsmake/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
-LICENSE="GPL-2 Artistic"
+LICENSE="GPL-2+ Artistic"
 SLOT="0"
 KEYWORDS="x86"
 IUSE="examples"