gentoo resync : 12.05.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
committer: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
commit: 752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree: 330d16e6362a49cbed8875a777fe641a43376cd3 /www-apps
parent: 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)
57 files changed, 1080 insertions, 451 deletions
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 940a5e5726b3..4f6b5f833baf 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index dee7642977b8..c342eafac07e 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -1,3 +1,3 @@
-DIST chromedriver-bin-100.0.4896.60.linux64.zip 6986125 BLAKE2B f64895936972cb8ef5c84597edc510d19f8c47c339c10824ecbcfaa7969d8b46209d36efdcb2e01f013750226751ad9ac60b9a2bd011302f92c41c32e1633bbe SHA512 32674808bf20a5b64fcaae3cd10af0089c6d3c3b4c236ba1c6090cf3dbff0791981c9edb14b5c506f884769daf83b7d24abeec33c283501bd67ba7a6fc63d381
-EBUILD chromedriver-bin-100.0.4896.60.ebuild 605 BLAKE2B 0af8c3a8ba6b29f3ad61b6a677de768ba142fcb0f8d829f4999cd9470fa19c88dc41988b14eabc1713cf4124eb1b6a511aaac2c6758065ed38d74a2cef0e50c0 SHA512 ab772c610d30355ba0b92f0947ed1168dab40599d7c77da6e4191bca284d11e84c8f564271cc9909a0e7701c32b6d5356699fc711dc340bcb7ec6ecc8c1737d0
+DIST chromedriver-bin-101.0.4951.41.linux64.zip 6206401 BLAKE2B f3b34bc76f6980ab16207131ff26e555b68d724c49d80b3c9350e11b31b789e7fcb0039853b04b20edba636c3e2feb18e7280e0d9a9d4afb665e6794521c0c28 SHA512 86688eac6441cc91badccc58d865d97e3f31b9fd6d160c7e88ae4ab939a53522e5c53d974f897470ca87f0556f3092267851d2de008d04faa460d15855146a7e
+EBUILD chromedriver-bin-101.0.4951.41.ebuild 605 BLAKE2B 0af8c3a8ba6b29f3ad61b6a677de768ba142fcb0f8d829f4999cd9470fa19c88dc41988b14eabc1713cf4124eb1b6a511aaac2c6758065ed38d74a2cef0e50c0 SHA512 ab772c610d30355ba0b92f0947ed1168dab40599d7c77da6e4191bca284d11e84c8f564271cc9909a0e7701c32b6d5356699fc711dc340bcb7ec6ecc8c1737d0
 MISC metadata.xml 461 BLAKE2B 4e6e0fd9bf732be9040a4defe4dc1ca63ba7e1ba860abfc97ad487d6220f7bc5cb1e304d001409cb866408fdf393ca42f3b95eb9b8dc258a0627aaa978f66e6e SHA512 3c9217fe5af26ee8ddc705edad8a32604d542ad60c3e78ed8aba9e08a5bd2b3508234e42710d4524149f8b7626bba08f83cb96f7f942fe5ccdfbd8bd98908bec
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-100.0.4896.60.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-101.0.4951.41.ebuild
index 7503ea84cdc5..7503ea84cdc5 100644
--- a/www-apps/chromedriver-bin/chromedriver-bin-100.0.4896.60.ebuild
+++ b/www-apps/chromedriver-bin/chromedriver-bin-101.0.4951.41.ebuild
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 68f16f75ad3d..934c6b5385da 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,13 +1,10 @@
 AUX postinstall-en.txt 1730 BLAKE2B b335309795d753c7689338c5e94b596efa5f66dc8dee17ad30b1a2d10b694a7bc288597b526239ea1d443887b45b8cd8ef89b499b79e86ab5df1c195ee85d4a0 SHA512 4ae14616c49e6aa61dc781350b5a75defefc2f894b98422a5b69a5827e367eb00fce140e6a45bcc02c90f068fc31970512d2632bbbf398cbe34f947933990050
-DIST drupal-7.82.tar.gz 3348407 BLAKE2B c01c93fda768d587a009c9007a019f01461ae3fed1010c80a4636971fcdf4ce97e1cad61a60b447698d8e2d6d39217ead52de3cf915f04ad620357aafb3209a0 SHA512 41b844df868971ea21fa574daf46502edcb78f4287c223694fe967541da72dfe9b360e1764441eddafb64b782d14408eac58ecff7eaed4bc1fd832b35f0c7e2d
-DIST drupal-7.87.tar.gz 3357750 BLAKE2B 60d294d927b577ce74c56389493691d4d70fe38a4bc182e88add4c9f3820906e4b5289f4985afe470b240956959d9d171ba262d0658ab712f1ca16084efa2821 SHA512 5122bfbba9bfab89d67823683ce4ec827d49f545aca685cbab7c751f95fbaf0d537bb8d33cdf9b6fb1b52c924e196e9d33498a1ae63771632d75025315ae2183
-DIST drupal-8.9.18.tar.gz 19831928 BLAKE2B e8f42a00e8efe1c3a0b7a995bb9f55b37c590945f12268e86887f0243ab2691222449acce5f61d4ec853e0d13bb81b2d8d39a7702c2651368adaaa2438004114 SHA512 2c3103489d4b7ecee432fba1a1ef597b07701e46920a4cf82fc9d078368a0259a28e62e92a96550b23950c4ff6ae943877f7b8f6ef556381bf633daa3d4d0846
-DIST drupal-9.1.12.tar.gz 18568186 BLAKE2B 74f20477867adc92eb6a87d2e3f4bd9449a69c66c723a03af9789d99f913a839324406aedaca1c731b5616fbde70bbd8e1a5fc469b2cc259385655fae0209176 SHA512 43335b11cddfd73271afa66c825316d48b0dece4d221119c571629ee8d61aeeea85d48674bc53a479b954d3f24648cd7571c4b6c84e560abae8bb682abf3468e
-DIST drupal-9.2.4.tar.gz 18860644 BLAKE2B f7ed7f5bd4131c0a167fe5c51c54fa7499bf4cecab9ce41fed1516eba842e40ea1191e51a1e2cb4a0f5426d86803b511a57d08f056ad8635ca2a55496e0b1237 SHA512 956a1c62fd9294f7d5fa1de3d620fea71db08c4ccea6c8d575e5c2cd6f06afd8380601be5a66d7f3ed4c78bfde9a1d2fd662a7fcd2f16b4484fee298b8cdd93b
-EBUILD drupal-7.82-r1.ebuild 1546 BLAKE2B e9a5f5e2cffc4d3fa64a077a45b61e6cf0550f02eb993cd0d6247ed18a98ee88d2c72af9dff61ddd5a027cc868f3cf7ae80c3b01eb04729c1a44e81538bc4523 SHA512 58927bb745f64c642c819af3192a21ea1e944b03aed1c30c15c82101db55aaf1241b764366cf175688776bbbe30ec120d0c0a2314ca85265bb06c1db597c8258
-EBUILD drupal-7.82.ebuild 1546 BLAKE2B 4049ed833958fdfebbf89a1ec584c06a66d92297b1cf71978cbb3956455959c91b920716a14cbf893d59bc1c2b97e324c97f3aa70f276ceff8ee6de8f1d992ee SHA512 902f0456f711369d90eb172e2049a1af86aade03293712208b13635fefce0786550d1b16a6bd88dccfedf4f3431993bec03b874c975016697911f1610dd23ceb
-EBUILD drupal-7.87.ebuild 1546 BLAKE2B f58ac28e02fb6ff19414968559bd7855d46fff6279b145f7c375f42ce36a7d6f3f372235d64435893ccc57d043155f67099991a896c7bcf9d211deec85ec21c4 SHA512 fe3b2504cd874d2d468ba323cbe8a9dfd0e602a0145b2048f92b19b7f0b40e036e0e8bd1f220ed7674db17643864de98075967d9735cb6686319f6017b40c8d7
-EBUILD drupal-8.9.18.ebuild 2084 BLAKE2B 5a3b2579563ff0e2060f89fa436dbf0853e4377d9aca0f5e656a344c1fb1ef6ea844adda1e8ca49738e25b0e633ce198df167b5582c02277799c6a703080852a SHA512 faaca53d7a6196ea8ff850d3c4fc9a9751d6f1e8b2e7ccd5ae9507ddefe6a4a585b666f03fe9b7d1276a38fd57fd1ac5b05b5b74b0fe9d29ae35fe079d5644d0
-EBUILD drupal-9.1.12.ebuild 2084 BLAKE2B 5a3b2579563ff0e2060f89fa436dbf0853e4377d9aca0f5e656a344c1fb1ef6ea844adda1e8ca49738e25b0e633ce198df167b5582c02277799c6a703080852a SHA512 faaca53d7a6196ea8ff850d3c4fc9a9751d6f1e8b2e7ccd5ae9507ddefe6a4a585b666f03fe9b7d1276a38fd57fd1ac5b05b5b74b0fe9d29ae35fe079d5644d0
-EBUILD drupal-9.2.4.ebuild 2083 BLAKE2B 512d1f32d328c2d45d079230861b93bf4acd41123f1c1ba9806d7e4c1f6f21eca1580dc4933fad882ba89c15c5558fa22def3eb697d9b10f331f8968d9d01531 SHA512 213b9364b57d673d3ef572cd0257b3017cf1fdb38e31991a8b1faa7898269df4e0f28ad517f719132265447c5631f00cb04b2d914f52964f28fee7f2abcccca1
+DIST drupal-7.89.tar.gz 3361853 BLAKE2B 5388c6c9ded2ce31caee1bea23976e2c2d53116f6e564fd47f4035e9815e28759bf4e56964754d01c165ae7c384527c3c1845ef6b9c3b1b029b9eca3c56e7442 SHA512 3f1f50b09bfd77afaad368c21a00d2fb52a4a3853bf288525a805fab992083ffb241c2b3bfef8db3b4351310b0a0d5d27470fa7adc191c687809f48464f18f0b
+DIST drupal-8.9.20.tar.gz 19837562 BLAKE2B 8246a96628eeb936c87d1c0ff58b507e432922ede550308b105066b4334e8e04e8f2dc9a7475fe9d4c5556b11e0e938191f453e74cac9ade11ce9369da696af6 SHA512 824ec2820a1071765fdb9f5d6195d906517d2d1a97f5cb0458e7417495f9c7c88717b931870bf46c0681787b54904a746770b8811c9deff3b05624415db032cf
+DIST drupal-9.1.15.tar.gz 18580086 BLAKE2B 500602e498de55d2163c53d2cb04effbdab24d343a2f04262275c6500d9329b12760dee846513efbddc37916973dc9ad4bf0f6f882b1b57b0ca97b40afb369be SHA512 1fd8cbdbf0de00ed6d85a004f61fb3897cfcbc1f71d1d72373c8acf108f21774f3a91138901d9a3d0043f6b65b29ae7f953dfce1428a96a4fe529aac907141c0
+DIST drupal-9.2.18.tar.gz 18882937 BLAKE2B 9e62b041c0d3cd634984fa29c72b35af9a1d9777d1b3c204fb55fd125d7270242177b30876a03e36aa3757b1445fd7763db82a2f038e7931d84df7f908150abb SHA512 ed91530280a6150070d4086a388084b6336526363fb56585c85e090f9e3fd1b3e90a82eb83b07a6c725eae3ba994228b5cf280d3c296650d9e2be9e97996aa31
+EBUILD drupal-7.89.ebuild 1546 BLAKE2B f58ac28e02fb6ff19414968559bd7855d46fff6279b145f7c375f42ce36a7d6f3f372235d64435893ccc57d043155f67099991a896c7bcf9d211deec85ec21c4 SHA512 fe3b2504cd874d2d468ba323cbe8a9dfd0e602a0145b2048f92b19b7f0b40e036e0e8bd1f220ed7674db17643864de98075967d9735cb6686319f6017b40c8d7
+EBUILD drupal-8.9.20.ebuild 2084 BLAKE2B 2053adf94a106651a8ddbfdad020ada0f9c77ae92385010b06951eeec155f57d17e58bfb998d9352ea5c018dc58fec8496c2139d41eece9b38c9b7bbd976f34e SHA512 49887557a87456fbadbc526308089e8f7cf734df537dc43447bb264da605502f16f6ceb555f9c8b9220c22cf1feca8666d570eaad0b609690c2cbb178ecb33fd
+EBUILD drupal-9.1.15.ebuild 2084 BLAKE2B 2053adf94a106651a8ddbfdad020ada0f9c77ae92385010b06951eeec155f57d17e58bfb998d9352ea5c018dc58fec8496c2139d41eece9b38c9b7bbd976f34e SHA512 49887557a87456fbadbc526308089e8f7cf734df537dc43447bb264da605502f16f6ceb555f9c8b9220c22cf1feca8666d570eaad0b609690c2cbb178ecb33fd
+EBUILD drupal-9.2.18.ebuild 2083 BLAKE2B f525394e91bfa12ef20be53214504f3a42922340a328a936d3fb9b366b36f6a218164cef8ca7902d0755f54682774d0ee3f9b4087236fe0ebb9eea28b8da3a44 SHA512 8f96f3a0aeded37f8f0d9f2a8152bccc4d07a2397ff050a8221bee57bf75a0b78eca431604c7240ca1db271b8448d201fdb265ea6aafeee11b9cfc1041d24d48
 MISC metadata.xml 382 BLAKE2B 1aadacb731da32a7f383c9d265880568cd74a67c79fdfea2b45bdad9dd55e09b074b6f71097bfc9dd43349f826af4b87a81c4f6ab6647eca5d85d07f9afa9638 SHA512 6a9f00eb8cbfcf407738e3702d14ef8c52c75c4d28f5ce3f25e41fa062dc73a777b344b2a225727e0c1c75c34d1f4ea1eadabdbdd58c296a9d41b64120607a0b
