gentoo resync : 02.05.2018

39 files changed, 176 insertions, 42 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index f24b2c3b02df..d1647f9f2738 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/browser-config/Manifest b/www-apps/browser-config/Manifest
index 41ce6932dfcd..c672d6e93c57 100644
--- a/www-apps/browser-config/Manifest
+++ b/www-apps/browser-config/Manifest
@@ -1,3 +1,3 @@
 DIST browser-config-1.1.tar.bz2 2013 BLAKE2B b49c6625b13c6f910b37157f80c0403c74702216552f0423cd8b71a9c43be5c9d05234867422c52778b8bf09b39050ce033baf787ef2e4799a7735b0e307976f SHA512 39205bc6c018fe61838c181d69f613eb893a358301f27c345de609e3a9c83be0797f06859f6adc1fe49873ce0876aa3e23e09745dea719c13e451fa15225614a
-EBUILD browser-config-1.1.ebuild 884 BLAKE2B 69b789eb9de504a6cc9fac2c20d1f1137f34e70a65af57a32910be0a479dc83921a904ff57c26c2ba095f17f126d06fe1748cd8b089aed5c90537592baac61f1 SHA512 050425131d0044b4c67c1a56e843cb6a7e78f38c88833a9b7927f99d54b0598eeed1a58b0159d1f029580e22eb7630e1487a015f609cd2b7f43ca69f02a37583
+EBUILD browser-config-1.1.ebuild 892 BLAKE2B b459e3de05c307753d04cfd4211ccbe7f6b6d221554b07e8e661f73be58860f2b77544bea5532c75ab4c925a1ad653eb6fbd39e921300b2cebd01ff7a31d151e SHA512 4720b9e374fd1aff56e7a0948f07e5d6284b3b22a9990fa7263d176f2c3d3e58220d16b671c4bf331493376472f83b8a393f015cdfe373cdf8b64491a003b3f4
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/www-apps/browser-config/browser-config-1.1.ebuild b/www-apps/browser-config/browser-config-1.1.ebuild
index 4560d62ee0ea..11a77daf42f3 100644
--- a/www-apps/browser-config/browser-config-1.1.ebuild
+++ b/www-apps/browser-config/browser-config-1.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 DESCRIPTION="A lightweight modular configurable http url handler/browser launcher"
 HOMEPAGE="https://www.gentoo.org/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
diff --git a/www-apps/cvsweb/Manifest b/www-apps/cvsweb/Manifest
index 3e07d80e52f9..e421920e6159 100644
--- a/www-apps/cvsweb/Manifest
+++ b/www-apps/cvsweb/Manifest
@@ -4,8 +4,8 @@ AUX reconfig 381 BLAKE2B 68ef63345f95c1b3a803d7aad5bbc2b3ea7bbc41c2babd68f2bba82
 DIST cvsweb-1.112.tar.gz 37239 BLAKE2B 4050c91e65ffc5c516da6962aad88c50357cebd29f2f3b6c766222f0c12a3ab04035cdb6bea31e632fd0855362de495b4e218068e9accddc6c3959a86c75a6a5 SHA512 f0e427d4225498a4a7342335f902d7f37ca546135e2ec90e4e1fa14923c301ba5479061fae27a2728f94e45b833242c86d73dbad797681e24eb54c30b796c59d
 DIST cvsweb-3.0.5.tar.gz 72199 BLAKE2B 8573a4952fba31379c64201c4f03687411e3de28824970787188805d0e7c768312a7ae3219425642fe97cdf072fe5c02396c5d0e1aac0bbfae31da37efa01d42 SHA512 68b6d0a1ef3ec17c1cdd71f90e1cfa27aa8a4591f1bb0cf342a168e7fb2c79ff0d5d0fe56916aa1255f43524c8ed281c228eea18183a0410a69789fefea5f8d3
 DIST cvsweb-3.0.6.tar.gz 72484 BLAKE2B ae2a53fcc3618bb1375543a68d2a5866161a1d68b2b55f688f4d3357e7c7db4a37ca0f3d6f58c0955824a112006193108a227f7eaabe3851780c1f0450ae45f4 SHA512 32ac58bcb025746e4cc20bdc12d1bd915e2286a4093afebf8d60cb94a70ac614301f9b7f0a175458b14262a03d3d2eb8c29eabaf9127bef1aa6847905f331cc6
-EBUILD cvsweb-1.112.ebuild 716 BLAKE2B f7e5cdbc9031b0e22fca18bc11005e11bd3f3363673b8b409316e15f5835f597e4772e32c35cf1277878065cd737f2cb2b820bd2e0915b37cdea1405f90e05ad SHA512 2deb62c5b57b365206dd71feba1958f226171932516fbafef03f7f3389b07c7b05b86a2679ae14b2fd12b751671291646f089992973c85cf3becfe4b721a32cf
-EBUILD cvsweb-3.0.5.ebuild 927 BLAKE2B 84c9be97c675feb6a5118f335cf7bf9665e82085a328ce06e456cf200106b191bb4f81cc3371321f523b3044299b80249d2c960f2828bccff9fd749049885e0c SHA512 a568dae3c228f722e2d7c3dc8f1f943207274f8dd87bfd526837e3f5666656c5c67babb38a2fea5bd980c7314fbfa5147e2e2e54d9538db2c5fbb93fa760970b
+EBUILD cvsweb-1.112.ebuild 724 BLAKE2B d04e09696c1f9ccf71d818ae5fb288acd45afa62a0c7b7e723c565ac1f986ae9d2b58333d253a06698d40b48d2339ed27c4079a4bd89fc433f3bcd291e3362cc SHA512 1c4d47dd4bc0ead0b8562d6c15ef70849d097ba11b6e4fc7fb107c01d5022195aa981c97313c4fd6933f1622649cd38489c14fd62ea7810c4706bb738a48d5af
+EBUILD cvsweb-3.0.5.ebuild 935 BLAKE2B ac835109ff37f31d411f20675dcd49a671a885e575309dc4f737fcc05ed42dcc9f1a5427f64a0ffe8ebad2f891f927bcedde51963e372ebc45cc83fa88405ad4 SHA512 d4f195cd3f804c6121c116edbe1bf188346986aadf8afa05787f54540aefbd16de7f00bced04d830a525e98ca8a5610c5d725788e49aa458e9f898ef7da5d7d9
 EBUILD cvsweb-3.0.6-r1.ebuild 1007 BLAKE2B 3b4dc68dc6e23402e37eef34888f5c6b0817395bae424bbf529f59f92a1a708ecc7f19b9a7feacf2fe95a4cef5f14cde501e2734f32410b31b44cb4aa65990f2 SHA512 75e8a1b8561f89bdf7f8525b08374850e43867e5f7b6d6140924ea5b41446fc42fcd6ce2188ac5f6756934471265ae637407643b56108d170672751de273bf34
-EBUILD cvsweb-3.0.6.ebuild 932 BLAKE2B 2f8c1bb4639007e2beee7e2cd337a5d406aceaffe24f3331a9fe43c2f04b1b9ec99d28ecc4df81e045c1833f1407a1586f007c3530a667d94ca299ec16af76da SHA512 dfbfd43bbdc58aced2541655d28f52d96c77a8c8428848bf18ca0cce7a7aba148d64ccafc22c5569be3784042a9e9f309a2737f1d93a15c124774ef8ca4cede2
+EBUILD cvsweb-3.0.6.ebuild 940 BLAKE2B 093ec47245e9536f6c639e4b86ddcd7a4623bff02dc7c5301794c8eeb44570ebae75775a86d7e1e89e10c37f5346ef2fe69754e35d4577e6be5185051f09aa43 SHA512 684244f64580c53b5df1bbf0c3bd8e370b2fa2a0d6545289054cc61a8d45632028675985fff0f5c874a3fa8ad3559df09df1be42bf972881d08c68f9b28d09f8
 MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
diff --git a/www-apps/cvsweb/cvsweb-1.112.ebuild b/www-apps/cvsweb/cvsweb-1.112.ebuild
index 475a89beac01..5fa2971adefa 100644
--- a/www-apps/cvsweb/cvsweb-1.112.ebuild
+++ b/www-apps/cvsweb/cvsweb-1.112.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 DESCRIPTION="WWW interface to a CVS tree"
 HOMEPAGE="http://www.freebsd.org/projects/cvsweb.html"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
diff --git a/www-apps/cvsweb/cvsweb-3.0.5.ebuild b/www-apps/cvsweb/cvsweb-3.0.5.ebuild
index 04e2333ac8f0..419ac221f853 100644
--- a/www-apps/cvsweb/cvsweb-3.0.5.ebuild
+++ b/www-apps/cvsweb/cvsweb-3.0.5.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit webapp
 
 DESCRIPTION="WWW interface to a CVS tree"
