gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /www-apps
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
101 files changed, 1141 insertions, 1575 deletions
diff --git a/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r1.ebuild b/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r1.ebuild
index 99bffd1ecaf4..29567e33253b 100644
--- a/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r1.ebuild
+++ b/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r1.ebuild
@@ -38,7 +38,7 @@ src_install() {
 	perl-module_src_install
 	webapp_src_preinst
 
-	dodoc Changes INSTALL README TODO UPGRADE || die
+	dodoc Changes INSTALL README TODO UPGRADE
 
 	insinto "${MY_ICONSDIR}"/gallery
 	doins htdocs/*.png
diff --git a/www-apps/Apache-Gallery/Manifest b/www-apps/Apache-Gallery/Manifest
index cb0ee29f335f..c60228ecc65f 100644
--- a/www-apps/Apache-Gallery/Manifest
+++ b/www-apps/Apache-Gallery/Manifest
@@ -1,5 +1,5 @@
 AUX 76_apache2-gallery.conf 1442 BLAKE2B 4954ca3e1c250360e2877d0a8140b83a3a0bde0f9faa793ac1113d202fa65d20fb314129e18203a9a3d61b02d5bdd9a8560073843424b1cac1ee1a11b2649471 SHA512 fb9f2c7c8d3fc38501311cdc76141326fa96ff8f9a33e8b9e9efc8ee7208fcb6168981ded323cc7851ea30f1b9ff1db3541cdd1c71a4f2c99ce9cb280efc7900
 AUX postinstall-en.txt 90 BLAKE2B 9a72fe84537ed2c7f3e76f4fae32f5d80306a07e3904307ccbec32c76ec380f563e5bf6c2a6a8ef85c4df165d02396d173e75d9e9feb8afdbc4fe943c0b844f3 SHA512 3cecb9f07c69b20805a64e3184e3aea8e934d7ac7e42d53884268f7614780f25be524dafb25ae0d4ce1f9b1aed1fe88dfa27d98827182888fc36eb8301be0968
 DIST Apache-Gallery-1.0RC3.tar.gz 83891 BLAKE2B 69fe688ecea1f06a9e889c62a559916736d311591001c6a4762d78abd7bdfcf92739c341426fbc290b459bd83ba6a29685cdcd6296d0a273a1f114e75ff8ebb3 SHA512 00b95d3aed844c32a5d2cf8dc736e43a017dacfad5b73c65db4e35c2bb5fa05b7ae29af8ce5bc307e7b3539d94672031e7f1abaf150f15071272b0c1fa442062
-EBUILD Apache-Gallery-1.0_rc3-r1.ebuild 1279 BLAKE2B 7c3e16083603398b8ba884c108eb6b5460fff0e76cf0449b4a4546e2d61232c795537b364f100f4ede0cd414c3bdc0bbb0cd4c142cc0a4fbed7cec0e61ed4843 SHA512 f5ac4de17f5dcd36439159fb2b58216b25548ef27c1ede0895e517283441ee38e1bad1d6f1d42746efc6d4c9ea9a41afddd9102cfe66f506885047d6875cfe2b
+EBUILD Apache-Gallery-1.0_rc3-r1.ebuild 1272 BLAKE2B fd987dc997cba2f541e33d68ba4154413c28e26da327256fd5c3b6c96a24a555bc7434709b8e09027ac1dcc1c92db854c858ecf44892e2b2b8a04648ca77356c SHA512 eb61341b2b11ee67551b3c7bcdecbf3878768d76a7a90ee27aadb9980c02eefd586d07d7a0d26904a6ed8165f5e9e7ca401e869d7cbe5f67f9e040722c08a918
 MISC metadata.xml 250 BLAKE2B 856ff9793486ce226d86aeb43e3c5a75acf1fdd49936d52cf09e72669d2e956844d9087cf5cb67d4f04353d30be644bfc1daaa70b2ae332651f4bf71ae5c31e8 SHA512 8a7934e6db1aa1e0aba026a0438fb291819be69c134d54bb3af0638facc3e0a47bc30557c944bfaf5adbdd1dbdcbc96dec88d69ab809b1758e5701ff38fc6282
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index cbc5c39e1627..8b3372ec22c2 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/agendav/Manifest b/www-apps/agendav/Manifest
index 45ad8057fc30..0403af51ec74 100644
--- a/www-apps/agendav/Manifest
+++ b/www-apps/agendav/Manifest
@@ -1,4 +1,4 @@
 AUX postinstall-2.2.0-en.txt 522 BLAKE2B 5701bd5d06bf3c35953fbc62a7ba448138091d66025da2af6187c4325c9cbca412542c70f0aedb0b24bb46705934152a0777ac49810a02e2fdf5d7121a76394a SHA512 342598d5e9171ec4e838af51ae5240d321d33fd72bf23e08649fa88ce7fc03671cd656332f55c32d581ff578a90b03ab32756a551b5dd8204208319e4c982e7a
 DIST agendav-2.2.0.tar.gz 5313351 BLAKE2B 3d7f47900f0030c87fe00c187faee5c508cd740afee2a5021a38e2e2f3986207d324891fc71b53c6b8938684981933f29c7c3022179e90f3b9e5b19e2437df99 SHA512 4bf3c6152d69d8c58cea4e4377acdc30ef90d7d40946ad495715a34348051db8d2c20c60d495fb629dd9ad143836025082109c2102149ab143e98ad2ba4b191b
-EBUILD agendav-2.2.0.ebuild 1393 BLAKE2B 4fab8e14ed36162cc57c83a69149bbabfbe4eaa544cfc3c5625a12a86918711fb06f3651739e4a142ce4ff9efba1e5d6d938c6777a03273407b709713f2fb849 SHA512 d096259e0fc90c252494731b5b8806f1bec5f61a78cee9b56290ac606b183a1ba1c07495bc76f2c4f7bbff0d6c39c86172a79fda6f3bb00ba5a289d913403c76
+EBUILD agendav-2.2.0.ebuild 1379 BLAKE2B 2973940614770cb4c752cb2a067919f26bce4506f7a2848f1f6d831299647fda6731403da6c2835c1b8f7e3055dfafd93eab1d7b41c9c395c22bbc18daed5363 SHA512 9db67206b726e23b19532f5ccf7c15925b830aa5c0c72548a953bffbbc8b11bde6f94c5d6c626263e0f5f0fc9ac0144ce1fecfaaaadeb51986d6c800694bdd8d
 MISC metadata.xml 326 BLAKE2B 0755116594edad3309ee654710ae5e3df2172e730355ee4bb8e1c7ed1f9292565fb2c71a14307d8632a14011fe200a2e5582bb219a818ce2bcd99b73c008b1c7 SHA512 353e3ba7bcb34dbcc4a7f3ee7c282914b5744f796da8ae8e19ccdd7bf1d65110b3e41938380fb460485f47468b9ebef8c3bb24b6f82911dac5a454784ba1fbcd
diff --git a/www-apps/agendav/agendav-2.2.0.ebuild b/www-apps/agendav/agendav-2.2.0.ebuild
index ead4966a1fa6..80287540c33a 100644
--- a/www-apps/agendav/agendav-2.2.0.ebuild
+++ b/www-apps/agendav/agendav-2.2.0.ebuild
@@ -23,12 +23,12 @@ src_install() {
 	# fix references to the rest of the application code
 	sed -i -e '/__DIR__/s:/\.\./:/../../agendav/:' web/public/index.php || die
 	insinto "${MY_HTDOCSDIR}"
-	doins -r web/public/* || die
+	doins -r web/public/*
 
 	einfo "Installing main files"
 	cp web/config/{default.,}settings.php || die
 	insinto "${MY_HOSTROOTDIR}/${PN}"
-	doins -r web/{app,config,lang,src,templates,var,vendor} || die
+	doins -r web/{app,config,lang,src,templates,var,vendor}
 
 	einfo "Installing agendavcli utility"
 	sed -i -e '/__DIR__/s:/web/:/:' agendavcli || die
diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index 0dcaf2420988..b74a15174d3f 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,6 +1,6 @@
 AUX postinstall-en.txt 272 BLAKE2B 2042cf6fbf8d98ef144d19002c3498e4e5f6238b8d135066920ee999facf14a65ba3ed1269228dedbd7f17932a894c399379c19fcf2fccf648d7a7f30b0ffb49 SHA512 4f902e053ac38e313698269decfabe750ca41e255076972eb439f7c753dba50f09879e54df09768daf643da13c81a7bcd1f9bee834da9d29e91a5be88b38c740
 DIST baikal-0.5.2.zip 3426025 BLAKE2B ac13b42a3eab54e43761bd0ad958208b692919a61908a6467e710a045c6568e9ae616a54c6910b6828c4499b3f815bd96b9bee12608637b64182238725e21922 SHA512 58dd9e231840a76582a70abca89c8f73f1a26f06855eff6949ebca526a22d23bc06f281f51611aeb7f0cf8334c0ad490cfea962905e985d6c75e78e1c1d47e63
 DIST baikal-0.6.0.zip 3432758 BLAKE2B db55008e2e971fd8d6edabe38f333c32564ef34cf7f3a93ad9d67083646c9575cdf9ba1d51108c5fe9f5d385a53bd78d1406318f3a72672126b5f31cc032b104 SHA512 75cd3e30c3df4bc5057e14215b320647c9683702171671ed58ac83e12f7770454d81970f036fd96dbb9aefe0928fcf40ae11128687fd261a0dccadf15d148905
-EBUILD baikal-0.5.2.ebuild 1492 BLAKE2B 5f9adb109ed9b414ac1e277184da4fc97a66f9059a8b2ccca8516c347b12c4dba0ad5d971e67f21f5c4bb8059a99b8031e5042f53765296a98fd9193d842af2b SHA512 9a3daddbd9ff63e8a29a6fc15c4ba27cfc911e84465614c056a2dc916a967264e9e763391ed5fbc259ceb17d4254bd1b85d75e6e0c23905d4a73442371739f78
-EBUILD baikal-0.6.0.ebuild 1490 BLAKE2B fb5e57e270a8edcd569f53bc81d90f8db835f61c27eaac35d6dae1c849b6922bc8d7c8d7c36549794d6bc228e2bcd884cc7a131b64790012f3c65f1c3e3b6b6f SHA512 38851abca53f7cfb49a1d8800e4524a180ebdcba0596f0c498e65c76fa9f926e3385f71332b20b5a8c578267a80df3925d1ba09eb8a0516ddb5e5fd56f8976e8
+EBUILD baikal-0.5.2.ebuild 1447 BLAKE2B f098f29cd8f6600a63d8b054ba0cb86b765d387d0a76018276871c474af3e202c334273613af7ca1b4ee80c5e72957ba40f7013dec76c5c30a724f836ea5c42e SHA512 c9a0d359302be4aec041362e3f6e199256ed5b161f2ba499e31c0393e3b2f37c19193d5b3b1b283ca30b396623b835739a46d11191a9c35ebea74b47d6ce6c21
+EBUILD baikal-0.6.0.ebuild 1445 BLAKE2B 4877135b216b5027109f6cfc52a4cedd4dc6eb2302be2554c4d28510ff43b9b52ea1bfde5a61c1b460266a638fafaf77258e4486cd00dbcb0bcab407f53c4f82 SHA512 4ce8aba81566dd8b34df062bd45319506ceeb5f649110cba354cff451220aa6b8a7c2242947d734c028e49e3490396343a889f4ed1102e60c664ceacbe7ececc
 MISC metadata.xml 325 BLAKE2B 92c24f0b14c94c6666fe915eda815354af8f73d3f829ff414afcd4ff49b775191ee79ec9000718a795799060ccca8f10acf5ca27d861943ee5ac5c5a34d69ce0 SHA512 2b6f9ba13bbc4821f79703ba0fe5829b4ec30817b9571c05698d65cadbd52444bd3dcff42f0807f4fcdfc9269db6edb858bb0301a50546b0741929030bc196c9
diff --git a/www-apps/baikal/baikal-0.5.2.ebuild b/www-apps/baikal/baikal-0.5.2.ebuild
index a1de25422205..c44cf7d9ddaf 100644
--- a/www-apps/baikal/baikal-0.5.2.ebuild
+++ b/www-apps/baikal/baikal-0.5.2.ebuild
@@ -25,11 +25,11 @@ S=${WORKDIR}/${PN}
 src_install() {
 	webapp_src_preinst
 
-	dodoc *.md  || die "dodoc failed"
+	dodoc *.md
 
 	einfo "Installing web files"
 	insinto "${MY_HTDOCSDIR}"
-	doins -r html/* html/.htaccess Core vendor || die "doins failed"
+	doins -r html/* html/.htaccess Core vendor
 
 	einfo "Setting up container for configuration"
 	insinto /etc/${PN}
diff --git a/www-apps/baikal/baikal-0.6.0.ebuild b/www-apps/baikal/baikal-0.6.0.ebuild
index 7984fe26d1e2..76fe4e54b4cc 100644
--- a/www-apps/baikal/baikal-0.6.0.ebuild
+++ b/www-apps/baikal/baikal-0.6.0.ebuild
@@ -25,11 +25,11 @@ S=${WORKDIR}/${PN}
 src_install() {
 	webapp_src_preinst
 
-	dodoc *.md  || die "dodoc failed"
+	dodoc *.md
 
 	einfo "Installing web files"
 	insinto "${MY_HTDOCSDIR}"
-	doins -r html/* html/.htaccess Core vendor || die "doins failed"
+	doins -r html/* html/.htaccess Core vendor
 
 	einfo "Setting up container for configuration"
 	insinto /etc/${PN}
diff --git a/www-apps/blohg/Manifest b/www-apps/blohg/Manifest
index 876220404a44..1e4898c683fb 100644
--- a/www-apps/blohg/Manifest
+++ b/www-apps/blohg/Manifest
@@ -1,5 +1,5 @@
 AUX use-recent-libgit2.patch 724 BLAKE2B 393c488bf71af9a7ae89c53a64739a729043ba1408722e8b64636ca6e099d859c63c4421eb821b26a89423e8dfdfaca9c95fccffee1b76d50b25b0d772169580 SHA512 fab12807128e60d6c9105947ca313233ea00e8b81329d9eb92e5307d24f0ec7b1173de6d1b6b6571bf2e8ce4820dc8d7c1e5dac0a3dfed14157357532b99d1e9
 DIST blohg-0.13.tar.gz 75003 BLAKE2B 6b9760ffa99ca85a40e35c81341e395fdfc00256f5e80091c6883e54f050d4cf3f345c4752b635b1297d15e0055c182e00e74165451d695bb396c869c285646f SHA512 de8643e85e3f72827408d726bbe2f8674dcc6dcf1efdc47d33a934892071f8365cb54e63a6adb803361c7fd04032b2ac4e786c442676e8a8132b6d3221696865
-EBUILD blohg-0.13-r3.ebuild 1713 BLAKE2B 36f257e1b693901d7a20a283eb529ee13c79777518f117360d83593836601cde55c8609753ccfe33fd598ec032a6a5894b24513316bb8c0b38b1189567474f82 SHA512 97a4086d973f53a313adca71d283674a80679e2a822c1cc2d081754c8985388d58c1cd1e029984980426da097c7f1cedba9b1e37355c00c36ad259629d68188d
-EBUILD blohg-9999.ebuild 1648 BLAKE2B 17f1cb12c1e71759ef1954e9ab287eb970197519d586eea0262239b14c07aeb270a7402ced8ff74a96ea8b9c4e967bfc0ffc24aba9a4aceef86170d19a7dd231 SHA512 a2a1d8a11ff880bf5b0531a43e3d9bd11918fbed9262b77bfd3759aa0708036831fe0c1199612c6514eae3f7fb48b4a371f0b7ece8ac97afd3ec4591743a84f3
+EBUILD blohg-0.13-r3.ebuild 1737 BLAKE2B 04f1e8bc211894e6c1e8a02650f434150729c413164401a61fba903c430b0c97a1fa4f296c6f1f8fad7f1c0b15475b8731b4fd56e9feb3532aa45f6e5d512511 SHA512 2182b11e686e521a398531d713d36ad6524983c7e632b3e212b096c30ef8b8aa56c822c0da4809c10683507ee8f274bc7d8f1bc6ba3a869e3c534ada50d6a77c
+EBUILD blohg-9999.ebuild 1672 BLAKE2B 3fd775eb873d59fe296a26346778eaae5c9f03bad92bd0cee1f4f5c6eca4eff444c60fc7ef34d9f8302eacc539bc2add10d2561a20e14eb510b4922745808208 SHA512 b6a72c8a9043f3dd5fc8efb1557b45647b0938508ea123d5885d369fee29a4b3adfa05fd6ec1a4ef4a1ce782a248010e7ad386b3c9ff06871ceafef2889f5dff
 MISC metadata.xml 983 BLAKE2B b57921e5e260e283cc261200cefcba516918e21ab44ff009a5fb08c58036cd39263de239e65e20714bac823bd7d0c6889dbd0737904109af635809cd16ce2f55 SHA512 39e0799c5a6e685ea188c12b8e2ddd34178fce3630a0cb84308a66c710730e8aeaeaf23444e4f8091ec2adf6eb1da3ea7bf74e1df1adb3d5caa2205da99cc6f8
diff --git a/www-apps/blohg/blohg-0.13-r3.ebuild b/www-apps/blohg/blohg-0.13-r3.ebuild
index f9a9daaf2eb1..f30c7c0ad0b4 100644
--- a/www-apps/blohg/blohg-0.13-r3.ebuild
+++ b/www-apps/blohg/blohg-0.13-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,6 +26,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="doc git +mercurial test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="|| ( git mercurial )
 	test? ( git mercurial )"
diff --git a/www-apps/blohg/blohg-9999.ebuild b/www-apps/blohg/blohg-9999.ebuild
index f27bdfa76f24..03b42c18276f 100644
--- a/www-apps/blohg/blohg-9999.ebuild
+++ b/www-apps/blohg/blohg-9999.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
@@ -26,6 +26,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="doc git +mercurial test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="|| ( git mercurial )
 	test? ( git mercurial )"
diff --git a/www-apps/bugzilla/Manifest b/www-apps/bugzilla/Manifest
index ff3d6bcaa606..8a21000ee3b1 100644
--- a/www-apps/bugzilla/Manifest
+++ b/www-apps/bugzilla/Manifest
@@ -7,6 +7,6 @@ AUX postinstall-en.txt 670 BLAKE2B 1b04aee08ce7fa84e75590374397bf96e9cfd12c2f982
 AUX reconfig 349 BLAKE2B a733307066d91e2c4df0969a3bee5969df51bf72ef0a7a343cf453a804ac474c7d0dc7d43dd89e54a2ec60579824ce495e3062829c05583363bbbe6c1743569a SHA512 bde5c8b728d9f40a8c7b6ff4df683b415c82729ccb95f3652500f6b0274bf7e2471ced0480813765d9c682f43d7de3baac7ab5b27a9a25525393c5c13270b6b0
 DIST bugzilla-4.4.12.tar.gz 4931062 BLAKE2B 21d060d3a6bc8fd16d5a0283bb5c3735a473283d829be711e22b9d21fc203c8bd33cc9b940417480fa4b16dc478dcb3b526f305c324c97ccac7965b2820bea01 SHA512 51520cc55ae0fb30f8a8efb98e9b5a5a35ca74e9ec3667528fae6520fa7f12137e01948009b152481d0b8e02d435b42c3cacb5449fb42fe709964db68a386548
 DIST bugzilla-5.0.3.tar.gz 4069689 BLAKE2B 1be1d911b59a06f9073a2e610b88af2b1b62bda1e2ef812f65faf2fc35499cff20b96f29a522cf8478ed65c4de9008a349162159f180f59f79a380d777340548 SHA512 82334533bd75a4a5eee5213826da916175ecf39cbfd1c4d820519f015257b02998a3acd881f8f52c1650d1140158c8aa839e374574a1fa862a6a4a1351748c46
-EBUILD bugzilla-4.4.12-r2.ebuild 2890 BLAKE2B 6e341c1d9e004afd9a05cc100d5f768f07f4fe6b1197e8f148c6f0ba29487fcc60df67ba99dd08e2c07fd90288387905aef800729a39c37d0e16f1ab7613a197 SHA512 2997e5ad774ee4f2d32ee065d5db76c23fd388a583b2edc71f0881b53d70e9aad8ba903734c053e13edb940489c764d73130e3a408b10fff82b32a551fea1221
-EBUILD bugzilla-5.0.3-r2.ebuild 3068 BLAKE2B 72327afc24b2674142e883a294e6522cc864a613b2c575ea9feec602df2e3855c133b6084653bd6d8a21d17e2de955c9147c983f38de57c3997dbe597352317a SHA512 bc3bafce38c3886c36a6a4307dcb188ce00d75b2a102c539dcf06043412cac9a7cc688d01799b4ae7f0b1f4f147a3cd11ac7b4866e531313f040a80406157cca
+EBUILD bugzilla-4.4.12-r2.ebuild 2917 BLAKE2B e1bd86d01929f19131fd052bf5f1527845d5e86dc242f7278435344d2c5a1ed3ccb997bfbfb31a3a0c4ac646d3a2f556f439d9b4360310cf931744fd8c5ac830 SHA512 f6896109906b6e14c66cd11dda66faa0893727c06ae4350a7c7d8f3732e6babaaec875904ae2f855e74a430a88f07fae4084568d921dec20090358930f6e4223
+EBUILD bugzilla-5.0.3-r2.ebuild 3095 BLAKE2B b81fab65896c9e60f3cf027152ae3508f32f5739044500498d66c81a65cc1968db312cf20effd2d4edc8a31a329f179ab4b1d6e301b335e7ad587a1990ddac1b SHA512 aea25e485a74a2c4ac7600cee680b9e7183cf971bde09a9dd890ed3bcc18415d947c2769e9462b8cb4ae2d651727f92182d37083796e3e1cdab26dcea21611a3
 MISC metadata.xml 392 BLAKE2B 7988b93af36ffeb2841c4a7b3d4dbe41533347c3847d41a999e7b00ddb4e11cd738defe96a95a51c5b6f7416f2fbeaf78ea47f3eb3502c5d02f964d1e3cd8c3a SHA512 e0893f3ce807576e90bdddfbf8b19bd32665fa40b288d01126ecbc402d2867b512f26afb5a62e8ed3bd0fa9c749a7f0e2e90547db5f1078274b4e0653f1d0fc1
diff --git a/www-apps/bugzilla/bugzilla-4.4.12-r2.ebuild b/www-apps/bugzilla/bugzilla-4.4.12-r2.ebuild
index 9668d236f5d0..3a358f3a63b6 100644
--- a/www-apps/bugzilla/bugzilla-4.4.12-r2.ebuild
+++ b/www-apps/bugzilla/bugzilla-4.4.12-r2.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=6
@@ -13,6 +13,7 @@ LICENSE="MPL-2.0"
 KEYWORDS="amd64 x86"
 
 IUSE="modperl extras graphviz mysql postgres sqlite test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE=" || ( mysql postgres sqlite )"
 
 COMMON_DEPS="
diff --git a/www-apps/bugzilla/bugzilla-5.0.3-r2.ebuild b/www-apps/bugzilla/bugzilla-5.0.3-r2.ebuild
index feb026881ffe..22725b834dd9 100644
--- a/www-apps/bugzilla/bugzilla-5.0.3-r2.ebuild
+++ b/www-apps/bugzilla/bugzilla-5.0.3-r2.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=6
@@ -13,6 +13,7 @@ LICENSE="MPL-2.0"
 KEYWORDS="amd64 x86"
 
 IUSE="modperl extras graphviz mysql postgres sqlite test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE=" || ( mysql postgres sqlite )"
 
 # sorting is identical to upstream MYMETA.json, please dont change
diff --git a/www-apps/cgp/Manifest b/www-apps/cgp/Manifest
index ffcb3a1a9d67..bb9bdd01fb64 100644
--- a/www-apps/cgp/Manifest
+++ b/www-apps/cgp/Manifest
@@ -1,3 +1,3 @@
 DIST cgp-1_p20181209.tar.gz 139556 BLAKE2B 0a79ff1974b0ae50db5582121c4fdcc2db0b89ef11ecb001dfa525dd753481f0a454e424d17f24b142fd116a9ea2eeb4ba1dade6f2ffadd63943e5c065323224 SHA512 fcbf81fca2bb14ed143ea414c2f11fe09f4594891507a1ad08482720b104ec62c9986ce25b127d45a7962a8b3db54293a6775dc2359bde41f19b5419606b51eb
 EBUILD cgp-1_p20181209.ebuild 1274 BLAKE2B 4e4f86373415213c1b88cac4828de7144732481d48d72c81d7b4156e59847af341bebd94f3f9f8e26177c324756fd99edc6973921f78e6567fbfdf01280cc69f SHA512 76a6f6b6a889d53f84b783cd67f7b60f11e472e8564c4b5caa39e14506a922a72fcce400cafd4b81b35c5508808faff5acda55041c763b2c5d0dc02a34856451
-MISC metadata.xml 677 BLAKE2B 2085e266da1c26131975e252ac7f4e9d778b8d32c708e78cecab760775af5273d1b8cfed21141159178b4a5d4d516118934b40e6ceaa67fc4b98decc643dfaf4 SHA512 a31566e2a70a4819d03b18bb7fe5a951d53db2a354430e767a26bea62666fd7c7968c423e335dd4e5d7070537e5e062bad4f5567dabcf4d900d560cc6a30bbc1
+MISC metadata.xml 558 BLAKE2B a2ef24fdd53e577774517c18e6030b08a375cf342aa003fc2f82fa7c73065cd9703f67ba6a2113a6e605280a6239fc7eaeca8f5d0827d587bbfcc9e49b4dc351 SHA512 87e53979d5f382d585ba2c8dbe30ed21402abc270ecad1a6bcc1147aaf7ccf9aba8090c3acfde20fd23b4cf57b4c3621f8e863d9ce175564949619a3c7853576
diff --git a/www-apps/cgp/metadata.xml b/www-apps/cgp/metadata.xml
index 10b010911e42..d4ddafb5c088 100644
--- a/www-apps/cgp/metadata.xml
+++ b/www-apps/cgp/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		Collectd Graph Panel (CGP) is a graphical web-based front-end
 		for visualizing RRD collected by collectd, written in the PHP language.
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index 6c58e895b07e..2b50a785c014 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -8,7 +8,9 @@ DIST chromedriver-bin-2.41.linux64.zip 3944714 BLAKE2B 6f86f973c1768d549bbc57a65
 DIST chromedriver-bin-74.0.3729.6.linux64.zip 5065988 BLAKE2B e4c6bc2530f2cf8d033677d18978d93fba9710ead098c5ed455584154b73e9d734db32d9b3fd7f5500f3f32d4403f34fa448b37d3b96d3aecfc11dd9ac7ce54a SHA512 1f61f4940b557c4d74e540ff11770b3182941a11cc34783c97beab1afb5eb53806c958721da1a8249cb6a88c6cf40e7064ac9f94e7da1970d9c23a1188873c5b
 DIST chromedriver-bin-76.0.3809.68.linux64.zip 5231218 BLAKE2B eb4bd1f6bfe8f137ba6314fdfe6c132a989266f75af1870b6dae3ed9bee70d8a8145794798d273f971fdce0b311523972eebf88cc4ddb391195fc1985abe12af SHA512 18be867e96fce752a1a2974ade8a0897b19d4a3e1b971e751193e33a01211a96e0f835785817151405e7d3d4138f86d8104544ca2b72925ba5e38a14b45c72dd
 DIST chromedriver-bin-77.0.3865.40.linux64.zip 5425800 BLAKE2B b1b0ef7e4a6822838874fe5fa4bf7e24ef01f720a8cd62b2c748af20a6fa74bc34473d3fff1ef553f21437fb2ed592c7245253b781810da8987e6d730c6c027f SHA512 6463e76f00ceee66fd8037b38e9ce5699b6ec83c8f2fa43cb0d417fb4d8d1c92cf85168beb1a23a90c20abf20dcfd66dfe235dfb690730a8fd548ca6236eb8f7
+DIST chromedriver-bin-78.0.3904.105.linux64.zip 5528166 BLAKE2B 02cb41da4f04dedc8bdb1d6137c7646f03ee07861a3f44b51ba6547768645e90d4acdc0898d272be8337ef99d12ec2dc838778750ecf5d354224340664adedcd SHA512 fdbf9112b6e9d2e2e1fdcc4960ff5ea3a8ec4181a5afb273d5cf647193a7e9e439dc9643767e006e647d823bae524892d7b111be68165a03e9a3edb94d5c97ec
 DIST chromedriver-bin-78.0.3904.70.linux64.zip 5527671 BLAKE2B 41c29c580ed00a23ea31bd536399eb850b4978bbfb132895baeef24e6cc53b0e0ab1ad8095fb5de9dba2a4a09dd3c7641d76f704a7ffb556fe11810af27cd6ec SHA512 ec5844a1eb788d5b6649178f22702fbfbe49533d061dede19179c97c0e578d4240ccfce0e0a7b9e82d618585c8f32c96e540f8ccdb295bac787e516e26bc3887
+DIST chromedriver-bin-79.0.3945.36.linux64.zip 4875160 BLAKE2B b5f91702ea415dd65e7b5807ace37dd2c27cf77733383f97e46d4e12234afcde1642b6a814088122a5e893124e6c6cbe117b3dfa2a7cc9c97dfa6948df5c5995 SHA512 78c11beb107f4775d40dd4f28f713d6f3228930a5647dd7a5a824a6c9902364f8267e40812b4ca8dc3b849cb5adc3fb6c810146b29d29ed85e6e55e13c86ded7
 EBUILD chromedriver-bin-2.24-r1.ebuild 644 BLAKE2B 1827f95c6dd8fe6bf87da9252d5b16a894626201a8eb2e62163970cad4abc048bac8e012043aa0e791cac28736dae680cce014b4177d85b4f6268ca4525ab8cb SHA512 5b5d5a6e5e333e8e36b8041247581aa687b756a01068f98052aa0d2898d662178530171fc58bd1e82cd32bdd742c7d8ec334f6adee2606ee156a7d22f7ef5604
 EBUILD chromedriver-bin-2.30-r1.ebuild 644 BLAKE2B 1827f95c6dd8fe6bf87da9252d5b16a894626201a8eb2e62163970cad4abc048bac8e012043aa0e791cac28736dae680cce014b4177d85b4f6268ca4525ab8cb SHA512 5b5d5a6e5e333e8e36b8041247581aa687b756a01068f98052aa0d2898d662178530171fc58bd1e82cd32bdd742c7d8ec334f6adee2606ee156a7d22f7ef5604
 EBUILD chromedriver-bin-2.35-r1.ebuild 539 BLAKE2B d41fdf3b40b52c2904abdd9f98623a248456ba07e20297ab5e367fd316e26012a76cff0745971e80fbc7f9c93565f7d89be9371177fc8e40374eb1515f7d0ec4 SHA512 f23bdc20e88e733db2006b29c533636a3a3135ee2225e39e7f5d8b718444feb6cff5351b3b46a6dcc7a4b8328a3f269c0c3a87d8e7d8abe64756436afc1b2f6a
@@ -17,5 +19,7 @@ EBUILD chromedriver-bin-2.41.ebuild 539 BLAKE2B d41fdf3b40b52c2904abdd9f98623a24
 EBUILD chromedriver-bin-74.0.3729.6.ebuild 536 BLAKE2B 33443cfcfae910fbe0fffcb92137fcc80e754883d180316acef1629b3508752dd5917e717d5fd26c94fd41591a7d817bf4ac4b99b592deb0977eb5290a921db3 SHA512 4a5ff3ae076a62a748d51f7418e1d26ee401ff2f3da81f7ec42cbb21f357269912b54fcb7276fce3556f02ac68d05b12726e0748b020de28474f585e17cfe12e
 EBUILD chromedriver-bin-76.0.3809.68.ebuild 536 BLAKE2B 33443cfcfae910fbe0fffcb92137fcc80e754883d180316acef1629b3508752dd5917e717d5fd26c94fd41591a7d817bf4ac4b99b592deb0977eb5290a921db3 SHA512 4a5ff3ae076a62a748d51f7418e1d26ee401ff2f3da81f7ec42cbb21f357269912b54fcb7276fce3556f02ac68d05b12726e0748b020de28474f585e17cfe12e
 EBUILD chromedriver-bin-77.0.3865.40.ebuild 536 BLAKE2B 33443cfcfae910fbe0fffcb92137fcc80e754883d180316acef1629b3508752dd5917e717d5fd26c94fd41591a7d817bf4ac4b99b592deb0977eb5290a921db3 SHA512 4a5ff3ae076a62a748d51f7418e1d26ee401ff2f3da81f7ec42cbb21f357269912b54fcb7276fce3556f02ac68d05b12726e0748b020de28474f585e17cfe12e
+EBUILD chromedriver-bin-78.0.3904.105.ebuild 595 BLAKE2B 50a3893369b0bf26c1ac28cf30f6fceebc04096f4602d4a433c29fcae1a1dbefae0e159c95dbbebf8ca4fbb3fb78aedd5c3dd7ef7d5ac0e8c3c324e3d4c4f667 SHA512 ebd62f835d0aa6ab6a517b4b2084227969f2b087540984d46a5a1f67d235baa77f1e98c0f7e13cbbdb5bccaa106cf30a539c79e94e846e2d2e4fda7d624ae638
 EBUILD chromedriver-bin-78.0.3904.70.ebuild 536 BLAKE2B 33443cfcfae910fbe0fffcb92137fcc80e754883d180316acef1629b3508752dd5917e717d5fd26c94fd41591a7d817bf4ac4b99b592deb0977eb5290a921db3 SHA512 4a5ff3ae076a62a748d51f7418e1d26ee401ff2f3da81f7ec42cbb21f357269912b54fcb7276fce3556f02ac68d05b12726e0748b020de28474f585e17cfe12e
+EBUILD chromedriver-bin-79.0.3945.36.ebuild 595 BLAKE2B 50a3893369b0bf26c1ac28cf30f6fceebc04096f4602d4a433c29fcae1a1dbefae0e159c95dbbebf8ca4fbb3fb78aedd5c3dd7ef7d5ac0e8c3c324e3d4c4f667 SHA512 ebd62f835d0aa6ab6a517b4b2084227969f2b087540984d46a5a1f67d235baa77f1e98c0f7e13cbbdb5bccaa106cf30a539c79e94e846e2d2e4fda7d624ae638
 MISC metadata.xml 460 BLAKE2B 6da42de60f119a13f70f0a64f61f4fde912d15a7582b240631761e852b0db50bdb2f95102be05b09b1d653907b4c0a8a9641a9952cb6a7c1bd84d8f51ae1d83b SHA512 a8dfdafe46c651f3b06e0c004750747cfbe21e0ee704e5afd6f302c2ea61e288fad3987732b0e4b6ecec4805822c347f1d43a5e09e911e7d950196207eb81f43
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-78.0.3904.105.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-78.0.3904.105.ebuild
new file mode 100644
index 000000000000..d784d5e28ea9
--- /dev/null
+++ b/www-apps/chromedriver-bin/chromedriver-bin-78.0.3904.105.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="WebDriver for Chrome"
+HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
+SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="bindist mirror strip"
+
+BDEPEND="app-arch/unzip"
+
+RDEPEND="!www-client/chromium
+	www-client/google-chrome"
+
+S="${WORKDIR}"
+QA_PREBUILT="usr/bin/chromedriver"
+
+src_install()
+{
+	dobin chromedriver
+}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-79.0.3945.36.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-79.0.3945.36.ebuild
new file mode 100644
index 000000000000..d784d5e28ea9
--- /dev/null
+++ b/www-apps/chromedriver-bin/chromedriver-bin-79.0.3945.36.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="WebDriver for Chrome"
+HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
+SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="bindist mirror strip"
+
+BDEPEND="app-arch/unzip"
+
+RDEPEND="!www-client/chromium
+	www-client/google-chrome"
+
+S="${WORKDIR}"
+QA_PREBUILT="usr/bin/chromedriver"
+
+src_install()
+{
+	dobin chromedriver
+}
diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest
index e7f8cfe016fa..f481f767e7c0 100644
--- a/www-apps/davical/Manifest
+++ b/www-apps/davical/Manifest
@@ -1,9 +1,6 @@
-AUX davical-1.1.7-fix_php4_style_constructors.patch 1364 BLAKE2B 4e4217fcb0a096f6020f0fb35eb800f52e349b8b4a4540ce19d7395d924926d8bda4f3c835311b95f2f2f3719289c71873b69d60d950254f37c82cb7e04e29c3 SHA512 3d971649f4fabf40b6683917d111f4cd374d6f01b98ffb8502030ff63e3b36e667a969c67e457f415a053b546e0362b128f1632e668f7eb2421832b86bf3cb75
 AUX postinstall-en.txt 201 BLAKE2B 4e4ff030cb8031785d62b17e83b7bb2e40124466081b407e7638cb41a9045cb478f8e71a2122005668047620a7fff644a0ae069b924709139ac6d87edf527e57 SHA512 a35c6e0700a047d39f5f685c5ef9453a430cc871f3c965b859dfbd9564953e2cb7ae6dabe59e4efe23fbbd971500c20c1d7174398d9e8e66cdc4d3ccc03ac988
 AUX postupgrade-en.txt 218 BLAKE2B 83d752f4a76637ac90d65b7c458c7dadb44a2d5ba496419ce71c9763793abbd95b97b0ead133fe7afd1b2b4b382dc00149d9b6135fa2430300281741ed2a8d34 SHA512 0154d820ed27e43f091d535550dc61fdb91faaf303926cd3a2ba16300b963d0ea5226015fc546cb6419c9df82ab7e99f0f05287b4a5240c2ea381a43ec8e52d3
 AUX vhost-example 366 BLAKE2B 2aef55fee2759d1063936a583cdf6b96fcab77a0d6b056d59390931327ebcfdc338a515a8f7d9cfc5a6f071e0266fa82f0b6b3b4bab97979ff4dd8231fa2d729 SHA512 a2fde5ad64445aee0936a4fe2c608f48ec8163c46949cccd98c1b36b548e769477d387fb82e065b6dade5277580ad43426264ce13dca614182db16a4951247b9
-DIST davical-1.1.7.tar.xz 1347368 BLAKE2B 74418e99190db94dbb95fe9bdbed8f468cf98070a6ef86cb5af1f6460a97eb8c2faede7858a38b9728c5b3e400c6340f1abf3f00ae757847d8996b22e709f70e SHA512 d66388479259a8369f3a648a9d81f1e2f5488f6a3c4415360c133b21b6c6d4b4d433d5f94a635cffdaa0385a56c24176fa660ee8653d75246604655ccdd1a455
-DIST davical-1.1.8.tar.xz 1358060 BLAKE2B 9b38081981e876bfdb025bfb5cbd57843645e399df0816658c395ab8c2447809930596a4adcc7bb30f357435735a435c75b03431505eec24fd5adb270845fc39 SHA512 e4a81a80086cdb67af47202865ad1652e83f276d2b82fc80b8bff60682027c911f2000052b1f32008269c77147462ec21886eae78fb3b5d4247b747fb9c4d1e6
-EBUILD davical-1.1.7-r2.ebuild 1721 BLAKE2B 1aad5ac42f137afec064ec6bcfe808e6eebbf7c027f9d092dda86839fa6b0cd36581df8e7f1e57f5fba8917055d5ae2b2ee6500ac6925ebc866c8ca05a89bff3 SHA512 b0435f9dbf3817ae638027b14e17ce00187404cf1cabf61ff74a78d51d362cad0f0d42e7ed1d18e6e61e4964affc58f55481909549641f16d580a43c77485bac
-EBUILD davical-1.1.8.ebuild 1655 BLAKE2B f21b19a458a1035ca9bf1d872753f5c81aea66454e71bd0820232d107f6b387757eefc831df265087bcd500af72bd163af301d54fb686996e44d91593df88efe SHA512 bc71b908e4abc9aee0a3155fd62d9355ff71586bb4012d077c276b0f46cfb4da96462858f735ec4f2e5855adfed2b455f0687327e27775b41e372d7c67989c09
+DIST davical-1.1.9.2.tar.xz 1359636 BLAKE2B 6161e98dc4683310ec51ca1272f4869dd56711f6bd2f3aadf4481c847056c060a7d2811368587aea42377ff27ccdbaf0095d4fd915aec7c5b766fd7e073d25ef SHA512 025f6600fde809ef95708197e62523b400e06a187461221a4fa86326ebef2452857b1d433c25b0b50ee56df89040aec733fc597d8f966ab22720a8ce38a0f5b2
+EBUILD davical-1.1.9.2.ebuild 1655 BLAKE2B f21b19a458a1035ca9bf1d872753f5c81aea66454e71bd0820232d107f6b387757eefc831df265087bcd500af72bd163af301d54fb686996e44d91593df88efe SHA512 bc71b908e4abc9aee0a3155fd62d9355ff71586bb4012d077c276b0f46cfb4da96462858f735ec4f2e5855adfed2b455f0687327e27775b41e372d7c67989c09
 MISC metadata.xml 464 BLAKE2B f84e3f2c3b622eea5925ed066e9885aa1adb55d2f62245da5a63118bd99b30e36c10f21cd001da54a35926489860ee92cbde495552a52faf2f70dfd87807035d SHA512 74382454cf5fad3dc417c8c5be290919a3e86fae9f7508eadc995a0253e18350f1ef8ba9b0085f174e7fb15b14b5cd5630180dcbc2178132409d858182c31b84
diff --git a/www-apps/davical/davical-1.1.7-r2.ebuild b/www-apps/davical/davical-1.1.7-r2.ebuild
deleted file mode 100644
index 9d2ef12cb2f7..000000000000
--- a/www-apps/davical/davical-1.1.7-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="A CalDAV and CardDAV Server"
-HOMEPAGE="https://www.davical.org/"
-SRC_URI="https://www.davical.org/downloads/${PN}_${PV}.orig.tar.xz -> ${P}.tar.xz"
-
-LICENSE="GPL-2 GPL-2+ GPL-3+ LGPL-2.1+ LGPL-3+"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap"
-
-BDEPEND="sys-devel/gettext"
-
-RDEPEND="app-admin/pwgen
-	dev-lang/php:*[calendar,curl,iconv,imap,ldap?,nls,pdo,postgres,xml]
-	dev-perl/DBD-Pg
-	dev-perl/DBI
-	dev-perl/YAML
-	>=dev-php/awl-0.59
-	virtual/httpd-php"
-
-need_httpd
-
-PATCHES=( "${FILESDIR}/${P}-fix_php4_style_constructors.patch" )
-
-S="${WORKDIR}"
-
-src_compile() {
-	emake built-locale
-}
-
-src_install() {
-	webapp_src_preinst
-
-	einstalldocs
-
-	einfo "Installing web files"
-	insinto "${MY_HTDOCSDIR}"
-	doins -r htdocs/. htdocs/.htaccess
-
-	einfo "Installing main files and i18n"
-	insinto "${MY_HOSTROOTDIR}/${PN}"
-	doins -r inc locale
-	rm "${ED}/${MY_HOSTROOTDIR}/${PN}/inc/always.php.in" || die
-
-	einfo "Installing sql files"
-	insinto "${MY_SQLSCRIPTSDIR}"
-	doins -r dba/.
-
-	insinto /etc/${PN}
-	doins -r config/. "${FILESDIR}/vhost-example"
-
-	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
-	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-en.txt"
-	webapp_src_install
-
-	fperms +x "${MY_SQLSCRIPTSDIR}/create-database.sh"
-	fperms +x "${MY_SQLSCRIPTSDIR}/update-davical-database"
-}
-
-pkg_postinst() {
-	elog "If you are upgrading from a previous version of davical, don't forget to"
-	elog "upgrade the database structure with"
-	elog "       cd /usr/share/webapps/davical/${PVR}/sqlscripts/"
-	elog "       ./update-davical-database -dbuser xxxxxxx -appuser xxxxxx"
-
-	webapp_pkg_postinst
-}
diff --git a/www-apps/davical/davical-1.1.8.ebuild b/www-apps/davical/davical-1.1.9.2.ebuild
index b7cc044e06db..b7cc044e06db 100644
--- a/www-apps/davical/davical-1.1.8.ebuild
+++ b/www-apps/davical/davical-1.1.9.2.ebuild
diff --git a/www-apps/davical/files/davical-1.1.7-fix_php4_style_constructors.patch b/www-apps/davical/files/davical-1.1.7-fix_php4_style_constructors.patch
deleted file mode 100644
index a236e2823373..000000000000
--- a/www-apps/davical/files/davical-1.1.7-fix_php4_style_constructors.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/inc/HTTPAuthSession.php b/inc/HTTPAuthSession.php
-index e3b208c6..08663286 100644
---- a/inc/HTTPAuthSession.php
-+++ b/inc/HTTPAuthSession.php
-@@ -60,7 +60,7 @@ class HTTPAuthSession {
-   /**
-   * The constructor, which just calls the type supplied or configured
-   */
--  function HTTPAuthSession() {
-+  function __construct() {
-     global $c;
- 
-     if ( ! empty($_SERVER['PHP_AUTH_DIGEST'])) {
-diff --git a/inc/PublicSession.php b/inc/PublicSession.php
-index 28e06173..e779a9df 100644
---- a/inc/PublicSession.php
-+++ b/inc/PublicSession.php
-@@ -59,7 +59,7 @@ class PublicSession {
-   /**
-   * The constructor, which just calls the actual type configured
-   */
--  function PublicSession() {
-+  function __construct() {
-     global $c;
- 
-     $principal = new Principal('username','unauthenticated');
-diff --git a/inc/caldav-client.php b/inc/caldav-client.php
-index 4c1bf67f..b32c5c91 100644
---- a/inc/caldav-client.php
-+++ b/inc/caldav-client.php
-@@ -48,7 +48,7 @@ class CalDAVClient {
-   * @param string $pass      The password for that user
-   * @param string $calendar  The name of the calendar (not currently used)
-   */
--  function CalDAVClient( $base_url, $user, $pass, $calendar = '' ) {
-+  function __construct( $base_url, $user, $pass, $calendar = '' ) {
-     $this->user = $user;
-     $this->pass = $pass;
-     $this->calendar = $calendar;
diff --git a/www-apps/drraw/Manifest b/www-apps/drraw/Manifest
deleted file mode 100644
index 1f37fcf2ceac..000000000000
--- a/www-apps/drraw/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX postinstall-en.txt 137 BLAKE2B 4625ea14453a699c1cb0c572f01f690781509cd86be9c434f176e5755402ae8fd7271834a25ac958fa0acc29b8e0b23af8b8a1d587971a2bf3ddd794aff1953a SHA512 17286b3758a6f2606b80ae493725647128b6f7ebce3318c3ffcf7ce13e4bc14c730013ec4633421630cdfbbd1eaa7310587066fac8063a777221d4b31581bffe
-DIST drraw-2.0.1.tgz 40970 BLAKE2B 706b6b678e041bbc7607404cd6d8caae2c900d66ea6baf277cdf373d69e411e721c0b39de781e058cd495af9b8f71e5bf1b306ba2e8fd40c0a52454bf418e800 SHA512 35f03864aae70812a5afd948c0f159f4fb873501117c3f8dfc8a227c2b3067d03e9d3bd524f74277750d0ba4f922770a73d8657548e7ee0eda1281b543202020
-DIST drraw-2.1.3.tgz 45970 BLAKE2B c7fbc5bfb1acaf80b2ea80e9bf4c0e7334cfb1f0454185f356fde7347131f133b827758f848be17fe5bfa7e11f6516bd508647ec62adafb2572e9b459faf0275 SHA512 2ac1ff34a4744a76aba0e3dfafcd0b6b4139bfaa20942965feef1434e72ddcb2f22f9e68d8f39b8fafe7ca252cbbb22e5ac9eb54ee1380f6aa251d48edded960
-EBUILD drraw-2.0.1.ebuild 1032 BLAKE2B b4b6e59dc43d3e298ce14f902ee36b54f50ddd3e0bb19e0112b5940dc2b900b9534459af9d5fcaa5ecb1073c0c3b9eaede13ec5f46c55afdda03e8d415651d5c SHA512 d2f54cd95cc110ed955bb80b5aa0c3bde7d4b2d76fce62d0fc3a04e3df2292c74e5286b3b147a42d137ac6065b8729c145c6f50242308e5290ebda68433661b2
-EBUILD drraw-2.1.3.ebuild 1042 BLAKE2B 0ffc5d4e96e0c3ca510e60e65dc6fb454d3c344736a86217b514b8dbf6a8a4ec378a4b7b06e3299386f6c3804a91ca282ac4e763fcd5d7d047aca60cc1fe97a0 SHA512 5936d15d49eb23b122890ec40133a7cec0d7b5463cbd495466d25e30d7827dba1a484bcc99f02dbf9ae3464cec41f10e609a3efc8d35953a17a4f1397218f011
-MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
diff --git a/www-apps/drraw/drraw-2.0.1.ebuild b/www-apps/drraw/drraw-2.0.1.ebuild
deleted file mode 100644
index e71913547cb4..000000000000
--- a/www-apps/drraw/drraw-2.0.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit webapp
-
-DESCRIPTION="drraw is a simple web based presentation front-end for RRDtool"
-HOMEPAGE="http://web.taranis.org/drraw"
-SRC_URI="http://web.taranis.org/${PN}/dist/${P}.tgz"
-
-LICENSE="GPL-2"
-KEYWORDS="ppc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.6
-	dev-perl/CGI
-	>=net-analyzer/rrdtool-1.0.47"
-
-need_httpd_cgi
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e "s|/usr/local/bin/perl|/usr/bin/perl|" drraw.cgi
-	sed -i \
-		-e "s|/somewhere/drraw/saved|/tmp|" \
-		-e "s|/somewhere/drraw/tmp|/tmp|" \
-		drraw.conf
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc CHANGES INSTALL README.EVENTS WISHLIST
-	rm CHANGES INSTALL README.EVENTS WISHLIST
-
-	insinto "${MY_CGIBINDIR}"
-	doins drraw.conf
-
-	exeinto "${MY_CGIBINDIR}"
-	doexe drraw.cgi
-
-	insinto "${MY_ICONSDIR}"
-	doins icons/*.gif
-
-	webapp_configfile "${MY_CGIBINDIR}"/drraw.conf
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/drraw/drraw-2.1.3.ebuild b/www-apps/drraw/drraw-2.1.3.ebuild
deleted file mode 100644
index 6b7773be9e09..000000000000
--- a/www-apps/drraw/drraw-2.1.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit webapp
-
-DESCRIPTION="drraw is a simple web based presentation front-end for RRDtool"
-HOMEPAGE="http://web.taranis.org/drraw"
-SRC_URI="http://web.taranis.org/${PN}/dist/${P}.tgz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.6
-	dev-perl/CGI
-	>=net-analyzer/rrdtool-1.2.1"
-
-need_httpd_cgi
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e "s|/usr/local/bin/perl|/usr/bin/perl|" drraw.cgi
-	sed -i \
-		-e "s|/somewhere/drraw/saved|/tmp|" \
-		-e "s|/somewhere/drraw/tmp|/tmp|" \
-		drraw.conf
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc CHANGES INSTALL README.EVENTS WISHLIST
-	rm CHANGES INSTALL README.EVENTS WISHLIST
-
-	insinto "${MY_CGIBINDIR}"
-	doins drraw.conf
-
-	exeinto "${MY_CGIBINDIR}"
-	doexe drraw.cgi
-
-	insinto "${MY_ICONSDIR}"
-	doins icons/*.gif
-
-	webapp_configfile "${MY_CGIBINDIR}"/drraw.conf
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/drraw/files/postinstall-en.txt b/www-apps/drraw/files/postinstall-en.txt
deleted file mode 100644
index 87ca1040a9d4..000000000000
--- a/www-apps/drraw/files/postinstall-en.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Now edit ${VHOST_CGIBINDIR}/drraw.conf
-You may want to edit the CGI executable in ${VHOST_CGIBINDIR}
-to set the path to the config file.
diff --git a/www-apps/drraw/metadata.xml b/www-apps/drraw/metadata.xml
deleted file mode 100644
index f2f2ba9e2823..000000000000
--- a/www-apps/drraw/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>web-apps@gentoo.org</email>
-	<name>Gentoo Webapps</name>
-</maintainer>
-</pkgmetadata>
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 99c9b6cc9845..4e5024765031 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,10 +1,17 @@
 AUX postinstall-en.txt 1595 BLAKE2B 9b5c237befcf415d0f769052c9634da830326ff57da1a1db538059138780c8ebf8d0666908fb6bb3eba99fee5d5869cd12042f0d276b560b51db60803e46c146 SHA512 6a0a5388d40b3c49f3c685a6a7986c2a9efe3e6d7c5115fbb3110ebe4c19c605a4ff785447a20c0296f3cb16811a8a6e77f2439d58253a011603709c9dd9b760
 DIST drupal-7.67.tar.gz 3312764 BLAKE2B bb7f21e80ca192ff3e37f917c1fa43dcd8d3cd8b60ff012d1fe22e279ffd674e08be6aef6328d0c5b7c50a106592bde299300fe9ccb0c4c1ffc1aca57c3ca6ad SHA512 0e4f60010b1395183cea19424e8c2849f93fb7285a081bf7d0c774b8e82f403083533059f58c3831950cc06dfa8117d443db52b66a521301ceac10b1b333aa28
+DIST drupal-7.68.tar.gz 3314177 BLAKE2B 915369e8b1af0676347d326ae5a23194a6643a079b89c83c12c93edccabc0f4eecd472d0007007f9c58ae8ecec0b9850eb8f0ea3488398d7bbccd105d1246aa5 SHA512 b6e9cd1ac002cf5b633b3bc5431e4159a1e49530860f60137960cf102a04b00cbd8bfe0687b98524348ef48e1f24f858808caf9d3305c973e24bd0d92479ba2a
 DIST drupal-8.6.16.tar.gz 17151378 BLAKE2B 2bdd14ff7a5f898af2d322a6b2862643899dfbe2ad05c99b85f036161612cccfc2c25105c8eef37311634a2aa03ed792db8de3e625aed5adb94cd8f644557fcb SHA512 34f260d780bce286a0a61b710c340d2622cb857aa92a2bdaad63737303ef2f4f1751edc3f415daaa14b9cb483757e367e639136d03f571cba5165129bba31e12
+DIST drupal-8.7.10.tar.gz 17894144 BLAKE2B cf20860bc11ca65a7ff0808e533f5c3aac39d4f5b0f9052601d1bf510cdc28bb5fca99d14d78badc61158f06742e1fb6addfc4145ad17720095631f7258b0cd7 SHA512 c614a64efd86c529d89f4411d4418731ae85cf0af5a236dd3a475f68dd4d408fb7c6d378477897e2ce68c71cc287f218dab2d45cc3d96967a75a6500e0161716
 DIST drupal-8.7.8.tar.gz 17882836 BLAKE2B 8a521c5c615356548eea8a64ee81e31082e3b9c5ed37c66fef7f2f3c426c7339e4848b90306cfccae1005c5c6d8fe8d7964662012da66c9c6754c6052d102173 SHA512 cc68e6318ebc162cd50fe19046a992ae2ca338f9da564a12a88954edb2c0cecaa56b0ded22903f67f305ab1fee48dd8a2bbf8b65a9efda2e1ce50d11b97bab28
 DIST drupal-8.7.9.tar.gz 17888541 BLAKE2B 958779c7ae8fa1527ae91d3174c19afc311682c4bbceacd6592796abf781b4e52b0e1ad5f020bd79d2d55508a954bf969076121d703f69959afd6b7a87b6e9b9 SHA512 6181af0e096974e1eb7d5a046d8f34372725891937fcce7d9c0b6b1dffebc0d6fc3519f16df6edbea35c081231c9f8411166f66586cb932de1e6aadebfa78cb1
+DIST drupal-8.8.0.tar.gz 19404952 BLAKE2B 4cdad86e3668f80c45a3cff79ca0d245e36e2239d0a97f06ebe05cf125a0665e16eb75410fccb0ac5cae5a7a5e909ec67649fc4ec5e14e78b887c6b8981e7f77 SHA512 26a2f064c951b712a944ef68903070c51262f6886482429b893809ee2b2a3a58974937e9c9a698d1476eb17c38c532ede73ba4cc4ff3e2d80e989ae6cd188664
+EBUILD drupal-7.67-r1.ebuild 1546 BLAKE2B 35cdab15e35337c9f7afd5188883ae89c4729ef0616de25fafe42d0252a517771fe1a075255239b3c7f1290a411490ddc6d4a64c66c67f1a25c09f06e0fc3d9a SHA512 bddd764fb0eeec6170b936829aad59cb7fe20dffef37eea6df80dd3ce05a13ee36710ab7b36975a450ee310ec94f0362763cb5541f6c721a5054b961c665a42d
 EBUILD drupal-7.67.ebuild 1758 BLAKE2B 52959ae6dc48617ec80e22ce74324e138897f01ed9e2c489d481554188825ce917a9461b79d07a7c77049cd4458d51329f19feb68a18949afd4517a0da40040f SHA512 2aabe685ca2fd5ff1f29c8e575f22b7c1030b830afadeefe3a591b3316410a97b3e7640690bc28fca4e22f6b816f8b898c2e15c22c2cb3557032f46ce2320609
+EBUILD drupal-7.68.ebuild 1546 BLAKE2B 35cdab15e35337c9f7afd5188883ae89c4729ef0616de25fafe42d0252a517771fe1a075255239b3c7f1290a411490ddc6d4a64c66c67f1a25c09f06e0fc3d9a SHA512 bddd764fb0eeec6170b936829aad59cb7fe20dffef37eea6df80dd3ce05a13ee36710ab7b36975a450ee310ec94f0362763cb5541f6c721a5054b961c665a42d
 EBUILD drupal-8.6.16.ebuild 2296 BLAKE2B 65b24cb2396a5b9a80da6c1e89fc1cf860fd6c02e2dd10e0795f9dc142d0b618444471859644e6cb0f2996d0edddfe55cb89f023359a5cef864d2ae2f8051e37 SHA512 fdc26580fb94ee1b936789ac75b7a4439020c6dcf0e0f55dc3bf2acadc6d798107796747f1bbd0c2b7832f11d2e180771a8a86c7d2404ee8948b3687f7fab47e
+EBUILD drupal-8.7.10.ebuild 2084 BLAKE2B 11f1dfac694f10e65ef501c4e8d6306c005115ff7c617e97ba9b37480f5d7d6792e2f84114197388ee8a94b9d3b0bf5dc9f3e84a5e70e11a2c6aa3f357714d78 SHA512 2a81cb1142d338d34b0c9d0bad5cc6a6b0b48879ac20e3e3fb18434aa29f8e9428b406790d591ce397337af5e69d0ad52d5859a92ec79d7d3c5edf24c41b0063
 EBUILD drupal-8.7.8.ebuild 2308 BLAKE2B 9b49ed1062c78c37eb9ce3bab96f63fbe288756166a9f3168844c59a9ab71830a7150714d9db77e0a268f4d81fd16165b8272a38afe1fba472cb28eee4969b8d SHA512 2cd254d70d6d715bf2f7ee79ad63a5df5e0c8d9881476998b8d496293663341b00a1e5ebe50beab17cdf056f6cec43d80bda559c5d794f37de99e99543857f13
 EBUILD drupal-8.7.9.ebuild 2308 BLAKE2B 9b49ed1062c78c37eb9ce3bab96f63fbe288756166a9f3168844c59a9ab71830a7150714d9db77e0a268f4d81fd16165b8272a38afe1fba472cb28eee4969b8d SHA512 2cd254d70d6d715bf2f7ee79ad63a5df5e0c8d9881476998b8d496293663341b00a1e5ebe50beab17cdf056f6cec43d80bda559c5d794f37de99e99543857f13
+EBUILD drupal-8.8.0.ebuild 2084 BLAKE2B 11f1dfac694f10e65ef501c4e8d6306c005115ff7c617e97ba9b37480f5d7d6792e2f84114197388ee8a94b9d3b0bf5dc9f3e84a5e70e11a2c6aa3f357714d78 SHA512 2a81cb1142d338d34b0c9d0bad5cc6a6b0b48879ac20e3e3fb18434aa29f8e9428b406790d591ce397337af5e69d0ad52d5859a92ec79d7d3c5edf24c41b0063
 MISC metadata.xml 419 BLAKE2B 3652ed012764eeebfd813e1979965e76caf500aea8a29bf8652c56f145e62e5ac8c5ae233919a0be123878cccdbab5fa52a4c02ed7367099862407487ca0b8b9 SHA512 3610c6151b6bbbb452a9c599d04d28a18c3e535c0976e425778e8b138bb03637bb28900acef2ef405ec10176390db33e997ba5d789f8a0fc49564538194fc8a1
diff --git a/www-apps/drupal/drupal-7.67-r1.ebuild b/www-apps/drupal/drupal-7.67-r1.ebuild
new file mode 100644
index 000000000000..da5fce8597f4
--- /dev/null
+++ b/www-apps/drupal/drupal-7.67-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PV=${PV:0:3}.0
+
+DESCRIPTION="PHP-based open-source platform and content management system"
+HOMEPAGE="https://www.drupal.org/"
+SRC_URI="https://ftp.drupal.org/files/projects/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres sqlite +uploadprogress"
+
+RDEPEND="
+	dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml]
+	virtual/httpd-php
+	uploadprogress? ( dev-php/pecl-uploadprogress )
+"
+
+need_httpd_cgi
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt INSTALL.mysql.txt INSTALL.pgsql.txt INSTALL.sqlite.txt UPGRADE.txt "
+	dodoc ${docs}
+	rm -f ${docs} INSTALL COPYRIGHT.txt || die
+
+	cp sites/default/{default.settings.php,settings.php} || die
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/settings.php
+
+	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	echo
+	ewarn "SECURITY NOTICE"
+	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
+	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
+	echo
+}
diff --git a/www-apps/drupal/drupal-7.68.ebuild b/www-apps/drupal/drupal-7.68.ebuild
new file mode 100644
index 000000000000..da5fce8597f4
--- /dev/null
+++ b/www-apps/drupal/drupal-7.68.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PV=${PV:0:3}.0
+
+DESCRIPTION="PHP-based open-source platform and content management system"
+HOMEPAGE="https://www.drupal.org/"
+SRC_URI="https://ftp.drupal.org/files/projects/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres sqlite +uploadprogress"
+
+RDEPEND="
+	dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml]
+	virtual/httpd-php
+	uploadprogress? ( dev-php/pecl-uploadprogress )
+"
+
+need_httpd_cgi
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt INSTALL.mysql.txt INSTALL.pgsql.txt INSTALL.sqlite.txt UPGRADE.txt "
+	dodoc ${docs}
+	rm -f ${docs} INSTALL COPYRIGHT.txt || die
+
+	cp sites/default/{default.settings.php,settings.php} || die
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/settings.php
+
+	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	echo
+	ewarn "SECURITY NOTICE"
+	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
+	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
+	echo
+}
diff --git a/www-apps/drupal/drupal-8.7.10.ebuild b/www-apps/drupal/drupal-8.7.10.ebuild
new file mode 100644
index 000000000000..945c43dcf134
--- /dev/null
+++ b/www-apps/drupal/drupal-8.7.10.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PV=${PV:0:3}.0
+MY_P=${P/_/-}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="PHP-based open-source platform and content management system"
+HOMEPAGE="https://www.drupal.org/"
+SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres sqlite +uploadprogress"
+
+RDEPEND="
+	dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml]
+	virtual/httpd-php
+	uploadprogress? ( dev-php/pecl-uploadprogress )
+"
+
+need_httpd_cgi
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
+		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
+
+	dodoc ${docs}
+	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
+
+	cp sites/default/{default.settings.php,settings.php} || die
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/files
+
+	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	echo
+	ewarn "SECURITY NOTICE"
+	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
+	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
+	echo
+	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
+	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
+	echo
+	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
+	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
+	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
+	ewarn "reported by the setup."
+	echo
+}
diff --git a/www-apps/drupal/drupal-8.8.0.ebuild b/www-apps/drupal/drupal-8.8.0.ebuild
new file mode 100644
index 000000000000..945c43dcf134
--- /dev/null
+++ b/www-apps/drupal/drupal-8.8.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PV=${PV:0:3}.0
+MY_P=${P/_/-}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="PHP-based open-source platform and content management system"
+HOMEPAGE="https://www.drupal.org/"
+SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres sqlite +uploadprogress"
+
+RDEPEND="
+	dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml]
+	virtual/httpd-php
+	uploadprogress? ( dev-php/pecl-uploadprogress )
+"
+
+need_httpd_cgi
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
+		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
+
+	dodoc ${docs}
+	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
+
+	cp sites/default/{default.settings.php,settings.php} || die
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/files
+
+	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	echo
+	ewarn "SECURITY NOTICE"
+	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
+	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
+	echo
+	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
+	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
+	echo
+	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
+	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
+	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
+	ewarn "reported by the setup."
+	echo
+}
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index d31f55272081..794e74798015 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,11 +1,12 @@
 AUX app.ini 67 BLAKE2B 4ec7b8217486047b419202b3a8a7172ac21ae0e5ad9224cd4f010be730ac5cda9d05bf06dcba2d06f8809900094b3b007ef98dd4ea20a125fb7d3db279f53e4a SHA512 93f6f7cf49dd1ece56f7da711adbb58cc38a503527aeea140837d74456ee6f550a089e897d9cb94382e1eb3f5a5cbe4a61362534463eada08a91f314da0f2108
-AUX gitea-logflags.patch 424 BLAKE2B af7c4d5b75a68d96eb3a4b352bd446ad25016093c9acedb1a035e2aa10baf3e451a89f685b9891d6941262523283946539c83e49b432ff7b6040b02a23c10c76 SHA512 df180aba171ef5f12228fa9c420f32a9f2da9125e4ec9517d068bed6c4bd64f4c196da1feb557c40764566fa6238d86c933ea505b8cbbd106102866d720149ca
+AUX gitea-logflags.patch 4568 BLAKE2B 280697f7ca87c3c985aef0462f63f431860411ad7c39e462e5a63607ef076b116c27d2090f894095193dad33918f1fad1767489d45ae80f9699dddf65141ceb9 SHA512 aa09b233402ecb450cab13ed08786c1b8dc72a944efe69792bcf95d6109dd41b73abae95c3048bf339c8bb7849b3a20edb473388c052d32e00f7fb8b9381138d
 AUX gitea-mod-vendor.patch 1273 BLAKE2B 3067b17a972b92d0c402af4336ee41daa2f09d389a6e8bf218d33b103230bf8bb4b7003977447cc00293f8941f5002676398d4d755548e114e59cbb3840af8cc SHA512 12d8e0d2cb0998d31f8077f1498205bfee07e0df74926251f1ca38b9824c11246c07e413fc20beaed9ae49cac3d329468432f3fd2d5b25292c5bd656a88c7cc8
 AUX gitea.confd-r1 243 BLAKE2B 87caa8371f53f52b0a85f720342f9f358dedec9240ab78998655a03df6bf3f301fe077afabdca1b1895dbcab2fa05748735d6f38f9b3ad53534fe8ae6e72db49 SHA512 485dc9d0b86d0a7b3ba958aac9de1129aa0ffbb47219419d38811f2accca2539e49dd93cc4a24b21f1c3802b024aa8449f54e320e8a16197f201532edeca6836
 AUX gitea.initd-r3 802 BLAKE2B 2e33e95f7d2762986184d45b0bbb250cc5e04fffc4e4b006233b28e5b57be69eef1d83441adebe2b94681585edaf77f9da4eb97930f91e75c1b1a5cd8d137633 SHA512 5ff2e653180a0601734fcd055dfffdfdc12363736ed2e56c8576c802398b90f4025b44002cbb9a3fd1e0c2d4c169f62d460381c6c549746d3390e55fc1c677d1
 AUX gitea.service-r2 734 BLAKE2B 84825b8198e9495e2803ca3702e6a631fb269c5c8fb4ff4246465a5bd7f7d796b0c3eaea72d0a25cef4f5d38d27a6c99a1b6d41f489749bef322a4ac93cfdd12 SHA512 287670f196bf6353dbdeb6ac37b4ac73693e16a6a3a83f57e7179ccb64364d1d85950a2ddd0a77238a3d218afdaacc8ba849c2810a7ba1238c7277074d1ebe39
-DIST gitea-1.8.3.tar.gz 24320679 BLAKE2B 9ef901ef7e1cb6ffa9a2aa082798b7a18ac2a6fdb4379082df3f942d767a27fd3915c7a4d2cb1af6f502a8cde3c1c98557c42d4c0ef60be7bdad78d8931035e0 SHA512 f6019fbfc056e4c7176222ccaca1cf638bd1f52323de54fcddc618129aeb778674f6e305de60e7d17b69505ad65439445ee6b5e368afdf0a6fbace7407acb495
+DIST gitea-1.10.1.tar.gz 30146802 BLAKE2B d566e58bc8031c6ff2741861c93deb1cc0bbe2236cfa8d1f054e1453d39b294ae55bd3bae46373efa39cd0b5bc9dfc248ecc0c64642eb4df68fb01042ef1c692 SHA512 d7baea6ac9aca3a3226d36325000c71c886d560eeecb2fdbed924b4924db34882cdd82d07120e3c7175a6d87140a1f63cc575c3be44513e08f8e557856b39acd
 DIST gitea-1.9.5.tar.gz 25355286 BLAKE2B 8b733651de64fcafa7b41a6fc812fcad8ac7311a7e7acc679ec7dab759175ec13a096902aece209a3fef31eefd3a99493e13f7c9792e1e41b5a1c3376680d3ca SHA512 f7a04d3bb37a33da15290355f3f02ff4c1b737e8458cf65f731c870ac9e452243b1fdacc5f74accf963fb00cdd200dd31191058eb1d6dda8b1033846a961c7d3
-EBUILD gitea-1.8.3.ebuild 3179 BLAKE2B 43582669d2e25936f7384f63834baa477ed276b21a0ec3564912ad8badd38cd916c847201855c4b78cf7961fdde9dad55278e1c3d684635b735525182d3a62fd SHA512 1c71d2564ee38ae631e98911cd548f0b72a9ab779a88d7609c48c2683ec19429ce909c224c1d4cea50798bb708eb8bfc4fbaa24cc5f0fb57a8999f2e69d60df9
+EBUILD gitea-1.10.1.ebuild 3427 BLAKE2B 8fbe625027b261ae19c50b1d51eae847530dbf2c9e973d95718083f7799fc71e16f7d7ce13b6b2f421d2dc47a1dfb171da434ea39f16df8ede6ae1ea086288c5 SHA512 548c4e072a0797ae6920050f6105d015bb6670d5f1fccce0fcf4c7561a12cfb4de5e1208826add8fdb13083532406c0c2ab7a11f6b181daae39588959e477356
 EBUILD gitea-1.9.5.ebuild 3107 BLAKE2B 35944719b504c0a9acba5c7c73eef3af11bea31cea72a4910a1b0176ba77031a52b0c03514de849d564e93a78154cf973dfe4f4e9802819e3e8df72de0d41932 SHA512 2985dd8aa4ae893cb1f98becc612f2738d39bb166ac29e8b9bfbe3cdb354c858523780db299e4fe5936ea07d1689e32ab8775072d517d05688cfa60b10bc6781
+EBUILD gitea-9999.ebuild 3379 BLAKE2B 02f80718715f55e172ac372e3d15aea4112c7043ace30d8441bdc9822f8c617e1a3d0109ed640904b9baf8d80a085c390ec2d008aaca03cd14b6d62b1a72bddf SHA512 d3c7b02a3000c23ce3ed491e63737e3bdd59b5008019b7459927b042a926a72f2a4756714d8347d15cce6b5a26d0c91839166a54bd1440a00cd33f3061f80eb1
 MISC metadata.xml 546 BLAKE2B 7b28ca7beb4fec57e6d4fc942b30afe505dc3b1f7c9034509bb9980d15429565220421d5edfcab76608386fb8cfbc086486beffcf53c814cfb0c09bf29e753ee SHA512 aaaca41cb5e43f8d382087760352e09e7fe0c18c6474399c4d6cd228ea0e2982b876f2f3d9c1c1bd11de1495679d3458bfb2a092c1f35df7ab8d5950bdfeadb2
diff --git a/www-apps/gitea/files/gitea-logflags.patch b/www-apps/gitea/files/gitea-logflags.patch
index 331bd3d046b1..bbe6e5501c81 100644
--- a/www-apps/gitea/files/gitea-logflags.patch
+++ b/www-apps/gitea/files/gitea-logflags.patch
@@ -1,5 +1,8 @@
+
+#Patch to make gitea logging less verbose.
+
 diff --git a/modules/log/flags.go b/modules/log/flags.go
-index 992fc62..5578a1b 100644
+index 992fc62dd..5578a1b6b 100644
 --- a/modules/log/flags.go
 +++ b/modules/log/flags.go
 @@ -31,7 +31,7 @@ const (
@@ -11,3 +14,126 @@ index 992fc62..5578a1b 100644
  )
  
  var flagFromString = map[string]int{
+
+
+#Just patching the tests to keep working with the patch above (avoid using LstdFlags)
+
+diff --git a/modules/log/conn_test.go b/modules/log/conn_test.go
+index cc3d758fa..295bee37f 100644
+--- a/modules/log/conn_test.go
++++ b/modules/log/conn_test.go
+@@ -40,7 +40,7 @@ func TestConnLogger(t *testing.T) {
+ 
+ 	prefix := "TestPrefix "
+ 	level := INFO
+-	flags := LstdFlags | LUTC | Lfuncname
++    flags :=  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
+ 
+ 	logger := NewConn()
+ 	connLogger := logger.(*ConnLogger)
+@@ -112,7 +112,7 @@ func TestConnLoggerCloseBeforeSend(t *testing.T) {
+ 
+ 	prefix := "TestPrefix "
+ 	level := INFO
+-	flags := LstdFlags | LUTC | Lfuncname
++    flags :=  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
+ 
+ 	logger := NewConn()
+ 
+@@ -126,7 +126,7 @@ func TestConnLoggerFailConnect(t *testing.T) {
+ 
+ 	prefix := "TestPrefix "
+ 	level := INFO
+-	flags := LstdFlags | LUTC | Lfuncname
++    flags :=  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
+ 
+ 	logger := NewConn()
+ 
+@@ -169,7 +169,7 @@ func TestConnLoggerClose(t *testing.T) {
+ 
+ 	prefix := "TestPrefix "
+ 	level := INFO
+-	flags := LstdFlags | LUTC | Lfuncname
++    flags :=  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
+ 
+ 	logger := NewConn()
+ 	connLogger := logger.(*ConnLogger)
+diff --git a/modules/log/console_test.go b/modules/log/console_test.go
+index a028b5b87..e4fec760a 100644
+--- a/modules/log/console_test.go
++++ b/modules/log/console_test.go
+@@ -33,7 +33,7 @@ func TestConsoleLoggerMinimalConfig(t *testing.T) {
+ 			},
+ 		}
+ 		prefix := ""
+-		flags := LstdFlags
++        flags := LstdFlags
+ 
+ 		cw := NewConsoleLogger()
+ 		realCW := cw.(*ConsoleLogger)
+@@ -64,7 +64,7 @@ func TestConsoleLogger(t *testing.T) {
+ 	}
+ 	prefix := "TestPrefix "
+ 	level := INFO
+-	flags := LstdFlags | LUTC | Lfuncname
++    flags :=  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
+ 
+ 	cw := NewConsoleLogger()
+ 	realCW := cw.(*ConsoleLogger)
+diff --git a/modules/log/file_test.go b/modules/log/file_test.go
+index 38279315a..dc8d291ed 100644
+--- a/modules/log/file_test.go
++++ b/modules/log/file_test.go
+@@ -24,7 +24,7 @@ func TestFileLoggerFails(t *testing.T) {
+ 
+ 	prefix := "TestPrefix "
+ 	level := INFO
+-	flags := LstdFlags | LUTC | Lfuncname
++    flags :=  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
+ 	//filename := filepath.Join(tmpDir, "test.log")
+ 
+ 	fileLogger := NewFileLogger()
+@@ -52,7 +52,7 @@ func TestFileLogger(t *testing.T) {
+ 
+ 	prefix := "TestPrefix "
+ 	level := INFO
+-	flags := LstdFlags | LUTC | Lfuncname
++    flags :=  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
+ 	filename := filepath.Join(tmpDir, "test.log")
+ 
+ 	fileLogger := NewFileLogger()
+@@ -155,7 +155,7 @@ func TestCompressFileLogger(t *testing.T) {
+ 
+ 	prefix := "TestPrefix "
+ 	level := INFO
+-	flags := LstdFlags | LUTC | Lfuncname
++    flags :=  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
+ 	filename := filepath.Join(tmpDir, "test.log")
+ 
+ 	fileLogger := NewFileLogger()
+diff --git a/modules/log/smtp_test.go b/modules/log/smtp_test.go
+index 216d55521..15075dd41 100644
+--- a/modules/log/smtp_test.go
++++ b/modules/log/smtp_test.go
+@@ -17,7 +17,7 @@ import (
+ func TestSMTPLogger(t *testing.T) {
+ 	prefix := "TestPrefix "
+ 	level := INFO
+-	flags := LstdFlags | LUTC | Lfuncname
++    flags :=  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
+ 	username := "testuser"
+ 	password := "testpassword"
+ 	host := "testhost"
+diff --git a/modules/log/writer_test.go b/modules/log/writer_test.go
+index 886dd58fb..df2f6e698 100644
+--- a/modules/log/writer_test.go
++++ b/modules/log/writer_test.go
+@@ -41,7 +41,7 @@ func TestBaseLogger(t *testing.T) {
+ 	b := WriterLogger{
+ 		out:    c,
+ 		Level:  INFO,
+-		Flags:  LstdFlags | LUTC,
++		Flags:  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC,
+ 		Prefix: prefix,
+ 	}
+ 	location, _ := time.LoadLocation("EST")
diff --git a/www-apps/gitea/gitea-1.10.1.ebuild b/www-apps/gitea/gitea-1.10.1.ebuild
new file mode 100644
index 000000000000..ebc72d5057b0
--- /dev/null
+++ b/www-apps/gitea/gitea-1.10.1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} != 9999* ]] ; then
+	SCM="golang-vcs-snapshot"
+else
+	SCM="git-r3"
+fi
+
+inherit golang-base tmpfiles systemd ${SCM}
+unset SCM
+
+EGO_PN="code.gitea.io/gitea"
+
+DESCRIPTION="A painless self-hosted Git service"
+HOMEPAGE="https://gitea.io"
+
+if [[ ${PV} != 9999* ]] ; then
+	SRC_URI="https://github.com/go-gitea/gitea/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64"
+else
+	EGIT_REPO_URI="https://github.com/go-gitea/gitea"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+	has test ${FEATURES} && EGIT_MIN_CLONE_TYPE="mirror"
+fi
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="+acct pam sqlite"
+
+BDEPEND="dev-lang/go"
+DEPEND="pam? ( sys-libs/pam )"
+RDEPEND="${DEPEND}
+	acct? (
+		acct-group/git
+		acct-user/git[gitea]
+	)
+	dev-vcs/git"
+
+DOCS=( custom/conf/app.ini.sample CONTRIBUTING.md README.md )
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+PATCHES=( "${FILESDIR}/gitea-logflags.patch" )
+
+gitea_make() {
+	local gitea_tags=(
+		bindata
+		$(usev pam)
+		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
+	)
+	local gitea_settings=(
+		"-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini"
+		"-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
+		"-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
+	)
+	local makeenv=(
+		TAGS="${gitea_tags[@]}"
+		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[@]}"
+		GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)"
+	)
+	[[ ${PV} != 9999* ]] && makeenv+=("DRONE_TAG=${PV}")
+
+	env "${makeenv[@]}" emake "$@"
+}
+
+src_prepare() {
+	default
+
+	local sedcmds=(
+		-e "s#^RUN_MODE = dev#RUN_MODE = prod#"
+		-e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"
+		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"
+		-e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#"
+		-e "s#^HTTP_ADDR = 0.0.0.0#HTTP_ADDR = 127.0.0.1#"
+		-e "s#^MODE = console#MODE = file#"
+		-e "s#^LEVEL = Trace#LEVEL = Info#"
+		-e "s#^LOG_SQL = true#LOG_SQL = false#"
+		-e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
+		-e "s#^APP_ID =#;APP_ID =#"
+		-e "s#^TRUSTED_FACETS =#;TRUSTED_FACETS =#"
+	)
+
+	sed -i "${sedcmds[@]}" custom/conf/app.ini.sample || die
+	if use sqlite ; then
+		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.ini.sample || die
+	fi
+
+	gitea_make generate
+}
+
+src_compile() {
+	gitea_make build
+}
+
+src_test() {
+	if has network-sandbox ${FEATURES}; then
+		einfo "Remove tests which are known to fail with network-sandbox enabled."
+		rm ./modules/migrations/github_test.go || die
+	fi
+
+	if [[ ${PV} != 9999* ]] ; then
+		einfo "Remove tests which depend on gitea git-repo."
+		rm ./modules/git/blob_test.go || die
+		rm ./modules/git/repo_test.go || die
+	fi
+
+	default
+}
+
+src_install() {
+	dobin gitea
+
+	einstalldocs
+
+	newconfd "${FILESDIR}/gitea.confd-r1" gitea
+	newinitd "${FILESDIR}/gitea.initd-r3" gitea
+	newtmpfiles - gitea.conf <<-EOF
+		d /run/gitea 0755 git git
+	EOF
+	systemd_newunit "${FILESDIR}"/gitea.service-r2 gitea.service
+
+	insinto /etc/gitea
+	newins custom/conf/app.ini.sample app.ini
+	if use acct ; then
+		fowners root:git /etc/gitea/{,app.ini}
+		fperms g+w,o-rwx /etc/gitea/{,app.ini}
+
+		diropts -m0750 -o git -g git
+		keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
+		keepdir /var/log/gitea
+	fi
+}
diff --git a/www-apps/gitea/gitea-1.8.3.ebuild b/www-apps/gitea/gitea-1.8.3.ebuild
deleted file mode 100644
index bdefa9b63520..000000000000
--- a/www-apps/gitea/gitea-1.8.3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit golang-vcs-snapshot systemd user
-
-EGO_PN="code.gitea.io/gitea"
-
-DESCRIPTION="A painless self-hosted Git service"
-HOMEPAGE="https://gitea.io"
-SRC_URI="https://github.com/go-gitea/gitea/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="pam sqlite"
-
-COMMON_DEPEND="pam? ( sys-libs/pam )"
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-bindata"
-RDEPEND="${COMMON_DEPEND}
-	dev-vcs/git"
-
-DOCS=( custom/conf/app.ini.sample CONTRIBUTING.md README.md )
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/bash /var/lib/gitea git
-}
-
-gitea_make() {
-	local my_tags=(
-		bindata
-		$(usev pam)
-		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
-	)
-	local my_makeopt=(
-		DRONE_TAG=${PV}
-		TAGS="${my_tags[@]}"
-	)
-	GOPATH=${WORKDIR}/${P}:$(get_golibdir_gopath) emake "${my_makeopt[@]}" "$@"
-}
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s#^RUN_MODE = dev#RUN_MODE = prod#"                                     \
-		-e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"          \
-		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"                   \
-		-e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#" \
-		-e "s#^HTTP_ADDR = 0.0.0.0#HTTP_ADDR = 127.0.0.1#"                          \
-		-e "s#^MODE = console#MODE = file#"                                         \
-		-e "s#^LEVEL = Trace#LEVEL = Info#"                                         \
-		-e "s#^LOG_SQL = true#LOG_SQL = false#"                                     \
-		-e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"               \
-		-e "s#^APP_ID =#;APP_ID =#"                                                 \
-		-e "s#^TRUSTED_FACETS =#;TRUSTED_FACETS =#"                                 \
-		custom/conf/app.ini.sample || die
-	if use sqlite ; then
-		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.ini.sample || die
-	fi
-
-	gitea_make generate
-}
-
-src_compile() {
-	gitea_make build
-}
-
-src_test() {
-	gitea_make test
-}
-
-src_install() {
-	dobin gitea
-
-	einstalldocs
-
-	newconfd "${FILESDIR}"/gitea.confd-r1 gitea
-	newinitd "${FILESDIR}"/gitea.initd-r3 gitea
-	systemd_newunit "${FILESDIR}"/gitea.service-r2 gitea.service
-
-	insinto /etc/gitea
-	newins custom/conf/app.ini.sample app.ini
-	fowners root:git /etc/gitea/{,app.ini}
-	fperms g+w,o-rwx /etc/gitea/{,app.ini}
-
-	diropts -m0750 -o git -g git
-	keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
-	keepdir /var/log/gitea
-}
-
-pkg_postinst() {
-	if [[ -e "${EROOT}/var/lib/gitea/conf/app.ini" ]]; then
-		ewarn "The configuration path has been changed to ${EROOT}/etc/gitea/app.ini."
-		ewarn "Please move your configuration from ${EROOT}/var/lib/gitea/conf/app.ini"
-		ewarn "and adapt the gitea-repositories hooks and ssh authorized_keys."
-		ewarn "Depending on your configuration you should run something like:"
-		ewarn "sed -i -e 's#${EROOT}/var/lib/gitea/conf/app.ini#${EROOT}/etc/gitea/app.ini#' \\"
-		ewarn "  /var/lib/gitea/gitea-repositories/*/*/hooks/*/* \\"
-		ewarn "  /var/lib/gitea/.ssh/authorized_keys"
-	fi
-}
diff --git a/www-apps/gitea/gitea-9999.ebuild b/www-apps/gitea/gitea-9999.ebuild
new file mode 100644
index 000000000000..9e8bcf9c6054
--- /dev/null
+++ b/www-apps/gitea/gitea-9999.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} != 9999* ]] ; then
+	SCM="golang-vcs-snapshot"
+else
+	SCM="git-r3"
+fi
+
+inherit golang-base tmpfiles systemd ${SCM}
+unset SCM
+
+EGO_PN="code.gitea.io/gitea"
+
+DESCRIPTION="A painless self-hosted Git service"
+HOMEPAGE="https://gitea.io"
+
+if [[ ${PV} != 9999* ]] ; then
+	SRC_URI="https://github.com/go-gitea/gitea/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64"
+else
+	EGIT_REPO_URI="https://github.com/go-gitea/gitea"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+	has test ${FEATURES} && EGIT_MIN_CLONE_TYPE="mirror"
+fi
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="+acct pam sqlite"
+
+BDEPEND="dev-lang/go"
+DEPEND="pam? ( sys-libs/pam )"
+RDEPEND="${DEPEND}
+	acct? (
+		acct-group/git
+		acct-user/git[gitea]
+	)
+	dev-vcs/git"
+
+DOCS=( custom/conf/app.ini.sample CONTRIBUTING.md README.md )
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+gitea_make() {
+	local gitea_tags=(
+		bindata
+		$(usev pam)
+		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
+	)
+	local gitea_settings=(
+		"-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini"
+		"-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
+		"-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
+	)
+	local makeenv=(
+		TAGS="${gitea_tags[@]}"
+		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[@]}"
+		GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)"
+	)
+	[[ ${PV} != 9999* ]] && makeenv+=("DRONE_TAG=${PV}")
+
+	env "${makeenv[@]}" emake "$@"
+}
+
+src_prepare() {
+	default
+
+	local sedcmds=(
+		-e "s#^RUN_MODE = dev#RUN_MODE = prod#"
+		-e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"
+		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"
+		-e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#"
+		-e "s#^HTTP_ADDR = 0.0.0.0#HTTP_ADDR = 127.0.0.1#"
+		-e "s#^MODE = console#MODE = file#"
+		-e "s#^LEVEL = Trace#LEVEL = Info#"
+		-e "s#^LOG_SQL = true#LOG_SQL = false#"
+		-e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
+		-e "s#^APP_ID =#;APP_ID =#"
+		-e "s#^TRUSTED_FACETS =#;TRUSTED_FACETS =#"
+	)
+
+	sed -i "${sedcmds[@]}" custom/conf/app.ini.sample || die
+	if use sqlite ; then
+		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.ini.sample || die
+	fi
+
+	gitea_make generate
+}
+
+src_compile() {
+	gitea_make build
+}
+
+src_test() {
+	if has network-sandbox ${FEATURES}; then
+		einfo "Remove tests which are known to fail with network-sandbox enabled."
+		rm ./modules/migrations/github_test.go || die
+	fi
+
+	if [[ ${PV} != 9999* ]] ; then
+		einfo "Remove tests which depend on gitea git-repo."
+		rm ./modules/git/blob_test.go || die
+		rm ./modules/git/repo_test.go || die
+	fi
+
+	default
+}
+
+src_install() {
+	dobin gitea
+
+	einstalldocs
+
+	newconfd "${FILESDIR}/gitea.confd-r1" gitea
+	newinitd "${FILESDIR}/gitea.initd-r3" gitea
+	newtmpfiles - gitea.conf <<-EOF
+		d /run/gitea 0755 git git
+	EOF
+	systemd_newunit "${FILESDIR}"/gitea.service-r2 gitea.service
+
+	insinto /etc/gitea
+	newins custom/conf/app.ini.sample app.ini
+	if use acct ; then
+		fowners root:git /etc/gitea/{,app.ini}
+		fperms g+w,o-rwx /etc/gitea/{,app.ini}
+
+		diropts -m0750 -o git -g git
+		keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
+		keepdir /var/log/gitea
+	fi
+}
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index bd1b625f8107..8ea044c2c047 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -3,10 +3,10 @@ AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
 DIST grafana-bin-6.3.5.tar.gz 58756804 BLAKE2B ffa96e5fd067dbe3590c8102c8ac93337679d968c19ec0decf44a39118d4473da82ac2f6702400cc57c22ea7703af3e7cd39aad9a1c63f41c5613b3d5bbe2bed SHA512 0298894f845fa6e322f3fa51364ba24617f3847c2f597a336ba3c1e761165a11efb9a884c3cce8856281bcb8ea3b66341c5ba301f58ce6bf2a8d0328ecd774bd
 DIST grafana-bin-6.3.6.tar.gz 58756037 BLAKE2B cdc7aaf9fe33ac271ca3a942e4dd9d33e8f6125db239a6b83ae33232730c44a8aa6395ebeaf60ed1d862912ba84c36347481c78d89150b32ae325926145037a5 SHA512 2c230c510a7e480aa9d972fc6648a4748fb5587830078a86b7a228f6abd1e8f4b1eb20f5ffb5d166ce07b43ac602e01af6c0574e3f8b276dde856ae6ac437067
-DIST grafana-bin-6.4.1.tar.gz 59635417 BLAKE2B 302a0663e91c7874ffd951a67ffe360f11f959a371e1605ef90647145928fbb0d7697f4db80fa38f97196fd11e89db84e01beaee85e35976b52ed2e2de13fec7 SHA512 95675c2bfd02edea4d0f1c30530822623acdd5b4ea07113d7a5d1bb10e89c2d2012ba459693cdf9ec83cc8a676fe635dbf6b9b359184e2df8bf7a0375b56ec7e
 DIST grafana-bin-6.4.3.tar.gz 59643330 BLAKE2B 721a32cb8b6a876fab8d1f9fd2d8ef0b5ffb142c9b35cf7d854a8f740c74a295eab84eb84a7404edcd7f2cb0e2a830f5cf701ad52b1d771c74623dabcb5dd4de SHA512 fdad6394fd050094a878da77a349b1c35320214b5ff522fe106a97bfd4e03267e4638e395fe19d69bcf1c5b6ba924907661d9549692a02a0463c641253dab6aa
+DIST grafana-bin-6.4.4.tar.gz 59693249 BLAKE2B 9a4a408e938475cee0154b3b49a2e6a10eec76effc2fda428c64449b74ce2ed3e939ce9ee35ff5aa21580e4b8b2410a199157107ef62852445df72536050390f SHA512 096abffb6a31ea9cfcbf3732f61b007a5cf0da77b681ebbad6d1b844d9a80fba725f18732cfba713b5b559eac748790dd1302088e51a917d141d1dd5dca6b5a9
 EBUILD grafana-bin-6.3.5.ebuild 1968 BLAKE2B fcc4feffc504f8060f41d50cf96e8080d421089e851d7e89d98cc166abce23ec21347c97ef8b693629664789584c67df82591a0d8e76acf12f86b33185ba9d32 SHA512 fc4e1c85e3346831ef9377e41ca3ab8636809a5ca4ce330fda39c739f5e184ee3c55bf0813ac60816ca980a71e093b9b78464b1c5210debac0aa76d953bdde9d
 EBUILD grafana-bin-6.3.6.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
-EBUILD grafana-bin-6.4.1.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
 EBUILD grafana-bin-6.4.3.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
-MISC metadata.xml 324 BLAKE2B 747dcf2b855aa56d5836860e136c1135a1940eee4cdf1c4049cc025fd36daad538e12813f0d96bef6dc5e5e4a76393d5c0e516210404f91f7cb19031c42816af SHA512 0d8b412c363e342c7971b1a95ddc52a57a6e5f9f742134682af5afeee9fef1cb7c110450891fb36b7a77cc7c19e845f24d8ad984cbbb7cc0a97adee4f9d71f24
+EBUILD grafana-bin-6.4.4.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
+MISC metadata.xml 218 BLAKE2B 2189d142b4baed0b8edb49fcc98f7397610a257a4cb5f87873272b284f84290420f0950c8b41d1d050ca7a1e0486c6e00344672a3f0479d1d382c14bf7f18485 SHA512 882f7787b97aa780dd3ba4112b9e1dcc84986e2a17704cba9a557ec3a3f9211bcf93532b92d42f60157b56b457ee9ee17e5409066230e54d48931b91bd6786cd
diff --git a/www-apps/grafana-bin/grafana-bin-6.4.1.ebuild b/www-apps/grafana-bin/grafana-bin-6.4.4.ebuild
index ed520bacd97a..ed520bacd97a 100644
--- a/www-apps/grafana-bin/grafana-bin-6.4.1.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-6.4.4.ebuild
diff --git a/www-apps/grafana-bin/metadata.xml b/www-apps/grafana-bin/metadata.xml
index de3562b1bee5..8c5a5301197b 100644
--- a/www-apps/grafana-bin/metadata.xml
+++ b/www-apps/grafana-bin/metadata.xml
@@ -4,8 +4,4 @@
 	<maintainer type="person">
 		<email>patrick@gentoo.org</email>
 	</maintainer>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 3a631b216944..d5e3740eddd6 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,8 +1,6 @@
-DIST icingaweb2-2.6.3.tar.gz 8174959 BLAKE2B 6301a0a509031828b8db886e4ab060596f2239de4e65fe714d98a8f8f73305a1116b534f5c2747ab78446ff39b34fa96fe4eae758942aab2de4946c7cf1cdbcb SHA512 f1d14c7ed87cd677a1c4ac03fd6a54514e7e4693000215e0e1628b0480c738848858546e54866eda3a55b4e7c35b5837ad01dc08b5b76502e24d5a727e271710
 DIST icingaweb2-2.7.1.tar.gz 8389123 BLAKE2B f5e469c1fde2b7bc2c22f898a5fb5370ca3788571501f070ed56b32afe8a155aafe70a06bbe09b77cd996725c3e176363aaf0fa885bc843102c56ddfa14da11d SHA512 0300e483e83699a79750dcfd4467a151fcfa95a1eb8735e8d0d8e5d59595ad252b630add3cb462fa4c115b2891f9ab904739ee36d5eb7fcdfb489c9d7658f1b6
 DIST icingaweb2-2.7.3.tar.gz 8388950 BLAKE2B 8d32f770020f72f1fbbf4c73de1935430976afe976c0b4497a1dd470aad286a9ec57d16dcd1f3f7354082206033d58b43966884c453fd8dd4106c13d8d3e8359 SHA512 eee3f81bb3eb29eeaeffe2f890639a12d75f9acf3b7c6649faaff3ab817ab2a5b6cd93b31637794969817f2d42ef5a46704fdc09488642caf6380f57c90d97cb
-EBUILD icingaweb2-2.6.3.ebuild 2527 BLAKE2B 804935e74b5969090cd6caca25e16e0537ce9c467007fa72a56011b0b852b01920bb3592bba24da63a57767d3385229851749eb1a829e62523b6995ebbc6d9ce SHA512 7030468c78d304c7d745d95b3acbe1f8782b323126664449785ce9145fab750dccff5daf2c97e72179fb483790e9a978585ffc9d9e81c6723db337ba9fe96d1c
 EBUILD icingaweb2-2.7.1.ebuild 2527 BLAKE2B 804935e74b5969090cd6caca25e16e0537ce9c467007fa72a56011b0b852b01920bb3592bba24da63a57767d3385229851749eb1a829e62523b6995ebbc6d9ce SHA512 7030468c78d304c7d745d95b3acbe1f8782b323126664449785ce9145fab750dccff5daf2c97e72179fb483790e9a978585ffc9d9e81c6723db337ba9fe96d1c
-EBUILD icingaweb2-2.7.3.ebuild 2529 BLAKE2B 49280ea2832b73adbbb3a246cbea7bb10871be65e2741a1324712727508f0f4d344217568e1f77a8f520cd1a490f614d44bb22c762c57103d98625c82f940e69 SHA512 7d4c16ee5dcf92a26096c8ec7ca084d5b36afa25652246d0c34207d1a53a83fef34d625377b0c44e2648df3573a7241c7d4f16a6356fbc17c1f0bd969d59f0ea
+EBUILD icingaweb2-2.7.3.ebuild 2527 BLAKE2B 804935e74b5969090cd6caca25e16e0537ce9c467007fa72a56011b0b852b01920bb3592bba24da63a57767d3385229851749eb1a829e62523b6995ebbc6d9ce SHA512 7030468c78d304c7d745d95b3acbe1f8782b323126664449785ce9145fab750dccff5daf2c97e72179fb483790e9a978585ffc9d9e81c6723db337ba9fe96d1c
 EBUILD icingaweb2-9999.ebuild 2529 BLAKE2B 49280ea2832b73adbbb3a246cbea7bb10871be65e2741a1324712727508f0f4d344217568e1f77a8f520cd1a490f614d44bb22c762c57103d98625c82f940e69 SHA512 7d4c16ee5dcf92a26096c8ec7ca084d5b36afa25652246d0c34207d1a53a83fef34d625377b0c44e2648df3573a7241c7d4f16a6356fbc17c1f0bd969d59f0ea
 MISC metadata.xml 530 BLAKE2B 855edf88f825a4c2f286068f7195264f1ca75f15aecf56d322a2e96b79ccdbea0b45c0a9a6cc4025dd2632cb0c97b60ffda3dd859adb7a2cfb35c0373c72bc0f SHA512 4ec6c57d7342dc1fa154f16e262f762374e37f6e4db09290c1b1188cc27ee605697d28b8349c51dee71fbfd5a90fd091e17b1dff4c9c9745bd6e69df8191897a
diff --git a/www-apps/icingaweb2/icingaweb2-2.6.3.ebuild b/www-apps/icingaweb2/icingaweb2-2.6.3.ebuild
deleted file mode 100644
index 4d66e260c407..000000000000
--- a/www-apps/icingaweb2/icingaweb2-2.6.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit depend.apache eutils multilib user
-
-DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
-HOMEPAGE="http://www.icinga.org/"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres"
-REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )"
-
-DEPEND=">=net-analyzer/icinga2-2.1.1
-		dev-php/pecl-imagick
-		pdf? ( media-gfx/imagemagick[png] )
-		apache2-server? ( >=www-servers/apache-2.4.0 )
-		nginx? ( >=www-servers/nginx-1.7.0:* )
-		|| (
-			dev-lang/php:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-		)"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-
-	enewgroup icingaweb2
-	enewgroup icingacmd
-	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
-	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
-}
-
-pkg_config() {
-	if [[ -d /etc/icingaweb2 ]] ; then
-		einfo "Updating existing installation ..."
-	else
-		einfo "Running first time setup ..."
-		einfo "Creating configuration directory ..."
-		/usr/share/${PN}/bin/icingacli setup config directory
-		einfo "Creating authentication token for web setup ..."
-		/usr/share/${PN}/bin/icingacli setup token create
-		if use apache2 ; then
-			einfo "The following might be useful for your Apache2 configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
-		fi
-		if use nginx ; then
-			einfo "The following might be useful for your NGinx configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
-		fi
-	fi
-	einfo "All done."
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins -r "${S}"/*
-	fperms -R a+rX "/usr/share/${PN}/public/"
-	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
-}
-
-pkg_postinst() {
-	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
-}
diff --git a/www-apps/icingaweb2/icingaweb2-2.7.3.ebuild b/www-apps/icingaweb2/icingaweb2-2.7.3.ebuild
index 45655f2ebdb1..4d66e260c407 100644
--- a/www-apps/icingaweb2/icingaweb2-2.7.3.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.7.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/www-apps/ikiwiki/Manifest b/www-apps/ikiwiki/Manifest
index 0c9770bf622e..ece7d1620c9f 100644
--- a/www-apps/ikiwiki/Manifest
+++ b/www-apps/ikiwiki/Manifest
@@ -1,7 +1,7 @@
 DIST ikiwiki_3.20170111.tar.xz 2614240 BLAKE2B b37d2e9095b38b2642bd4f2bd6114a8b313837bd409abd5c111d61a9abd2e65cc534e7efbcfdb72b148a567cc6391e576d61daf530c62b5e14269f2f25bbabf8 SHA512 78c2a624684bb1c34878ff008558a3967f6e7f5648878e931961695e582a40e4351b6e467c64ca42ba99cb403fd275265bd5d96ecd860ad8263043514d207ad4
 DIST ikiwiki_3.20171001.tar.xz 2638780 BLAKE2B 537008233f4c9612b3d1236eb15fe85a76a1bbbd1db9648197c032ec83c79ee3810dbd44f0a99576ac30e34e049662a1ae6525707cd1c786cc11081692ec57f7 SHA512 1f5c5a48aa95e6e3898fdb40826f90d554ff328c367133e69a2a2da4c9286e0e54ba2f2dcd57ff452fa3105c92b4d72297d771688661fb8ecf22b7a0cf78bd97
 DIST ikiwiki_3.20190228.orig.tar.xz 2672244 BLAKE2B 43012fc14f08c491ebe382e20953b8b01e10c390c28da0184b4e45a1435ada00b1ad6ac61f28c56ba1edb2e22dca1ab1f32eb77fc8d6133b899a26023593d3bd SHA512 125147d83dae6166b45541ed9176398ba4bd22ef3389d3efb3f442e558e326e0b004583d29aa32ed4bfca489c9d55b4232f074aab5fa649e51d9edd103685172
-EBUILD ikiwiki-3.20170111.ebuild 2086 BLAKE2B fad60188d2fa890350c9b2308409c9259dcc60c629f003ce2ee281c4c059d20d1c0369bbaf6290fd24f541e2b02227fa3ca87091ee49815bbbaacba5937ddc0e SHA512 7efdda5c7beb52be7f3de65a0090be7295f97350e69091d1069908d36f3165293e1ae399dbaa25bea68f5b433d2aa7c48918d7f7f4c1559a303c7f8d71336b52
-EBUILD ikiwiki-3.20171001.ebuild 2087 BLAKE2B 97788b721fcb8c552b9cddf1edbaf86d7815263efd072e0deafdce10ec1a4ef9f8a6879eeee43554f74b2873e15bf22d567e0023627e8834a9308736e065ce6c SHA512 66e0690357126199f0350be0f1fb04b87159480a14ee8e6d7d6b9db37b3b89cc5b2cd3bf3bb09dd828d17350e512f8af4b85033038a7b46f6891d57283bbc304
-EBUILD ikiwiki-3.20190228.ebuild 2090 BLAKE2B d21af6459cb5c11855f3c520578510c5bd3206a20e815b52916ef4bce8a8a9a695b8990371c77aae617af13975e8d45e4ecff3dd65c539cbc2dc4025cf187101 SHA512 d4aae81f8cfd839652979eee1a6b749e9af7c672dd01f420880ca14435e204fe3ce10cce6f3dfdd3813c654d022076eb678a4c0ab89a15fa82e09ad6518b907b
+EBUILD ikiwiki-3.20170111.ebuild 2110 BLAKE2B ce8f7ff4fafce2203fa7a757d1bc753ef17523a334960d8bdcf449ee981c365f61bb30c99eab1578692527e6e9b32a152286e3f91d50f1ae024dd09f48857235 SHA512 86030570777dee6ac123e63a74522147072a0cb56a84bffcdcb6385168a6aed7dab12e0ab9e38f4a9c41b486d004786ab3834347bd861f51dc3618f178c48a0d
+EBUILD ikiwiki-3.20171001.ebuild 2111 BLAKE2B 5e961d6859a13084a896f7396195f53854ba69a559da5cfbfa370508e14be88854061404074fc8bd8e121bd457d98303193913a8aba6c0187c38c63a71d98c28 SHA512 ea8f2bd0d510a9d14527935d6ed7ea2b9d2bfd01c1b36d7219109b0d015b77a28cfe79cdd539d48d390133b06f3a1af8d0394b38d7d0a429af24f25ee0348e46
+EBUILD ikiwiki-3.20190228.ebuild 2117 BLAKE2B a44fcc2746c47223ee18c89428b50a1d8b7bee41e705f537267ecf0eb2629b69b52669d44dae84dab6bdf595fcf7525663cdb634259af54a3b19b2f4234f724c SHA512 d8c4303b053547ad028bd1ed25f471cfa0863bdda2b6edf4aa017c6d6c2ff9c34408b558ae99741fd9051bd519f2d0824f130fdd24ed0076e8d8f32011dd9d9e
 MISC metadata.xml 336 BLAKE2B 659eb5913c4c6c05924f811fac31deea3cea40dd30b32b498ea5b55341f20cf9405065dfdf5d19e82f8ba93ff3ec4d5c5adbedfa51271d6762cff10c4a5088f4 SHA512 7d31f6078d1d49aef54bd46c5e8005d4247eb1cadfd4fdec36592deef15c4450a213d29c353dd43255a10918c2146c335efdbf7b626da2cd4ea98f815e0c5141
diff --git a/www-apps/ikiwiki/ikiwiki-3.20170111.ebuild b/www-apps/ikiwiki/ikiwiki-3.20170111.ebuild
index 56db287375d9..b829c1877e1b 100644
--- a/www-apps/ikiwiki/ikiwiki-3.20170111.ebuild
+++ b/www-apps/ikiwiki/ikiwiki-3.20170111.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
@@ -12,6 +12,7 @@ SRC_URI="mirror://debian/pool/main/i/ikiwiki/${PN}_${PV}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="extras minimal test"
+RESTRICT="!test? ( test )"
 KEYWORDS="amd64 ~x86"
 
 S=${WORKDIR}/${PN}-${PV}
diff --git a/www-apps/ikiwiki/ikiwiki-3.20171001.ebuild b/www-apps/ikiwiki/ikiwiki-3.20171001.ebuild
index 0fde64e34667..6240b30623dc 100644
--- a/www-apps/ikiwiki/ikiwiki-3.20171001.ebuild
+++ b/www-apps/ikiwiki/ikiwiki-3.20171001.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
@@ -12,6 +12,7 @@ SRC_URI="mirror://debian/pool/main/i/ikiwiki/${PN}_${PV}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="extras minimal test"
+RESTRICT="!test? ( test )"
 KEYWORDS="~amd64 ~x86"
 
 S=${WORKDIR}/${PN}-${PV}
diff --git a/www-apps/ikiwiki/ikiwiki-3.20190228.ebuild b/www-apps/ikiwiki/ikiwiki-3.20190228.ebuild
index 5791382b3092..e7f335283b1d 100644
--- a/www-apps/ikiwiki/ikiwiki-3.20190228.ebuild
+++ b/www-apps/ikiwiki/ikiwiki-3.20190228.ebuild
@@ -12,6 +12,7 @@ SRC_URI="mirror://debian/pool/main/i/ikiwiki/${PN}_${PV}.orig.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="extras minimal test"
+RESTRICT="!test? ( test )"
 KEYWORDS="amd64 ~x86"
 
 S=${WORKDIR}/IkiWiki-${PV}
diff --git a/www-apps/klaus/Manifest b/www-apps/klaus/Manifest
index 99bb423c2836..76841a0eae6b 100644
--- a/www-apps/klaus/Manifest
+++ b/www-apps/klaus/Manifest
@@ -1,5 +1,5 @@
 DIST klaus-1.4.0.tar.gz 36879 BLAKE2B 8a621338514e3be143c5b64a0a486d47edc7e7a14c839bc135e7c1693fd09ddea1529b5b2e1d8e0bb70f152629d7bff288f9221ae4243dac01995da4d00e5848 SHA512 8e596590fe29c62eeb823047780f747a0f4908f926dad8ff54000469dca013fcfcbaf7b53c0555db095fef71e4d9056e9b6e959005550bdfccc338f1ee3a5d2c
-DIST klaus-1.5.0.tar.gz 37819 BLAKE2B 06c987a6f0192e745d2216387d0547fa8d6787100fb75515e954830b214ac19e997d9da7eb6a9ecf30c9a7a7d3cbf1f63ced1cf3ec2544f16e7262fc79664489 SHA512 fa371bde18b112fafe26a2782d48123a083e111ab183c26e2af6a31a70a6028eb7c82bc5f3eda04703c61684ed990256e99d770b1328e4c61d3b0d13be65cb13
+DIST klaus-1.5.1.tar.gz 37563 BLAKE2B 164971626cab61d49e662fd356e0954e6ce8c1028d2452d661b3fdc386d835408e5aaaf83f14ec8851b7482e5a848086c6f15765811454ecf16628c01ba154b8 SHA512 a2244973ff93dbb00f5771755704fe7c6d5ee7f4f47189643f27cc114216a9b14327fc537b5c934c7ed8a08df52727600761402da0d492ffa5d5ba6c5f24af56
 EBUILD klaus-1.4.0.ebuild 919 BLAKE2B 1a598db00725e56a879816336f06392335aaf2317316a5f3015b99bde856b8f0bff4929f5d2aaa6a4f9c8981a72cbc06170730b36fae630dd69d5334d1c0ffbb SHA512 7e3c5ed3f5fe46ffd85bdcbde573f985d0b68aa53b5d4e65973e69fa65299dc6eb41c8c383ba1fa1e769591a6fc244e17aff35efa1b4dcc6da2eb4939a8f7277
-EBUILD klaus-1.5.0.ebuild 919 BLAKE2B 1a598db00725e56a879816336f06392335aaf2317316a5f3015b99bde856b8f0bff4929f5d2aaa6a4f9c8981a72cbc06170730b36fae630dd69d5334d1c0ffbb SHA512 7e3c5ed3f5fe46ffd85bdcbde573f985d0b68aa53b5d4e65973e69fa65299dc6eb41c8c383ba1fa1e769591a6fc244e17aff35efa1b4dcc6da2eb4939a8f7277
+EBUILD klaus-1.5.1.ebuild 919 BLAKE2B 1a598db00725e56a879816336f06392335aaf2317316a5f3015b99bde856b8f0bff4929f5d2aaa6a4f9c8981a72cbc06170730b36fae630dd69d5334d1c0ffbb SHA512 7e3c5ed3f5fe46ffd85bdcbde573f985d0b68aa53b5d4e65973e69fa65299dc6eb41c8c383ba1fa1e769591a6fc244e17aff35efa1b4dcc6da2eb4939a8f7277
 MISC metadata.xml 684 BLAKE2B 3fd97f5f66e03afef819feddd1995814e607f188ca87ce5a294f3a10f794fdbcba2fdea691bca7e100d0b853925fd1248fea7eafc37cc947d31454a01c070af2 SHA512 37f5386826bc762dda625012e6016f65d0dd3d1ed4b88f62341cb4ed7b2876cc2a819550faed8fbcb939796d6d76f6d4dcca8f0559be329cc9f8f583c188d5e1
diff --git a/www-apps/klaus/klaus-1.5.0.ebuild b/www-apps/klaus/klaus-1.5.1.ebuild
index 1966b9410b74..1966b9410b74 100644
--- a/www-apps/klaus/klaus-1.5.0.ebuild
+++ b/www-apps/klaus/klaus-1.5.1.ebuild
diff --git a/www-apps/mod_survey/Manifest b/www-apps/mod_survey/Manifest
deleted file mode 100644
index 3ad51cc85de5..000000000000
--- a/www-apps/mod_survey/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 98_mod_survey.conf 4327 BLAKE2B 41b45b8c94b798cdefe7e8b2bc67ff1763cf39546b3cd509e2cbdacba4b766d3c70ec64409ff6427690a5172f035e9b4fc0c729172e9d347bce3d74f70b272a4 SHA512 37c6b7eb96eafa32ea3eb67d1c74f9139d81f2a9b8bc08ccbd40b7f1c94479e9a6f7ac1bff593238567be352fe1b39f8da8bdac40ea45e56bd6ca931c478b689
-DIST modsurvey-3.2.5.tgz 508271 BLAKE2B 63e45151417920c6e678836d3f8fec040c8afc8fabae128526764b69ac9ea5498740a252bfad8975dafcc89bb258a0f0671ed66ff646798a87bf256d69512bd2 SHA512 627b976e3f5bae180456daae2f4544d74abf1d0dafc3b3b43332ef055f4e3a9b66e4f5dfe7b997008237206963c203d518372106cb27073d29966e19271b0149
-DIST modsurvey-docs-3.2.5.tgz 678356 BLAKE2B 46e2f0653484db96beba406feeeb45483f51fb41f50af288169f9314bd827dc48248882a24225c7169995ae942ab11a1f994e658a2451b336a13dad34f6ed41f SHA512 3511720922668a2d55f675366c9b7e3e9a67fea8abafa39018475ec5734b496e8d6c8ba313e5d2182028ae324aaff84702c09380a1ffb1cbcc14b5cbfbfb4403
-EBUILD mod_survey-3.2.5.ebuild 1758 BLAKE2B cf6890e5fd5c11d472f04ee6eb0051a4c4d9148336fbc84690c5005d2f5fdde4cfd1306d3c2c3aa61d3d99d498d0704efd0e8a09274e26e0732eb66e78c90064 SHA512 d3679fcd04896b77b392798b9f6c01a9672ac542638aa7be6cd377c1d154d0c173a12e226a28f5d97b6c4431b8572a898a365ba7a5a71dba3353c8714b1c6045
-MISC metadata.xml 250 BLAKE2B 856ff9793486ce226d86aeb43e3c5a75acf1fdd49936d52cf09e72669d2e956844d9087cf5cb67d4f04353d30be644bfc1daaa70b2ae332651f4bf71ae5c31e8 SHA512 8a7934e6db1aa1e0aba026a0438fb291819be69c134d54bb3af0638facc3e0a47bc30557c944bfaf5adbdd1dbdcbc96dec88d69ab809b1758e5701ff38fc6282
diff --git a/www-apps/mod_survey/files/98_mod_survey.conf b/www-apps/mod_survey/files/98_mod_survey.conf
deleted file mode 100644
index 1791c5a88f8e..000000000000
--- a/www-apps/mod_survey/files/98_mod_survey.conf
+++ /dev/null
@@ -1,115 +0,0 @@
-# -----------------------------------------
-# Config new for 32x
-# -----------------------------------------
-
-PerlSetEnv _SURVEY_ALLOWED_EXPORTS   "html,spss,sql,delim,fixed,xml,r"
-PerlSetEnv _SURVEY_OPTIONAL_EXPORTS  "browse,desc,freq,gfreq"
-PerlSetEnv _SURVEY_EXPORT_html       "Survey::Export::HtmlTables"
-PerlSetEnv _SURVEY_EXPORT_spss       "Survey::Export::SPSS"
-PerlSetEnv _SURVEY_EXPORT_xml        "Survey::Export::XML"
-PerlSetEnv _SURVEY_EXPORT_sql        "Survey::Export::SQL"
-PerlSetEnv _SURVEY_EXPORT_delim      "Survey::Export::DelimitedFields"
-PerlSetEnv _SURVEY_EXPORT_fixed      "Survey::Export::FixedColumns"
-PerlSetEnv _SURVEY_EXPORT_r          "Survey::Export::R"
-PerlSetEnv _SURVEY_EXPORT_browse     "Survey::Export::CaseBrowser"
-PerlSetEnv _SURVEY_EXPORT_desc       "Survey::Export::Descriptive"
-PerlSetEnv _SURVEY_EXPORT_freq       "Survey::Export::Frequency"
-PerlSetEnv _SURVEY_EXPORT_gfreq      "Survey::Export::GroupedFrequency"
-
-# -----------------------------------------
-# Mail settings
-# -----------------------------------------
-
-PerlSetEnv _SURVEY_SMTP_HOST         "127.0.0.1"
-PerlSetEnv _SURVEY_MAIL_ADMIN        "root@localhost"
-
-# -----------------------------------------
-# Set global survey configuration variables
-# -----------------------------------------
-
-# Directory where caches, autodata files and keys should be stored
-PerlSetEnv _SURVEY_SYSBASE           "/var/lib/mod_survey/"
-
-# Whether parser is allowed to write and read cache at all (overrides
-# ALLOWCACHE in survey docs if set to 0)
-PerlSetEnv _SURVEY_PARSERCACHE       1
-
-# Whether display module is allowed to write and read html output cache
-# (overrides ALLOWCACHE in survey docs if set to 0)
-PerlSetEnv _SURVEY_DISPLAYCACHE      1
-
-# Where mod_survey is installed
-PerlSetEnv _SURVEY_HOME              "/usr/lib/mod_survey/"
-
-# Where mod_survey web root is
-PerlSetEnv _SURVEY_ROOT              "/var/www/mod_survey/"
-
-# Which root alias to use for doc links and similar
-PerlSetEnv _SURVEY_ROOT_ALIAS        "/mod_survey/"
-
-# Whether we have installed on a sensible (unixoid) system
-PerlSetEnv _SURVEY_SENSIBLE          1
-
-# -------------------------
-# Security related settings
-# -------------------------
-
-# If you plan to use DBI tables, you must install DBI 1.13 or later and
-# set the below to 1. Even if you have DBI installed, you may want to
-# choose to not enable it in Mod_Survey for security reasons.
-PerlSetEnv _SURVEY_USEDBI            1
-
-# Whether is is allowed to let system automatically handle data submission
-# It would a stupid idea to change this unless you know what you are doing.
-PerlSetEnv _SURVEY_ALLOWAUTO         1
-
-# Whether submit should protest at illegal characters and ask the user
-# to go back and correct these. This will be ignored if _SURVEY_USENEWAUTo
-PerlSetEnv _SURVEY_PROTESTILLEGAL    1
-
-# Whether to use safe delimiters in the AutoData file. This makes things
-# safer, but also makes the AutoData file partially binary. Most users
-# want to enable this.
-PerlSetEnv _SURVEY_USENEWAUTO        1
-
-# -------------------------------------
-# Internationalization related settings
-# -------------------------------------
-
-# Where to find language files
-PerlSetEnv _SURVEY_LANG_DIRECTORY    "/usr/lib/mod_survey/Lang/"
-
-# Which language to use
-PerlSetEnv _SURVEY_LANG              "en"
-
-# ---------------------------------------------------
-# Startup check and addition of survey folder to @INC
-# ---------------------------------------------------
-
-PerlRequire "/usr/lib/mod_survey/startup.pl"
-
-# --------------------------------------------------------------------
-# Add type for survey files. If you change this, please change pattern
-# for the files tag below too
-# --------------------------------------------------------------------
-
-AddType text/html .survey
-
-# ---------------------------------------------------------------
-# Match all files containing ".survey" (tail "*" is necessary for
-# admin part). Enclosure in Directory necessary to avoid clash with
-# mod_proxy.
-# ---------------------------------------------------------------
-
-<Directory "/">
-	<Files *.survey*>
-		SetHandler perl-script
-		PerlHandler Survey::Handler
-		PerlSendHeader "Off"
-		AuthType Basic
-		AuthName Mod_Survey
-		PerlAuthenHandler Apache::AuthAny
-	</Files>
-</Directory>
-
-# vim: ts=4 filetype=apache
diff --git a/www-apps/mod_survey/metadata.xml b/www-apps/mod_survey/metadata.xml
deleted file mode 100644
index 2b9b44f73497..000000000000
--- a/www-apps/mod_survey/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>web-apps@gentoo.org</email>
-		<name>Gentoo Webapps</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/www-apps/mod_survey/mod_survey-3.2.5.ebuild b/www-apps/mod_survey/mod_survey-3.2.5.ebuild
deleted file mode 100644
index 9fe895cc6616..000000000000
--- a/www-apps/mod_survey/mod_survey-3.2.5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit depend.apache webapp
-
-WEBAPP_MANUAL_SLOT="yes"
-SLOT="0"
-
-MY_PN=${PN/_/}
-
-DESCRIPTION="XML-defined web questionnaires as a plug-in module using Apache"
-HOMEPAGE="http://www.modsurvey.org"
-SRC_URI="http://www.modsurvey.org/download/tarballs/${MY_PN}-${PV}.tgz
-	doc? ( http://www.modsurvey.org/download/tarballs/${MY_PN}-docs-${PV}.tgz )"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc mysql nls postgres"
-
-DEPEND=">=dev-lang/perl-5.6.1"
-RDEPEND="${DEPEND}
-	>=www-apache/mod_perl-1.99
-	postgres? ( >=dev-perl/DBI-1.38 dev-perl/DBD-Pg )
-	mysql? ( >=dev-perl/DBI-1.38 dev-perl/DBD-mysql )
-	>=dev-perl/CGI-3.0.0"
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-pkg_setup() {
-	webapp_pkg_setup
-	has_apache
-
-	if use nls; then
-		ewarn "English will be set as the default language."
-		ewarn "This can be overriden on a per-survey basis, or changed in"
-		ewarn "${APACHE_MODULES_CONFDIR}/98_${PN}.conf"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i \
-		-e "s|/usr/local/mod_survey/|${D}/usr/lib/mod_survey/|g" \
-		installer.pl
-
-	rm -f docs/LICENSE.txt
-	use doc && unpack ${MY_PN}-docs-${PV}.tgz
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodir /usr/lib/mod_survey
-	dodir /var/lib/mod_survey
-
-	dodoc README.txt docs/*
-	rm -rf README.txt docs/
-
-	insinto /usr/share/doc/${PF}
-	doins -r webroot/examples*
-	rm -rf webroot/examples*
-
-	perl installer.pl < /dev/null > /dev/null 2>&1
-	rm -rf "${D}"/usr/lib/mod_survey/{survey.conf,data,docs,webroot}
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r webroot/{main.css,system}
-
-	insinto "${APACHE_MODULES_CONFDIR}"
-	doins "${FILESDIR}"/98_${PN}.conf
-
-	fowners apache:apache /var/lib/mod_survey
-
-	webapp_src_install
-}
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 4ef0b41df177..76246eb2bf36 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -5,7 +5,9 @@ AUX postinstall-nodb-en.txt 171 BLAKE2B ee2aa857cf365815b705b5e60c5b2fef0cdb0bcd
 DIST moodle-3.5.9.tgz 46748268 BLAKE2B 41c1b9f47f088438fddaa3bbf913091610d8b5aece8413944d79ba67381a50c510c257eab56c8a41f755335417549107c4e349134f3d0c39579329efd04cee34 SHA512 262449f3c424655d86746c13548187e412575ba4abe5d4bac2bcd64aa8f2ce4ea3fd3663bba8a61c10c9bd9192d5fb1ee19d75484340972a909284bc5d923a2c
 DIST moodle-3.6.7.tgz 47805595 BLAKE2B 567d179d3f2c600960c979dc54a92de9bf95e0710de20f6dcb304d8d6a528d929b60183f56e707a3254a2c98060c2c3ced62272360912716d8a1cf2fa7bd3b98 SHA512 b406fccb8ea572cf14cb8c06e746778b1ce92a170537ed4cd17e1a0977d30e5b8711a7cb36f7d845acc1af31a348faf7cf3b8beca815c1caa8ac0b2c2cf48ae4
 DIST moodle-3.7.3.tgz 45782119 BLAKE2B 2732e0269d65f213b71e32231f7fff8ba06f2456466f8fa00f9e7f204f0f7160b3552763c555f952a35cbb9344c9494e7122bd9a6f9ecea8b9ca18a8a9d90e07 SHA512 e9cb7d633be57ed9a66f54f33d2b2827a0ee18d3e7d48f463e8526b817e470d9d1930dbef557f84d94c1dc20a2543874e3bbbae4ac89eeda62217ac2bbddb14d
-EBUILD moodle-3.5.9.ebuild 2949 BLAKE2B 948d8ccf72fa401f3243b6ed4751de0ecf498502c5d1fa1f592c0dcc649670e99c2576d0d1ba40be463ebb4ae2bd3803000c6132e3d00eae5758bf70bccd256e SHA512 0c300c8f3b7e7758a1d29ae12be386f4b459cdc65fcd39ed45da307e503e03bcd99e68aa6798260e813aa92d03e4f1d0a4161e6e093d0b4fca6cb0b6db86a86f
-EBUILD moodle-3.6.7.ebuild 2949 BLAKE2B 948d8ccf72fa401f3243b6ed4751de0ecf498502c5d1fa1f592c0dcc649670e99c2576d0d1ba40be463ebb4ae2bd3803000c6132e3d00eae5758bf70bccd256e SHA512 0c300c8f3b7e7758a1d29ae12be386f4b459cdc65fcd39ed45da307e503e03bcd99e68aa6798260e813aa92d03e4f1d0a4161e6e093d0b4fca6cb0b6db86a86f
-EBUILD moodle-3.7.3.ebuild 2949 BLAKE2B cb6e624bb0c83c5e8a3e7d9a541cb61dcf93dd6b06bdbf417ac96631444665a08bfdb5d1366636c0452421faf6350d4b886d08d6a9a07b8676f45cdcb040ffa8 SHA512 593727dc584922aa6a0074c01ab6d31bf738c7e198d4901ce2766c2dbda9eae26b0f2ccb4360d117da3d8fb76f34b656b6f777d2e1aa992401bc8bd627774c67
+DIST moodle-3.8.tgz 53109307 BLAKE2B 833160d06cb1068eda5474a4bba5bfb05a80b857c32a92eea2c92eb1bd6fec91fd1098f7172d643a9f0a8a7c567afda395f91d884446ff8c5113eac1d441e79a SHA512 c67803b62d25d3031ea58afea8820d746da144b0ef5c41f659fe0d9a99aeef5f287c4582b3766ec28452495bea03aed78509acd71a203edf990328d31f185bf3
+EBUILD moodle-3.5.9.ebuild 2804 BLAKE2B 0e176684ae1e2682448bbeb4f3d11f4888b5cda74eb2399839199e629ea01d35b1296450b90003a4ec78ba94bdddefccd982b8afaf79e8f5c0eb2ee5ad13475d SHA512 261e6dcf491af3a2d04d28a1a8d45e634b88f0a20d2510e0928a9a8c22824f5cfe2065fcc24e42cd918492a62e638e65bcaf7ef75de2ff0bbb1cf66ee9996f4f
+EBUILD moodle-3.6.7.ebuild 2804 BLAKE2B 0e176684ae1e2682448bbeb4f3d11f4888b5cda74eb2399839199e629ea01d35b1296450b90003a4ec78ba94bdddefccd982b8afaf79e8f5c0eb2ee5ad13475d SHA512 261e6dcf491af3a2d04d28a1a8d45e634b88f0a20d2510e0928a9a8c22824f5cfe2065fcc24e42cd918492a62e638e65bcaf7ef75de2ff0bbb1cf66ee9996f4f
+EBUILD moodle-3.7.3.ebuild 2804 BLAKE2B 985d48d4fa7a008d1175ad60d47f9212eb486017bace234589cd444e615b2df4d17b2bd00945d2ccbf66cd2c83a0c3ccce4cea9227f68ffd6dd6b2dcb6ccb2a6 SHA512 f370c9419da9ac3fd4bcdf92025ca7ae3998be18bb1be73b9fd26edb00c95d690c885d7fcf4d17532f222dd029224826a3a319864603471ec57642e640384430
+EBUILD moodle-3.8.ebuild 2804 BLAKE2B 985d48d4fa7a008d1175ad60d47f9212eb486017bace234589cd444e615b2df4d17b2bd00945d2ccbf66cd2c83a0c3ccce4cea9227f68ffd6dd6b2dcb6ccb2a6 SHA512 f370c9419da9ac3fd4bcdf92025ca7ae3998be18bb1be73b9fd26edb00c95d690c885d7fcf4d17532f222dd029224826a3a319864603471ec57642e640384430
 MISC metadata.xml 355 BLAKE2B 68d10d39dd24da3d570f13edec9c4adae89b7620bb455c1c30377c3cebe56c4961d1548360adedc96fce780067b308193fdb7560478a60ab56c364b774b1984a SHA512 f02e5404a714cb20207e494f635fb0e98870576c4b5f6affc4dc27fccfcabdd1af1c7411a83cfd4e01b51ecc24d11944d1e612757ff45ab4405f6099ed9b1278
diff --git a/www-apps/moodle/moodle-3.5.9.ebuild b/www-apps/moodle/moodle-3.5.9.ebuild
index 1c5e865ec67c..07dbb6d2bb56 100644
--- a/www-apps/moodle/moodle-3.5.9.ebuild
+++ b/www-apps/moodle/moodle-3.5.9.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit versionator webapp
+inherit webapp
 
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
+MY_BRANCH="stable$(ver_cut 1)$(ver_cut 2)"
 
 DESCRIPTION="The Moodle Course Management System"
 HOMEPAGE="https://moodle.org"
 SRC_URI="https://download.moodle.org/${MY_BRANCH}/${P}.tgz"
 S="${WORKDIR}/${PN}"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 #SLOT empty due to webapp
 
@@ -30,7 +29,6 @@ PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
 PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
 
 IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
-REQUIRED_USE="|| ( ${DB_TYPES} )"
 
 # No forced dependency on
 #  mssql? - lives on a windows server
@@ -58,14 +56,13 @@ pkg_setup() {
 		fi
 	done
 
-	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
-	#if [[ ${DB_COUNT} -eq 0 ]]; then
-	#	eerror
-	#	eerror "No database selected in your USE flags,"
-	#	eerror "You must select at least one."
-	#	eerror
-	#	die
-	#fi
+	if [[ ${DB_COUNT} -eq 0 ]]; then
+		eerror
+		eerror "No database selected in your USE flags,"
+		eerror "You must select at least one."
+		eerror
+		die
+	fi
 
 	if [[ ${DB_COUNT} -gt 1 ]]; then
 		MYDB=""
diff --git a/www-apps/moodle/moodle-3.6.7.ebuild b/www-apps/moodle/moodle-3.6.7.ebuild
index 1c5e865ec67c..07dbb6d2bb56 100644
--- a/www-apps/moodle/moodle-3.6.7.ebuild
+++ b/www-apps/moodle/moodle-3.6.7.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit versionator webapp
+inherit webapp
 
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
+MY_BRANCH="stable$(ver_cut 1)$(ver_cut 2)"
 
 DESCRIPTION="The Moodle Course Management System"
 HOMEPAGE="https://moodle.org"
 SRC_URI="https://download.moodle.org/${MY_BRANCH}/${P}.tgz"
 S="${WORKDIR}/${PN}"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 #SLOT empty due to webapp
 
@@ -30,7 +29,6 @@ PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
 PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
 
 IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
-REQUIRED_USE="|| ( ${DB_TYPES} )"
 
 # No forced dependency on
 #  mssql? - lives on a windows server
@@ -58,14 +56,13 @@ pkg_setup() {
 		fi
 	done
 
-	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
-	#if [[ ${DB_COUNT} -eq 0 ]]; then
-	#	eerror
-	#	eerror "No database selected in your USE flags,"
-	#	eerror "You must select at least one."
-	#	eerror
-	#	die
-	#fi
+	if [[ ${DB_COUNT} -eq 0 ]]; then
+		eerror
+		eerror "No database selected in your USE flags,"
+		eerror "You must select at least one."
+		eerror
+		die
+	fi
 
 	if [[ ${DB_COUNT} -gt 1 ]]; then
 		MYDB=""
diff --git a/www-apps/moodle/moodle-3.7.3.ebuild b/www-apps/moodle/moodle-3.7.3.ebuild
index 02e7fab65927..f9ed8bfdb6fd 100644
--- a/www-apps/moodle/moodle-3.7.3.ebuild
+++ b/www-apps/moodle/moodle-3.7.3.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit versionator webapp
+inherit webapp
 
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
+MY_BRANCH="stable$(ver_cut 1)$(ver_cut 2)"
 
 DESCRIPTION="The Moodle Course Management System"
 HOMEPAGE="https://moodle.org"
 SRC_URI="https://download.moodle.org/${MY_BRANCH}/${P}.tgz"
 S="${WORKDIR}/${PN}"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 #SLOT empty due to webapp
 
@@ -30,7 +29,6 @@ PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
 PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
 
 IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
-REQUIRED_USE="|| ( ${DB_TYPES} )"
 
 # No forced dependency on
 #  mssql? - lives on a windows server
@@ -58,14 +56,13 @@ pkg_setup() {
 		fi
 	done
 
-	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
-	#if [[ ${DB_COUNT} -eq 0 ]]; then
-	#	eerror
-	#	eerror "No database selected in your USE flags,"
-	#	eerror "You must select at least one."
-	#	eerror
-	#	die
-	#fi
+	if [[ ${DB_COUNT} -eq 0 ]]; then
+		eerror
+		eerror "No database selected in your USE flags,"
+		eerror "You must select at least one."
+		eerror
+		die
+	fi
 
 	if [[ ${DB_COUNT} -gt 1 ]]; then
 		MYDB=""
diff --git a/www-apps/moodle/moodle-3.8.ebuild b/www-apps/moodle/moodle-3.8.ebuild
new file mode 100644
index 000000000000..f9ed8bfdb6fd
--- /dev/null
+++ b/www-apps/moodle/moodle-3.8.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit webapp
+
+MY_BRANCH="stable$(ver_cut 1)$(ver_cut 2)"
+
+DESCRIPTION="The Moodle Course Management System"
+HOMEPAGE="https://moodle.org"
+SRC_URI="https://download.moodle.org/${MY_BRANCH}/${P}.tgz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-3+"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+#SLOT empty due to webapp
+
+DB_FLAGS="mysqli?,mssql?,postgres?"
+DB_TYPES=${DB_FLAGS//\?/}
+DB_TYPES=${DB_TYPES//,/ }
+
+AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
+AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
+AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
+
+PHP_REQUIRED_FLAGS="ctype,curl,iconv,json,session,simplexml,xml,zip"
+PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
+PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
+
+IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
+
+# No forced dependency on
+#  mssql? - lives on a windows server
+#  mysql? ( virtual/mysql )
+#  postgres? ( dev-db/postgresql-server-9* )
+# which may live on another server.  These USE flags affect the configuration
+# file and the dependency on php.  However other dbs are possible.  See config.php
+# and the moodle documentation for other possibilities.
+DEPEND=""
+RDEPEND="
+	>=dev-lang/php-7.1[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
+	virtual/httpd-php
+	virtual/cron"
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	# How many dbs were selected? If one and only one, which one is it?
+	MYDB=""
+	DB_COUNT=0
+	for db in ${DB_TYPES}; do
+		if use ${db}; then
+			MYDB=${db}
+			DB_COUNT=$(($DB_COUNT+1))
+		fi
+	done
+
+	if [[ ${DB_COUNT} -eq 0 ]]; then
+		eerror
+		eerror "No database selected in your USE flags,"
+		eerror "You must select at least one."
+		eerror
+		die
+	fi
+
+	if [[ ${DB_COUNT} -gt 1 ]]; then
+		MYDB=""
+		ewarn
+		ewarn "Multiple databases selected in your USE flags,"
+		ewarn "You will have to choose your database manually."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	rm COPYING.txt
+	cp "${FILESDIR}"/config-r1.php config.php
+
+	# Moodle expect pgsql, not postgres
+	MYDB=${MYDB/postgres/pgsql}
+
+	if [[ ${DB_COUNT} -eq 1 ]] ; then
+		sed -i -e "s|mydb|${MYDB}|" config.php
+	fi
+
+	eapply_user
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
+	dodir ${MOODLEDATA}
+	webapp_serverowned -R "${MOODLEDATA}"
+
+	local MOODLEROOT="${MY_HTDOCSDIR}"
+	insinto ${MOODLEROOT}
+	doins -r *
+
+	webapp_configfile "${MOODLEROOT}"/config.php
+
+	if [[ ${DB_COUNT} -eq 1 ]]; then
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	else
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
+	fi
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	einfo
+	einfo
+	einfo "To see the post install instructions, do"
+	einfo
+	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
+	einfo
+	einfo
+}
diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index e900e74a105e..de3066c362be 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -1,15 +1,4 @@
-DIST Nikola-7.8.11.tar.gz 4104413 BLAKE2B 22da280a7f7416ad88680a573aa103dc38a8e7ed5476f0ce35c7d179131aaf6bc41edfd1f591967bcc6e747a279b5e0b9e2e0c6e959d45e93328dcb14d95658e SHA512 9273f56a6cbb08db9a4b5c562cd4e80e8bbb777c299406bc3d816a63d8b21d1b2a3e4aa3fa376858459a650ded54b0526ac54b4f186757cd2dec7ccf656e145e
-DIST Nikola-7.8.12.tar.gz 4106202 BLAKE2B 95ef2d074145b40be90f8daf7de92dc4091e24b0db8e5f949daeff6e6bd03d2437198a4a1e33728c204c907cd94fc1ad6f6d0a1945119eaaa738cbc172dfaadb SHA512 8be18b4a9b61da7de1c0b3d75cd0d2bebc9c45191b30b8f918b2a6c8af333d1a6545f7336a033c3aef25a6920d905ff10f7d8238aba586b1dcbc6b92e03e376d
-DIST Nikola-7.8.13.tar.gz 4131250 BLAKE2B 6fdb12e59d7e977bc1ab9e2dd458de4a8a61104e1237926d5362ce1420fd3533617d268a4b496a4248932255459a2e3fa43488be62fedc86ab7c62a3c3cefeb3 SHA512 95118f9e2a7d884ab3e7f517749de6cde22439579cf6e05245111ab972f2def0c7ab824978cf750d2bedf788b2a994ec743e9574b70d17424e04c570ef796bef
-DIST Nikola-7.8.14.tar.gz 4130538 BLAKE2B dc8cd3a484bf203291ff8ca2b25233814e68bf916081f692a73c87af953cd57ea732dfdedfb8508187fb27566204f9442eb87847c98018fa0e5ef4ab4eb5295f SHA512 1a930e0cebbc9d54437ce438622eb2a6ad01988aaa9706f58cc0add17e483c3510d3a8ba120b8aa3b475c0e030cca471173f2520fd36e9528144cdee40fb1a9c
 DIST Nikola-7.8.15.tar.gz 4131518 BLAKE2B ea3dca9340852a68b668de82e5deeaa0ecf7bb8597f311721b27409fe0cf820919c79f6e631b030bd3ea4571dd8480c862c607d0b9e6015a8b03023de5a9b93e SHA512 b441ae014539b948d007183ceb574243b89a498be265da7245095f67510d4d7c109c4935e0f9765b4144e82f788a1b66a0eacfba1477a89ce6c2645cb77102d7
-DIST Nikola-7.8.8.tar.gz 3870991 BLAKE2B df6b3784acb339faccbcf1d269a2a9e315861be25e3880fab1c18754df1121b7081e9d1ad08d5a08d6b6913eacfdf184d9a19e5e1218a038913a6c7d2f78dcde SHA512 6222cfaea048a547d8a224828815b8334d2f39abf872d63b9a970ca017cee37e5efeaccc5327b8c21bea9fdfe7beafae7ac9af9f57d459a10fa991879bf74687
-EBUILD nikola-7.8.11.ebuild 2312 BLAKE2B 56afad2e27e9a653b7e70bf5347b89321e21a111d2fbb4e970cd3bd81ffc694284e845cac11da06de1ed2d51727d148c0a60fa71eb68b54714b67c106581ef00 SHA512 06bc0d9bc32618cb29d2ec874c96325df90f0d8ce0cc4e23045f85b11427c696404cfaf17da09d7579426387995fbc7278336ce8beedcb18852847599559dcad
-EBUILD nikola-7.8.12.ebuild 2312 BLAKE2B 56afad2e27e9a653b7e70bf5347b89321e21a111d2fbb4e970cd3bd81ffc694284e845cac11da06de1ed2d51727d148c0a60fa71eb68b54714b67c106581ef00 SHA512 06bc0d9bc32618cb29d2ec874c96325df90f0d8ce0cc4e23045f85b11427c696404cfaf17da09d7579426387995fbc7278336ce8beedcb18852847599559dcad
-EBUILD nikola-7.8.13.ebuild 2312 BLAKE2B 56afad2e27e9a653b7e70bf5347b89321e21a111d2fbb4e970cd3bd81ffc694284e845cac11da06de1ed2d51727d148c0a60fa71eb68b54714b67c106581ef00 SHA512 06bc0d9bc32618cb29d2ec874c96325df90f0d8ce0cc4e23045f85b11427c696404cfaf17da09d7579426387995fbc7278336ce8beedcb18852847599559dcad
-EBUILD nikola-7.8.14-r1.ebuild 2342 BLAKE2B 8559ab8b8597077864cbeb59847cc860474baff86d7aad2a2cdbb55fcc005bbe942d7cd41336a717c0f522cad3a855227e01300ee95aef9cd2b19ebf84e678ec SHA512 e24b1e54e31b41a0af7a3cf55837c02b00f7c0d2f09aa065141b9115472ac7afdd299c7ad5f17ca1a137921e271cbea9e2cd299b39405994fcfe867f89100dcb
-EBUILD nikola-7.8.14.ebuild 2346 BLAKE2B b7103299479bb1be59f26b20781c3af1ca8ddd51865a42ca8435813100523e940cb17f2b4cda6f9d15dc6ebd6269dfa2eb934c209ff6b96c564d6e0fcfa60af0 SHA512 4257c93e3317399c46c436325726908db4d998b9550674b08bcbe3d0b32c9cb57ec44e878e2c7ab1a97f0d858cd3fea10d40e2f5b03b0ab29b472f347072c245
 EBUILD nikola-7.8.15-r1.ebuild 2342 BLAKE2B 1b07256f3a69d002e45cbf720f1540374aa22e4e76bb3621404aa2fa7c9876fb8247b78e2dd52d4ae06a193f3c6837d481f5536d4be4b1ff4d412d0ed97f0a51 SHA512 4bda732817fd23e2bac698aabde65bd3346f1a31b5b1bf174ccfe270099cd8debfe8cca8e4d52ec51d133573d57b441a87d7b2c6327e9044f1238ee20b3fc93f
-EBUILD nikola-7.8.15.ebuild 2341 BLAKE2B 4101e2cbf26dffc69dd5b8a9afce8b1c1462b0b2d75ca533528ee8d56db0dba8f3f40daa490c8a7d003f46ae0506bef1d70032d6ade4768e0be071a453c04298 SHA512 90a06d57f562af135aabb68785bcc9c4dfd939d98ee48e5e7542ebcb0bb150d5f2530f63c788437947d25e1b31dc6f8dd8dd9b3972ba107f26967c29327d745a
-EBUILD nikola-7.8.8.ebuild 2330 BLAKE2B 3010ed5a670c93978bf2f09fc816a0a36f46788bde965422fe5a73711b6f0185d628ceed1f1c3b1840adf89817084e4abee336f088b40d11e493fb8d20102d3c SHA512 be5d0bbc720ef8f05e0f6fae30c997093a9d42231640345e57d0d32bb21fb0ba2d11a7fef0f096255b7b85aa59f3bb161f563c000d3bfdbd0e2f1eb22c753d00
+EBUILD nikola-7.8.15.ebuild 2440 BLAKE2B e585b8867a7c7ef3adf4428899b0c10b38d5b21a938c3cfdad81635efdeb20f4758c8cd77954b3b305238d7a78d98fc82b1e922d96a10d624add3513f169bd8e SHA512 7432c7ea3a80244801f1308845a9b6576da4b89a9800b6440c12ea0abfb48407c4177eff35e9155d7d5f640e9bb2fc8bb577e19f866b849785630dac0f3a93d4
 MISC metadata.xml 1360 BLAKE2B 694323edda02eec1a835c4c8a68a74c960a290ee44d1c95a59b5814fc6a8f6b248aec961ce69519da1a33970fba2868df81ed87155cd3c60193f79e8165c99d2 SHA512 ea8f610d5c5d7d568e29340e12701d652136a344f8aeb32c1df9a6909dc48180c5e9a7a91935c73e4d7df4f13cff82794e301d6a659262c52d8c88773e3b9697
diff --git a/www-apps/nikola/nikola-7.8.11.ebuild b/www-apps/nikola/nikola-7.8.11.ebuild
deleted file mode 100644
index d57d5fb59b08..000000000000
--- a/www-apps/nikola/nikola-7.8.11.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-MY_PN="Nikola"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A static website and blog generator"
-HOMEPAGE="https://getnikola.com/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="assets charts ghpages hyphenation ipython jinja watchdog webmedia websocket"
-RESTRICT="test" # needs coveralls
-
-DEPEND=">=dev-python/docutils-0.12[${PYTHON_USEDEP}]" # needs rst2man to build manpage
-RDEPEND="${DEPEND}
-	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
-	>=dev-python/doit-0.29.0[${PYTHON_USEDEP}]
-	>=dev-python/logbook-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
-	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/natsort-3.5.2[${PYTHON_USEDEP}]
-	>=dev-python/piexif-1.0.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
-	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.4[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-20.3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
-	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
-	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
-	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
-	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
-	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
-	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
-	watchdog? ( ~dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
-	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
-	websocket? ( ~dev-python/ws4py-0.3.4[${PYTHON_USEDEP}] )"
-#	typography? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] ) # needs smartypants
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	distutils-r1_src_install
-
-	# hackish way to remove docs that ended up in the wrong place
-	rm -rv "${D}/usr/share/doc/${PN}" || die
-
-	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.txt
-	doman "docs/man/${PN}.1.gz"
-}
diff --git a/www-apps/nikola/nikola-7.8.12.ebuild b/www-apps/nikola/nikola-7.8.12.ebuild
deleted file mode 100644
index d57d5fb59b08..000000000000
--- a/www-apps/nikola/nikola-7.8.12.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-MY_PN="Nikola"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A static website and blog generator"
-HOMEPAGE="https://getnikola.com/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="assets charts ghpages hyphenation ipython jinja watchdog webmedia websocket"
-RESTRICT="test" # needs coveralls
-
-DEPEND=">=dev-python/docutils-0.12[${PYTHON_USEDEP}]" # needs rst2man to build manpage
-RDEPEND="${DEPEND}
-	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
-	>=dev-python/doit-0.29.0[${PYTHON_USEDEP}]
-	>=dev-python/logbook-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
-	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/natsort-3.5.2[${PYTHON_USEDEP}]
-	>=dev-python/piexif-1.0.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
-	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.4[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-20.3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
-	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
-	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
-	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
-	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
-	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
-	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
-	watchdog? ( ~dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
-	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
-	websocket? ( ~dev-python/ws4py-0.3.4[${PYTHON_USEDEP}] )"
-#	typography? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] ) # needs smartypants
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	distutils-r1_src_install
-
-	# hackish way to remove docs that ended up in the wrong place
-	rm -rv "${D}/usr/share/doc/${PN}" || die
-
-	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.txt
-	doman "docs/man/${PN}.1.gz"
-}
diff --git a/www-apps/nikola/nikola-7.8.13.ebuild b/www-apps/nikola/nikola-7.8.13.ebuild
deleted file mode 100644
index d57d5fb59b08..000000000000
--- a/www-apps/nikola/nikola-7.8.13.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-MY_PN="Nikola"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A static website and blog generator"
-HOMEPAGE="https://getnikola.com/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="assets charts ghpages hyphenation ipython jinja watchdog webmedia websocket"
-RESTRICT="test" # needs coveralls
-
-DEPEND=">=dev-python/docutils-0.12[${PYTHON_USEDEP}]" # needs rst2man to build manpage
-RDEPEND="${DEPEND}
-	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
-	>=dev-python/doit-0.29.0[${PYTHON_USEDEP}]
-	>=dev-python/logbook-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
-	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/natsort-3.5.2[${PYTHON_USEDEP}]
-	>=dev-python/piexif-1.0.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
-	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.4[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-20.3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
-	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
-	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
-	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
-	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
-	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
-	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
-	watchdog? ( ~dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
-	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
-	websocket? ( ~dev-python/ws4py-0.3.4[${PYTHON_USEDEP}] )"
-#	typography? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] ) # needs smartypants
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	distutils-r1_src_install
-
-	# hackish way to remove docs that ended up in the wrong place
-	rm -rv "${D}/usr/share/doc/${PN}" || die
-
-	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.txt
-	doman "docs/man/${PN}.1.gz"
-}
diff --git a/www-apps/nikola/nikola-7.8.14-r1.ebuild b/www-apps/nikola/nikola-7.8.14-r1.ebuild
deleted file mode 100644
index 9706ef6e630d..000000000000
--- a/www-apps/nikola/nikola-7.8.14-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-inherit distutils-r1
-
-MY_PN="Nikola"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A static website and blog generator"
-HOMEPAGE="https://getnikola.com/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="assets charts ghpages hyphenation ipython jinja watchdog webmedia websocket"
-RESTRICT="test" # needs coveralls
-
-DEPEND=">=dev-python/docutils-0.12[${PYTHON_USEDEP}]" # needs rst2man to build manpage
-RDEPEND="${DEPEND}
-	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
-	>=dev-python/doit-0.29.0[${PYTHON_USEDEP}]
-	>=dev-python/logbook-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
-	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/natsort-3.5.2[${PYTHON_USEDEP}]
-	>=dev-python/piexif-1.0.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
-	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.4[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-20.3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
-	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
-	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
-	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
-	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
-	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
-	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
-	watchdog? ( ~dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
-	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
-	websocket? ( ~dev-python/ws4py-0.3.4[${PYTHON_USEDEP}] )"
-#	typography? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] ) # needs smartypants
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	distutils-r1_src_install
-
-	# hackish way to remove docs that ended up in the wrong place
-	rm -rv "${D}/usr/share/doc/${PN}" || die
-
-	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.txt
-	gunzip "docs/man/${PN}.1.gz" || die
-	doman "docs/man/${PN}.1"
-}
diff --git a/www-apps/nikola/nikola-7.8.14.ebuild b/www-apps/nikola/nikola-7.8.14.ebuild
deleted file mode 100644
index 34d9a48daf5a..000000000000
--- a/www-apps/nikola/nikola-7.8.14.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-MY_PN="Nikola"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A static website and blog generator"
-HOMEPAGE="https://getnikola.com/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="assets charts ghpages hyphenation ipython jinja watchdog webmedia websocket"
-RESTRICT="test" # needs coveralls
-
-DEPEND=">=dev-python/docutils-0.12[${PYTHON_USEDEP}]" # needs rst2man to build manpage
-RDEPEND="${DEPEND}
-	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
-	>=dev-python/doit-0.29.0[${PYTHON_USEDEP}]
-	>=dev-python/logbook-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
-	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/natsort-3.5.2[${PYTHON_USEDEP}]
-	>=dev-python/piexif-1.0.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
-	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.4[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-20.3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
-	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
-	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
-	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
-	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
-	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
-	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
-	watchdog? ( ~dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
-	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
-	websocket? ( ~dev-python/ws4py-0.3.4[${PYTHON_USEDEP}] )"
-#	typography? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] ) # needs smartypants
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	distutils-r1_src_install
-
-	# hackish way to remove docs that ended up in the wrong place
-	rm -rv "${D}/usr/share/doc/${PN}" || die
-
-	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.txt
-	gunzip "docs/man/${PN}.1.gz" || die
-	doman "docs/man/${PN}.1"
-}
diff --git a/www-apps/nikola/nikola-7.8.15.ebuild b/www-apps/nikola/nikola-7.8.15.ebuild
index 0b6076257213..4ae53a855542 100644
--- a/www-apps/nikola/nikola-7.8.15.ebuild
+++ b/www-apps/nikola/nikola-7.8.15.ebuild
@@ -17,6 +17,7 @@ LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
 SLOT="0"
 KEYWORDS="amd64"
 IUSE="assets charts ghpages hyphenation ipython jinja watchdog webmedia websocket"
+REQUIRED_USE="ipython? ( || ( $(python_gen_useflags -3) ) )"
 RESTRICT="test" # needs coveralls
 
 DEPEND=">=dev-python/docutils-0.12[${PYTHON_USEDEP}]" # needs rst2man to build manpage
@@ -42,7 +43,11 @@ RDEPEND="${DEPEND}
 	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
 	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
 	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
-	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
+	ipython? (
+		$(python_gen_cond_dep '
+			>=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}]
+		' -3)
+	)
 	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
 	watchdog? ( ~dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
 	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
diff --git a/www-apps/nikola/nikola-7.8.8.ebuild b/www-apps/nikola/nikola-7.8.8.ebuild
deleted file mode 100644
index 2d6dccca94be..000000000000
--- a/www-apps/nikola/nikola-7.8.8.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5} ) # 3.6 waiting for deps
-
-inherit distutils-r1
-
-MY_PN="Nikola"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A static website and blog generator"
-HOMEPAGE="https://getnikola.com/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="assets charts ghpages hyphenation ipython jinja watchdog webmedia websocket"
-RESTRICT="test" # needs coveralls
-
-DEPEND=">=dev-python/docutils-0.12[${PYTHON_USEDEP}]" # needs rst2man to build manpage
-RDEPEND="${DEPEND}
-	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
-	>=dev-python/doit-0.29.0[${PYTHON_USEDEP}]
-	>=dev-python/logbook-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
-	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/natsort-3.5.2[${PYTHON_USEDEP}]
-	>=dev-python/piexif-1.0.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
-	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.4[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-20.3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
-	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
-	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
-	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
-	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
-	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
-	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
-	watchdog? ( ~dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
-	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
-	websocket? ( ~dev-python/ws4py-0.3.4[${PYTHON_USEDEP}] )"
-#	typography? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] ) # needs smartypants
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	distutils-r1_src_install
-
-	# hackish way to remove docs that ended up in the wrong place
-	rm -rv "${D}/usr/share/doc/${PN}" || die
-
-	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.txt
-	doman "docs/man/${PN}.1.gz"
-}
diff --git a/www-apps/owncloud/Manifest b/www-apps/owncloud/Manifest
index ed5e631c9c2b..8334f339413f 100644
--- a/www-apps/owncloud/Manifest
+++ b/www-apps/owncloud/Manifest
@@ -1,7 +1,5 @@
-DIST owncloud-10.2.1.tar.bz2 20354052 BLAKE2B da7c148e322c202ba599421cdbaf3b20f9ed9d490e7bfe7427a0892bbd1fc12520b21b9769d3afedeb93108632a58efbc13f919f20bc9b8a0faec88010f14540 SHA512 316125cd9540c1830a122fb56ee4bd4df1eedc397ef24996ee7dca582989bdfaee4ab659df3bac2a905c817919f2804bdc419ab18c9db2461909cf5941dda169
-DIST owncloud-10.3.0.tar.bz2 19419688 BLAKE2B bb7cbc367f500dddcd9b46a1aac847d3664f07af7077a5cd8135281436f4444208d93ee27d334156502e94ce4522e05685391177cde42556e5070284daba12ba SHA512 fc8662b1531c30bbf434f6a042c9b42b92e5acf0e7801866b232addd77998cceaeb16bacf6a91abe0762fe5676c36d59bbef58c00f379f34f5988c7cd181bf74
 DIST owncloud-10.3.1.tar.bz2 19715056 BLAKE2B 5e6026dc1ca9d7e1469e4a592b05807e4cc6ed83293eb3ad94b13d8aefd8eaf2b79e3aa9fca2e28dbc5b6c8d93a19c50d358a4fa7e393e0aaa00307c1652545d SHA512 4f3e60409c199f8075987aa5716a8f2736e875c045349562b79d2c785b9e99bc7d01d17e110b9c768b410f261e7a81904feb1dccffd6da11d4daca82b7201e14
-EBUILD owncloud-10.2.1.ebuild 1275 BLAKE2B 0f2990eb49aa741733cca2bfc1860d6f644d0fb489eaf944f3177641c178308fd99ea93d22a2ee032f7587d0cee6e6b9202a08bf58c340d92630664f5bfa6213 SHA512 7ed6fb59c3a699f6dae7169c74820ca55c1c7d06c823c4693fe01339820d248cbb16724414f0e3df6ed78f38524c9563ab4c77a592e0414c1289633e8a54c295
-EBUILD owncloud-10.3.0-r1.ebuild 1259 BLAKE2B 3b4c68b1944852eeb1770db91466c12f697076057d58db461bce021757548f4d2daf1901dc444bb93ac536ac8942672b64a740f86a1239fd8dc87d5719ec5046 SHA512 e416a9d252fcb98e6af9faec401904afbcc4be00731b3e1ea431074785ba36e8f5732e96dc0bbd02cacebb3d18b9bc51f54d8babd854f6f67b25f174127bc59b
+DIST owncloud-10.3.2.tar.bz2 19828724 BLAKE2B 6619c83fd247889a83e6c7d574b9d0e4fc8e3e5782671e280a4f1b2500ac1b82c8514fb587114e08c4ed8fae47d70769fc0813593a5cf6bd6c6e4d1ec5ce7710 SHA512 d2a1903c52e26f4518e91035e940999ff7955f9f955c71c4e6457a267137df5f61ed02227e5dcc97c3d21d46a017206fb60e9b430a73006fd8fc503e2d20d2d7
 EBUILD owncloud-10.3.1.ebuild 1259 BLAKE2B 3b4c68b1944852eeb1770db91466c12f697076057d58db461bce021757548f4d2daf1901dc444bb93ac536ac8942672b64a740f86a1239fd8dc87d5719ec5046 SHA512 e416a9d252fcb98e6af9faec401904afbcc4be00731b3e1ea431074785ba36e8f5732e96dc0bbd02cacebb3d18b9bc51f54d8babd854f6f67b25f174127bc59b
+EBUILD owncloud-10.3.2.ebuild 1252 BLAKE2B a715a1e52f6d2b4a77424b96cabca7ecf3b99f9e7193fd29afac0752a5307e8c99c48dfa3a5b7b85da0826434f9ce1e8073b4e62d8727775c09ef9c2a65e014a SHA512 8394a7272db2d38e34b204a38ae38951594066a5c03cf2f596e7fa4dff57027663d94f0754abd179fdd645522d6ed9957f78a3e489b930ef9add126a82be64f2
 MISC metadata.xml 362 BLAKE2B 966b48f98107fc73bd40f9c602962f2c876c1be1f074943452cfb5bbf60eb1c2ca08153294ce4166442da85beebd41395ca9bbe9c98d7832665fa16419db374d SHA512 64c690c6fa8bc6861f673b465e0519d5c5e945d76b66a2d9e7422cbfaa967624e7da287626bd12edbf347f0d0b5296fb9719ede93d15f073542367f5fecf5e99
diff --git a/www-apps/owncloud/owncloud-10.2.1.ebuild b/www-apps/owncloud/owncloud-10.2.1.ebuild
deleted file mode 100644
index a0cf0b0eccd0..000000000000
--- a/www-apps/owncloud/owncloud-10.2.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Web-based storage application where all your data is under your own control"
-HOMEPAGE="https://owncloud.org"
-SRC_URI="https://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+curl mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="<dev-lang/php-7.3[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog "Additional applications (calendar, ...) are no longer provided by default."
-	elog "You can install them after login via the applications management page"
-	elog "(check the recommended tab). No application data is lost."
-	webapp_pkg_postinst
-}
diff --git a/www-apps/owncloud/owncloud-10.3.0-r1.ebuild b/www-apps/owncloud/owncloud-10.3.2.ebuild
index df2ef215759e..d07f4325007c 100644
--- a/www-apps/owncloud/owncloud-10.3.0-r1.ebuild
+++ b/www-apps/owncloud/owncloud-10.3.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils webapp
+inherit webapp
 
 DESCRIPTION="Web-based storage application where all your data is under your own control"
 HOMEPAGE="https://owncloud.org"
diff --git a/www-apps/phpBB/Manifest b/www-apps/phpBB/Manifest
index 220faadc8262..be4cb91fa900 100644
--- a/www-apps/phpBB/Manifest
+++ b/www-apps/phpBB/Manifest
@@ -1,5 +1,5 @@
 AUX permissions 600 BLAKE2B ae5ced85bf5ce72bc6bca533e68ae55499ace30590de37be55c4267efacf03fe752c9c3d96ff1f6ba54beda0df238fa663281195a7c874eb3cea422fb16b5a82 SHA512 ea8f2796a43c825fbe160606dc4a3cdabd6ed8fd6692c841cadb87b06803f448df48446a83366a3af3cfba65a50bb9ed3361c0495bb5058c542b6cac9c7b2a1b
 AUX postinstall-en.txt 554 BLAKE2B 6560cb0c3a95cbbba91932af13790eae010193e6bcca4d46c640eb05b18bcae23645d5962a6be08f28aa721a10668bd128d19f505b9d463119d1a7aff845e732 SHA512 d1d61b525b2746d558f9fa1bd56e92e182d44bb406302f1646a40b0b1f06fc900ae46c3e600e27495edce1fa4188915dcf8f96b4762938ec0f324bdbb8d91759
-DIST phpBB-3.2.7.tar.bz2 4384851 BLAKE2B 68af960efa04a30f81869b205d9c43ace86a4a4411a4cb969cdf5d52c8bf4f87f806fc3b2c71941f15be295afe5faa0d606af72a734356c3a7f0f97fb73d3f01 SHA512 f6cf728c022d803f2b39560037b987e832f4ee4583a377f63e01a1529b58e275db4f13386a0d70b50cfb40621d7573a26e349702f901a549cedda9db7f79d4d2
-EBUILD phpBB-3.2.7.ebuild 1501 BLAKE2B 259d96c2c47492231586bd0d13fec2bdaca9d59aa384b5670f30f0f486749e05e9453b92d5e75a692524eb41bd31b93aa495ac84d469268e371a024982d3a868 SHA512 2106a4a65de676d9327fabbe85275c1161813732550c98f4c03663d64238bd436ec591b24d32c41cf879a60edd1ac1e321ca584014a82d6845267e76569e88ab
+DIST phpBB-3.2.8.tar.bz2 4388929 BLAKE2B 8d7b7294a852450400f721cb05d258bb36b88c48133d340292bb2733c4a28da02e3c2038eb269e0549512cc3db286c4e31eb970070edda0493c304185bc303d0 SHA512 467a84917041889eaa7f2e68a0a81d9368f3ee36427883dec7ebd2af72fe21044dbdb08c5a068ab4e67490af2e4b30132db9d3a300382dd5ccc0a54f7ca20a31
+EBUILD phpBB-3.2.8.ebuild 1589 BLAKE2B 4b30f4e792d3eb9aff2cb298774114ce9e20becaa4632dbdf65610aef8cf9950320317027811672df3689f0b924ad9e45ec7ab01dbd5054d4951d1b7c26a3c88 SHA512 002789fbd950e20b80f90aba5bbc084ba3b653df7bf99d1f80f34582479d4c351ee56e2a8abc39d2cf12c70d02dedc2de591e0898bb432a6d8ec3a81b89a7ea2
 MISC metadata.xml 875 BLAKE2B 1b4bf9ef1b179b5bee6bf42a7b7d1f25b28273f4cbd18ceb830f478c788ed055921d05aa5154512bacd5e86b48ee87b8401c47878ae9adb567ebbc7192235fa2 SHA512 25c485aa4cb248afaf4500c9c7ef1d84e23245ca11f2dbe60eb809da4766d4566a9d76df4e6f9ecf19059b75c05f13fabd5f56e3bd4751a5b5cfcd33529b93a7
diff --git a/www-apps/phpBB/phpBB-3.2.7.ebuild b/www-apps/phpBB/phpBB-3.2.8.ebuild
index 95dfe1c22767..52b9af6e5ebc 100644
--- a/www-apps/phpBB/phpBB-3.2.7.ebuild
+++ b/www-apps/phpBB/phpBB-3.2.8.ebuild
@@ -7,15 +7,21 @@ inherit webapp
 
 DESCRIPTION="An open-source PHP-based bulletin board package"
 HOMEPAGE="https://www.phpbb.com/"
-SRC_URI="https://www.phpbb.com/files/release/${P}.tar.bz2"
+SRC_URI="https://download.phpbb.com/pub/release/$(ver_cut 1-2)/${PV}/${P}.tar.bz2"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
 IUSE="ftp gd mssql mysqli postgres sqlite zlib"
 REQUIRED_USE="|| ( mssql mysqli postgres sqlite )"
 
-PHPV="5.4:*"
-RDEPEND=">=virtual/httpd-php-${PHPV}
-	>=dev-lang/php-${PHPV}[ftp?,gd?,json,mssql?,mysqli?,postgres?,sqlite?,xml,zlib?]"
+PHP_RDEPEND="(
+	virtual/httpd-php:@SLOT@
+	dev-lang/php:@SLOT@[ftp?,gd?,json,mssql?,mysqli?,postgres?,sqlite?,xml,zlib?]
+)"
+
+RDEPEND="|| (
+	${PHP_RDEPEND//@SLOT@/7.2}
+	${PHP_RDEPEND//@SLOT@/7.1}
+)"
 
 need_httpd_cgi
 
diff --git a/www-apps/phpsysinfo/Manifest b/www-apps/phpsysinfo/Manifest
index 43a4c3fa033c..d7e7f2958cf1 100644
--- a/www-apps/phpsysinfo/Manifest
+++ b/www-apps/phpsysinfo/Manifest
@@ -1,3 +1,3 @@
 DIST phpsysinfo-3.3.1.tar.gz 866981 BLAKE2B 9dcaba2bd1b4faa79fe12a2c50dbc767953cf98d45801ca6bc8398eb625b93ebc56356db0f6e05422dd665d8c6e88cb831b4288a5f0190f3c113c1171ea81def SHA512 7b8e0c469651c878b2dcc37189be7b592be5bde4ece38e0aec21afa5a422286b4c6a555bbafc4b7a2eb19e1c2afdac80fddcf03b41084f9da02fb3c92c7242b5
 EBUILD phpsysinfo-3.3.1.ebuild 1675 BLAKE2B 2d35b9e6dba6b3ec5963f35526ea1a4975937ecb643ba315da8847612c66cf39fb326d3de8702f239ffd9cf9f4f16b8e031ed9f63e004a0d4650f8eafdf2478b SHA512 f5f4092dbba9c37e53c745f94d3f31fd82c57eaea60297630fc12421f9c4ffe1f0058e5a7f88f48e67c7748b96122a0aea87f5d67343935950e97afa478855ee
-MISC metadata.xml 630 BLAKE2B df872dd395f9330647888f294f5c971ad2153f5e6051b7611b5a890295f37abe4101e570f62c508c3393c58f15fa652f14f4f41937a20da412e807e2e8897a06 SHA512 eb92eb13af2ebbd1444035cca86e2754516f5fea843f6cec328e933b3a7b2799a6a00807945e73893dfda5558febf85317edec44c89515b292e532b1f80f62d8
+MISC metadata.xml 511 BLAKE2B 3139dd25eebac631793e015cb1db6e41d64c5a3e9a75f61f340d0f1ba73b99d304716dfca4b0f0f51baf0f46a740312bb198c52aa625f5b838e6ae10f341a8e1 SHA512 59fd8766c9545193c86374e1dd05d0a08e1f5c548f4297ad4fe22acbd4ba36aa4ae46ccf6f497bfae1a7e015cf95a5f51fb417266c21cf5b5201eac31b543d41
diff --git a/www-apps/phpsysinfo/metadata.xml b/www-apps/phpsysinfo/metadata.xml
index 920c77979871..b8a3d9353d86 100644
--- a/www-apps/phpsysinfo/metadata.xml
+++ b/www-apps/phpsysinfo/metadata.xml
@@ -2,14 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="project">
 		<email>web-apps@gentoo.org</email>
 		<name>Gentoo Webapps</name>
 	</maintainer>
diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index 44c2f3fc1136..cf496fbf6e78 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -1,12 +1,10 @@
 AUX 10_redmine_vhost.conf 343 BLAKE2B ef74d3feefb81ea29a85860e94ced42cc565058a9e57a1bdb7bc3581842c9543315852d47b9bed80ffbb94280f5f0264c05a552819f89bcc409118ccffd68865 SHA512 839a01abedd2977f79bde2a55041d4e3e3a72de1e04e2bdc4aa5169b3ec22adce12b2b39d4b991d6e034fcd13fbcd030cba5ecc69ae71a76f7f37d2cdde09edc
 AUX additional_environment.rb 322 BLAKE2B 26571ffcbc43431058a685000e00870ec41d266c4cdf46e077018bbbac34a5c818fccb19508c76dd56f53bc31d3e469e61302d36825ba36a5d851cfa73b0a0ef SHA512 1a4b649bc036372a47782a089c2b3db244ea4dd5437f2d931b6c7c4578f5aa104c8b8493da4a3f2874aac0380527604807ec2062525dcd392425b9b22c84f9bf
-AUX redmine-3.3.7_gemfile_versions.patch 1401 BLAKE2B 978258b8226260edb2af735d6dacdb357e7e58f7ca99b1719a78dc8a7b77863f074e405d5980739849c3307c5d91cc82464d3d12262ad2a152a469d1b37e40d9 SHA512 a81367c5d27273c54274241a76fbbf0c3bf72344b696af419224e75a3e4350f22a15bf95699714f5c4aae0fdf0b2e6d4900c0a1b7aa8f05b845feaa6bd5f7839
-AUX redmine-3.4.5_gemfile_versions.patch 1294 BLAKE2B 2aac6c6eb74b2abbfc436f30834566dba5760ef9a5dca1fda28d4a2cbfb7db58fed31b0cc5149618defcd17eaac6b2fac9a864e61e6168ef87dbb6097d97a685 SHA512 89645b6d03ff48804201bd385557468c9c10c339021c83de7633f669147c58e2884e8eed921add5a4ed2548e350ecba025f7ab6b56e13f207d3bc3903609d125
 AUX redmine-3.initd 1269 BLAKE2B 1c0f561fa1c13c899b17b7c707ac6beaa9090a9ec98657f7ddce2e653241d7388392f22eaf35a85f5de96c3a0c32a4b67f0003725c371ef1ffb1f76c56d989b4 SHA512 c0ec931313d8b684cc8d2ab59e0c6d6fd159202420a3849cbb09a62f4fae7f6c3ec071b58fc17d838247c7c573a92de0ecdab7de995fd2391c4bd66001335ece
+AUX redmine-4.0.5_gemfile_versions.patch 2609 BLAKE2B 5841c5d7b13ae5808c1a111f9a452cf5cbb5a1be6b730a6379d583f7bf7e7b94f8cd086d4d9700886096c20ab93140c1c8d6ddbe2f1611d0dd1ec920aa9537dd SHA512 1a765504dbd1f84c2e03eee6eaa4882195e89a23ddf2f070f34abd8b278d87dabd0e367d48247350b0ffe5a5795f4552500514882cb4fae69ffcda80841eabe7
 AUX redmine.confd 267 BLAKE2B d2f4f34ac6ac2aadfe5371831fb5dba6dc6e58fd26197528ebe27d9f4faa3dc8b9c495e77841b8a2e67db7093c76cbcda24b9548da0d10268d105b5dde0bb023 SHA512 4e4a700f1540b5e82df6ca610a94adcb08929f5ca75e605e40372b18ccc395515cdd53451ba2b3e3d9bdf129d9052a7218f6323d526c1ffb2540254d279c8d94
 AUX redmine.logrotate 106 BLAKE2B 0c725d812b4a6caae29ed55d0b948a3dc14369aa550994d55ca3aa41e0c1e34962d26da4a46c99fdbdcdd600c12f2d386559af53a2e48d55b5d670372be65b60 SHA512 c7e611dc5e662e5b2126c77a333081708e552f2980efb835dc8560cd5e1929c6923e5e6e4e45604fe662b9bd5ef433678eb900e797cee34bbb1b80fb55eed0e1
-DIST redmine-3.3.7.tar.gz 2371716 BLAKE2B ba1e69419f846ddfa64ddc5d26fda281737501374f5aa4f79bd4c59d5b483a28070103fcc3bf2f3b1c7a4ce96dbfb32d1d1f21a6b74603aad012ce7d2e3373ed SHA512 ba106eb60587788ccd3162274a9a40d2876324e647e1fcafce0f943d69d8fe216a01cbddb2a5a4f41f64513e287c80ec518cef5a6033b3d1ed0bcfc7d1cfcc64
-DIST redmine-3.4.5.tar.gz 2448231 BLAKE2B 11041cbac5ea33c060a90ead56a4479cc86137bad5e0eb6135aed8d19059aedecd2ad52ac63ae6fcc5bbb13b5fc4cd6b05695aff484932b55ad5d7be7cb1c396 SHA512 c77ce76fadb7a2b9d6daf77a898a1ca4d7b1c8616922e89026cee3a4b0ec1a187a746f0a054b786663e78fc510596be736fd12d71b2569f6a63a21d0c95a05ad
-EBUILD redmine-3.3.7.ebuild 6660 BLAKE2B f8e8e9785b682c5ad1d7fa4ba06157a171438d3fed1bfaaebcaad0a063638d87897ea3cade28669fe30b7e69674b4617cf4095777b35dd1ec4f27fff37a5a1ec SHA512 873308418eb2a231d4ecdf41ca2f24da31af8c438a3e02e2982a9d99c80d82c7ed05a13cb67d3c48bd251efdd40658fa62954d84d5e30c29d2c3dce58ec46be3
-EBUILD redmine-3.4.5.ebuild 6668 BLAKE2B a0ba11f4cd5e078f72510998092497b5c1eaa9abb509e0f24a5680a4c3c99ec3f502ae3b0cd47df658742ebc968fddc55a12bb3f36db153f2e7939e296eebc90 SHA512 56ca6c12fe532608e005f0db11a2abad4f01ca1fef7d029ef6a0828e2255b983ee37782ed5c9df3ff4b305059ed17bdbcf1272e688e10b255b1a786539f38d6f
+DIST redmine-4.0.5.tar.gz 2519900 BLAKE2B ddc465f12030f3f672ea9bf6b825fd40344dcffd3b60907a42c4dbe57f209c54a12bbd3d59f886ff000ccbd43f6d1b9c1aacfbab653f2d81bb06d8d7189bd624 SHA512 a6aa3e2418fd83ed3783fc6644c339c54ebb1952b8c2c0be4b718fb296fdff64fb4116faa2c88f3e5c3c25d7c5b3c21cd7822ff9f99f6f67270e0b8b64053678
+EBUILD redmine-4.0.5-r1.ebuild 6583 BLAKE2B 8fcca6848479f73705b676aca54fe0f3e5a634cb863c675c709255b90757f06f1eff2e38230f32a6192d50876ea680868dcf6cce89f00900721a4d27e798b723 SHA512 6b8cbb2ff81f9f7120b8c1025e6ba9760a045779a4183fadbf41c183a7b571539d6d48be5ac1be1ce0b18e4ec8fedbd2bb69938bdf8b19aad9fdb307b320cca0
+EBUILD redmine-4.0.5.ebuild 6512 BLAKE2B e2cfbe2896f392dfd4206e3f126ee87ae170a504ae28ed59f5a29e4dcd8539ea56193f1d7d0253a819a611d522c3a6d577a1c016212485cf6da4e4f578993da3 SHA512 99b6f3791b3231447adabbf7203bafb1a95a80aa8548887f3aaeec65087de4bc6fa34c1c324dad0e42993699edffa4a467ead92b5085adc6716933ef60a57f9e
 MISC metadata.xml 527 BLAKE2B 251acbf9246fd6c986b37b6320e78619036d30bc8e155e97a93a2c3ca99847eb39d7919ba94f633aa021462cd200dd156b6f7d3c1575151c1d6b38a4ee999bfa SHA512 156e0ee607ad0ae734a98fab405679c55de4e2a5d620cce564a7ac17e8a029869f66c3df6d2733eb8106f9732537355c72be7c7261209af196264d069788eed4
diff --git a/www-apps/redmine/files/redmine-3.3.7_gemfile_versions.patch b/www-apps/redmine/files/redmine-3.3.7_gemfile_versions.patch
deleted file mode 100644
index c338a385a969..000000000000
--- a/www-apps/redmine/files/redmine-3.3.7_gemfile_versions.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Nuar redmine-3.3.7.orig/Gemfile redmine-3.3.7/Gemfile
---- redmine-3.3.7.orig/Gemfile	2018-05-23 22:36:30.756737829 +0300
-+++ redmine-3.3.7/Gemfile	2018-05-23 22:42:20.227720874 +0300
-@@ -4,7 +4,7 @@
-   abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'."
- end
- 
--gem "rails", "4.2.7.1"
-+gem "rails", "~> 4.2.10"
- gem "addressable", "2.4.0" if RUBY_VERSION < "2.0"
- if RUBY_VERSION < "2.1"
-   gem "public_suffix", (RUBY_VERSION < "2.0" ? "~> 1.4" : "~> 2.0.5")
-@@ -17,12 +17,12 @@
- gem "protected_attributes"
- gem "actionpack-action_caching"
- gem "actionpack-xml_parser"
--gem "roadie-rails", "~> 1.1.1"
--gem "roadie", "~> 3.2.1"
-+gem "roadie-rails", "~> 1.2.1"
-+gem "roadie", "~> 3.3"
- gem "mimemagic"
--gem "mail", "~> 2.6.4"
-+gem "mail", "~> 2.7"
- 
--gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.7.2" : "~> 1.6.8")
-+gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.8.2" : "~> 1.6.8")
- gem "i18n", "~> 0.7.0"
- gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0"
- 
-@@ -35,12 +35,12 @@
- 
- # Optional gem for LDAP authentication
- group :ldap do
--  gem "net-ldap", "~> 0.12.0"
-+  gem "net-ldap", "~> 0.16.0"
- end
- 
- # Optional gem for OpenID authentication
- group :openid do
--  gem "ruby-openid", "~> 2.3.0", :require => "openid"
-+  gem "ruby-openid", "~> 2.7.0", :require => "openid"
-   gem "rack-openid"
- end
- 
diff --git a/www-apps/redmine/files/redmine-3.4.5_gemfile_versions.patch b/www-apps/redmine/files/redmine-3.4.5_gemfile_versions.patch
deleted file mode 100644
index df49ccbe1dc9..000000000000
--- a/www-apps/redmine/files/redmine-3.4.5_gemfile_versions.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Nuar redmine-3.4.5.orig/Gemfile redmine-3.4.5/Gemfile
---- redmine-3.4.5.orig/Gemfile	2018-05-23 02:01:54.591358114 +0300
-+++ redmine-3.4.5/Gemfile	2018-05-23 02:05:19.531348171 +0300
-@@ -4,7 +4,7 @@
-   abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'."
- end
- 
--gem "rails", "4.2.8"
-+gem "rails", "~> 4.2.10"
- gem "addressable", "2.4.0" if RUBY_VERSION < "2.0"
- if RUBY_VERSION < "2.1"
-   gem "public_suffix", (RUBY_VERSION < "2.0" ? "~> 1.4" : "~> 2.0.5")
-@@ -15,10 +15,10 @@
- gem "mime-types", (RUBY_VERSION >= "2.0" ? "~> 3.0" : "~> 2.99")
- gem "protected_attributes"
- gem "actionpack-xml_parser"
--gem "roadie-rails", "~> 1.1.1"
--gem "roadie", "~> 3.2.1"
-+gem "roadie-rails", "~> 1.2.1"
-+gem "roadie", "~> 3.3"
- gem "mimemagic"
--gem "mail", "~> 2.6.4"
-+gem "mail", "~> 2.7"
- 
- gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.8.1" : "~> 1.6.8")
- gem "i18n", "~> 0.7.0"
-@@ -33,12 +33,12 @@
- 
- # Optional gem for LDAP authentication
- group :ldap do
--  gem "net-ldap", "~> 0.12.0"
-+  gem "net-ldap", "~> 0.16.0"
- end
- 
- # Optional gem for OpenID authentication
- group :openid do
--  gem "ruby-openid", "~> 2.3.0", :require => "openid"
-+  gem "ruby-openid", "~> 2.7", :require => "openid"
-   gem "rack-openid"
- end
- 
diff --git a/www-apps/redmine/files/redmine-4.0.5_gemfile_versions.patch b/www-apps/redmine/files/redmine-4.0.5_gemfile_versions.patch
new file mode 100644
index 000000000000..46aebf2b8254
--- /dev/null
+++ b/www-apps/redmine/files/redmine-4.0.5_gemfile_versions.patch
@@ -0,0 +1,76 @@
+diff -Nuar redmine-4.0.5.orig/Gemfile redmine-4.0.5/Gemfile
+--- redmine-4.0.5.orig/Gemfile	2019-10-24 22:20:32.412728804 +0300
++++ redmine-4.0.5/Gemfile	2019-10-24 22:27:40.356708042 +0300
+@@ -3,46 +3,45 @@
+ gem "bundler", ">= 1.5.0"
+ 
+ gem "rails", "5.2.3"
+-gem "rouge", "~> 3.3.0"
++gem "rouge", ">= 3.3.0"
+ gem "request_store", "1.0.5"
+-gem "mini_mime", "~> 1.0.1"
++gem "mini_mime", ">= 1.0.1"
+ gem "actionpack-xml_parser"
+-gem "roadie-rails", "~> 1.3.0"
++gem "roadie-rails", ">= 1.3.0"
+ gem "mimemagic"
+-gem "mail", "~> 2.7.1"
+-gem "csv", "~> 3.0.1" if RUBY_VERSION >= "2.3" && RUBY_VERSION < "2.6"
++gem "mail", ">= 2.7.1"
+ 
+-gem "nokogiri", (RUBY_VERSION >= "2.3" ? "~> 1.10.0" : "~> 1.9.1")
++gem "nokogiri", (RUBY_VERSION >= "2.3" ? ">= 1.10.0" : "~> 1.9.1")
+ gem "i18n", "~> 0.7.0"
+ gem "xpath", "< 3.2.0" if RUBY_VERSION < "2.3"
+ 
+ # TODO: Remove the following line when #32223 is fixed
+-gem "sprockets", "~> 3.7.2"
++gem "sprockets", ">= 3.7.2"
+ 
+ # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+ gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
+-gem "rbpdf", "~> 1.19.6"
++gem "rbpdf", ">= 1.19.6"
+ 
+ # Optional gem for LDAP authentication
+ group :ldap do
+-  gem "net-ldap", "~> 0.16.0"
++  gem "net-ldap", ">= 0.16.0"
+ end
+ 
+ # Optional gem for OpenID authentication
+ group :openid do
+-  gem "ruby-openid", "~> 2.9.2", :require => "openid"
++  gem "ruby-openid", ">= 2.9.2", :require => "openid"
+   gem "rack-openid"
+ end
+ 
+ platforms :mri, :mingw, :x64_mingw do
+   # Optional gem for exporting the gantt to a PNG file, not supported with jruby
+   group :rmagick do
+-    gem "rmagick", "~> 2.16.0"
++    gem "rmagick", ">= 2.16.0"
+   end
+ 
+   # Optional Markdown support, not for JRuby
+   group :markdown do
+-    gem "redcarpet", "~> 3.4.0"
++    gem "redcarpet", ">= 3.4.0"
+   end
+ end
+ 
+@@ -58,11 +57,11 @@
+     adapters.each do |adapter|
+       case adapter
+       when 'mysql2'
+-        gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw]
++        gem "mysql2", ">= 0.5.0", :platforms => [:mri, :mingw, :x64_mingw]
+       when /postgresql/
+-        gem "pg", "~> 1.1.4", :platforms => [:mri, :mingw, :x64_mingw]
++        gem "pg", ">= 1.1.4", :platforms => [:mri, :mingw, :x64_mingw]
+       when /sqlite3/
+-        gem "sqlite3", "~>1.3.12", :platforms => [:mri, :mingw, :x64_mingw]
++        gem "sqlite3", ">= 1.3.12", :platforms => [:mri, :mingw, :x64_mingw]
+       when /sqlserver/
+         gem "tiny_tds", "~> 1.0.5", :platforms => [:mri, :mingw, :x64_mingw]
+         gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw, :x64_mingw]
diff --git a/www-apps/redmine/redmine-3.4.5.ebuild b/www-apps/redmine/redmine-4.0.5-r1.ebuild
index 5b6112dc9338..b73f9df2d521 100644
--- a/www-apps/redmine/redmine-3.4.5.ebuild
+++ b/www-apps/redmine/redmine-4.0.5-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24"
-inherit eutils depend.apache ruby-ng user
+
+USE_RUBY="ruby24"
+inherit eutils depend.apache ruby-ng
 
 DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
 HOMEPAGE="https://www.redmine.org/"
@@ -14,42 +15,38 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="imagemagick fastcgi ldap markdown mysql passenger postgres sqlite"
 
-ruby_add_rdepend "
-	dev-ruby/actionpack-action_caching
-	dev-ruby/actionpack-xml_parser:0
-	>=dev-ruby/builder-3.2.2:3.2
-	>=dev-ruby/coderay-1.1.0
+DEPS="
+	fastcgi? ( dev-ruby/fcgi )
+	imagemagick? ( dev-ruby/rmagick:0 )
+	ldap? ( dev-ruby/ruby-net-ldap )
+	markdown? ( >=dev-ruby/redcarpet-3.4.0 )
+	mysql? ( >=dev-ruby/mysql2-0.5.0:0.5 )
+	postgres? ( >=dev-ruby/pg-1.1.4:1 )
+	sqlite? ( >=dev-ruby/sqlite3-1.3.12 )
+	dev-ruby/actionpack-xml_parser:*
 	dev-ruby/i18n:0.7
-	>=dev-ruby/jquery-rails-3.1.4:3
-	dev-ruby/loofah
-	dev-ruby/mime-types:3
+	>=dev-ruby/mail-2.7.1
 	dev-ruby/mimemagic
-	>=dev-ruby/nokogiri-1.6.8
-	dev-ruby/protected_attributes
-	>=dev-ruby/rack-openid-0.2.1
-	>=dev-ruby/rails-4.2.5.2:4.2
-	>=dev-ruby/rails-html-sanitizer-1.0.3
+	>=dev-ruby/mini_mime-1.0.1
+	>=dev-ruby/nokogiri-1.10.0
+	dev-ruby/rails:5.2
+	>=dev-ruby/rbpdf-1.19.6
 	dev-ruby/request_store:1.0.5
-	>=dev-ruby/roadie-rails-1.1.0
-	>=dev-ruby/rbpdf-1.19.2
-	>=dev-ruby/ruby-openid-2.3.0
-	dev-ruby/rubygems
-	fastcgi? ( dev-ruby/fcgi )
-	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )
-	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
-	markdown? ( >=dev-ruby/redcarpet-3.3.2 )
-	mysql? ( dev-ruby/mysql2:0.4 )
-	passenger? ( www-apache/passenger )
-	postgres? ( dev-ruby/pg:0 )
-	sqlite? ( dev-ruby/sqlite3 )
-	"
+	>=dev-ruby/roadie-rails-1.3.0
+	>=dev-ruby/rouge-3.6.0
+	>=dev-ruby/ruby-openid-2.9.2
+	dev-ruby/rack-openid
+"
 
-REDMINE_DIR="/var/lib/${PN}"
+ruby_add_rdepend "${DEPS}"
+ruby_add_bdepend "${DEPS}"
 
-pkg_setup() {
-	enewgroup redmine
-	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
-}
+RDEPEND="
+	acct-group/redmine
+	acct-user/redmine
+"
+
+REDMINE_DIR="/var/lib/${PN}"
 
 all_ruby_prepare() {
 	rm -r log files/delete.me .github || die
@@ -57,14 +54,12 @@ all_ruby_prepare() {
 	# bug #406605
 	rm .{git,hg}ignore || die
 
+	# newenvd not working here
 	cat > "${T}/50${PN}" <<-EOF || die
 		CONFIG_PROTECT="${EROOT%/}${REDMINE_DIR}/config"
 		CONFIG_PROTECT_MASK="${EROOT%/}${REDMINE_DIR}/config/locales ${EROOT%/}${REDMINE_DIR}/config/settings.yml"
 	EOF
 
-	# remove ldap staff module if disabled to avoid #413779
-	use ldap || rm app/models/auth_source_ldap.rb || die
-
 	# Fixing versions in Gemfile
 	eapply "${FILESDIR}/${P}_gemfile_versions.patch"
 
@@ -75,6 +70,8 @@ all_ruby_prepare() {
 		sed -i -e "/group :rmagick do/,/end$/d" Gemfile || die
 	fi
 	if ! use ldap ; then
+		# remove ldap stuff module if disabled to avoid #413779
+		use ldap || rm app/models/auth_source_ldap.rb || die
 		sed -i -e "/group :ldap do/,/end$/d" Gemfile || die
 	fi
 	if ! use markdown ; then
@@ -88,6 +85,11 @@ all_ruby_install() {
 
 	keepdir /var/log/${PN}
 
+	# Additional dependency for Gemfile (#657156)
+	if use fastcgi; then
+		echo "gem \"fcgi\"" > Gemfile.local
+	fi
+
 	insinto "${REDMINE_DIR}"
 	doins -r .
 	insinto "${REDMINE_DIR}/config"
@@ -151,6 +153,9 @@ pkg_postinst() {
 }
 
 pkg_config() {
+	# Remove old lock file
+	rm -f "${EROOT%/}${REDMINE_DIR}/Gemfile.lock"
+
 	if [[ ! -e "${EROOT%/}${REDMINE_DIR}/config/database.yml" ]]; then
 		eerror "Copy ${EROOT%/}${REDMINE_DIR}/config/database.yml.example to"
 		eerror "${EROOT%/}${REDMINE_DIR}/config/database.yml then edit this"
@@ -198,9 +203,8 @@ pkg_config() {
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
 		einfo "Upgrading the plugin migrations."
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
-		einfo "Clear the cache and the existing sessions."
+		einfo "Clear the cache."
 		${RUBY} -S rake tmp:cache:clear || die
-		${RUBY} -S rake tmp:sessions:clear || die
 	else
 		einfo
 		einfo "Initializing database."
@@ -212,7 +216,7 @@ pkg_config() {
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
 		einfo "Populating database with default configuration data."
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		chown redmine:redmine -R "${EROOT%/}var/log/redmine/" || die
+		chown redmine:redmine -R "${EROOT%/}/var/log/redmine/" || die
 		einfo
 		einfo "If you use sqlite3, please do not forget to change the ownership"
 		einfo "of the sqlite files."
diff --git a/www-apps/redmine/redmine-3.3.7.ebuild b/www-apps/redmine/redmine-4.0.5.ebuild
index be96b5703989..494fd300228b 100644
--- a/www-apps/redmine/redmine-3.3.7.ebuild
+++ b/www-apps/redmine/redmine-4.0.5.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24"
-inherit eutils depend.apache ruby-ng user
+
+USE_RUBY="ruby24"
+inherit eutils depend.apache ruby-ng
 
 DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
 HOMEPAGE="https://www.redmine.org/"
@@ -15,56 +16,46 @@ SLOT="0"
 IUSE="imagemagick fastcgi ldap markdown mysql passenger postgres sqlite"
 
 ruby_add_rdepend "
-	dev-ruby/actionpack-action_caching
-	dev-ruby/actionpack-xml_parser:0
-	>=dev-ruby/builder-3.2.2:3.2
-	>=dev-ruby/coderay-1.1.0
+	imagemagick? ( dev-ruby/rmagick:0 )
+	ldap? ( dev-ruby/ruby-net-ldap )
+	markdown? ( >=dev-ruby/redcarpet-3.4.0 )
+	mysql? ( >=dev-ruby/mysql2-0.5.0:0.5 )
+	postgres? ( >=dev-ruby/pg-1.1.4:1 )
+	sqlite? ( >=dev-ruby/sqlite3-1.3.12 )
+	dev-ruby/actionpack-xml_parser:*
 	dev-ruby/i18n:0.7
-	>=dev-ruby/jquery-rails-3.1.4:3
-	dev-ruby/loofah
-	dev-ruby/mime-types:*
+	>=dev-ruby/mail-2.7.1
 	dev-ruby/mimemagic
-	>=dev-ruby/nokogiri-1.6.8
-	dev-ruby/protected_attributes
-	>=dev-ruby/rack-openid-0.2.1
-	>=dev-ruby/rails-4.2.5.2:4.2
-	>=dev-ruby/rails-html-sanitizer-1.0.3
+	>=dev-ruby/mini_mime-1.0.1
+	>=dev-ruby/nokogiri-1.10.0
+	dev-ruby/rails:5.2
+	>=dev-ruby/rbpdf-1.19.6
 	dev-ruby/request_store:1.0.5
-	>=dev-ruby/roadie-rails-1.1.0
-	>=dev-ruby/rbpdf-1.19.2
-	>=dev-ruby/ruby-openid-2.3.0
-	dev-ruby/rubygems
-	fastcgi? ( dev-ruby/fcgi )
-	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )
-	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
-	markdown? ( >=dev-ruby/redcarpet-3.3.2 )
-	mysql? ( dev-ruby/mysql2:0.4 )
-	passenger? ( www-apache/passenger )
-	postgres? ( dev-ruby/pg:0 )
-	sqlite? ( dev-ruby/sqlite3 )
-	"
+	>=dev-ruby/roadie-rails-1.3.0
+	>=dev-ruby/rouge-3.6.0
+	>=dev-ruby/ruby-openid-2.9.2
+	dev-ruby/rack-openid
+"
 
-REDMINE_DIR="/var/lib/${PN}"
+RDEPEND="
+	acct-group/redmine
+	acct-user/redmine
+"
 
-pkg_setup() {
-	enewgroup redmine
-	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
-}
+REDMINE_DIR="/var/lib/${PN}"
 
 all_ruby_prepare() {
-	rm -r log files/delete.me || die
+	rm -r log files/delete.me .github || die
 
 	# bug #406605
 	rm .{git,hg}ignore || die
 
+	# newenvd not working here
 	cat > "${T}/50${PN}" <<-EOF || die
 		CONFIG_PROTECT="${EROOT%/}${REDMINE_DIR}/config"
 		CONFIG_PROTECT_MASK="${EROOT%/}${REDMINE_DIR}/config/locales ${EROOT%/}${REDMINE_DIR}/config/settings.yml"
 	EOF
 
-	# remove ldap staff module if disabled to avoid #413779
-	use ldap || rm app/models/auth_source_ldap.rb || die
-
 	# Fixing versions in Gemfile
 	eapply "${FILESDIR}/${P}_gemfile_versions.patch"
 
@@ -75,6 +66,8 @@ all_ruby_prepare() {
 		sed -i -e "/group :rmagick do/,/end$/d" Gemfile || die
 	fi
 	if ! use ldap ; then
+		# remove ldap stuff module if disabled to avoid #413779
+		use ldap || rm app/models/auth_source_ldap.rb || die
 		sed -i -e "/group :ldap do/,/end$/d" Gemfile || die
 	fi
 	if ! use markdown ; then
@@ -88,6 +81,11 @@ all_ruby_install() {
 
 	keepdir /var/log/${PN}
 
+	# Additional dependency for Gemfile (#657156)
+	if use fastcgi; then
+		echo "gem \"fcgi\"" > Gemfile.local
+	fi
+
 	insinto "${REDMINE_DIR}"
 	doins -r .
 	insinto "${REDMINE_DIR}/config"
@@ -151,6 +149,9 @@ pkg_postinst() {
 }
 
 pkg_config() {
+	# Remove old lock file
+	rm -f "${EROOT%/}${REDMINE_DIR}/Gemfile.lock"
+
 	if [[ ! -e "${EROOT%/}${REDMINE_DIR}/config/database.yml" ]]; then
 		eerror "Copy ${EROOT%/}${REDMINE_DIR}/config/database.yml.example to"
 		eerror "${EROOT%/}${REDMINE_DIR}/config/database.yml then edit this"
@@ -198,9 +199,8 @@ pkg_config() {
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
 		einfo "Upgrading the plugin migrations."
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
-		einfo "Clear the cache and the existing sessions."
+		einfo "Clear the cache."
 		${RUBY} -S rake tmp:cache:clear || die
-		${RUBY} -S rake tmp:sessions:clear || die
 	else
 		einfo
 		einfo "Initializing database."
@@ -212,7 +212,7 @@ pkg_config() {
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
 		einfo "Populating database with default configuration data."
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		chown redmine:redmine -R "${EROOT%/}var/log/redmine/" || die
+		chown redmine:redmine -R "${EROOT%/}/var/log/redmine/" || die
 		einfo
 		einfo "If you use sqlite3, please do not forget to change the ownership"
 		einfo "of the sqlite files."
diff --git a/www-apps/roundup/Manifest b/www-apps/roundup/Manifest
index d7e77e2ef7a3..7c152f9c9e63 100644
--- a/www-apps/roundup/Manifest
+++ b/www-apps/roundup/Manifest
@@ -1,5 +1,5 @@
 DIST roundup-1.5.1.tar.gz 2618886 BLAKE2B 5ccca10ce7f30b35b0875340c4cae87aa19e5384e6e5973576ea8e2de79eb83d32447580944f472d73e7cdb5f43a4ed7f805d51242e22cc2f756b3deae4004b2 SHA512 d7cdeaafb682ce7f202cacddeb1a42312f22778a2c83b52b4e838c27b1e7141a94b2ac2b670b0edee0efcfe27d74e31e6f267ae1380e90359def27385ca68d58
 DIST roundup-1.6.1.tar.gz 3128618 BLAKE2B 7fa87006582feac74f0fc455bc201f2485326b8f6ed616164f667992da114d45e8d8cef370a825450b5a4cb757ba0453d5fe3ace47164bd83e78a8c6f28b9d05 SHA512 b7666c5515c76baa4fa3ac3d0efea82feace6270af55bbc70e603b2ce0c617b4a303a15133310c1e00d3b6442baa58060d5387f568014652b1b781d9248f0052
 EBUILD roundup-1.5.1.ebuild 1223 BLAKE2B 7ed134153096b574ae8efd88613d28555055ba10ecde2bbcc47ffb78dc68de813b8fd6e2c8ade791b34fd69ca8ef88a4e7522cf24f26c282c463f87c3e4571af SHA512 226588bc17c7fa2726b1734d6a233c354f684d39b705f47ce3ce2b9792c6ecbe7979075861a677a6434e78caa0f5abede020a329c145ed59e112769591575a62
-EBUILD roundup-1.6.1.ebuild 1149 BLAKE2B 45f05861dec435e55b74d9ff39d02d832a02b555c77318682fa6f1b79236fbb4453550a37e62f4deff9618d432de1e6fb8498cc74d4a9d8b804bfe77ba32e158 SHA512 76082840f77b8a568657796d132c4c69f2fbcd01ff0ea1e039c8d750d62fff94b2dbd5ee2bfa72235220dc9885241eec1ea91273113b32ccb4902b7f4e891e7c
+EBUILD roundup-1.6.1-r1.ebuild 1194 BLAKE2B 891e1ce36fecbb548e49b06dcd2a4bb14a90c70fdd61dcbfde977d49df5d084af519065181f84a90b9d949a3315e621fa71c0e309919c6b7623d634074ab1dff SHA512 6c5f128ecc8a3af8c0123ad0879b5b718d5a86f46388759ba4d46256d1bc5f879de85f3cd96fdbcbaba04c56a01b9fc3b665993225dcc78b92b8d71ae6f762c1
 MISC metadata.xml 671 BLAKE2B a0a50000b9e4b5858b672a682111ec2b958aee5067e491eb842437ff14a85fa0ab2c8550b12ac4a028d583f43808223e279f04a24d56747c338e7c3c81d454b0 SHA512 2930519c380cf108ade7731b1ee9587fbaf3861957e6d5375afea0f221363137d959e582ce85e44acad39184b850600d2ca3bd5c809826edb8c53948a3b30741
diff --git a/www-apps/roundup/roundup-1.6.1.ebuild b/www-apps/roundup/roundup-1.6.1-r1.ebuild
index eebb51a675b5..571eeef81bb0 100644
--- a/www-apps/roundup/roundup-1.6.1.ebuild
+++ b/www-apps/roundup/roundup-1.6.1-r1.ebuild
@@ -20,7 +20,10 @@ RDEPEND="${DEPEND}
 	tz? ( dev-python/pytz[$PYTHON_USEDEP] )
 	sqlite? ( dev-lang/python:*[sqlite] )
 	mysql? ( dev-python/mysql-python[$PYTHON_USEDEP] )
-	postgres? ( >=dev-python/psycopg-1.1.21[$PYTHON_USEDEP] )
+	postgres? (
+		>=dev-python/psycopg-1.1.21[$PYTHON_USEDEP]
+		<dev-python/psycopg-2.8[$PYTHON_USEDEP]
+	)
 	xapian? ( >=dev-libs/xapian-bindings-1.0.0[python,$PYTHON_USEDEP] )
 	whoosh? ( >=dev-python/whoosh-2.5.7[$PYTHON_USEDEP] )
 	ssl? ( dev-python/pyopenssl[$PYTHON_USEDEP] )"
diff --git a/www-apps/trickster-bin/Manifest b/www-apps/trickster-bin/Manifest
deleted file mode 100644
index d76a303aa93a..000000000000
--- a/www-apps/trickster-bin/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX trickster.conf 4756 BLAKE2B 54694dca2c99568eeef5499dc48315d320c0dd07bcdb516bde64672897eca44f501ab098e015018728e58239c13e7e56d59ee1a0ba8a862bc80350216c26ff5c SHA512 18eb8df59ae41f5f982432f4b13e77b27494817fcba5c2e716e810265854ccaaf2790d0262c41ef72cef439b0b88ad68aff475bca6cd53a79d3555a2ff11d3e0
-AUX trickster.initd 467 BLAKE2B 0e9d67543d054db9b196b0be25bce8f92d3f76f63acaa747c8110b2119194da8d3d1d329b3f53266b102786559a1bf18f5001bb9f3618d73616a38a0ea26f917 SHA512 253729023241ab7de6d2703ccd6701942b303ec7e07461eaecc401623ab6e3c603c4dd449f8c255199c40bed431255dcda2942c2047e471ed382e0a95afbab65
-AUX trickster.service 361 BLAKE2B 25c7d6f167efcc8a435b38115d8aafb990807e020d25e86a227ffec25603bdea66907976f9832b94b5902dce6ab317b47a304fefca3f776fcc3c548a69a80db0 SHA512 0032d84483419da66c984b17d9e686953497c39dfb405f7c0719e57650acf538693c48dcdbb3a27906b380a073f550fd30f0fc89b78d57f1eb00aed9f63f5e9d
-DIST trickster-0.1.7.linux-amd64.gz 6440487 BLAKE2B 70884e04852aadf1c0a723dfdb8c39ea081e7ee15a69062e43c80bf0a75e80791e93825ddb691cc1323bdc2ae8efbef57e66871e2ed33397b29dce8d1320b12f SHA512 f8099108ad0b11d3dddd6043ceaef3451131e30aeb1973231e86c0b3b4ff378dd0e559c56903c3f2b35a5e83f2a06e8c72e95a4c1408aedb8ea6ddfb3525b67c
-EBUILD trickster-bin-0.1.7.ebuild 982 BLAKE2B 2b369ffb22aee8c947e864043c16b2b017f2d39376f4ef71a77ae25efce488770a2f9b271ee5c6e5911db00e57de5a64c64915a8f538fe12de4b0332318beeb1 SHA512 04e271ffaa4365c0eed45bde572c8d365f4ce4c61eb6737afb00c8eac0752a1d496edd6ac0eea31d7d14ad881e61ae5f62c8ad0709446d18fb5f01d8e9c11583
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/www-apps/trickster-bin/files/trickster.conf b/www-apps/trickster-bin/files/trickster.conf
deleted file mode 100644
index 004a3e906423..000000000000
--- a/www-apps/trickster-bin/files/trickster.conf
+++ /dev/null
@@ -1,113 +0,0 @@
-[main]
-# instance_id allows you to run multiple trickster processes on the same host and log to separate files
-# Useful for baremetal, not so much for elastic deployments, so only uncomment if you really need it
-#instance_id = 1
-
-# Configuration options for the Proxy Server
-[proxy_server]
-# listen_port defines the port on which Trickster's Proxy server listens.
-# since this is a proxy for Prometheus, we use 9090 by default, just like Prometheus does
-# listen_port = 9090
-# listen_address defines the ip on which Trickster's Proxy server listens.
-# empty by default, listening on all interfaces
-# listen_address =
-
-[cache]
-# cache_type defines what kind of cache Trickster uses
-# options are 'boltdb', 'filesystem', 'memory', and 'redis'.
-# The default is 'memory'.
-cache_type = 'memory'
-
-# record_ttl_secs defines the relative expiration of cached queries. default is 6 hours (21600 seconds)
-# record_ttl_secs = 21600
-
-# reap_sleep_ms defines how long the cache reaper waits between reap cycles. Default is 1000 (1s)
-# reap_sleep_ms = 1000
-
-# compression determines whether the cache should be compressed. default is true
-# compression = true
-
-    ### Configuration options when using a Redis Cache
-    # [cache.redis]
-    # protocol defines the protocol for connecting to redis ('unix' or 'tcp') 'tcp' is default
-    # protocol = 'tcp'
-    # endpoint defines the fqdn+port or path to a unix socket file for connecting to redis
-    # default is 'redis:6379' 
-    # endpoint = 'redis:6379'
-
-    ### Configuration options when using a Filesystem Cache
-    # [cache.filesystem]
-    # cache_path defines the directory location under which the Trickster cache will be maintained
-    # default is '/tmp/trickster'
-    # cache_path = '/tmp/trickster'
-
-    # Configuration options when using a BoltDb Cache
-    #[cache.boltdb]
-
-    # filename defines the file where the Trickster cache will be maintained
-    # default is 'trickster.db'
-    # filename = 'trickster.db'
-
-    # bucket defines the name of the BotlDb bucket (similar to a namespace) under which our key value store lives
-    # default is 'trickster'
-    # bucket = 'trickster'
-
-# Configuration options for mapping Origin(s)
-[origins]
-    ### The default origin
-    [origins.default]
-
-    # origin_url defines the URL of the origin. Default is http://prometheus:9090
-    origin_url = 'http://prometheus:9090'
-
-    # timeout_secs defines how many seconds Trickster will wait before aborting and upstream http request. Default: 180s
-    # timeout_secs = 180
-
-    # api path defines the path of the Prometheus API (usually '/api/v1')
-    api_path = '/api/v1'
-
-    # ignore_no_cache_header disables a client's ability to send a no-cache to refresh a cached query. Default is false 
-    # ignore_no_cache_header = false
-
-    # max_value_age_secs defines the maximum age of specific datapoints in seconds. Default is 86400 (24 hours)
-    max_value_age_secs = 86400
-
-    # fast_forward_disable, when set to true, will turn off the 'fast forward' feature for any requests proxied to this origin
-    # fast_forward_disable = false
-
-    # For multi-origin support, origins are named, and the name is the second word of the configuration section name.
-    # In this example, an origin is named "foo". Clients can indicate this origin in their path (http://trickster.example.com:9090/foo/query_range?.....)
-    # there are other ways for clients to indicate which origin to use in a multi-origin setup. See the documentation for more information
-
-    # [origins.foo]
-    # origin_url = 'http://prometheus-foo:9090'
-    # api_path = '/api/v1'
-    # default_step = 300
-    # ignore_no_cache_header = false
-    # max_value_age_secs = 86400
-    # timeout_secs = 180
-
-# Configuration Options for Metrics Instrumentation
-[metrics]
-# listen_port defines the port that Trickster's metrics server listens on at /metrics
-listen_port = 8082
-# listen_address defines the ip that Trickster's metrics server listens on at /metrics
-# empty by default, listening on all interfaces
-# listen_address =
-
-# Configruation Options for Profiler
-[profiler]
-# enabled indicates whether to start the profiler server when Trickster starts up. Default: false 
-# enabled = false
-# listen_port defines the port that Trickster's profiler server listens on at /debug/pprof. Default: 6060
-# listen_port = 6060
-
-# Configuration Options for Logging Instrumentation
-[logging]
-# log_level defines the verbosity of the logger. Possible values are 'debug', 'info', 'warn', 'error'
-# default is info
-log_level = 'info'
-
-# log_file defines the file location to store logs. These will be auto-rolled and maintained for you.
-# not specifying a log_file (this is the default behavior) will print logs to STDOUT
-# log_file = '/some/path/to/trickster.log'
diff --git a/www-apps/trickster-bin/files/trickster.initd b/www-apps/trickster-bin/files/trickster.initd
deleted file mode 100755
index e443653fcbc2..000000000000
--- a/www-apps/trickster-bin/files/trickster.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-command=/usr/bin/trickster
-command_background=yes
-command_group=trickster
-command_user=trickster
-description="Dashboard Accelerator for Prometheus"
-error_log=/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
-output_log=/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
-extra_started_commands=reload
-pidfile=/var/run/trickster.pid
-
-depend() {
-after net
-}
-
-reload() {
-	ebegin "Reloading ${RC_SVCNAME}"
-	start-stop-daemon --signal HUP --pidfile "${PIDFILE}"
-	EEND $?
-}
diff --git a/www-apps/trickster-bin/files/trickster.service b/www-apps/trickster-bin/files/trickster.service
deleted file mode 100644
index 02363a906786..000000000000
--- a/www-apps/trickster-bin/files/trickster.service
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- mode: conf -*-
-
-[Unit]
-Description=Dashboard Accelerator for Prometheus
-Documentation=https://github.com/Comcast/trickster
-After=network.target
-
-[Service]
-EnvironmentFile=-/etc/default/trickster
-User=trickster
-ExecStart=/usr/bin/trickster \
-          $TRICKSTER_OPTS
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/www-apps/trickster-bin/metadata.xml b/www-apps/trickster-bin/metadata.xml
deleted file mode 100644
index c36c37139fad..000000000000
--- a/www-apps/trickster-bin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/www-apps/trickster-bin/trickster-bin-0.1.7.ebuild b/www-apps/trickster-bin/trickster-bin-0.1.7.ebuild
deleted file mode 100644
index 44a02e42fe8e..000000000000
--- a/www-apps/trickster-bin/trickster-bin-0.1.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-MY_PN=${PN%-bin}
-MY_P=${MY_PN}-${PV}
-
-inherit user systemd
-
-DESCRIPTION="Dashboard Accelerator for Prometheus"
-HOMEPAGE="https://github.com/Comcast/trickster"
-SRC_URI="https://github.com/Comcast/trickster/releases/download/v${PV}/${MY_P}.linux-amd64.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-QA_PREBUILT="usr/bin/*"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 -1 -1 ${MY_PN}
-}
-
-src_install() {
-dobin ${MY_P}.linux-amd64
-dosym ${MY_P}.linux-amd64 /usr/bin/${MY_PN}
-insinto /etc/trickster
-doins "${FILESDIR}"/trickster.conf
-newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
-systemd_dounit "${FILESDIR}"/trickster.service
-keepdir /var/log/${MY_PN}
-fowners ${MY_PN}:${MY_PN} /var/log/${MY_PN}
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-	elog "Please edit ${EROOT}/etc/trickster/trickster.conf for your setup."
-	fi
-}
diff --git a/www-apps/venus/Manifest b/www-apps/venus/Manifest
index 4038fc25b2de..7a082ed98d20 100644
--- a/www-apps/venus/Manifest
+++ b/www-apps/venus/Manifest
@@ -2,6 +2,6 @@ AUX postinstall-en.txt 192 BLAKE2B e64917b92cc44853bca099f672be29b78a58679490dd8
 AUX venus-bsddb3.patch 1366 BLAKE2B a764ee9447dd8034f9b3b50ee4d0fb0e977edb006f861b20a114a1589c38672bb7a16abfc895d64ecb3c9cde6e0ea9f4a8f52adfa879031d27e9675c6da7b32d SHA512 cb3cca0415a9d12356dd85aa1434270612e09153c443a2f207af8d0be53c64e8a87bdd10b3e89b4d5a3fa56334cc691f3c44221078fbe2931c99b6215fc1925d
 AUX venus-xml-utf8.patch 4058 BLAKE2B 03d24dd8265754e006e5083b3aff7c4894fd4cf039c8b7177ff3a25b6529e4da42e1b031837490e1c9af480106b1c4f02297bbee2167f6d07067bcf06d4c2e81 SHA512 1466ec1fabaef90b7907cc7587ff994a8a9d8935eed77c725ebb65b9b86f3daa15d6e0da907ce84ce7090d14c82e1c96739b3a4a7c862bcc22af60cb74e0ad6c
 DIST venus-20100911.tar.bz2 349639 BLAKE2B 386b6b7381b9dbf9515fdad03179a844dcf884a928d291b8a7b3a1897b4f67bec9418e2fec5373f640b5eab7c028671e28ff92e08461f779869b81c0388fd54b SHA512 516a503e1e43e4bf694f007382603d6415bf508f79feb8db55dba533ca9b8b367f922ede84b2ef4ec74684f81ad17919ba754abfe5e79aac51da732ceb8c2897
-EBUILD venus-20100911-r1.ebuild 1534 BLAKE2B b028464b987a38644c2638db45fe79ccccb404765040b5f2cb54a16daefe9cb360e2f1ccc8e6125d1cead57a488e5f1c0bd5d1507afb9cec6cb08dcdd7c6afaf SHA512 87547404d5b23373882eae3a6b3314030ec8e802b242acbabb9fe505cdf38e768b2f2e30bca0ac8362bdf6b0dd911a8130606fc128e25b38382ba147a8825f22
-EBUILD venus-20100911-r2.ebuild 1586 BLAKE2B 9d38f8eefb6278510250ad40e72191d4fd638e9bee02f857c17e809a8b369ed6026999e7c01cb8fabc94fda23e23d5cef7f9fac753589a02b9398704967bbb70 SHA512 d1ed382fc803c2312defa3ebfb7e23323282d430d5781166ee2e1d3dff73d4848c26ea2ae2b5fb1771fff17909e4f4fb21b55aeec802cb4445c577e19311b4fb
+EBUILD venus-20100911-r1.ebuild 1558 BLAKE2B efb0c8876dd33ac963d81848f0535ccf9b337cc5e727004f9fbf1d031f9f73eeaf858e1d40c3692e68e52a876ebff9d84d048fd950eeb672936cb4f9f1358dfc SHA512 d58ad99f891ac6cdd93d3dcd608aa65ffe5ed3e2c85c6e47250b523522630e874129c5f1662bb0629ff700612414281fe65aea5f13273fc9f2d6fdd0cd83b93a
+EBUILD venus-20100911-r2.ebuild 1610 BLAKE2B 3a854d9b07ec980ddffd3b819847283652b74d648d7374bb4210e16243cf15ed3f9e93567f5580d448364653a6a26d924c3fdbaef0e0f39f01f91ac8ba00caa1 SHA512 8cd5412a3d3e48b15be10e31142121593f82b07ce6badbcde591b27c866b46360a6b5cef689c5ce4d69813ce9b1b276c6df45a32b8868320a52f707730d847b0
 MISC metadata.xml 480 BLAKE2B 997ccc6bcd7147a44d4928d558f82170bbb032c57b0dd4d9a7daf5584cbdd66f3733e6bf2d5c5711a843b199552d82f00a4508586ee1de7fb922cdccaeb95db1 SHA512 0caa5f4788096b3eaaa02c6cbc2f0685975e25f95ce1775e330acae28c708a0cf1bf38f31c8384068da0258948ada6ce09c6c864dac680753fb83a0d272d3bc9
diff --git a/www-apps/venus/venus-20100911-r1.ebuild b/www-apps/venus/venus-20100911-r1.ebuild
index 8136fe627ae8..44d5059cd316 100644
--- a/www-apps/venus/venus-20100911-r1.ebuild
+++ b/www-apps/venus/venus-20100911-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=6
@@ -15,6 +15,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="PSF-2.2"
 KEYWORDS="amd64 x86"
 IUSE="django genshi redland test"
+RESTRICT="!test? ( test )"
 SLOT="0"
 
 RDEPEND="
diff --git a/www-apps/venus/venus-20100911-r2.ebuild b/www-apps/venus/venus-20100911-r2.ebuild
index 2ca1b2e96206..dd264089df00 100644
--- a/www-apps/venus/venus-20100911-r2.ebuild
+++ b/www-apps/venus/venus-20100911-r2.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=6
@@ -15,6 +15,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="PSF-2.2"
 KEYWORDS="~amd64 ~x86"
 IUSE="django genshi redland test"
+RESTRICT="!test? ( test )"
 SLOT="0"
 
 RDEPEND="
diff --git a/www-apps/viewvc/Manifest b/www-apps/viewvc/Manifest
index a732e23f4dfc..ba92c9e74b2a 100644
--- a/www-apps/viewvc/Manifest
+++ b/www-apps/viewvc/Manifest
@@ -1,3 +1,3 @@
 DIST viewvc-1.1.26.tar.gz 616103 BLAKE2B e622dbf247641ddcdd68d54a8e10168d4b7506c2cb53f6d2e30b9bac36207520cde57d81875e1e0106287da9b4bf312abc2c69b15d206e557cf93a2b26cae446 SHA512 af70d4344fe92f942debb407b6fad909e250ba2656499f5229e1c2f018dfbd783d0cebd28c49a429bd7b155bb6db02cead602384f91b99b7ced6aa365e32bb8e
-EBUILD viewvc-1.1.26.ebuild 2581 BLAKE2B b11cd3bb31653a4898af1b14de2729e431094f02cbd1c08474fcfbfdcd088ecb9fcb5fb3c7e32a0efdab3519367caa9c0fddd37fd43cc46479e756cb1e208ee7 SHA512 a764d406fd20279ae6af58b9f727b5677619d79e3ac274cf8aea27700352939027bcc128fbb1cb9f58540d4158907ba5856be1da836eaec6e772b407822e9c0f
+EBUILD viewvc-1.1.26.ebuild 2559 BLAKE2B 6ed71fe42d8556438b4946aac14992688d5dcddc28cf3011dab0f1ff3c593f8e46c95d9226a3b6c2f94191e1d233e5e0dccbbb0c7adf237cc5b5a2387e83d220 SHA512 c6997566f74e0804d8b8562568135e9f39423b1368de0d12b36d4b4ce85379e7ee7a43a6140d9740225854ac000dcca105d20023928d4ebf239192b4bab47e78
 MISC metadata.xml 558 BLAKE2B 3e08174918193e922abeea23a32ec3b6732d300380cd01aafd3e15476c1c0eba2bdd9e63750c9fe37addd11ea03c03c03f25cf2184b372b14430b583148eba1d SHA512 9623aa98ccf5ab79b5784e6cf7773ffb769ebd2c73847df3be6f0caa1cfaa59c73b5f820b13a02ccbf0398e3e33e20174f5d81c279ec707d5a574fa0cdde24db
diff --git a/www-apps/viewvc/viewvc-1.1.26.ebuild b/www-apps/viewvc/viewvc-1.1.26.ebuild
index d0627301f127..787b46c03658 100644
--- a/www-apps/viewvc/viewvc-1.1.26.ebuild
+++ b/www-apps/viewvc/viewvc-1.1.26.ebuild
@@ -70,7 +70,7 @@ src_install() {
 	python_domodule lib/.
 
 	insinto "${MY_APPDIR}"
-	doins -r templates/ || die "doins failed"
+	doins -r templates/
 	doins -r templates-contrib/
 
 	if use mysql; then
diff --git a/www-apps/webdavcgi/Manifest b/www-apps/webdavcgi/Manifest
index 49e4478b51a0..1644b89e9f21 100644
--- a/www-apps/webdavcgi/Manifest
+++ b/www-apps/webdavcgi/Manifest
@@ -13,4 +13,4 @@ DIST webdavcgi-1.1.1.tar.bz2 11623234 BLAKE2B a5a2b67f2666ce4180e5ed145045b8552e
 EBUILD webdavcgi-0.8.3.ebuild 2766 BLAKE2B e3801bbfa9c3d418872cbadde17c726bca1570f010cd6fcff9a877dbe6a01560f74a0f174b25c116624b79d18b000aab9807cd811f8017eda7cf44c0be76ff20 SHA512 500f6552ca5daaf7595ff3c18ed361015bb191a48705212ab5b74c9b289c15b50a24a604322b3d1b8faa5438c381815b6e9ac5a56f1ccd5dbb2e9805763a8542
 EBUILD webdavcgi-0.8.4.ebuild 4781 BLAKE2B afbc05b971d90aaf849597cfbd573f948f33254c53b5ac45ddf3b4bfd4c10516eeeb14a734f3392d595873cddb3ed1a2bc65eebc0a2303b705a94944dd3c4dce SHA512 4a5ca82beca219929bd9190d18eb92a648e8eb68fc2dc91f514f2fb598b7eaeee29cf97a8f233425f7bd0662699a533b19f6f70cd6d0ccd6afa957d05bb86d9d
 EBUILD webdavcgi-1.1.1.ebuild 5736 BLAKE2B 46d043b9252bdf52f75696ee6476489ebf8bde2a208f81d121b504bb4bd1e8b347bb2ae85ab650bb19e2dd6f47779387afb331219fa4e6d7e448699f5469a89d SHA512 e4fb54e0f2fee21772eae95816a4b9fca5179a5231606f904db5f61d50ecab7d1ad6922dc87d022dc199b8af5ff7b642148cc662c1413c73ae378648cc94ac8e
-MISC metadata.xml 1120 BLAKE2B f9caa0218a01e169c35adc581eecea16a84f8ab7e2f57462e914c01dfc02bcb577403c4f11f378041bcea9486dc1238d6d6f64059ac56ab080d667bb3d93b72a SHA512 a15fde71b85985628bd3f3851898cbb683f33f44ff6cac59ba17f2fd65514d4ea4f3f5f6b62c8450b516fe1f4cf2960aabc1bd708f9f49242b7386a6d5f9658a
+MISC metadata.xml 1040 BLAKE2B fb1efea181e0b46f16e8086c4e183af13f61d4113d9957cb3b9e8ded4894c13e8559989c543cc9bdd326083805d7357c64c8ffc80518ed8fe12945c947cefbb0 SHA512 af3c8574f9b2c376194b27190dd6e1acf2e7a1e01f1becf41b84de395d96e6a6c739ebfb969c772104c8bdac3de4a8e725ad95a10e8a40902595602692bdcddb
diff --git a/www-apps/webdavcgi/metadata.xml b/www-apps/webdavcgi/metadata.xml
index f98f11a3f957..15f6fb907c82 100644
--- a/www-apps/webdavcgi/metadata.xml
+++ b/www-apps/webdavcgi/metadata.xml
@@ -4,9 +4,6 @@
 	<maintainer type="person">
 		<email>c.affolter@purplehaze.ch</email>
 	</maintainer>
-	<maintainer type="person">
-		<email>dev-zero@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/www-apps/wiliki/Manifest b/www-apps/wiliki/Manifest
index cfd3bfcda9f2..13ab31970709 100644
--- a/www-apps/wiliki/Manifest
+++ b/www-apps/wiliki/Manifest
@@ -1,5 +1,5 @@
 AUX wiliki-0.6.1-cgi-gentoo.patch 816 BLAKE2B e0a4448467d42cb91d20421e14d260c4482eac2687bcd728bac5c041ab605f824679c6936641258e5b9fd1f6287f3aa6fe938b5213bb45b0004d864d10db1f4c SHA512 d875ec0efde29348a230bb0bcd08a5eb4813cb5daace4b6cbdc25b5103b5f11f21fec28167b0fd618d4f6a1b53baa4024e9bbedb7b20d065f7502964579cf7b1
 AUX wiliki-po-gentoo.patch 455 BLAKE2B be37736cc1b4b5c6de065bb3bfe3d7011310710b87d45738d81eda9398342541e6b42512228e3ab1bb38e483bef8824d1b22f60e5493f64a6e9cc7984e3faca4 SHA512 e5c3ba62b29be3c9910e06ee20897f66696a859d1c427de5c8d7d57ccaba4d18325700b6d6a01fb6e869391373f6ac1894dd267720957d2f594dd8c37d5db162
 DIST WiLiKi-0.6.1.tgz 123954 BLAKE2B 80f1f39a0099e481a7b21c61bdb2d0a1b89052b23fa3312564b32d8bfb19441d08f23bc8369d085204179041dad18da72f65636ff80b63533d6c290a99e4f31a SHA512 de781f028d38edd37db43384dbdc8a57e9fbfd8b71f12c24840a90a6f000b0a2a85425f5cf3b49c5837bc3d104e2080dbb9c8e763cea54121dac779e3c5d7021
-EBUILD wiliki-0.6.1-r1.ebuild 1406 BLAKE2B be894ce099d405ee357150d3507e163218edd08eeca584d6baa4d77a79e43711487eb63084856156204a23f2eeb4f7891d106ae422f2b456db6b2e8e4254cbee SHA512 5aaeca1f7c7ff58f17d4f64082ac2da0e9b1faefca70adf7d9ebec3cfba84be2f8e6905a99434d89d0dff47380081a516a8dba846a91860437e0a1720e251c77
+EBUILD wiliki-0.6.1-r1.ebuild 1293 BLAKE2B 6e81c0712ae189530bbc1170da75ff2a3d0305db924ce56d76eb4a15dc375ead9db59669dc25b07051d84765e0704ce0ffd199dc3d1871a6ed6ba5c5ce2ab535 SHA512 37a84faf78497dfab632f895cd388fe42a4929f9a591c8fa50eac525949246afff35f868df656de25c553a643fcbee5370e0d55d3d6fa77bc0fda47ec9f9c1aa
 MISC metadata.xml 692 BLAKE2B a7d08bea3e962a0fd42bc5e90fc114a26b293141bcb251c039b1558a6a4950fd0efec1219241bfa2ed0985924ceffdbfadf3b28809bebb7dc4ae0a9211e1bfeb SHA512 ed8c01a0526eeb75e36d011af5a619a9882ca2e511e48a8b2dd914545d097968958c000c3898a97b2f60b6f42c81efc25e64ab2442a1bcedec952c764ee5b7e1
diff --git a/www-apps/wiliki/wiliki-0.6.1-r1.ebuild b/www-apps/wiliki/wiliki-0.6.1-r1.ebuild
index 4add1c335f63..b617915fe753 100644
--- a/www-apps/wiliki/wiliki-0.6.1-r1.ebuild
+++ b/www-apps/wiliki/wiliki-0.6.1-r1.ebuild
@@ -35,16 +35,16 @@ PATCHES=(
 
 src_install() {
 	webapp_src_preinst
-	emake DESTDIR="${D}" install || die "Install failed"
+	emake DESTDIR="${D}" install
 
 	insinto "${MY_CGIBINDIR}"
-	doins -r src/wiliki.cgi src/wiliki2.cgi || die "doins failed"
-	fperms +x "${MY_CGIBINDIR}"/wiliki.cgi || die "fperms failed"
+	doins -r src/wiliki.cgi src/wiliki2.cgi
+	fperms +x "${MY_CGIBINDIR}"/wiliki.cgi
 
 	insinto "${MY_HTDOCSDIR}"
-	doins src/wiliki.css src/wiliki2.css || die "doins failed"
+	doins src/wiliki.css src/wiliki2.css
 
-	dodir "${MY_HOSTROOTDIR}"/${PF}/data || die "dodir failed"
+	dodir "${MY_HOSTROOTDIR}"/${PF}/data
 	webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/data
 
 	webapp_src_install
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 9f436fc6e038..2854df4645e4 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,7 +1,7 @@
 AUX postinstall-en.txt 1285 BLAKE2B 09a372660022bda4064f2b298e6409be4d8f8943fd06d672e15c6126029acf2551b2eb0447f378a7c9287f757a820787ab6e592556e5cf199b0d8c0dd8f98f18 SHA512 8fa41aa39a1dfead723c87e6b16f979839dd5c585b9f9bb14a8a1ef556b69f9dcab113622b56c24890d1414df045b055b6997be02364ab4d5c7c06db2e4c12b2
 AUX postupgrade-en.txt 963 BLAKE2B c08e2ecca3d462d544549c80fb11abde670251002257d75fa8dd41d890f1327b08f1796c54125663fd35aca999f63b89035b610bdeedc32396c35d9d9b92ce4d SHA512 dbc86a1cf3b5280137322794a344818be8cfc137153f0e634e7bbd856ccb7ac589199353f2ccd5c28a8aa7d35cc2e041137bfc5d812fc6267efc758a1113c2d4
-DIST wordpress-5.2.4.tar.gz 11199173 BLAKE2B 879f5de709b56474674aef575ba79fffa57263080a043d51adada12fe9f766f7c0731195d468f0103bca8e5ffa2d9775ec3d328a76fd0fe104044de131c11037 SHA512 eaf6e1555f13e4fe1f1a99691b271e658d9a83ab5fa7de1480987875565aab45d246bf8bb2e9828bd43979b96a0fb0db1ebf61c62c4967d9af08a370bef083e0
+DIST wordpress-5.3.1.tar.gz 12388850 BLAKE2B bc1158f5573fb601361eec27dfde9239b2387b6faaba307e33b13f93c08b81768ebed0f6a4a59f503f5c959cc14c689ecb528f79cf2ae4b31c92f4e7b6104d88 SHA512 97a3297305ae23bf0d1d295a3df1516dcafc1486a63974357bfc46963cecf0bfd982edc68efd60a0ceb4014fdcdde9fc71e7257a5f5d011922d8dfce280e1a9a
 DIST wordpress-5.3.tar.gz 12372564 BLAKE2B a3cb1e76dd62ffe4e3689e9d3fdb1a96b8f787a763610684a0fbb0ae7fe9ad34252d1cb7119f3edf24c771bf50ca4a322e26e9b3894d12250ceb299f6fd3b019 SHA512 90a0df8a2b965c06ac10ba0dd3521b98bbd6040780bd2ccfa14a445bd2cbdb1311277563dd30f5cdc918a4177ec7c49e89260d95309fb08e271173f242fcfc07
-EBUILD wordpress-5.2.4.ebuild 1260 BLAKE2B b3478b9f1821baaee2517a15ee9ea6e67e2bc2dfa760e2a7b87bcd3933a2db89903e3d92f85b52db6afaa3906649dc7372cb80cfd6c3c962c87d215dbf6497f9 SHA512 077876f0d5c75686f33cfe5b6422a0bb8eefb56519f8b4cc098dde7c39dc09a38f4a43db4b8412890666e8adcab1f4f39f5601a34c7647b9c428987168dd8209
+EBUILD wordpress-5.3.1.ebuild 1368 BLAKE2B f5b45626e424d308eae0e46b4d403d9b8e26cac04b9d882d30806c7ec2cb450b85a39fb04fa543ae98b799d4b5513505f3e4f8f6d745f9670e45e0a770442658 SHA512 705fd916adf648b921e531e075f532421220505106f8a2fe644440f959d5a7e4fe75b8f81a6b7ec79ef750cdef348c56c1937554cafe4d6bbd275ecdf2053370
 EBUILD wordpress-5.3.ebuild 1368 BLAKE2B f5b45626e424d308eae0e46b4d403d9b8e26cac04b9d882d30806c7ec2cb450b85a39fb04fa543ae98b799d4b5513505f3e4f8f6d745f9670e45e0a770442658 SHA512 705fd916adf648b921e531e075f532421220505106f8a2fe644440f959d5a7e4fe75b8f81a6b7ec79ef750cdef348c56c1937554cafe4d6bbd275ecdf2053370
 MISC metadata.xml 392 BLAKE2B 736fb06bba21342a9cdd29ce815b1325098bc11798675534a4d299bcbaeb29f46d1eab8bebd90e2539187e82294510d06827ac068611797ad441e7c024bee6b8 SHA512 f63f0ac7c836f4f8c21d69b021d6e4d6f4257f80fd1995f180509379c7ab82028a89d1be22a381e36aad34b21d94e29c2471b48d6b31dd1a634150991e7b6c33
diff --git a/www-apps/wordpress/wordpress-5.2.4.ebuild b/www-apps/wordpress/wordpress-5.3.1.ebuild
index 9d6f0eaa173c..5a8f16d8897e 100644
--- a/www-apps/wordpress/wordpress-5.2.4.ebuild
+++ b/www-apps/wordpress/wordpress-5.3.1.ebuild
@@ -27,13 +27,13 @@ src_install() {
 	dodoc readme.html
 	rm readme.html license.txt || die
 
-	if ! use akismet ; then
+	if use !akismet ; then
 		rm -R wp-content/plugins/akismet/ || die
 	fi
-	if ! use examples ; then
+	if use !examples ; then
 		rm wp-content/plugins/hello.php || die
 	fi
-	if ! use themes ; then
+	if use !themes ; then
 		rm -R wp-content/themes/*/ || die
 	fi
 
@@ -45,6 +45,8 @@ src_install() {
 	webapp_serverowned "${MY_HTDOCSDIR}"/index.php
 	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php
 	webapp_serverowned "${MY_HTDOCSDIR}"
+	# allows plugins update if allowed within WP
+	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/includes/file.php
 
 	webapp_configfile  "${MY_HTDOCSDIR}"/wp-config.php
 
diff --git a/www-apps/zeppelin-bin/Manifest b/www-apps/zeppelin-bin/Manifest
index 101d3c2c0a20..8c98d95a29c4 100644
--- a/www-apps/zeppelin-bin/Manifest
+++ b/www-apps/zeppelin-bin/Manifest
@@ -1,4 +1,4 @@
 AUX zeppelin.init.d 492 BLAKE2B f6a551375b34ffc8ab0c2f5fe259614a8dd7024e6578919943755121d796ffc815678133446ce65b0c7eadbe18bcd0441327e29fb4cd8226f949a769f1f7e1bd SHA512 a70788870d766256c3e515748d9680e19ea0a574b81c47e5a4456a81179701db551079e2a066e5dba69c3db5d10509250780b6e54f2b43f5fc8602252292ab1b
-DIST zeppelin-bin-0.8.1.tgz 992975720 BLAKE2B 13bae89054a5be0570d0550cfc875d989de66dcdc6fe2aa3c8b71b452782d8cf2c8f6cf030b47f1b9050899912f75136cef7d9ef1b80c8957ad8a260fc7050c5 SHA512 b8302b36acc5cc8859f4341329bcb4d038bbb91d4493be191606df94da08a2fa37940958ceae507e6cdbe22fc338111ac9bee580cb41ee74198911469552df02
-EBUILD zeppelin-bin-0.8.1.ebuild 918 BLAKE2B 37a1afb39b64bc5a04c4eb8c4a8b51cf1b161e17244fdbd7d9be5c7f1f4e65e72c7c343aed1e2a7ef1f3f99a9b5b4e0c27af6bf590851726ed01f33aff61c685 SHA512 14a66d142d0f83c2e295c6e1072d33bfc600f1dcde07e39fc731a7d9fa8f8eb00058e83e00d3679b6687908c33e71f67e61a75b98c41c604899f2309df57782d
+DIST zeppelin-bin-0.8.2.tgz 998508624 BLAKE2B cccfa95426d8d0407d7a226f5d71c15ca55da8893a7fff9e3a612c63034ab1838f8f7d5a529bb393b825c6c3bd19e197f4e913c2c5b8dd04fb282affc43788ab SHA512 91a785153bc47b087f90fac0f83066fdede041d5193506b231af1b6855b150307873c92cea462c6dd48ef6d38caa37934591a08542199ac4b02d9493298fbd43
+EBUILD zeppelin-bin-0.8.2.ebuild 905 BLAKE2B 0bc8aeba198f6b4424bf7120a90278576a53ea71ac7eb60ec4184786bfe73d46523c44947b186622e9ccc1b0fd06979c4daabdaf497aecbf52e524af8e1b336f SHA512 07a10e5d231d06968f64cdbc4a0c362222b946ac885af5f09a95594e0e6040953f581316d63d39391b34e5950252d64dd17a564b676fa705a7bb946c8a05adeb
 MISC metadata.xml 331 BLAKE2B d3c2a6f490848f29f26ce31bb281d8b5ccb39463be72a40228a91ab5e4b91f5797dba1a6b5e789f977a3485c4b0fdc6bd7c112d95b527546688ecf91a1c60291 SHA512 0ae77f77f2563a7885f4d037432ac7b75728af9144fc58dd9069a4dc8f8b74ad9425600d43d39e6801dc225d3f4f6fc93cb393ba3c2cdd40d6788d2d22d184f0
diff --git a/www-apps/zeppelin-bin/zeppelin-bin-0.8.1.ebuild b/www-apps/zeppelin-bin/zeppelin-bin-0.8.2.ebuild
index 6b80c178e624..62d7b66262ba 100644
--- a/www-apps/zeppelin-bin/zeppelin-bin-0.8.1.ebuild
+++ b/www-apps/zeppelin-bin/zeppelin-bin-0.8.2.ebuild
@@ -13,10 +13,13 @@ HOMEPAGE="https://zeppelin.apache.org"
 SRC_URI="mirror://apache/zeppelin/${MY_PN}-${PV}/${MY_P}.tgz -> ${P}.tgz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8"
+DEPEND="
+	>=virtual/jdk-1.8"
+
+RDEPEND="
+	>=virtual/jre-1.8"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -35,6 +38,6 @@ src_install() {
 
 	dodir "${INSTALL_DIR}"
 	cp -pRP * "${ED}/${INSTALL_DIR}" || die
-	dosym "${ED}/${INSTALL_DIR}" /opt/zeppelin
+	dosym "${P}" /opt/zeppelin
 	fowners -R zeppelin:zeppelin "${INSTALL_DIR}"
 }
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /www-apps
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)