gentoo resync : 30.05.2020

22 files changed, 67 insertions, 234 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 9a496394c373..079111d856bf 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index bcfeab0d0a31..a59ce3e5997e 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -2,7 +2,7 @@ AUX postinstall-en.txt 272 BLAKE2B 2042cf6fbf8d98ef144d19002c3498e4e5f6238b8d135
 DIST baikal-0.5.2.zip 3426025 BLAKE2B ac13b42a3eab54e43761bd0ad958208b692919a61908a6467e710a045c6568e9ae616a54c6910b6828c4499b3f815bd96b9bee12608637b64182238725e21922 SHA512 58dd9e231840a76582a70abca89c8f73f1a26f06855eff6949ebca526a22d23bc06f281f51611aeb7f0cf8334c0ad490cfea962905e985d6c75e78e1c1d47e63
 DIST baikal-0.6.0.zip 3432758 BLAKE2B db55008e2e971fd8d6edabe38f333c32564ef34cf7f3a93ad9d67083646c9575cdf9ba1d51108c5fe9f5d385a53bd78d1406318f3a72672126b5f31cc032b104 SHA512 75cd3e30c3df4bc5057e14215b320647c9683702171671ed58ac83e12f7770454d81970f036fd96dbb9aefe0928fcf40ae11128687fd261a0dccadf15d148905
 DIST baikal-0.6.1.zip 3437686 BLAKE2B f28d3a63166a73571116759df3662c2b19c2eeeebcd7070574dfc3ee8cb046f2d94fdbc4701669291c1bb2cb2b9b92665726127c852c5457cd285f6ffbcc9b00 SHA512 d88ed9fbe1f934d52fd798165675b90972c47c9e138de61e17a14777590ebad5006c1a414a4e0119eb8fa718e01f2aadb6e1d180e23a51fb33e1b5a3539c9e38
-EBUILD baikal-0.5.2.ebuild 1447 BLAKE2B f098f29cd8f6600a63d8b054ba0cb86b765d387d0a76018276871c474af3e202c334273613af7ca1b4ee80c5e72957ba40f7013dec76c5c30a724f836ea5c42e SHA512 c9a0d359302be4aec041362e3f6e199256ed5b161f2ba499e31c0393e3b2f37c19193d5b3b1b283ca30b396623b835739a46d11191a9c35ebea74b47d6ce6c21
-EBUILD baikal-0.6.0.ebuild 1445 BLAKE2B 4877135b216b5027109f6cfc52a4cedd4dc6eb2302be2554c4d28510ff43b9b52ea1bfde5a61c1b460266a638fafaf77258e4486cd00dbcb0bcab407f53c4f82 SHA512 4ce8aba81566dd8b34df062bd45319506ceeb5f649110cba354cff451220aa6b8a7c2242947d734c028e49e3490396343a889f4ed1102e60c664ceacbe7ececc
-EBUILD baikal-0.6.1.ebuild 1445 BLAKE2B 74e2d1c5ead1cb02eea2e26ae710b567e375dbf745a7472572dc894ad5b36eba9475033618aa9008bc25f63af0599a01031a0a8455e83c509fd877633c4ab697 SHA512 f0b8fbee64ededf8b5e338abdf12847dc16aeffb8519c41372fd98c9df4367670e469e0b21a3a7a2940aa7adcff24fc372766d0007a6069b5a5505c5dc17127a
+EBUILD baikal-0.5.2.ebuild 1448 BLAKE2B c90e53da2862e36249d70f300ea406e4203953f0896b0b238e42804c8202511bee1df4533ca6f3667e78f28e53355fc89b38015a379cc846acd448f917b2ce7f SHA512 5c2ecde3efa57c267f567cf492cf9d9f5bf754998e617cc0726f6ed642e695816949d0c13d327f96ff6ea0a45e182c20a1667c2a533c20208a79e8005efc6f52
+EBUILD baikal-0.6.0.ebuild 1446 BLAKE2B 5944a7dd73429ee30975230eb49a4eb842ec4dbf538ff31e9d070d3aa31acd73c3f3ebcfc140d00bb28714316431e9c3125e8e8ae010debc9eaf7b0a1000070b SHA512 12b9b6a9d0c6135455502923e38218612344d37836d4d2a244f7092049a1e164482eace228b114fa6ab1423b0242ea712dbfbc046fd73254c2582373a5206e3f
+EBUILD baikal-0.6.1.ebuild 1446 BLAKE2B 5944a7dd73429ee30975230eb49a4eb842ec4dbf538ff31e9d070d3aa31acd73c3f3ebcfc140d00bb28714316431e9c3125e8e8ae010debc9eaf7b0a1000070b SHA512 12b9b6a9d0c6135455502923e38218612344d37836d4d2a244f7092049a1e164482eace228b114fa6ab1423b0242ea712dbfbc046fd73254c2582373a5206e3f
 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 c44cf7d9ddaf..24e74850aa4a 100644
