gentoo resync : 12.03.2021

22 files changed, 91 insertions, 173 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index cc91f77bcff9..5ede305c8890 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 76d42b1f7659..4dc1fc23bc38 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,7 +1,7 @@
 AUX gitea.confd-r1 243 BLAKE2B 87caa8371f53f52b0a85f720342f9f358dedec9240ab78998655a03df6bf3f301fe077afabdca1b1895dbcab2fa05748735d6f38f9b3ad53534fe8ae6e72db49 SHA512 485dc9d0b86d0a7b3ba958aac9de1129aa0ffbb47219419d38811f2accca2539e49dd93cc4a24b21f1c3802b024aa8449f54e320e8a16197f201532edeca6836
 AUX gitea.initd-r3 802 BLAKE2B 2e33e95f7d2762986184d45b0bbb250cc5e04fffc4e4b006233b28e5b57be69eef1d83441adebe2b94681585edaf77f9da4eb97930f91e75c1b1a5cd8d137633 SHA512 5ff2e653180a0601734fcd055dfffdfdc12363736ed2e56c8576c802398b90f4025b44002cbb9a3fd1e0c2d4c169f62d460381c6c549746d3390e55fc1c677d1
 AUX gitea.service-r2 734 BLAKE2B 84825b8198e9495e2803ca3702e6a631fb269c5c8fb4ff4246465a5bd7f7d796b0c3eaea72d0a25cef4f5d38d27a6c99a1b6d41f489749bef322a4ac93cfdd12 SHA512 287670f196bf6353dbdeb6ac37b4ac73693e16a6a3a83f57e7179ccb64364d1d85950a2ddd0a77238a3d218afdaacc8ba849c2810a7ba1238c7277074d1ebe39
-DIST gitea-1.13.2.tar.gz 150862119 BLAKE2B ef0b77c868214ca1c11c868ca2200d79198966e13cbbe515a195706927da6560efcfde875393882bf1637731b2812138ab61bb405cc93467e8701a35edb3bc4a SHA512 33724cd68259b22bbe1f7f2e9e10d2b9fe4cf21b5c6d9bfaa05277b3775e1b31ebd50740713ed448da276a2c41ba66469fc724c72b44f082b0d458b7f00deea1
-EBUILD gitea-1.13.2.ebuild 3459 BLAKE2B 4f0552782f2a6917127e9d0279dd01a586ae93edef050bd218fa9f71b5bf5259d3d60fc5b924b279add899aff3c722efb5a5f765367bf3439314663af2135600 SHA512 addc33481ada8a104d4f87926c4b7a0c4988f08370ce90b673b8827abb112acdbfc37c7c43bf42693101343f458f02bd23d82a1c2c05a6116846747c98a803c0
+DIST gitea-1.13.4.tar.gz 150805886 BLAKE2B c639043cc5afe6f35015b8c5d44f3b46222cf6c418d80f27257bd697d12f1315f126d9406c953047e4d595284649fac0c057fc6e96a210906e839aa76da05b3b SHA512 bfa740214f22fd4e74a236510a8ccafc6369c293e409260ccc598df835c8a7ef552713c6760f4bf4f1b8ba2321ff1e5c7686b010d7bb307da3ff9901147cbea5
+EBUILD gitea-1.13.4.ebuild 3459 BLAKE2B 4f0552782f2a6917127e9d0279dd01a586ae93edef050bd218fa9f71b5bf5259d3d60fc5b924b279add899aff3c722efb5a5f765367bf3439314663af2135600 SHA512 addc33481ada8a104d4f87926c4b7a0c4988f08370ce90b673b8827abb112acdbfc37c7c43bf42693101343f458f02bd23d82a1c2c05a6116846747c98a803c0
 EBUILD gitea-9999.ebuild 3262 BLAKE2B 05a9dd4cc6edbce16bdfc736a5c2cc6b945e8203accf4312a4c3512dc2df035c572388cdb83f4be865a932cfd0edc0e834242a96494757fce598c2360fd8b0bc SHA512 813be6bb8754cb882314aa813d10151a1dfef5d08e30e2b5316818f90192a1427804a1dbdc1e1b4e617353ffaa1d44db4bb3b1dad86b2293334861dcfe23213f
 MISC metadata.xml 639 BLAKE2B ded4337596780b55640ce8db682ac7fcd8b6624147d6f9cf6190d41212b98f77d752b98eb4f6af7e6bbc5472bff5f3eb6ab016325e68e3f2b2284c5b4294d5a3 SHA512 5e6a76f08e5d2161192c35371caeb38f8dc972f478aca0f3f1025852c482f54be9b7ca30dbb1365ac5c7a9902534d74b05d7dc0f21109a752f0446ff5b4191e1