diff --git a/www-apps/drupal/drupal-7.82-r1.ebuild b/www-apps/drupal/drupal-7.82-r1.ebuild
deleted file mode 100644
index fab5db976ab2..000000000000
--- a/www-apps/drupal/drupal-7.82-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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.82.ebuild b/www-apps/drupal/drupal-7.82.ebuild
deleted file mode 100644
index 4e6998d1e429..000000000000
--- a/www-apps/drupal/drupal-7.82.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 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.87.ebuild b/www-apps/drupal/drupal-7.89.ebuild
index f5302a46a2ad..f5302a46a2ad 100644
--- a/www-apps/drupal/drupal-7.87.ebuild
+++ b/www-apps/drupal/drupal-7.89.ebuild
diff --git a/www-apps/drupal/drupal-8.9.18.ebuild b/www-apps/drupal/drupal-8.9.20.ebuild
index 421034d30ee7..65376470ca05 100644
--- a/www-apps/drupal/drupal-8.9.18.ebuild
+++ b/www-apps/drupal/drupal-8.9.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/www-apps/drupal/drupal-9.1.12.ebuild b/www-apps/drupal/drupal-9.1.15.ebuild
index 421034d30ee7..65376470ca05 100644
--- a/www-apps/drupal/drupal-9.1.12.ebuild
+++ b/www-apps/drupal/drupal-9.1.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/www-apps/drupal/drupal-9.2.4.ebuild b/www-apps/drupal/drupal-9.2.18.ebuild
index 2830cbc4184c..fd1b09540bcc 100644
--- a/www-apps/drupal/drupal-9.2.4.ebuild
+++ b/www-apps/drupal/drupal-9.2.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/www-apps/element/Manifest b/www-apps/element/Manifest
index 88565d9e56bf..259a0a2b66db 100644
--- a/www-apps/element/Manifest
+++ b/www-apps/element/Manifest
@@ -1,5 +1,5 @@
-DIST element-v1.10.7.tar.gz 17249694 BLAKE2B 17e9e5e7814ca13a6be03210ace71036c4d86d3f7aa11ba4e42d6f2d29420f17fbccbeb319159358ae941b3c8b01954fbcb93ab96ea75edae57866abfa3068f8 SHA512 9ca7856700ce173e653508170fafb4193aeb865c68da2c04b58088f65e4204516f080f26239a08b738a74de7eae1ff09c7464d4a6294cf03b27872ed0be78ca9
-DIST element-v1.10.8.tar.gz 17345607 BLAKE2B 989c389901f61e06a7b164e0ae9c332a018abb63ded874479be1231f4b77fba6b5adc67823d571a15c39f6831c6b661f4cc67ada2fe9a3429920b2e9d3d4e734 SHA512 e113d3df025f0519cd26247a9428efe08318078b167ba8d831d26a922adc7c75e6846577fdff21fcc4e54ba5335a4beab718ee114b91868db2b64c5630da79c2
-EBUILD element-1.10.7.ebuild 733 BLAKE2B db476c59066c1360f4fe92bbfeb929e00853f79b28a8d7c18f34422fc8f4aac859ca5df21397ce4b94ff0ebdcede08eafe1584dd97d36f5e4ef31096ba785af9 SHA512 8b355b00e7500aa8529d6f2e7539e571940dbaf4200d736d549fd0da5da9f05eb2fd3cc527e8d1692067d9aa0cf709985105250b8854f5882f42bfbb97f2fc52
-EBUILD element-1.10.8.ebuild 733 BLAKE2B db476c59066c1360f4fe92bbfeb929e00853f79b28a8d7c18f34422fc8f4aac859ca5df21397ce4b94ff0ebdcede08eafe1584dd97d36f5e4ef31096ba785af9 SHA512 8b355b00e7500aa8529d6f2e7539e571940dbaf4200d736d549fd0da5da9f05eb2fd3cc527e8d1692067d9aa0cf709985105250b8854f5882f42bfbb97f2fc52
+DIST element-v1.10.10.tar.gz 17541812 BLAKE2B 16e59f00f9fd0d220a00093a241a36c2b1c52b745545b66c9ecb57956eaf3b27fad871faa15c19c219de8d0f111392f17ccbc34bc71c969cc08bc7333ccb7af9 SHA512 dc7ab99d93c0aae71806b176340663a5f59cddc4b00ac7ed423a689f28d812db472398f75d1e0787a2a666ac9121544e1aba41d8550f9dc34b583d852eb74dad
+DIST element-v1.10.11.tar.gz 17554189 BLAKE2B bbd61969a8d0513b311ab65a99a83b1d4d9d4b5be39a492ac57726b86a2f84e32d4e71e95601d6fb95bf9f549b81190bbd995a8b481ab23ac69d898c82cf8e2c SHA512 003f865ed5e8ab89d8427338229af944123222e5f36dac10432e7f83beef20b992746a69a39f56ecf3bcc722644eff387d663f327b558620061ec43114a1bd63
+EBUILD element-1.10.10.ebuild 733 BLAKE2B db476c59066c1360f4fe92bbfeb929e00853f79b28a8d7c18f34422fc8f4aac859ca5df21397ce4b94ff0ebdcede08eafe1584dd97d36f5e4ef31096ba785af9 SHA512 8b355b00e7500aa8529d6f2e7539e571940dbaf4200d736d549fd0da5da9f05eb2fd3cc527e8d1692067d9aa0cf709985105250b8854f5882f42bfbb97f2fc52
+EBUILD element-1.10.11.ebuild 733 BLAKE2B db476c59066c1360f4fe92bbfeb929e00853f79b28a8d7c18f34422fc8f4aac859ca5df21397ce4b94ff0ebdcede08eafe1584dd97d36f5e4ef31096ba785af9 SHA512 8b355b00e7500aa8529d6f2e7539e571940dbaf4200d736d549fd0da5da9f05eb2fd3cc527e8d1692067d9aa0cf709985105250b8854f5882f42bfbb97f2fc52
 MISC metadata.xml 253 BLAKE2B 8557c513beef73e834b0a000c523a3241da961c6307b6e98ac857dad0888c4bbd028c98f8499f01086c24e8f2f57c64bc75db20154dab232adefc2510fccac03 SHA512 67dd372ef7b684101d9198c6199a6403f8750132d80aab4f4daa4b31ebaea3d82eb9a18e904734e2ac10c77b237d67210055949ff1c6d5aad4f75951a096884a
diff --git a/www-apps/element/element-1.10.7.ebuild b/www-apps/element/element-1.10.10.ebuild
index bdccc2ddf91f..bdccc2ddf91f 100644
--- a/www-apps/element/element-1.10.7.ebuild
+++ b/www-apps/element/element-1.10.10.ebuild
diff --git a/www-apps/element/element-1.10.8.ebuild b/www-apps/element/element-1.10.11.ebuild
index bdccc2ddf91f..bdccc2ddf91f 100644
--- a/www-apps/element/element-1.10.8.ebuild
+++ b/www-apps/element/element-1.10.11.ebuild
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 55f845c6ce99..9f0a1120d27e 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -2,5 +2,10 @@ AUX gitea.confd-r1 243 BLAKE2B 87caa8371f53f52b0a85f720342f9f358dedec9240ab78998
 AUX gitea.initd-r3 802 BLAKE2B 2e33e95f7d2762986184d45b0bbb250cc5e04fffc4e4b006233b28e5b57be69eef1d83441adebe2b94681585edaf77f9da4eb97930f91e75c1b1a5cd8d137633 SHA512 5ff2e653180a0601734fcd055dfffdfdc12363736ed2e56c8576c802398b90f4025b44002cbb9a3fd1e0c2d4c169f62d460381c6c549746d3390e55fc1c677d1
 AUX gitea.service-r3 732 BLAKE2B 8227349f9ffe5dbf7c59efc3b1e250bf8184a72d37958c0ce0a2d8affabaadcb6aaf271b1402c7ac127b80d534f4f72b888ccdce7aa5f7a7cf86a0efe0e719e0 SHA512 7c8aa33dcea56b6fccac23095f7b84225f1c85541cd5eb3536d2901e638c391e025bd9db28bd10c26ef91e5a8fe2d12a878040cf21d4b983858a19f2cac7d1b0
 DIST gitea-1.16.5.tar.gz 53178954 BLAKE2B 67c378a46eab8e374b1a5b91d86e558c6ae06e24a23cb0d670f112573e0606c3ee7f700047f703a73b19f39b216597e3a05c3602e01ecfb09f146515545d3687 SHA512 3c367155a97809d587879b023979ad198106040c362e6d5e6df26cad384c614aaac1c47d84bcac0177a5b5546c4a76e95cfff9cf76b411226c0b1aa618d4d4b3
-EBUILD gitea-1.16.5.ebuild 2968 BLAKE2B fad3a0806c1a9f035fbf1e35e8226d5f92ba8437e1ca1f6cfb0465a0b6178e0c1a6d6c11a5574944370d4c5481f8bb545e463f90ce76148a00ffd30e28d0019c SHA512 ae5963ae218d7d68682dac4cb25bb9ffc6751ad4aa3a00438e7728798bba2ad8e1c74c8f05e095536a20136d3db598d43bf2bbe35f66b8ec7e80f5ceba96d03c
+DIST gitea-1.16.6.tar.gz 53649707 BLAKE2B 118d77f82d2037d2d3f3a3fa9f8548af9af6fd9a8bf4797b005de9e98772899fcd73af91f135999db9136d850fc5e0283da9fc2868058e58c6f68d231e4affec SHA512 3f14aaf9fdcd21180995717c7dfebe70966073e4228520963313379f124d383192f600690c276b0a9e1d6b442e8ad053f24ffac795c13fdc6321b9200d8223ea
+DIST gitea-1.16.7.tar.gz 53657579 BLAKE2B ae9d67fa633bcc5156036f033a4ed084b5b6ac0d71ec6a1ec0d0c88848233f3f0f0c22ca1c33289dc0e9950a8b299e26a88417e03643972f6721f94097b37d85 SHA512 7a31330e46078e215eecfbb2ec28373be1a176790720afbcf9674f3530d66f300d8ef9e47b9b9124cda9ce585d26d40c975e4897e5a3477dcec28b6f2b16735c
+EBUILD gitea-1.16.5.ebuild 2967 BLAKE2B b315270f9a456ca7043a60bd00254d4b69913dac08421d0a0d1c0ff6b6aa43f4f86200972b1cc70670026e900519fc6a928aaa1f1b57a31dc10edbfa107eea66 SHA512 3e2cab8768a70394fc61317460f1151a82d2c6b44fa6a680976ee6198e0226e92004f4e15980322ee5664ba01043e114b61dfc86da9ab7c96a027bd8433fa960
+EBUILD gitea-1.16.6-r1.ebuild 3177 BLAKE2B 14e26efbc4c3218d3937023755a5f83a8c13c74bc4a918c8339c864aaaa78f00f2a37010a1567375c71c43780ea9b58469160619bc5d80ff01a2c17cb2dd3a4f SHA512 69d1609cef00b20a4dfb880cf9c85b69715e7f915bf1184d82e4a7c0fe287f7b730c816b3ce99f85db7347f604986c674ae9810b27c28bed3a36ca91fd3efd3c
+EBUILD gitea-1.16.6.ebuild 2968 BLAKE2B fad3a0806c1a9f035fbf1e35e8226d5f92ba8437e1ca1f6cfb0465a0b6178e0c1a6d6c11a5574944370d4c5481f8bb545e463f90ce76148a00ffd30e28d0019c SHA512 ae5963ae218d7d68682dac4cb25bb9ffc6751ad4aa3a00438e7728798bba2ad8e1c74c8f05e095536a20136d3db598d43bf2bbe35f66b8ec7e80f5ceba96d03c
+EBUILD gitea-1.16.7.ebuild 3176 BLAKE2B ca0c1c6304f65462ed54022c43b5a3688a9dfec26c1b5f9e2d4ed43dc273065aca37b0963fdccee443a7a35ae4a7733002abd5c60780d4bacf63650036c50cd4 SHA512 8612865a06fb84aaf2ca749214b32faf1750541060b0e2b146d303d14a0b5a5673e7887444da12913bf09ebdeb51ffc9ce0fde6aaf92c418c84fb2993daa353f
 MISC metadata.xml 339 BLAKE2B 6117542b37ffbb9dc5aa2420c5846c95864b632cb35e1c69acea24d0eaed05767b0c3607a58bc9ab8e54596927072f1c7c5cb795ee44d076b7ac027d0ee65a58 SHA512 9b05184ccba06361a7dfdecced7ad53d887065763bbbc736aedc791d9089f146f99fbbd6a483bdaf47a6ee5d4965dfc2a66e6990bea1beb599baf621c2c16471