--- a/www-apps/baikal/baikal-0.5.2.ebuild
+++ b/www-apps/baikal/baikal-0.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,7 +6,7 @@ EAPI="6"
 inherit webapp
 
 DESCRIPTION="Lightweight CalDAV+CardDAV server"
-HOMEPAGE="http://sabre.io/baikal/"
+HOMEPAGE="https://sabre.io/baikal/"
 SRC_URI="https://github.com/sabre-io/Baikal/releases/download/${PV}/${P}.zip"
 
 LICENSE="GPL-3"
diff --git a/www-apps/baikal/baikal-0.6.0.ebuild b/www-apps/baikal/baikal-0.6.0.ebuild
index 76fe4e54b4cc..b8a74120fedd 100644
--- a/www-apps/baikal/baikal-0.6.0.ebuild
+++ b/www-apps/baikal/baikal-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,7 +6,7 @@ EAPI="6"
 inherit webapp
 
 DESCRIPTION="Lightweight CalDAV+CardDAV server"
-HOMEPAGE="http://sabre.io/baikal/"
+HOMEPAGE="https://sabre.io/baikal/"
 SRC_URI="https://github.com/sabre-io/Baikal/releases/download/${PV}/${P}.zip"
 
 LICENSE="GPL-3"
diff --git a/www-apps/baikal/baikal-0.6.1.ebuild b/www-apps/baikal/baikal-0.6.1.ebuild
index 60941c03651d..b8a74120fedd 100644
--- a/www-apps/baikal/baikal-0.6.1.ebuild
+++ b/www-apps/baikal/baikal-0.6.1.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 inherit webapp
 
 DESCRIPTION="Lightweight CalDAV+CardDAV server"
-HOMEPAGE="http://sabre.io/baikal/"
+HOMEPAGE="https://sabre.io/baikal/"
 SRC_URI="https://github.com/sabre-io/Baikal/releases/download/${PV}/${P}.zip"
 
 LICENSE="GPL-3"
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index d2289c82cdda..a48eaadfc34f 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -13,6 +13,7 @@ DIST chromedriver-bin-78.0.3904.70.linux64.zip 5527671 BLAKE2B 41c29c580ed00a23e
 DIST chromedriver-bin-79.0.3945.36.linux64.zip 4875160 BLAKE2B b5f91702ea415dd65e7b5807ace37dd2c27cf77733383f97e46d4e12234afcde1642b6a814088122a5e893124e6c6cbe117b3dfa2a7cc9c97dfa6948df5c5995 SHA512 78c11beb107f4775d40dd4f28f713d6f3228930a5647dd7a5a824a6c9902364f8267e40812b4ca8dc3b849cb5adc3fb6c810146b29d29ed85e6e55e13c86ded7
 DIST chromedriver-bin-80.0.3987.106.linux64.zip 4943146 BLAKE2B 7e5656fbd223f157702e0b31a52c5d9f9bf72b0bcff15dd40571f7b470efe591b46829b3cb5139d5d2ff94fac6e9829d444a33cb1427ffd02434a7c894d889d1 SHA512 afdffdffa3cdb685c1fe96e47ed625f5bc01b5fd180c201f6eafe120b6d11bb26c60bcfabf71a07d12213eec8e606d3dc52917b0830dc86fd384f30cd18c6229
 DIST chromedriver-bin-81.0.4044.69.linux64.zip 4956612 BLAKE2B 9d7bc8fe5f62e940c8b711bd7d7918de974b6c7731bb6cd7ba6597958c20a57acb333989ab47c8298786e168a03d7456007a34d9a85e20bbd033e7380deac957 SHA512 6dcb05d7fb117051caf3091501f708cbfc45adecb8f2591b7cb5664dbe4999e93542f878a6de8c116761c8fd2f53f4f2df3604704dd4e8dc33b973ed749e25ff
+DIST chromedriver-bin-83.0.4103.39.linux64.zip 5222065 BLAKE2B 7d801205bcd0174d1d622b8e3c6c755f1dfae1fd4bf1bc225dbd05bd0d868c300d7bf442a39f29525d4af1f54c0f2e46b233d433d70523d48df15a30aa1a89f0 SHA512 9cb02938cef436dcf0b3f54e5ce668de86e9afc702a1903e2f35ecabcbd4c468f525ff3c6b079eb88b14c1a956bc070fa281fdf64d9d54027254f769c00d24f9
 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
