gentoo resync : 18.12.2020

13 files changed, 26 insertions, 64 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index d97cdb7350a5..515ca1619132 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/airdcpp-webui/Manifest b/www-apps/airdcpp-webui/Manifest
index 6092cdfcfd79..791ebd7c136d 100644
--- a/www-apps/airdcpp-webui/Manifest
+++ b/www-apps/airdcpp-webui/Manifest
@@ -1,5 +1,3 @@
 DIST airdcpp-webui-2.10.0.tgz 8135065 BLAKE2B a14cd4be3745386ef05d4bdb96b0f60b10d55abeb734f752cacba44a34e9e7615c26a52136c93fb1965c31fb36f5eadfebac0aa84b73f9cd4c36190b11a69fbd SHA512 7dcd8261be48e570e125cd3b31738fa7b5970fd78c15f86c78abc929801cc86d0e56909d7c653394575e156513a6454094708c22d2241ba6541a1350fcce2085
-DIST airdcpp-webui-2.9.0.tgz 7891520 BLAKE2B ca597a1b0c844abb6b220d5241842dad6f68686f2aa8b250b094fd6baebd0697abe5019c4d7f0b3213398b056d8fa1b4d5d7e55bd9bf30245eb737c37cbb20b7 SHA512 7a80077f7e56c1ebb5dc2e358e6866021b308d05306d1716e2e5c6f3b64f9f65aa5f88a44cae228671665eb413e8ba7ae842de9f94fa7a8ab967a8b36903e2bb
 EBUILD airdcpp-webui-2.10.0.ebuild 466 BLAKE2B 653bbb9da8b78f84fbae7427681388e8eed36969eec8af7e8275aadceda156900fffd87dc5a88d7ca47312b1b368a9ecaf8fd8b042b3125259440121cb5ccb67 SHA512 c0303de5e61ac84b3590b58a973cccf1eed9905d3797f2fda2a9725a4c0f041ad1c34be332c06ae4fc7a01c8ee202c9202b1365281169b569fbd509fa241aacd
-EBUILD airdcpp-webui-2.9.0.ebuild 466 BLAKE2B 653bbb9da8b78f84fbae7427681388e8eed36969eec8af7e8275aadceda156900fffd87dc5a88d7ca47312b1b368a9ecaf8fd8b042b3125259440121cb5ccb67 SHA512 c0303de5e61ac84b3590b58a973cccf1eed9905d3797f2fda2a9725a4c0f041ad1c34be332c06ae4fc7a01c8ee202c9202b1365281169b569fbd509fa241aacd
 MISC metadata.xml 412 BLAKE2B efb72e215a563fe22c3c504c57f91260b0df156d1124d0909d8ade9165fb8fc684868c6ee889c75d014c19c9fbe148cf1e86664c01c83961854d222bb0efa393 SHA512 1ed885a9c0b93fdff82ebe5cb5d7cdadf729829f767e1db18e7c510c816b96b95755f7ee54017fa8de76786b0b0d23b53993c2db7937b40f98eccf1c01465367
diff --git a/www-apps/airdcpp-webui/airdcpp-webui-2.9.0.ebuild b/www-apps/airdcpp-webui/airdcpp-webui-2.9.0.ebuild
deleted file mode 100644
index aed6a3249e7e..000000000000
--- a/www-apps/airdcpp-webui/airdcpp-webui-2.9.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Web interface for airdcpp-webclient"
-HOMEPAGE="https://airdcpp-web.github.io/"
-SRC_URI="https://registry.npmjs.org/${PN}/-/${P}.tgz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="=net-p2p/airdcpp-webclient-${PV%.*}*"
-
-S="${WORKDIR}/package"
-
-src_install() {
-	insinto "/usr/share/airdcpp/web-resources"
-	doins -r dist/.
-}
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index fdea72e44bd1..5bee3a538223 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,8 +1,7 @@
-AUX 1.12-fix-vendoring.patch 430 BLAKE2B 897214736e27f49023c8de9da5e7caa3612947f381d10e1bfd9fca2a6f4cfdcefb7fd6a70fb972e9db1c8a84deb592f585d0c6beda66b551b6e65cdce33e73d6 SHA512 9b2678c373dfb18e53be53b99e2cebdb656f777f850c6f9b67e29d52011edc320fb7d14045fef08b0b3b70959784070264f1cdfae70937097977b2865c8c71b5
 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.12.6.tar.gz 135134376 BLAKE2B 762f5403a9c5524182c717d6d028ad7fae2ce01d66960635d5e3d1e0ad9027c431efb3604a89061d5354ac126eea8e412b52d9c9d1243b1dc56b9ecbabd2e7db SHA512 c581f84ffe793b80e445c70f3e60ed54a663ef2b2579959b4f1bd4ce5aa0f470ef6d6b13476cc920e615e18ef79ff461896c75ce8282f9b774e939dbbe1f2a49