diff --git a/www-apps/cvsweb/cvsweb-3.0.6.ebuild b/www-apps/cvsweb/cvsweb-3.0.6.ebuild
index 00ed18debcbd..822b6502b897 100644
--- a/www-apps/cvsweb/cvsweb-3.0.6.ebuild
+++ b/www-apps/cvsweb/cvsweb-3.0.6.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit webapp
 
 DESCRIPTION="WWW interface to a CVS tree"
diff --git a/www-apps/drraw/Manifest b/www-apps/drraw/Manifest
index 32d37090395a..bafeab297854 100644
--- a/www-apps/drraw/Manifest
+++ b/www-apps/drraw/Manifest
@@ -1,6 +1,6 @@
 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 1027 BLAKE2B b379c0730001d43266525a751558fb074d2c946c36776f5990291511ed409e6f2521d04968ff903a674c8c931bbab09525f450eaef3c01d26c112bc7f150c1e9 SHA512 2a6ba1986c312c0601e1f6a907131d1acc89ab50c2a2ff8165d4318a8b358dbce5ebb33476357394d46f4ba190a4882af29fa5ff2ca889321d70dd0f064a3b89
-EBUILD drraw-2.1.3.ebuild 1034 BLAKE2B 592358eaab8929e82b5b644773a0b9e707feddbdfe2bb8c00dfa63fb3287f9fec81d6e4ab6586ee73ca89228099fd181234a7ae383ed990273ae60149d5451ce SHA512 ae8c6048b1ab1c5b071b77195e1a09153b85b7defc97ed6f3f840efb741b4a7b66c2728322ffd0ed452cfab23f8e68c94d22e4529e495773569a01ffdb3a2bbe
+EBUILD drraw-2.0.1.ebuild 1035 BLAKE2B a5336db9cf13387c7987284a371e13dfa9db9118169956c7989e954c39278987beb64f978cfabebe007a52081709dd732c5e8cd1e5805efe71390dc34f467fad SHA512 1b9d410c978c057c64943c7eb96eb6d935d830da972bdd18910f894495f2466062f5801eb72c0fd4d3aa6ca08aacf57cf5f65fe1d902df9d29364a44b320d61a
+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
index db9c7e1cb1c1..62998f47098a 100644
--- a/www-apps/drraw/drraw-2.0.1.ebuild
+++ b/www-apps/drraw/drraw-2.0.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# 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"
diff --git a/www-apps/drraw/drraw-2.1.3.ebuild b/www-apps/drraw/drraw-2.1.3.ebuild
index 6682f05f4365..6b7773be9e09 100644
--- a/www-apps/drraw/drraw-2.1.3.ebuild
+++ b/www-apps/drraw/drraw-2.1.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# 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"
diff --git a/www-apps/freeradius-dialupadmin/Manifest b/www-apps/freeradius-dialupadmin/Manifest
index 6c995ee8624a..9708a1c692be 100644
--- a/www-apps/freeradius-dialupadmin/Manifest
+++ b/www-apps/freeradius-dialupadmin/Manifest
@@ -4,6 +4,6 @@ AUX freeradius-dialupadmin-1.80-tmpfile.patch 8171 BLAKE2B d2b2099c7004f1076ce13
 AUX setrootpath 200 BLAKE2B 290c436983a55a8f77ef83b0897a1a47ddaf21a5f4811059daf000ac7ea793627c94928bdfe34225f8c1522a599323f44e33847bddff1614f11d1a0d14ad13d4 SHA512 efa8c8ca5242f2b51b46ab25876bdf4cc3ca789a706567cad5e6e8889bcc94fff8b6bebfa8e1416d9f7a6ce8c832f37b17261516d79b970619ba024d8be10f38
 DIST freeradius-1.1.6.tar.gz 3175652 BLAKE2B 371b40cd1dcdd4b5bb5a83b0834d5582ad8050b78c8915b5c34a213bf9d85e0b52e80d4479d2a5a494ce62b5eb07d8471f9a4418d0e85cd4917b7c8a084097bf SHA512 437a1705d559849bce3c11216b0b25392668ee96300d455a2ae92b6ca233f0308eca62c06d659f26900509855237f7d17c5eb566b13bbc4cda8999a18da4b8a1
 DIST freeradius-server-2.1.1.tar.gz 3648766 BLAKE2B 25b42bd923499a450ac0fed91276ba816842ab5843c5a9c1d57b5d77891ed1104826fee2eedd68ea60f306f2325cc8081a81e2583b134ebccd725b6053fd72c8 SHA512 68f9abda7f3219ab2be6393021866ac3fda5302aa2cae85877666f3db86a09f293286003815e596cb1dfd67479b6577f7568d412953b7a2d22a7cbdc00c71b88
-EBUILD freeradius-dialupadmin-1.70.3.ebuild 1879 BLAKE2B 4c857c87ebd2dbb47fa2622d8b3806b9386d3afd8e09fbcb4422d46b4f7a2869d28eff0555f2a8e910c8a61223cad59e7c7fb8ffcd254f7a34e7fae8206ef12a SHA512 a74d0724cf2a9b453ea46ae53d9e268804fe9efed5aba1752d630ef2ceeea5dc56f39d7f64705934578beeccaeecc9cc675b5b7b92aede12735b2e5b190c6906
-EBUILD freeradius-dialupadmin-1.80.ebuild 1952 BLAKE2B b025599812904062652e02f605a102111ad1497946c52163df0dfbc42b73c66fda2f07583ff605787baa219c66bb3f2fd773ef320562e2b70eef7c8f1bff52af SHA512 e423fb6e5f727a97c6d00211f6e71b67f1df96032696d8774f027b32877865485708461ae300f8eab01c8081d230a66b2c16bf0a85b8ea3ac7634be1e1f91048
+EBUILD freeradius-dialupadmin-1.70.3.ebuild 1887 BLAKE2B 7c0e7b7a8ffcb5dce961a22c3adab49bc3425af2fe9e3026008a419d25b8b379fd11176e75fa0e1e5d8a216f105039b574563f57ac187347504f97f6d9663099 SHA512 fa175f2a006b2a1c7b8bf2db1f072dd9ddb4dcb44f23bde913bb9184cc6835876fa1c9ac72d686f388c39909b2100319c562041a9be6f34e470ac740dbb32da1
+EBUILD freeradius-dialupadmin-1.80.ebuild 1960 BLAKE2B 074bcd40e786c54e7da9b2c504f6e114c605825929821d537c42a48a9c0f99df617c43e3a7d736e65f25eb1935fb8c6b3f3a81d14064bb72298ad207873b3471 SHA512 b8e82ef61430f1cb9e73a8f746d6c424b73f3f49fa9f7ddc0a9ac9d9b4c9823e542f3520d34834b6a3188ab7baa4809ee8a7c693e4163a04d0e68bb3798f581c
 MISC metadata.xml 534 BLAKE2B 3a6adfd2ebcf41be1bd7596fcb2b3b053882d9d8dcd5203fa4be5ad841fd1394197f3ccb116503169c73fb993e3d980a401067ec781a412c6e651ebc9a3e89f0 SHA512 546c777bb50229dcf29c18d4f62a78c20e2715e49f97134c397133d632423b683426da3f37ceb7e1ccbcf392ed4dce6e5c97fb702d256a71844b09db074c845e
diff --git a/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.70.3.ebuild b/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.70.3.ebuild
index 00b0e8d6afa6..9bf34f6453b9 100644
--- a/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.70.3.ebuild
+++ b/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.70.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils webapp
 MY_FREERADIUS_P="freeradius-1.1.6"
 