@@ -26,4 +27,5 @@ EBUILD chromedriver-bin-78.0.3904.70.ebuild 536 BLAKE2B 33443cfcfae910fbe0fffcb9
 EBUILD chromedriver-bin-79.0.3945.36.ebuild 595 BLAKE2B 50a3893369b0bf26c1ac28cf30f6fceebc04096f4602d4a433c29fcae1a1dbefae0e159c95dbbebf8ca4fbb3fb78aedd5c3dd7ef7d5ac0e8c3c324e3d4c4f667 SHA512 ebd62f835d0aa6ab6a517b4b2084227969f2b087540984d46a5a1f67d235baa77f1e98c0f7e13cbbdb5bccaa106cf30a539c79e94e846e2d2e4fda7d624ae638
 EBUILD chromedriver-bin-80.0.3987.106.ebuild 595 BLAKE2B 630d77aec56a4bc0d3bdf7a602f7568b205b4511fef2ffd28d0b811c86e6c31b436ed172198901e143eff56c0633d1b463c338907c79798e10e5468b7a0b5bc8 SHA512 33779f842a2e2e5aedf085c50f91c856438396705dd1191beceb85ae3cd6cfec23fe707de697f2de533289562676e9779bb8195bb63911eb245884bafc7a56fa
 EBUILD chromedriver-bin-81.0.4044.69.ebuild 595 BLAKE2B 630d77aec56a4bc0d3bdf7a602f7568b205b4511fef2ffd28d0b811c86e6c31b436ed172198901e143eff56c0633d1b463c338907c79798e10e5468b7a0b5bc8 SHA512 33779f842a2e2e5aedf085c50f91c856438396705dd1191beceb85ae3cd6cfec23fe707de697f2de533289562676e9779bb8195bb63911eb245884bafc7a56fa
+EBUILD chromedriver-bin-83.0.4103.39.ebuild 595 BLAKE2B 630d77aec56a4bc0d3bdf7a602f7568b205b4511fef2ffd28d0b811c86e6c31b436ed172198901e143eff56c0633d1b463c338907c79798e10e5468b7a0b5bc8 SHA512 33779f842a2e2e5aedf085c50f91c856438396705dd1191beceb85ae3cd6cfec23fe707de697f2de533289562676e9779bb8195bb63911eb245884bafc7a56fa
 MISC metadata.xml 460 BLAKE2B 6da42de60f119a13f70f0a64f61f4fde912d15a7582b240631761e852b0db50bdb2f95102be05b09b1d653907b4c0a8a9641a9952cb6a7c1bd84d8f51ae1d83b SHA512 a8dfdafe46c651f3b06e0c004750747cfbe21e0ee704e5afd6f302c2ea61e288fad3987732b0e4b6ecec4805822c347f1d43a5e09e911e7d950196207eb81f43
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-83.0.4103.39.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-83.0.4103.39.ebuild
new file mode 100644
index 000000000000..c96967a171b8
--- /dev/null
+++ b/www-apps/chromedriver-bin/chromedriver-bin-83.0.4103.39.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 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/drupal/Manifest b/www-apps/drupal/Manifest
index 07cb6f3fcc7d..62f83b81d18c 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,12 +1,8 @@
 AUX postinstall-en.txt 1595 BLAKE2B 9b5c237befcf415d0f769052c9634da830326ff57da1a1db538059138780c8ebf8d0666908fb6bb3eba99fee5d5869cd12042f0d276b560b51db60803e46c146 SHA512 6a0a5388d40b3c49f3c685a6a7986c2a9efe3e6d7c5115fbb3110ebe4c19c605a4ff785447a20c0296f3cb16811a8a6e77f2439d58253a011603709c9dd9b760