diff --git a/www-apps/gitea/gitea-1.13.2.ebuild b/www-apps/gitea/gitea-1.13.4.ebuild
index a68755728ea8..a68755728ea8 100644
--- a/www-apps/gitea/gitea-1.13.2.ebuild
+++ b/www-apps/gitea/gitea-1.13.4.ebuild
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index d9afc6dc5ad5..11ef89a37961 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -5,6 +5,8 @@ AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
 DIST grafana-bin-7.4.1.tar.gz 51266762 BLAKE2B 8f0cc812e67ea2c91d0b1758a3d675289d6b5bedd42061fb994473073fcb3e174740d7a3546fa2b1482b39425daa45bb817f867deedf85ba56966282ee8aa9cb SHA512 f7d2e91139d32999d43cabb7843a5368eff2af1386bf865ae8aaf9c099c6c24a5b494029e4a5e4f4c7c5ecd5f23e0e0229c82fd5c142a2e01edf2c63239e5cf0
 DIST grafana-bin-7.4.2.tar.gz 51266527 BLAKE2B ce1edd1b1a718fbc8acf5e20218f1d5dc82823e5246ea6504f10c92c6309e7a89cdb270b2fa448554370acc521d5b2eb1ac8d160cb206cd9ba223be849fe4e50 SHA512 404e36d0fa4bbe2b39d6bcba0ab04a92a0f5db5878089c2b972ecb2d7b8a7409aa1b1d1fc81deec620da223b942113500661003804b93f17ddccd38f1f1ad361
+DIST grafana-bin-7.4.3.tar.gz 51268825 BLAKE2B 8af8279eaf30b0235a1bb8d44995ad4bce9c71bf80dbbe67aad91de7c5c4e4cc74ca41feedce07c8f7faf15826753b88ac928b5d04914c6a2be73c5e4f1cc052 SHA512 d841e829ca9b8d66294334b3870cd4ca40385e6896b5a25795f8696498f12ee192ab93c4c5a663bc745f77fb8b3b3d46d6066387c6d70c67177f6bc049abd9e9
 EBUILD grafana-bin-7.4.1.ebuild 1768 BLAKE2B 1b643ac33f03e7a792a334017259deaa2b178ea565987cd9690439b583e5245465533fd1569c3d11b8f3fc34bece619173320cd308e6fa7ff9272df4a87acc7d SHA512 2e5f1f8f588175e72f2b167cc07add05eb33345d48618a2bf0b13a8cfb16a802b906a3d532574c558ee614b9ae7dcae5b105c3cfebecafdc503709771fd32025
 EBUILD grafana-bin-7.4.2.ebuild 1769 BLAKE2B 5a68f16b65e6ef167c4476131b505a9947878b9f64b77e9a52240fff659f2d5ca6a0256c240a32d7d2f1b59505284a5ea974059cecae785ff5d5f0aca5c83e3d SHA512 45afd377bf5400a620744f7ad2daebcf36bd972f98a8baab270c68497d0c28662154bef6a68aac0123e6a1c382c9c77d02a28c7b0ae7a0f0e1ceb9f2a5b89bb5
+EBUILD grafana-bin-7.4.3.ebuild 1769 BLAKE2B 5a68f16b65e6ef167c4476131b505a9947878b9f64b77e9a52240fff659f2d5ca6a0256c240a32d7d2f1b59505284a5ea974059cecae785ff5d5f0aca5c83e3d SHA512 45afd377bf5400a620744f7ad2daebcf36bd972f98a8baab270c68497d0c28662154bef6a68aac0123e6a1c382c9c77d02a28c7b0ae7a0f0e1ceb9f2a5b89bb5
 MISC metadata.xml 218 BLAKE2B 2189d142b4baed0b8edb49fcc98f7397610a257a4cb5f87873272b284f84290420f0950c8b41d1d050ca7a1e0486c6e00344672a3f0479d1d382c14bf7f18485 SHA512 882f7787b97aa780dd3ba4112b9e1dcc84986e2a17704cba9a557ec3a3f9211bcf93532b92d42f60157b56b457ee9ee17e5409066230e54d48931b91bd6786cd
diff --git a/www-apps/grafana-bin/grafana-bin-7.4.3.ebuild b/www-apps/grafana-bin/grafana-bin-7.4.3.ebuild
new file mode 100644
index 000000000000..229e2a789b9e
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-7.4.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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/jekyll-coffeescript/Manifest b/www-apps/jekyll-coffeescript/Manifest
index 1254db922691..94aa8a6688ff 100644
--- a/www-apps/jekyll-coffeescript/Manifest
+++ b/www-apps/jekyll-coffeescript/Manifest
@@ -1,5 +1,3 @@
-DIST jekyll-coffeescript-1.2.2.tar.gz 5963 BLAKE2B d71d343786f855d480694aa9bac99497b21498ed730198d5fef3f309b96bf5924ecefbf0dee9a6e2ecc9272941c58206508dc47ce0b5bd88afab500bdf07b7e3 SHA512 4b531fd69553036bae22c6f9bae2552da13eb6957e122592ebfa9253b260718a6ec66c34dda8fea83d6d2a0e01eea16c65a4915d6c730dbc6ed53632d2eae198
 DIST jekyll-coffeescript-2.0.0.tar.gz 5984 BLAKE2B 2158f138820253a4e181035dcdf7e25ac7ded26ce7b6e6d6fb5f73e18f5c7e8bbeed8b47a8b12c059b2e7e5167e41f0f9645d5d08e85ff8ab52d400b1c4eb3c7 SHA512 31742ff4a9139d56baaa657b8259c1327a3f7ea14465203907b4d98e6c2b70286f5a1a7515140638a2347db86a35645e715a527b4b85fd536176277f7cfa3400