diff --git a/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.80.ebuild b/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.80.ebuild
index d2c682b129ad..c03e4900136e 100644
--- a/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.80.ebuild
+++ b/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.80.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils webapp
 MY_FREERADIUS_PV="2.1.1"
 
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 9eac46178f2d..6275b31e8317 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -1,12 +1,15 @@
 AUX kibana.confd 72 BLAKE2B 786203cfc47132fedb989fbcaebc799ed566e15f2b0ced9657980269906a0395ffd6287d8b89ce41fd437086173177a9727daa2cd03de8bda26045c013f7c6dc SHA512 7dfb5c2e99e48227a95ac405fdf9f1ffdf20f7173c5a211a1aedf73b2e2ac37b7f428e5e3c7b713b78433cc9ea7bbfac723477c4497a6cb18ed787d42d8faddd
 AUX kibana.initd 1015 BLAKE2B 4e8e3e22fdbc2cee3fe9b992f2118a57f82d8f099236842b787b8e66fa59a353fcc49364db31016bdec50e0c465b48c18f07236e828268e9a0b76ad3741bb3ec SHA512 cd89c1fc7846d4c553bf2abc7e3df851561a574ef70ba3c6709ee8e3016d0348093563c70e5800bf6ff2e977976835dc7bed30e5b191d60e5f3c5f17fb3adc7e
 AUX kibana.logrotate 186 BLAKE2B e0446247e29b474dcab5756ac26f10fd8f46300e144386ff54a4e25fc1c2678ce0d21196b7365b01417cd0304a3f1edd6841800256e931bdc10f7d4e0f4ccd49 SHA512 1e0a51a83798e30b3807f496245b5733bc60a7bd1a529d2548a187ff8d3fa56d60bc23abf516d239ef76a8e9b66358ed84c687040a7b04c7818ea63417d33a1e
+AUX kibana.service 511 BLAKE2B 2b0786bfaf37c26e061973f38adea0a55ac1b8bf771395242c0ed3b53c6586099c121c286b23f0a3be67dc481a3e95c6f87486cd1601df997126d3cfd14435c1 SHA512 0b7754ebfa7e3538e64843436d8abe32a6ce38a9ab5e252e52657a99d97fa1801777db4502c1af5ec6082d83f0b3a0613e074f6ebe28624832bd0c258a478899
 DIST kibana-5.6.8-linux-x86_64.tar.gz 51974963 BLAKE2B d90b3e56e9d19c3846b7fae294d8bf27b89ffe462d8554e465bb5235741915ee65c1c6e58b94453ffbb80eaac17ede190300d614b25cf033d84231d87a46c6e9 SHA512 a819fc1166994364e94a47fa6f55f06e0672a6c5fc9bc8d594ad5ba48092033faafcc8fc70aae3c4b04300f96a9221683711bc2e2b5d343fd85d7dc22b173513
 DIST kibana-6.0.1-linux-x86_64.tar.gz 62720465 BLAKE2B 81c3cb130067483cc6138c5274555c01102e365d873bf753a534cbcd96487516af41fbb91878cea4f80ffc02c5d18c82d322b0530cf1d3a55adffeefe60d9574 SHA512 3761f8abff5d949631f365c228af2f205597e1f05137d0140917b35128d2dcb79e32db355873864c1f01bce06121af71f1bfcb1679ae25903e1121bc76f68ecc
 DIST kibana-6.1.2-linux-x86_64.tar.gz 65093343 BLAKE2B 08254af4fcc261a49f5f6e4e1c734acca799708394d95d3203d6355d1e9dc3fa6bfa3eb85b1cb40e5d52a4558b6ea202d54e87ff6274823767f8332a7b01b9c7 SHA512 eefe3ae73e08c0cd14c5c7d7f962dc78cdfff1096895a1ab539f172b84dfa0d8c197d99573ac7dea6c60adb89b5e3fd5be10dddd749c060c540b30c34426c8a1
 DIST kibana-6.2.2-linux-x86_64.tar.gz 83415765 BLAKE2B 86f7511c82b6954a8769673b856eb46f2b633490535a013d4e30138e8abee470776493de43284f2e68b2cac6b74ba2b76245fd35803b8b5834f79ea5f488dd6b SHA512 8d26eb8293028aa0c35942a7b5025401f9b717d5c548d6cdbcf2761c0d8cc1189fdbf12c6f39468d4c809a3975f5f3c817e0f02424b296ce36183e118b0c72c6
+DIST kibana-6.2.4-linux-x86_64.tar.gz 85348919 BLAKE2B ce062a5a7d96c0266143f1091f7dbe5ade6236068a73f6fedbe253957f7ddf2d00b441d985f72e9936aa3bfa7ecd9e7b7672b301b726a7d78c3e2b71d52c3b24 SHA512 125c2002e1a3b197f9f0d6200f2979f2e5974a902bfec2baa4b34a0c8d55babccafdb87b8a7b69c61ca4c02b8ae97e69b9b2743f7d445f0e53e31c69288296d5
 EBUILD kibana-bin-5.6.8.ebuild 1429 BLAKE2B f5900166bb79afe612922cd5193249a83daa63e889758ba9e1b5deeab0466e1f51d5403b2b2432a7afbefcff668d9a3de3120f93542630714e4c49ed7178715c SHA512 c9657f12d8ab28df467835cad4c845d20fa1d196532102493fe015d2a11a6b44333c6474ee69a6a5909b2043c1e18d1f9d36845d66131a94616eecc639229909
 EBUILD kibana-bin-6.0.1.ebuild 1412 BLAKE2B c4c69097fa674a92f675d7dddcd7a27c6741ee9c4dfe2307df8622adc191deecd868f29f7fd3da43c1a48dae072238f7fd33faf4d41a08a8ea3856b493ab32b9 SHA512 12d6802953ed1727dd1f9e90cf7e8cb194956a9e00a52faf64b6aebe03ea9d97efd58725e9dbb75d23d5a944a4e614db565e2018776f1e8ba0a1e2d066b6b441
 EBUILD kibana-bin-6.1.2.ebuild 1429 BLAKE2B f5900166bb79afe612922cd5193249a83daa63e889758ba9e1b5deeab0466e1f51d5403b2b2432a7afbefcff668d9a3de3120f93542630714e4c49ed7178715c SHA512 c9657f12d8ab28df467835cad4c845d20fa1d196532102493fe015d2a11a6b44333c6474ee69a6a5909b2043c1e18d1f9d36845d66131a94616eecc639229909
 EBUILD kibana-bin-6.2.2.ebuild 1429 BLAKE2B f5900166bb79afe612922cd5193249a83daa63e889758ba9e1b5deeab0466e1f51d5403b2b2432a7afbefcff668d9a3de3120f93542630714e4c49ed7178715c SHA512 c9657f12d8ab28df467835cad4c845d20fa1d196532102493fe015d2a11a6b44333c6474ee69a6a5909b2043c1e18d1f9d36845d66131a94616eecc639229909