-EBUILD gitea-1.12.6.ebuild 3625 BLAKE2B e7f8ffd05f79982a5b8a7e2d44e1a25c702e1b32ab7993a083ade16b06be5723920014adace64212e96f43a93108b5f6c8b6524351c2f35de5c63e9395bbd461 SHA512 840e3737d07ee8be438e22bb1b4781715ed439fcd9eeda598d06c4793505b6caacf58e49bccdf1677a9d363b63aedc78705541238ac386175a76b657dd7f6909
-EBUILD gitea-9999.ebuild 3235 BLAKE2B 893edb722e2f4de3054d8bc3744414a0dca088ecb9b1cfd25bd24a839f0da9653df401db84dfd46221d3d60b3a1010f48d1ff9a3528c5b8035717faf1be8d262 SHA512 5fbfdd2d1ee6bedbb70fd23180d0473d6ddee629ad06225298c4a170a5c3198896f663033cfc0db84b02098b181a2f0f29d120799e3c7cf222de175b29888e4a
+DIST gitea-1.13.0.tar.gz 150897624 BLAKE2B b09d3a695a399bfff813f45faf7435eb0b512d448e8329142d8131be786e0dee822a8491c58c8537545350162c89db39cbaaa0ba58c467f2494137f1313a9fec SHA512 bdcc1d3f53ba2b8a6c9964bc15449d3ea237853dfeb2f1da1e4c9f68fb5f09188b3fcef9a1c004ea774003181a85758eb95cff909cc39f6caa611b0505628739
+EBUILD gitea-1.13.0.ebuild 3459 BLAKE2B 97f83d95d87b47f368eb6545483ac1603e4ae6b98fe119680b4dfcec309ff7906df5a20a1df8575a7dfa746fa692c89a2c8855e455a6edf4c32049fba40f9580 SHA512 c7a7fd93a7d01b266ebb1a97397f5b13c02eaae28ac920735762d7bcfaeb3949162ad7abb0485169f8d08a1be52da299795bc3e036761b5d6d761ef88be5681d
+EBUILD gitea-9999.ebuild 3262 BLAKE2B 9dfea3dc2ed67430e81fc38df9ac0643188dba9a6e29bca2c692c221885ed5a8536f6f51e3d53d60b9f956a2c7219b4236edeff5941ea08fe5125ea0cd1d1b8b SHA512 e591905d1bf58ff36456b5ebddac50cc0145de4164031903a8b549dc1ed1dacd2d6b84653ad97710166bd79d44e1fa0a7df90700224cadeb05299d17be665fd3
 MISC metadata.xml 639 BLAKE2B ded4337596780b55640ce8db682ac7fcd8b6624147d6f9cf6190d41212b98f77d752b98eb4f6af7e6bbc5472bff5f3eb6ab016325e68e3f2b2284c5b4294d5a3 SHA512 5e6a76f08e5d2161192c35371caeb38f8dc972f478aca0f3f1025852c482f54be9b7ca30dbb1365ac5c7a9902534d74b05d7dc0f21109a752f0446ff5b4191e1