-EBUILD jekyll-coffeescript-1.2.2.ebuild 843 BLAKE2B 26ff2f0fb6bd6e3f86784eb89103b2eaa5d447221e835bb3a6b3454ca113ba80cf6be009eb1c3e08c668b0043e17873ab000c08b0220f51d331569dd5b32aa93 SHA512 e809a9239462376d826e1b7d20c28446d6545c10523410f6318252e4bde476de9006c306bdc65fedeb1c40dd9e6ba72e9db0ded463cb5c520671fa478c84c6ac
 EBUILD jekyll-coffeescript-2.0.0.ebuild 983 BLAKE2B b77b8db45cb5e13fe18a15718e5c1f8fe6f6f063057b140c53989276da4bb20107b52a05852fce612442463f5483961800c34ecd4606d2f56b105ddb08f6766d SHA512 c533d2b279badddc9b1ff5fa54253ab889e65064290172f932e3c44166bfb0dd5be4af38b7563b6a5967497d9c01903783db1d6d44adecfddb17467663945ca9
 MISC metadata.xml 256 BLAKE2B 91077d2e9e84295909405e547aceaa5b70bc6825205a2b4a689568de3bfe2204c7df492d425a0b56ad2ed38e48f9bc59e150a127b92ae9fce5ce713ecfe952cc SHA512 4640ad8626df1f627d4f145caa95d272da5020a1fc7ed591bbbe33e0be47668cd7ce71fbbba73367da76c74f90ccf1ee70b6bc6d9a8936916cdd49907dd58f7b
diff --git a/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.2.2.ebuild b/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.2.2.ebuild
deleted file mode 100644
index df9a1ecfa151..000000000000
--- a/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.2.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/jekyll/jekyll-coffeescript/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="A CoffeeScript Converter for Jekyll"
-HOMEPAGE="https://github.com/jekyll/jekyll-coffeescript"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' Rakefile || die
-	sed -i -e "/^RSpec/i \
-		require 'jekyll'"\
-		-e "/^RSpec/i \
-		require 'jekyll-coffeescript'" spec/spec_helper.rb || die
-}
-
-ruby_add_rdepend ">=dev-ruby/coffee-script-2.2
-	>=dev-ruby/coffee-script-source-1.12"
-ruby_add_bdepend "test? ( www-apps/jekyll )"
diff --git a/www-apps/jekyll-sass-converter/Manifest b/www-apps/jekyll-sass-converter/Manifest
index 9bf80d0c8e6d..a1fa15c45172 100644
--- a/www-apps/jekyll-sass-converter/Manifest
+++ b/www-apps/jekyll-sass-converter/Manifest
@@ -1,5 +1,3 @@
-DIST jekyll-sass-converter-1.5.2.tar.gz 9004 BLAKE2B a5c0e9a3aa51e47efcc7af90682c3fdb5ab23ba8142768afb175c1edaf2edd4feb8a867aebc72d3c89cc39fe40ed1ec7d1334a473d6023c95478411178e33758 SHA512 370ac6bd150a51afc766e4eb065b55d8965e7c39070fd133ea5422db1c559d4bf84d59bd601a3565792fd90a99c32ea1ccb5ecbed0cc8e1a3a343e7923250cb2
 DIST jekyll-sass-converter-2.1.0.tar.gz 13136 BLAKE2B 9a0a477004a1967a51f894f9bdb99f5c311cbfedfa2b1f0ba1aa7756c8550099361d24347bd3ba8d61fdc5c6c0058cc06be0c87145bb52e67fb65348112f5937 SHA512 336420ee5cf099af94c6f6d9a1cf5bae971f4720f625040f722f502acf05b94e17fdfaac4ccab8b1e58768b653df6c4640dfc835a6425a56a41ddfe709e7009d