diff --git a/www-apps/gitea/gitea-1.16.5.ebuild b/www-apps/gitea/gitea-1.16.5.ebuild
index eaeda1a3f382..c213d90dc38d 100644
--- a/www-apps/gitea/gitea-1.16.5.ebuild
+++ b/www-apps/gitea/gitea-1.16.5.ebuild
@@ -8,7 +8,7 @@ inherit fcaps go-module tmpfiles systemd
 DESCRIPTION="A painless self-hosted Git service"
 HOMEPAGE="https://gitea.io https://github.com/go-gitea/gitea"
 SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${PV}/gitea-src-${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 S="${WORKDIR}"
 
 LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
diff --git a/www-apps/gitea/gitea-1.16.6-r1.ebuild b/www-apps/gitea/gitea-1.16.6-r1.ebuild
new file mode 100644
index 000000000000..249baa6f0eb7
--- /dev/null
+++ b/www-apps/gitea/gitea-1.16.6-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 2016-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps go-module tmpfiles systemd flag-o-matic
+
+DESCRIPTION="A painless self-hosted Git service"
+HOMEPAGE="https://gitea.io https://github.com/go-gitea/gitea"
+SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${PV}/gitea-src-${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~arm64"
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="+acct pam sqlite pie"
+
+DEPEND="
+	acct? (
+		acct-group/git
+		acct-user/git[gitea] )
+	pam? ( sys-libs/pam )"
+RDEPEND="${DEPEND}
+	dev-vcs/git"
+
+DOCS=(
+	custom/conf/app.example.ini CONTRIBUTING.md README.md
+)
+FILECAPS=(
+	-m 711 cap_net_bind_service+ep usr/bin/gitea
+)
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	local sedcmds=(
+		-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#"
+	)
+
+	sed -i "${sedcmds[@]}" custom/conf/app.example.ini || die
+	if use sqlite ; then
+		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.example.ini || die
+	fi
+}
+
+src_configure() {
+	# bug 832756 - PIE build issues
+	filter-flags -fPIE
+	filter-ldflags -fPIE -pie
+}
+
+src_compile() {
+	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=(
+		DRONE_TAG="${PV}"
+		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[*]}"
+		TAGS="${gitea_tags[*]}"
+	)
+
+	GOFLAGS=""
+	if use pie ; then
+		GOFLAGS+="-buildmode=pie"
+	fi
+
+	env "${makeenv[@]}" emake EXTRA_GOFLAGS="${GOFLAGS}" backend
+}
+
+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-r3 gitea.service
+
+	insinto /etc/gitea
+	newins custom/conf/app.example.ini 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
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	tmpfiles_process gitea.conf
+
+	ewarn "The default JWT signing algorithm changed in 1.15.0 from HS256 (symmetric) to"
+	ewarn "RS256 (asymmetric). Gitea OAuth2 tokens (and potentially client secrets) will"
+	ewarn "need to be regenerated unless you change your JWT_SIGNING_ALGORITHM back to HS256."
+	ewarn "For other breaking changes, see <https://github.com/go-gitea/gitea/releases/tag/v1.15.0>."
+}
diff --git a/www-apps/gitea/gitea-1.16.6.ebuild b/www-apps/gitea/gitea-1.16.6.ebuild
new file mode 100644
index 000000000000..eaeda1a3f382
--- /dev/null
+++ b/www-apps/gitea/gitea-1.16.6.ebuild
@@ -0,0 +1,107 @@
+# Copyright 2016-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps go-module tmpfiles systemd
+
+DESCRIPTION="A painless self-hosted Git service"
+HOMEPAGE="https://gitea.io https://github.com/go-gitea/gitea"
+SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${PV}/gitea-src-${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~arm64"
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="+acct pam sqlite"
+
+DEPEND="
+	acct? (
+		acct-group/git
+		acct-user/git[gitea] )
+	pam? ( sys-libs/pam )"
+RDEPEND="${DEPEND}
+	dev-vcs/git"
+
+DOCS=(
+	custom/conf/app.example.ini CONTRIBUTING.md README.md
+)
+FILECAPS=(
+	-m 711 cap_net_bind_service+ep usr/bin/gitea
+)
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	local sedcmds=(
+		-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#"
+	)
+
+	sed -i "${sedcmds[@]}" custom/conf/app.example.ini || die
+	if use sqlite ; then
+		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.example.ini || die
+	fi
+}
+
+src_compile() {
+	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=(
+		DRONE_TAG="${PV}"
+		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[*]}"
+		TAGS="${gitea_tags[*]}"
+	)
+
+	env "${makeenv[@]}" emake backend
+}
+
+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-r3 gitea.service
+
+	insinto /etc/gitea
+	newins custom/conf/app.example.ini 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
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	tmpfiles_process gitea.conf
+
+	ewarn "The default JWT signing algorithm changed in 1.15.0 from HS256 (symmetric) to"
+	ewarn "RS256 (asymmetric). Gitea OAuth2 tokens (and potentially client secrets) will"
+	ewarn "need to be regenerated unless you change your JWT_SIGNING_ALGORITHM back to HS256."
+	ewarn "For other breaking changes, see <https://github.com/go-gitea/gitea/releases/tag/v1.15.0>."
+}
diff --git a/www-apps/gitea/gitea-1.16.7.ebuild b/www-apps/gitea/gitea-1.16.7.ebuild
new file mode 100644
index 000000000000..f81eddf452ee
--- /dev/null
+++ b/www-apps/gitea/gitea-1.16.7.ebuild
@@ -0,0 +1,118 @@
+# Copyright 2016-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps go-module tmpfiles systemd flag-o-matic
+
+DESCRIPTION="A painless self-hosted Git service"
+HOMEPAGE="https://gitea.io https://github.com/go-gitea/gitea"
+SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${PV}/gitea-src-${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="amd64 ~arm ~arm64"
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="+acct pam sqlite pie"
+
+DEPEND="
+	acct? (
+		acct-group/git
+		acct-user/git[gitea] )
+	pam? ( sys-libs/pam )"
+RDEPEND="${DEPEND}
+	dev-vcs/git"
+
+DOCS=(
+	custom/conf/app.example.ini CONTRIBUTING.md README.md
+)
+FILECAPS=(
+	-m 711 cap_net_bind_service+ep usr/bin/gitea
+)
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	local sedcmds=(
+		-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#"
+	)
+
+	sed -i "${sedcmds[@]}" custom/conf/app.example.ini || die
+	if use sqlite ; then
+		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.example.ini || die
+	fi
+}
+
+src_configure() {
+	# bug 832756 - PIE build issues
+	filter-flags -fPIE
+	filter-ldflags -fPIE -pie
+}
+
+src_compile() {
+	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=(
+		DRONE_TAG="${PV}"
+		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[*]}"
+		TAGS="${gitea_tags[*]}"
+	)
+
+	GOFLAGS=""
+	if use pie ; then
+		GOFLAGS+="-buildmode=pie"
+	fi
+
+	env "${makeenv[@]}" emake EXTRA_GOFLAGS="${GOFLAGS}" backend
+}
+
+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-r3 gitea.service
+
+	insinto /etc/gitea
+	newins custom/conf/app.example.ini 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
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	tmpfiles_process gitea.conf
+
+	ewarn "The default JWT signing algorithm changed in 1.15.0 from HS256 (symmetric) to"
+	ewarn "RS256 (asymmetric). Gitea OAuth2 tokens (and potentially client secrets) will"
+	ewarn "need to be regenerated unless you change your JWT_SIGNING_ALGORITHM back to HS256."
+	ewarn "For other breaking changes, see <https://github.com/go-gitea/gitea/releases/tag/v1.15.0>."
+}
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index a4d42deeaaa6..502206b82e49 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -5,8 +5,12 @@ DIST grafana-bin-7.5.15.tar.gz 52222968 BLAKE2B 0d1d0282eb4cbd8a91c1719b2085ff78
 DIST grafana-bin-8.3.5.tar.gz 72641356 BLAKE2B a75e20de51f0b2346bc504a0c65a14e818697d346352f51197edb1d783db4d234b65cf09c7915d6f2e902f0e4e65076cac723453e9fc7d2fc78b8d5316b4a25d SHA512 ce8afd0da6e7f0e712cb181a6c1ac4ff95cb0349862da673c547eb2ce4426d7fa1402f7fbf3cfa56b5b1006788864f0a54fbbca4b29c456b6c6ca4a5862bc9da
 DIST grafana-bin-8.3.7.tar.gz 72682810 BLAKE2B e7ceb64d3caaf3fcf02aba8beaf1cde9d66f25b673752fb342f74c2e2bd2f60cd60771ede6f2401fe0e2e2b345457d2d2e6d2b3f19532a2f393528cf21b4b594 SHA512 57e6c25698db943b5eca15b588f50bb01d30e88d227ba6499c5fcd8df185a8e6e6f799cba0c0953efc397b04315ffa755193cc7a90197e5cd93375481d999fe1
 DIST grafana-bin-8.4.4.tar.gz 74258533 BLAKE2B 9635e39f816c88c7573eda4e6309c2958adc08585b3cb5da94f9ca95b3c7c15a9c048e06e3594a394bf7831b28476f406ff748330c386716aee62e67c266b201 SHA512 1977e031234e4fd24de87b6d34ae012851575fd51a668e172b6e8b8a490019f162dac376beb492d31b76dcc15dc8e9a8546b3e1a85b23945308281ab688d19ee
+DIST grafana-bin-8.4.7.tar.gz 75609875 BLAKE2B 157e1c0ee3ac49d817004da9484097d960e900f6727a1fd4e3386d6573a88e72e5477e4085b3e12659fc3ac295ce77adbace708f0dabc787eab88a1432a2617b SHA512 663a78cb2e51e0d95e1bc0e03faacc8f0c0ab666154adcc465c6b0f3ddc2a2fa7e73acff9a74b95a6a9865c041499397e74a081cec2686973b1acdc33a19e802
+DIST grafana-bin-8.5.2.tar.gz 77679732 BLAKE2B 7ae347eed09074f840b0bf0a663fc893c07cb8b97f0dda4fce5f5e7a75fffd875327efdc2dbcf16e6af00228bdd62e39328c30c2968ea48369a9eeb565b21b6b SHA512 0d1afdc8c4a1f09a3005a321cbf1647f8aca4b508a2041f21d7477fc041cdf348944f5b3473084beff5993f3c7e9b2da2fad321066dea9f34294bf023ff1cf01
 EBUILD grafana-bin-7.5.15.ebuild 1769 BLAKE2B 5eeb7b9385f4bf3f453f634cadb0b26f16cbafdadae1131652fdae2dcc21243a655403e7f5d222ef254acdb42ba814af82819f5a618c4e0f338bf90c74128404 SHA512 c00131c4f3938c6fa65f227cb012c37f717f1205269216c4eca6df1cf647168aef7ab91483fffa3c464cdaae0f8d030aaed30d7cf51c38498269f57b59b9fa7f
 EBUILD grafana-bin-8.3.5.ebuild 1769 BLAKE2B 5eeb7b9385f4bf3f453f634cadb0b26f16cbafdadae1131652fdae2dcc21243a655403e7f5d222ef254acdb42ba814af82819f5a618c4e0f338bf90c74128404 SHA512 c00131c4f3938c6fa65f227cb012c37f717f1205269216c4eca6df1cf647168aef7ab91483fffa3c464cdaae0f8d030aaed30d7cf51c38498269f57b59b9fa7f
 EBUILD grafana-bin-8.3.7.ebuild 1769 BLAKE2B 5eeb7b9385f4bf3f453f634cadb0b26f16cbafdadae1131652fdae2dcc21243a655403e7f5d222ef254acdb42ba814af82819f5a618c4e0f338bf90c74128404 SHA512 c00131c4f3938c6fa65f227cb012c37f717f1205269216c4eca6df1cf647168aef7ab91483fffa3c464cdaae0f8d030aaed30d7cf51c38498269f57b59b9fa7f
 EBUILD grafana-bin-8.4.4.ebuild 1769 BLAKE2B 5eeb7b9385f4bf3f453f634cadb0b26f16cbafdadae1131652fdae2dcc21243a655403e7f5d222ef254acdb42ba814af82819f5a618c4e0f338bf90c74128404 SHA512 c00131c4f3938c6fa65f227cb012c37f717f1205269216c4eca6df1cf647168aef7ab91483fffa3c464cdaae0f8d030aaed30d7cf51c38498269f57b59b9fa7f
+EBUILD grafana-bin-8.4.7.ebuild 1769 BLAKE2B 5eeb7b9385f4bf3f453f634cadb0b26f16cbafdadae1131652fdae2dcc21243a655403e7f5d222ef254acdb42ba814af82819f5a618c4e0f338bf90c74128404 SHA512 c00131c4f3938c6fa65f227cb012c37f717f1205269216c4eca6df1cf647168aef7ab91483fffa3c464cdaae0f8d030aaed30d7cf51c38498269f57b59b9fa7f
+EBUILD grafana-bin-8.5.2.ebuild 1769 BLAKE2B 5eeb7b9385f4bf3f453f634cadb0b26f16cbafdadae1131652fdae2dcc21243a655403e7f5d222ef254acdb42ba814af82819f5a618c4e0f338bf90c74128404 SHA512 c00131c4f3938c6fa65f227cb012c37f717f1205269216c4eca6df1cf647168aef7ab91483fffa3c464cdaae0f8d030aaed30d7cf51c38498269f57b59b9fa7f
 MISC metadata.xml 219 BLAKE2B e366b8552425c0b7293381e047210130af3c96a6be5877911f2e3ee77b0c80a475854ec7d59e1a5dea75e9d07cefcb3636947fa0af121357cfe7db12e05e6c34 SHA512 b5fce0d3f0f5fa2729808fad339e6843c6bdf814451d2b65b9b67b4b715194e6de20ad2702c9b5a08d260c97641ab9478d978486e702d85034cfb95d7ceab954
diff --git a/www-apps/grafana-bin/grafana-bin-8.4.7.ebuild b/www-apps/grafana-bin/grafana-bin-8.4.7.ebuild
new file mode 100644
index 000000000000..b15b8f8775d4
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-8.4.7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+MY_PN=${PN/-bin/}
+MY_PV=${PV/_beta/-beta}
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
+HOMEPAGE="https://grafana.org"
+SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="acct-group/grafana
+	acct-user/grafana"
+RDEPEND="${DEPEND}
+	media-libs/fontconfig"
+
+QA_PREBUILT="usr/bin/grafana-*"
+QA_PRESTRIPPED=${QA_PREBUILT}
+
+src_install() {
+	keepdir /etc/grafana
+	insinto /etc/grafana
+	newins "${S}"/conf/sample.ini grafana.ini
+	rm "${S}"/conf/sample.ini || die
+
+	# Frontend assets
+	insinto /usr/share/${MY_PN}
+	doins -r public conf
+
+	dobin bin/grafana-cli
+	dobin bin/grafana-server
+
+	newconfd "${FILESDIR}"/grafana-r1.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd grafana
+	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+	keepdir /var/{lib,log}/grafana
+	keepdir /var/lib/grafana/{dashboards,plugins}
+	fowners grafana:grafana /var/{lib,log}/grafana
+	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+	fperms 0750 /var/{lib,log}/grafana
+	fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
+
+postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		elog "${PN} has built-in log rotation. Please see [log.file] section of"
+		elog "/etc/grafana/grafana.ini for related settings."
+		elog
+		elog "You may add your own custom configuration for app-admin/logrotate if you"
+		elog "wish to use external rotation of logs. In this case, you also need to make"
+		elog "sure the built-in rotation is turned off."
+	fi
+}
diff --git a/www-apps/grafana-bin/grafana-bin-8.5.2.ebuild b/www-apps/grafana-bin/grafana-bin-8.5.2.ebuild
new file mode 100644
index 000000000000..b15b8f8775d4
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-8.5.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+MY_PN=${PN/-bin/}
+MY_PV=${PV/_beta/-beta}
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
+HOMEPAGE="https://grafana.org"
+SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="acct-group/grafana
+	acct-user/grafana"
+RDEPEND="${DEPEND}
+	media-libs/fontconfig"
+
+QA_PREBUILT="usr/bin/grafana-*"
+QA_PRESTRIPPED=${QA_PREBUILT}
+
+src_install() {
+	keepdir /etc/grafana
+	insinto /etc/grafana
+	newins "${S}"/conf/sample.ini grafana.ini
+	rm "${S}"/conf/sample.ini || die
+
+	# Frontend assets
+	insinto /usr/share/${MY_PN}
+	doins -r public conf
+
+	dobin bin/grafana-cli
+	dobin bin/grafana-server
+
+	newconfd "${FILESDIR}"/grafana-r1.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd grafana
+	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+	keepdir /var/{lib,log}/grafana
+	keepdir /var/lib/grafana/{dashboards,plugins}
+	fowners grafana:grafana /var/{lib,log}/grafana
+	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+	fperms 0750 /var/{lib,log}/grafana
+	fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
+
+postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		elog "${PN} has built-in log rotation. Please see [log.file] section of"
+		elog "/etc/grafana/grafana.ini for related settings."
+		elog
+		elog "You may add your own custom configuration for app-admin/logrotate if you"
+		elog "wish to use external rotation of logs. In this case, you also need to make"
+		elog "sure the built-in rotation is turned off."
+	fi
+}
diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index 95cfea5081cf..f632bfe4ae09 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -3,11 +3,11 @@ AUX hugo-0.96.0-skip-some-tests.patch 4082 BLAKE2B fe22f1c7fe5dd023c21f45b1dca71
 AUX hugo-0.96.0-unbundle-libwebp-and-libsass.patch 1558 BLAKE2B bce42fce63466424c0e3b2f7f099485cb23ea0e756fe57dfa1a062f9e0afb6ca3213d5b3048c6482e557c8399b392deaca53281866cd8d160ea20e81cb133c89 SHA512 a0ea32e10112047dd3a4536286c853c97d43c548ed4cfaa366711c45ff67960545b317f67fb2f69484b61dabe8d668a0540339a4789f43f8581afe11d611c538
 DIST hugo-0.93.3-vendor.tar.xz 4828092 BLAKE2B 4df3e876ffcc71f4caa089512510bec47f9e3aa25240ed6cc9ed9e7faef7425b3f7bdd03293023f103a0b8927ecbdf7fe3d9f36f5a66db580dfc8f0ddb9dc310 SHA512 6c93a8435552553079e856f8a74eef76e23ab7343e6e65ac83f9f1675c5fe44547f5d3f700656c0e666bc668792be38e343cfaebbfb23b5ece28ddfa0896755c
 DIST hugo-0.93.3.tar.gz 27852078 BLAKE2B 8e21fcbacc55cb304314d24f7a1258c9192655cb603e33c2ac2cac5fcc21f83045c1fc3a3ee7bd227507fd08be54e15dcd9cc9629e320bae9b41f1c87d03e163 SHA512 c65cc776588604a6ca2fbe5c4081db252ec007311eae54ed81ea65e983f1787edf6e10774d8ace82284eb7c42f6cb70650135ec44b2ddc8994ed511ba2a7d55e