diff --git a/www-apps/gitea/files/1.12-fix-vendoring.patch b/www-apps/gitea/files/1.12-fix-vendoring.patch
deleted file mode 100644
index 9baff97307a0..000000000000
--- a/www-apps/gitea/files/1.12-fix-vendoring.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/vendor/modules.txt b/vendor/modules.txt
-index efbc866..1c34104 100644
---- a/vendor/modules.txt
-+++ b/vendor/modules.txt
-@@ -845,6 +845,8 @@ gopkg.in/yaml.v2
- # mvdan.cc/xurls/v2 v2.1.0
- ## explicit
- mvdan.cc/xurls/v2
-+# src.techknowlogick.com/xgo v0.0.0-20200602060627-a09175ea9056
-+## explicit
- # strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251
- ## explicit
- strk.kbt.io/projects/go/libravatar
diff --git a/www-apps/gitea/gitea-1.12.6.ebuild b/www-apps/gitea/gitea-1.13.0.ebuild
index f4f0af94aa84..7bb52ed548ee 100644
--- a/www-apps/gitea/gitea-1.12.6.ebuild
+++ b/www-apps/gitea/gitea-1.13.0.ebuild
@@ -33,14 +33,11 @@ RDEPEND="${COMMON_DEPEND}
 	dev-vcs/git"
 
 DOCS=(
-	custom/conf/app.ini.sample CONTRIBUTING.md README.md
+	custom/conf/app.example.ini CONTRIBUTING.md README.md
 )
 FILECAPS=(
 	cap_net_bind_service+ep usr/bin/gitea
 )
-PATCHES=(
-	"${FILESDIR}/1.12-fix-vendoring.patch"
-)
 
 RESTRICT="test"
 QA_PRESTRIPPED="usr/bin/gitea"