-EBUILD jekyll-sass-converter-1.5.2.ebuild 709 BLAKE2B 773a9d2288c32fae6494eebd531e83ab41f4aed9c16783545a516eed2dec66104e92bc564fac950587f70c57f2d1ee376e17b8e45fa91662e8399dfb721a03ed SHA512 8a499a2490eba86e0429ab233c1475c1e06a1073a398b57f55e25e1697756a83fb2022f0c49bb137b5d50eb9a8ed2f7d186f5530b546c953218db792e3a5ed64
 EBUILD jekyll-sass-converter-2.1.0.ebuild 957 BLAKE2B 6e1c54410613ce1f60a95b7293470a78886090fb107a4af20399c05c54fdcea6c0343de5204d47290fb08684aaff3d08efa1a0ebf9cec4de7996136ea28a0a37 SHA512 8452ee610271de42ee0e35370b0ea531b999a78d74a9c64ede02e00d8c610a4aa71cc3d08519f4effe82e8c28031a9932c54883186ac2d9be61660ab89ba33df
 MISC metadata.xml 258 BLAKE2B cc80231eeb696b3c37c4ba2e43e7d2313165ec5f95f0e0e087d3059f2d2935ff136263aaa905c33d6b3e3a87a062f1dc46641751333d5c8dc0d5ceed318f05a9 SHA512 2de0f9bdc2f408153b78771d9d4780f407b60dce4063c545cd5151ad13da77e5a61672eceac092405f8ee2cd1cf66bf96a2da301a3696ff3875afd7fc42d4ef3