-DIST drupal-7.69.tar.gz 3314294 BLAKE2B bfa1d528caf5dc1fa8a21d65244801e2d10961ec707bdb05c99cdd4fbb1e8f90692549b00befd29583371791a22fdf46af87dcc8c43204dce6ba505376bff5d4 SHA512 521eec475cbd11d9c997f660c8cd3f92e7a164650eaec67bc1d40c53e901576bc827a3805d2341ab80e9a5bb2f4524e7541d0a99970f2a51a3e45a9ac8ae7880
-DIST drupal-8.7.12.tar.gz 17917274 BLAKE2B 931876fffaab011416d992910317e0b24f89ea4c01fbb09e7d256fb90652b30509051d60c61863434762eccf382ed9f25be41f84b797ffba89aff83a15ff908d SHA512 f9b140d52d11d9ec0543b8e18315b898f1d09bb4c360c544498b1b6df8d40e59c04e5e04749140c896c51f2ea1844fab8220dd556986b39af0fc846d2571e5c2
-DIST drupal-8.7.13.tar.gz 17930132 BLAKE2B 926614cfa214a4c6bceea89d730f888fadd6373d197aaed983d9a778602fd0c22c8115fea670489e1d5eb26eadaa89f30427e7d7c719f3abe3f59e98f7cb6e07 SHA512 bbf859b30204c6c62ac1d2824cda0dc23acc4af99a119684c2b55d8944d6bb6ee5989f1a092f042009e4fe1f8da7cce8fca7d823097c53279a94b2c6f75fdbbf
-DIST drupal-8.8.4.tar.gz 19488274 BLAKE2B 47cd41ec3d494f5dc948d70c45072fa8040698db133141947348b201e9853c04b91460b1c064d36e45dd20d0ce99c2a1a592e4f2a0f99348cdfd08fb97b9f0e1 SHA512 e85e1262eff6274ada1d2625fbd7744b22611807e55252fcaeae722dae5dbc1c552841681f80d552e2d68f7ab2cdca8915e9a2e4c3dac9870fa92c0cb3910286
-DIST drupal-8.8.5.tar.gz 19487785 BLAKE2B f7f64482c122009a7517bc299abee2a69f37b7732f4caa6348c811324c1875d38c3a8c71e031f451b1926e9e3b209c1da6db743451c28cf1e5a8c5ea2b13eee4 SHA512 15c1b574867066601d19f1cc45f3a65301f11e034f1aed4ab2b5566e5efc7b70ca7d12482fc94bd936b4b1b6bfab0fdc1eec1470d44a6de157eeb5bf8c178124
-EBUILD drupal-7.69.ebuild 1546 BLAKE2B 35cdab15e35337c9f7afd5188883ae89c4729ef0616de25fafe42d0252a517771fe1a075255239b3c7f1290a411490ddc6d4a64c66c67f1a25c09f06e0fc3d9a SHA512 bddd764fb0eeec6170b936829aad59cb7fe20dffef37eea6df80dd3ce05a13ee36710ab7b36975a450ee310ec94f0362763cb5541f6c721a5054b961c665a42d
-EBUILD drupal-8.7.12.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
-EBUILD drupal-8.7.13.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
-EBUILD drupal-8.8.4.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
-EBUILD drupal-8.8.5.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
+DIST drupal-7.70.tar.gz 3319190 BLAKE2B 33f27c8c893d0a34ba953fbe9fae9a9552333328869da4d8627df018e3fc79d6e0cda3ae010c810ee113d87bbbfd2a9a7b12164cf2aede294de246d545eb3bcd SHA512 17d82cd8e4a519bccaf858447db76d7672ba0b9b6b4081f2b10842f22cf9cdb3a15df1dcc33a71be1476ba0df960812624938a0bdff594dd02b114521fd83b65
+DIST drupal-8.7.14.tar.gz 17930775 BLAKE2B 0a25ea095d8431075bb2d6506237a270131cef0548b0be4d801721fc850b504d0ea1969410a4b7493f983d9a9e80e9e8e45fb553e821759505882bac96266de3 SHA512 0dc5ee0d21c6da019aae6cf93d16d938b5fcf3179b74278d03c75cb6fd78f7fa698bc98ccb4040553b010e7b529f8a37640147b928616348abbcfd3060d42995
+DIST drupal-8.8.6.tar.gz 19494446 BLAKE2B 201399953571903b174548aa46455fc247dc34b3c38953c82c8f30c3317875662744fea5574c3692a35d6859ce5479dcfe084c9347c20909b72a015ce44fa44a SHA512 7466b28c36b8eafe15f5c23ec89c59e0add945ead9b46421735efff304cb3dd563c7dc850725e6fdc517a9116756a5d118f763e7744cd05edeaf1cdcf827eca4
+EBUILD drupal-7.70.ebuild 1546 BLAKE2B 68d9ef0e5c84e8413ab72d8d1f7427316885419b1e19086d2d27d293a98fff1c4f7f889ae68decf1083d98e228dc6778794bf7e61d82f7d3002cd2a92ca0d844 SHA512 366ec13e1ae23222f5b5bbe04f2f3ee0fec8c70e68d542582bb01c67ed5fda76b28dd3ae0072bef3c19c76bbf85e34ce505986226edb76755092b2cc8d299a63
+EBUILD drupal-8.7.14.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
+EBUILD drupal-8.8.6.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
 MISC metadata.xml 350 BLAKE2B 6142fb739e77e5ea96afb08fc4874d79efcac28348eb84333b77010fe74286d2939e160ad4ae0bbc7ca1630a73683d6d956ea1dc804b602f7fb925fff3e4b814 SHA512 10953373bc06435a35f07b9f0950c7e930c6c23cd3e6d35393eb98e581a3daeecf9b6c1f26bf1343e9ff4be84b7db3a6967c5c61bae78dc5cc7a8b786a93d6c4