@@ -49,7 +46,6 @@ src_prepare() {
 	default
 
 	local sedcmds=(
-		-e "s#^RUN_MODE = dev#RUN_MODE = prod#"
 		-e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"
 		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"
 		-e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#"
@@ -58,13 +54,11 @@ src_prepare() {
 		-e "s#^LEVEL = Trace#LEVEL = Info#"
 		-e "s#^LOG_SQL = true#LOG_SQL = false#"
 		-e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
-		-e "s#^APP_ID =#;APP_ID =#"
-		-e "s#^TRUSTED_FACETS =#;TRUSTED_FACETS =#"
 	)
 
-	sed -i "${sedcmds[@]}" custom/conf/app.ini.sample || die
+	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.ini.sample || die
+		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.example.ini || die
 	fi
 
 	einfo "Remove tests which are known to fail with network-sandbox enabled."
@@ -117,7 +111,7 @@ src_install() {
 	systemd_newunit "${FILESDIR}"/gitea.service-r2 gitea.service
 
 	insinto /etc/gitea
-	newins custom/conf/app.ini.sample app.ini
+	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}
diff --git a/www-apps/gitea/gitea-9999.ebuild b/www-apps/gitea/gitea-9999.ebuild
index 672af6461ca6..d6f5cfcf5a8e 100644
--- a/www-apps/gitea/gitea-9999.ebuild
+++ b/www-apps/gitea/gitea-9999.ebuild
@@ -33,17 +33,19 @@ RDEPEND="${COMMON_DEPEND}
 	dev-vcs/git"
 
 DOCS=(
-	custom/conf/app.ini.sample CONTRIBUTING.md README.md
+	custom/conf/app.example.ini CONTRIBUTING.md README.md
 )
 FILECAPS=(
 	cap_net_bind_service+ep usr/bin/gitea
 )
 
+RESTRICT="test"
+QA_PRESTRIPPED="usr/bin/gitea"
+
 src_prepare() {
 	default
 
 	local sedcmds=(
-		-e "s#^RUN_MODE = dev#RUN_MODE = prod#"
 		-e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"
 		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"
 		-e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#"
@@ -52,13 +54,11 @@ src_prepare() {
 		-e "s#^LEVEL = Trace#LEVEL = Info#"
 		-e "s#^LOG_SQL = true#LOG_SQL = false#"
 		-e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
-		-e "s#^APP_ID =#;APP_ID =#"
-		-e "s#^TRUSTED_FACETS =#;TRUSTED_FACETS =#"
 	)
 
-	sed -i "${sedcmds[@]}" custom/conf/app.ini.sample || die
+	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.ini.sample || die
+		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.example.ini || die
 	fi
 
 	einfo "Remove tests which are known to fail with network-sandbox enabled."
@@ -104,7 +104,7 @@ src_install() {
 	systemd_newunit "${FILESDIR}"/gitea.service-r2 gitea.service
 
 	insinto /etc/gitea
-	newins custom/conf/app.ini.sample app.ini
+	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}
@@ -114,3 +114,9 @@ src_install() {
 		keepdir /var/log/gitea
 	fi
 }
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	go-module_pkg_postinst
+	tmpfiles_process gitea.conf
+}
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index cfdc20f8deea..b144c16b85fe 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -4,16 +4,16 @@ DIST nextcloud-18.0.12.tar.bz2 95691445 BLAKE2B 3c10ca58de3a65f30f9dd28752844e7b
 DIST nextcloud-19.0.4.tar.bz2 98094038 BLAKE2B 3970c85d74383bc1d031dc0a8cc48755612021a4263e1169637316ea05fe33788af6930938ca25cd49fbd3f601738176aea898ea0acda170b8601403853b4d54 SHA512 e128397ebe67c70f6ce2846f12f43a4927a1ef48ba69799494f10e7a4481c578239c7f6442b5310d8fba42779b619603e1044bed044b322dce363d3eceaef7a9
 DIST nextcloud-19.0.5.tar.bz2 98289833 BLAKE2B 79ef75778128f0b4b9b2bec0ebb0e80fc4722a99c06413040cdf3a406c6ae2fe44bfa172760615b15e0d2772b0c49d573f303bd3286c467b6c193391d0e4ed80 SHA512 c7057c353dc50c68d8b2b9afb8dd8d93b1029893438cdbc3fb253e2126c670163dbe60d2afca85899e6abb819b8ea304f5094ffc683b4c6710398c97e93bc152
 DIST nextcloud-19.0.6.tar.bz2 98375846 BLAKE2B d93eeac7ccadbea53663c5f215a5b745e34251655691bc39f00466781b5b6cfaea1ae2d8cd65ff61c7fcd6e754757d74f758a2d0b198c1c3cc9183ddc5d5ec21 SHA512 a8b33fb106809fc071399229e8af201d31be85cf28f0ab447a23b77067afe85b093031c15b01d14e811bf82fcfc28c30727ae773f7be9047d10a224b122d2590
-DIST nextcloud-20.0.1.tar.bz2 120287967 BLAKE2B baa48249bed9de3facba4158da0e46ffffbb60d4cd1cf6073ccad051d04baeac3abf3d958caad1b0a1d891fec0569f1fb3cff290e65030437546bc81ddc22e33 SHA512 9e343872b00578c442d11da81d5d97d46b70df3a86b2d081283fb8670301792bc0f977f4b854ebc2b505b8c00bd8a70170b0ce721493dcad3ae6ef0cdd3e4ddc
 DIST nextcloud-20.0.2.tar.bz2 119446810 BLAKE2B 5ddac99a4b9a7bc4185d2a8987b4ccdabed24ae872235444462b520771aec8b74a041ed74dba7ea8fda838c7ede1f5e9554483ac00170a13f0ae8c943c3c86bd SHA512 bc06d5b312c974f60cdd9fe7c69566a93445dee1a89023442b43c02984aedd3e2ad8aea7f3fe365a0a4114d545ad91cf0de0ac1483c808425bf2c7aeefd1ac9f
 DIST nextcloud-20.0.3.tar.bz2 119801638 BLAKE2B f23c946ffcf24b9b28016ee9ee159b2539ea0ab25559e7b5102c7c088b987b6a06483d680cd8586cc855e0f03ff50ca6cd79bc10c994bb0c91a1a13b88c2efab SHA512 0876ce633291e4ef6ae26ef2b1221a481f3be060460d02e484920b13f6e3cda8e4e466945d660745248f6777adb7e550a986f73a4ec49a69a098eccc90890cd1
+DIST nextcloud-20.0.4.tar.bz2 119997124 BLAKE2B e4ffac2f47e8aee89580b47e92326625c034bbf9a042b7d488da8ca3e43fc789bca0eb5efbc97e60ce74275a01d4535bfd8d509385ebcba48710b6f0cf9fad85 SHA512 15646175a6139ea22219df10805946f643397faf708e6808838227412e6d06b5224d18675d21d3c057d543ae179fb8626e68f412d6fe9bd758362d7a1023daff
 EBUILD nextcloud-18.0.10.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
 EBUILD nextcloud-18.0.11.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
 EBUILD nextcloud-18.0.12.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
 EBUILD nextcloud-19.0.4.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
 EBUILD nextcloud-19.0.5.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
 EBUILD nextcloud-19.0.6.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
-EBUILD nextcloud-20.0.1.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
 EBUILD nextcloud-20.0.2.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
 EBUILD nextcloud-20.0.3.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
+EBUILD nextcloud-20.0.4.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
 MISC metadata.xml 475 BLAKE2B 74871cad366634084aef18e597f13073b53e1716ab6d1f8c5fb9e63a3150670167982c60bcae5d8dbada774ba374c686f33dd5eafbd7b0571449ea9a13e0cab0 SHA512 5196408ac6cd288b3989e64ad0a1b3dea869c46377c13ded4b4f0b6e0527825e4036dffdf54230482218b0fa3e1a623463888986d64fad1b997fe35dfde7c302
diff --git a/www-apps/nextcloud/nextcloud-20.0.1.ebuild b/www-apps/nextcloud/nextcloud-20.0.4.ebuild
index de1b7898efdf..de1b7898efdf 100644
--- a/www-apps/nextcloud/nextcloud-20.0.1.ebuild
+++ b/www-apps/nextcloud/nextcloud-20.0.4.ebuild
diff --git a/www-apps/phpsysinfo/Manifest b/www-apps/phpsysinfo/Manifest
index fadade8d1b09..962c39fd9b7b 100644
--- a/www-apps/phpsysinfo/Manifest
+++ b/www-apps/phpsysinfo/Manifest
@@ -1,3 +1,3 @@
 DIST phpsysinfo-3.3.2.tar.gz 891158 BLAKE2B 40428647a502f9861f89a490a10e95bef0fdf306d2ee27507b4f396ee7371ca3d75b7259db53b8501b127fb525dce283cb8c73e50172b5b2a78fc490fc7f658a SHA512 33f76436d6ba1aa76a4c7e7dba84f5d4bf458b505df47d65ff9f1ffecc4db48a853c9cdb8583019e70c4d0b54c184ae6d48968f3ed820a711804095a5fc31b07
-EBUILD phpsysinfo-3.3.2.ebuild 1679 BLAKE2B ac561c52adc88b50e96d8417946a45b92c4a559a8467c314252263f7073a727beddf5e38b03af1cf949eb34efe9d1467b044d46de2bedbf1c9745aedd2c20f2f SHA512 1cfadb62bbe44af65a7e9532f9545e965613b70d874bede2e5a0c908f06261114606653304df637992dbeed1e8240ff005133a0e6567ac6a22ad9c2590b1a87b
+EBUILD phpsysinfo-3.3.2.ebuild 1680 BLAKE2B 0b6d1d90d01ceb50736042ee13cf800f577a958ff1326f4918ace512cf8179d158c29e5fe3332f8a3aaf76002f2b27d3ada183648004c48803af6c8ac82e3814 SHA512 e93f3f6affef0bcb7f6eabebd15156b4e5558eec86abbdaff6319a6eda2d03d4be60c9bff5ed495d9d31cee65f8e34972a7519bd2451ee5649231ecb14ea6b0a
 MISC metadata.xml 511 BLAKE2B 3139dd25eebac631793e015cb1db6e41d64c5a3e9a75f61f340d0f1ba73b99d304716dfca4b0f0f51baf0f46a740312bb198c52aa625f5b838e6ae10f341a8e1 SHA512 59fd8766c9545193c86374e1dd05d0a08e1f5c548f4297ad4fe22acbd4ba36aa4ae46ccf6f497bfae1a7e015cf95a5f51fb417266c21cf5b5201eac31b543d41
diff --git a/www-apps/phpsysinfo/phpsysinfo-3.3.2.ebuild b/www-apps/phpsysinfo/phpsysinfo-3.3.2.ebuild
index add7f99210ee..375b614eaee1 100644
--- a/www-apps/phpsysinfo/phpsysinfo-3.3.2.ebuild
+++ b/www-apps/phpsysinfo/phpsysinfo-3.3.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://rk4an.github.com/phpsysinfo/"
 SRC_URI="https://github.com/rk4an/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64 hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 RDEPEND="
 	dev-lang/php[simplexml,xml,xsl(+),xslt(+),unicode]
 	virtual/httpd-php
diff --git a/www-apps/webmcp/Manifest b/www-apps/webmcp/Manifest
index e55dcd1d0875..95c3ccdc6667 100644
--- a/www-apps/webmcp/Manifest
+++ b/www-apps/webmcp/Manifest
@@ -1,4 +1,4 @@
 AUX webmcp-1.2.6-gentoo.patch 5156 BLAKE2B 4d0680753a83422483c33909b692bc6a0fdd146216889aa83e6a9b99a15bf92920913330de12f2e2125b976214753ec4853b7dd48dabf8c2a0c88fb9b7d1ada5 SHA512 7e57b4f5f32f280198e8c6e01c21ed1414af3bf87a77022af37e3d144576a7d23c9f912e7f41282ef6d984f4323af1dbdda472cfe076fc62a6ee1a47d0529a7c
 DIST webmcp-v1.2.6.tar.gz 132283 BLAKE2B ed5539b91eeb809a1e19b98f2dc8888c055ec547c95c53c0ea9232531bf9b8432ba6a0ad566a1d2fecbdcc056a52e42e99b973741fc44f923ea88369393c5ade SHA512 a233c312f85851c690f9b020e5df1fffb548c708199279021f384a36cf6e2b73a9b7bc2343c886ccc0e18aecf6d205e2a699fa2398b9bf0da587bc4f8a8f8556
-EBUILD webmcp-1.2.6.ebuild 1432 BLAKE2B 832f15b3399e1cba3d6bd4b02f39d82b9ea84a0faee696ff3aab28d6e7714149233e0e783357b378ee7c80181b09dfc1cccb006e8643a60d28be9bab3602381c SHA512 16ecf95e1b4476cc028d8266f0e6a99f0e21da57b5139037e155acf57d7586d6ae6752210a308023d460e61c77c5aaf6bf988625149f8cbe299a762616d8e4bd
+EBUILD webmcp-1.2.6.ebuild 1433 BLAKE2B 2992e27650896416405f9315e295d030062f271c9392973a09d935f0dbed619cc80912535b33baba8b320eb7bb9927053e38b0077b9390e0eac66baf9d6f7f61 SHA512 96ecc61450f7de7fb280fb6ea1ffb1f906e7c27245dacc1bc5e31d8c864639af4b8d572416eaa1fb46160371dd268a6065a1c11377433a793c8f293670c1a847
 MISC metadata.xml 821 BLAKE2B a116a4db4b1be4a6a860805b866e735633b1ee8031cc0750e9843c201fe5b1d36657f845d0e9fc1e3871ab091601b85996b4ebd5b224ea1fa6139ffc0e6fd8a2 SHA512 68b0741c84f5a93b26b89e56093b9554727ef375ed77e189cdeb62e12dc0a1b8506b56885be46c637e03b388830467eeac3f11511f49668d74dd36ff15f380e8
diff --git a/www-apps/webmcp/webmcp-1.2.6.ebuild b/www-apps/webmcp/webmcp-1.2.6.ebuild
index 117dd6461db2..70f63e2a0bd3 100644
--- a/www-apps/webmcp/webmcp-1.2.6.ebuild
+++ b/www-apps/webmcp/webmcp-1.2.6.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64"
 SLOT=0
 IUSE=""
 
-RDEPEND="dev-lang/lua:=
+RDEPEND="dev-lang/lua:0=
 	dev-db/postgresql:="
 DEPEND="${RDEPEND}"