diff --git a/www-apps/jekyll-sass-converter/jekyll-sass-converter-1.5.2.ebuild b/www-apps/jekyll-sass-converter/jekyll-sass-converter-1.5.2.ebuild
deleted file mode 100644
index 7ae638410e1d..000000000000
--- a/www-apps/jekyll-sass-converter/jekyll-sass-converter-1.5.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A basic Sass converter for Jekyll"
-HOMEPAGE="https://github.com/jekyll/jekyll-sass-converter"
-SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/sass-3.4:* =dev-ruby/sass-3*:*"
-ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
-
-all_ruby_prepare() {
-	sed -i -e "1irequire 'tmpdir'" spec/scss_converter_spec.rb || die
-}
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index fc11a0186374..83ce9eab36d0 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -2,12 +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.1.tgz 57464025 BLAKE2B 55a7f1ba24fa516cdb5f67a936797a5e9450ddd279bd3ea67a3fe4b321019dddae57f928a816374282dd9c08e78281b4835879a1ff5843e1997f61cede1ed05f SHA512 3460857b5e0d524849d30d3d883fc35624cb2afe52184e85cb63477b7b17b8737338b91f6f8b5cd263fa1a3666288c85f8f3b10fcab3669cb5b1e68f6d8e5399
-DIST moodle-3.5.16.tgz 46790181 BLAKE2B 921026617cc435f481ef5533908ca2a809fc63c57365d3cc114acb51ea246ea035d37c63fc64b8cfc25b29250ac2a3e92cbb5c838dce53b6e62971901c73de19 SHA512 ae9b2689a232c48a6d682627271e83460d6d95154f58dd8d1e27a58faec49c1089680378d943b1b45c3ebfa8e1f6cd1b879108b0c79bd9f49aab44e9520690c6
-DIST moodle-3.8.7.tgz 53309020 BLAKE2B 6be85529dd7cd69631b1f2de0873ffb00bb1d50b8165d2198b3ee08a2ffbd34b4e9f3f2b97e956166ffc3617e7c234051c8f43e81838b1470caa7f6b9b2b91c6 SHA512 28cd050bcec988cf235776be8058f1f153a76e7720dd47db16f6c243dc4b542eac230a73e5fa86ca62dea056e9e6a1af71e4b485a7ccc6198b19670900871527
-DIST moodle-3.9.4.tgz 57068491 BLAKE2B 9a7f3c1d5eae206b063e1dc5d471a34f378f8dd5b3f227cd87b2fc2a9c6b7429fab5d803a09a1fe312cbd936b37696aaf4b92ce8cd06b675ad7c891ff03fd518 SHA512 1a5069005aed3f0e1b5620d6c091cb8e9ad9003f95ae9d66055eb52e892feaf54b150942baecdc27a8d2884a349e3b882e16b187a2188e03aca0146abbc75a7a
-EBUILD moodle-3.10.1.ebuild 2809 BLAKE2B 1dcdba6d0f8c9dbcd6dc0697a9e516d1d3a362b44cc792d5cffb97efd6be25670b8263e55ccb2139c74166b164d0e0eb6d32052f51bb1f3e575045ec712d29b2 SHA512 8d5cd9354198ecfae246854cb25cc9b7ac56b6e6230d4f9d240a15a080cef74fabb92447d463644009a12fb0d679285d7348bb1f174cf5861a3ad05052ff5880
-EBUILD moodle-3.5.16.ebuild 2809 BLAKE2B c1c12d463986b66c67949f8a698d1d2b9f994a24c039037ace0e8f9e0cd9c5a154ac0f4506bcee1d9660d2802eae26086921270f235019712b98ca27196e6535 SHA512 1290aede300fdd6697bd4c1ece2cea96acff535542dffea0d4d6a824d879bfcdd85eb9e44c7d4e00f1addbffb11231fa60bacf69c567fa0ebef0c51abe011e82
-EBUILD moodle-3.8.7.ebuild 2809 BLAKE2B 80ceb10f90d8288baa2ebcc639f161e31a546c029f88cf8ada174f8bd097ab97a2afe974f09a9056cab6040a63bf7e7b7b103dc55787134aced82e3e0c3f0d06 SHA512 c3ea934d47623b55c317791542ad5ca09dff19645cc3f34e9edf4795de1e952d1e901523f239102b6896447a4eea0f19a67038227aa829e061f8fc0e2e1d3b11
-EBUILD moodle-3.9.4.ebuild 2809 BLAKE2B 1dcdba6d0f8c9dbcd6dc0697a9e516d1d3a362b44cc792d5cffb97efd6be25670b8263e55ccb2139c74166b164d0e0eb6d32052f51bb1f3e575045ec712d29b2 SHA512 8d5cd9354198ecfae246854cb25cc9b7ac56b6e6230d4f9d240a15a080cef74fabb92447d463644009a12fb0d679285d7348bb1f174cf5861a3ad05052ff5880
+DIST moodle-3.10.2.tgz 57476423 BLAKE2B b842e9ff4b6d2442624cba29bc74b981f57cfb4469d1a60af3a36709c060e682b20bdba7637062b68d57ee2c281b7c90156af3d8f11e6c12b0cde71e2af35c94 SHA512 18b0361eca660235396641ec5126555948439f5064090bc6fd2792ce45462b26d1bf347acfad397b7e219ddf059d95d054c308ca234bf4c25706471ea127926a
+DIST moodle-3.5.17.tgz 46811874 BLAKE2B 2dca8da3647f55afe09686d22bb3cd6a2c39153a060435056167561a9d6c4febcbae99f0c539ea14dca6b239856f3c0271bbafa049aee90395f8deb03d055407 SHA512 dffdf8bd2585ed9aede9e5c018df4ceecbdcbcabb3e5c0953c10b622b71e676bda9abc6295aa53d7fade96c115b24eb473020b5727698fcee3e2c823b1db28cf
+DIST moodle-3.8.8.tgz 53315860 BLAKE2B f0b9f652f8c699fae1fa86ecc89c2719618ae09a007946fec17031a8bba865d45a05249a88dcfec2a01f27b572d59db80297b06bc65a6ecc02484680da3a0825 SHA512 07ee64a3845822329154f343a40d60027509860854b2b3e19d6488b1ca79e8f95d721a2e7f6f284d5764d2b049dba56812144b2ea46581189a91a8271746c3dd
+DIST moodle-3.9.5.tgz 57104678 BLAKE2B 418e857bf0363d1cfac8dbc573b755d419a5e95b1a66d2ab86a159434116b42537366feffa6b8b73089373292be2d94c5995d92e84d43762196ea2dcd4eda846 SHA512 80a91e701df894481b36ea46d60127333d786f4b5e64309f73a8d00d82e62783288ef9e86b5dfbdd4f43afd12fe9e659bab93af8c265b67ea37d504104b05a38
+EBUILD moodle-3.10.2.ebuild 2809 BLAKE2B 1dcdba6d0f8c9dbcd6dc0697a9e516d1d3a362b44cc792d5cffb97efd6be25670b8263e55ccb2139c74166b164d0e0eb6d32052f51bb1f3e575045ec712d29b2 SHA512 8d5cd9354198ecfae246854cb25cc9b7ac56b6e6230d4f9d240a15a080cef74fabb92447d463644009a12fb0d679285d7348bb1f174cf5861a3ad05052ff5880
+EBUILD moodle-3.5.17.ebuild 2809 BLAKE2B c1c12d463986b66c67949f8a698d1d2b9f994a24c039037ace0e8f9e0cd9c5a154ac0f4506bcee1d9660d2802eae26086921270f235019712b98ca27196e6535 SHA512 1290aede300fdd6697bd4c1ece2cea96acff535542dffea0d4d6a824d879bfcdd85eb9e44c7d4e00f1addbffb11231fa60bacf69c567fa0ebef0c51abe011e82
+EBUILD moodle-3.8.8.ebuild 2809 BLAKE2B 80ceb10f90d8288baa2ebcc639f161e31a546c029f88cf8ada174f8bd097ab97a2afe974f09a9056cab6040a63bf7e7b7b103dc55787134aced82e3e0c3f0d06 SHA512 c3ea934d47623b55c317791542ad5ca09dff19645cc3f34e9edf4795de1e952d1e901523f239102b6896447a4eea0f19a67038227aa829e061f8fc0e2e1d3b11
+EBUILD moodle-3.9.5.ebuild 2809 BLAKE2B 1dcdba6d0f8c9dbcd6dc0697a9e516d1d3a362b44cc792d5cffb97efd6be25670b8263e55ccb2139c74166b164d0e0eb6d32052f51bb1f3e575045ec712d29b2 SHA512 8d5cd9354198ecfae246854cb25cc9b7ac56b6e6230d4f9d240a15a080cef74fabb92447d463644009a12fb0d679285d7348bb1f174cf5861a3ad05052ff5880
 MISC metadata.xml 387 BLAKE2B c94976408768e98849655b8679935062d448bd3c9a2b65f165c005556d0a7230717c23577216e61d1d529e2172ad4c19d51223aaf7db07731cf2e1e92b858efe SHA512 bc5bc14f985ea4eba911fb4e411c5caafca175a1859f2535abe5b8fa3ebe45e05ecb9085ffa4dc33bd9f88bc220fbf42f7b1615553f352b742ffb524c482e49a