diff --git a/www-apps/drupal/drupal-7.69.ebuild b/www-apps/drupal/drupal-7.70.ebuild
index da5fce8597f4..4fd21d3cac4f 100644
--- a/www-apps/drupal/drupal-7.69.ebuild
+++ b/www-apps/drupal/drupal-7.70.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/www-apps/drupal/drupal-8.7.12.ebuild b/www-apps/drupal/drupal-8.7.14.ebuild
index 50acdd30770d..50acdd30770d 100644
--- a/www-apps/drupal/drupal-8.7.12.ebuild
+++ b/www-apps/drupal/drupal-8.7.14.ebuild
diff --git a/www-apps/drupal/drupal-8.8.4.ebuild b/www-apps/drupal/drupal-8.8.4.ebuild
deleted file mode 100644
index 50acdd30770d..000000000000
--- a/www-apps/drupal/drupal-8.8.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 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.5.ebuild b/www-apps/drupal/drupal-8.8.5.ebuild
deleted file mode 100644
index 50acdd30770d..000000000000
--- a/www-apps/drupal/drupal-8.8.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 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.7.13.ebuild b/www-apps/drupal/drupal-8.8.6.ebuild
index 50acdd30770d..50acdd30770d 100644
--- a/www-apps/drupal/drupal-8.7.13.ebuild
+++ b/www-apps/drupal/drupal-8.8.6.ebuild
diff --git a/www-apps/liquid_feedback_core/Manifest b/www-apps/liquid_feedback_core/Manifest
index d2372e69b782..5b802b9b52b2 100644
--- a/www-apps/liquid_feedback_core/Manifest
+++ b/www-apps/liquid_feedback_core/Manifest
@@ -3,6 +3,6 @@ AUX liquid_feedback_core-3.0.4-gentoo.patch 843 BLAKE2B 81b37cf79c20a83db0d5c55d
 AUX postinstall-en.txt 1498 BLAKE2B 0b29f386ea2c6a132046a42ebb246ecb428821d76a027722b4260f7c7bd00e99186ce145a2b5d7f169eb25b28a702ef4d3c2e0a0ae3217321f6969a2efc02304 SHA512 cd1488337b3faae08a1d7c326b4c1445863fb07b3d39b63460703467ad85524acf0fc14a19278a9cf995304e3a79c1b90ecdc0098f984d106d484f79d315b8e2
 DIST liquid_feedback_core-v2.2.6.tar.gz 127440 BLAKE2B d62ecd8c9947259a7213f92ecaf1491a5e858ff2fdaff5e020fc4ec0c433297d8a7701a812de200130a1ed7f08ded1d9f31d42de7fffa2981361efee0e31646c SHA512 6f680398a7d2e529e642dc94ba16bc1b33d25459ddbf629c06387391ef13c0e212a108cc337cd2bc29505f4f6436b6e92994e63eaa09fe1c07733d2821d9b7f1
 DIST liquid_feedback_core-v3.0.4.tar.gz 142983 BLAKE2B 05e8c1630a8fa3932b4fc291843dd0c45e2333940394a0632309c9041dc850cc894a6cb54fb840329f67812ebcde5d540c338cf27a88ad428aaa066329725409 SHA512 baea8a61c94e640557d0169b6171247ff0303ff1a9c8b587c6769e367cf56805c1a1e660aadf7178d984182be6dde326770240b3ffeda42139c4a94445a2bbf8
-EBUILD liquid_feedback_core-2.2.6.ebuild 1106 BLAKE2B df24ce5b1a7644b187323950268cd6148f5d2d73887d045e6985c484996a21c56b85f2032b832806d8b8a74cfedef821ed52aa14457605daf75a926be6e123d7 SHA512 d2ee14faf7f435f7d83954e9ce0bdb2fa861ea417927d117d948c77c06c13cdfe0623471367b384d91983418b8d32be1e3032f7e449fc336b8c5ac5b754f4e87
-EBUILD liquid_feedback_core-3.0.4.ebuild 969 BLAKE2B 9202588851c23b109db9805c299ceb7fece980311acf980ab7f7374ad7d787928a47cac119c8faed3ca11fc9a27bcbc973bc7eef25ceff6b5a75927507fd529a SHA512 9b667019dbc756a8baaf082b147a008f3216073e5fe0b3b863a74cc3e52fe67b4a1d90672df42f8ea6d2bed75fd32ee6a9f07c9818dcf18a43c934dc4f5c6e9a
+EBUILD liquid_feedback_core-2.2.6.ebuild 1084 BLAKE2B df7fdf853f14de8f2f3be1cbc9dae637b0cea46d326b4454aeb3b4c55938854ef023232fd76f5752aa1e4cd2a0db0ff2e7f3299e648a2755bfbcff603a793f32 SHA512 2d0029901f91df8563c0130a8b3b7338373ff7fd5665712c2e3217682014fe3755929ea5d9271f4ac1ae64f8bb59691099825ecfa1044d875914df21fac76cad
+EBUILD liquid_feedback_core-3.0.4.ebuild 947 BLAKE2B 7db06edac8e12c112dc12dd41d12e4f805d82385c05e1fe566cb8e3a77b8f114e008d4feb80d6b8845d948f91e79fd419b7867454c50e8f510a5caff7e8e084a SHA512 9f7428e0b41b70127654446c88468a4c139e6404bbd3cced1a4283491dc05b2064e6f9feaccc067e271a624f98e86185b19250bc5117c1b2bb594d3d539d273b
 MISC metadata.xml 1099 BLAKE2B c846e77c5b1531e4ea502b308146062803cd79f74b275cf131343fe5c9c6b0f86a107c84f40cf3be95910ed5b99174d0c9883836a06b535b2d4f08514c9b082e SHA512 1fbc5d0f4eff2085665038a48155b652d434ec42019a5343fe1c1ef34a7b863aa2f21636145d105cf9052ef0756400f29098f3017f948d3aa0fb854f89cd6ff0