-DIST hugo-0.95.0-vendor.tar.xz 4781084 BLAKE2B ead2d42b615fa838995853df38c304c63baccb109f32b5034449cb64c8edacb78e5fac615f2018e8d4acb693f83df0abaa73bc511f5ba31b3a30bdec476420b1 SHA512 941061396433a20b524694c8dd2838d84454fbee98c48aa2860881fd9b31b6d480d22f6fd54bd2e17f1f90b1c9e6c3c5813682131fd01c7d3eabc063dcbb01b2
-DIST hugo-0.95.0.tar.gz 27859168 BLAKE2B 3667ab14c19f586d0f45b76072786a49f2448367cdf4151df2b44a329a57047544dcbbe4db8774433cf2042024c17ccca3269f5eeb508392aed00d31955de55a SHA512 fbe43fc9698325c380d7e7499ee726aba448eebba087f7bdc7cdf14d01e0649869359c07fefaa9a0d9623c910523b82efc2a2b57e152d391443e2b890a29affb
 DIST hugo-0.96.0-vendor.tar.xz 4721504 BLAKE2B d8516c848be292f2097961a599450b719b2d760ad3464036929a0937ae6b401ec4b7b90df3281f11a70c4f9a7e94d74e821d78639b9cb3a335a59c5f6e645e65 SHA512 d58cbded19c5e2595838725a181e5fcdad94888f1e140e8961d9815c17d7719644483bb9bb34141c26bfccd87412632b1c896c12b85abb76c6448de3d0c8642d
 DIST hugo-0.96.0.tar.gz 27853655 BLAKE2B 8161eb31b66a9643e31967629852475496dcabd0ef04e806f0d004f3933de07553a10572c201f8b798c7c257d20d7e0e6381bb2892728f89fd3416cc768d76f2 SHA512 1dc5e9f433953a1ae378d0eeb24e0647a4c096db96a727ece39c1c4e5d3ef40033ca61aa7a9ed322234e41a116f118115e637c0342b52ee60fe47eea5718ffde
+DIST hugo-0.98.0-vendor.tar.xz 5675060 BLAKE2B d876207dfc7c13ff97249bf72bf5191a0d4adbf82af38b8962a8e66d922f5bdf5298c8ecddb05c8a1d13f95f9e8bbbb84dec8cc37538ad47d8d83da951dfa003 SHA512 7b67920c8adcc8aea3a3dd6880716a79df8081cca17bf2d8cbd0ca3861aa69c29b0320eb86e0942db32e362b22faaade7cb65c9a0e0f88578504bfe4ed666d63
+DIST hugo-0.98.0.tar.gz 27716005 BLAKE2B b3cbc9c616eb79a993bd9ddf07658ff1d3ce0680d3788e37cab78dfb48b33a259514b417d3e657afe89f188b3c0c03b88108dbcbd44d80c4d97004f7aa0185b0 SHA512 9d8a65c49be5b7bb181627bd8b557ddc041dc00a673ac0af8aeacbbfc46441a0045a5ab531087fb866d076297d67823a2eb5b14f57f3ecf57cc7b9e6b90ddf3a
 EBUILD hugo-0.93.3.ebuild 1887 BLAKE2B f0351fc4bc20ed692378b5a8ad6ebb5622971ffca2832e50b21b39592e9dc891b8cdf4e8c7aa01cb349bfb39db9070ee8f768b17a8d30b774cec4b98f4693347 SHA512 0b345e1b12d4488660f3c8ab1baef7e886ccb57bb49c3ee177f902fafd1e9f5e2affbaeeb195f5537dfe8179f2d8fe081906343c05fe6c9e9ed5a515ab248416
-EBUILD hugo-0.95.0.ebuild 1889 BLAKE2B edaa1f15ca6ef22537b4f200c1a3e46784f6a28dae79b5c9fadd6a87a2bb50554b34d202f087e61822dd650b1613d2923989a33fd66dc67826686082822a926b SHA512 b247dd4cbc3d1df67e9608dc3ecc173886e698cbd82ad0836d7af2716d1d929440c3d43222b6435f3f6e2f9a62017819ee0313f65428c2a779d79b757d6302b0
 EBUILD hugo-0.96.0.ebuild 1993 BLAKE2B 8f4e9fd025c5b55911c1313144069bae7e3bac29008901937026513867a867d87067ee3b7e668d20640e062042fe58811e9f3fb77eb3ef6cd1721323e3f0b306 SHA512 2faae5f367ac1d83b851bc8a042ab8da3363e359a359e8d84fddb93690f396b82d8775a9156bcbd6c5e5a930fa279573a7f8b37be89105eec2ad435c48a18870
+EBUILD hugo-0.98.0.ebuild 2000 BLAKE2B 88f98e70ae87ba9bd50cea3abeecefdfe79990aaab98fb07dde14736164a74513f256a2ca2875bec3056985db96fb16979bca0e6b3335df72a7d00bb681f9cb0 SHA512 fb60f6591a2ebf1f13293d012a575317ac5c427ecd8677fff9cb0489684656435ef55e9c820e528589bea107bcc7022c3b0cb92268588e5a2c023522f9ae9758
 MISC metadata.xml 806 BLAKE2B 94596b9097f4f1277d81c88292eecfaab2480476807edf680350158e704226d335787029f7e898c6cc6ad0452af4266d2aedcfa38209201b48cde75efa88965e SHA512 26e3674ec6775f073d0e10f87b9bbc8364e0c4d1e946a415002bdc11aa62909b2792c6cb7a90ac163860e569fdf6ed303173887c214531f50ae63dc0f9b4e69e
diff --git a/www-apps/hugo/hugo-0.95.0.ebuild b/www-apps/hugo/hugo-0.98.0.ebuild
index 9a628528735b..455ae3474bd6 100644
--- a/www-apps/hugo/hugo-0.95.0.ebuild
+++ b/www-apps/hugo/hugo-0.98.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 2018-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ DESCRIPTION="Fast static HTML and CSS website generator"
 HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo"
 SRC_URI="
 	https://github.com/gohugoio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://tastytea.de/files/${P}-vendor.tar.xz
+	https://tastytea.de/files/gentoo/${P}-vendor.tar.xz
 "
 
 # NOTE: To create the vendor tarball, run:
@@ -18,34 +18,45 @@ SRC_URI="
 LICENSE="Apache-2.0 BSD BSD-2 MIT Unlicense"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc +sass"