diff --git a/www-apps/moodle/moodle-3.10.1.ebuild b/www-apps/moodle/moodle-3.10.2.ebuild
index 35d47aa5db46..35d47aa5db46 100644
--- a/www-apps/moodle/moodle-3.10.1.ebuild
+++ b/www-apps/moodle/moodle-3.10.2.ebuild
diff --git a/www-apps/moodle/moodle-3.5.16.ebuild b/www-apps/moodle/moodle-3.5.17.ebuild
index 5b538bc3be85..5b538bc3be85 100644
--- a/www-apps/moodle/moodle-3.5.16.ebuild
+++ b/www-apps/moodle/moodle-3.5.17.ebuild
diff --git a/www-apps/moodle/moodle-3.8.7.ebuild b/www-apps/moodle/moodle-3.8.8.ebuild
index 407eecf4f7f0..407eecf4f7f0 100644
--- a/www-apps/moodle/moodle-3.8.7.ebuild
+++ b/www-apps/moodle/moodle-3.8.8.ebuild
diff --git a/www-apps/moodle/moodle-3.9.4.ebuild b/www-apps/moodle/moodle-3.9.5.ebuild
index 35d47aa5db46..35d47aa5db46 100644
--- a/www-apps/moodle/moodle-3.9.4.ebuild
+++ b/www-apps/moodle/moodle-3.9.5.ebuild
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index 5eaa414f7a97..617c969542f1 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,14 +1,10 @@
 AUX php-argon2-en.txt 416 BLAKE2B 9940a3e218d1db382790f4754352594c9098eccce7426729e75471f017e15bb45b50cc885609e54817077e36d9feb4484bcff5b40c4f669ad80d4d5a643da8bc SHA512 076bbbfb9305a2608b60fb7f9802a5a455c5d049d39c8f209eadac1a306ba2015d11a30b4544d8cdf43025077a3c3087f3e9922cd9b530a08c089a7818590115
-DIST nextcloud-19.0.8.tar.bz2 82313065 BLAKE2B ebea55cdbf935a9df8ea7e8f1f8dfbaefb92d01a7e0fe50bdc2dde4a4fa0e3a9c19e41d95e0cdffb6ceed61060ec7cabfdf3ca1b6728c37f7690cefe39da45f2 SHA512 3ba6c639e5e1c833d0a4d7e46d23424c66af22211b39ff78928987c04d8cffb3d3b5fa6d51e8a043ee919dc8ae2eec7dec221512596e2b34703082ab02da0020
 DIST nextcloud-19.0.9.tar.bz2 82504506 BLAKE2B bcd456b96e778675509f0c3bb900c7489667f723bf9f4680bb9b353f762e2ed7dc0456212d659b71cbb978e222301a1bdc0e46358eb179e125ef93f4206b17c7 SHA512 12c9f3c9938cd37a852008e1490ab892f1adb8b37983cd58fbba7afe0231adaa9fc328c18c15136741eca5f0e2a2048c9cdff17e1ba5d8acc6cc660af99b948d
 DIST nextcloud-20.0.5.tar.bz2 105422202 BLAKE2B 5fdfcd75bdb257d803caec9d563b34527cfc54d55ba93b9912ee4dd9ee41624fcd38fa2fe243313ebd057487d1b53e99e0bc33f57dbab1c860a2ae952d8bedf0 SHA512 8839795e0c31c0bb264888f55c189214b802bc50e096af90530b4ef395e54a29bd3b9a7de5bfabc314ded61fd8ddf79c7d445b4277a46bb342f4273c64bd0219
-DIST nextcloud-20.0.7.tar.bz2 105883310 BLAKE2B 05bf673e9f7d24248c5993db5d28e5a0acb56407c743d77449777b44a2e09ae0006ecab49cc824b3c75700532ab5a77ce492f1cfbf89547aa47eacbb08ba2465 SHA512 24cda9579d24422ea1c72c256ad208e936372077f62a91b3ca4e99ac511127dee5cc128c163174373394883114107cdda52bcb012faa282767710e1365ced3b3
 DIST nextcloud-20.0.8.tar.bz2 104577806 BLAKE2B 97647905fb18e99d1b99f41119fd83f0461f0e5c06dfc29cb91a8178884d9bcdb60a4d02de25b61cd4c64bf2fbb3c0c065358b98a4f88488bb8d458c72672902 SHA512 dd512c3a6f624a20b49743d2ecdfc31c740452bf50fb87f3ab0d6b365ebbfc9004bdc4495e5f378c26085312e138939a6c707f045421e0be6ef2ab881b6c2e66
 DIST nextcloud-21.0.0.tar.bz2 110504725 BLAKE2B 7c583c150f6b315830191329310993582439e7aef57f306b93681d654b8fa7d4d5dafee082befd493aafd2bf6efd940d52ca0ca05b8e42b79a1599ff3e809550 SHA512 a1ae3400f0fb5997e54b0cee821c50d13e4ba0e27c9d11731c8b5233cba564666121a58aed848ccd2593a9783e27db1ed98ff559588a76a1acaeaf083ef4404a