diff --git a/www-apps/liquid_feedback_core/liquid_feedback_core-2.2.6.ebuild b/www-apps/liquid_feedback_core/liquid_feedback_core-2.2.6.ebuild
index a914251c479c..6980d685f120 100644
--- a/www-apps/liquid_feedback_core/liquid_feedback_core-2.2.6.ebuild
+++ b/www-apps/liquid_feedback_core/liquid_feedback_core-2.2.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_P=${PN}-v${PV}
 
@@ -16,14 +16,12 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-RDEPEND="dev-db/postgresql"
+RDEPEND="dev-db/postgresql:="
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.2.3-gentoo.patch
-}
+PATCHES=( "${FILESDIR}"/${PN}-2.2.3-gentoo.patch )
 
 src_compile() {
 	emake \
diff --git a/www-apps/liquid_feedback_core/liquid_feedback_core-3.0.4.ebuild b/www-apps/liquid_feedback_core/liquid_feedback_core-3.0.4.ebuild
index 982f8b95469d..0e52e88b06a7 100644
--- a/www-apps/liquid_feedback_core/liquid_feedback_core-3.0.4.ebuild
+++ b/www-apps/liquid_feedback_core/liquid_feedback_core-3.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_P=${PN}-v${PV}
 
@@ -16,14 +16,12 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-RDEPEND="dev-db/postgresql"
+RDEPEND="dev-db/postgresql:="
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0.4-gentoo.patch
-}
+PATCHES=( "${FILESDIR}"/${PN}-3.0.4-gentoo.patch )
 
 src_compile() {
 	emake \
diff --git a/www-apps/liquid_feedback_frontend/Manifest b/www-apps/liquid_feedback_frontend/Manifest
index 346a4eb93793..dd804431d617 100644
--- a/www-apps/liquid_feedback_frontend/Manifest
+++ b/www-apps/liquid_feedback_frontend/Manifest
@@ -5,6 +5,6 @@ AUX postinstall-en.txt 2550 BLAKE2B 10f43b315cd156d74e3e70a8af1bbcd2a7a2e1835409
 DIST liquid_feedback_frontend-italian-2.2.7.tar.gz 7670 BLAKE2B 8131613849efdea1eaa1eda4f5620d7418d6b32c0f57b0aebb07c7dbe17afda2eee814733eada0656a159a93dda97a5a21e17db71baf3ca84e708caf502a4247 SHA512 63cfcb4a565fa570777c2f3d2dcec2e98f16415ad9f8a6d62076f4e2cdf0ddae95610688b6b7751a865344acb7b65f78e7cb1ae4103b24dacf63e3e346405918
 DIST liquid_feedback_frontend-v2.2.7.tar.gz 362509 BLAKE2B 980e261ac9bddfb0f87757457fe58e93481e6d56dc0199b9fc72308e094aec21730f6d901f2e5c1b18a7f5993d1704cc91f64870c16c6215cbbf806095aabe12 SHA512 aa8c99e53c329dbf4659dabe617938d63b2aa42bab99ff4e200d4e15be8ed8ef5f64a71293fa796adde47525d1a76ece3b04cff982474eb2307a3fcd4f269d78
 DIST liquid_feedback_frontend-v3.0.6.tar.gz 497521 BLAKE2B a9e7e7944b418a707a459093b41798818644e2d8aed47a48808c2bf7800acdcde61a04e07483dbb387264df2236b1b02f2410cb34f62bdec6244405db0cf3474 SHA512 d283d277cf6836c53398480c566158481fc65400e128bc4817975fd39c41e6e56b17f7f789a74b1b2a89f84aaf315101e9aa86a474c1817362443d03610fe6e9
-EBUILD liquid_feedback_frontend-2.2.7.ebuild 1563 BLAKE2B d833c465e3722e5cca9de6978633503510e248eabc763692619d4543dce9becc25d06ba4943c7dab23417b38d41050fda50d156dc408e7a4ba3d0e91ce3c1daa SHA512 4ad774ee44fe9e87f312def1cd2b400e2a5b186e069be912daff9e27191e0a27bcbbbe95fdf383145376c9c819c58f6b6eea4f636f201477db9c6ab308cdb606
-EBUILD liquid_feedback_frontend-3.0.6.ebuild 1093 BLAKE2B 668e3a642ba1ca17d61841880456bc7aa112fb512fc1cafa835420fd9b5db1e41db57f79d229c54c11bfb57363344cd178c8826855c90433b494bfea27114c7f SHA512 e37d9681c02b4cbcfa7e485abacff654a3de1a35b142449e2d7c0dc432f2479e22cdb54c943c9cf24a34639b4a0a1231af18cf056a32afe984cf7242fe90104f
+EBUILD liquid_feedback_frontend-2.2.7.ebuild 1580 BLAKE2B 43e872eea424039b31e17e7b8e8c5c6194eba98a86f44b8ab0bc879feb0ad7109af604e27b5af2a6deb08eaf82d2f7c4e2a979ed89bd041904a389b2147b4f6a SHA512 ed1eeeae12ea56a51aca672135996571a59abdc6a65f2f61d7593bd11fb8d34fc65f23c89448906d9f1d2002da7f4852bd9b76fa27495d4a9e1046bc55dfd905
+EBUILD liquid_feedback_frontend-3.0.6.ebuild 1098 BLAKE2B 8c3c79d810cc74fec51cb5fb3229b88a22d5d175d50456ee7147b7d16e29fbee409e62f1e08f1286027900ed6654744997aa4553a482bb5dcb21e2a789877f55 SHA512 c85d88a39aa53ae4f7f1a90359f5d9b5b2da55a964dffdbc260fb23cff462a01a3f4b6327e9df8fd2730671b1336956069d4ee7c9dc540ee8deb48e8f7c5e133
 MISC metadata.xml 699 BLAKE2B 12bf221f2c88a9f60051a1e91e00d855a12c937384470c92272f0ecd195f0a0cbb921ff401932a77a4304f02ed30f8afc9339035eaa6995c932db04b7529e06a SHA512 5a9961a632ba7d64fa23d2e6d43cff15cdd4b0fae14681cf7a0c809cdaa527cc6a1e5dcde7d7d9f26cf824cd18599f39345e5592064c4ebbfa29406256117038
diff --git a/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-2.2.7.ebuild b/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-2.2.7.ebuild
index a482ccbabca7..1c9f8c97b1d7 100644
--- a/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-2.2.7.ebuild
+++ b/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-2.2.7.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit estack eutils toolchain-funcs
 
@@ -35,6 +35,7 @@ src_prepare() {
 			rm -f locale/help/*.${lang}.txt
 		fi
 	done
+	default
 }
 
 src_compile() {
@@ -59,7 +60,7 @@ src_install() {
 
 	insinto /etc/${PN}
 	doins "${FILESDIR}"/myconfig.lua config/*
-	dosym /etc/${PN} /var/lib/${PN}/config
+	dosym ../../../etc/${PN} /var/lib/${PN}/config
 
 	insinto /usr/share/${PN}
 	doins "${FILESDIR}"/lqfb-apache.conf
diff --git a/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-3.0.6.ebuild b/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-3.0.6.ebuild
index 79a779ceea4f..6cac5a55db69 100644
--- a/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-3.0.6.ebuild
+++ b/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-3.0.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit eutils toolchain-funcs
 
@@ -37,7 +37,7 @@ src_install() {
 
 	insinto /etc/${PN}
 	doins "${FILESDIR}"/myconfig.lua config/*
-	dosym /etc/${PN} /var/lib/${PN}/config
+	dosym ../../../etc/${PN} /var/lib/${PN}/config
 
 	insinto /usr/share/${PN}
 	doins "${FILESDIR}"/lqfb-apache.conf
diff --git a/www-apps/phpsysinfo/Manifest b/www-apps/phpsysinfo/Manifest
index 76d4d306675d..4452d84ff3c5 100644
--- a/www-apps/phpsysinfo/Manifest
+++ b/www-apps/phpsysinfo/Manifest
@@ -1,5 +1,3 @@
-DIST phpsysinfo-3.3.1.tar.gz 866981 BLAKE2B 9dcaba2bd1b4faa79fe12a2c50dbc767953cf98d45801ca6bc8398eb625b93ebc56356db0f6e05422dd665d8c6e88cb831b4288a5f0190f3c113c1171ea81def SHA512 7b8e0c469651c878b2dcc37189be7b592be5bde4ece38e0aec21afa5a422286b4c6a555bbafc4b7a2eb19e1c2afdac80fddcf03b41084f9da02fb3c92c7242b5
 DIST phpsysinfo-3.3.2.tar.gz 891158 BLAKE2B 40428647a502f9861f89a490a10e95bef0fdf306d2ee27507b4f396ee7371ca3d75b7259db53b8501b127fb525dce283cb8c73e50172b5b2a78fc490fc7f658a SHA512 33f76436d6ba1aa76a4c7e7dba84f5d4bf458b505df47d65ff9f1ffecc4db48a853c9cdb8583019e70c4d0b54c184ae6d48968f3ed820a711804095a5fc31b07
-EBUILD phpsysinfo-3.3.1.ebuild 1675 BLAKE2B 2d35b9e6dba6b3ec5963f35526ea1a4975937ecb643ba315da8847612c66cf39fb326d3de8702f239ffd9cf9f4f16b8e031ed9f63e004a0d4650f8eafdf2478b SHA512 f5f4092dbba9c37e53c745f94d3f31fd82c57eaea60297630fc12421f9c4ffe1f0058e5a7f88f48e67c7748b96122a0aea87f5d67343935950e97afa478855ee
-EBUILD phpsysinfo-3.3.2.ebuild 1680 BLAKE2B 79c5612f8ed44352bdae51fa97687f5e8d111d9e1b7994fdf9d35c117564a0e61ddb7464fe552e5c1a01cdfa3aa422a03ba938010163c92512c1b585610639ec SHA512 f9b2318d5c09115594e35d86d195a0fbc84080bbc68a7a61a964268eaedbfa25f4cb0a68bb93dca44a9e4dab1f6ed5fa40ac529b9bb26532ba718e05d3b77ca1
+EBUILD phpsysinfo-3.3.2.ebuild 1675 BLAKE2B 7c8bfb0aee2fcda08b5ef0a1fa54727e6ac800894058f2cb77d9790607e71b3cd91800fafd57fe55fa7fba9e059feffdc6376a0adff899e21180828df1de4680 SHA512 90044784e857262744e4d8123b18430a2f3cc2b58db6ed3be15c3c7a4e14a19ef77d4e2c8b461882dd03f4405ac1d3180ad4c56b7857fbac5841ac0e5e5489b9
 MISC metadata.xml 511 BLAKE2B 3139dd25eebac631793e015cb1db6e41d64c5a3e9a75f61f340d0f1ba73b99d304716dfca4b0f0f51baf0f46a740312bb198c52aa625f5b838e6ae10f341a8e1 SHA512 59fd8766c9545193c86374e1dd05d0a08e1f5c548f4297ad4fe22acbd4ba36aa4ae46ccf6f497bfae1a7e015cf95a5f51fb417266c21cf5b5201eac31b543d41
diff --git a/www-apps/phpsysinfo/phpsysinfo-3.3.1.ebuild b/www-apps/phpsysinfo/phpsysinfo-3.3.1.ebuild
deleted file mode 100644
index faff23b9887b..000000000000
--- a/www-apps/phpsysinfo/phpsysinfo-3.3.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils webapp
-
-DESCRIPTION="A customizable PHP script that displays information about your system nicely"
-HOMEPAGE="https://rk4an.github.com/phpsysinfo/"
-SRC_URI="https://github.com/rk4an/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 hppa ppc ppc64 x86"
-RDEPEND="
-	dev-lang/php[simplexml,xml,xsl(+),xslt(+),unicode]
-	virtual/httpd-php
-"
-
-need_httpd_cgi
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc CHANGELOG.md README*
-	rm CHANGELOG.md COPYING README* .gitignore .travis.yml || die
-
-	mv phpsysinfo.ini{.new,} || die
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR}"/phpsysinfo.ini
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	optfeature "showing disk temperatures." app-admin/hddtemp
-	optfeature "showing system uptime." app-misc/uptimed
-	optfeature "showing snmp statistics." net-analyzer/net-snmp
-	optfeature "showing iptables rules." net-firewall/iptables
-	optfeature "showing ipmi sensors." sys-apps/ipmitool
-	optfeature "showing ipmi sensors." sys-apps/ipmiutil
-	optfeature "showing system sensors." sys-apps/lm-sensors
-	optfeature "showing s.m.a.r.t. health." sys-apps/smartmontools
-	optfeature "showing lsi raid controller health." sys-block/megactl
-	optfeature "showing fake raid statistics." sys-fs/dmraid
-	optfeature "showing software raid statistics." sys-fs/mdadm
-	optfeature "showing quota information." sys-fs/quota
-	optfeature "showing ipmi sensors." sys-libs/freeipmi
-	optfeature "showing apc ups statistics." sys-power/apcupsd
-	optfeature "showing ups statistics." sys-power/nut
-}
diff --git a/www-apps/phpsysinfo/phpsysinfo-3.3.2.ebuild b/www-apps/phpsysinfo/phpsysinfo-3.3.2.ebuild
index 4861a565e05c..acf34b79ac08 100644
--- a/www-apps/phpsysinfo/phpsysinfo-3.3.2.ebuild
+++ b/www-apps/phpsysinfo/phpsysinfo-3.3.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://rk4an.github.com/phpsysinfo/"
 SRC_URI="https://github.com/rk4an/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 hppa ppc ppc64 x86"
 RDEPEND="
 	dev-lang/php[simplexml,xml,xsl(+),xslt(+),unicode]
 	virtual/httpd-php