-
-BDEPEND=">=dev-lang/go-1.18"
+IUSE="doc +sass test test-full"
+
+BDEPEND="
+	>=dev-lang/go-1.18
+	test? (
+		dev-python/docutils
+		dev-ruby/asciidoctor
+		test-full? ( app-text/pandoc )
+	)
+"
 RDEPEND="
 	media-libs/libwebp:=
 	sass? ( dev-libs/libsass:= )
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-0.92.2-link-to-webp-and-sass.patch" )
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.96.0-unbundle-libwebp-and-libsass.patch"
+	"${FILESDIR}/${PN}-0.96.0-skip-some-tests.patch"
+)
 
 src_configure() {
 	export CGO_ENABLED=1
 	export CGO_CFLAGS="${CFLAGS}"
-	export CGO_CPPFLAGS="${CPPFLAGS} -DLIBWEBP_NO_SRC -DUSE_LIBSASS_SRC"
+	export CGO_CPPFLAGS="${CPPFLAGS}"
 	export CGO_CXXFLAGS="${CXXFLAGS}"
 	export CGO_LDFLAGS="${LDFLAGS}"
 
+	MY_BUILDFLAGS="$(usev sass "-tags extended")"
+
 	default
 }
 
 src_compile() {
 	mkdir -pv bin || die
-	local my_import_path="github.com/gohugoio/hugo/common"
-	local mybuildtags="-tags $(usev sass "extended,")nodeploy"
-	ego build -ldflags \
-		"-X ${my_import_path}/hugo.buildDate=$(date --iso-8601=seconds) -X ${my_import_path}/hugo.vendorInfo=Gentoo" \
-		${mybuildtags} -o "${S}/bin/hugo"
+	ego build -ldflags "-X github.com/gohugoio/hugo/common/hugo.vendorInfo=gentoo:${PVR}" \
+		${MY_BUILDFLAGS} -o "${S}/bin/hugo"
 
 	bin/hugo gen man --dir man || die
 
@@ -59,6 +70,10 @@ src_compile() {
 	fi
 }
 
+src_test() {
+	ego test -race "./..." ${MY_BUILDFLAGS}
+}
+
 src_install() {
 	dobin bin/*
 	doman man/*
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 389e4dec7cce..f5b356cca677 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,8 +1,6 @@
 DIST icingaweb2-2.10.0.tar.gz 11491028 BLAKE2B bee48e59ec7d0a564e7056986a84fda9639e61ed82ea65d35da310916e7058837fc146ee06f2c044748f72424198dc42f75b32de4b6ab39f673e2a9bbaf46966 SHA512 e26a4382970ece503c18ac9f93bb9e7ac24fd827dd84fd04352aeeff796ab58dac747840c6153cea5711d548603f219ba32aeffe76d87359ea72f2d3a598468b
 DIST icingaweb2-2.10.1.tar.gz 11490414 BLAKE2B 897d5dcb4774db42651b53937f2bf80810b9a8d3eccb10bb733ce7b083e4eeea5673ee7cab75d24602871b72d44d84f7c1a6faec28c1ff4d2bd404a7d39d7ba2 SHA512 ba77ddeb27fb0ab1c6f7a77020eb9490803e1bf2d37186c7efc06bd250301a7d50f669699196d3a3208da9d5606edc787f62f34cdd15343e2c55020b77e485d8
-DIST icingaweb2-2.9.6.tar.gz 12313930 BLAKE2B 696b882fc1bb0fd0452dca9e8b13b336181d953c05ab43c1db38073aa817496ca431dfb0f68adab0a6eae7c2238878dda98a57d8b69b2bc19ed94f1afbd26fe5 SHA512 507ce9ab8e31f0afc19de173c56e9ce2986c9c2e945ff3516e005b49a69993ccb00ec53d4c53bc0beee865cebc533b4b91b0d7707abf9d30d4cb76b7545fb6a4
-EBUILD icingaweb2-2.10.0.ebuild 2531 BLAKE2B 53f83accfd9a604c1c9ca85371379b8d6fda8df18dc0d0459a93549d3504fdd37cba3ca23deaeb7e28165fa56974d126bcc227a4f7459c4b92d885b4d2432dd1 SHA512 7fe3b7cb49979ce01fb96be9d7a887c2c540b521aac120cbc3437e371dedad178d8a9874574885845dce17642aedc1f9a7799164e5495c92aad7e5f29b6a7711
-EBUILD icingaweb2-2.10.1.ebuild 2531 BLAKE2B 53f83accfd9a604c1c9ca85371379b8d6fda8df18dc0d0459a93549d3504fdd37cba3ca23deaeb7e28165fa56974d126bcc227a4f7459c4b92d885b4d2432dd1 SHA512 7fe3b7cb49979ce01fb96be9d7a887c2c540b521aac120cbc3437e371dedad178d8a9874574885845dce17642aedc1f9a7799164e5495c92aad7e5f29b6a7711
-EBUILD icingaweb2-2.9.6.ebuild 2529 BLAKE2B 0bff09ed4258d2674a3e1ec780e6b7aa0d87cbcba5771af2ea2aae5fc10381f73f9b9434f09e3730c07d3ddcfdd2809f5b33273dd169f0c7ce808694d772c2ad SHA512 b9a0b279ac1606370ce0b238638c9a328990ffa977a50a21c61ad25b46d800e689b18c5eb8989e83a94a75a0d5afff3548989565a62bb3b6ab1551a8b17c2171
+EBUILD icingaweb2-2.10.0.ebuild 2529 BLAKE2B 0bff09ed4258d2674a3e1ec780e6b7aa0d87cbcba5771af2ea2aae5fc10381f73f9b9434f09e3730c07d3ddcfdd2809f5b33273dd169f0c7ce808694d772c2ad SHA512 b9a0b279ac1606370ce0b238638c9a328990ffa977a50a21c61ad25b46d800e689b18c5eb8989e83a94a75a0d5afff3548989565a62bb3b6ab1551a8b17c2171
+EBUILD icingaweb2-2.10.1.ebuild 2529 BLAKE2B 0bff09ed4258d2674a3e1ec780e6b7aa0d87cbcba5771af2ea2aae5fc10381f73f9b9434f09e3730c07d3ddcfdd2809f5b33273dd169f0c7ce808694d772c2ad SHA512 b9a0b279ac1606370ce0b238638c9a328990ffa977a50a21c61ad25b46d800e689b18c5eb8989e83a94a75a0d5afff3548989565a62bb3b6ab1551a8b17c2171
 EBUILD icingaweb2-9999.ebuild 2531 BLAKE2B 3f5f8503d3157d485a7d20ee78f92d6cd1fb8948a7ae314a796e79c0379ab9b96fb7f57589fac9ad653cfad6eae4dfa04b67ec1064cad3e9bdd5915c8bebaaeb SHA512 564852d6c04c14e98870a205a72c1ab5d2c4e712b9a71bd84112fce7d44d5652835213375ef7e684dc752be05869cd91f6f3d32168bcdbf2c37c2b44ccbcdda8
 MISC metadata.xml 444 BLAKE2B bf24467286f442770ed78cb298cd0fc1d37786b06e85bbc4b20a8c750764e7a831828ebc9b7872772f0a286b12cb67491cb1f84f189cf00e2ec59a6b921e760f SHA512 55e57997695e09ad9cc8448030e8470a0e39a1cbc610f70e29c2a68a4f287e54cb816b0cd1ceec611112849ba97225a60560b67368fb3a6ed68a73a728d61d83
diff --git a/www-apps/icingaweb2/icingaweb2-2.10.0.ebuild b/www-apps/icingaweb2/icingaweb2-2.10.0.ebuild
index 1c12f98d4b39..eb5a96a535d5 100644
--- a/www-apps/icingaweb2/icingaweb2-2.10.0.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.10.0.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/icingaweb2/icingaweb2-2.10.1.ebuild b/www-apps/icingaweb2/icingaweb2-2.10.1.ebuild
index 1c12f98d4b39..eb5a96a535d5 100644
--- a/www-apps/icingaweb2/icingaweb2-2.10.1.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.10.1.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/icingaweb2/icingaweb2-2.9.6.ebuild b/www-apps/icingaweb2/icingaweb2-2.9.6.ebuild
deleted file mode 100644
index eb5a96a535d5..000000000000
--- a/www-apps/icingaweb2/icingaweb2-2.9.6.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit depend.apache multilib
-
-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:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-		)
-		dev-libs/icinga-php-library
-		dev-libs/icinga-php-thirdparty
-		acct-group/icingacmd
-		acct-group/icingaweb2"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-
-	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"
-	fowners root:icingaweb2 "/usr/share/${PN}/bin/icingacli"
-}
-
-pkg_postinst() {
-	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
-}
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 23fd18999b33..e3e201783bbc 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -3,11 +3,6 @@ AUX kibana.initd 1019 BLAKE2B f57bce1793768f2936dc8cd3437aacbb4d4e034ac53612f010
 AUX kibana.initd-r1 1040 BLAKE2B 12fc93fcb8f79fc5013fab36eb74335a967f5573d7361dbfce78bde08d53e536eb63a068c047dad3c04e19b973b70d2af2b1e9757ebf9155951dea5c850d5783 SHA512 04cc2571d4c37cb7e270b1ef64e6fb26fa22d4ed259bc74eb165c8f2c49fb8ef9e1a3fbb0a7e45b04ed88309382429b2e78bdc5fe5cc51bf97ffcd5b17f387bf
 AUX kibana.logrotate 186 BLAKE2B e0446247e29b474dcab5756ac26f10fd8f46300e144386ff54a4e25fc1c2678ce0d21196b7365b01417cd0304a3f1edd6841800256e931bdc10f7d4e0f4ccd49 SHA512 1e0a51a83798e30b3807f496245b5733bc60a7bd1a529d2548a187ff8d3fa56d60bc23abf516d239ef76a8e9b66358ed84c687040a7b04c7818ea63417d33a1e
 AUX kibana.service 511 BLAKE2B 2b0786bfaf37c26e061973f38adea0a55ac1b8bf771395242c0ed3b53c6586099c121c286b23f0a3be67dc481a3e95c6f87486cd1601df997126d3cfd14435c1 SHA512 0b7754ebfa7e3538e64843436d8abe32a6ce38a9ab5e252e52657a99d97fa1801777db4502c1af5ec6082d83f0b3a0613e074f6ebe28624832bd0c258a478899
-DIST kibana-6.8.23-linux-x86_64.tar.gz 186911401 BLAKE2B 4d0894b88c855bc64ed648489d8c7293965a6edee0ebb841f22c5779592a282dc6af800f39bcd4fd710242aa63365165616bd7a2cf17e8ca0a6560c7bc604256 SHA512 15226207e3606637fe5004bf7b994fa8d09a0b2860881f7539a70872e5480c6614a6181fbb1ec0effa24380bd7721a8bdd87dea152e628c6577684c1b13ee0a2
-DIST kibana-7.16.3-linux-x86_64.tar.gz 281044755 BLAKE2B f308f60615f66a7139ae4e39172900c571c6000879aa2c47f6ba906098e12cb1e0f244af2289b870c6d35bf10ce59d6bd9395678243bd77365aea0b650cc27f5 SHA512 a08198dac16d62a0167a37ed58d73004535eec0fe21e0be8bb4926a2bfb1a69e8d8a679e1a7537dcad72d7a5f25c35c8a233da7dd130df01d2fa47b848d18ca3
-DIST kibana-7.17.1-linux-x86_64.tar.gz 281738743 BLAKE2B ddc29593889c17d3f6bb353ac4445e6a50b30f5a2409576a1bb15cee60da72f2bb9ce099a75764e26336d479604a0402fdb7f3c570bf524459d3e3339b5e0e38 SHA512 7e2fd31bdc7199ff8889fc04b3c1370aa963909a3d693808f41493da6c1546b691c44bc61f1b69309eeca0d0cae39305932ff96f76bfa8ff469cfd5649abaf50
-DIST kibana-oss-6.8.23-linux-x86_64.tar.gz 67419004 BLAKE2B e7d7be6947cdb3d19efae9ca4113d22a70d3354632c57df266f0dff0b367caa01e3e0ee797ed6330f59cf4d4de63c7985c3504b0914445fb18ab696cbbaf98c1 SHA512 f6ffd8e8f957e08a6783b3decbab0f85654eb1386d7135e76c25799c76524957aa250f8bae43b220c0f14616071a63f5132ca73145d5a44ac8a52d106403a530
-EBUILD kibana-bin-6.8.23.ebuild 2524 BLAKE2B b9ed1e826f76a192c1de376442d5ed1653c40c87ca15cbcd7ea8048479f5d0d03755ba7449b4f432f91f8f69cb31931e9d7bf5f2989ea520bd24596f3aed9d82 SHA512 4145f5048d32d5dc5112f17370e5d8b90148960bf3369674f1e8bc00b1a0c9a143b5c962aceef6d4be5565f028cbd4608eb711b7b223a009f2200cd538e49f46
-EBUILD kibana-bin-7.16.3.ebuild 2492 BLAKE2B 53be56a97cc94b5bcbb291d603c0bdbed3d1166180c4cd840b1bb3bb08875d24dc231e2adf47b21917aeaec4f88464bc5533ae2e97727394a488a3bff890d46c SHA512 de8251fc77621f800367cbcecb8e8d07e6b5b9162f893a0131feab7be43840db858a46f7a009d17ca63cc7fee68d07b260e971e0b5610d026aba6caee59a963a
-EBUILD kibana-bin-7.17.1.ebuild 2492 BLAKE2B 53be56a97cc94b5bcbb291d603c0bdbed3d1166180c4cd840b1bb3bb08875d24dc231e2adf47b21917aeaec4f88464bc5533ae2e97727394a488a3bff890d46c SHA512 de8251fc77621f800367cbcecb8e8d07e6b5b9162f893a0131feab7be43840db858a46f7a009d17ca63cc7fee68d07b260e971e0b5610d026aba6caee59a963a
-MISC metadata.xml 569 BLAKE2B 66a1069bcf497973fbf62e9951912b3a39340a8c9e21ad2d09f297ee9d8680ddbee3fac02aab30e9b5ae463b40a2e9fd230c42a2f3ca42135869273e15a0cdc2 SHA512 2e812f2a8d31f4cf20d2252bab8795a0f25dab616592bb4da6e4cd1063ec7eae88f0bf136dfee2af19cc1dfe9e62ece4d36a2031d32bfa0aeba9925fabd8cdc6
+DIST kibana-7.17.3-linux-x86_64.tar.gz 263671680 BLAKE2B fe044050ffbc7f83428cb75f27bcab0afbabbe6ee69603067ceeffb13c673973f7413b8ea13ee6534bc1e96898b2955da0f16c41f254e7e8a56ea58d74032903 SHA512 ad675a4f7ae05dba56517435057d7698c967f71c5b4bca722583bc0075dde15b54757fb99cfa7ed64c488a1cc62b00a617cbd645b052829062be1cb30fc023cc
+EBUILD kibana-bin-7.17.3.ebuild 2507 BLAKE2B be8dfcce97d27cdc3ea405edb9213c9c317bbb6fafd8594b9d035a5e0e104933bc319cae10e05114bee4612bb50abe0c68a4b578011553a2c895be5202fe71ad SHA512 6b6b1ecf6cb208001f76a2f0a925e588f9e937f57755143673fec4df2171668e2cb4a87d245bed788c76bb84e0b21ab50acc5ea2d3311f3a2a64c1869d4440fc
+MISC metadata.xml 477 BLAKE2B 427185c252047ce2b2bbee8ddf2dbc9e59a6c701d3f0c6dec44158627d41f8266f8cedbba9b330c34bbc77335a5763598897fda097f6991a78f96ed9cce1f826 SHA512 6e158be025d255cf1a189bd02d4c9679aa96cc6b15985c321af0102498a760333fa82f4cc90aa3370820626c0d5478fb821eeef24c603d8dac82996447dc7c2c
diff --git a/www-apps/kibana-bin/kibana-bin-6.8.23.ebuild b/www-apps/kibana-bin/kibana-bin-6.8.23.ebuild
deleted file mode 100644
index 0c16c09d3126..000000000000
--- a/www-apps/kibana-bin/kibana-bin-6.8.23.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-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="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-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 x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RDEPEND="
-	acct-group/kibana
-	acct-user/kibana
-	>=net-libs/nodejs-10.15.2
-	<net-libs/nodejs-14
-	x-pack? (
-		dev-libs/expat
-		dev-libs/nss
-	)"
-
-S="${WORKDIR}/${MY_P}-linux-x86_64"
-
-src_prepare() {
-	default
-
-	# remove empty unused directory
-	rmdir data || die
-
-	# remove bundled nodejs
-	rm -r node || die
-
-	# move optimize/plugins to /var/lib/kibana
-	rm -r optimize plugins || die
-
-	# handle node.js version with RDEPEND
-	sed -i /node_version_validator/d src/setup_node_env/index.js || 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 .
-
-	fperms -R +x /opt/${MY_PN}/bin
-
-	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
-	keepdir /var/lib/${MY_PN}/optimize
-	keepdir /var/lib/${MY_PN}/plugins
-	keepdir /var/log/${MY_PN}
-
-	dosym ../../var/lib/kibana/optimize /opt/kibana/optimize # Bug 667214
-	dosym ../../var/lib/kibana/plugins /opt/kibana/plugins
-}
-
-pkg_postinst() {
-	ewarn "Kibana optimize/plugins directories were moved to /var/lib/kibana."
-	ewarn "In case of startup failures (FATAL Error: Cannot find module...),"
-	ewarn "please remove the optimize directory content:"
-	ewarn "rm -r /var/lib/kibana/optimize/*"
-	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
-	elog "Node.js 10. Some plugins may fail with other versions of Node.js (Bug #656008)."
-	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/kibana-bin-7.17.1.ebuild b/www-apps/kibana-bin/kibana-bin-7.17.1.ebuild
deleted file mode 100644
index d13809c0d99b..000000000000
--- a/www-apps/kibana-bin/kibana-bin-7.17.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-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 Elastic-2.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	acct-group/kibana
-	acct-user/kibana
-	dev-libs/expat
-	dev-libs/nss
-	>=net-libs/nodejs-16.13.0
-"
-
-# Do not complain about CFLAGS etc since we don't use them
-QA_FLAGS_IGNORED='.*'
-QA_PRESTRIPPED="
-	opt/kibana/x-pack/plugins/reporting/chromium/headless_shell-linux_x64/headless_shell
-	opt/kibana/x-pack/plugins/reporting/chromium/headless_shell-linux_x64/swiftshader/libEGL.so
-	opt/kibana/x-pack/plugins/reporting/chromium/headless_shell-linux_x64/swiftshader/libGLESv2.so
-	opt/kibana/node_modules/re2/build/Release/re2.node
-"
-
-S="${WORKDIR}/${MY_P}-linux-x86_64"
-
-src_prepare() {
-	default
-
-	# remove unused directory
-	rm -r data || die
-
-	# remove bundled nodejs
-	rm -r node || die
-	sed -i 's@\(^NODE="\).*@\1/usr/bin/node"@g' \
-		bin/kibana || die
-
-	# move plugins to /var/lib/kibana
-	rm -r plugins || die
-
-	# handle node.js version with RDEPEND
-	sed -i /node_version_validator/d \
-		src/setup_node_env/no_transpilation_dist.js || 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-r1 ${MY_PN}
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-
-	insinto /opt/${MY_PN}
-	doins -r .
-
-	fperms -R +x /opt/${MY_PN}/bin
-
-	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
-	keepdir /var/lib/${MY_PN}/plugins
-	keepdir /var/log/${MY_PN}
-
-	dosym ../../var/lib/kibana/plugins /opt/kibana/plugins
-}
-
-pkg_postinst() {
-	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
-	elog "Node.js 16. Some plugins may fail with other versions of Node.js (Bug #656008)."
-	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/kibana-bin-7.16.3.ebuild b/www-apps/kibana-bin/kibana-bin-7.17.3.ebuild
index d13809c0d99b..6082bc86be56 100644
--- a/www-apps/kibana-bin/kibana-bin-7.16.3.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-7.17.3.ebuild
@@ -21,6 +21,7 @@ RDEPEND="
 	acct-group/kibana
 	acct-user/kibana
 	dev-libs/expat
+	dev-libs/nspr
 	dev-libs/nss
 	>=net-libs/nodejs-16.13.0
 "
diff --git a/www-apps/kibana-bin/metadata.xml b/www-apps/kibana-bin/metadata.xml
index 239f72d67760..c1786678a5e5 100644
--- a/www-apps/kibana-bin/metadata.xml
+++ b/www-apps/kibana-bin/metadata.xml
@@ -12,7 +12,4 @@
 	<upstream>
 		<remote-id type="github">elastic/kibana</remote-id>
 	</upstream>
-	<use>
-		<flag name="x-pack">Enable additional features (may need a license)</flag>
-	</use>
 </pkgmetadata>
diff --git a/www-apps/miniflux/Manifest b/www-apps/miniflux/Manifest
new file mode 100644
index 000000000000..b6f532decab7
--- /dev/null
+++ b/www-apps/miniflux/Manifest
@@ -0,0 +1,9 @@
+AUX README.gentoo 2168 BLAKE2B 2291976288e00d71ecf9b978874cd26a33d604f803c6eb511e137e8a9843e4c7b64d286482c9af47879fadfe1d800cd58e4d09ea1882d436eff528d8aaa9743f SHA512 edac844eb081472d6c8054d9bf0f8661cbbb61455d2cc97ce7d05a842fe735b6e130f1b6d0a2e26737d153624b5a7451b362e04247b366c090f2fc3e9aab7391
+AUX miniflux.conf 809 BLAKE2B 4465c338fa13d3465731fcb98616d08d4fbcfdad6e10eb3f089de62dda9297220b92cb767bd92dfd97c3a5a5f6a2bd87444b76fa790243626d77698ecefcc2a1 SHA512 470b0e8382b97c2c2d1c8a2c6865a8cd06b2157a24d81a329d6de37d9b964b502a37ca7178090f2aee5c29210fc4c6e4f7d7e2245d00d8df33cfc738012b7329
+AUX miniflux.confd 171 BLAKE2B 2d38a12678c7873ac31473a2160d1416d168e384c519fe48feebf4ea3d4e6c734ff198e652df8b0af7da5c3543eff5321a02b6991de131d746b89e3b5fb7db08 SHA512 13b43595e7a5bca01b9fbff9fc6979d408b32109bafc23cfae29a9470b5333a244ee1f1bc94ba436d93e2d2c55640690202ac1201884f9ea5499fa0161af059a
+AUX miniflux.initd 504 BLAKE2B d43cc0323161fc3723063f07fb5d8da4f762b420dedbcab28ad5d41c90f526c80849222f9255032fdf9fc4c4ba45d4989d0967498a5e32b326a6d966abaa4c84 SHA512 d58233009fd6c69f1095aa5cc62d08a910edaa0d16db3af663398d723873f2354e0d60c75ca746a281546d1f40ad0a8db1fc275ee31ed9e6958410b0b5f12afb
+AUX miniflux.service 463 BLAKE2B e6f1a3717e985f3ddae4224472b753f293a73ab015acbe80ddf20d2d9e505aa9fd47e2fca2c86749067288a1f10787e16179a41e5c30d3f37f53e83f798719b8 SHA512 c38fe3f19162be02a44a353281690d40e90cb8ac8126ea4f9aab1218e128da0be3d1152cf260fdfd19ecfed2ea4396ae4a6c645088a1b212b58a3cba8387ce60
+DIST miniflux-2.0.36-deps.tar.xz 151007452 BLAKE2B b21e2a96e9c19341ff1435deb41558b6a1061d7ed136f4164e577949519582e003bfc0ac7f1d60453dbde89d807fbf2707c878dc3c5e0da874ce8f3b6e6682d9 SHA512 f7708d45ad1ed72faf4a32420c990fdeea25258d7caa2a332781590b169bbaa4ead53baaf1024e2e399921182551876a63a3e516a94fdc074995b5cb1d35b9d1
+DIST miniflux-2.0.36.tar.gz 548596 BLAKE2B b3f6a85d635eb095f41852d3e618e7e2e2b97e83c776f16b4da9a22a0bb03e9c1815c4ea1a9b841ee8132087067fb7e00a084536f99e004c0863adaf6bbc64b0 SHA512 0c3f1b68e1cb9c4cf5e543847abf3cb34bb56152991a3cd257f4886c7573d17fc177f928574040c2d5b339bf8fe39f9504952f234babe1dcd3b824f8ec95c75a
+EBUILD miniflux-2.0.36.ebuild 2578 BLAKE2B 555cce45ceea4f96b75638128b60ee946532bb329f3bd4a6f93fffed8a28f8a8547331bd8c1cc73fb1bcca1234a5c8e71fce63e745294e6f9c55ad2fc6a964eb SHA512 1d5c77e1f8699ea710d38760d624f1bbd6286c4d42d1f827df516ac13a6d977ade246c0150e7de2f4509f5d31e706b6175e7b8df4b30175bf68b14f1c70c1ccd
+MISC metadata.xml 329 BLAKE2B 50e914926db603f0d6e89f009847cab4ed7e771c33779da94e71d78dd4322457a19c8b1f4d9a27670fcde68ffd4480582c8def09973b84cc69bcf670fabfae19 SHA512 c00ceaf0e7d32f4395cdba01ce2af24ce7ab2d50baa250abe035f78d905b864fc1e0947226fce655adb5b0355030b30adabd6c64d306b83a5b8f6aae70dcdbcf
diff --git a/www-apps/miniflux/files/README.gentoo b/www-apps/miniflux/files/README.gentoo
new file mode 100644
index 000000000000..7d236ffadfb6
--- /dev/null
+++ b/www-apps/miniflux/files/README.gentoo
@@ -0,0 +1,76 @@
+Introduction
+============
+
+Below are some common tasks needed to administrate a miniflux instance.
+
+
+Create the Database (Example)
+=============================
+
+# Switch to the postgres user
+$ su - postgres
+
+# Create a database user for miniflux
+$ createuser -P miniflux
+Enter password for new role: ******
+Enter it again: ******
+
+# Create a database for miniflux that belongs to our user
+$ createdb -O miniflux miniflux
+
+# Create the extension hstore as superuser
+$ psql miniflux -c 'create extension hstore'
+CREATE EXTENSION
+
+
+Create the hstore Extension
+===========================
+
+To create the hstore extension, connect to the miniflux database as any user
+with SUPERUSER privileges (like the postgres user) and run:
+
+  CREATE EXTENSION hstore;
+
+Alternatively, give SUPERUSER privileges to the miniflux user only during the
+schema migration:
+
+  ALTER USER miniflux WITH SUPERUSER;
+  -- Run the migrations (miniflux -migrate)
+  ALTER USER miniflux WITH NOSUPERUSER;
+
+
+Create the First Admin User
+===========================
+
+The easiest way to create the first admin user with your new miniflux instance
+is by running:
+
+  miniflux -create-admin
+
+Alternatively, set the DATABASE_URL, RUN_MIGRATIONS, CREATE_ADMIN,
+ADMIN_USERNAME, and ADMIN_PASSWORD variables in your config file or run miniflux
+with these set as environment variables. For example:
+
+  export DATABASE_URL=postgres://miniflux:secretpassword@db/miniflux
+  export RUN_MIGRATIONS=1
+  export CREATE_ADMIN=1
+  export ADMIN_USERNAME=admin
+  export ADMIN_PASSWORD=n0tAstrongPassw0rd!
+  miniflux
+
+
+Migrating the Database
+======================
+
+On upgrades, the miniflux database needs to be migrated to the new schema
+version. This is handled automatically when you run 'emerge --config miniflux'
+but can also be performed using the following manual steps:
+
+1. Export the DATABASE_URL variable.
+2. Disconnect all users by flushing all sessions with 'miniflux -flush-sessions'
+3. Stop the miniflux server.
+4. Backup your database.
+5. Verify that your backup is really working.
+6. Run the database migrations with 'miniflux -migrate' or set the environment
+   variable RUN_MIGRATIONS=1.
+7. Start miniflux.
diff --git a/www-apps/miniflux/files/miniflux.conf b/www-apps/miniflux/files/miniflux.conf
new file mode 100644
index 000000000000..7a2b217f598c
--- /dev/null
+++ b/www-apps/miniflux/files/miniflux.conf
@@ -0,0 +1,22 @@
+# This is a sample configuration file with the most commonly used options needed
+# to get started. For a complete list of available options, see the miniflux (1)
+# man page or visit https://miniflux.app/docs/configuration.html
+
+# Toggle debug mode (increase log level).
+#DEBUG=off
+
+# Postgresql connection parameters.
+# See https://pkg.go.dev/github.com/lib/pq#hdr-Connection_String_Parameters
+# for more details.
+#DATABASE_URL=user=postgres password=postgres dbname=miniflux2 sslmode=disable
+
+# Address to listen on. Use absolute path for a Unix socket.
+#LISTEN_ADDR=127.0.0.1:8080
+
+# Override LISTEN_ADDR to 0.0.0.0:$PORT (Automatic configuration for PaaS).
+# Default is empty.
+#PORT=
+
+# Base URL to generate HTML links and base path for cookies.
+# Default is http://localhost/.
+#BASE_URL=http://localhost/
diff --git a/www-apps/miniflux/files/miniflux.confd b/www-apps/miniflux/files/miniflux.confd
new file mode 100644
index 000000000000..2448e5069f78
--- /dev/null
+++ b/www-apps/miniflux/files/miniflux.confd
@@ -0,0 +1,6 @@
+# User and group miniflux server should run as
+MINIFLUX_USER=miniflux
+MINIFLUX_GROUP=nobody
+
+# Config file the miniflux server should use
+MINIFLUX_CONF=/etc/miniflux.conf
diff --git a/www-apps/miniflux/files/miniflux.initd b/www-apps/miniflux/files/miniflux.initd
new file mode 100644
index 000000000000..f8a8c59132da
--- /dev/null
+++ b/www-apps/miniflux/files/miniflux.initd
@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+: ${MINIFLUX_USER:=miniflux}
+: ${MINIFLUX_GROUP:=nobody}
+: ${MINIFLUX_CONF:=/etc/miniflux.conf}
+
+name="miniflux daemon"
+description="Miniflux Web Server"
+command=/usr/bin/miniflux
+command_args="${miniflux_args} -c ${MINIFLUX_CONF}"
+command_background="true"
+command_user="${MINIFLUX_USER}:${MINIFLUX_GROUP}"
+error_log="/var/log/${RC_SVCNAME}.err"
+pidfile="/run/${RC_SVCNAME}.pid"
diff --git a/www-apps/miniflux/files/miniflux.service b/www-apps/miniflux/files/miniflux.service
new file mode 100644
index 000000000000..5480dd01e603
--- /dev/null
+++ b/www-apps/miniflux/files/miniflux.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=Miniflux Web Server
+Documentation=https://miniflux.app/
+
+After=network.target
+Requires=network.target
+After=postgresql-9.5.service
+After=postgresql-9.6.service
+After=postgresql-10.service
+After=postgresql-11.service
+After=postgresql-12.service
+After=postgresql-13.service
+After=postgresql-14.service
+
+[Service]
+User=miniflux
+ExecStart=/usr/bin/miniflux -c /etc/miniflux.conf
+Restart=always
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/www-apps/miniflux/metadata.xml b/www-apps/miniflux/metadata.xml
new file mode 100644
index 000000000000..6ae1ef592e60
--- /dev/null
+++ b/www-apps/miniflux/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>concord@gentoo.org</email>
+		<name>Kenton Groombridge</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">miniflux/v2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/miniflux/miniflux-2.0.36.ebuild b/www-apps/miniflux/miniflux-2.0.36.ebuild
new file mode 100644
index 000000000000..005822d6132c
--- /dev/null
+++ b/www-apps/miniflux/miniflux-2.0.36.ebuild
@@ -0,0 +1,98 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+DESCRIPTION="Minimalist and opinionated feed reader"
+HOMEPAGE="https://miniflux.app https://github.com/miniflux/v2"
+SRC_URI="https://github.com/${PN}/v2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test" # requires network access
+
+DEPEND="acct-user/miniflux"
+RDEPEND="${DEPEND}
+	>=dev-db/postgresql-9.5
+"
+
+S="${WORKDIR}/v2-${PV}"
+
+src_compile() {
+	ego build -ldflags="-s -w -X 'miniflux.app/version.Version=${PV}' " -o miniflux main.go
+}
+
+src_install() {
+	dobin miniflux
+
+	insinto /etc
+	doins "${FILESDIR}/${PN}.conf"
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	fowners miniflux:root /etc/${PN}.conf
+	fperms o-rwx /etc/${PN}.conf
+
+	local DOCS=(
+		ChangeLog
+		README.md
+		"${FILESDIR}"/README.gentoo
+	)
+
+	# Makefile has no install target, so call einstalldocs directly
+	einstalldocs
+
+	doman "${PN}".1
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		echo
+		elog "Before using miniflux, you must first create and initialize the database"
+		elog "and enable the hstore extension for it."
+		elog ""
+		elog "Afterwards, create your first admin user by running:"
+		elog "  miniflux -create-admin"
+	else
+		# This is an existing installation
+
+		echo
+		elog "If you are upgrading from a previous version, schema migrations must be performed."
+		elog "To perform the migrations, stop the daemon, backup your database, and run:"
+		elog "  emerge --config =${PF}"
+	fi
+
+	echo
+	elog "Please read"
+	elog ""
+	elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+	elog ""
+	elog "for more information."
+}
+
+pkg_config() {
+	# To be safe, avoid doing migrations if miniflux is running
+	if pgrep miniflux; then
+		die "miniflux appears to be running, refusing to continue."
+	fi
+
+	# Extract the database URL variable instead of just sourcing the config file
+	# because miniflux itself may interpret quotes as part of the URL
+	local DATABASE_URL="$(sed -n 's/^DATABASE_URL=\(.*\)/\1/p' ${EROOT}/etc/${PN}.conf)"
+	[[ -n "${DATABASE_URL}" ]] || die "Failed getting DATABASE_URL from config file"
+
+	DATABASE_URL="${DATABASE_URL}" "${EROOT}"/usr/bin/miniflux -migrate || die "miniflux -migrate failed. Please check the above output for errors."
+
+	echo
+	elog "Database migrations complete."
+}
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 17c65ad88f18..ffbc86e5c2c1 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -2,10 +2,12 @@ AUX config-r1.php 1780 BLAKE2B 1d80339f97771f5f4cce03f49d055598269fd50832d6f98d5
 AUX config.php 718 BLAKE2B b12392f83a9feaaad4ad5ac7c7e3ff27670b9aad959db5528900472cc6cd10f19c9a371c17f0412b7c0c985f4ba1bcf39ecea8c7ef9e0a8ed50012cc64f4b72b SHA512 38347d3a275397074abe3cc8cd1521c7fe2deb45f4702d7a8a3e3c30ab6e2c1c51fa2c1f58d7fc99f0b72f2dcd243b8dcfdd7b3641c22c41399705aab6b59479
 AUX postinstall-en.txt 6524 BLAKE2B 68262eaf6318780a468d9e6f98c3b2cce43164964de6ea6626da43b1ac481b6edea6d0314cc4038adb511c4354a8f18dfd9da9145901d26665f84e746ab14e9b SHA512 bb3e5187db6be49707801cfde15ebced065f2d4b8c1a04fef2f4ced0a67dab2440b8e79d110685056cad84647f8ebb587c697452df8e2b0eab07b015d01b92cf
 AUX postinstall-nodb-en.txt 171 BLAKE2B ee2aa857cf365815b705b5e60c5b2fef0cdb0bcd8acef0375e0173f13c004e336df9b2dbc6cac376bea939e8fe73a72f06d52961500d05ee2137a8fea82286b1 SHA512 b0cf4787351f904caf06573c5bc50275b6a11361170b4006acc24224f44efde69cfe3a9b6340d6787c5805c605dc89f07072bf992b0ee255c97fba90e5d5617e
-DIST moodle-3.10.10.tgz 58340957 BLAKE2B 1bcdd93802657729ac83f0eb7c9d25901ed71e0ba50940f3739875735d9fe4b4575c13680ea7b3acd1f578a6267813a011404f0cbbc2d93d0c9d79cf0c4beafc SHA512 fd5d2902a85a3e41cfa2eae1673e783aa55c78690a184664d554f5079a99ea7cf699a7b2c6f398daea7effa56c46533a5d475a25e805e9ae61b1cee0f0663fdb
-DIST moodle-3.11.6.tgz 60192360 BLAKE2B a9761a1056325ed952ed446ba35ddf7a09be2faec297609253424cd340fb89c7aa99caa5474a22d230e49321963f489539e4ec764983ebbe352cbd3c7b9c742f SHA512 1ceed02ace4bb506e2d3a2565af37956f9b89024478a32010699efde602220dde598938343566b018feb0d779182cdea4199db63b3671b0a15d4336646ef57f3
-DIST moodle-3.9.13.tgz 56738890 BLAKE2B 3e894c30a480dc74d6ef332052a545be885f93057025a43065ccbc86d81ad3cc7d7f339a98189d3833b28ba13432fb3a30c6335d1d87d4056fc841f4ce11c8e2 SHA512 824572f01b185e0e722524620b08e623fb5827e972f7a3adc2ec6b4c023675f03ff46a0973e418aa6ff3d7c3efd8acccbb866750e760ef2499c3352f3b9dad21
-EBUILD moodle-3.10.10.ebuild 2812 BLAKE2B 6f6b5dc3270adcce5d10d27683d734e76f554e8454344aaff4fcd2233d268d9425b623a8423dfbc6dedd2b73c2a5c9f9be60ef02ada06b4f6aa0ccf4c8f8dbcd SHA512 7ee2eca192cc93d44f57133ce67fccf00c3d246a6341654a78286a68eba1676233365030629ee45fd8cf1e4a91a9be10f262c87dd0a7ddba1742a92efb4713a4
-EBUILD moodle-3.11.6.ebuild 2812 BLAKE2B 3a17d83da854b75046b2f489a943307e9eb035f5a240938087dc040d66b9271a27dd359f855df6dea9bd0da9a0e0e0dd94dbfff6e0209cca63e278bfe726da0b SHA512 50b8cd24e8f4323a5c2636e3256de12a53ef3206367a9a193be82e6c0050b8e9b089cbdcde5efbb8ca94e35fc15081b3e5df77d78d3bc084a0bacfc658d63cdb
-EBUILD moodle-3.9.13.ebuild 2812 BLAKE2B 6f6b5dc3270adcce5d10d27683d734e76f554e8454344aaff4fcd2233d268d9425b623a8423dfbc6dedd2b73c2a5c9f9be60ef02ada06b4f6aa0ccf4c8f8dbcd SHA512 7ee2eca192cc93d44f57133ce67fccf00c3d246a6341654a78286a68eba1676233365030629ee45fd8cf1e4a91a9be10f262c87dd0a7ddba1742a92efb4713a4
+DIST moodle-3.10.11.tgz 58342694 BLAKE2B 732231f2787ffc05ca48205a631b950fd37571203b603fc34799f5063f56b95836dfe5781524dfe00b28059b0cc2559231f093d13c826cce8ebb91065867a7a8 SHA512 85f029e983f38cad08446ce5d59ed8d173de0a2556ea4a56359022e0b775e8ffc615ffb34dc5feef3abd5449e6d828e094c4472c529b021f49996bd373913151
+DIST moodle-3.11.7.tgz 60219306 BLAKE2B 716e4dae672bd4f143db7fda0a9e21ee0d98719a67253a281808bf3365e8330329ab05020509860768341e11df49bbe1edaff35fe91e201f4993739e5a0bd302 SHA512 891581fc10e9c1715de44ba273872fdf30335cdc9fb354dbe3cd9821a6665cc0d02af94e406afde466dd3a1632d5e8543efffd741e5109186af6b2c5480cf523
+DIST moodle-3.9.14.tgz 56736058 BLAKE2B 7a1759edf2fa322d871cc0e05b45809c0307708fc34c46ed3fbeb6c80d4fd77b37482454a1660593be9ec229a883d062ada0f814d94d1afb9cfdde94489cf884 SHA512 07cd5c8ac734abe3ec550cc4a0eb77276230bf1b5430c828a95699e07cccd2d81c0ee6c7f47aa52f3439a3184fc81e86579b9ab06de4e8900287ad499a2fa6eb
+DIST moodle-4.0.tgz 61778671 BLAKE2B 426b0977d9c78055465fd752ea20a29c0f9c715cc513d3cb377f74e58cd3b3be01cafe93e2ba77222f097f2f13594ff645b5150d31b50493556b899587798400 SHA512 a104cfcc3616cb5d97382cf387ef13d89ea73e7b0a2f71f0bbd8cabc1df5828476091f0ab0a2e3f5962f4c8bb9d3019e3f226ec808fad670c5777cc87bd3d70c
+EBUILD moodle-3.10.11.ebuild 2812 BLAKE2B 6f6b5dc3270adcce5d10d27683d734e76f554e8454344aaff4fcd2233d268d9425b623a8423dfbc6dedd2b73c2a5c9f9be60ef02ada06b4f6aa0ccf4c8f8dbcd SHA512 7ee2eca192cc93d44f57133ce67fccf00c3d246a6341654a78286a68eba1676233365030629ee45fd8cf1e4a91a9be10f262c87dd0a7ddba1742a92efb4713a4
+EBUILD moodle-3.11.7.ebuild 2812 BLAKE2B 3a17d83da854b75046b2f489a943307e9eb035f5a240938087dc040d66b9271a27dd359f855df6dea9bd0da9a0e0e0dd94dbfff6e0209cca63e278bfe726da0b SHA512 50b8cd24e8f4323a5c2636e3256de12a53ef3206367a9a193be82e6c0050b8e9b089cbdcde5efbb8ca94e35fc15081b3e5df77d78d3bc084a0bacfc658d63cdb
+EBUILD moodle-3.9.14.ebuild 2812 BLAKE2B 6f6b5dc3270adcce5d10d27683d734e76f554e8454344aaff4fcd2233d268d9425b623a8423dfbc6dedd2b73c2a5c9f9be60ef02ada06b4f6aa0ccf4c8f8dbcd SHA512 7ee2eca192cc93d44f57133ce67fccf00c3d246a6341654a78286a68eba1676233365030629ee45fd8cf1e4a91a9be10f262c87dd0a7ddba1742a92efb4713a4
+EBUILD moodle-4.0.1.ebuild 2917 BLAKE2B e02ee7289c828d941b4154e611c56f411b616bef3d09f988df5c8a63b9563b32cc3b4607ee46a4b49a3207bf62512893526b93e19427ac2f518de0941329753c SHA512 51eba2e507c75a13e58f4f671cfd087fc1ff03861827d0286f2408b001e7a26521b7b4084d39b0c0fa0df72a3c6f1015d2537ac77d753709313c710673c0b7bc
 MISC metadata.xml 388 BLAKE2B 5e63a37b5ae4bd8f72d1c53fc42a2d0fcbe002abf330912b7f15a0441ef4a9e04694ffa1f7076d67bb36c7cee6a1c6da11e49206bf8498451f131d9e787bb7c1 SHA512 db2fd63e289eb9471b5d99ffa0214879d89db93ec60ddf35e34b72b62cd24835d133da52619d3872144225c0581ae1fe729901d1407a1b12bfb9c18ea2508379
diff --git a/www-apps/moodle/moodle-3.10.10.ebuild b/www-apps/moodle/moodle-3.10.11.ebuild
index 7dd5a9861c83..7dd5a9861c83 100644
--- a/www-apps/moodle/moodle-3.10.10.ebuild
+++ b/www-apps/moodle/moodle-3.10.11.ebuild
diff --git a/www-apps/moodle/moodle-3.11.6.ebuild b/www-apps/moodle/moodle-3.11.7.ebuild
index 36f762e3e63b..36f762e3e63b 100644
--- a/www-apps/moodle/moodle-3.11.6.ebuild
+++ b/www-apps/moodle/moodle-3.11.7.ebuild
diff --git a/www-apps/moodle/moodle-3.9.13.ebuild b/www-apps/moodle/moodle-3.9.14.ebuild
index 7dd5a9861c83..7dd5a9861c83 100644
--- a/www-apps/moodle/moodle-3.9.13.ebuild
+++ b/www-apps/moodle/moodle-3.9.14.ebuild
diff --git a/www-apps/moodle/moodle-4.0.1.ebuild b/www-apps/moodle/moodle-4.0.1.ebuild
new file mode 100644
index 000000000000..7712f6dc98aa
--- /dev/null
+++ b/www-apps/moodle/moodle-4.0.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit webapp
+
+DESCRIPTION="The Moodle Course Management System"
+HOMEPAGE="https://moodle.org"
+
+#MY_BRANCH="stable$(ver_cut 1)$(ver_cut 2)"
+#SRC_URI="https://download.moodle.org/downlaod.php/direct/${MY_BRANCH}/${P}.tgz"
+SRC_URI="https://download.moodle.org/download.php/direct/stable400/moodle-4.0.tgz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-3+"
+KEYWORDS="~alpha ~amd64 ~arm ~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.3[${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/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index 78e086571bea..84b7b5ca3ebd 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -2,11 +2,13 @@ AUX php-argon2-en.txt 416 BLAKE2B 9940a3e218d1db382790f4754352594c9098eccce74267
 DIST nextcloud-21.0.5.tar.bz2 127542660 BLAKE2B b6c2bc642705ba5572a74a1f473e09a7be0ad6c4937b1a15d3b29bdad652872c373b9b6ab126c1ea90f32dced3fbb34505c82a7fc9d6913e407c6e43b97fe55b SHA512 ef8796cb17e6143dc1c9ccdea56105d0d7e2138eddae228724074b6360f99d0416a3682be047955b9a84dd6a961cdbb15ccff67ee6656a896699bbfa640d715d
 DIST nextcloud-21.0.9.tar.bz2 128237860 BLAKE2B 665d6c43300a595d745af3a2496e9865c5eedb84d99fcd94266fed8f6fd4889adc7dbbfbdccbd043ce5b68eea1af37f0513dc7b497fd585822bbcdab12507bce SHA512 77028d0064b171addaee9569b5d60b617b3d27ce86791393edcf099c5c2674e1f323932810fcba48869bc6b69e76fe9bdbab60ee02d7664b5fd91062e4e6822d
 DIST nextcloud-22.2.6.tar.bz2 131746258 BLAKE2B 4a259b13beb1c061a0c789b87f7d3fbc82154f4784ce3c616f1d1e1d8d4bb383a46586a1e5c3e30f2545d8447b633c7c5a114dba8d583c0b8a285d69ee762093 SHA512 e221026b08096c7a99043a37300a33f0396f475b121406e4d2c6fe295b4bd3d8d21ecf0c2b5a352b0ca5a66fdb6f882a945ed8ecb2cc5b3c54ad27681d78b3bf
-DIST nextcloud-23.0.0.tar.bz2 138156149 BLAKE2B 2dc00a1b522b51baa368a19628e354a674af1428e062595ccf75cb8541f497c1b2f8ed4f301cc0b5136382526e0e0c6ea1405f2d08a748b8fa2caf95d70c3d89 SHA512 fba9f03c37a4d3f5e44472218fc50a49157872ae7c1aaaa3bc0c1c0301a97394690f75cf03cd11b3f9b0f282fef29eea189fa52ee5019f40a0d6f671ddda6706
+DIST nextcloud-22.2.7.tar.bz2 131669340 BLAKE2B a20aeb22a6ba6d13318821b7b9e1acbbe25cbec9cbb94ed8502dc1bb8369a589404dc7595dc18f51f8fa66c612ed0b0e9869aa1c7211fde9c345a249c7ca7c2e SHA512 cdeafbf9089c42836fffc3b2c7c4898a27e0c5de09b942e6f69a0c70aec570de2386bc45343ad8c71db24401154473d283edb7c442988ba253a87d2cd53064c0
 DIST nextcloud-23.0.3.tar.bz2 139983015 BLAKE2B 271d247d66c80e2b342e435ec5b1a627703e09adc373e52a3bfe0a0802b698759c25904e6c489033ba3f6028155b5c0c5bcbcb2378089eddefe2dd967ecabe4b SHA512 406e9c0615447ffa9f77104e067d1d6b73262d78388e531ebcd8de3a759260a26bf08461997a8513ce910b8de81775d6ccad65a26f38e159014aebf6a555aa23
+DIST nextcloud-23.0.4.tar.bz2 140409123 BLAKE2B 6202ca26c1fd2839cd46651dfb727e20ea8eaab5329aedb905d23817ed3399ce999aff3161f0a6301d558a7acf537b8b54befeabe831e132a56b22bc3c13e635 SHA512 f43acf7c9df6e3105d9085bf9b4c95eebca83812980b933cd57920dec5684c34fe47e8f5395aa7eed806c75f13049790a30b2f8abce8738f9e8a55b24280871f
 EBUILD nextcloud-21.0.5.ebuild 1081 BLAKE2B 89d3edc2aa3f41b8bfc2a1a1d59d886d71c77b41c4681e1abff33471e5a336c4b800872d2f3369325ee15c7b9eafeec51d65e6de113017345753ce416f9e732c SHA512 c5fcae9887cdc570c820c94314319b9c597418be7ad378fa78d7c6a16481fadb850a3d6fb6ba8b0973c46c159fee3f56da9c5e6409ab435258aaab0a824893bc
 EBUILD nextcloud-21.0.9.ebuild 1083 BLAKE2B b036df116d245be11fb8ac26716cb0e26e8a910b05150d5377b10ff84275f48b02c04f4c2b477f06f76564992dbaa391b45555d44714afc306941c3e45586f42 SHA512 46430f577e15de602f40a5470c1d5a13de049d08c7879c144e8bffe7eb32135b294f0f403a2b3cadd54d1fd522892d4937b8d3c049b232533dfc1685f894fe37
 EBUILD nextcloud-22.2.6.ebuild 1083 BLAKE2B b036df116d245be11fb8ac26716cb0e26e8a910b05150d5377b10ff84275f48b02c04f4c2b477f06f76564992dbaa391b45555d44714afc306941c3e45586f42 SHA512 46430f577e15de602f40a5470c1d5a13de049d08c7879c144e8bffe7eb32135b294f0f403a2b3cadd54d1fd522892d4937b8d3c049b232533dfc1685f894fe37
-EBUILD nextcloud-23.0.0.ebuild 1081 BLAKE2B 12416bb95d60bbc1a105a62079176135b65fe17e05b4008991e5c8b17fee813bdefb24dba9911315a54de1fb1325236a59f9ab6b3b8b0e38e4a7bbfb0a044567 SHA512 bfbdc2cc665179a1d4ed9bcaa34c8284bce1e78e2f987cc2f490e8d52b010fe3c1e00e8201e729b895cc45614863731a9d6c3b5dcc72e04604eea530fe63ffc4
+EBUILD nextcloud-22.2.7.ebuild 1083 BLAKE2B b036df116d245be11fb8ac26716cb0e26e8a910b05150d5377b10ff84275f48b02c04f4c2b477f06f76564992dbaa391b45555d44714afc306941c3e45586f42 SHA512 46430f577e15de602f40a5470c1d5a13de049d08c7879c144e8bffe7eb32135b294f0f403a2b3cadd54d1fd522892d4937b8d3c049b232533dfc1685f894fe37
 EBUILD nextcloud-23.0.3.ebuild 1081 BLAKE2B 12416bb95d60bbc1a105a62079176135b65fe17e05b4008991e5c8b17fee813bdefb24dba9911315a54de1fb1325236a59f9ab6b3b8b0e38e4a7bbfb0a044567 SHA512 bfbdc2cc665179a1d4ed9bcaa34c8284bce1e78e2f987cc2f490e8d52b010fe3c1e00e8201e729b895cc45614863731a9d6c3b5dcc72e04604eea530fe63ffc4
+EBUILD nextcloud-23.0.4.ebuild 1083 BLAKE2B b036df116d245be11fb8ac26716cb0e26e8a910b05150d5377b10ff84275f48b02c04f4c2b477f06f76564992dbaa391b45555d44714afc306941c3e45586f42 SHA512 46430f577e15de602f40a5470c1d5a13de049d08c7879c144e8bffe7eb32135b294f0f403a2b3cadd54d1fd522892d4937b8d3c049b232533dfc1685f894fe37
 MISC metadata.xml 645 BLAKE2B 1347bd3fcd02b3e541da305002e905cfc9114307ef1988401e6f8443d54e73b897a37557e4ae1e225ffde3897d6b0d448a0a0859cfab6d81d11b1b9226a734cf SHA512 1aa361e4cf6c13ffa18945645ecf7754721397ef6aa289e56e532435e69d1024e94714907f2c3870b7e0b234f329ec6592e62c69969de69499597f25b64ac0d5
diff --git a/www-apps/nextcloud/nextcloud-23.0.0.ebuild b/www-apps/nextcloud/nextcloud-22.2.7.ebuild
index b398da7a1cb9..b49730459a5f 100644
--- a/www-apps/nextcloud/nextcloud-23.0.0.ebuild
+++ b/www-apps/nextcloud/nextcloud-22.2.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://nextcloud.com/"
 SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
 LICENSE="AGPL-3"
 
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="+curl +imagemagick mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/www-apps/nextcloud/nextcloud-23.0.4.ebuild b/www-apps/nextcloud/nextcloud-23.0.4.ebuild
new file mode 100644
index 000000000000..b49730459a5f
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-23.0.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+DESCRIPTION="Personal cloud that runs on your own server"
+HOMEPAGE="https://nextcloud.com/"
+SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+curl +imagemagick mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
+	imagemagick? ( dev-php/pecl-imagick )
+	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_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
+
+	webapp_src_install
+}
diff --git a/www-apps/novnc/Manifest b/www-apps/novnc/Manifest
index cb690a025e29..b9cbdce80766 100644
--- a/www-apps/novnc/Manifest
+++ b/www-apps/novnc/Manifest
@@ -1,4 +1,4 @@
 DIST novnc-1.2.0.tar.gz 1356408 BLAKE2B a84b767afcdaa641a21943d19ac93c9200074c24c83c899fe2452a82eef526ecd74de92da47b3caa85abe9d51f2fb8d5078f3bf66c0868a241218d22a9088239 SHA512 461490da7bb983e9c94b8ce39f8455ee6609b5a9df8d88254bcc37ebaa5153f5ee9db6afbd88b51762d6d55661bc5cde6fbe70616597583bfce1203e337adf75
-EBUILD novnc-1.2.0.ebuild 1071 BLAKE2B d328588089ea5df84217e3c3b0450fa47965096a438b94977985c73b217999220a64f2ea657a8aa7da3b9e925cfd4592655f2534992e0e640d2050c90dc060f1 SHA512 d712e1025e7cbddef922a1fc2b8d0aea95c101989baa69fee40e83dcaf058697c1129c90fcf61483d2304e6a5a9806c81aa1fe645d16240b43f36557ed5eedb3
-EBUILD novnc-9999.ebuild 1070 BLAKE2B 98db90c393a932c3865d2ae99c197805dbef150af0ecadde787dc4b64e5e872d2f1634d438b98733195eb2b58f0f67e7ac1df3e7accea796670fe42fd6b73d92 SHA512 4aa5830a497c6bd045a5316a06f06e6bc180a2b3803a6b5645a16f5d554d5ffd7499d2029b2421cef51d430e7b6a018743d379bd0d0ef15bc3db72c6769d6444
+EBUILD novnc-1.2.0.ebuild 1078 BLAKE2B 6f4f4b3c6d53c36b6c43319e26038d24323c5a2591ccb1280199bc41750cc159d8af6eea20a7ff7b0939526e33d6d3d521432bbd2d6f08c881f7a389cee1a804 SHA512 41c95a1dc895e8b0e65b7be349ced130900306205ce757c3b911c04c7e3c100cfda9c788799abb7d222e7593d202e107f4bda5811107de772309676c83c31e9d
+EBUILD novnc-9999.ebuild 1077 BLAKE2B 33df3de2f21860fa4ff6b3f488d3a2bd2f03857976b21376ff06441e9da2757fa816537976727f118f8335f706732e5d9724a7cbda4f81284602b673847ad6ae SHA512 ac6c12531f0ea764abd19c24c87355dabda8eada3ca7f1b64c8d7b0fa794ee8ea53c66aa0c2fd75be9c70d665c2e6d2d234d00b2f5671664e2c6809ab23d5138
 MISC metadata.xml 367 BLAKE2B 3c3734e6bec10d5312464c3bf27ba6c3e1cdc7689165b461f617ca3fffd9c95739821c280ae78ea3ab69d6eb2166b82dcee2330c132dee527753522a75df2045 SHA512 13ee4b658e79907c7c59bf69160d41e9db7f7e865329fd03a9be6024b134a9a8a832f7b2b218ea29c647dfcdf3c61d0932c539e6f02117d4192a20fa9f74fc8e
diff --git a/www-apps/novnc/novnc-1.2.0.ebuild b/www-apps/novnc/novnc-1.2.0.ebuild
index 513e5c12f59d..287051b334b2 100644
--- a/www-apps/novnc/novnc-1.2.0.ebuild
+++ b/www-apps/novnc/novnc-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/kanaka/noVNC.git"
 else
 	SRC_URI="https://github.com/kanaka/noVNC/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/noVNC-${PV}"
 fi
 
diff --git a/www-apps/novnc/novnc-9999.ebuild b/www-apps/novnc/novnc-9999.ebuild
index 782515ec8cae..a061cad3709f 100644
--- a/www-apps/novnc/novnc-9999.ebuild
+++ b/www-apps/novnc/novnc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/novnc/noVNC"
 else
 	SRC_URI="https://github.com/kanaka/noVNC/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/noVNC-${PV}"
 fi
 
diff --git a/www-apps/phpsysinfo/Manifest b/www-apps/phpsysinfo/Manifest
index 754ef689e186..0b81a378af99 100644
--- a/www-apps/phpsysinfo/Manifest
+++ b/www-apps/phpsysinfo/Manifest
@@ -1,3 +1,3 @@
 DIST phpsysinfo-3.4.1.tar.gz 980537 BLAKE2B f0924e2855bb682cc6a5be62d35e1a04463e3fdbad75e8f7ee43d0f9cf4ede53091d7495d68a10a3521f6eb3b8460d3458443b840aeee705d5a74fa87b3addf3 SHA512 5e8c82ba95c9f6b4d8dddfdaabbfb676a0c63913a6cd65d6b74ffbe6369830d98cc67c8192cf06c6eaefc8689d1c40b4e1917ea21a1ecd8df7977847e3ede24c
-EBUILD phpsysinfo-3.4.1.ebuild 1668 BLAKE2B 704d2d40657228336a60a6a792257d29f4f02cc588b40c5899687c12f5797e33f1d746097638962d7b7461fef949c80ec33dd986b85173b3ef077db621578985 SHA512 158c135a29f4df0b912bc12d5e7984de888737eb0319a71e021e87b7f8ff15b8007c6419ce8f4b81200828e8e5f9076ad465ef0d66c76b5428ce954d509fc9f5
+EBUILD phpsysinfo-3.4.1.ebuild 1672 BLAKE2B e8bb8ee065d20f4c80d0abf42b1e5e04c8034afbeef9de4563f7f571746c95bd3b6696413e8c1d902f91578a6fc2662deb14c4cf9e59dfbda7d2e83d2bb2b198 SHA512 e2846c442d47dcef189244d2cdbea47847a8e08086159e20c6a8edd9a45495e235f6bf721c94bf43aaa2e9b75bad51573f38f9869c79cec21e17387c1cbf2b8b
 MISC metadata.xml 536 BLAKE2B eeccf1567ef7a9cd2e4eaa17499074b52555896492a20f8dd4f982f9f73f855437127647699d875e9d6b9e3814dd7171d737461991ec6f8ab477a41fa0eb1558 SHA512 6334f650900c7a2d9e5b8458418d7a39915e169001ed665fb2700be1236904996da040dc52f41cba180d6e916e2e852d8013f47c188247abf661ce00e435bfaf
diff --git a/www-apps/phpsysinfo/phpsysinfo-3.4.1.ebuild b/www-apps/phpsysinfo/phpsysinfo-3.4.1.ebuild
index 701e93369f3a..6fcc047b0492 100644
--- a/www-apps/phpsysinfo/phpsysinfo-3.4.1.ebuild
+++ b/www-apps/phpsysinfo/phpsysinfo-3.4.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit optfeature webapp
 
 DESCRIPTION="A customizable PHP script that displays information about your system nicely"
-HOMEPAGE="https://rk4an.github.com/phpsysinfo/"
+HOMEPAGE="https://phpsysinfo.github.io/phpsysinfo/"
 SRC_URI="https://github.com/rk4an/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/www-apps/prewikka/Manifest b/www-apps/prewikka/Manifest
index 4c0c0d16d3e2..387b61872373 100644
--- a/www-apps/prewikka/Manifest
+++ b/www-apps/prewikka/Manifest
@@ -1,4 +1,4 @@
 AUX prewikka-5.2.0-fix_siteconfig.patch 331 BLAKE2B 0aa3a6ce4d31067b1ce38976bfa6081527d760f0b5461494c36a9fccedba2fbf8bf44691090fea285d70c6743fa948708c32561beaea80758fc528bfd71b360d SHA512 9d7c48ffa8f225f6927961a94da2d69b011209c1c69fe98efb3d37343f7ad78774ac8d5b1a56b5831605800471117e34ec0ec49309385976a41557c3713702df
 DIST prewikka-5.2.0.tar.gz 1808717 BLAKE2B 5713b0ce47a3ef137795035ca074410abf9e934c3e9c90b48d127396f0c92e48969e755b48a8519f52cc63bf56e7200c285fb7ad7069f4489cd552eddaa1be5a SHA512 034040e22c2b122289f6af5a2221024585c671327f158e61845feef720c7f70b06a6aa4caaaeba7b48394aa95cd67c45061d97cdaecc3902e26175df9b86c411
-EBUILD prewikka-5.2.0.ebuild 1365 BLAKE2B 1537eadd7ed99c15679dcae5e8cdde44ea4cc09d9dbdc7030b4c18ec48863dd30e378afbaa3a0ca44ce9e7b81e122572015abdb3bee403c452185c59294c76dc SHA512 907ddbb7cb7759f4fb0a7e5c2a903e145874607b6cbe2fa50787d39d42dc6700192b4cbd1a190eeeb445cd293f754c4794d3abc36a8055c7ed6e30220baa07f1
+EBUILD prewikka-5.2.0.ebuild 1358 BLAKE2B ab958dde5680c367dc316f1e7981c782abd881d046c16e984dec5ea909f060843fc4d3625cd555922e9c46163879faeca75ff68b37ae5487c623efab196fc5b4 SHA512 4c6c3456ab23ed7e961517210e69a20a7b2597095ec4f78f6a1a2225600c190f4abce9a057f232d8296e7f2b95947ec70eef2bcfb98301a4cdf4809a41259cfc
 MISC metadata.xml 584 BLAKE2B c13f4e7cf2fbecfb8dac6a4e671328bcc68d922d5b7b06dab0fe63d1e2d1c38a93a6a15e062813f6a7e28953e2e40f27332d19824a0e3951142d755dc631c2da SHA512 6615399a41608faaf3c48540da110f6b547fb4401aeb9aa2f7cf544b62c9065d9ff00e0dec7a728a80ebe9747b5654ddf5093c799c0d858041df679233ed4339
diff --git a/www-apps/prewikka/prewikka-5.2.0.ebuild b/www-apps/prewikka/prewikka-5.2.0.ebuild
index 112641e22195..05a33df39048 100644
--- a/www-apps/prewikka/prewikka-5.2.0.ebuild
+++ b/www-apps/prewikka/prewikka-5.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/libprelude-5.2.0[python,${PYTHON_USEDEP}]
 	dev-python/Babel[${PYTHON_USEDEP}]
 	dev-python/croniter[${PYTHON_USEDEP}]
 	dev-python/gevent[${PYTHON_USEDEP}]
-	dev-python/lark-parser[${PYTHON_USEDEP}]
+	dev-python/lark[${PYTHON_USEDEP}]
 	dev-python/mako[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/www-apps/radicale/Manifest b/www-apps/radicale/Manifest
index a9b96b88482c..4e1b247ba07b 100644
--- a/www-apps/radicale/Manifest
+++ b/www-apps/radicale/Manifest
@@ -1,5 +1,7 @@
 AUX radicale-r3.init.d 531 BLAKE2B 2462a6a9cc3377d82f53f4add662f17dbb06c497876348baed61f12a0be4e1636ecf08059fa4d0d139bbc4e4e9476ff5db2436b23a780a9182ad59488fe1b934 SHA512 37d40c036cc76c12a37677bf14781582b754d17cfc25e56b642235b1ea8d7fd557550a4da595fd539349d33902a70810ebeacda00396767f3b2d12f48c6111e1
 AUX radicale.service 546 BLAKE2B 6d43e9b9aec713a944259e6323442f6796068ede3da5399f9081692b55fa0edc7ec72b35d190ec68f14972374c4da23178e84c7f4ff6df611c1f82e1e0b3029d SHA512 94705c36ddd4de14b608fa71cb8ee4fff3f4f12cf90cfeb3863c334e98ac5d19b34134d26c319d5d05b61efba8370addb87b8b6a6ad7005a17f8bfb35ff9013b
 DIST radicale-3.1.5.tar.gz 136725 BLAKE2B 574032fc9a4010db2de0066758093b74fb29e43c3e8f3328441c92af99827a5f4174ac3ddbc2573083642af4c68073c470ce64ae7689b537a72aa0b813b641b8 SHA512 0febad350e970e4f0ef8199472bb94a81a2a412be2b55c1baee16967b39bf9a5f7b9e8aa7c95a19beedf2f8b2d871382aa0727803432575bff248bc0137adce3
+DIST radicale-3.1.7.tar.gz 137416 BLAKE2B 3192acd1e4ee9a63803bcc7aac7b62ae50a94a88d294f3299508dbd1f7a42cb79ea87dc2675509c1b12f76e75e37635b1a97672db61b09f5dfaefc5bbc1d616e SHA512 04ae2072a90f303dd18de3a2cf6474263ca9650ee87ee72be0d7177ad2f2f61f4860784674bac8dbff2c2679ac45acd03aa38c02b00349f01669c6cf4a474605
 EBUILD radicale-3.1.5.ebuild 2042 BLAKE2B bedce290b9a0ca7d954b4859a67929699d0ceebeaf04352a23c5adb202565d915848a16bf34cc08e68a75c7da05ea97a5ac3bbbc90b9f417223fc92f6e2b50b8 SHA512 d20433b22735284b225eaca5e537b3299a807b039bf2a23f887e206dcd411631747638e4bc77fd5bd73d3195308144b5497295b6a4787721d7503a702a0cac4e
+EBUILD radicale-3.1.7.ebuild 2042 BLAKE2B bedce290b9a0ca7d954b4859a67929699d0ceebeaf04352a23c5adb202565d915848a16bf34cc08e68a75c7da05ea97a5ac3bbbc90b9f417223fc92f6e2b50b8 SHA512 d20433b22735284b225eaca5e537b3299a807b039bf2a23f887e206dcd411631747638e4bc77fd5bd73d3195308144b5497295b6a4787721d7503a702a0cac4e
 MISC metadata.xml 499 BLAKE2B e8aa182ad9b9388d6bbb527bff646b1e816343ddcbc95f8a9ee2eede2272f6470e1d543745c8ab9b907259c3b880332fb6d281e9771ea63696812956195bb277 SHA512 bb9b0a207af851714831c2aca9d020bcc728094c82ad15d519578e31499ff1999741279725ab6c306a25f0e4ccfd8399e39f2b42ca4eb821e677395aea8be842
diff --git a/www-apps/radicale/radicale-3.1.7.ebuild b/www-apps/radicale/radicale-3.1.7.ebuild
new file mode 100644
index 000000000000..113b188e44b1
--- /dev/null
+++ b/www-apps/radicale/radicale-3.1.7.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="A simple CalDAV calendar server"
+HOMEPAGE="https://radicale.org/"
+SRC_URI="https://github.com/Kozea/Radicale/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+MY_P="Radicale-${PV}"
+
+RDEPEND="
+	>=acct-user/radicale-0-r2
+	acct-group/radicale
+	dev-python/bcrypt[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/passlib[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/vobject[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	sys-apps/util-linux
+"
+
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/waitress[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+
+S="${WORKDIR}/${MY_P}"
+
+RDIR=/var/lib/"${PN}"
+
+DOCS=( DOCUMENTATION.md CHANGELOG.md )
+
+src_prepare() {
+	sed -i '/^addopts =/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest radicale/tests/
+}
+
+python_install_all() {
+	rm README* || die
+	# init file
+	newinitd "${FILESDIR}"/radicale-r3.init.d radicale
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	# directories
+	keepdir "${RDIR}"
+	fperms 0750 "${RDIR}"
+	fowners "${PN}:${PN}" "${RDIR}"
+
+	# config file
+	insinto /etc/"${PN}"
+	doins config
+
+	# fcgi and wsgi files
+	exeinto /usr/share/"${PN}"
+	doexe radicale.wsgi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	local _erdir="${EROOT}${RDIR}"
+
+	einfo "A sample WSGI script has been put into ${EROOT}/usr/share/${PN}."
+	einfo "You will also find there an example FastCGI script."
+	if [[ $(stat --format="%U:%G:%a" "${_erdir}") != "${PN}:${PN}:750" ]]
+	then
+		ewarn ""
+		ewarn "Unsafe file permissions detected on ${_erdir}."
+		ewarn "This probably comes from an earlier version of this ebuild."
+		ewarn "To fix run:"
+		ewarn "#  \`chown -R ${PN}:${PN} ${_erdir}\`"
+		ewarn "#  \`chmod 0750 ${_erdir}\`"
+		ewarn "#  \`chmod -R o= ${_erdir}\`"
+	fi
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
committer	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
commit	752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree	330d16e6362a49cbed8875a777fe641a43376cd3 /www-apps
parent	0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)