-EBUILD nextcloud-19.0.8.ebuild 1080 BLAKE2B 452ea4bead6e463a6e5999ba2646c155dc2af4f258b11de4a8e22aa8ea6b94584ab734651ec7f7a26e3c9bac43ca2c02b84136d2a269213d3fb577fda5dc081f SHA512 86f65b9384517a04a35dc380a009d0d044aeec73d8a16cb8b54fb97ee13f6940e2166b4b45fc090502d0e18da8ab2463adf22b38ded5008b9060409ee891911b
-EBUILD nextcloud-19.0.9.ebuild 1080 BLAKE2B 452ea4bead6e463a6e5999ba2646c155dc2af4f258b11de4a8e22aa8ea6b94584ab734651ec7f7a26e3c9bac43ca2c02b84136d2a269213d3fb577fda5dc081f SHA512 86f65b9384517a04a35dc380a009d0d044aeec73d8a16cb8b54fb97ee13f6940e2166b4b45fc090502d0e18da8ab2463adf22b38ded5008b9060409ee891911b
-EBUILD nextcloud-20.0.5.ebuild 1078 BLAKE2B 0ee654f01c61ed026136494171d215bb63762edee39d1ed00ae460403462c9186780aa580f58beff98c00baedb69c72337cb941a54d3eef5b5d2ea46413d1d62 SHA512 71630de1135c3c5e5cc9c4b507496010a96786c27f1d16213e75352af0fea3755d7fb81ca033f52fae8f786a73c8594adef707f682bcbea46ae4f1cfdf2b088d
-EBUILD nextcloud-20.0.7.ebuild 1080 BLAKE2B 452ea4bead6e463a6e5999ba2646c155dc2af4f258b11de4a8e22aa8ea6b94584ab734651ec7f7a26e3c9bac43ca2c02b84136d2a269213d3fb577fda5dc081f SHA512 86f65b9384517a04a35dc380a009d0d044aeec73d8a16cb8b54fb97ee13f6940e2166b4b45fc090502d0e18da8ab2463adf22b38ded5008b9060409ee891911b
-EBUILD nextcloud-20.0.8.ebuild 1080 BLAKE2B 452ea4bead6e463a6e5999ba2646c155dc2af4f258b11de4a8e22aa8ea6b94584ab734651ec7f7a26e3c9bac43ca2c02b84136d2a269213d3fb577fda5dc081f SHA512 86f65b9384517a04a35dc380a009d0d044aeec73d8a16cb8b54fb97ee13f6940e2166b4b45fc090502d0e18da8ab2463adf22b38ded5008b9060409ee891911b
-EBUILD nextcloud-21.0.0.ebuild 1080 BLAKE2B 452ea4bead6e463a6e5999ba2646c155dc2af4f258b11de4a8e22aa8ea6b94584ab734651ec7f7a26e3c9bac43ca2c02b84136d2a269213d3fb577fda5dc081f SHA512 86f65b9384517a04a35dc380a009d0d044aeec73d8a16cb8b54fb97ee13f6940e2166b4b45fc090502d0e18da8ab2463adf22b38ded5008b9060409ee891911b
-MISC metadata.xml 475 BLAKE2B 74871cad366634084aef18e597f13073b53e1716ab6d1f8c5fb9e63a3150670167982c60bcae5d8dbada774ba374c686f33dd5eafbd7b0571449ea9a13e0cab0 SHA512 5196408ac6cd288b3989e64ad0a1b3dea869c46377c13ded4b4f0b6e0527825e4036dffdf54230482218b0fa3e1a623463888986d64fad1b997fe35dfde7c302
+EBUILD nextcloud-19.0.9.ebuild 1083 BLAKE2B 0e18f62655dfa0bdf7a81f5280be99c34c876a8c57e66e206e1c7e43e0cf93745cda3247f05da592fc5882e872e8249dac9391f22648940fe95e8cd2bc158422 SHA512 e0d8a192c51901913a40521b5259c7276356b8c15246c5df193c4a4a5b0652034148dd971c5014a72f378d4449b778e5867030f9ec3d8ad9bf42efa955ce63c5
+EBUILD nextcloud-20.0.5.ebuild 1081 BLAKE2B 51166655fca8673a06762990e4cd9770655e2fe027e51a2a51b4ae3a1a05f020f5a863d415d132ef7d0974654170205879c4d4eded787195490d8abb7cf2249a SHA512 a198ebbb7005113bb1f2eec73ef7ca56e7c1831da6dc1eacc5a942ae59344d8d10f1c6f8467db6e430359e9dcdc807de21e90ea7269f795d088ec9618708ea5a
+EBUILD nextcloud-20.0.8.ebuild 1081 BLAKE2B 51166655fca8673a06762990e4cd9770655e2fe027e51a2a51b4ae3a1a05f020f5a863d415d132ef7d0974654170205879c4d4eded787195490d8abb7cf2249a SHA512 a198ebbb7005113bb1f2eec73ef7ca56e7c1831da6dc1eacc5a942ae59344d8d10f1c6f8467db6e430359e9dcdc807de21e90ea7269f795d088ec9618708ea5a
+EBUILD nextcloud-21.0.0.ebuild 1083 BLAKE2B e6abe80192e7a00277126f901c655f1eab03544572da0071c0734ece0a4a5574d2fcbd7f06f935ccf61a91640a8ca549c3bc359c68103f7f46632fef89d62322 SHA512 9fe6b70447bd9e4d3678eaaca5174586a1a96c0e4763ccd30f9749410892b78c59087c06c0fe42372e6126bf5c7fb5973ed0ead0c664c2040abffd5e7951dfe6
+MISC metadata.xml 644 BLAKE2B 893952d31b289d07befd82be0d9998df95149363a0bfcfbb64626d8679b67048017a520fe65e5eb14224432a98efbb726e866c95562de23f2dc650df90df5371 SHA512 ec4bcd3ea472df2201830ac14e6dbc01a8317fc8ad8eadd5231014c49a07151ed7647b6d87c22a62df9a2f67d8c2911d44b504a612c9f446228f9a227e6bed7b
diff --git a/www-apps/nextcloud/metadata.xml b/www-apps/nextcloud/metadata.xml
index 014af3e2ccf3..d5f3dce55dd1 100644
--- a/www-apps/nextcloud/metadata.xml
+++ b/www-apps/nextcloud/metadata.xml
@@ -13,4 +13,9 @@
 		<email>web-apps@gentoo.org</email>
 		<name>Gentoo Webapps</name>
 	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<bugs-to>https://github.com/nextcloud/server/issues</bugs-to>