-MISC metadata.xml 379 BLAKE2B 8e9441d2b290b2055894f11d940424ead756cc408b91b5eecd413f6ed4476de9e025fac57b71d8b92ec655787ba8c6e4ec7565f40c2ab22fc0d96051a56faefb SHA512 f39a4765eca2676d25bd98ad9f17c85e528a31ccc1b06e6327203ddfca981363a5eac870fd4f856f4d11926f689dd5b2ea45297055625e2f7089a7b9aec3f975
+EBUILD kibana-bin-6.2.4.ebuild 1654 BLAKE2B 0d7112ba0229cd359d47ef9422e19fdebfc533cfaff331465496da16e9a41d43ee36e7c8762fda32610272a063b83ceda09767319ce081f960c2520be2e163f9 SHA512 64168cc84aa586b7cf96b448c0edb7b7181636d87af791d1fc1357ce51966638f18e25f71a3a5179e73f1505bff4d8b13ee5c7c38fcd8659ce7ffc5c860aef36
+MISC metadata.xml 462 BLAKE2B e46d1fa695c441eebcf417e41d8a28d04309768c8e91c97c3e5c6f7a165a284f229708c9d3b6860cfc5ee7b541cc77dae288a7df17468b30f7b2fda258b84359 SHA512 99681a4b9c1674467a8f4828246c0fc0a96d145c5c62cf751b8dbcc060a41b9327f58e5a53323454fa360bf4a5d576b3f01e7664cb0091f20c21b88d6a18b0a9
diff --git a/www-apps/kibana-bin/files/kibana.service b/www-apps/kibana-bin/files/kibana.service
new file mode 100644
index 000000000000..9e2840d3862e
--- /dev/null
+++ b/www-apps/kibana-bin/files/kibana.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=Kibana Web Application
+After=network.target
+
+[Service]
+Environment=BABEL_CACHE_PATH=%C/kibana/.babelcache.json
+
+WorkingDirectory=/opt/kibana
+StateDirectory=kibana
+StateDirectoryMode=0750
+CacheDirectory=kibana
+CacheDirectoryMode=0750
+
+User=kibana
+Group=kibana
+
+# DATA_DIR should be set in config (path.data directive)
+# But to comply with OpenRC script, preserve this
+ExecStart=/opt/kibana/bin/kibana --config /etc/kibana/kibana.yml --path.data=%S/kibana
+
+[Install]
+WantedBy=multi-user.target
diff --git a/www-apps/kibana-bin/kibana-bin-6.2.4.ebuild b/www-apps/kibana-bin/kibana-bin-6.2.4.ebuild
new file mode 100644
index 000000000000..481a185aa4b1
--- /dev/null
+++ b/www-apps/kibana-bin/kibana-bin-6.2.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver systemd user
+
+MY_PN="${PN%-bin}"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Analytics and search dashboard for Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/kibana"
+SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="net-libs/nodejs"
+
+S="${WORKDIR}/${MY_P}-linux-x86_64"
+
+pkg_setup() {
+	enewgroup ${MY_PN}
+	enewuser ${MY_PN} -1 -1 /opt/${MY_PN} ${MY_PN}
+}
+
+src_prepare() {
+	default
+
+	# remove bundled nodejs
+	rm -r node || die
+
+	# remove empty unused directory
+	rmdir data || die
+}
+
+src_install() {
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	rm -r config || die
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
+
+	newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
+	newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
+	systemd_dounit "${FILESDIR}"/${MY_PN}.service
+
+	insinto /opt/${MY_PN}
+	doins -r .
+
+	chmod +x "${ED%/}"/opt/${MY_PN}/bin/* || die
+
+	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
+	keepdir /var/log/${MY_PN}
+}
+
+pkg_postinst() {
+	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2)"
+	elog
+	elog "To set a customized Elasticsearch instance:"
+	elog "  OpenRC: set ES_INSTANCE in /etc/conf.d/${MY_PN}"
+	elog "  systemd: set elasticsearch.url in /etc/${MY_PN}/kibana.yml"
+	elog
+	elog "Elasticsearch can run local or remote."
+}
diff --git a/www-apps/kibana-bin/metadata.xml b/www-apps/kibana-bin/metadata.xml
index 1b662aaef98c..235a4590e78e 100644
--- a/www-apps/kibana-bin/metadata.xml
+++ b/www-apps/kibana-bin/metadata.xml
@@ -9,4 +9,7 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">elastic/kibana</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/www-apps/metadot/Manifest b/www-apps/metadot/Manifest
index 7650d6665c9b..1b0a358f7218 100644
--- a/www-apps/metadot/Manifest
+++ b/www-apps/metadot/Manifest
@@ -5,6 +5,6 @@ AUX reconfig-6.1.6 337 BLAKE2B 3a371354d86f9b9f446df1db0dff91104901dc0d87421fd2e
 AUX reconfig-6.4_p3 361 BLAKE2B 438ef8199fe21d897d76bb5e29ba28204af45b7d42923aa31e469b079dc90fb47863363d7ad18656d1b13da91d5bbf34b5002f65dbab6ff24fb5bf7252033706 SHA512 c3fd94bd96de791da23799054b474b392e761c056acd664947d2e66551ddf85e14436b4390b92d3c6ebe80d2f590b84e0b74031d4cf0de943d72d214c4dc8c59
 DIST Metadot6.4.5.4.tar.gz 4055040 BLAKE2B eb5b8361e9b20951ec68c73f68fcf8126fe550f67090b0451460db6874f367ed20e1e18f5988bcd617dfae079a93f5c696298fec3eb8b59ed240a6df88f80106 SHA512 a7982e604b1f0f8db393bb16c6ecb7ca0562b8b1a620bc9db268e4be4c73de827b8a0cf0c5156822c3c63d4f8ef19a37a37d2c39037bf9d6d00df0a310e04cc1
 DIST metadot6.1.6.tar.gz 3754969 BLAKE2B 7012afd6f639568bdd96d9f6ea16f84755bbfd518aef8921fd7b28a97e3d835a84d50963c2edad049011959be0347ecee1f8d36fa11d0a5abe484eacb35f29d5 SHA512 0b7f4bd99fcc909b3f3428591193fecadfe6542b5a541c351e69323efe06e38fdb4a507d83ceec61105ddeae6b95433f67d3d12778c4acf4b9189b169f03fd7e
-EBUILD metadot-6.1.6-r1.ebuild 1266 BLAKE2B 5b865e1db9093549a7f03b5c82e54f4ea8cd0199b376d15c5ad1920244b46ff695ba4de30e9cf678dc95fb71e7c0bff46fbc336ebe6f0e3df67f6d0682a1d717 SHA512 f3a10d000b44343373a63e50388f0119dc43fe675395c58fcdd3d987b56f88ad4b105c757d28747a7a64836c7a3a31d842b7e426bb497999197b0dbab0027848
-EBUILD metadot-6.4.5.4-r2.ebuild 1751 BLAKE2B 1c88e5e13ec0c6524dacfa22382e11fcba31b259f98119318b38c8ca22d11b35aa32af1d0277c0b205e4ec0e788cdfa71dd43942961c8dd8942c66f8eb4f64f5 SHA512 51fe6d0ab6fedaf53f11325b6ad4d422390363e43752640c0af58d1387b43aa17d79499c451c923f9454f03946b0249df9f4cfa6d3a6cf307909e2ffae17c84b
+EBUILD metadot-6.1.6-r1.ebuild 1274 BLAKE2B ab24ab326fcb842e65234f2fb809891a183d704c46317d2f04cf4f710bf93a5e0fda2cf3c768ae06ced1aa42991641c9e3b369d4b6cd08c2ee6abfad8d413d78 SHA512 155bae3fdddb254824df52ebfce8a0f3655ffd5775465efa5f7be9de9eae2ee4658092a46e95862dabeeb5ed4e78d59d81a03b3cdbd1a00de37a289e98fd4806
+EBUILD metadot-6.4.5.4-r2.ebuild 1759 BLAKE2B 3624ff8f7af7f14c8412820c1f7afdf6ad95fa20c637abdf6e468a1ed11e0a797339b9b4c1e9db06b44855dc72352467063161c227db204cad08aaaa1b507edc SHA512 f1324b64c8ad461014c7aaf53825def44d52c2572681048dbe0aa33d0bf82ca2e0f5c686c2151001d9810f035a1e78ffdc447d199e45923c13f60c064b17b2b5
 MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
diff --git a/www-apps/metadot/metadot-6.1.6-r1.ebuild b/www-apps/metadot/metadot-6.1.6-r1.ebuild
index fbef34d5c613..8346e6b77398 100644
--- a/www-apps/metadot/metadot-6.1.6-r1.ebuild
+++ b/www-apps/metadot/metadot-6.1.6-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit webapp
 MY_P=${P/-/}
 S=${WORKDIR}/${PN}
diff --git a/www-apps/metadot/metadot-6.4.5.4-r2.ebuild b/www-apps/metadot/metadot-6.4.5.4-r2.ebuild
index 4ab1afba1f7a..cc9ac3b5e160 100644
--- a/www-apps/metadot/metadot-6.4.5.4-r2.ebuild
+++ b/www-apps/metadot/metadot-6.4.5.4-r2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit webapp
 MY_P="Metadot${PV}"
 S=${WORKDIR}/${PN}
diff --git a/www-apps/mod_survey/Manifest b/www-apps/mod_survey/Manifest
index 13a0db9f888d..3ad51cc85de5 100644
--- a/www-apps/mod_survey/Manifest
+++ b/www-apps/mod_survey/Manifest
@@ -1,5 +1,5 @@
 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 1750 BLAKE2B 1c07e5ca38510e767f230204205837452dc0bf43cb40e71c95745951879ee77160d045c12975d26841428ba52b870e867633f5df3b3d6abcb134fe0aafbcaa49 SHA512 627a0f429912bfae5d1fdf49668c77747eeec17d6d3ca9f5f5b6335d884ea2254cafaa89fb1ca426fcc0a799a5774af467a48d1140db64e7ded7265f1167f91e
+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/mod_survey-3.2.5.ebuild b/www-apps/mod_survey/mod_survey-3.2.5.ebuild
index 4fef9c59543a..9fe895cc6616 100644
--- a/www-apps/mod_survey/mod_survey-3.2.5.ebuild
+++ b/www-apps/mod_survey/mod_survey-3.2.5.ebuild
@@ -1,6 +1,8 @@
 # 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"
diff --git a/www-apps/mypictures/Manifest b/www-apps/mypictures/Manifest
index 6254a4c42361..ae06d1bdcfaa 100644
--- a/www-apps/mypictures/Manifest
+++ b/www-apps/mypictures/Manifest
@@ -1,6 +1,6 @@
 AUX mypictures.diff 482 BLAKE2B dce2d677fda0746f820f5a9dfee61afcd174168bf6c50ff685b734e2018eb069d48870e0105282b79f071d721acf3fe40426911f130b12bf00dd3c6651dcd64a SHA512 5db22a96deda3d0114a21a95c4cad8840b153742ac4a590e03af4af9d8b0fd4a6ec3482af1f06abfe82e4343839ac6e9ea9307af97131b55023b3e04c46fae8e
 AUX postinstall-en.txt 124 BLAKE2B 35f808252b0457c34175e1b1952cbcd774e36e7243b7e1a3b556c96c2765a50f6a2bf8455ab3cf014700b15e73c6d4bb4f706483a7b814d30ee5146315eb62ec SHA512 fe159224fd872037e3c1ce8cdb86595a427908332c1f0a4938d0639e28cfdaa86de2c606fd95ff23e823bb8f8b569e57bd04102d2c1c72834d4bb3816bb52fb2
 DIST mypictures.tgz 43783 BLAKE2B a4a89e8b9bcad2884a3140635b4078e7ccaafbd7b61587f21b90fb40558f27f4fe86854ae1aee32bbf7b1f457a9ed3ac054690b8e9354edf2aff0636f5ac73a0 SHA512 aebe637ca4ecbcd41b8aedb1afacaf7e58a2984660b2ee125e96a846c674d36ccab1f27cc8f6b5edc5f1166e982e77a51fc4ead33baffb0f7e08928e1366d1f0
-EBUILD mypictures-20040202-r1.ebuild 904 BLAKE2B 02b73406c6b92e076445fb6fea2f29b07170899df1557fb514e4ceb8ddc4e5269f1d398da1eebf730fe3af04c729c8d29e947fe229ead415c79e0c3aa2f532fe SHA512 38364caaabf6a67669429b8cc3b091f34128fdd1e8e04e70c079d8f338911ebbfe4c29350912853a43465c6321451cbbf8c0d363b0413e4cd03a2ff547561556
-EBUILD mypictures-20040202.ebuild 966 BLAKE2B 2d201c2380e11b65c670bb28c14ba89041e5aa86167fb84be927a39719ad1c45c74622208572dfdb932ab27439db717121bdbe5a1d13ee6359f95fa8a9070b43 SHA512 2c313c574bbd8b2b9215152074b88beb6527a1eb3e185f15f2029f5d1450b0eceb431a1b47fa1bad6fbbbd2deba4b90a4c8009559586ef1d556895a82602c993
+EBUILD mypictures-20040202-r1.ebuild 912 BLAKE2B d13afd25756fb0d2fa8a18963c788094c7c452b6c1261e9977901fb525e6993876bfa5f3e2c05ddef51061cf1c03700f9122ca20fecb62ca8aa1be69ae7eff2b SHA512 8aa8a6f1b1d89cc61400f766a744f1c200077f6d934c42f91e12f45143081c653a523528268ecc14da3fba2279047f9a768492e9509edd8d10f294796ee549fd
+EBUILD mypictures-20040202.ebuild 974 BLAKE2B 67058dd125c8bea3c3b2bb2ce037a1cf2b993284a9694df94107f36dd58a095d78f223ad65928f4cd059882a6aed1aedf0abf489b158cd90d98d1d6933084c9f SHA512 63697c9297695274e944b06faf6a6df85d60274bedf703e1b545f94ffd02f19fe2ef4627d3aaea9c4ad153f63a1d42685092cdb3d2716e413826890ee94d4de2
 MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
diff --git a/www-apps/mypictures/mypictures-20040202-r1.ebuild b/www-apps/mypictures/mypictures-20040202-r1.ebuild
index 1000dd3a5401..d82dfd6f382d 100644
--- a/www-apps/mypictures/mypictures-20040202-r1.ebuild
+++ b/www-apps/mypictures/mypictures-20040202-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit webapp eutils
 
 DESCRIPTION="Simple photo-gallery for websites"
diff --git a/www-apps/mypictures/mypictures-20040202.ebuild b/www-apps/mypictures/mypictures-20040202.ebuild
index 87893521a344..bfb926120d7f 100644
--- a/www-apps/mypictures/mypictures-20040202.ebuild
+++ b/www-apps/mypictures/mypictures-20040202.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit webapp eutils
 
 DESCRIPTION="Simple photo-gallery for websites"
diff --git a/www-apps/nanoblogger/Manifest b/www-apps/nanoblogger/Manifest
index 0252740b46a6..04ff757da64c 100644
--- a/www-apps/nanoblogger/Manifest
+++ b/www-apps/nanoblogger/Manifest
@@ -2,8 +2,8 @@ AUX nb.bashcomp 1275 BLAKE2B 0e6fefe950988c1f290f442781eb284f4c762365387cc58e675
 DIST nanoblogger-3.2.3.tar.gz 54672 BLAKE2B ab53f85d93d30e0db96d62b0dc5c0f079df1710ebe1b35be0c772d44eb01182617bbdfbbcb9e563861b9122363ee660f685683c54995ad539b8cd9803c29b6a1 SHA512 5cd771d1621a6e5fdb60cf34f294e93596584d7535d4a89a98fd8332c85b58e70715a9bf34e46839a1756a8827f37f998f105ba1e494cabefb780e81f6deb8d7
 DIST nanoblogger-3.3.tar.gz 82302 BLAKE2B 16b560de8f5a6b639ad439010aeb6335590bfe5620f29e6a8c1bdd4d96e677b707da7930407641282ecdc58ac031492699e2d211bba757808c8e4bcd7e36b5f2 SHA512 7de711a69ba0db7dd006902c335ce32773b8d02716048802487f683353702cebd164c059ce0a920856ab49a2b833d6524b6c0981d188c5874f42f6b2a6435f7d
 DIST nanoblogger-3.5-rc1.tar.gz 131833 BLAKE2B d5918e406d0b5c6d82b466b43ed84b413fc539651baa568eacbd70b47eae4b382a4f621c8195631b47ef2039d6a4e0b569596a6d601881b195b1db5f7098d90c SHA512 03a590b1bdf3adb9969e2ce6fda89ece99f33def9f46e1028d2c0724a86f47696c703a5a3bb3c4b1c34418b841702a15bae527cc94eba377ee2003203582de2f
-EBUILD nanoblogger-3.2.3.ebuild 1976 BLAKE2B 0255521d34248368e400df601e296385b3e00a2e79a5c5f5ed9540f0c5fe9bc2b5dd834277128b43c5fac5bf0d759a035b09a2e79a3228cf3a6e8af809ff6f5e SHA512 f2c210fa7c0b157c55a4151f73a54c55cfb00913e59c278acda96a81e8fed84ef759f74b3ab069fc1243fcf337fd712ce26052b83b61aff35e042ccf93aeee48
-EBUILD nanoblogger-3.3.ebuild 2196 BLAKE2B 6b97a0391c5b2c1b78c6fe6d660dfb20405abf6b87455eab3fbc436c5f24e1c9447a3b9b4193d7f2116ddefdb13abf7a90bf74b541937a42f4ff721270e4ba06 SHA512 9b44ce33846797aa323977f277c63dfe00974ecad63f0026b18c68f7f3f13ff914b19882763e104ffeeffd26405cb046df9737d56fc4ddfc2cb807e336256215
+EBUILD nanoblogger-3.2.3.ebuild 1984 BLAKE2B 2f3e061b242e8fe93aa68e0d2dbb593a08f53033a00bf87010cc7ef6d51cc81c46ddfc2883cb6d8e4869231a17ec2db6304f72fd0d761bffe23c8ea50052a1a9 SHA512 0ee6e34be5b0b9c30779d95ccbcf37ef98be8da311de9693c5f01e164412fa7edb4bb8f497cdef7633058a533ef5737d60c9dd908671180280d9650f2b2b0a56
+EBUILD nanoblogger-3.3.ebuild 2204 BLAKE2B b7655375ceff26203a713f47a65e1d81f7d6d82c0ce57be36241a8e2e4671143e5d664a63258ab0e9a54c720a2d4e98549b2dd3de27ebb3f9f8c21598354db43 SHA512 5b197fa25dcc5579dc52ea9659327434039c9f669c8b6d984e562341dc1997de0afd64099c05fb6185e19441473ae0fbdec95cf5811968b3daa3d2ec8e4a9d46
 EBUILD nanoblogger-3.5_rc1-r1.ebuild 2222 BLAKE2B 7bdb8bf78f60cf0fc707ac947af8fbea0b47cea31a14f931baab2cb2f98349d2d20e4fa6a73352efd7bbbe3d477aa73b928373fd1e582d427aa6c44ff5c3c468 SHA512 4d4f953b77fa166b51ab55a16a3d01d0df8594aaa60ab86101d219090f8dc00eebd58e6e90d8e7ad93e1d8dafc5b3cc0d23f6e2990619f35918a7ddab80d3581
 EBUILD nanoblogger-3.5_rc1.ebuild 2217 BLAKE2B 7a66dce1b6ff8e41da7cbd969082836388bfd73f284d62752cb871cb17af3a391dbcd5ac95d1b85c52a8387043fb51cb3604ec4dc7824791e4346a93b715cfde SHA512 ccfce25bfeb31b87aea68d78f86e0a63b162e0a2ee290045181f69bf73809658b1f82a607221624a71c5d1158e6aa424bfd2708df027691e2554ca067f8aa672
 MISC metadata.xml 1158 BLAKE2B 0b261c973a5196c38ce880dd3f3ce99e368b86ca909190bf4934a50d94ebf1ccce9e01f99cd7812702dc1fcde47a5d9c91fdd5411599e46454f38cfb3831c9d6 SHA512 51fefdaaa979d1625c710655dcd2cf6bb2f1f0143f533b2b2ce1ee8022b6bfac20c9cc92dbd125aac5b19878df28e735f70653f75331c86f7152c194d37994f5
diff --git a/www-apps/nanoblogger/nanoblogger-3.2.3.ebuild b/www-apps/nanoblogger/nanoblogger-3.2.3.ebuild
index 0a57d0807f66..a4e50036ec2c 100644
--- a/www-apps/nanoblogger/nanoblogger-3.2.3.ebuild
+++ b/www-apps/nanoblogger/nanoblogger-3.2.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit bash-completion-r1
 
 DESCRIPTION="Small and simple weblog engine written in Bash for the command-line"
diff --git a/www-apps/nanoblogger/nanoblogger-3.3.ebuild b/www-apps/nanoblogger/nanoblogger-3.3.ebuild
index b305d681bb49..66a4ec784004 100644
--- a/www-apps/nanoblogger/nanoblogger-3.3.ebuild
+++ b/www-apps/nanoblogger/nanoblogger-3.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit bash-completion-r1
 
 DESCRIPTION="Small and simple weblog engine written in Bash for the command-line"
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index daf92ced868b..00d89283f402 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,10 +1,10 @@
 AUX nextcloud-12.0.4-destroy_modal_when_closed.patch 786 BLAKE2B 24222dde0d9ed5f3c5fa31b7cd1b837f765837543475db235056dccff9fa17cce83a37b0ed64a1999a6b61dedd5857866debb1950686acf062e42d80bccb3813 SHA512 93297f991312c5fd2504267bb16a8c38797970fdf8d109d4c4b4416a5e72c8677141ebc9a13a2dadc40845348e07f264937dd852384f88d65be4f3cc4f0cb462
-DIST nextcloud-12.0.5.tar.bz2 43704324 BLAKE2B 92b4569b3fc29f33a9c8163f34b7119081a48c657bd9383d0d656f9c66a240339889288c8c4e9936dd884b7436574ab501b1022251f743ecf5f00bf1e9ec7c20 SHA512 6a07384fef1ca57e82c5867c7f4898b9dcc94bd99d25ea49cf44606833e0045f9503f2c9256b71845603bd7b911fdabea39e1bebe8cddb69d9d752c69101bc27
 DIST nextcloud-12.0.6.tar.bz2 44300816 BLAKE2B 9ce2426653cb57e7b933f918e531d02f2da9bb0da2e0fc7d6abd7f6c895f29d582b89202f6476a3592b76c46d0c70fe31d914377449ce5bb8d4c4fd4c54b3e7b SHA512 28058d1c66f1d6c6188b303f8035763582229a82facd6732ac60e7a40dbd0a1b66ca1235d2854a254e0ae5af7923c0df75db9f9e95b3b24ed61a09789ae00c18
-DIST nextcloud-13.0.0.tar.bz2 43397247 BLAKE2B 21d41e09fe97135e1eee76b14cc5ffe2f0389ee00cfdf84eb38a83bfcbdd7b915114d54fa20e54b1b08f5a59bec88c6708eb68f37752afc710fd864f73607ad0 SHA512 c2a3be174b43b27667c3e1894a942d4dd77c29a4e043cbb0c7d7f516aa299b83dc4869c7b3cc08b353b1298e3ac06598c9d192506ea218a5490250cd1c48e369
+DIST nextcloud-12.0.7.tar.bz2 44916150 BLAKE2B cf6223ea700283580465cba95d93754c3223c939f7925298e264d1ea2eb64295e82d20528c023ac040b47563858a402bb679b9608c7ba4cce5f236d8ea21ca3e SHA512 e141faa37acfea884bb6d5ea5ab6fc3ce31496d4897092c91cb2e5d8cb4ab8f8356ebe5c17d0ba867eb99b26594d5f93756d2a9e3a32de92dc04a3d06a8fb791
 DIST nextcloud-13.0.1.tar.bz2 44183890 BLAKE2B f97eed503f7dd6cf641d2a2d5dadb200031c510f3e86f1b9ec8ad47e8f1b5d314b02ea8714232f89eb7a8617450f10a6970d97fbca8ae2d0b8641b28baf33a2c SHA512 dac798a36d18b94a2d5287e2cb0eb06352635099e0c808b1cdb0ecb76f3d1e771a85cafb35597b23fcb77b9e36a57a25a361413f798b3dbd13d0a0255ec5cbe1
-EBUILD nextcloud-12.0.5.ebuild 1036 BLAKE2B b2879a65866185315d051004f3d4126e7b309f6f0ffee59f08ec4a60b2474db4d1177827d6aad961b1fd1d07d02582124051b29b62763a5aeab0d2d3cfc49c3c SHA512 c978bb14c48115b5dc0e7aaea8e93d87b78426f31ac4a8d2225c6d22c8f00fb0d330f4fcbb2da232d18ede79dc27451a69787232d5d3ef0527a5b128d560a56a
+DIST nextcloud-13.0.2.tar.bz2 44842305 BLAKE2B 23b3d751584a846ba7585af4de7fa9736dd6b316d6102790b799649ec53603509727a626d69344a24925afd965cf8c85dbb9f31a1dfc97620b137cbe39e095c1 SHA512 b787ed03937588dd84d41b85ea1ef2868173c7353d0b9c6d81f4df97780278a7a78254c9a3cc39a0e69cc1c4472120130c1064cf1f343d9cc06519cae1bf0dc7
 EBUILD nextcloud-12.0.6.ebuild 1036 BLAKE2B b2879a65866185315d051004f3d4126e7b309f6f0ffee59f08ec4a60b2474db4d1177827d6aad961b1fd1d07d02582124051b29b62763a5aeab0d2d3cfc49c3c SHA512 c978bb14c48115b5dc0e7aaea8e93d87b78426f31ac4a8d2225c6d22c8f00fb0d330f4fcbb2da232d18ede79dc27451a69787232d5d3ef0527a5b128d560a56a
-EBUILD nextcloud-13.0.0.ebuild 954 BLAKE2B b4a52fde03a19859bdba2400ef05a0d586be3a43abfc0079837d08fd0f246b6879ecd1afd7e1d127b212b1b5581f63441a74f2b028c2614225139cfd826c8330 SHA512 34bfd8c7c7071710468e9c59e9f8577359cdbd6a7abfb850f9d3756fd3b787335354a0b087131a314dc7eb8a9a457869fa275aa33a842a2da17313341df05189
+EBUILD nextcloud-12.0.7.ebuild 1036 BLAKE2B b2879a65866185315d051004f3d4126e7b309f6f0ffee59f08ec4a60b2474db4d1177827d6aad961b1fd1d07d02582124051b29b62763a5aeab0d2d3cfc49c3c SHA512 c978bb14c48115b5dc0e7aaea8e93d87b78426f31ac4a8d2225c6d22c8f00fb0d330f4fcbb2da232d18ede79dc27451a69787232d5d3ef0527a5b128d560a56a
 EBUILD nextcloud-13.0.1.ebuild 954 BLAKE2B b4a52fde03a19859bdba2400ef05a0d586be3a43abfc0079837d08fd0f246b6879ecd1afd7e1d127b212b1b5581f63441a74f2b028c2614225139cfd826c8330 SHA512 34bfd8c7c7071710468e9c59e9f8577359cdbd6a7abfb850f9d3756fd3b787335354a0b087131a314dc7eb8a9a457869fa275aa33a842a2da17313341df05189
+EBUILD nextcloud-13.0.2.ebuild 954 BLAKE2B b4a52fde03a19859bdba2400ef05a0d586be3a43abfc0079837d08fd0f246b6879ecd1afd7e1d127b212b1b5581f63441a74f2b028c2614225139cfd826c8330 SHA512 34bfd8c7c7071710468e9c59e9f8577359cdbd6a7abfb850f9d3756fd3b787335354a0b087131a314dc7eb8a9a457869fa275aa33a842a2da17313341df05189
 MISC metadata.xml 363 BLAKE2B 4da5b0e27af01e94e1e68b98274da6c9cacbe59ed1d85413038bccfa530af8fd479a7edd89f4d7633dfb07afbad4736cb6c075e021db7dc9761c273ec1256500 SHA512 60195d5859a8b175346a1cd533dbb6496d2787c1ff501d9233b2b1794670ae344c6f9f4cac4fbf86b24686a83692cff27513d05243947e2921e554e065696721
diff --git a/www-apps/nextcloud/nextcloud-12.0.5.ebuild b/www-apps/nextcloud/nextcloud-12.0.7.ebuild
index b5b260e20578..b5b260e20578 100644
--- a/www-apps/nextcloud/nextcloud-12.0.5.ebuild
+++ b/www-apps/nextcloud/nextcloud-12.0.7.ebuild
diff --git a/www-apps/nextcloud/nextcloud-13.0.0.ebuild b/www-apps/nextcloud/nextcloud-13.0.2.ebuild
index f7e6255e6454..f7e6255e6454 100644
--- a/www-apps/nextcloud/nextcloud-13.0.0.ebuild
+++ b/www-apps/nextcloud/nextcloud-13.0.2.ebuild
diff --git a/www-apps/openwebstats/Manifest b/www-apps/openwebstats/Manifest
index 2f2fd0c315fb..dcca3284eec8 100644
--- a/www-apps/openwebstats/Manifest
+++ b/www-apps/openwebstats/Manifest
@@ -1,5 +1,5 @@
 AUX config.php 2106 BLAKE2B 727e4dca51bcf691399041e260d3318382a6e97e2a23d15f1b93473fc744ab853c3c2a97782b3cfa2c2062aca7fce1563757925bee9dc46712a344cc12d8657f SHA512 c4db28cffb2dd83bf54f483d57468cd0602680d8b40f471fb063a37a4a4ca3968157ef9aa0209c26d97a86855a1863c0908779bab0e54f6fe3b747cc38a887b2
 AUX postinstall-en.txt 1245 BLAKE2B 50f54e2cd971c13d120a2664beb3a569c74b9350fbf13988021911efb24063dd894837e951b1250f45fa828b314a0c10cc00dc1afb137b96982dcd7ee720c884 SHA512 b814a821aa70c1dbaa736976a7dc19c9589efa3f50cbb2686ce9059c339304bd224d7849265a64725805ee86463e948a15c24e2c807cef05a6f625bb463bc78a
 DIST openwebstats-1.1.tar.gz 163477 BLAKE2B 1fde6928746e6e43b9713eae02078d50567753040966403e736936131ab1c4f1eaa7827848d873bc17cf346080365689a02559f95a3d35f6ac9541c597ecc6af SHA512 882a8aa672703e978282550437ea9944bc44c424c3a157acd10f35a42681721de4bd5dde60aa9e57e15d3b986b1b4d1c9f0e4adf0360a0d569aa46720b4e2eec
-EBUILD openwebstats-1.1.ebuild 871 BLAKE2B 3ef9c32a6be5b3e9413b6eab98fd5725f5eb0a2b69a5604d44b308918c9d1ecda0c578338f22ca8b87bfbb41c247a1a6d2e8df6a9f1a7634a17eb9cdf3119e99 SHA512 8a9072836d7f951d25274b864ba885c977fa4d3d7964eab2452f04802f5a4e62d438af0e0998d4ff7762df4f04d25adf85c253173e935704dcc12632404720fb
+EBUILD openwebstats-1.1.ebuild 879 BLAKE2B 765205548b47e22d4f9404c6d6393e3e0d0cc6f44301bea5d6b4b1a5b50387d8e095be4fccd4c719b4d3b4c50e8e1eb73632ab7b87c9c1fcbc1ee05043a9a089 SHA512 740e212a8de1315da1494f64a71eadf74ce24ff88a8537df800f14e7387f6af50b6a3c44c47f8e9bd090ae6c75a9ec59ee7723d88796be05efb7983cb1712d5c
 MISC metadata.xml 332 BLAKE2B bfdbd52b41802fcbf1f331c475605684db0925455ca692c2ce8755c95a753709016906d29878bd86d60d6cbdbc3f5e520db46bbd8953efad86103c34645d308c SHA512 b3a5cd09143fa07cc7f0ebaed3382a34bd6ddfa0e28f4540a01356be6d4d4b4367dcf2b6ec901179526f1deb5f66ced1503dbe8fcf9e41b7addd400dde6dadaa
diff --git a/www-apps/openwebstats/openwebstats-1.1.ebuild b/www-apps/openwebstats/openwebstats-1.1.ebuild
index 5171e9031e40..037e16bdcce6 100644
--- a/www-apps/openwebstats/openwebstats-1.1.ebuild
+++ b/www-apps/openwebstats/openwebstats-1.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit webapp
 
 DESCRIPTION="PHP stats app that reads Apache logs and imports the data into a MySQL database"
diff --git a/www-apps/pcgi/Manifest b/www-apps/pcgi/Manifest
index 3fd657019f4c..45cd61ca0a9e 100644
--- a/www-apps/pcgi/Manifest
+++ b/www-apps/pcgi/Manifest
@@ -1,4 +1,4 @@
 DIST PCGI-HOWTO-1998-08-13.html.bz2 6483 BLAKE2B 1283503a0474ad4098a9371842b9db6db5d20cd78952d1ddf79cdd2e2f7e37fe17553bc12f635026b45ef36512fb0d2bd3dbaa2590be0796d00a0854d30b6335 SHA512 8b86e0c166055492564ee919d8f983f8f9df7927aac63f9f63068f5dd837a675c3b230801763d2623401095515fe138b5c9ab222d972bbbcedce36ad1b576d16
 DIST Zope-2.6.1-src.tgz 2318685 BLAKE2B 7be409216124479b0baa1c079bc5f41ed7c5f87318a9f814af9d63b0b87fe51756531dde8b4ba7cb4155f29aaf5c39fe82c4f1bb3a7f8586ab3f149798dae842 SHA512 b714c533f818cbc16bd6c5f899049a4f214d5aad06a98f822f886a33fd5636b416cf8e944757f4a50d39daaac482e2af24dcaf4bc0ab795b9e9d25c961525451
-EBUILD pcgi-2.0_alpha5.ebuild 1455 BLAKE2B b621c97d9df6850b0c54f7e464af0abe810a6c49de2839ea6324b7f0e57a28cd3d301c826f57ce584689235cf06c63f14ce024f3a38a05defc3d7ea182b36e72 SHA512 da6abbcda1c13fd5660f92e89adbf5a5fcc977aab41b589bd9d5b019b2dce808d31d60c713ebf3fe58fd88654079dac897a0ea30114e24b5a0923996d5116772
+EBUILD pcgi-2.0_alpha5.ebuild 1463 BLAKE2B 40fbd4bfa15df165c7db690b276f32c3d213beb54b43b0b8095a6ebc8611d1c67e8ba588524e9f0b8766b249fead97d43bb2c4f615d70065987c60dd5ea999e7 SHA512 2667090edbc678dd9eebd491e4c89602d231ba6fe953b799a10c48bb802756c7e8acd04a3a05f3d9ea119227e55e7182f45b67d1bd64d3e0fbd7452fa26585c7
 MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
diff --git a/www-apps/pcgi/pcgi-2.0_alpha5.ebuild b/www-apps/pcgi/pcgi-2.0_alpha5.ebuild
index c9815cd57798..b4b6a1e0a96a 100644
--- a/www-apps/pcgi/pcgi-2.0_alpha5.ebuild
+++ b/www-apps/pcgi/pcgi-2.0_alpha5.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 # this package is ONLY available inside the Zope tarball!!!
 ZOPE_PV=2.6.1
 ZOPE_P=Zope-${ZOPE_PV}-src
diff --git a/www-apps/phpwebsite/Manifest b/www-apps/phpwebsite/Manifest
index da869f3c8881..9721be0cca12 100644
--- a/www-apps/phpwebsite/Manifest
+++ b/www-apps/phpwebsite/Manifest
@@ -2,6 +2,6 @@ AUX postinstall-en.txt 4642 BLAKE2B d00a3c06c548ab1b424a988b064d23023ce10c5ba620
 DIST phpwebsite-0.10.2-full.tar.gz 3338377 BLAKE2B df6d2a87f9c6f77c664f1df5a542bd2f9da670367dfa4b281c3acd1a664c9550a03f12e752dbae7380bcd4d660b46ee5829849c91ea5a15e0ec7b08a924304c3 SHA512 b767ddf2f211c5bf9ccee22f88dae0a66a26a7a294d8eb95a94a9384d358f18ecf3ce888423c98a8a84091f7bad6399c370220ae31fbf5006f1416a44ec4d4c6
 DIST phpwebsite_1_7_2.tar.gz 14531036 BLAKE2B 4681cad72ebc9ae3e1838b0db15022a8681560dae27bd9cc4be9e1b4b1d479e218e43781e2c5024924c762cbc85eacfa31ab975ab81587e42356bbb0b7936c9f SHA512 cf3f503794bb12d24ea003b0caf3e98148be43e0acd38e4d15be559cdf643266270800450309337d6540eaa069022730cef64bf315bd0fb3853a344a63c78ae5
 DIST phpws_patch_20060419.2.tgz 1560 BLAKE2B cee7e4752d06394b1806d7baa8f25128ffeaab696a03b24c149358f4e7ad118875386ff022f67a50aeeb541fc00da1dc8c1dcbe66e7ca164d2c486fe451fa262 SHA512 12354f8012dbb5540f681b3df54108153745264f9703242edfb31122bfe5e59df86ad51fbb4faced52afad1f69eae137f0da428fac2f32af582e5e91800539c2
-EBUILD phpwebsite-0.10.2.ebuild 1332 BLAKE2B daa5418ea6144645e0fdcf6f7fdee37a8cfdd3f2109e05322f102a356cb5ab5793701980181c3d136669f96bc0ac1414ea1b80e5d7df7f7e929742a5e3c80802 SHA512 16b6ba4832cae9bba062c72d22b3006d2b0b64d4e6228aa39af297ccd955ac4a0439205221bdd24ae612a8ccd29e2f43a414e6ad6990a26db4ea25e1b18fc9d7
+EBUILD phpwebsite-0.10.2.ebuild 1340 BLAKE2B a9c7792e6aeefe53671b066109fa69b2b99a63b4d33ff0f2838ea9eec6d4ddb0ef77d1ebec0b394f76c1b641d39bbfeb6a18b491e64050d20a9b0b2419224cbc SHA512 a84f1124dcf2c96bda5e39f33c40d6294d53d668cca995f50afca3e118cffc53f8a0dd7fbc9a1188cedcd808cc65548efe36d53160388de11eb3c5534cd2172e
 EBUILD phpwebsite-1.7.2.ebuild 1076 BLAKE2B 6178ce16315beb0d3d8ed0346c90734c12f973e6b59b55b4a331857ada2484a5d84bb6d0d6291032a978c34f937a60a6010df8894fb37ac2610a0644ef09c209 SHA512 f71f17722a93f01f61db60b703ed382a433bfecfde4cc3e238b01b4859d68641559ee73b82c24ae6b888475f4db5f7e007149e367fd83ca6793ef4175580f213
 MISC metadata.xml 530 BLAKE2B 7da060cdaf07251ff2d82470470c761f08d2d9c4ce8bbc3be8bd12cf31431f7404ec0dee4860bc63ece36e10cb4025b7c18381d57035dc747efb7453d619422b SHA512 ae99108e95329aacd90e09478fa476ddde8c30de43db1c2f09b7083d034d0190114922ae70715414ad32456884b9be9e99fadc6ace9374336dc8eb35aa089c90
diff --git a/www-apps/phpwebsite/phpwebsite-0.10.2.ebuild b/www-apps/phpwebsite/phpwebsite-0.10.2.ebuild
index 7ffafe8c5a2d..9b2035df2cc8 100644
--- a/www-apps/phpwebsite/phpwebsite-0.10.2.ebuild
+++ b/www-apps/phpwebsite/phpwebsite-0.10.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit webapp
 
 DESCRIPTION="phpWebSite Content Management System"
diff --git a/www-apps/sitebar/Manifest b/www-apps/sitebar/Manifest
index a1ff42d838c9..06f63d08ac7e 100644
--- a/www-apps/sitebar/Manifest
+++ b/www-apps/sitebar/Manifest
@@ -6,6 +6,6 @@ DIST SiteBarPluginLDAP_3.3.7_1.1.zip 10036 BLAKE2B d4c93d9070c642a3ef042f5c48538
 DIST SiteBarPluginMailGate_3.3.7_1.0.4.zip 15685 BLAKE2B b0b0ab6697382742435b0f9b613d2ed447dc3489ae466a7720ae264b74d5331f7d1810cdc7d466fa0b6ae517edb3bd832b416b62e585c4e9edbc5bf0d5adc264 SHA512 3e27d31c62bd7cadd734740247a8e94066d3787f7a19208f1630bc85720ddf9bcada5392aa654103c756780c92178d3df0d2ea0d3dd8ba63ccb77410a507e5c7
 DIST SiteBarPluginMessenger_3.3.7_1.2.zip 19406 BLAKE2B 465718b08d653d8a96d5564bfbfc8a44d1211eb7e5c75abbbe678a1e2e72e9334a1b5bfd29f1cec68bc82d367787fa77f2816ecc01474fa919f22cb872579d70 SHA512 eee9c2be52472972e454de49210f884a6436ccdaaf1ecedc59b25aa83a40ffa695ece645db65a5bcf246621de54d2f510a8e6a5e9f3b059ee0aa0c677a9b739c
 DIST SiteBarPluginXBELSync_3.3.7_1.1.zip 16487 BLAKE2B c818f6783573f2ead2715e3f7d0b8dca2abe2e88fde44710233bed70a79d2d55a301d4067ce05c9e6d74776da9192a546aa2e3d4aeae4c48b8a984b32e988c33 SHA512 9ad4924912befec47851aba3ad3f9c13ef94db6de09b56c6c75c10e76ac44e54b7d07303936aef70bd720a15e8a3569af49bec92aa68eedf05d49389c4c0cbf5
-EBUILD sitebar-3.3.9-r1.ebuild 763 BLAKE2B 28e37c8d4a56b88454d4a0637880d4cc550838e7c026a2ac8333ddf5c97db1a6154d37ec6eb3c11a562da5aa191e2ef6c6057efe773eea21fe7b5a09d67160f0 SHA512 090925624c7019b250556aeaffcd99eff8b30bd00e173dc7791fcc75b63cc00951d339db31e07585733a160758092841a4614ed2128b64efd82071fd7b2de365
+EBUILD sitebar-3.3.9-r1.ebuild 771 BLAKE2B 4e1005fe1c305be8e88a3cc671d8bf1979fed85eabc8ea26bdd9a5271a3edcf7d2acf425bbd721c2368eb53f7418f430d27eb46a73a9c4492d8060f841b2a6a8 SHA512 746786e0e20d984aee7d3249d2c679ab01f22f11a5c3b05bacf921a44bd6e379f03947f53c915f76978fcaf9a29dec14db1c489a4173de3498d13f93fe6a591c
 EBUILD sitebar-3.3.9-r2.ebuild 1284 BLAKE2B 173b5552f6e1319e9d81b04707a2ddf88c81cb3700d16bff360e911dc0a9fe985de18795dc9c6f3d904a4b752d14b791c85b39d8dd1073333e19f304812425e7 SHA512 59e83208fb66244ae580934dde47a98e0821325b7b0ab547223dba019b1534720d74e6eb9481b1901f4cfe211fcfcc0d301b30e5a81e0f8928320a428fb690f5
 MISC metadata.xml 397 BLAKE2B 3d3c552dc80d9f027cd4a86270d164cd40512a1632d17b9b0b1deb0e862e06f117574a98ff111281ff8e05dd54c7bdc81314b17f7c6aa94feea16a7faab86f19 SHA512 e7eaac481d5b669270adda58bff95be6428c3b7eb6c8a2d6da48d60c1b2a59f0dda5ad51a82367c148b5cb8470ef4e4dae378826228d46dc365582e6d834f06f
diff --git a/www-apps/sitebar/sitebar-3.3.9-r1.ebuild b/www-apps/sitebar/sitebar-3.3.9-r1.ebuild
index ef0c74bbf1cb..7c27ae26c110 100644
--- a/www-apps/sitebar/sitebar-3.3.9-r1.ebuild
+++ b/www-apps/sitebar/sitebar-3.3.9-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit webapp eutils
 
 MY_P=SiteBar-${PV}