+		<remote-id type="github">nextcloud/server</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/nextcloud/nextcloud-19.0.8.ebuild b/www-apps/nextcloud/nextcloud-19.0.8.ebuild
deleted file mode 100644
index 0aa3ba1808c6..000000000000
--- a/www-apps/nextcloud/nextcloud-19.0.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 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/nextcloud/nextcloud-19.0.9.ebuild b/www-apps/nextcloud/nextcloud-19.0.9.ebuild
index 0aa3ba1808c6..2aebb2320d5d 100644
--- a/www-apps/nextcloud/nextcloud-19.0.9.ebuild
+++ b/www-apps/nextcloud/nextcloud-19.0.9.ebuild
@@ -15,7 +15,7 @@ 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]
+RDEPEND="<dev-lang/php-8[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"
 
diff --git a/www-apps/nextcloud/nextcloud-20.0.5.ebuild b/www-apps/nextcloud/nextcloud-20.0.5.ebuild
index 7de14adb136e..db622aa5e6ab 100644
--- a/www-apps/nextcloud/nextcloud-20.0.5.ebuild
+++ b/www-apps/nextcloud/nextcloud-20.0.5.ebuild
@@ -15,7 +15,7 @@ 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]
+RDEPEND="<dev-lang/php-8[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"
 
diff --git a/www-apps/nextcloud/nextcloud-20.0.7.ebuild b/www-apps/nextcloud/nextcloud-20.0.7.ebuild
deleted file mode 100644
index 0aa3ba1808c6..000000000000
--- a/www-apps/nextcloud/nextcloud-20.0.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 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/nextcloud/nextcloud-20.0.8.ebuild b/www-apps/nextcloud/nextcloud-20.0.8.ebuild
index 0aa3ba1808c6..db622aa5e6ab 100644
--- a/www-apps/nextcloud/nextcloud-20.0.8.ebuild
+++ b/www-apps/nextcloud/nextcloud-20.0.8.ebuild
@@ -10,12 +10,12 @@ 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 )"
 
 DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
+RDEPEND="<dev-lang/php-8[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"
 
diff --git a/www-apps/nextcloud/nextcloud-21.0.0.ebuild b/www-apps/nextcloud/nextcloud-21.0.0.ebuild
index 0aa3ba1808c6..ab3ba8e01bc4 100644
--- a/www-apps/nextcloud/nextcloud-21.0.0.ebuild
+++ b/www-apps/nextcloud/nextcloud-21.0.0.ebuild
@@ -15,7 +15,7 @@ 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]
+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"