gentoo auto-resync : 18:10:2022 - 07:56:02

author: V3n3RiX <venerix@koprulu.sector> 2022-10-18 07:56:02 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-10-18 07:56:02 +0100
commit: eb17cef883968037fcc6177549d44a030f08b69c (patch)
tree: 50c47314ceabb3efe7efeb72edeecca54b2aa905
parent: 5fa0e0c7e62842b1491426c8c6e506f51b6c78e1 (diff)
857 files changed, 4219 insertions, 2811 deletions
diff --git a/Manifest b/Manifest
index d613e5e9bf97..0275738b532c 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29621 BLAKE2B e4115269a58758fbedd4c969021558ed1b57796c775160740ad2c962bc78f01963dcf385a4d69e45acc172056d7a803ae9af2c146b4354d839d5e725a49c47e4 SHA512 7dc96caa5dcc2df501272f0ebb8782ae3fd75741f8a2387be6aec13be1003ded23600e310b20e67e8e2e050a9c7a68f5bdec282a9498c764f4931a9c09131f21
-TIMESTAMP 2022-10-18T00:09:58Z
+MANIFEST Manifest.files.gz 29602 BLAKE2B dc64c0979314ab7eb517b4efac61d395903c0f1f263e43a4d2c07339e60d7c00cf8d01259ddbb821aa63fc6a23017cd3aaa741ab379c05468eb718d505f09329 SHA512 5efc9ca397183bbf8cd92a0983a99b3a7cafa1016b671743e5ef246bfd679a1b0c9d91e6f4e00de5ff618b1fb440fd96a695fb3c2865380e4f25ab3a0dce9f33
+TIMESTAMP 2022-10-18T06:10:05Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNN7tZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNOQz1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBk+Q//WaAl71dj3zihLEmnX+uLFcnxKVTdh2GEOHUytvDCFsXw3uu6kj1RY9xp
-INPt1zdQC/oqfnPyM8QzZ7G05DVotknDInJ1LNnScExxe1mS7nns2fLm7ynPRItw
-NEb//Iz/rod8Wf5sWaJpixdTdDeCTyH2pGKXHKOu+HpCADOMOuZUN5UqyyAkke1N
-QWif6d1qvotQO4Nnh8P7m5/UBOBXeJaikO+K3zZDGq0SbCeYCW6Yj7ZDKdTfbXe/
-MfHmFInN8flMRXz9/TbDmHmYDnkNO+9uW4cN+FwO7YP9Zoujvs3WZrIAVUTnruMD
-d90KW6V3POkDzI7zThiXQvFbRHTltVqVHm3e7MCpV2V52AfHC5SWesaHzWAqDOfG
-Po848pdWV99nWlSK6dwDVS5VO55MXyczMbSYYNbd76y6uIcyiZAnhoAzOUpwEcuo
-a0OUx1O+dnXujRsjVUWhpoddm9rMUnNle1JbDqNoO9oA1ZnHbAuePLdcC7W6M9e9
-f7IhUTz8TWF9aUth/958XlgeQdOT3Ug7BwfwhQcTN52NLUVhfAq1hgw8Nh8Evwr/
-vHV26HZA3MDWjjURh1LY4qOTBcsCohZoktcSR3nE+pDqJ+KSKjZ0zOlzp43KwaDP
-dqc98vekugSxGXDICgX7SLQzJ7mz+Vf0zLNZ0fi0nBwFqeBGELY=
-=ocSt
+klBrLg//XncR7WZIAEJziXSXSLTcS86f8l2djBwGAnsbpEFqewf8coo/BfhKcKmX
+5jowvl8CkOHaFll5Tyn10dJRwCW6wN1TnPe12ZRDF47MxEANBLuww3QLZCD191Qy
+TamDl9+JZtAgmYuWOaZiYpW+7sjRjhV+vDLQ1VLXXqmS+AZoybGrntZYBn3g4BXq
+k4ZR13ZgagMOGfPEtkrmYpGUUVdYXCv2kYzM+zaIJd76J2kon4zfRkzGIRZ9cTVY
+JDFy8t80UP4KJI+7xh1fcPe+vrSHRjqIcLAI0Rysl2A17+r2Gfa+CdVYFzICpIz7
+zU6I7UF7cDgXvBR/JcQUVHmvYo3/XMxZPEVZvyPOQogFw2DbdMPdvfpa05cwGNj4
+u/AVeyHbMLV7c9vnjS5LinsE5eb0mIy/yMhEzZaUnNDvrgPlcGWFctGeijv1SAKV
+IySKcvIw0iSZKa2l9TEglS38phxSZJgZwitsrCgRlnVApE8MFm4W8/JPjtlPTkKD
+vJBsDkhgb6WqV2WpON6clV35A2wwBVhumup8OWY6I/NqFK6tS35xR+nguNl561Xm
+Y519a1blQJWJJsK7Ny0kMK+7HYPaPS5L3WEitV19NLMj6eYWV8aySXDVGXUA3b2d
+AsJAyX23QF76GhMEoS1G2G3wmF6zc2k13OVIG/jEvFPExqXXJaM=
+=MODz
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 32b6c4343ada..430e8b2a1f4e 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 6be1aa765183..4e1b0e2fb4cd 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/consul-template/Manifest b/app-admin/consul-template/Manifest
index f553cd5f38a0..65e5531cec19 100644
--- a/app-admin/consul-template/Manifest
+++ b/app-admin/consul-template/Manifest
@@ -8,7 +8,9 @@ DIST consul-template-0.29.1-deps.tar.xz 59041120 BLAKE2B dd822c41cf9fdfe773ed48e
 DIST consul-template-0.29.1.tar.gz 254592 BLAKE2B 4ad5e7c1bf2edc06d72ec1ed48f9546c698d22f8562c4c9924106891c44511b912abecc94517ed2359592b709f1f8fd05fcb00cea52893de29c62b34b61fd71e SHA512 edcfe45a3d98b9affda8b5d07fb375a647a78473c7041a87f1f5a2aa2faef2bfdef26a7037d228f6a86d0c446397e7452e7005ce16beff2bc68edabf2268a6f9
 DIST consul-template-0.29.4-deps.tar.xz 59446648 BLAKE2B 9ccd689f38eff50ad448a4226de918920c7acca9eb1e23d4e30f9999afc124224bb8f123b3dff4a1d433ea683ed523cd604a41472f50cb1919483040fc18c848 SHA512 3c60d88fdb82744f250cf02be3b3423f74360f18a43f4c4204ee97f73c370b878ecdbd5a300f96b74ffd9c7cde66f6c8b974392f7acc07a113b85ab6f1b6d8e9
 DIST consul-template-0.29.4.tar.gz 262539 BLAKE2B 487902c2a05561db325e6d2638a70d2733a27dd31f678b65883d0b4925b4efa38fe4fbe6c7128c9473af4d4a21f467288a2c1945da399f6feab39216b67dd5aa SHA512 3bc5fcd1877fe125398d6bf0bd4938af88cacf726441af3e82142e651ab458185593eec3cb7c5916669a0e39dff8059c049556509ec279bf572f03b4c915d757
+DIST consul-template-0.29.5.tar.gz 262722 BLAKE2B 1e3ddf259d76cf487872cebbe8c8b5bb313b89d073b26496340d39cc55c4e56ec531cbefec4bc1c0dd5c8bb3bd707c9bebfd15011e421badf12ea59a5bbbdbe3 SHA512 f753c2ec7f6c97ac73b34820b40568b5b16a3b8d4bebc7390905614a96744e8d4afd4a63b8b911989ba084ea91d85a21e3283d67a36bf65a685aa63154361a14
 EBUILD consul-template-0.29.0.ebuild 1263 BLAKE2B fbb76644ed420faeba6dfbf34315d6494bb2b2bc1390596d0afa1da5b10ba258841ea3e9726e9ce6a5e647e3ccabcbd6e01b45cbc4342d586fb36b9b08a5f0b4 SHA512 0197e8fc343e63bd8142b6a26cd560507d3860cb96c90f317721244f2153ba5e0f9d0660ee34b29ffb1802ab02337ebf2ad309415443981d5598263d1cb191a0
 EBUILD consul-template-0.29.1.ebuild 1263 BLAKE2B fbb76644ed420faeba6dfbf34315d6494bb2b2bc1390596d0afa1da5b10ba258841ea3e9726e9ce6a5e647e3ccabcbd6e01b45cbc4342d586fb36b9b08a5f0b4 SHA512 0197e8fc343e63bd8142b6a26cd560507d3860cb96c90f317721244f2153ba5e0f9d0660ee34b29ffb1802ab02337ebf2ad309415443981d5598263d1cb191a0
 EBUILD consul-template-0.29.4.ebuild 1263 BLAKE2B fbb76644ed420faeba6dfbf34315d6494bb2b2bc1390596d0afa1da5b10ba258841ea3e9726e9ce6a5e647e3ccabcbd6e01b45cbc4342d586fb36b9b08a5f0b4 SHA512 0197e8fc343e63bd8142b6a26cd560507d3860cb96c90f317721244f2153ba5e0f9d0660ee34b29ffb1802ab02337ebf2ad309415443981d5598263d1cb191a0
+EBUILD consul-template-0.29.5.ebuild 1281 BLAKE2B 23ccbe86f4a595439f4a8631f02113a7ea1efa4809ae8dea8387553ada6a134cd3a3ab699f3e05ed605df7a130f7379ac8931fe26a5f0efaec7c518c40a8c03f SHA512 1bec1d319fe99c05e751654f41cac807e54eb3797d6a776256d0c91c354b3c66124ad70a11532b228184a41f17579f4e8fea3c7235947060cc6b69fea33de6e2
 MISC metadata.xml 317 BLAKE2B d2427e36d0eec88eb97a7db510b4b45659b3d07b24228903eb5ed80807167c66cde6a3f1e63b1f55117974242ea9c06a78d58cca62359c775750ee34fe328ca0 SHA512 1e6e09983a77466e8671cfd7c848df28c2f35830a28a11c6c78369234fd35f35cb1dce8cbedfc97d2e5b1c4258db730e94c4d452d88b9841dc37e306d68d65b2
diff --git a/app-admin/consul-template/consul-template-0.29.5.ebuild b/app-admin/consul-template/consul-template-0.29.5.ebuild
new file mode 100644
index 000000000000..6727d40a8f93
--- /dev/null
+++ b/app-admin/consul-template/consul-template-0.29.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module systemd
+
+DESCRIPTION="Generic template rendering and notifications with Consul"
+HOMEPAGE="https://github.com/hashicorp/consul-template"
+SRC_URI="https://github.com/hashicorp/consul-template/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zmedico/dist/consul-template-0.29.4-deps.tar.xz"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="
+	acct-group/consul-template
+	acct-user/consul-template"
+
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+# TODO: debug test failures
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	# remove -s and -w from the linker flags
+	sed \
+		-e '/-s \\/d' \
+		-e '/-w \\/d' \
+		-i Makefile || die
+}
+
+src_compile() {
+	emake GOBIN="${S}"/bin dev
+}
+
+src_test() {
+	emake GOBIN="${S}"/bin test
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc CHANGELOG.md README.md
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	keepdir /etc/${PN}.d
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/app-admin/serf/Manifest b/app-admin/serf/Manifest
index 83639e27d2c1..d91f0af82498 100644
--- a/app-admin/serf/Manifest
+++ b/app-admin/serf/Manifest
@@ -4,8 +4,11 @@ AUX serf.logrotated 81 BLAKE2B 7f09c81d7efa52d1e970b0603fa2c89809aca99166efb1026
 AUX serf.service 286 BLAKE2B d0a7157101e18f80047688318a16995d24f0d06d444104ace3aaea9cb4c43b3ea164804f105dc94a03aa8e800228db9d2007510885cddb82e50b41d7aa8927ed SHA512 928dfca39afd79b113b299e4de25635fc9f68c64c77951d690797ed5796515d060fc36286f0dc1da63923042e3d8612ca8b1696dd511cb2fbd06550151d2a05b
 DIST serf-0.10.0-deps.tar.xz 24363004 BLAKE2B f0fed10ffa8ff536263f6fde5a87e9584c35a681e7821a91d123aa8bd149ca1b9024d454f8163de458e4b928e887736c3247661afbc3f46b2ba38bef09d4516d SHA512 73815e512fda8aa00241bff84e1ee2414106a4b1a6189e66aa80967152acafde56eeafd15b87cbaefcbedc093f1c42cfb19b9d5776473c4c580416c2b671931a
 DIST serf-0.10.0.tar.gz 446394 BLAKE2B 627e9ee776e217db09dde4bb22d1f317c884f887d918ba69de9bb65160eb00280c1ae5f53119570732f462c35381bd24a81405761b8ec63193295b6245298049 SHA512 53cb42b4a5f94fbb9e099739af0e31bb00cc261ea16325c3e5b9f081bb31299b5b8e42bc92d0f83ae78e511854589a95ab011930f373c1ad148c152b73adf485
+DIST serf-0.10.1-deps.tar.xz 24356192 BLAKE2B f635b7f4ea496aeac3148132ff0c4fcd2de037a2fc4c7c0c3943f2531b816a8002eb1e14a2204a30c206630f94400f953ae872e18bd2164c1d688f80961d54b8 SHA512 401e5bb706b3bf6521401ad4d40b02b331e71c6a0886796002046c83dffcffc735b803634d96bff5220d1069f418881daa9432412c4bcf6b7f3b37036d1a3a20
+DIST serf-0.10.1.tar.gz 447396 BLAKE2B a5b1aadf2e7d9b807406d8bd1d2db799f7a629a4db3abb3558c405b7bf81b5bef618157e51887ac631f3b42ca9eab3107ead8ead938ed0a1267299b2c47e0a18 SHA512 50febac6a634b7e19e58a2591371228fe7c1865673f48d082ed57cff1ac9c404d6a3b328d85b82cb92f05973a34396b824fdd9cb81f3e12c586b3f56d6734fa8
 DIST serf-0.9.8-deps.tar.xz 24178272 BLAKE2B 6a82fa025245f0c393b55d87a10195a9ed5f314b3cb772b54b01b858b9f6b393991cc206f269b39efe9a9061aeff948191ae48070eb7c1e5bf77781c97173952 SHA512 ec12d4b27044f58e897984adb3855413e2d3a624f62dffe981353bb5bfbbcbe64501080ef543bc446633716bbfe3ef29c3c93c44db8599b5639e2ef8d20d8eee
 DIST serf-0.9.8.tar.gz 444968 BLAKE2B 023413f75444f8e785bd7c5029e84ef58abca1c227f69dd8c16111c30afb38ff331e39cd8c30539f133229829bb9517516ff0e18e49b2dc9fb53df2ed40224b3 SHA512 1501ad6587f77840f7ad95d2886aafa3c28ffa533e862df0ebe5a4822078de09370c2ca1826d47dc6ff84e8598fb3711125a16e399a935ac39bad887e532c402
 EBUILD serf-0.10.0.ebuild 1218 BLAKE2B 688658ba3bd985aab9d20a3313b74709db937fdba88020bdfd14c641787072889c17c27b5eda4cde9cfc580edcb33bdd0d226ca89004a130b9e58aeb14bb1791 SHA512 f1a5912546200c3812bc075104f1abdb5d0a59611f66b3f52c41f4be6c5bc1113e2d380a4bf64dbebe36139db21dd9ce58762333c8bdd1ed364d402a1d9d76ec
+EBUILD serf-0.10.1.ebuild 1218 BLAKE2B 688658ba3bd985aab9d20a3313b74709db937fdba88020bdfd14c641787072889c17c27b5eda4cde9cfc580edcb33bdd0d226ca89004a130b9e58aeb14bb1791 SHA512 f1a5912546200c3812bc075104f1abdb5d0a59611f66b3f52c41f4be6c5bc1113e2d380a4bf64dbebe36139db21dd9ce58762333c8bdd1ed364d402a1d9d76ec
 EBUILD serf-0.9.8.ebuild 1218 BLAKE2B 688658ba3bd985aab9d20a3313b74709db937fdba88020bdfd14c641787072889c17c27b5eda4cde9cfc580edcb33bdd0d226ca89004a130b9e58aeb14bb1791 SHA512 f1a5912546200c3812bc075104f1abdb5d0a59611f66b3f52c41f4be6c5bc1113e2d380a4bf64dbebe36139db21dd9ce58762333c8bdd1ed364d402a1d9d76ec
 MISC metadata.xml 298 BLAKE2B d9e0f6a71fa3a3fff0fa469d70032a93dbd2dbe50903a687d77880a555ca7d4d007fcc95466804045a2610f1ce2c1d17ceb6796767f14bb80549d596eb1f03c3 SHA512 9830254ed456b995d7c06bedc27d4c2fd9eda67038b8dd7756bc5a6ea2b0317849f9c4ec66759a7335d099a6de168e48d726e9537a7b182253574ae45b6ce941
diff --git a/app-admin/serf/serf-0.10.1.ebuild b/app-admin/serf/serf-0.10.1.ebuild
new file mode 100644
index 000000000000..540d5af97180
--- /dev/null
+++ b/app-admin/serf/serf-0.10.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module systemd
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/hashicorp/serf"
+DESCRIPTION="Service orchestration and management tool"
+HOMEPAGE="https://www.serfdom.io/"
+SRC_URI="https://github.com/hashicorp/serf/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+
+SLOT="0"
+LICENSE="MPL-2.0 Apache-2.0 BSD MIT"
+IUSE=""
+RESTRICT+=" test"
+BDEPEND=""
+RDEPEND="
+	acct-user/serf
+	acct-group/serf"
+
+src_prepare() {
+	default
+	sed -e 's|\(^VERSION[[:space:]]*:=\).*|\1'${PV}'|' \
+		-e 's|\(GITSHA[[:space:]]*:=\).*|\1'${PV}'|' \
+		-e 's|\(GITBRANCH[[:space:]]*:=\).*|\1'${PV}'|' \
+		-i  GNUmakefile || die
+}
+
+src_compile() {
+	mkdir -p ./bin
+	go build -o ./bin/serf ./cmd/serf || die
+}
+
+src_install() {
+	local x
+
+	dobin "${S}/bin/${PN}"
+
+	keepdir /etc/serf.d
+	insinto /etc/serf.d
+
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners serf:serf "${x}"
+	done
+
+	newinitd "${FILESDIR}/serf.initd" "${PN}"
+	newconfd "${FILESDIR}/serf.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/serf.service"
+}
diff --git a/app-admin/stow/Manifest b/app-admin/stow/Manifest
index ef34ad5c3703..4ecb068cc50a 100644
--- a/app-admin/stow/Manifest
+++ b/app-admin/stow/Manifest
@@ -1,4 +1,4 @@
 DIST stow-2.3.1.tar.bz2 556921 BLAKE2B cd946dd1537bec063e21c91cc60c0c8f3a8a5609960536020e7e4b970ff2daa628151258487492b1b44fb5539e1d75a8955152fdfbe91384b7e174ab420a9cf6 SHA512 3d6cec3d50e2dc0ffa92646c45015ced3fca32cef9dd24418fada3fc2e4472a1f335877debb3a1284812aef281a432925c3a3e7afa112d92f127facd3150079c
 DIST stow-2.3.1.tar.bz2.sig 833 BLAKE2B a236d67fca2dabb965021b7ef23ec680ffd48c1b23d3637cf4bd2c31da58b55ad9d190ee88c7f9bb8ce676f85a0bb133b963bc8252fea7c8d5bd5c0042c65681 SHA512 0a0ad10781c29ee6cd69dc8cb05592e779e5cb53412b8bc6c7bce12846c1e1480e2763eaaab329f2cf945a263d15217adb102387247bc2bec313856b3d7535c4
 EBUILD stow-2.3.1.ebuild 908 BLAKE2B 322e05f403bbb3302902c4a12eb8b6682da86c8c2b153394d366179d9cea3479821b415ab0f08d1e5821fb86cb4a0c3fb39634a71f357062c60b548e005866b1 SHA512 1f9c59a71606c4a800b5be15b4bd5a1f99f557b624789ef7fd39fb18b581acae06a6e0dc953c0fc6a45a311d31552045e2a157ddf3ef6dfbe990de90f97d4499
-MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
+MISC metadata.xml 321 BLAKE2B 6c48c1b0f2712dfe4d98286b1056b52315800609ddb3a17d7b6c13f582a09af037d3a559b735b9d986beb30144423effa66e0aa9d43b0505d6e8777d90b6ae2d SHA512 9f9ffbbde5faad7037655d2269cc5b857a5aab45fe01444292cb56d8d38c278a487c93c192753de72afba2589f299337c8ef71c180df80cae56bad3c2c3dd786
diff --git a/app-admin/stow/metadata.xml b/app-admin/stow/metadata.xml
index 641cbd3703e7..bf29ceda8819 100644
--- a/app-admin/stow/metadata.xml
+++ b/app-admin/stow/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>sam@gentoo.org</email>
-		<name>Sam James</name>
-	</maintainer>
+  <maintainer type="person">
+    <email>sam@gentoo.org</email>
+    <name>Sam James</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">stow</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index bc06ac8ea385..80c5d211285c 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/lzip/Manifest b/app-arch/lzip/Manifest
index 992cf8c80d95..bd0aeea46d33 100644
--- a/app-arch/lzip/Manifest
+++ b/app-arch/lzip/Manifest
@@ -1,4 +1,4 @@
 DIST lzip-1.23.tar.gz 121817 BLAKE2B 934a35e31b0db76c4dcbe2fe903f04b60471485118aa5d4001599a3c23a7db74f05f703cf430bb299795be7025f71efb225afddff85c8245e962bdadcf82aef7 SHA512 482804205b6e92fdf9cb17fb9482df7987227c7b1bef9e42d78787acfabe73995f5b1a66f847d2176423f22dce56f1122c5b1c9670f0b778c0bdad2852369c85
 DIST lzip-1.23.tar.gz.sig 72 BLAKE2B 2441968deb279c25724d854cf13c2601c8a62619e9350dc063051b8c7d86a978ef39e91d7ba680152080ab537976677d3ea2fbb2071ce8a95b8f12dc65777cf3 SHA512 e49542558c8424036b5aaab348b3baa133b9b2d0ec5f8fc19557b83acb2cdbab3909d8eb51a9dd111750ae1dd81bafc2a1a4c4be4a46e8f149386c42f4ec79ce
 EBUILD lzip-1.23.ebuild 1026 BLAKE2B b64de75c9fa2e0aae1b2222b323ddf959d16931735f0f3ea9efcea0e3648955e40a3bbba66211e2b0b6e6c5049e990adf37a35b29d86080783ca6d32a1272e6a SHA512 68e9ae85f38bcd6915d9024d1d010f57e05777a0a0188221bf60c206e1c7dbaa676e756711a5fb7805e6496f3b3041c61adeb9a95057d052713aa0e7ba19e57e
-MISC metadata.xml 358 BLAKE2B c0e0c2c610a33aa6f8bff1325deb8c583fbde09ceaef09f4ddc1f343feaf3cc81a0e59ff2e4f3cd81bf6e3294e18026fa4ae6870eef8d213ff44c73edbb7df0a SHA512 faa29e9bc8f49b51279e643a7d9f0dc4b5463b434f9874901625af9f13c4460c19888913ee9d4105ee9eda4257526af50383fbe936d5834b2713eb027e75773f
+MISC metadata.xml 433 BLAKE2B f223f7a52fed40be8267d75a1a16ba3657fde4e5eff20059ac53496fa243a680c415455fc4bfb478cbf98875d8874276c747597ec37847c72f2db7b0caad15b3 SHA512 5ba5e22b1e4291e49bca77cf4c76b10dad22e172329b5f189c345dbca2321c61371908808952faaac7ad26049e8b53124358d5a2705b4213029e23c15f37eb59
diff --git a/app-arch/lzip/metadata.xml b/app-arch/lzip/metadata.xml
index 4d9ece7acd6a..4989f733c740 100644
--- a/app-arch/lzip/metadata.xml
+++ b/app-arch/lzip/metadata.xml
@@ -9,4 +9,7 @@
 	<email>mgorny@gentoo.org</email>
 	<name>Michał Górny</name>
 </maintainer>
+<upstream>
+	<remote-id type="savannah-nongnu">lzip</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index b1adbe0e9743..9dd52d3d7584 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/spideroak-bin/Manifest b/app-backup/spideroak-bin/Manifest
index a19f6e230583..3480290a77ee 100644
--- a/app-backup/spideroak-bin/Manifest
+++ b/app-backup/spideroak-bin/Manifest
@@ -1,4 +1,4 @@
 DIST spideroak-bin-7.5.0_amd64.deb 20758038 BLAKE2B ecd549ee0d479f576e8d50b44f4f7a13c4d24445af32f460d34081e5b654586f314399b34cff1c937e157582a143fee6b98641a68655552bb6d3609e532ceba4 SHA512 4af9f6b57d8748c03bccb0ab843cf27f70eac8e8cc5f11bb494c597d5fd29f475bf9c68bce8971d3cc1550a6def7bac6beed78fdfb31961b09be61ee14116ddd
 DIST spideroak-bin-7.5.0_x86.deb 24779422 BLAKE2B 8cdae243794e5de6a8326e335b539d004c0ba0f1121b85067acbffffbef67f4a0c785f3b794abb62a5eedfd459c8e4d5e48cf8848b005ba637150b286b13db22 SHA512 32504b6e6931f1e923d4202f0b3201c93190128d30767ec41ac11cf7c8c751b87094bdedcf44dda3ae8089543418366c5a78093b9236fee5f95e7f89a29141fc
-EBUILD spideroak-bin-7.5.0-r1.ebuild 2734 BLAKE2B edded335d4b603ba6a4e27a21e17f5589630a3b04900e046daca2d15cb0164a82bd400e18f538b79eabb94a55e1a7dd0a9710211bfe03563455240f7ae58a688 SHA512 3c0a3016dd35889d0873429810846f810a1aaa29e53dfdb0beb905fb88e07141475d4fffbf7543477f6048ec17292401f1ee4993ee337ea5ee935f1c92ae421c
+EBUILD spideroak-bin-7.5.0-r2.ebuild 2784 BLAKE2B f7a188186935ae51396242a659b6fc95a5d1b764f7f5d46dc9358599a93003afc15917cace104af2600c6e839296becfeea5af8ccb8ca82850741c7f60c9e3a8 SHA512 63eeeb2a65dc67cd785e9e206225e0a07de78bd5786597d8e538b6f8b43518b2aee8f950a6a41fda2edebe6758eb0d9c61af7012b29a20d9e08c0859e5ccf60a
 MISC metadata.xml 367 BLAKE2B 35e875f6930a45a018241b08aebd8cd6a8ad4cd36c504b774f58d2c2d05594edc0c2bd8625b5a1d1f28946d079165b8076b820e627fb671bfe62c2be67d2e38f SHA512 8ca0a2e05c8ad7bd949735534a5a6cca575de8fce832517aa89af31717022e9ef31920b79ccdf03873862dceeba13bea98dd67023b91d06812308354d8f944c0
diff --git a/app-backup/spideroak-bin/spideroak-bin-7.5.0-r1.ebuild b/app-backup/spideroak-bin/spideroak-bin-7.5.0-r2.ebuild
index 9b91aa577c3c..897265b79cc9 100644
--- a/app-backup/spideroak-bin/spideroak-bin-7.5.0-r1.ebuild
+++ b/app-backup/spideroak-bin/spideroak-bin-7.5.0-r2.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="6"
@@ -90,7 +90,8 @@ src_install() {
 	doins -r etc
 
 	# Install the manpage
-	doman usr/share/man/man1/SpiderOakONE.1.gz
+	gzip -d usr/share/man/man1/SpiderOakONE.1.gz || die
+	doman usr/share/man/man1/SpiderOakONE.1
 
 	if use X; then
 		domenu usr/share/applications/SpiderOakONE.desktop
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index a20da60e0327..690ca62613bc 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/flannel/Manifest b/app-containers/flannel/Manifest
index 3036f90003dd..ed7b8501e230 100644
--- a/app-containers/flannel/Manifest
+++ b/app-containers/flannel/Manifest
@@ -4,14 +4,8 @@ AUX flanneld.confd 40 BLAKE2B 7e3aae756e872ead179c34119e39bb054c7e23255b647c9c4f
 AUX flanneld.initd 518 BLAKE2B 36859121c77fcd7b53f679eff455ad1ba1f9c6c58fc6a015e195c7639434f941106c44349671c1fe15f4f0c63c3d753f69e9b8cfe2a8d706cd33dbf62a928154 SHA512 3f6f33fe90adca1dd17b503ce0cd3a7f3cc0ca7fc10d0ca5b631f4c87ed513c0133dfd7679618cf95540b252b3176f9bbefd6454867ef792258c46cafc039d86
 AUX flanneld.logrotated 77 BLAKE2B 778f7289a6268cf6b150b1c58895514808c304b56baca56b1df3297df4ff0a4c9ec6e70a3ddbf16c55c0bd5be146bcfa20f7b4ac8ceb08fa9af223164c19a905 SHA512 d84258a164adcec0f1cef7fcafcf0cadb3bf3959b393b905c4897274adeff476279ce96ec42e9aa9d574c6bd7d37649d92c7c52563975f85d303cade990a3942
 AUX flanneld.service 476 BLAKE2B ea838e26be0834943bafb985a37e71b45219bffbd68784b8442c065d9bafc8c9cb2b097c8a00629c19faf4b7bb1fb4ae33071e51d4bf6ffdd62cf5898de1f3cf SHA512 4a7d09f25f117b1cda9b02914a394c0d6d6ddd6c02503f61c0646ede1934cb4cad831992058c5738401b1ac7be6e4c7cd83b1c4a70c04084bb4bb01338c08220
-DIST flannel-0.14.0.tar.gz 8324790 BLAKE2B 47fd65d531f9fa10e602ccf1858549ede97d8f8c9afa32ffeb010d733060703262cafd02b5daddc65142dfa96b1c6b429eaff30b7fdaca27e2a5397c0d756e7c SHA512 a5d9f45d55f18c744e635b4d697200cf9d5a8c4387cd6d9c57220e652e3688337f2ee50fef193135dd0073b14edb8800fac8d5ca9f9d0d3e9ef70d09a52f259c
-DIST flannel-0.16.0.tar.gz 8697548 BLAKE2B a307990554a6cf215bef6ac75a544d00d8c6cd702f02e98efaf80b89d0ecf4592c1c338d1f80cf22ee086355ee7edb77492e6af587cbf037f38b6e3dbc4ac252 SHA512 7b80fe1e282c312b8b242d2201ecd164d87b551f4bc02d8375ca856c0dcfad2d31bd1b4041663016130b0bd7ebaf0062afe59c0946e97f10478142ca8ffd94f0
-DIST flannel-0.16.1.tar.gz 8697974 BLAKE2B bff4d5a6fe179129fa9ae494291301b25bc3ff9d6f4049b990f50b01920dfd20d149eb85339e2930b66dd060aca57f269a3b21fa508a3c95f5d152bbfb91631f SHA512 699ba7e7b80dd60a03bb5c6ee384a582201d8167ef21e60816ca9942a9d70ba0fd7633a3d2a44802f9f0a0851a79709afe78bd46f15ca81641ff64d46859f928
-DIST flannel-0.16.3.tar.gz 9531741 BLAKE2B 6a22b3d031dda538a0b64877eda4afbf5e9cbe6d39342325f54bcc5faf1b867c8eef6a9f2800ec9b872ed5c48d17aa23842f273a0fad862bffb99b9905045363 SHA512 965708d99401c4a6a32883181afbc1afccd2211589411272b6b93f225ec84373b95fa2be840d00c39364b8e4c1a8a3763a498523503ecb631156c5c70304a9b9
 DIST flannel-0.17.0.tar.gz 9534647 BLAKE2B 03d6d036d5877641a2fc7b6654995822522d378943e4d7b2531be8197de6e7d6e0509143cd8d4dfd3d2ef11c9355011bfc44c834f966e14fd3aa774350bcab11 SHA512 f0625339e387a6ae81780d21025c282c2e0caf8b32ac778634a877a4e04ebf10d41fc10b50ae477c28815cedaf34af867b651ed5a8c5267177ea925abc6a1253
-EBUILD flannel-0.14.0.ebuild 1418 BLAKE2B 94b7e426dc6e3d769b3564f60e969a28d21628a1f963721a9d78e3f3568bd6ef2a5b481406b6aa93aa072c47209ab1f7eb1c375429d66d8cd11910bacde07c6f SHA512 1dea57abed0dc5dc46b720d046788fc16e3d471d01bc0fe2115b156c3a7888b6d834f0da85eed00b644ed3318817e858126aabacdf40e94e53d06d3736bef43a
-EBUILD flannel-0.16.0.ebuild 1418 BLAKE2B 94b7e426dc6e3d769b3564f60e969a28d21628a1f963721a9d78e3f3568bd6ef2a5b481406b6aa93aa072c47209ab1f7eb1c375429d66d8cd11910bacde07c6f SHA512 1dea57abed0dc5dc46b720d046788fc16e3d471d01bc0fe2115b156c3a7888b6d834f0da85eed00b644ed3318817e858126aabacdf40e94e53d06d3736bef43a
-EBUILD flannel-0.16.1.ebuild 1418 BLAKE2B cf64ef8ca8ccea8838b27dccf750a8497b23876ba68275bb97911770898e17b2c35c917134147ba06493e010ce5b18fd8950678fd992db4feb9fd49066aeb8d8 SHA512 6095d70c1bbe214c6122584f9b307bc93aee73018c20aae8ed0e11e7f6e87dbd9f38edf64dcaf6931d48db35906fa17df03bf983963ae349b3b951bfd3e3d85b
-EBUILD flannel-0.16.3.ebuild 1418 BLAKE2B cf64ef8ca8ccea8838b27dccf750a8497b23876ba68275bb97911770898e17b2c35c917134147ba06493e010ce5b18fd8950678fd992db4feb9fd49066aeb8d8 SHA512 6095d70c1bbe214c6122584f9b307bc93aee73018c20aae8ed0e11e7f6e87dbd9f38edf64dcaf6931d48db35906fa17df03bf983963ae349b3b951bfd3e3d85b
+DIST flannel-0.20.0.tar.gz 10737855 BLAKE2B d2e5821c4457a8c0781618a62245132f862d7877ce10467f8d9c72be2440f7b60f0866a3420a69d13bc53826407b0b653e6c2385f8e56d684ee1e09acf0528f0 SHA512 624a293607d3d4d5e53b41b5fd26a416f8499a763f8cfbe39c79796644a56d5eb3605664592d15eddde519f2dba55da241889be159644bbe40e78ae72ed5a43b
 EBUILD flannel-0.17.0.ebuild 1436 BLAKE2B c0dc753253b6267ffc746294c1cec61bd4647f30ad1b562598dec39de55073bf2cd0a47b1b9a0bb518ec4211f285f00f63a319c009b6c4d83498242d99908083 SHA512 6fbaedd060184774118f8a483ea737fa1ba6eb16996d8b2f7677c9f09ba5aeafc1773182980a98f4185c70442d6a7080ab4903944958197125c26b7e4f13fc8c
+EBUILD flannel-0.20.0.ebuild 1436 BLAKE2B c0dc753253b6267ffc746294c1cec61bd4647f30ad1b562598dec39de55073bf2cd0a47b1b9a0bb518ec4211f285f00f63a319c009b6c4d83498242d99908083 SHA512 6fbaedd060184774118f8a483ea737fa1ba6eb16996d8b2f7677c9f09ba5aeafc1773182980a98f4185c70442d6a7080ab4903944958197125c26b7e4f13fc8c
 MISC metadata.xml 310 BLAKE2B de0cea7ebb19915abdb06399ba91ff1f3c45b2ca5a24c4c99e59c839bad7a854f702cd5909549bc9ad746ad579b80280fe53be39736117aa5f4fdec184a122e3 SHA512 e2c16506f5baf5911f15a5cadc4d8493b0c8d66dfefef8f789a471dfc4c92411e3a8c5ac3e40490edd3d4c8150a0beb815d497882db83164724093e2fc8aa34d
diff --git a/app-containers/flannel/flannel-0.14.0.ebuild b/app-containers/flannel/flannel-0.14.0.ebuild
deleted file mode 100644
index ec33f31625ba..000000000000
--- a/app-containers/flannel/flannel-0.14.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd tmpfiles
-
-KEYWORDS="~amd64 ~arm64"
-DESCRIPTION="An etcd backed network fabric for containers"
-HOMEPAGE="https://github.com/coreos/flannel"
-SRC_URI="https://github.com/coreos/flannel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD ISC LGPL-3 MIT"
-SLOT="0"
-IUSE="hardened"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	default
-	sed -e "s:^var Version =.*:var Version = \"${PV}\":" \
-		-i "${S}/version/version.go" || die
-}
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"\
-	go build -o dist/flanneld -ldflags "
-		-X github.com/flannel-io/flannel/version.Version=v${PV}
-		-extldflags \"-static\"" . || die
-}
-
-src_test() {
-	GOPATH="${WORKDIR}/${P}" \
-		go test -v -work -x "${EGO_PN}" || die
-}
-
-src_install() {
-	dobin dist/${PN}d
-	exeinto /usr/libexec/flannel
-	doexe dist/mk-docker-opts.sh
-	insinto /etc/systemd/system/docker.service.d
-	newins "${FILESDIR}/flannel-docker.conf" flannel.conf
-	newinitd "${FILESDIR}"/flanneld.initd flanneld
-	newconfd "${FILESDIR}"/flanneld.confd flanneld
-	keepdir /var/log/${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/flanneld.logrotated flanneld
-	newtmpfiles "${FILESDIR}/flannel.tmpfilesd" flannel.conf
-	systemd_dounit "${FILESDIR}/flanneld.service"
-	dodoc README.md
-}
-
-pkg_postinst() {
-	tmpfiles_process flannel.conf
-}
diff --git a/app-containers/flannel/flannel-0.16.0.ebuild b/app-containers/flannel/flannel-0.16.0.ebuild
deleted file mode 100644
index ec33f31625ba..000000000000
--- a/app-containers/flannel/flannel-0.16.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd tmpfiles
-
-KEYWORDS="~amd64 ~arm64"
-DESCRIPTION="An etcd backed network fabric for containers"
-HOMEPAGE="https://github.com/coreos/flannel"
-SRC_URI="https://github.com/coreos/flannel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD ISC LGPL-3 MIT"
-SLOT="0"
-IUSE="hardened"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	default
-	sed -e "s:^var Version =.*:var Version = \"${PV}\":" \
-		-i "${S}/version/version.go" || die
-}
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"\
-	go build -o dist/flanneld -ldflags "
-		-X github.com/flannel-io/flannel/version.Version=v${PV}
-		-extldflags \"-static\"" . || die
-}
-
-src_test() {
-	GOPATH="${WORKDIR}/${P}" \
-		go test -v -work -x "${EGO_PN}" || die
-}
-
-src_install() {
-	dobin dist/${PN}d
-	exeinto /usr/libexec/flannel
-	doexe dist/mk-docker-opts.sh
-	insinto /etc/systemd/system/docker.service.d
-	newins "${FILESDIR}/flannel-docker.conf" flannel.conf
-	newinitd "${FILESDIR}"/flanneld.initd flanneld
-	newconfd "${FILESDIR}"/flanneld.confd flanneld
-	keepdir /var/log/${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/flanneld.logrotated flanneld
-	newtmpfiles "${FILESDIR}/flannel.tmpfilesd" flannel.conf
-	systemd_dounit "${FILESDIR}/flanneld.service"
-	dodoc README.md
-}
-
-pkg_postinst() {
-	tmpfiles_process flannel.conf
-}
diff --git a/app-containers/flannel/flannel-0.16.1.ebuild b/app-containers/flannel/flannel-0.16.1.ebuild
deleted file mode 100644
index ad8fbf25ad4e..000000000000
--- a/app-containers/flannel/flannel-0.16.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd tmpfiles
-
-KEYWORDS="~amd64 ~arm64"
-DESCRIPTION="An etcd backed network fabric for containers"
-HOMEPAGE="https://github.com/coreos/flannel"
-SRC_URI="https://github.com/coreos/flannel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD ISC LGPL-3 MIT"
-SLOT="0"
-IUSE="hardened"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	default
-	sed -e "s:^var Version =.*:var Version = \"${PV}\":" \
-		-i "${S}/version/version.go" || die
-}
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"\
-	go build -o dist/flanneld -ldflags "
-		-X github.com/flannel-io/flannel/version.Version=v${PV}
-		-extldflags \"-static\"" . || die
-}
-
-src_test() {
-	GOPATH="${WORKDIR}/${P}" \
-		go test -v -work -x "${EGO_PN}" || die
-}
-
-src_install() {
-	dobin dist/${PN}d
-	exeinto /usr/libexec/flannel
-	doexe dist/mk-docker-opts.sh
-	insinto /etc/systemd/system/docker.service.d
-	newins "${FILESDIR}/flannel-docker.conf" flannel.conf
-	newinitd "${FILESDIR}"/flanneld.initd flanneld
-	newconfd "${FILESDIR}"/flanneld.confd flanneld
-	keepdir /var/log/${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/flanneld.logrotated flanneld
-	newtmpfiles "${FILESDIR}/flannel.tmpfilesd" flannel.conf
-	systemd_dounit "${FILESDIR}/flanneld.service"
-	dodoc README.md
-}
-
-pkg_postinst() {
-	tmpfiles_process flannel.conf
-}
diff --git a/app-containers/flannel/flannel-0.16.3.ebuild b/app-containers/flannel/flannel-0.20.0.ebuild
index ad8fbf25ad4e..18d922d3f1d3 100644
--- a/app-containers/flannel/flannel-0.16.3.ebuild
+++ b/app-containers/flannel/flannel-0.20.0.ebuild
@@ -6,8 +6,8 @@ inherit go-module systemd tmpfiles
 
 KEYWORDS="~amd64 ~arm64"
 DESCRIPTION="An etcd backed network fabric for containers"
-HOMEPAGE="https://github.com/coreos/flannel"
-SRC_URI="https://github.com/coreos/flannel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/flannel-io/flannel"
+SRC_URI="https://github.com/flannel-io/flannel/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD ISC LGPL-3 MIT"
 SLOT="0"
diff --git a/app-containers/snapd/Manifest b/app-containers/snapd/Manifest
index 7d3e85418f29..be021527eb1f 100644
--- a/app-containers/snapd/Manifest
+++ b/app-containers/snapd/Manifest
@@ -1,4 +1,6 @@
 AUX README.gentoo 1941 BLAKE2B dd25269f2aaaea693701d74511d632bc45f2c99954ae683cb81d4df41c4c1f8007bb6c337234e46bfc5973aa7e8356cd12ac510e9109eca09890cbc42bd184bb SHA512 5b522e6c29bdad84a71245fa1f0289e9cfed0501d936b433829f66ef9d655f3cc13d6bca29beeae2c00e1b68f9fa30058608b9c4cde86ba66eab67bd011c9d00
 DIST snapd-2.57.2.tar.xz 6827264 BLAKE2B f9b1ae934a9c5b777d2e36854e259ddde301067a91b04ecef064accfccecc74693a2a58700e60867f46f028728a271b87cb3d4cdb316ae35df11363990959c3a SHA512 671e7598074894daf76646f7eea09c4163c57e68d0d46ebb77b20f71b898109fd73c78d363cb1253386ce058c1796eb25fab7f2f0345360426d3b9cc11d38804
+DIST snapd-2.57.4.tar.xz 6884432 BLAKE2B 47dcb8857070ab9f5cd02f6b64d6ef263ab1cf958c0eee6654064f7beec10c5b9995dcad9c66ba8237c6e4991e6c82b2fa758e204cdc3fb1134a5d8bb45e855b SHA512 00763d64a17c94ae7a8f4b09f61489f5dc32d923e2a22f223e0fa817693cf69e5d36cb7f9ea7b04d4ea325abdbaf3c1aeb87884318bf16de803bce1fef9666de
 EBUILD snapd-2.57.2-r1.ebuild 5169 BLAKE2B f96430c3131d507c6b7566f7b085851a6db569a93dae668d0a34d13319c06f563566858367bf028ed600f1d0ba8f29e5970c56ca72241b7b72eccf5318939633 SHA512 b7551510c5b5adf6f12c2df137ef54c8c62f96984141f49e2706a7c88c65490b03f43674b8314c82cb83bbad5de560285d1c10b1b11bf79359034cf758096caf
+EBUILD snapd-2.57.4.ebuild 5169 BLAKE2B f96430c3131d507c6b7566f7b085851a6db569a93dae668d0a34d13319c06f563566858367bf028ed600f1d0ba8f29e5970c56ca72241b7b72eccf5318939633 SHA512 b7551510c5b5adf6f12c2df137ef54c8c62f96984141f49e2706a7c88c65490b03f43674b8314c82cb83bbad5de560285d1c10b1b11bf79359034cf758096caf
 MISC metadata.xml 457 BLAKE2B 204b67bf36a85bd18f4111b4d8590195908bf15ae0bafedb76b6124b7d19c6570627925e5dfc46dd4dd47732c6d8f1066451831a0cc475518aab8a29403ececc SHA512 07671272b60f1a6793e3f36b096e99153263830314359eb86000aec65266c61ebe9c448af4ec166d6163e3ca2325f36cc74fe5aace95e7ffa7b0293516b18120
diff --git a/app-containers/snapd/snapd-2.57.4.ebuild b/app-containers/snapd/snapd-2.57.4.ebuild
new file mode 100644
index 000000000000..35255adff108
--- /dev/null
+++ b/app-containers/snapd/snapd-2.57.4.ebuild
@@ -0,0 +1,178 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 flag-o-matic go-module linux-info readme.gentoo-r1 systemd xdg-utils
+
+DESCRIPTION="Service and tools for management of snap packages"
+HOMEPAGE="http://snapcraft.io/"
+
+SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz"
+MY_PV=${PV}
+KEYWORDS="~amd64"
+
+LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
+SLOT="0"
+IUSE="apparmor +forced-devmode gtk kde systemd"
+REQUIRED_USE="!forced-devmode? ( apparmor ) systemd"
+
+CONFIG_CHECK="~CGROUPS
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~NAMESPACES
+		~SQUASHFS
+		~SQUASHFS_ZLIB
+		~SQUASHFS_LZO
+		~SQUASHFS_XZ
+		~BLK_DEV_LOOP
+		~SECCOMP
+		~SECCOMP_FILTER"
+
+RDEPEND="
+	sys-libs/libseccomp:=
+	apparmor? (
+		sec-policy/apparmor-profiles
+		sys-apps/apparmor:=
+	)
+	dev-libs/glib
+	virtual/libudev
+	systemd? ( sys-apps/systemd )
+	sys-libs/libcap:=
+	sys-fs/squashfs-tools[lzma]"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	>=dev-lang/go-1.9
+	dev-python/docutils
+	sys-devel/gettext
+	sys-fs/xfsprogs"
+
+PDEPEND="sys-auth/polkit[gtk?,kde?]"
+
+README_GENTOO_SUFFIX=""
+
+pkg_setup() {
+	if use apparmor; then
+		CONFIG_CHECK+=" ~SECURITY_APPARMOR"
+	fi
+	linux-info_pkg_setup
+
+	# Seems to have issues building with -O3, switch to -O2
+	replace-flags -O3 -O2
+}
+
+src_prepare() {
+	default
+	# Update apparmor profile to allow libtinfow.so*
+	sed -i 's/libtinfo/libtinfo{,w}/' \
+		"cmd/snap-confine/snap-confine.apparmor.in" || die
+
+	if ! use forced-devmode; then
+		sed -e 's#return !apparmorFull#if !apparmorFull {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
+			-i "sandbox/forcedevmode.go" || die
+		grep -q 'panic("USE=forced-devmode is disabled")' "sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
+	fi
+
+	sed -i 's:command -v git >/dev/null:false:' -i "mkversion.sh" || die
+
+	./mkversion.sh "${PV}"
+	pushd "cmd" >/dev/null || die
+	eautoreconf
+}
+
+src_configure() {
+	SNAPD_MAKEARGS=(
+		"BINDIR=${EPREFIX}/usr/bin"
+		"DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
+		"LIBEXECDIR=${EPREFIX}/usr/lib"
+		"SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
+		"SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
+	)
+	export CGO_ENABLED="1"
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+
+	pushd "${S}/cmd" >/dev/null || die
+	econf --libdir="${EPREFIX}/usr/lib" \
+		--libexecdir="${EPREFIX}/usr/lib/snapd" \
+		$(use_enable apparmor) \
+		--enable-nvidia-biarch \
+		--with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
+}
+
+src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME
+	export GOBIN="${S}/bin"
+
+	local file
+	for file in "${S}/po/"*.po; do
+		msgfmt "${file}" -o "${file%.po}.mo" || die
+	done
+
+	emake -C "${S}/data" "${SNAPD_MAKEARGS[@]}"
+
+	local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath)
+	local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
+
+	local cmd
+	for cmd in snap snapd snapd-apparmor snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
+		go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${flags[@]}" \
+		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
+		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
+	done
+	for cmd in snapctl snap-exec snap-update-ns; do
+		go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
+		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
+		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
+	done
+}
+
+src_install() {
+	emake -C "${S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
+	emake -C "${S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
+
+	if use apparmor; then
+		mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die
+		keepdir /var/lib/snapd/apparmor/profiles
+	fi
+	keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
+	fperms 700 /var/lib/snapd/{cache,cookie}
+
+	dobin "${GOBIN}/"{snap,snapctl}
+	ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
+
+	exeinto /usr/lib/snapd
+	doexe "${GOBIN}/"{snapd,snapd-apparmor,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
+		"${S}/"{cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
+		"${S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
+
+	dobashcomp "${S}/data/completion/bash/snap"
+
+	insinto /usr/share/zsh/site-functions
+	doins "${S}/data/completion/zsh/_snap"
+
+	insinto "/usr/share/polkit-1/actions"
+	doins "${S}/data/polkit/io.snapcraft.snapd.policy"
+
+	dodoc "${S}/packaging/ubuntu-16.04/changelog"
+	domo "${S}/po/"*.mo
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	xdg_desktop_database_update
+
+	if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles &&
+		$(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
+		apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 43f651e2a786..b30685a2eac9 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 4681805f1e2e..a64c71cd14ec 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -24,4 +24,4 @@ EBUILD emacs-28.1-r3.ebuild 15014 BLAKE2B a3101a3515f1a65d53e627f98bae37ae5bdad1
 EBUILD emacs-28.2-r1.ebuild 16772 BLAKE2B 358d7cd7107263ad003c03222f12ec389b736439babb3b42f44da127ad5bd62f1ed58a2b260e8c9885a1face1f332eb1fd53f2701880dc7d119a0bf3c0e94669 SHA512 cfa93adc3e64d8efdcdcbadcb708f4f145a612493d918d5809dddf0a89614b0d3d967caa47ad3eebb3a163fc895374d3a54e852ce79ac79738629d8e8888a595
 EBUILD emacs-28.2.9999.ebuild 16869 BLAKE2B 7b2689a37c8b0f7d9df094087b519e3007583f3ffd95cf550062a632425ecb26734f62453643715d44d6233a613707751a42b22f6cc17a0dbf261d9e29de2f6a SHA512 a6e204a5df72499d4e599898a8f69d01bafd24c059744847836239386c4d933d943098e2226975626edc3dbea9c74a4c6f2adbb53fcf8e72d5222d242c457ea7
 EBUILD emacs-29.0.9999.ebuild 18111 BLAKE2B 0f07fd333ef24101c0383ae25cee0edc42f29ba75273c8764843fa3b9549e7d8abd04a94d3159bb87847bfe65e9d1d5cf1fec0f73c131420931dc290a6a421e2 SHA512 374759b0af9b86d441c9d9bafb0241092bac0efeb6c114aa2a7b2cd292c0afdc1a3b70ff7ebe6fa33778a2ec0effeef6f2eefe27a4c92d5d25a5dcf62619d701
-MISC metadata.xml 3130 BLAKE2B 162f49aa253a87b89e80dcbc961cacf659220c16c5b9d83e96b1eb90c40f828b87830173a80fb24cbfae50efb2ddfe51aed3e334c8c0f8e5cd30b63569e991cb SHA512 71a1b4b298ae915a33c7876a20892799c3c7b39f913b7b2606c18e6c14a4169b60f17c41742cdaab870cb60bceee14c0d10ea6f345739b1e9c3d07a14d9d60ee
+MISC metadata.xml 3258 BLAKE2B 44636f6ca0aba4806424dc382c389f772a76b9fa903c22d8dfd44a1a81dc2952de9f384e02f88d6288ce0fa48af6146eded90fca8801c9d9308308cbdbb6d50a SHA512 7fef9cb3a87124d3c8ce7d2e1d754f176f7e2fc8e57df62cbae420fa47262ab50526287c649036a43133d2c0174f5165ec93ee103859555ccf86679491158b2a
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index aca16631d5e5..43baaeb7ecc7 100644
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>gnu-emacs@gentoo.org</email>
-  <name>Gentoo GNU Emacs project</name>
-</maintainer>
-<longdescription>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription>
   GNU Emacs is an extensible, customizable text editor - and more. At its core
   is an interpreter for Emacs Lisp, a dialect of the Lisp programming language
   with extensions to support text editing. The features of GNU Emacs include:
@@ -19,42 +19,45 @@
      more. Many of these extensions are distributed with GNU Emacs; others are
      available separately.
 </longdescription>
-<use>
-  <flag name="athena">Enable the MIT Athena widget set
+  <use>
+    <flag name="athena">Enable the MIT Athena widget set
     (<pkg>x11-libs/libXaw</pkg>)</flag>
-  <flag name="dynamic-loading">Enable loading of dynamic libraries (modules)
+    <flag name="dynamic-loading">Enable loading of dynamic libraries (modules)
     at runtime</flag>
-  <flag name="games">Support shared score files for games</flag>
-  <flag name="gconf">Use <pkg>gnome-base/gconf</pkg> to read the system
+    <flag name="games">Support shared score files for games</flag>
+    <flag name="gconf">Use <pkg>gnome-base/gconf</pkg> to read the system
     font name</flag>
-  <flag name="gfile">Use gfile (<pkg>dev-libs/glib</pkg>) for file
+    <flag name="gfile">Use gfile (<pkg>dev-libs/glib</pkg>) for file
     notification</flag>
-  <flag name="gmp">Use the GNU multiple precision arithmetic library
+    <flag name="gmp">Use the GNU multiple precision arithmetic library
     (<pkg>dev-libs/gmp</pkg>) instead of the bundled mini-gmp subset</flag>
-  <flag name="gsettings">Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
+    <flag name="gsettings">Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
     system font name</flag>
-  <flag name="gzip-el">Compress bundled Emacs Lisp source</flag>
-  <flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> as text shaping
+    <flag name="gzip-el">Compress bundled Emacs Lisp source</flag>
+    <flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> as text shaping
     engine</flag>
-  <flag name="imagemagick">Use <pkg>media-gfx/imagemagick</pkg> for image
+    <flag name="imagemagick">Use <pkg>media-gfx/imagemagick</pkg> for image
     processing</flag>
-  <flag name="jit">Compile with Emacs Lisp native compiler support via
+    <flag name="jit">Compile with Emacs Lisp native compiler support via
     libgccjit</flag>
-  <flag name="json">Compile with native JSON support using
+    <flag name="json">Compile with native JSON support using
     <pkg>dev-libs/jansson</pkg></flag>
-  <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
+    <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
     of the internal Lisp implementations</flag>
-  <flag name="mailutils">Retrieve e-mail using <pkg>net-mail/mailutils</pkg>
+    <flag name="mailutils">Retrieve e-mail using <pkg>net-mail/mailutils</pkg>
     instead of the internal movemail substitute</flag>
-  <flag name="source">Install C source files and make them available for
+    <flag name="source">Install C source files and make them available for
     find-function</flag>
-  <flag name="threads">Add elisp threading support</flag>
-  <flag name="toolkit-scroll-bars">Use the selected toolkit's scrollbars in
+    <flag name="threads">Add elisp threading support</flag>
+    <flag name="toolkit-scroll-bars">Use the selected toolkit's scrollbars in
     preference to Emacs' own scrollbars</flag>
-  <flag name="wide-int">Prefer wide Emacs integers (typically 62-bit).
+    <flag name="wide-int">Prefer wide Emacs integers (typically 62-bit).
     This option has an effect only on architectures where "long" and
     "long long" types have different size.</flag>
-  <flag name="xwidgets">Enable use of GTK widgets in Emacs buffers
+    <flag name="xwidgets">Enable use of GTK widgets in Emacs buffers
     (requires GTK3)</flag>
-</use>
+  </use>
+  <upstream>
+    <remote-id type="savannah">emacs</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-editors/leafpad/Manifest b/app-editors/leafpad/Manifest
index bb379499ea46..8bf323238b48 100644
--- a/app-editors/leafpad/Manifest
+++ b/app-editors/leafpad/Manifest
@@ -3,4 +3,4 @@ AUX leafpad-0.8.18.1-format-security.patch 821 BLAKE2B 2b26cdc2ddc6cd0047c40fcf0
 AUX leafpad-0.8.18.1-truncate.patch 590 BLAKE2B e12eec5436ba8bf2972a8e0bd09fff7a762e14a9a6a5ffc12817e6c051e6b702c8fa0c0b3fcc554759e4f88d58614f63956d3f4cd9580c7ba09d9a8f65892c2a SHA512 f2c3fcaeeeec9eee0dac5088c40c675deb2b01f313125443f76a869741dab5f88ea181a6b29b8f6ad1f8bbb708887cd10ee1162e121ef5029a4a43eacf14a7fa
 DIST leafpad-0.8.18.1.tar.gz 289117 BLAKE2B 41f01f9b9e031c749a4b1a06d32edbcf9b0f0a694141c79bb462fce29d59f87efa52bc4a7faf270ce28f04697deb6350fe4e26317d28450d7d785a01007c06c2 SHA512 1caad712967f634f585ab32e406534b5ce2c5621008c1eb5b2b48f17ca0f48cd834ea2ea1c67eda4053fa84e8727ff0e708e99d3b5dad838dcf0701389788257
 EBUILD leafpad-0.8.18.1-r1.ebuild 745 BLAKE2B 19f32defed6d54e91d172fb1c3204afd9631f8b421899d3996dc46b1aa578682bc8bc33aa6f29a19b7e670e594e9efcbebb22ad3b08d01f8d808ed8d095b22e1 SHA512 7e661e5924e9ade85e95f74ad97b33a24b585cef2990b509bd716e36eda0ed717cf74a7c408c40cf61a204bc773856eebf49c16ba1d0fe9ca49c232dace6d4c7
-MISC metadata.xml 232 BLAKE2B a731fbb31073fb6f6f72757a484b6af776a1f6ec9d22122e2bcd8e9f73d14f0250fd1369603ef992bf4a8be0b30e20b3680ef078ae850e55c7104c479fb906fe SHA512 22594506a9049d69487673a2a071982153b687ec89d0e0b8548ddd75962c24c96460e1386cae8c4314336db0243542007603fbe31c7b127f468adc42d4e5dcc5
+MISC metadata.xml 322 BLAKE2B 1276ee6be6ed50fa54506d488f0edd595784e3c0fbc7854e07b974a623dcb7ede4a27b9c41509f19f4ebdba3089cf187e39c1db9cc31b045df9da07ae878851e SHA512 ed4523d2a8614dca18c825799c4517270988f2e06fdda6afb712ef745cebae91d15dd4c6f91405309d4b553e1816d295db267354ccdcb7ffe84c9362aedfaea9
diff --git a/app-editors/leafpad/metadata.xml b/app-editors/leafpad/metadata.xml
index 29f6abd3c713..00dd62d025d7 100644
--- a/app-editors/leafpad/metadata.xml
+++ b/app-editors/leafpad/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
-	<use>
-		<flag name="emacs">Enable Emacs key theme</flag>
-	</use>
+  <!--maintainer-needed-->
+  <use>
+    <flag name="emacs">Enable Emacs key theme</flag>
+  </use>
+  <upstream>
+    <remote-id type="savannah-nongnu">leafpad</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-editors/moe/Manifest b/app-editors/moe/Manifest
index 8a0f904e57a2..0e3268e9dd94 100644
--- a/app-editors/moe/Manifest
+++ b/app-editors/moe/Manifest
@@ -1,4 +1,4 @@
 AUX moe-1.12-respect-user-flags.patch 473 BLAKE2B 36857c2387ac28dba72e88e990800be2aa5ee34765a06c5d62097768495139d9dd6a1e26546797d87c6b20e82bcf653e2f67f3a03fee21cf7d8ca042a07d08b3 SHA512 8ecceaa1662c6434c63e49a36831dff7f790462b354302f06243dcb6021ce96b2e9a28c2a512a455fc160d39e5e9a63137fe32e726be31470d12f46015f8ecad
 DIST moe-1.12.tar.lz 87917 BLAKE2B b036b24193045cd5c64812af13e6cf542700e649e78f3ba416501d0915c0ac2eef09bebdb333d145e0428dfacdccef431588ce93b1f407a41a7bd7e0acbc163c SHA512 f0d5daba70d0018ce82d6673749b8f688c0bac58de7684cc24f5badffd6868d425c9f771404186ab5cec12ab94c3e20af870bd920bfef0432a622925838ebed7
 EBUILD moe-1.12.ebuild 606 BLAKE2B 8e9f3f71afcfd043567c1239e8ce035dca59c3bdbf91c51e2c13889cf3ea230ddfb040e58d857bf28960622d741cd9fc47310430c4ec26e6f4acb68f09fdb8ee SHA512 2d62988c15a06ab9630664bfdb2c4188043b6d6e9e6a62f9d394b3d0b83654c289100e395c452fb6fd02f1c8248c081fb352ea5f88adac78b86cab3e554f3236
-MISC metadata.xml 248 BLAKE2B dba7ab19012197ff483b3c5febb6e1eae41d23999686b287a45c38e89ff7565454473fac44579b1e367345933bd749897f8e737f50eaf024190c42069a3d4d16 SHA512 abd659f01838c035f4dfeb2c13e95a0e8e249b41d093af54ff31b4d87bfe03ae472e911a20ff0ad3ea6bb9718dbab822c8b7553ac0a7a59c1d09db7b4d910ea9
+MISC metadata.xml 328 BLAKE2B 6e25cbeb5372cd17bdd15a63dd2594443a996f7a285e42598c72a9707ba4c6270fc969ffad14db30b0eaefd07139a67a7848a29ee2ec52e1e953b00e37bfb5f2 SHA512 097796df8a51618c05e3e8827b1fcb7d642c25cf9c258b66c72669be2111668ba8cc1d059ed36727e65c46b746598ad47729972bdf38249399ae8a4e5d8cf3fd
diff --git a/app-editors/moe/metadata.xml b/app-editors/moe/metadata.xml
index 2c47fcf00594..12ed83f42509 100644
--- a/app-editors/moe/metadata.xml
+++ b/app-editors/moe/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>zlogene@gentoo.org</email>
-		<name>Mikle Kolyada</name>
-	</maintainer>
+  <maintainer type="person">
+    <email>zlogene@gentoo.org</email>
+    <name>Mikle Kolyada</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">moe</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-editors/zile/Manifest b/app-editors/zile/Manifest
index c8a7fc96ba43..fb6d26849030 100644
--- a/app-editors/zile/Manifest
+++ b/app-editors/zile/Manifest
@@ -2,4 +2,4 @@ DIST zile-2.4.15.tar.gz 1490611 BLAKE2B 3744ab2459edf9b0dc9ca976c5f37625d06e0766
 DIST zile-2.6.2.tar.gz 1152751 BLAKE2B db51b534c8d76e1def91bbfe49cab501ff1bccd6fbeddd5622d8fca3695305c53e480eed1978e880621e09955e2b98519cfa02cf259006a08d1a8722122148ea SHA512 16d5cece403fc215d53b35c31fe6f743d53d7a01cdc7d101cabe6760173539c9c31e092b29c374f28a723708027f6de626fcfee302962848091f85078fa81761
 EBUILD zile-2.4.15.ebuild 1093 BLAKE2B 5f94a7c04aeaa447571d806bcf4029d3c6cbdda2d31dcfdbcea2810800c1aa2a7e3b097df3edf923e6e30b223ce450154f2e4923ee501ee7e4b663099b5c072c SHA512 ea016a21bf45f2e2cbfcc09fb23ff25b39d63f8e96b01dcf45f3636c11f24be6cb3130d0b429a6bec4d956e893985228b3757440a1eed5bb5d9c3746962bfd3d
 EBUILD zile-2.6.2-r2.ebuild 1164 BLAKE2B cca8851edd92f7fdc8f09e5b4837d9c83081619132a69a5cf98501458f4609a90f7a224cc76df6c0213f2b8c55af8677346b60b3f5042b3e40b0acca3fbc2c9f SHA512 6e02aea7207398c1ec4c2f3e9a98c6df1e97e2fc79fdbea541a8f952f2b0a3c6efe3a11201b67cfc82f5791c647cd2e145ce3925e15c63d04c1b95a6c3090c45
-MISC metadata.xml 537 BLAKE2B 3a084218fac3dad29b7a80d6f707e7e8c769eb0e755a1a482814d67b0064c274fc80a50dac09cc6d04e963271fd526f34805dc9c49ffb6d5681dc6178ff43032 SHA512 d1de1757bd448535892b60dd6cc739c9b8cb92affd0c7a1cfffcddbcc1d18a1f17d054e751aa4362e26111e6e59206d086e3afb1552a2061503db6459ec34424
+MISC metadata.xml 622 BLAKE2B 94d3576487b2e09f5c1f51f45c2efb4965d1f014460f133d1a8c718cf33f7af90b7080818ec0e5269fbdd14d8cff4e6ebf92cc60b18a4a052f02b5c804406e93 SHA512 41bae1089ed217c1bc3987a5d8d1898d17c166a658b8b635d55867f65ac7762dac4c59dbf1c081c79de67daa200091cfef5966533164d1a16f29555963093c26
diff --git a/app-editors/zile/metadata.xml b/app-editors/zile/metadata.xml
index b90e6fc97258..f5c8083da120 100644
--- a/app-editors/zile/metadata.xml
+++ b/app-editors/zile/metadata.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>emacs@gentoo.org</email>
-  <name>Gentoo Emacs project</name>
-</maintainer>
-<longdescription>
+  <maintainer type="project">
+    <email>emacs@gentoo.org</email>
+    <name>Gentoo Emacs project</name>
+  </maintainer>
+  <longdescription>
   Zile is a small, fast, and powerful Emacs clone. It is useful for small
   footprint installations (e.g. on floppy disk), machines with little memory,
   or quick editing sessions, especially on remote machines or as a different
   user, e.g. root.
 </longdescription>
+  <upstream>
+    <remote-id type="savannah">zile</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index fbc342c94508..15622d3b71b1 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/auctex/Manifest b/app-emacs/auctex/Manifest
index 58b902601f5e..5a888f255626 100644
--- a/app-emacs/auctex/Manifest
+++ b/app-emacs/auctex/Manifest
@@ -4,4 +4,4 @@ DIST auctex-12.3.tar.gz 1534283 BLAKE2B b70db839cd82805ed0410f8b92c5f19a78e92ee8
 DIST auctex-13.1.tar.gz 1600209 BLAKE2B e6ab7d19e60b19f54f8af61c0038a0aa656bebfb56f8a1bcea3ad26a249b2c176570fcd1eaceffbc99d4a824b9191eb301a1ead16dc382f31a09729cd99415e9 SHA512 562f106627d244113669654bc683818c7145c2f74d0ce50824765989e894dfe01e34bf96fe11123ebfb76c7053647697c99ae15e80fcd5e3e022683054a962ae
 EBUILD auctex-12.3.ebuild 1442 BLAKE2B 961fb1c1009e2a53b83aaf0fd48dc605e9c99a013d4a30eeef8634753db3ac80069dc55e0048bac4df77cdd6edb8ed8e3a1aa939aa5948280523ad385a168117 SHA512 4be7449a4479faf4d24ebcb9ee50e34bd99bb0b7cbf360ff8210c0ddc20823247e1c4ede0957bc8af74eb8cc0ffe8776fef6d788fda899a822cf260bd798a665
 EBUILD auctex-13.1.ebuild 1445 BLAKE2B 08a86f8f5ce3b0856156157f0971855da02af277e637224d552805f71b9890d058a58206c5854db1b3c3b4df2a7398d5469ba09741d87d253ec4fec5605ad709 SHA512 fad87a6058bc13095739e0e80c4811d7d3cf1a3806f6af8263cccf6519a069f80f9f541298b40859e4a0655c8c092d64ed7c3b4ec63ff690b6f107561d97a041
-MISC metadata.xml 948 BLAKE2B 8b8d66912a4b4cc3c19413b3cda303b083dea2d7ff18e8d36ff7203a836de192acdaff00c10f9e8bd367d526e717da60d8069f80b596507988bc7e5528305bd9 SHA512 12e6afbe2f695fb822ac10e50212951975858a7aed152d523602195933b359788979b1c4d658b63a0271edb325c5156343db3e318a374f921094c5b989e3181f
+MISC metadata.xml 1051 BLAKE2B 8f85d48d1236c8bcac1a1d674cc8b3d36873f82692fb1fc045767c8deb8ca567a119d101513d89746e92707f2318e71f3131c073e6aa77d8e2c1034bd17edb54 SHA512 99f4f1c9ee6ae4b681372e0e69e62bf30c13578b88e8606c4c42dc595b294c6592cb3c350d2e4c670aa4448ac641c546652b0cc408c93491e2bdb4b8999e3727
diff --git a/app-emacs/auctex/metadata.xml b/app-emacs/auctex/metadata.xml
index 06dfa1aa3a2f..f67ffdf9e9d3 100644
--- a/app-emacs/auctex/metadata.xml
+++ b/app-emacs/auctex/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>gnu-emacs@gentoo.org</email>
-  <name>Gentoo GNU Emacs project</name>
-</maintainer>
-<maintainer type="project">
-  <email>tex@gentoo.org</email>
-  <name>Gentoo TeX Project</name>
-</maintainer>
-<longdescription>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>tex@gentoo.org</email>
+    <name>Gentoo TeX Project</name>
+  </maintainer>
+  <longdescription>
   AUCTeX is an extensible package for writing and formatting TeX files
   in GNU Emacs and XEmacs. It supports many different TeX macro packages,
   including AMS-TeX, LaTeX, Texinfo, ConTeXt, and docTeX (dtx files).
@@ -19,8 +19,11 @@
   (such as single formulas or graphics) directly as images in the source
   buffer.
 </longdescription>
-<stabilize-allarches/>
-<use>
-  <flag name="preview-latex">Use bundled preview-latex</flag>
-</use>
+  <stabilize-allarches/>
+  <use>
+    <flag name="preview-latex">Use bundled preview-latex</flag>
+  </use>
+  <upstream>
+    <remote-id type="savannah">auctex</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-emacs/autoconf-mode/Manifest b/app-emacs/autoconf-mode/Manifest
index 902c9c151632..43403829c6be 100644
--- a/app-emacs/autoconf-mode/Manifest
+++ b/app-emacs/autoconf-mode/Manifest
@@ -3,4 +3,4 @@ DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7
 DIST autoconf-2.71.tar.xz 1292296 BLAKE2B 7fd4b98b4cfff10720e8da6ee91045637991643b50fcb3e47a0ecfcc01600f7b7b36fd1c0a5f08b68a418f1bdbd8d5a98de1008157595dd37cc3a31facb61416 SHA512 73d32b4adcbe24e3bafa9f43f59ed3b6efbd3de0f194e5ec90375f35da1199c583f5d3e89139b7edbad35171403709270e339ffa56a2ecb9b3123e9285021ff0
 EBUILD autoconf-mode-2.69-r1.ebuild 528 BLAKE2B 9a34ee1d0a7667625084f9e75e35d35d93f57eef8b6ca1bad3113a75a8091ed9798fdf5e75b6d9477c9ed58e0e317208aa980606bce191f212f490a98824dd95 SHA512 74858225657f921ac836bcc5e2642efd6e7d7ed9456898fb7085b578c078e791fadcc1ee1f49d6e6b4bbb3392f138ee8ff2d8ad578ba78a03ced573ca1b0602f
 EBUILD autoconf-mode-2.71.ebuild 535 BLAKE2B ee2c8d09424a34416280d35e76b22eb3ab3c3fd8bfc2de42eea9ca02ea17827d5fe612e84b7082cab43d77d0465a265caab0660941920221d518176020cb1f8c SHA512 13e98122a1b330cbcf4325ce06a5db3363518a8f59c4860f88c3366b78f11f1372ea47fda7e59894c7be45dd3398e07bb9f593540fe153ead7e3795b5cd13727
-MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
+MISC metadata.xml 372 BLAKE2B dcbbcfcad0337cdd2edf7fe0fedc1de5d3286f2a92e8cd8ec2c216edb7f32062559377a7d43cfd9fc68b3d5938066751545d5c644474e93d691260b259066c28 SHA512 b261211b6a4d21e8c85b657668ee64ec95b21caa523aee6b26520cb0f6499f8b220c9650af996c289459b8dc19002ddf8629ac5f50c9e903da9bdfbadc5e566a
diff --git a/app-emacs/autoconf-mode/metadata.xml b/app-emacs/autoconf-mode/metadata.xml
index 986088003fe1..bba4a891037d 100644
--- a/app-emacs/autoconf-mode/metadata.xml
+++ b/app-emacs/autoconf-mode/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>gnu-emacs@gentoo.org</email>
-  <name>Gentoo GNU Emacs project</name>
-</maintainer>
-<stabilize-allarches/>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <stabilize-allarches/>
+  <upstream>
+    <remote-id type="savannah">autoconf</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-emacs/po-mode/Manifest b/app-emacs/po-mode/Manifest
index 4251fa6fd92b..e1e9c86b8bba 100644
--- a/app-emacs/po-mode/Manifest
+++ b/app-emacs/po-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50po-mode-gentoo.el 373 BLAKE2B dedf37969c42ac3dbeb4b4cb01af0f9ee79e40aad8586831503bebc1192a110fbecdc0bba339ebe6d7f89a8509e4f6df52f98f7563a90f31d73af279aad81e66 SHA512 48c371afe3f1a1f033ea20cb0a60bc700414108f7dc1f235e62423bda9b94373e49da9bdd3ab76e119b7b6c1b5f0a7601d36ce2710dd23b3de46557cf7d9cd8d
 DIST gettext-0.20.1.tar.xz 9346544 BLAKE2B 6541715b82399b7fac390ccbec82d2878228a19db9a37642b3eb65eb139cf4a5d74f17f876be4946771143b5897d5b4e4ca7948e06bb3edd79f125d1d3954a84 SHA512 82ffa5a28068272d0587262f8d9269f9629c601da5d122b6645c9c4cf98bfe4149df01bb58522ccf8fe25b931672e18551d7fb34de1cbf6a0463a87f9f8ee221
 EBUILD po-mode-0.20.1.ebuild 526 BLAKE2B 62bbbd59d6b9dcbaf95cce70b52d7633ca9a12aaf12a702c628a92e8293ccb285b82ee1f9885c2f0a3a5973027ce9ef63bf4e0d188faa8a978f373fe905bf56a SHA512 39c058e3698739b9449a0bd5d041ed246b941bad3386cc8794e876bf3995ccac513f244972badb3cdb9b2135d453ad6e6530dc5bf486ffad8b42bb7fca055f81
-MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
+MISC metadata.xml 371 BLAKE2B edb991176f561047af6d5aae277d993f199521d510b2e27e9a546b17759a172835447237e4eac59fea544c91cec78db973641062406254fdda297455195a1b32 SHA512 72cd2fe3311ca48e6d02d5f96b093678304dd258ec0564e7a24a0b53fe29da1bff3f505333f30ea4698234fff5f26feea231fab1688bd79a72c2c0a0db9eb22f
diff --git a/app-emacs/po-mode/metadata.xml b/app-emacs/po-mode/metadata.xml
index 986088003fe1..89003aa4c750 100644
--- a/app-emacs/po-mode/metadata.xml
+++ b/app-emacs/po-mode/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>gnu-emacs@gentoo.org</email>
-  <name>Gentoo GNU Emacs project</name>
-</maintainer>
-<stabilize-allarches/>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <stabilize-allarches/>
+  <upstream>
+    <remote-id type="savannah">gettext</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 2ef2076f8ff6..1d6e8b3198d8 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/aldo/Manifest b/app-misc/aldo/Manifest
index a6f61af21785..70033095df81 100644
--- a/app-misc/aldo/Manifest
+++ b/app-misc/aldo/Manifest
@@ -1,3 +1,3 @@
 DIST aldo-0.7.7.tar.bz2 112000 BLAKE2B fec22761f49bccc91f47a224576f1a0faffcb9680826872470392a7c4ebe5018691fcd031462ebe220239e6384a46366fd7611ea10efe20216477bdd102c6693 SHA512 b68f9bd96210f17b6a37bc49f114bba70b75357967580cb4644454789b70285439f15bedb55fb93aa1bc0e5027c46a65679fcefb6a66332ca37d866d9c169e0b
 EBUILD aldo-0.7.7.ebuild 383 BLAKE2B 3b04e952925ef75e47143ae8828b80f3b5b0994ed7e1f613044fa652ec9dfe600e929d3ff712a0ce6731cb9d0755331062bcb28a097f19352572015a320961e9 SHA512 56f4ce1d8071c9afca4450ef980118d5469a49e79d384f5ca43432e8a2f42f3170bdfd2791591981effee5259a6fd6efe1de71fcde81030cd5c14be235c3a61c
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 251 BLAKE2B 36dc37d6db619cba94a5cb6ec03181e5c903a12642413d30467f5940afc6772661749a61938640e1227a2009b0dea5e3cb9cd3a4c400b1bb37c66cd1b20e5483 SHA512 7d056135d2f28c2ad56ddb4152496897139cd6848dfc8b511307f91043dee5267e6bc84ba24a6cad7dd3dbb6ddab8e87e38b0ffeee6b2edc23a54878ce41b7f7
diff --git a/app-misc/aldo/metadata.xml b/app-misc/aldo/metadata.xml
index 85e4ed814fa2..cbb81fdac003 100644
--- a/app-misc/aldo/metadata.xml
+++ b/app-misc/aldo/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="savannah-nongnu">aldo</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-misc/dasel/Manifest b/app-misc/dasel/Manifest
index fe219ea14ac1..439318607e6b 100644
--- a/app-misc/dasel/Manifest
+++ b/app-misc/dasel/Manifest
@@ -1,4 +1,6 @@
 DIST dasel-1.24.3-deps.tar.xz 20531068 BLAKE2B 6cd947a88c54e46300432c2f87c0ef757a53739e0755af48f4596a87ba46faf12c967145a0f263e13abb8f01ffe10c51b45f641de348fc02e7af39417b709d1d SHA512 27696cd5a5c93b3e29ba12fd2730c04047dc752ef17a32db73e7cbc8e5d38d914705720da9ff0ffb0c8d3fb383b5070eb552b24a4e72e72ebad70c2e1085cab3
 DIST dasel-1.26.1.tar.gz 3054446 BLAKE2B 760f03ee0feb1b6e0e0da9a92922f13bb3786b90ab01bda040d2be2cf10ed5d8a8c2db69ac146ac2ec64f6c4503eaaa87d32c73068f27ebc9ce87045052b4af3 SHA512 07efcf0bf31573decc856a8b41842af9658dc1a3b968510b8e4c642ec8cfe24e97de64b6ef2c296da7d5623ca47e92d42e3f7bb927a8a25e54f97546fac279f0
+DIST dasel-1.27.1.tar.gz 3055281 BLAKE2B fde309780c2eef80e1efb52eafe1f5c1fc9c6824f88ed5d902564f4831f6628cf03501d52b7f2605be8ee7d5eb84898d752bac1077e3c06243ffe5b1f1eb4527 SHA512 de9a68cd158262d7d216fe54bc05b7bbaed671dbdee2f3c8055957434903364491c79c00e009e357f1650f2d3f2558ccd609b15f5320026b536eb23cb74482bd
 EBUILD dasel-1.26.1.ebuild 682 BLAKE2B 4e42f9e1c0b72e2e8e0822edfd2fe2cd143a93e3ef4fd192285a5fb907bfed3764d6b2712a56d681fd0acbb8e224a067eced93c29d17adc58c47f245124a9731 SHA512 c9bb3d0094eec3ab1d9f7e9f0d6eb0622f9cc744b9095a8f26a706121ea645e5349f35651f495d506b03150c233a2dd36d0d1f7a0ec91067e24330d9bbce79cc
+EBUILD dasel-1.27.1.ebuild 682 BLAKE2B 4e42f9e1c0b72e2e8e0822edfd2fe2cd143a93e3ef4fd192285a5fb907bfed3764d6b2712a56d681fd0acbb8e224a067eced93c29d17adc58c47f245124a9731 SHA512 c9bb3d0094eec3ab1d9f7e9f0d6eb0622f9cc744b9095a8f26a706121ea645e5349f35651f495d506b03150c233a2dd36d0d1f7a0ec91067e24330d9bbce79cc
 MISC metadata.xml 325 BLAKE2B 468cbe90bb22931af07591f3852927393460a119d19acf0a14328ef11682cc1725bb70ef74309a8e106b5cb1fe36a234027050aab84a1a551e881347e12e76d3 SHA512 75eca3b8efbd254410160102d574cd6268eabc197deb3899a4d67fad265f5397b86f85121fd24f269814154e4f6246c320f6befac5cbca840bcd424a9ce0b972
diff --git a/app-misc/dasel/dasel-1.27.1.ebuild b/app-misc/dasel/dasel-1.27.1.ebuild
new file mode 100644
index 000000000000..261c64912713
--- /dev/null
+++ b/app-misc/dasel/dasel-1.27.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Query, update and convert data structures from the command line"
+HOMEPAGE="https://github.com/TomWright/dasel"
+SRC_URI="https://github.com/TomWright/dasel/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zmedico/dist/dasel-1.24.3-deps.tar.xz"
+
+LICENSE="MIT Apache-2.0 BSD BSD-2 ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+src_compile() {
+	CGO_ENABLED=0 go build -o bin/dasel -ldflags="-X 'github.com/tomwright/dasel/internal.Version=${PV}'" ./cmd/dasel || die
+}
+
+src_install() {
+	dobin bin/dasel
+	dodoc CHANGELOG.md README.md
+}
diff --git a/app-misc/gcal/Manifest b/app-misc/gcal/Manifest
index 0d0e54366e3e..0fc848c9fbe4 100644
--- a/app-misc/gcal/Manifest
+++ b/app-misc/gcal/Manifest
@@ -3,4 +3,4 @@ DIST gcal-3.6.3.tar.xz 1640172 BLAKE2B 322a3bf34a389ab92daa0262b8b36f99b585c7f76
 DIST gcal-4.1.tar.xz 1658948 BLAKE2B 980b509923d7e3afbd391f1129a77e647f61e09d68aec29490bc16041260e56082097732f015260515036a4560bee18391c8f6aaa5eaff69740f18a37a44d8f2 SHA512 24b9ee87c3dbfd3231b2017fd0a3030cc5b7c7fde032ea1fcf816b0f10dc40d808c646aa8ece86651da4f3928fecf35f84f4c68c0bfdb8cf63e3ecc189d2074d
 EBUILD gcal-3.6.3.ebuild 756 BLAKE2B d921836afc98c73ef7040bb23f6672fc80b0c4256351b1ad53d4219de8574d6f20154b7e59dc41517a065411ca24d7f356ebe2c31621837a82fd27c86d4a2b1a SHA512 abec0eb87080b32bdbf86be2643eb9aa56f0fbdd4fe5d8355a3f40fa1ffc241335793150bf1634691448ba60998eee2ed91419d49a3190b6e05043993788d851
 EBUILD gcal-4.1.ebuild 881 BLAKE2B 9e9cf497307c14dc5d745a1d1937976e2b8d1729c3564afe7997f41fa4a1a07a80f89cdce4bc80553f52f7594ad04326332c7f88ef9856f24fed77e2ba60a412 SHA512 b6b5b4ad0353b626c5a0bf80f8a9fb0459182f2e5848130d2761fe91684fc61d95d926eeeb166b6f937260488afe66f153d82af8beab01a53d93f25b52770080
-MISC metadata.xml 1019 BLAKE2B d4fc884d4d383b567d1017a8634eeb63b1cdf9efdcfa094973320e2308708aeffd0f1832a4acc34099d53542aff5ae6a87c557b2a7e52370987ce02d5c16f34c SHA512 4a8cfa4915eb41bdcb95f22b2c5ef1c0b67cafa270b46e75ac33cdac28b1c4e3c771356c5a4942860ee423eb30e4b9edda9ac66d292b1a4828fbdab529984287
+MISC metadata.xml 1094 BLAKE2B 2b5026b4622b89e6e5489dbdd600cc3fede9e71a47bd19738812d0fb7989cf602a2c605ab2ac86cf3879ab72a5ef774977b12ec56b4b95eda820283c04117ccd SHA512 1d9d03ed7354098ec74f2000b0e7a1bee077efdfb08b3ef06e18026b36cbc079985deb2e43d659414c3e4d59da3da765c38fc50b8ca542e8c1b3e2c325b9d1ff
diff --git a/app-misc/gcal/metadata.xml b/app-misc/gcal/metadata.xml
index f9dc5e6492c8..c9b4c5aa1c76 100644
--- a/app-misc/gcal/metadata.xml
+++ b/app-misc/gcal/metadata.xml
@@ -17,4 +17,7 @@
   the Chinese and Japanese calendar, the Hebrew calendar and the civil Islamic
   calendar, too.
 </longdescription>
+  <upstream>
+    <remote-id type="savannah">gcal</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-misc/gnuit/Manifest b/app-misc/gnuit/Manifest
index 5b70abac2979..a78fb6ed3ad0 100644
--- a/app-misc/gnuit/Manifest
+++ b/app-misc/gnuit/Manifest
@@ -2,4 +2,4 @@ AUX gnuit-4.9.5-format-security.patch 296 BLAKE2B b9e315a48ee9049c6eddd93bea1b93
 AUX gnuit-4.9.5-respect-AR.patch 170 BLAKE2B 3a3fea147bf671d745f6ed59609cb946a1e630a80000ebf28d8df79c65ad26751a0fd075e8407a8e4177de6ef446ecbac00d05fecb870ec2ae69c049d10d4c99 SHA512 0f7e1cb33e2d0025664f3975a5ca9e216114e9ac4f6b4bbbab7a22a96351609e1eb4490a04929e843ae4a37ac22c8b55e4fc716c9483089de4b5f0f3bbaaf471
 DIST gnuit-4.9.5.tar.gz 894362 BLAKE2B c609ac823dc93ab4092638dbfb19e85a9d7629f41be43ac1670341151daec49486c220b96b97492b9a51e4400e8581c2d7dc58c9092cf2c09e600d852993ab75 SHA512 91f1a86f45d5a2fab91941587aed3c1e57ae68271584bef38560c9a31fabbdfeba801d87cdf5640ba9f2041e43305e49c64953b8d5370f3f6a463b2fa2a7c5da
 EBUILD gnuit-4.9.5-r2.ebuild 1239 BLAKE2B a155fc898408bd506b16bfa22aa55181ede30fc64d546380a4601f5bf31e6e6287094218cb6e4e0edf364b428b79505d1b6d19e28aa9db21e1dd87f5d58096c2 SHA512 e9afac5875293c6442059955854ab494c7c3f0ba4c0f760f7dfb971ecc05f55912a597d107bc82f642bdd3a75292b8fd50fc7d05a13acbe17ce5003135b1b849
-MISC metadata.xml 266 BLAKE2B 74ac06b4ea12603c8713e69cbff9ce6874266fc48ee5c846f0ac3d50bf577c3edb1e4b6690ec44fc4dd51e55e96dd5c2478831c9f754b04661fe7700d8baf66f SHA512 b996554131284e3556af42d2c5032c5b1635de67d48983096991935e7ee04c32aadc93e48cae5160861e86d64eb6fd4abafc40d9dd8b85ddc032b042a77677cb
+MISC metadata.xml 348 BLAKE2B dba6438c2969c19ea2efc0ea70af25405dfa0204950c0f3c7541d4643bc4188ccb05d4e1d3f062ebe7ee912772b5c4137d356bf92c0ede40532d45a38ac64dfd SHA512 3051487e95ba747d5297e6a8ffc7b748b31f2b949e5c013e4cf18593bcf6f77bef7d6d2e4aa8df76c4f4b1b5766ee905eb1bfa0f7117de54ca7f7a22e8a817e4
diff --git a/app-misc/gnuit/metadata.xml b/app-misc/gnuit/metadata.xml
index 6258504e5133..4da0c2125467 100644
--- a/app-misc/gnuit/metadata.xml
+++ b/app-misc/gnuit/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>shell-tools@gentoo.org</email>
-		<name>Gentoo Shell Tools Project</name>
-	</maintainer>
+  <maintainer type="project">
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">gnuit</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-misc/gtypist/Manifest b/app-misc/gtypist/Manifest
index 0b2d937e86c0..28d9d16a33dd 100644
--- a/app-misc/gtypist/Manifest
+++ b/app-misc/gtypist/Manifest
@@ -4,4 +4,4 @@ AUX gtypist-2.9.5-link-infow.patch 453 BLAKE2B 6fd312a511b4d151a42679a329e47acf0
 DIST colemak.typ 8922 BLAKE2B e3c422e9172e215406a5165a44c51c38f3372c9988f1bafdb537463a9a3209f1759a312c2a5d316ec3a2a0b39563521b87aa6944cdd0b4cf94c960cbe70c7ca3 SHA512 f2c2816836c83d7b640f7f703a4924c62ff0746e0d4cf2a2ca36d434017770272518b835ea273815c93ab9df1c0e4d142f5fea1e5f0b1484ecdc652a53bdc499
 DIST gtypist-2.9.5.tar.xz 929356 BLAKE2B d83506ee8ab26290fae47f98aed4e5e63260f39d5391a9a735d009f34a787cd670b034375c946c7562545b84ed4655d51c385209d676de76cf4891ead9845ea9 SHA512 d6891cd58d23f9b023aec97dc825cb15f7371ab18e82133b9a284d3329b1526bda8e1c5d7225f335c5ec673280cbbe3ad92471eeb15db4ecf29e7feffe27e095
 EBUILD gtypist-2.9.5-r1.ebuild 1579 BLAKE2B 4305543039039e43c990faab45f2065cad4aa5f1800cc54e79341cea096a5be3c2076e2b84484197c9799159f31748b1c71fbbc40618fa91820dc49cc1058aa7 SHA512 d9684f3f9421e0877a061e616a31f76e59f56d6db10fcf1c794fb1e96b1fc306dad9c1736cc510e297c41582ca1862fc7fc94d06fd816068b58f61632eb285d2
-MISC metadata.xml 407 BLAKE2B bbdac15ead4cdfe323acbfd6d58d72ecc6ea04ac28e4bbdb8f46681dea628b6ec8d52b499d209fca4dafba91bddafa4ebe0b30eec4ab016aed369556d87d3d7c SHA512 459dd777389ede008d4e7ef6c29a8b3256c2448c9313f46090802badfea8f6345211e5ffb4457c2839d75a920dc457643e6fe17121530d7da2489d61013ae8b8
+MISC metadata.xml 485 BLAKE2B 170769676ef1f0491fd62bd5d2ea6a090f1341b5edb22d7d073203f6e7ceddfff4e9a0b3c84e965975e3216fe4b2dd9be71a630108fc857c0d34d5c77389f79e SHA512 a339886b430ccd8eeee7ec4840412872b34c953ccc1ae0ff14b7ded54f8bf84ff317b22ba1a700a7c069245b23eac48767ca0b6e4a8014a55f70e4f3aaa5d81e
diff --git a/app-misc/gtypist/metadata.xml b/app-misc/gtypist/metadata.xml
index 770c35e0854f..7f23bdde1392 100644
--- a/app-misc/gtypist/metadata.xml
+++ b/app-misc/gtypist/metadata.xml
@@ -9,4 +9,7 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <upstream>
+    <remote-id type="savannah">gtypist</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-misc/hello/Manifest b/app-misc/hello/Manifest
index 4f73c8630412..192801c6bd40 100644
--- a/app-misc/hello/Manifest
+++ b/app-misc/hello/Manifest
@@ -2,4 +2,4 @@ DIST hello-2.10.tar.gz 725946 BLAKE2B 0af5a3890191dff6e570e2297c20f72c8d0598cadf
 DIST hello-2.11.tar.gz 1018256 BLAKE2B 6e06e4a3a113fc24bca056197ba004fd97b2076bb2f5d660f337782c9a982a0d80e265e7e1dc22f3467257eab071fe5e252a020234839f30ce767ae5d5ee7a3b SHA512 9b1defc1dd7b6a989d3f64a1cb1c6f47276192d7bacf11282ae8683606eb613473c882c1a5e74c18d641f46584f0735981597a45ae4eb37830a5b4d955e3aec7
 EBUILD hello-2.10-r1.ebuild 470 BLAKE2B 4da043cb8d6542105fb3b7bda841d0b0c4246bba7124017ba153f95ee36da735d28b124ed4f1d979469aab64e9edc00ddb07dbe2e6e15c4cd45db07a0509f594 SHA512 f3d4bfed8c5729a4ae8fe089af1c33575f1f77127f45fd779e1a2d9962080e8d83e9e47405951485053dddca13110a55d2ad7f241c528a5b1f733af1029364a4
 EBUILD hello-2.11.ebuild 470 BLAKE2B 8957cfef26db716479f023ea1cfbb6e60d70ac2562f6f5d2c16930fef3cb6a8c3ca5fb21d2b68d3eca7655fa9843619344c0cc654c66816bc0443c1d46861547 SHA512 558e63e1f425927e0cc62694d81c75c9a48b879c259e9e0c29fca73cd434ce1f77da104ae5deee2124e87fbfe171c98f0f301b07a6f310ab10005969cecbae53
-MISC metadata.xml 248 BLAKE2B cdc66ee780cce8b539d2c619893b5a5121982e3cde1ea6308f7795eac4b3d2247922b5900e7908213297c90bec9a63118312ee9349394becfc67a316aa3f5ca9 SHA512 276b07770aef3fc094cdf356ec54c492c34d515e426d47825a8a2df2331e71876b8a0f87f9549d279958e58a6624c1452092d9b185b4233a973096e1d1bd0301
+MISC metadata.xml 330 BLAKE2B 785b422a1f5c408719355b1f8f4857ab8431575a77d16ef6aae25e4a0eb9f57b44422aafca865e92112ea1b2e95c404b8b2359eca200e2d7b4e839ae927ebb83 SHA512 e4cec8adba388c44b6efc988dba444a32e51838f08b9f2be0f7b118aa19b1873bc965c25d4f3d2df29a52615c10b8b3d9c5950608e54800059dd7e8f77d00eca
diff --git a/app-misc/hello/metadata.xml b/app-misc/hello/metadata.xml
index 41492a48020d..e5d57608d806 100644
--- a/app-misc/hello/metadata.xml
+++ b/app-misc/hello/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>tamiko@gentoo.org</email>
-		<name>Matthias Maier</name>
-	</maintainer>
+  <maintainer type="person">
+    <email>tamiko@gentoo.org</email>
+    <name>Matthias Maier</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">hello</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-misc/khal/Manifest b/app-misc/khal/Manifest
index 4e7f5f2612b9..d2a1d35c0191 100644
--- a/app-misc/khal/Manifest
+++ b/app-misc/khal/Manifest
@@ -1,4 +1,6 @@
 AUX khal-0.10.4-add-etag.patch 417 BLAKE2B 2eadf7cb5ba1a4bd179a4f8b37278407819de7f798ce9f23723a11694fe9954bb67a267932d85416644a7dcf09544d13ca0107c02c832e63d36122cdab1e00f9 SHA512 ff5cd23b3351e474f8d9327bee52733587f8e5f8ab8973beff3736bd59af017865512c53b0c42b81f1b4fbb8212099b2d0d3751aa67e190f0e57349ffedd87b2
 DIST khal-0.10.4.tar.gz 185736 BLAKE2B 0cb9deb793f577bbcedcbba4788988973ee9d0ab71fdd30a01142a54434767d74b1d10e5bfa5f6a2feb9f18a8a9fe22717d4a38a07ab5e30b331c87b79a79f39 SHA512 b32f1bfe5d3a3976278726a6570eb345a5ad44f63a52b75f045fd0509d145edd5b76e11a10acffd9c3982edc124f93daec34a37c39299c2311796c0314016eb6
+DIST khal-0.10.5.tar.gz 188468 BLAKE2B 195e61fcff7cff1308f2819ec54c5733acebb5ace18f88afa8fc561926857dab3e0e0b82d1f7e3e0235e69ed9ad56544d6eeb95a9e9829dc078d49ebf96c0485 SHA512 f7b1e4d4934757ec7458fc4e73c6b6c5ee6b1c64f6cdc3e61771a2f05041515e4afb73b4a17cbc577747039b689ddd66503e120648c4bfe4e33113a3de6f3d14
 EBUILD khal-0.10.4-r1.ebuild 1308 BLAKE2B 2fc2e3abfe6931cad4dceaf6213fd8280c34fce42dfcbc514ed522481b9a016b52660929b0b5dfb134b69376e13eb69003cc274dc0bff6188409270692d657a3 SHA512 e9e1b130e4a7ad2ae2b2e7b0eaf36e730cc7cffe248d8c749aec372bb24530b2b7a1d0e1b6b398324d9b4828fe842d1ddc3c38ffa26c5bf95d72ad22c72575f1
+EBUILD khal-0.10.5.ebuild 1146 BLAKE2B 89e3eabf060cb868872ff5ee29d8dffdeabdd607df5083560747f3064669d556ef3e609355edb431c644f18b46b34b35d462235d24a5ba5a74704882ea3e86c4 SHA512 9ae3cadad7bf326fa294929371c2a31d96c8b6246eee398fc6813995d6e8615442e7cc04f6cefad6afb91d21aca9be96a654a5b0e388f9e6b8f4e186213cce43
 MISC metadata.xml 285 BLAKE2B 5e4543b327c8dc84cecfda51b540cccf8722c584a44ce5146beb390ccb3105af8789c8dfefe614e92723eb12a3c167baab09d6e83bd1d7ad2feb3f5ae31f7c81 SHA512 6309634c2ea8e5cbe7ce1627098b90fc90ae12829000332f83e967dd3ef1677dc807b78332cc9c790155323086d901b9db1c5acb23252c1f5e5d241d8b0b73d9
diff --git a/app-misc/khal/khal-0.10.5.ebuild b/app-misc/khal/khal-0.10.5.ebuild
new file mode 100644
index 000000000000..07c83a85bd60
--- /dev/null
+++ b/app-misc/khal/khal-0.10.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_10 )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="A CalDAV based calendar"
+HOMEPAGE="https://lostpackets.de/khal/ https://github.com/pimutils/khal"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/click-log[${PYTHON_USEDEP}]
+	dev-python/icalendar[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/atomicwrites[${PYTHON_USEDEP}]
+	dev-python/tzlocal[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/vdirsyncer[${PYTHON_USEDEP}]
+	dev-python/freezegun[${PYTHON_USEDEP}]
+"
+
+DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.rst README.rst khal.conf.sample )
+
+distutils_enable_tests pytest
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 68bfb0b47e57..79b800f0a443 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -10,4 +10,4 @@ EBUILD screen-4.8.0-r3.ebuild 3848 BLAKE2B e861b10538b50fa4d53a9b42fc3e69409c2a9
 EBUILD screen-4.9.0-r1.ebuild 3851 BLAKE2B 5a85d371d6fb07207d883fa1324094f605114af99c017fb95cd3ff1bfe5d37ba3f0a659e7b98129bf680546514fe6891362369a8ba8e93e1794e0524b2c6bbd0 SHA512 a258bc64578d2189003c1f6d9cd24e5025983cb70c6da9332c654d0a7a5331a434f56c14e336480d9f5f03d040094d7e0f01a4c00498403718ea8a45c3e71111
 EBUILD screen-4.9.0.ebuild 3776 BLAKE2B 3a633a10f4ce16e6a98ce539679e6466f41e2edab285caea9bb8d51706d657df7e31d03639bdd9d87a77af7cfc2d308a64a72800371076ba66b981bf942547b6 SHA512 9b8d81c3652eac5342823c27e3199a873031bb8c54182ff3432d631e6f363322a71973b9d58610e93aeca9f040f30f06a3e4592d573146ea826c3f05d13db9e2
 EBUILD screen-9999.ebuild 3781 BLAKE2B c70c76d9f0d0f1ea8f7af9d182e22dcb381d9e0ef0f134b27e72e07a3be90e387efe0856dff3459ce04e125dd0e555e83df1e5e32c93bce84ccb7a6b1ee7f6cd SHA512 b503a8ebfdef364fed0acbac79f0960969c668b68243c337ed12a814e7b796cec4235a4faa2c6bae84cb20d6d866547aa3e2b1d4dd242be328cbda43a9c7f188
-MISC metadata.xml 1783 BLAKE2B 6b1b392339f6786f95c151a7f311c24adf76c32d23e0f5bf50ff97571ab7e0a7b878d1ccac6938a01c2783c4f54eb0644dfd1f35b9bc602590fce96eed4a4e99 SHA512 fc4a716f118ab74b7757035ffadaaeebd47ba512a8ff123a7f5df4fa8fd2b384a66d4da88f8b78e7c16314b710e2346cfa6fc644c22f059d065cc1778565d060
+MISC metadata.xml 1860 BLAKE2B 72021d6e6edd33ced5a240b0ce3420426050c2a1125e538fba9b804295ea781ea4dde6364cf77b1e6952fc2cf8a3dbc98405ef34e8d2ae16770ccf9d63712971 SHA512 4f482283cc93755a07800554c2cbdc6d65cbf24e3a48b8b148c31c5dee140ed7214024ffc32bcfb85deb47a0140dd348eb657ec6468f0195a9eca2d2e22dd06b
diff --git a/app-misc/screen/metadata.xml b/app-misc/screen/metadata.xml
index e6af8d165fdf..a27a752aecda 100644
--- a/app-misc/screen/metadata.xml
+++ b/app-misc/screen/metadata.xml
@@ -30,4 +30,7 @@ session is detached from the users terminal.
     <flag name="multiuser">Enable multiuser support (by setting correct permissions)</flag>
     <flag name="nethack">Express error messages in nethack style</flag>
   </use>
+  <upstream>
+    <remote-id type="savannah">screen</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-misc/socnetv/Manifest b/app-misc/socnetv/Manifest
index 8218dfeef9f3..cfe7ba817e2b 100644
--- a/app-misc/socnetv/Manifest
+++ b/app-misc/socnetv/Manifest
@@ -1,4 +1,4 @@
 AUX socnetv-2.2-deps.patch 218 BLAKE2B 8f9900b1f9a6d6e9e4a116d3da75aa743d7a193dce8136582eabfa9c183209d4ead2fa782d7cefa5366eb98f1a5e29ac20c8f0b2350982856c05826130b63fc4 SHA512 30fa3fda847aee54452ebbbaea8ae2439dc99fd5b79bdd41517d12effaf2a8e1355257b00e80dabb40e1502a169a8b46bbb98af8ead5239731d35a75b847db03
 DIST SocNetV-2.2.tar.gz 745086 BLAKE2B 3b520df2bb29f1989f744ec7e424caecd722cf3f903cf494e0fba9c0e5c1def413411768f593a3f8c0eb3cc20d1071d54babbd76eb24aac9f6670b4f2623ceb7 SHA512 12f490fd1f7fc1a6b45f77d23d8825117def0b7720595cd203d171fd88c41d5a0194a70359f55cbe2dab9e545f300156b31bb0680e46d7ab584e070e128e457b
-EBUILD socnetv-2.2.ebuild 758 BLAKE2B 6e2ddd4164d44e33afc0605d0e712fb4161d973f50cd67d74d2d5ebd64a27b871741b8596bdee8cd1d460b2cb01f975181114d2d25ca11cdab3f8c0ad9d13f52 SHA512 bbab328b52850df83062f1ddb7c2b73ee8694a4f5793d79e335be6d4bfcb3588751bdef9c0d97278d6b8cf3092c7b5491773a836cc8071a4b43e8d4d01f8f5ed
-MISC metadata.xml 789 BLAKE2B 62f971025052aebcd3cb4a429842a60eb822a8c425ba4dc8e0ea9b7ae56674046d64b999246924634e6c387c6341491a9e3c01e7ec56d4625279bff12eae0b74 SHA512 238b8b0a0409944a14f569860dde0b5869ce6cdef2036f20a1b3c0a58870f3f548344cb9ba72ffce7c0c9d81227a9d1d0ce3584ca63a39df3e46301116c88701
+EBUILD socnetv-2.2-r1.ebuild 794 BLAKE2B 3479bfa3c1e4eaeaeb50d42792a29461a58b7ca0bc4e0078b18f020dee87051da689302a3315f4180db3efedcb394016f49794000f8c50caa8f9c287ef6e751a SHA512 de3ee0f0b3294e23df3428163518d30085fa4e424f668abf42d5aad79bdab3565636b972bb5f865d9d0fad7772a26bf5b7cbc1e11c2b77ef64a0ca13a5e57d14
+MISC metadata.xml 840 BLAKE2B 39926319d15efbf8df0d9de8ff19a5f41ddc627843bdb494231b6fc254b3bbb26ca7653e62cba6902d4fa4efa782c65c6897bacbe0402bfc24b6da3923fcc65c SHA512 c38b95fb0343ed4eb0f2e572bd11f8f5ba879761d3cd404288afb34da1f86d0b1de19dbb1bb450b74466bc03f6c372c49133aaa338d1bcfd243b2e772d664504
diff --git a/app-misc/socnetv/metadata.xml b/app-misc/socnetv/metadata.xml
index 5871c3583d42..7e68ced7e09a 100644
--- a/app-misc/socnetv/metadata.xml
+++ b/app-misc/socnetv/metadata.xml
@@ -11,6 +11,7 @@
 		automatically create networks from all links found in a given initial URL.
 	</longdescription>
 	<upstream>
+		<remote-id type="github">socnetv/app</remote-id>
 		<remote-id type="sourceforge">socnetv</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-misc/socnetv/socnetv-2.2.ebuild b/app-misc/socnetv/socnetv-2.2-r1.ebuild
index 21357723af64..3c0c8c58f078 100644
--- a/app-misc/socnetv/socnetv-2.2.ebuild
+++ b/app-misc/socnetv/socnetv-2.2-r1.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
@@ -38,5 +38,7 @@ src_install() {
 		insinto /usr/share/${PN}/examples
 		doins nets/*
 	fi
-	doman "${S}/man/${PN}.1.gz"
+
+	gzip -d "${S}"/man/${PN}.1.gz || die
+	doman "${S}"/man/${PN}.1
 }
diff --git a/app-misc/wayland-utils/Manifest b/app-misc/wayland-utils/Manifest
index 57da0e48ab00..e82ca43ee837 100644
--- a/app-misc/wayland-utils/Manifest
+++ b/app-misc/wayland-utils/Manifest
@@ -2,4 +2,4 @@ DIST wayland-utils-1.1.0.tar.bz2 14071 BLAKE2B b2726205c8d123a4543aa316928fe2909
 DIST wayland-utils-wayland-utils-1.0.0.tar.gz 13188 BLAKE2B b05917c611a54e157e31c6e83b026c0960189c36d71361e12ec6dbc33872184fb2ea30cf04a0c57ba6a9b776e5aa51baf286f092eb8780fdd6f0462c8e36ae87 SHA512 0e5886fc74bf84396facb79bfc2fcc4fa7ababc39f861fc62d198656c65dec31150bc7fd27773dfa8add421f08ad0dd43a7d72c9e8f6f5733ac34fb8212658cc
 EBUILD wayland-utils-1.0.0.ebuild 588 BLAKE2B dd9eb30959b6d87b21153093669f97e8b123fba85909701b541280a38601612f675f9b0d98b7eb30c9a605287564707a3a65e06c2c4dbe4e548752659d6d2f7b SHA512 877c480d53e85f9fa97a3ef5519df4792a7cc3c9729a7af6cc8b5867d4eae8999b977402bb182fe1c8719fa33301ec634afb126418f55a7eaa4dc8362b0e946b
 EBUILD wayland-utils-1.1.0.ebuild 662 BLAKE2B 91b07a1e53ba17f25f98431f60682607c7890059243df607b711c67e9730a5baee6a680ba35d0d2be7011dfda9e7b4c825bee9e3792af723a1233df3359ad2ed SHA512 4f242830050f959503499c2b64484633ce439dd7cdb6995e75b735ebbef69ee269369994d07a1e4324b4376cfb3146ac9a0aea2cac4257c3502fcc1c31e5d9d0
-MISC metadata.xml 235 BLAKE2B 5ed3cd35ac32a5cdd6ac490bafdbc1cd03fc8c6bdbc8194ba7f4a34151a24c4ade7a80705d92348d6d13a9579d18b19ec40a353bf014dc02f98980bfa03d3574 SHA512 3fe78f6dd92b87b30ed02aef15ed72ec5cb62f4c6568dd9b98dcb2f11a4b9ce93955e34c62112a310b4c4a51f87e0e31e31ae5af140e1054c127d3cd344d7267
+MISC metadata.xml 343 BLAKE2B 1245da4d0eed93c9bc6822719c23140406b752f84b3cd55c7787511164f9bffffafaf359b86e9fd14a52dc119d8e77a21cbaff3c4420348fef8a9a7c92430abe SHA512 12684765e5e7d6f51a0b77180e9c7dd354f29515026fd61621d10b65451d2cc007138b14aa3f5adb4a408f8805b866bfca331ca8083d8d1fe11a2d9f6fb1abc6
diff --git a/app-misc/wayland-utils/metadata.xml b/app-misc/wayland-utils/metadata.xml
index 6bbd73893d34..74511dfc51a3 100644
--- a/app-misc/wayland-utils/metadata.xml
+++ b/app-misc/wayland-utils/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">wayland/wayland-utils</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 25b473a69bc2..e774e5500080 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index 12b99638dbc9..17347134fe87 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -1,4 +1,4 @@
 DIST layman-2.4.3.tar.gz 135311 BLAKE2B b83fd543468be904a10d6fbda11f8d603a6936ecef3029c9d1c82fe4c938d2cd299874a3e114ac3524485ce8a33c5ec21885adddc218f5e331519318c0b1ad5a SHA512 2f3d1180647b358d5ca929fd28c6c5f4664f1f6f24e3114a4dc886d23279ffcdde7ca292c64aab84f1710ddf7029c26483de07c2271ca527b8618888b0ea2b54
-EBUILD layman-2.4.3.ebuild 2366 BLAKE2B 09e1ac426eabfd9b1a2a84b863b6c87d71e77ef93341082e48f28470fbab5058ab24835417b740820b11b99247a8e5b2b9b93cfe526e3f172b459c0f43ebcc6e SHA512 5047c533b4ae0c0190358ec9e3788f9ea0b8c28cdf9610b83b9da212c00db71aeec773f5426f6b826bafdc53478c1bc6f42c9e4fbfdbd50a3c756798d1393dbd
-EBUILD layman-9999.ebuild 2373 BLAKE2B 1d2630864e851b469d568e12aae01926b55448aa95c2c77f21ceeae78add5b672a9150901faa2f8cce5493a331e846192bb2c16c1379cc6db9a476b8d160b663 SHA512 1800110551b04db9981b998f0735b9798446c1fbc6d21f180fd1cd0057a8eeb9de5efcb886898a31610f6f07763d192838c00cbd007e7e171b844d2212ecd24c
+EBUILD layman-2.4.3.ebuild 2428 BLAKE2B abb05f7e4b02f40715bd1aa62690b83cfa6c1f6d45e846ad4f867efd981a516b75b5fabfa30bbf4ad26062d49a56066cdf94875493f065cb823aa47358c04554 SHA512 743a7c576f7a644eaaab243b62f02d1df1e98404a39c82cad848667bbc86fdb52a658f9f0dec65f42a66fad0b1fe7919ac7a3c026a0f406431bddb23c0cea517
+EBUILD layman-9999.ebuild 2435 BLAKE2B c8f917eb5b16e3f0a2317c921336555010963ca4382496c0d162b6265866d6879904605d9d84d16a686e794bbe85101f79d853c0e9ffb9e08ff2a1d1e4a0500b SHA512 4c4588065be463ab118f81c822723ce60c5f5d355bfd5eaf80fdad100fffdf83922c0346cff0114c53e4d9b4ca1dbbf842f4b3852dbfab9bb258cd18f2e286be
 MISC metadata.xml 1103 BLAKE2B 3a719da18a59c5262d096af809af56f9f905ab14434cb4b29affd031cf463d69a203c73b10268bb74280d5627788d3d2a4498fa3a7ec573ae4188025919f1bfd SHA512 53a40e4f7697ad39a8eb274c68af4dc5b95f8f1da741b8fdcd034e4ee3ac20a63e3b86005ec17dcfe3a78eb7dcc565fe431f8393f15c8019993070c0b856133d
diff --git a/app-portage/layman/layman-2.4.3.ebuild b/app-portage/layman/layman-2.4.3.ebuild
index 241864865100..eed4b3067dc7 100644
--- a/app-portage/layman/layman-2.4.3.ebuild
+++ b/app-portage/layman/layman-2.4.3.ebuild
@@ -25,9 +25,7 @@ SLOT="0"
 IUSE="cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test"
 RESTRICT="!test? ( test )"
 
-DEPEND="test? ( dev-vcs/subversion )
-	"
-
+BDEPEND="test? ( dev-vcs/subversion )"
 RDEPEND="
 	cvs? ( dev-vcs/cvs )
 	darcs? ( dev-vcs/darcs )
@@ -39,7 +37,11 @@ RDEPEND="
 	sync-plugin-portage? ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] )
 	!sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
 	>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
-	"
+"
+
+if [[ ${PV} == *9999 ]]; then
+	BDEPEND+=" app-text/asciidoc"
+fi
 
 layman_check_kernel_config() {
 	local CONFIG_CHECK
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild
index 9045c9189761..49649b33a171 100644
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@@ -25,9 +25,7 @@ SLOT="0"
 IUSE="cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test"
 RESTRICT="!test? ( test )"
 
-DEPEND="test? ( dev-vcs/subversion )
-	"
-
+BDEPEND="test? ( dev-vcs/subversion )"
 RDEPEND="
 	cvs? ( dev-vcs/cvs )
 	darcs? ( dev-vcs/darcs )
@@ -39,7 +37,11 @@ RDEPEND="
 	sync-plugin-portage? ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] )
 	!sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
 	>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
-	"
+"
+
+if [[ ${PV} == *9999 ]]; then
+	BDEPEND+=" app-text/asciidoc"
+fi
 
 layman_check_kernel_config() {
 	local CONFIG_CHECK
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index c459ce5316e5..23444945283f 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index bf9da49afc7b..37cdcfbd6ee8 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -400,4 +400,4 @@ EBUILD bash-5.1_p16-r2.ebuild 8234 BLAKE2B f5b26b6ad263cd92f91f8c6fe0896b90cb43b
 EBUILD bash-5.2_p2-r2.ebuild 9477 BLAKE2B c16b5f06f20e14a0401f3acde5bab9e5e260117f75b12a8db2d2557f9d98d60231931f141a93a340895896bfade9a8e3de41928e5a26ddcad6ef7068c1562afa SHA512 4377489d3ad2f3d2e50715e10c364fa5e73e0aff7d36399e0176add2f573db9a0b9816c62055d4bf34818fd11e80e7323a9cb8e6bd02d4daaf47e45c10742dbb
 EBUILD bash-5.2_p2.ebuild 9350 BLAKE2B e1e028bcef06fbbadaa200376a7d33bd2fa2b1c4ce5a5711805ea9b7bf3426a4785b147cc9cb1a8f2314b004ecef0d95c0b212a935946225b11e9334031e55eb SHA512 deced834f4d2cf6ed25405b45018fbd20e9da7cf2e64bba75979a19e8c13fe6404569a58555a233cdcd4dafa039b8f2bde89e014c0b12194e6c1c326ee0dfb8b
 EBUILD bash-9999.ebuild 9350 BLAKE2B e1e028bcef06fbbadaa200376a7d33bd2fa2b1c4ce5a5711805ea9b7bf3426a4785b147cc9cb1a8f2314b004ecef0d95c0b212a935946225b11e9334031e55eb SHA512 deced834f4d2cf6ed25405b45018fbd20e9da7cf2e64bba75979a19e8c13fe6404569a58555a233cdcd4dafa039b8f2bde89e014c0b12194e6c1c326ee0dfb8b
-MISC metadata.xml 963 BLAKE2B cadf4453d8e9f77353fcae360e6d2b0a254303ba4ee422bd799be1d44733ca2833c1a2cf21c0ce30fdca365e70f0bb295f946669483c1d284ffa89fbffdf6a50 SHA512 51079c00a5d93eed4169a69fdae98c292df842de195bb8880319a582bf37ed1d1574ae57805ccf57baf0880391871c07b794487806257da3eab19744d8090e35
+MISC metadata.xml 1009 BLAKE2B f71587b0a6d05b907f82b26be93b071290d91dc8f612f7b008a05eaa94d45be2ef8c1d992b7ac886648a9dcf964c30e8d9a7aff90d44835beb452e0d635b9533 SHA512 8aa1cb4c3206a76d10181394a91c315967fd9d3b359194f430f075fdd5a0b4b32149eec36b85412ef7e84b55e7b01955c75486b2df82b392a5acb3df8229a88d
diff --git a/app-shells/bash/metadata.xml b/app-shells/bash/metadata.xml
index 6ec75e4bd86f..9459ebc90e90 100644
--- a/app-shells/bash/metadata.xml
+++ b/app-shells/bash/metadata.xml
@@ -27,5 +27,6 @@
 		<bugs-to>mailto:bug-bash@gnu.org</bugs-to>
 		<changelog>https://tiswww.case.edu/php/chet/bash/NEWS</changelog>
 		<remote-id type="cpe">cpe:/a:gnu:bash</remote-id>
+		<remote-id type="savannah">bash</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-shells/gash/Manifest b/app-shells/gash/Manifest
index 9ade6e4349a4..cac8a36c2508 100644
--- a/app-shells/gash/Manifest
+++ b/app-shells/gash/Manifest
@@ -1,3 +1,3 @@
 DIST gash-0.3.0.tar.gz 334781 BLAKE2B a654978f7ea4bb36ab3c6e194219e3796fae1f1c19d36919a068e384aa8b896445409186c2f34e92e447254cdac5e6fb86b2ea0c0810ea0fa72ea40f4c8f89e2 SHA512 14e4d6a4eababe07a59f694baad3942122d3df3109478bc52c352431b0e0c13f7246ba722276d314f04a15cec78159cbbb390ce6df4d2eacecc2eaaf6987af59
 EBUILD gash-0.3.0.ebuild 683 BLAKE2B f4d07ebc45f44089bb0b4ad36c8f6085c12c5c26ec0bd9b91c769f57a92716e5cb575ae682b521c8f4e39c12d41b66046e4d46d2591d2fd1737357728b4ce7e9 SHA512 74428f09897c29be45b68fbcec6ed5c079410439a581917d004865bbee8ad689dde5501148d3b9a3c679068e91370183b532dae7c02ebae9d475db866dd5bd1b
-MISC metadata.xml 540 BLAKE2B a905bcb1a3444f162e5f94d301ff937e07c47c60e3def129d66368c7f98def5692c69c84a76fb4dd11c0ca5f22659e6b053cdaf96b4c88f4fd8c259288296a9b SHA512 a6aefe996e229f86b9298024e543610a9ab199d55800abc1e21b712dfd93419d91637acd458b1ed6cdb0eabbcd4527546c92b2b6727fc5b4cdee1f7a7a54f6b1
+MISC metadata.xml 621 BLAKE2B 1e37bef94731e6f542871276e72e54d3ad9d35b930f59afd4c556bf0ea1a415ad99ff7a4a20db4050e3f95f01356aedd5a05996161a7e9bae217e8f5b0c31938 SHA512 44212f400dcb692a3e03fe7044f576e171ab331e5a84a77230acc58bb28164d9afd564dbc0de8b1e6d96ad2cf23b628440a762996a401b2fc13df40fc2f51d3d
diff --git a/app-shells/gash/metadata.xml b/app-shells/gash/metadata.xml
index fecc1d3e3f38..799ad8f39abd 100644
--- a/app-shells/gash/metadata.xml
+++ b/app-shells/gash/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
   <maintainer type="project">
     <email>scheme@gentoo.org</email>
@@ -11,4 +10,7 @@
     the shell interface, as well as a Guile library for parsing shell scripts.
     Gash is designed to bootstrap Bash as part of the Guix bootstrap process.
   </longdescription>
+  <upstream>
+    <remote-id type="savannah-nongnu">gash</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-shells/nushell/Manifest b/app-shells/nushell/Manifest
index 34ca8db4b8ab..3264886706a5 100644
--- a/app-shells/nushell/Manifest
+++ b/app-shells/nushell/Manifest
@@ -6,6 +6,7 @@ DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef
 DIST alloc-no-stdlib-2.0.3.crate 10199 BLAKE2B 725d0ee96e91bf93434757340427bb59b6efb1e169e202fa9153b1ff34c002fd69e08de6940e1830484ab40cf72530abecf0ffde6e2a238e2974b2c568c79022 SHA512 44dc8360a77dd984e4211648d1a2465df9d664885ab8f523dd0b3200e3d28799e4149d7b3df87df8a9cb19602331e98badf596a626f484756cd14926bfea6078
 DIST alloc-stdlib-0.2.1.crate 6304 BLAKE2B 949abd6c77f4c448a32eec2df8a2ced03a2fe9cbe39acd15648d7a9f791896ede108cd16d0d82b9b746885cbe6b78a46087024609126c837bc666bfc6bf3667b SHA512 282f1d34d40b994dfb008abba45c99c1bb7dd30a1bd7e168f4fda7297bec5edbfe28358eb3447d89d02cfada0a6035ef69388c7c533b00c31dbd4a1e873a483a
 DIST alphanumeric-sort-1.4.4.crate 5740 BLAKE2B 1509fcc1994a7ee14d55e1e094110e6422d3466486f00e9cf481e676149c46642806c44f4c02b146752a3b6ae7346e81cce43d7051ed11b79e0b0b8994fdf294 SHA512 1ba7e4634bb585faf43a85930de922cf9988aab44ce8ef33cf3a1c4f5b75dfb8e0d0a229b16e56681b161dcfba75fe83ddd0792d284346943dab968f217dc008
+DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191
 DIST ansi-parser-0.8.0.crate 11752 BLAKE2B fda164c2d48a9e57b118b7d4535e5777c129e9dec93ce078d049d2a865c934f6d0fa6bb153396b39707e6838195c78a23a58dfa37b6d5d9b684a5b2142835479 SHA512 46a53f94d048c0552690d048cce66dd7fe5a85bc1aa1a254f11f32f54bb5114ddb5d8c12609de3b65ec266f50a9bd777322eec53b6a9690534c1d427779b1cef
 DIST ansi-str-0.2.0.crate 16370 BLAKE2B e43cf7762ea4ee9b9186d8d3e35793c0a6b7b3d4a81b67ef282a4c0801c293b5b4a4e79a80c1f29030a0bbdb016ce7394399250990e852c547a3e294114a9d7e SHA512 4ebef80af343760c420ca3fcdd767ec04ed6ade298319b072a95bf81cf0458c55b238b1810945ab5af1d52aa758bc594c14329b81d03d5cebbf0dd06f89d2bff
 DIST ansi-str-0.3.0.crate 15657 BLAKE2B 686c9ad7d5e648b2025b7e8c9104e1d5db0b2ba9e8400f49672449a73a01fd180d374a9dbf460f8f329d879f7cec7d9c21f5faa29d57ff660cc4bc4f7b7ccfda SHA512 440cdd772afcd01879d91a9720f33b969724cc2c86377d97f64cd048517f6c51c5607712ab6b3a1c89ed5ea643f053a033e030e82839a2487d5000c8d5cc80f8
@@ -18,7 +19,9 @@ DIST arrayvec-0.4.12.crate 26551 BLAKE2B 45514f09f0fd1fae7afb7dc812142ac8d88d1f4
 DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
 DIST arrayvec-0.7.2.crate 29341 BLAKE2B eae9d3f494033ea2d837a6024cb24bd4574683ed1e76ac6be7f7c6b0d8ee65c0eaf03dbae7fea04cf0921299f69234ad91e1cf41342de86f554f74e287dd3ba1 SHA512 80cc6e55b6032f4882362813de970d3d99e600ada774b28ac6a24c9c8e018fda3b35c5750ac3a09fca6fb9496e2e3fe608b58d21b1b84685ebd170f567a0ecbc
 DIST arrow-format-0.6.0.crate 35077 BLAKE2B 00b56fb9cf390fd1d7e8798735ae87f234e89ed4fc8df4b229df511ff067af8b77fa413c92e537fb4785ed51fb53473fc349a3b98efa00ba791ee467bcdbb039 SHA512 68a1700d56c3e5317a23b1e6f55a49260e4bbba4cc83eebd62f9f40e7a8e62acffaae26224d277cf3fc13f88c643ecb27645f6213f6c194539381915b9b6653e
+DIST arrow-format-0.7.0.crate 35084 BLAKE2B b99bd072b255ccb70929f47ed5d6dfc2c75011c9022171d37566561e62d90a0a9e432121bba9995a98fabcdcd25cd7a6b3b37b8d0ff092e1c1f37186471e9fc4 SHA512 c0ae3db5829acbd5f0a1ad923b24be7869e23afb4e07d1f4484f547cc240593fa118cc21bace9a5ce0c09c20da021f78577e1d1967017b5a9dfa531133649c05
 DIST arrow2-0.12.0.crate 736449 BLAKE2B c8a803571ed9f06fdeaaa04c56bb155cb8f006a15756cca4b776b1d0ccc7fb3c457e2e3ec7b4515f2f364de90dcd8239940269be4782aa2dc5c638b902143363 SHA512 7921639394018fc1a070891db2185d6499f34079fdc407f808b8bac15a6bec814cf4d33b260531edfb26bcd00187e9fea6ec42b388aee0c318ade7b6963189e1
+DIST arrow2-0.13.1.crate 765490 BLAKE2B a8555bdb5a13192f5e41a27c38497cc20918483a63c2c835bac9c99fc0ba19d22d38a1d7be95e9263e50fd73f3af908405337c53cd66755dd2703bfb3d693fda SHA512 09603af1c1a85a117e3365559462fc3a9cdefa4b108a90ee9610859031ef4cfa4e43e8bd761369556282ee434d53e7de31acef40bba7b8a4c0af6516d2be288b
 DIST as-slice-0.1.5.crate 7986 BLAKE2B cebed41646fde627d759292bb9b1f5ad5033b526298a61aedb425d99473f37e2d3713b2cb10235986a50737573dcda3250dbf62c931a9f4752a5d0e01fc60462 SHA512 ada4f8ab265d6c6a8da0f98159a379dc4c4f4eb6cc827ccdf18fd525339d391ea4396de6f4322092ad00eb53156fa43f90ee0df09155554a3f6de033e5abc58e
 DIST assert_cmd-2.0.4.crate 22581 BLAKE2B 7fc9fe4577e486f26d07b2b4419c331022ca61923d0664f4e8a25abbe6d6305600b47c739f9f065ef778bdeb59b6309ab73df2be11e5f8387cac2e7e8c70a4a2 SHA512 c389e0210153e9a6ccbba4dbc6a6c7a23533e5fe76e717dbc36415be2adbabfbc0de33a2e6d05e3d70779b7a278580edba400c688c9a6b446403b59a78d93720
 DIST async-stream-0.3.3.crate 12142 BLAKE2B 982831c5161e4fe3fadd5cb62678ba6d17c08e8d00de6cdf67ea2fcfc99cb878f7a87ed6eb29474f38081e0236bcf8e98e1ca2ae7d14f72bae2a6443557f2382 SHA512 fcc1e2c4e845ef309ece18824dcb769d84bf2370427f339658c489909028daa5e86e9dd4150c62c4279f4f498d4a73a200d9036271107d16134f56713aa6a0d0
@@ -34,6 +37,8 @@ DIST bare-metal-1.0.0.crate 10650 BLAKE2B cc3185e5aa6cd7856e8ae507eaf87afb45a786
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f369902d316a4fd1ae4b8edd94e2d4a8cbff0e96646eb29facb04a84b249d74f0781dc3d29c8797ac975aa9f SHA512 49e39d71214dbb623a18e3852f6f2f2a5c3f951b64107d66c8adaa95a442a3283fba978bca41b126c9879b12833b945f478d2c77d35482b3577fc1a894e8e5f3
 DIST bindgen-0.59.2.crate 206267 BLAKE2B de66347fcf2d538879e49c85d2db80e86a70e27d3c84464b52a840476a31edae0cfa3e1afaba33ef0b7abadcb1e23a2fe1420e3254e0de1f6848b575a9c96620 SHA512 14c49879c7443191b877957a4fd405c7f10a1e8b70016d91bf5fe33861fc5d71982a1c685c190e4f7922cedb6c8aefadac3b0b68cbe5578da791a8da6bfedf44
+DIST bit-set-0.5.3.crate 14470 BLAKE2B f6525500a494236103df2b27e964bae0b2caf718156879f972b9972fa509794bcc663c2130e3d872ecadb7ead0982b415dfa4468ef12523ee248fb1bbec2559e SHA512 c5ce7ef71559706d996505e138ce95d9f008ac3375928012a36339bfec48986ad935b384e2d21fa0d505d4cf98bd3e93be15955ecd9607d253b8a276351334c6
+DIST bit-vec-0.6.3.crate 19927 BLAKE2B f5bd3bb9c87fdf3b206739b74df20cab50a1a45af3a58b2642a5a061c26207884be58ef8369a3cd06dfd3615bff0ce15915fdd4b6b6f03facc4a0f86c0b7e910 SHA512 b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8
 DIST bit_field-0.10.1.crate 10576 BLAKE2B 3a906092be85cce6af9e2ac48632d8545864c5fd1610e7e28731bd5cc44c9513f2c7eb52fa1be0b4eed65bffe130ddc98c95dfeba2f9de28ada4091396e5695d SHA512 4848d7ec592642913c7bd06cd3a0da49d3bb14291866cd22ead8e9a6b2939a787035d5cded87be3d2d3491283e31ea2cfb105885df4114720da98beb82990ee6
 DIST bitfield-0.13.2.crate 16479 BLAKE2B c34f150e135579452d5b6e13bac0fb4a3a897219660289c861646330f7050d19a10d041affe8d250bf314c35eb19ee519b1fa0dd12eed94a93a5e904b95380d9 SHA512 5ed9ad97913828d67b19d5f10a264592f4c03aba8e4ea791f7a20e61da79066daa1d5ce678c822d8f6f1d065a65a3aa6afec23980abd1da38b44dc6cbb96166f
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
@@ -46,6 +51,7 @@ DIST brownstone-1.1.0.crate 10690 BLAKE2B df8c5ca8c0855969fd37854a1f0167a96f43ae
 DIST brownstone-3.0.0.crate 10770 BLAKE2B 8a433376fa7a7995f5ca4df9e47e9bb5d1dfab10d07ef32de858c82c9b497f3bfda0928c97bd62e367e0a7a399fa58e90ddf3346804f9287df2b748aac1652ce SHA512 52ccf0d970fca06cd5d6585e589e61c3a455a6485f006eb74cba2357c0649c015ccd83ce8c2697953032d4e960f7b8fe23796fe4ac6f4cb43a977ee0d887007d
 DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d17198ea8ceee0b613d03297f9dd8bca30e1ec5da01d1da359a1da72b2c2771b77c82bebab5006cafd665192 SHA512 883eac8210d14f89517b4dd5e25d02c97cf31602ec74498b5e186112ba0f154d47de8d1c41a8f4e5503f3b53c064e2c976b60bbfd63fc28b186bc006e00f20c2
 DIST bumpalo-3.10.0.crate 78915 BLAKE2B 94515190837765b47feaf94946c7e4da5b84e6faf7975bd5452bd9388d34e51c84315b80bc15b37c7f4ea8b4aaa0112707cdfc82d0651eeb8b63d2e7bd247660 SHA512 60c686534588524250ea7cb43510dba69d24999769b719127ee07f6015530ac2c5778d9b93477ab075bfc15c13e3ef9adc29ac24059067ac32e109347cd509f8
+DIST byte-order-0.3.0.crate 7143 BLAKE2B 7bd331ad477ca847ffefd995d5787b9c5b06c79d442635efb62adc65d3fadafebe0b026ecd432af133efb86e8f89f711f7f6a6876587a784bf50ca25fc339ea5 SHA512 6df9c24c5ac65dccd1ab216403a4ab1f52a735f665fd4aa0daf52251b26bb29e450dc7f8e42a64c02c4b4ec67effa8867a997a70b63bfc7a67ea34c4982da070
 DIST byte-slice-cast-1.2.1.crate 7342 BLAKE2B 2d10fff6b5997bffbf1d8277a7ff2746d481f70fe47dcb204aa0bb5d6ffbaa92d89c39c6f83c26d1e7265f5f3af90e4cf7dbe582456e7e9bf773961c3a6dd901 SHA512 589293cbf86f4a9fe8f6fcccb5b7b81a3374b128c4f5bf2009ea5a57902202cbe8a763cd4d9ab63ae12608a53c8236d02cb0d712a65fdf7289f1f9cd7d798aa2
 DIST byte-unit-4.0.14.crate 10805 BLAKE2B 671ffbbb7b092d8c7962586bacc52595ec00dbe50dc321f2ab1708ff729283773e48c7773d5ab7ede2a99005eee9964456c8e4bec67a9d04cb825794f6744ab6 SHA512 0f551029a1750b3576d2518f7198176bfc6bd0a98955af6935f6bc4144397b3ffabe22f39d56ab882f33997d907f135d9633c19ef8f29bf17517751fe2eefd34
 DIST bytecount-0.6.3.crate 12416 BLAKE2B 462e41d5a4ee23a6c9ff2bf350171e309cbc32f14bbdbde25a5743072a6511634d6c0429903edcfa8df4b9ef3c7bd95d73fff8a7b2018f3b4a8147de2bbfd3f4 SHA512 0c5f424329883726589e69842d2ac0767dc0b440d744a4452a14cbd449b8ca2e8117fa2978b4aa9b803a1a7cf79e9cf67e948057e8ee521e2422ca2e145ea670
@@ -60,11 +66,13 @@ DIST bytesize-1.1.0.crate 9370 BLAKE2B 38fcddbdb862e82a076b7ae1339b48c776f704d25
 DIST calamine-0.18.0.crate 60972 BLAKE2B 7d3087417cd34d8d69f991661908e1714c4e1eb942e228a9ecf46004fd860ed0111db5a951ed7ad05266e953bdea16b9e6872814cd3e90badb2fa4e2f22623cd SHA512 9740b7621a862ddcd45820a07baae72f244dad903880d637d2761756e0c7c8ef608b0c12bf59ad0a30fd91b50d42dac510099128c6153af7721be80711d91e75
 DIST capnp-0.14.6.crate 65297 BLAKE2B f67b448b81574f8ac9bcd4507d972f6ae07e5ab3f60ec509b4940eb36b7c210c0ac057f5240d6349bbd1fa62dc49e9d2d29e986d5a6edaba7aa464989950d10b SHA512 978ca1dfc14a67b09b033b4a2b1a0b6f3fbd1cfac86a3a08b9fead4613a01e9c153caf89858aef89303753192c62c99e4db754d128e1779968b1f3574a289049
 DIST capnp-0.14.8.crate 70519 BLAKE2B 4c8ac3c97b919b634fdb30b3b5fc6b41fbfb4d739493b6182b553d911ddc39e3116dd07b595c7f92c12dd7adf79b8c15ea3f3f661dc3cdac8fc7c76569ef3a84 SHA512 e48e700e14dd512e33779b388e74813825bf33cd012fe0c2d767bd65ab7ee6175cf43882dd07bd29e67bb33d16ff4830632b9aac38d7d54aded07e1f73ad4b1b
+DIST cast-0.3.0.crate 11452 BLAKE2B fe6edddd0589fa436cda32342d7beaabe4003afdbdf1d7c5db7e8748adf23b1b2cdcdd286235837c735d2143f29e692c152a5d56fb0458a54961e4dea303b2cb SHA512 4a3e19bc1e9e5ecc03aaef9bcdce01624ac0e6858c065fa1c41693db0ac172b9735ce872064561347cd9e79f00a274129011f6e4ccf9e61d960c8bb684b6d396
 DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
 DIST cexpr-0.6.0.crate 17966 BLAKE2B cb46f066eb1f4dbac00ec86dc3e562db7ee8ea5ff17d16a60004fa020405e455b8aeb3d001f669cb33d1b62525bfd04ec657ffca4ed44a83af4a5e75b2c820e3 SHA512 766bff7ca7f9bf0885aee6f014bcfc084e7fdfcd567a49443d5340acfe8f257db109de17b24588504fc35c53f2d4303e2d22da21f73669125cfca984950cf886
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
+DIST chrono-0.4.22.crate 185570 BLAKE2B 10dfae2fe871a9910bf885b78aaf3e9ed1bcb87a40962d781c8ea407a945b837c665c2bb4e3d0562ac63d9e7bd5012804434642ee6f5c80e22bc816d4331f1b0 SHA512 de856679ec16afe035176b22125a00ced532d49c8babac0a88fa5f6e4a3d9e526a34ee8bf51639653fc313a5703a202b1be013aa16fdd72a505151d7aafa7c44
 DIST chrono-humanize-0.2.1.crate 14509 BLAKE2B bce741f86f1d826b9efaa25907a40a88d8e18c50b5971a0ac6794d64360605ec9515eccbfa04c12c753cb640406ed45f4da530e1864af5498c0b14fb2b66cb30 SHA512 199a3da317791cd4fd607894afedc8b6607a8562f9f69ff805304a65e935b51cd7681521bb23c1c00baaa6d7e836174d51986f77e683c1312d3017f41f95d083
 DIST chrono-tz-0.5.3.crate 555362 BLAKE2B 95691492c0fb8bbfdeb881701f2724fb24f1e9a9b8aca301d2b306e8558ec51434e92206d8ee1fd506cbd16c5b28d13377c815eb871a8549503d81d09996233e SHA512 c1f25caeeb0bf013a500476ffe67a42438d08d05984c5cc04b6499cb31fde48e05c51b88bbef8b2309c18871b8cdb62815eecd3b4bc1f704af0d6309c2d034f5
 DIST chrono-tz-0.6.1.crate 585749 BLAKE2B 39c493886d5f72b782cafb877e6775e1e4d9877e52f8be36549fc5d8ef8b1d39555c5f096b3c7d7e0aeaccd48cd100d50f14fc4561a22171397b6474beacc574 SHA512 2c5df423cf94d69adc8c3d2866d208724759b5a12e9fc15dff80aca64a51709f85965a27889ebdc5eb7163f87d5b4fb20389edc86512973c01434a8aaa60fe83
@@ -72,6 +80,7 @@ DIST chrono-tz-0.6.3.crate 589734 BLAKE2B 03b7ff98a218677bbe3daf6a3672e0accc40b1
 DIST chrono-tz-build-0.0.2.crate 5840 BLAKE2B cf7661f2b7205c90ed664c874c230928cc7e70d3a62d758fbe8be862b4cb35312354efa13fa39a99ffb857632cf57519b168a51b65fe5f3d573ea2a0a4194f27 SHA512 9ce99c60a61e97d987a84b367832cbc239cd13e2da5f8af8661afce16fcf6fa927fa1f3a03f002a82261fc693999832b705d62ce1dbba33bb11a0a7a8c38c521
 DIST chrono-tz-build-0.0.3.crate 5768 BLAKE2B 253cc13dd7369de6edebb9e4c486d8f26973cdcbcb2aca1815b250a51a71a48346d5a0f5832457da8dc77260653d2ce9f936077649479ec01f08d8571caa0f8d SHA512 859fc1024cbc08cf1cf4f53f7f70c91b81049eb5af4dbfc4e5632f5a3f70d4e1c1b3786cab29ceb490647715de914f88630f82bac66dad2f565a90f2151a31d9
 DIST clang-sys-1.3.3.crate 37943 BLAKE2B 92ecba81573fc27de689752e7009514d0e51c4d09407d0345eee7a94f4713cfd01304b98370aa89d56a3b028912370f4967f8fda28ae9e3620fbb4af991da117 SHA512 fd922627ff66f9265aae30bf585bccab1efdea7f66b9fb95f45af0f316727bff7b791f36ef42010df5d8b3b474f36457fec03fdbb25c50cc8922c3b157387dc9
+DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8
 DIST codepage-0.1.1.crate 8680 BLAKE2B c33ae92f515b7bc578e8c81bf45744d681e038ba513ac26d7acba2792926db272a59cd20047c3e3771a14846b675c3ebd081db2b43b8967bcb9c98cd787d9229 SHA512 7be012259432245264d4c93d5afd1f0849644ab5040ad5459de5340556f522339f6c5835a54fb6c2c61f6a799969ecffba16d11fbedb10a78ba20c58a5588d2a
 DIST comfy-table-5.0.1.crate 53809 BLAKE2B 3d91d9dd1bfba1de505c9478f6b513056dbad93c001d5c42b27b1d9918532157b3eae6d805bcb0e767ed864a90d1a7dfc67e00d100738de694296526467376e1 SHA512 b3a5906e973251faf5b07a78063a8b07d990ed229b235c47c51a839ec8e32e1c4101844ec6b462ab56f947627dd774e3d66234110cee366e4051a2380f350852
 DIST console-0.15.0.crate 23507 BLAKE2B 49694683baddb53e0f35584403aa93616164c2d3b94b39e0e35ebc4f915c37c8e794619d57b44ac0ea460ddbf7ec43323adecf657cc6f2869f313b3cdbf3a46a SHA512 70bd6abfafa533903f273ec3b34da6783856bd1abedaf139fddafac0dbb03fa9154f8e1e1bef01fd8de3c53100bbaa93313518c42f8ce51217c23ef34d3f9d62
@@ -84,7 +93,10 @@ DIST core-foundation-0.9.3.crate 27059 BLAKE2B d94fec51b1b1055c285609f4bba45c516
 DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82
 DIST cortex-m-0.7.5.crate 140834 BLAKE2B b2b9b9a6f4fab279832c284033bc4a6f67dfe7a0c49102a102d57064ce9c34a0f45f95e887864daee88143ecc4c659cc2ec073ee59ef32fcf6d83809cc80d85b SHA512 50e41e7a91fd8e4e1d1fc1afbce412e94c38ac2df411a90c6f8dd24cbac56fa68bac77bc6c87c55ec2aa2848793c14da79da82f42a99d791e56aa87821c4e228
 DIST cpufeatures-0.2.2.crate 10655 BLAKE2B 7e068032f818af691ce1bbeacc1e79af17284cf6d1b9896fd146b2b87ebab7b12e7a9ec93b28f77106856c1d11a565e4a64f8dc60c30b401c08836097f587530 SHA512 a771a86e2fa26033b27d22fe250968cd80cc64031838d1c111ad5c69951d5f29de0cad375965c7c2cbceda2a005dedaf6df15c699041c9d0cf65a1c2033f69c5
+DIST cpufeatures-0.2.5.crate 11251 BLAKE2B 2724be40d3bc0e2fda957f645e1cd6472450dee68db3592ab607bdac444283f571f3c904e47981a3fdaa06cab4032734a54470e3dd6e1b67fd856daf010e1277 SHA512 d02327a27ca9fc3c587dcbd10da6b1370671cd7b1df8dfc9078b47180744d0572ef41a7ec205ae9f1c571e5b7f4bc81278ab4c6b076c6ccac0167100e346e74e
 DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
+DIST criterion-0.3.6.crate 110967 BLAKE2B 7e6d86da0c218145505c467680968758641dfffe55ed6570d5ad0ee23115d484db45aebd5a0efa248f22e60cb8923b0671f51860f867fce74132fca90a3a843b SHA512 282d8d110b8ae2c4f96503ee9d5080cd40acb4bd5ceb317f9a0acf098f2a67c61a99fe3c9796424a74181910840411362b8cf5c53e5665b078483c50935dbdcc
+DIST criterion-plot-0.4.5.crate 22721 BLAKE2B 81118b04d9715fdef79a120d98ea85cc2c2b6b49ef44b28cd5c9984762dc400da37c7681b52a8a185e6208574c4a5b74b7de9e3db0223757258a8dd4b2214a3c SHA512 0e06a230d00471b7274375d37c8454d0e000ba513348463407083423151df930831c8c99a943a3d1e42155f98e09687e26d53bea7ca3f640171e055cce32ec83
 DIST critical-section-0.2.7.crate 6094 BLAKE2B c910f974a6b5906266026a5f1cab6620bdf5094f22dd7a4e44a40cf3e20d895b7f57ea0d1f024b40de8f32d9c37e66c4cac3c7e5dc86aec01777e931b24ad7ba SHA512 8402410866786adbfdf82a0cba0fdbd49b278052560ea98e9d1151647cda9804cdeb2a9c7e1d9f458180b2a37a19f1266d72712d4cf9ced0f486b55de655d51f
 DIST crossbeam-channel-0.5.4.crate 88237 BLAKE2B ffcab003305b80586a9b61c6309dcf6f4ced483856c4501753cddd23fb0fa9a71b7870b676ccba78119cc29f03974ff4731cef9a92840c0b38ae944f0b3825b5 SHA512 39b17dbaefc15d7faafca4ae6b060665471d384956aca7439fc407ed2632bd458e473efb62b74629b42a5f3d237e13503d2084cac6f6b3f42b9e03aa1fde0982
 DIST crossbeam-channel-0.5.6.crate 90292 BLAKE2B 7da87ab15c384754d2493dd1a30e83550cd4b2b749b7f0c24de131f054e3a2e521e1bb4ba10094378c8f4c7bdf19218e35b10562c50b4ad1d2871bf6f821e488 SHA512 de6a42ffede95750a13e3b9af6ab26cbc498125860cd8e4d227c7361bd831e558254a48bdef5cf901585a915003071b0efa321f2011f282218c364780f62f44a
@@ -95,6 +107,7 @@ DIST crossbeam-epoch-0.9.8.crate 46012 BLAKE2B 181df06d1a9925ad1b3e2df70f290fc9c
 DIST crossbeam-utils-0.8.11.crate 40887 BLAKE2B 6cf3c4e28243515f06193ef746b18129f62832abde8153503571052f4965b38ce510b09d18e51e0f563bfc14818af13463d1e2d63716b98a91b55461f5186b25 SHA512 eeb19480ca1860953507606f6649756974f65a05883c695fa371ff6d80a9fd0b94872aad5168955b4771b38f50314364236cb39363bcafe9750b687ff92a5ed5
 DIST crossbeam-utils-0.8.8.crate 39681 BLAKE2B 2b3e64bfcaa044a9351c1cc8e9ea53fd68fd0bb9875ae523e0cd309a85ad23b340267bdb742d363b5d99fc065ed74f6cbb3ad1e33dec7d14d99ec458875e7e10 SHA512 ab960afdb82863160a3fa1c21c64b35b3112725bd72fc8e0724175937f4b23d0628253032229501938cd86a8e406a59c06cb44e8bdf34619de781a84ebb46ea0
 DIST crossterm-0.23.2.crate 106712 BLAKE2B 6b3730d9653a9d130f0399ad8cf9951b1527834560ed84a25815482f226ce5693c78b6a7e9fc52678a097dfd677d86e87eeb88f1aa6da5db4becebedb84f55fb SHA512 3299e47dedc44988d2f0508a5d81345092f1495c1292994d237c7222b4b52fe91b98e12bfdd88b322242661eaec75857c59f13a430691d4aa867c0e3914254a3
+DIST crossterm-0.24.0.crate 110615 BLAKE2B 08c1d86b9997c679f487b4273f56fbbe037f9b2dac47a2a1a6884030c149215164ea12d172a596c0f13ee935cabf55aed60f8d3987c8454d562fa581214ad369 SHA512 50134a80abfee248f6547b039d2e4f1e640e196e9f492d55790c7630abf0fbf68e698955522424ed9c36022d691626ac2902bde1019e769fe5b55cb5ac2b513d
 DIST crossterm_winapi-0.9.0.crate 15561 BLAKE2B f84604f1da9cfdd0fc69742eef8088e7d0959073c6f7f37507b065b8537faa20bea8e349bcb1d6836be97f06b4a2c55c4dc63f50eb2f2aba1f34df9b8c9abf1a SHA512 b8c32a82cc83244e8991931e3fe0d85527ee2cc5e6b4a0839d633448dfa8a137c87684e8e079f44edf5a994355e0106bb573b36b57c7420ac5cb6fb0ce20ce8d
 DIST crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb SHA512 36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025
 DIST crypto-common-0.1.3.crate 8556 BLAKE2B 980c3d820633b62d3aa08e00b4737dc44ed08db3c2cae4f14aa4ad769b6a84d5eca03ed3d8a4d35cacfc051ba9cf23826bc098400996a80cd5a264abae873d0b SHA512 d32fa67b9baafc32ce6f4d97d54deb7f1b4453849bf549384689b0ce8d417407d11f405793e7765ea47dfa86c8d6df5661bd17793c145351731c39f8124d1a2f
@@ -125,6 +138,7 @@ DIST dtoa-short-0.3.3.crate 8198 BLAKE2B aaece640d0f8b231081bb1534c3188dd4f9780e
 DIST dtparse-1.2.0.crate 31839 BLAKE2B 07486a47bc4a95ef8401785c56ea8c32c704d5b37564a355fc51c3b5515d9aaf590e866001dfa4ac97297f3f3674f103bfc29b9fccc7fb327ef584998b786b1f SHA512 6d47ba55e8437240c5fe01f7fb54b1c85bb86e8edf7a0b9fd4155d9694b25a57c7dbcdd34584de9716261691f4728d839dd255a46dc0dfe3efa3a30fd0a63d4c
 DIST dtparse-1.3.0.crate 31169 BLAKE2B 00acaf8b179bd83595cb0a9ffe4a44be4402a4d41ffe86a64183f5141f0c4c34f051c6facf0895dd2dd1eff1de5c0c9f66a633a08a32916d4ae797e559926d6d SHA512 f85a1ff41fc20ea9eba73ac65371c5775a7a1cc1c4fa54594308909374af96d7d841728ce8d58b2575e7fe40bbd508819339d684a85917e5aab80330e58cd6db
 DIST dunce-1.0.2.crate 7953 BLAKE2B 5572521dd8b85419561ad0af2abc47f3b60b1142c1966b89f678bcce500a38b88b3986523bb6c29b38205440ed110ad5dda3ec7170c476c5614054b36b691acf SHA512 9d1a5d449985913d1cecf2249f3c14001361faf98a0ffa2cb682b4ee4dbde906302355632033484640373587c78c0345c1c7e267c354018cb070cbc46517ba86
+DIST dyn-clone-1.0.8.crate 11805 BLAKE2B 974140546b94d0fa620d2162f70d2ac207338ce61dd3aa16506e1994cd6483b866636d058f66343213207a19ca22a83f98e354b68db0c06e9548899a8b2b9969 SHA512 98baca999050a0bf15b672fca2a24577e7e0d369758180dc491898ed24d7e89bd433d690f2f132847541bbfae70cc07e1f28a5b31aa10beadc737e8cf189f1cb
 DIST ego-tree-0.6.2.crate 8962 BLAKE2B 012f88e588384169768a340e76bec42713cc0a29ffcad4dda990f47aff03cea4589177ae01198d8fc1c43bcbaa1cb3f0cb3d05d6a23967c5f6f5339644052938 SHA512 bbfb56b4dae753a980a9552b59da34fafdd52cc796d8abfa19e7b9ae97137d0755019e6efaf053365fd7e6cd1972de53acb0b83a69ebe329741c253370b93a1d
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST either-1.7.0.crate 15492 BLAKE2B 3ed1c5c27e7bd9453f83b82d3f57a4a73f965b1943a7a17d3de45ee35f62db53976ba9f2055ba28c555500cda528ff3a2d7ad6cd957540c91f512bd3adf9c5e6 SHA512 894bf3980def07848a2911734c02eb0c5c5d2ff3ab7656413d2acfd164d120a7c075e0a5f3fb95243b8bda0257a5f457117d5c6eafc146f3f6aaf6c6fbc4cf33
@@ -142,6 +156,7 @@ DIST failure-0.1.8.crate 37582 BLAKE2B 007652720edab76efca83ef23a6f29dfec2a8949e
 DIST failure_derive-0.1.8.crate 4950 BLAKE2B c068f2a122e1137aa8a31e3a3c4c333f1e66f1b93df144f5a07772167f9085241292b85c55adf33851c319a418bac19fd31f4fb22b87ebbbf2814cbc815b77b3 SHA512 3f11adeb616a2d57e1a33ec2a5eb71c79a5df7946a27b74acc7c89a67c5dc6d01222731b37b405e33493570a98c96c7d2c7b8535928d7cf82536bcd9f0df809c
 DIST fallible-iterator-0.2.0.crate 18509 BLAKE2B 9630fcadb2f30fbd8a2a057eb992bf33c0aa2d163e6fbd43de9c8c350e3e932ebca79a6576b215e17a0566898f6e37aef806a643d20c16a6aa73ca515fcf30c0 SHA512 c558fea3fcf3a7756acc0b63d38f76dfe7eeed4dd9c12c46b7a7e8b8bea64d00e0cc115492e8b3a1a19e86e6083477dcf7d2d72ef960b44f24d61819a3077e79
 DIST fallible-streaming-iterator-0.1.9.crate 9249 BLAKE2B cc4459b34a9ad00552a5248d090d1f25804b92838f41131e475abb83ae0b89401248feeb52a49dbffd499ccc0ba0f2f1d044f2f3e9b06662be01fe2257a4e885 SHA512 34824e2007cb944eaf54b10d6d3885bb17ef2a2976c6dd7695ff82a937cc95eb65d343dd7a5cd2fab5aa5859faae3352a9e1c78f239ff736900c1dbc3f5ef7dc
+DIST fancy-regex-0.10.0.crate 79951 BLAKE2B b00f5c398a4a35f257b5e92c20bf3beefa1cc6e1dc515319d18c7d58eae14de53f51b5d0be443619dc06df8f960a9134c413b10ebaa1f0766860965682483299 SHA512 19d948e4e98b3ff0d9d9680287ff0ee5c3597598c781d61fd7174cec9b63448ed3bd9fb52a2643ff4289ee21069123a0adc9c422ea516076e4e55024845309be
 DIST fastrand-1.7.0.crate 11265 BLAKE2B 318f6c903a0ad0d0eac39638aceb162739868efd61dc0b54f6aac4c96b7b1283c8d463b48b36f9ea1fee640a2081a0eda39238cd53cdcc24efc4d17b4a3a09d4 SHA512 6a1a8cd4f6f9bfff07a4ca18ef84839e4427ca9bf9b6733bb15b1b70cf2439820d6a770ae9f3e5e10166a6144449e37e6f3f6ed9acb761688207fd7c53d2c673
 DIST fastrand-1.8.0.crate 11369 BLAKE2B 93e911ffcec559e30b2fefa44c4d74d1ffa9b8ef1904ace608b8576210bcd41a2b4c7adffc00cd3bb40996110d07316cf8068f4754a879c6cb47e3d41304d406 SHA512 82cbc2b29b97fa3fa2c9372d3e8c390586a7b39f6c7d8c45f9b779bdfdaa2e8a3b44bc7bfcb3367c18120726facc753c9827cf63a8fb4ddc2667509b16333cb1
 DIST fd-lock-3.0.5.crate 13383 BLAKE2B 554729ecd142e9f783112ff479de14e52554b902319c061321a38e37ed80a1a445d4eb9b45ed91a44fc913b02f98aab8f7187b29e692e08b67edd789a337d936 SHA512 7173838a01960e0870ae90055fd97173d647fe9eb7457f76c0bfbb95f7d95c02e4ec9a9a7c7ea528ecefc4400b4c6b99f6c847248c55392e72d94248ad6db239
@@ -153,6 +168,7 @@ DIST flate2-1.0.24.crate 70191 BLAKE2B f5ff04557dd0a57151b4c704cce60622157be4c84
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
 DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
+DIST foreign_vec-0.1.0.crate 5198 BLAKE2B b06371724a4db1b9a1da25881ac965552e9d84a8219f80c3023878348ee7f61be8d4910312f21c7577f4c3b2dd8ecb50bd9882986732f18788c793434a1a724f SHA512 9155f500825ba553e574f4c83cd39c6a96fa7a9b3df328fa04e5a16aa1df8f38db140bba29b5e24262dd01030b9272dc245e59030ae4c07f07945683846bcfd9
 DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
 DIST fs_extra-1.2.0.crate 29918 BLAKE2B 92e5de4cdaa16ed8c2737e988f8f2419e394f56e30ec43d9a29dbadc13ccbbdff7cf2b30788d37f160123df83fa998b966fc9b5f793b6e15f84af4dda7ec4cd1 SHA512 66670d624394874d7f786f8d362438c53f5b18008909ab8e7a74e82518dbc189e37588836f05f19dcd4718f4c1a5296fdf274380d574b1f475e28891ecdd6c91
 DIST fsevent-0.4.0.crate 7292 BLAKE2B e55fa22bca32165c17ab1cf623311de85d1c1cd78f89fcc016babfa3557658352c17e1fd9a2fa64c753b0073a96361461662c4583f780cd7195ffcaa254da0ce SHA512 98d5e6998e3ae0cf3e0f383aa1e8f7fadd9b75154753168da4f6b87cc9a37b8830e7bed4b2169993ddf49646c9d47aa022d6af8a8a66370e7fc533932e70855f
@@ -187,9 +203,11 @@ DIST ghost-0.1.5.crate 14211 BLAKE2B 8b179912cd33b8ad62d37fd2612d93ffcda8809c7da
 DIST gimli-0.26.1.crate 716168 BLAKE2B c138e890457e8724295cc8996f8e60f1f4d3eed46c865dc7ff2379c65e8d470080953eee70718867b73524f57d54d4a91b5d5ba74d79bd3da38084a880f3fed6 SHA512 c341354e13a78c4afeb651a0ed651f60d188957216ba51079512531ab1273b1b79c86c57e904b87064015f8e7efe4280d9edd4acf90e25fb29f8813a4c7bf9a9
 DIST gimli-0.26.2.crate 717340 BLAKE2B 6460346625fad7ed202f387d45900867e785026e08efbf6542bb5c7b6ec2bc8ddfdaf825e872d2c339c3b72f8ddaba546efa94243a602bd8c9470c6e808a8f30 SHA512 10baa5fb5fe13eeab2ed9ac8e02ae7607b42df80b9f39b14027d052ac7f6f11e4dec451bd73c3640ff8ef174e280c1640110720b2bc4220229d27bbb31079029
 DIST git2-0.14.4.crate 196849 BLAKE2B 020e8c87fedb49fcf38727a8c0abc975dce2b70dfcb1db996e526967bd71455be8f81ed7d7e58d56e584f34adcfa2aaad7765d262b2d4899370ed9e0a7e2175d SHA512 05a5894eb90e5371525222f69321c2376f6b8e0306a04ff05a9917005ca77a86b6100ec19338e47265599f3a61603511991ea8664e7c64702a580841ef98963a
+DIST git2-0.15.0.crate 198983 BLAKE2B 0e340dedef36339cc6ce4cf9ac79014e7bcbdf9ebf688986d1836c3e2f480998a60a2722017381124682edc5dc511368497f03c9bd9a8c4d0e7690682789bf88 SHA512 8ea32850e592cb9bc8caa0d7a04042e284c11b9d46959807d8e6d496d93946342dc37fcdf1ed354010434798a404f415e8e980fee2ce4f5cb998e0f8736b5bc5
 DIST gjson-0.8.1.crate 2975684 BLAKE2B a6488541edef2a5d84f04d0b3b7f1be30bb8c3b192f406d1b128b3dbdf36a74da0deea1beb0d0845f3db58642b9c949151a5cf7098573ab8a2e67e1c7a29e16f SHA512 37f1a06d7002873991c67dc551c6db83dd2f6d6702eb4b3656b10a79a4310ef8dad01a51650b601413d96cc5fa7a5bd1dbaabfdc406942fdd35c4ff99d9e55ed
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST h2-0.3.13.crate 161962 BLAKE2B e8fcea52f4b6020c8c7d84b440977beede9f655f85d01b58348a9b9e78bdc5ef7a34e59e89c24291917390b568e229ed5b280e68be7c4e6e9793f0b967268271 SHA512 480484b75b22060146fe373a61136585bb71fade1a99231de4bdd123ecd11e4a3237e7d8da1b952556b7e832f1d6299bf4b833361368a243cce4c23c53ea26dc
+DIST half-1.8.2.crate 41874 BLAKE2B c3c5c01771f05b7af652abb8e5490dde7afd04de130537e67845fe7ed58904e7ad66c7286a4e7deca3641876a6d12c5b6e95883fee2809c8e685d2f79cf96610 SHA512 5eb128e41b8b7f9769a669834b2f8380b115395bf2a2a181732bf6c71234d978dbc4c527fddadaa7bd7fae9add77958b27616bfa1767fd123d3cfb887663292e
 DIST hamcrest2-0.3.0.crate 17640 BLAKE2B 1f5691c53df38e5c39a901f8287e3315fc4538b26c2782b3790d9e31802b586134c5b35c61d0a704b6d49572ab546e26a02a53ed6395e18381b83837029b4caa SHA512 e8dc89a4386f2fc335994f5b8468c7d2f56835c1b74ee735bed0f81af7f77179151678771b1cffe2134528f5b42c818c57c5375c66d8fe8a20d3c4e9df6dbea6
 DIST hash32-0.1.1.crate 10967 BLAKE2B a87b945b6c39a98022b32c5b29cbd6cce64e20abeb80b32131f95f7e919c979f3b5b6cf440e2255ec5a9861060d7a95deef3cfb280e26cdc0247f809eb2881d9 SHA512 57ea9009c6365de6a55bf1c4a514eb997a1671fe72877354fb75de858b531c78eb7a3c9e2477491d595a916ac4dfd5e976e1febe3e0ef6bc2299e69c37389215
 DIST hash32-0.2.1.crate 11168 BLAKE2B 26e157c3e8e1c3f72c06a804b0e991544d92dc46ed6f12913074dc3f22861939e24644d7fee8e4836ba4d36fe02cf7147a5c1f30998deed33fb3ac53854d20a1 SHA512 e739445fb07403370fda110dc76b82046e5df0250a5e9898ccd0b33547972d26405527f3e3e9cddcd2caa775c8afcfbfc098cb995ab59c44aca642d6c539594f
@@ -219,6 +237,7 @@ DIST hyper-0.14.19.crate 182288 BLAKE2B 6b5a400fb60177ff911093507f0194e169e73ad3
 DIST hyper-0.14.20.crate 183885 BLAKE2B b8fc273bdba1f422e4dd7f5ffcbe93f6ed5c750df71a51bd9a54c25b105f209b0cd97abf2ac5c2f415bbea2fd75094f53654d7c3554440ea125eca0f702b5ef6 SHA512 2a95a1b1de9a5032afbf0ab6c5c5c547d3cc4c08f02824868501d4d19c1a399d0b1729d6f7485dd016775e63c899b441cd667ff30afdb38170090fe007ec62a3
 DIST hyper-tls-0.5.0.crate 13257 BLAKE2B 50cbe4ca7c1862fd3fff192de070341dd32bfb9f108b516e1e261ec8da7c4f7972b7b66e3d45c1497733a913b0281bef706994270ec8bd03eba7368612127aa4 SHA512 45dc16cc9ce48706e0b3575dca35ba1b6b3084dda8c2cc489d126e1c4f0bb96a9b2baa860d09f68c5e0a48c2a69e3eaf62f4f0406fffc4efefcd79d26c82896e
 DIST iana-time-zone-0.1.37.crate 13074 BLAKE2B 6cae9058d42502cc5b87fff3a2ec4d5fabd012dbde8e37d58bf4fbd20d8330b4a051a95fcd600218e327c63eb80cdfa11f697ba1f4b9a3366629a8ba0ed8f6a6 SHA512 a499358ea93056e537ca7c4a14361e880ea3b9e0f615dc8e031abed035465c738e07919958acfcf8f7df073792e694bd7f8fd7968af6bf06a11190f7cbb6dac9
+DIST iana-time-zone-0.1.47.crate 16974 BLAKE2B 841e380fd81def3eb5af424215c36caa9b48adf2368d9da57dd562ea4f806fc5ed1abd0c118eebb532264eb3ab5d8670049cfe20eada40cad7bef4718245c968 SHA512 c1817555149f05ae45f7e54046b79c732f80f5af382680d626dd3e970167092cdc176b259941d3c1533518bef511a92ed24c3aa538897e9d082984684d99f55b
 DIST ical-0.7.0.crate 17601 BLAKE2B c0feed7d2dfcf2d7910b23c198289ebe714a8cf0cac147243893416a8dc062d033d6c973ba8ae077011d14c6413b614d898668727583e6041411977822e3af95 SHA512 f74e505e7b981ff1e64c6cd8380c9542b44c52055a5ccce6a83bfaa4d4b8dcc063deba192d6e4b0752719c5609d041d34a4a8357975aa6f550471f8b2efe7305
 DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
 DIST indent_write-2.2.0.crate 11090 BLAKE2B f6a2fe0f5a05763da915e4cf7519d1c5ba4b90ed8dd780412bafd14c3c2857b7a160268c10aaa2a68608d4199e291bd00adbe6cf48e956f0536d3b3548adf8d0 SHA512 9b3df6eab3b3dd2499a53fced0fbfb79cb353fb186558f1737abcffe1d99be6ff762ca76e9403e28be33bf3c3e0f6ac5b13a3252e05bdffcbc7ab70ffc2fb4fa
@@ -258,6 +277,7 @@ DIST lexical-write-float-0.8.5.crate 100281 BLAKE2B d5885d793ddcb8414fc9cd3085f0
 DIST lexical-write-integer-0.8.5.crate 55427 BLAKE2B 54bb11be6c9377518384ad843d90d3bd344edadb889e1049ca8b58e34862e6d2a6730cd772c38859372d1068e110fd67db147c2d4c90bdd9bdb232ced7be4710 SHA512 a749846f8beb9b01ce61473f6ce123afb1b9f6efd91428cfff1fbbdd77422867e6eed4cd04c3ef25cd2d5be59864fa0e213ce296735e4021ac4632634b345838
 DIST libc-0.2.126.crate 590481 BLAKE2B 1000de6b9fa2b3ff025b961e504d6d20b401f37cdeda6710187d18ad2dfe8ec89142bba65486d7853f1796897b58f343c5a34dd6381a0d0794b615635ac31175 SHA512 9bbb17f64a7503819616a71076ebe8ee317daf07b17b9fff783a4459da0439aecee535c09e7185bf148b1993e6fc958d182a490fc9c9a7b9fb635429c491ca44
 DIST libgit2-sys-0.13.4+1.4.2.crate 1506315 BLAKE2B 87199812e8dd5475c3c659e11bde4a294951685880e9fc8771b3a075d351d02a1eecb5d4ea039466af6b9d90b5374d3d1369195a442ba60c596669aa2e25af59 SHA512 71e3f4ed8a123109ae1f0cfaad90092bbea25658356e6eaee3135d4576ffcfadd83ada28367459dd70903ddce716bed6278388e294e13712dcbcf8202e884548
+DIST libgit2-sys-0.14.0+1.5.0.crate 1740370 BLAKE2B 0bdcec13f78292ad7849f88bbf21a8168371e9d4b15dcd09863b2ef703caa8e94a33da01164214620e11ff6f75038cf9ee6257c44aed5e07c52af044abca9952 SHA512 b2e1e54b172e6b0c71fdd02da0800e9120a3fe1b9c33b5fee4e667e9aa627979012865397b406fe91437425bf52e52a26245cfb7fa84f3ba64269dbe204582d6
 DIST libloading-0.7.3.crate 27378 BLAKE2B da36353819cbbc85dbb3196585970b431eb5570140978fed8a6b5e46bec2560b373e20fc108b9520589bfd1f804eea57a524a0cb497620d4a8fd11030e9c4818 SHA512 58da6e73f86aa05132949939507a128188ec2e26e2245e23b1534d90673c9909c7d5220aa4aeab2c16249f7433b4d0f98f20c94b8b1f7434c7abadc8b8039ae9
 DIST libm-0.2.2.crate 113226 BLAKE2B 126ff68b4ccc7c4e3043095c84ef010bffdc1f76d3c0c871441d1ecaaa044534506844fd6accf145f94cfdbb611fbb1fb13ce976521911dcfe77d57c3c81463a SHA512 5aed180dec326ed9ee2fb90dfd94127ee5f75804f7ce7fa0ed5c7e1f0533215690553551da44c055f9ad47170ca32971467fb378f7328a3c22930832388eed75
 DIST libproc-0.10.0.crate 23128 BLAKE2B 1e0f2150289c81151efd7b6adf2e28d0d37bcd0123f31140fc1f60f3555a2abbc3b2243c23d15663e2336766f1ea273e15d73e90b3980e7de9a99a11396c7629 SHA512 c7931cf0a187b40f7669511ac18bb7fe8a7f20c67055a1ec6031e587ca9d3a25484234314fcfc7cba8d60aa98f9eefec5bae3ecf0e014a03e9814c8a33dd4315
@@ -272,10 +292,13 @@ DIST linux-raw-sys-0.0.46.crate 807633 BLAKE2B 58a63a6ee202e53892d78f2142d6ef98f
 DIST lock_api-0.4.7.crate 25371 BLAKE2B 9ed08433ffa70af60193dcf307287991a3154f0ef16b485f32a6c83e64962661a6e08ef83a6b217d6cbf5bd964c0638d8ed86b290087677c1fb3218321c4bbf8 SHA512 b1a5227fd131edaa70e017f7ddb43af8b4efa58488007b898ca1dfc818a3a441b732b7adbf1270e72a68ee5d2a99a5d48f33b2bca8e2cf78694953d20d27636d
 DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
 DIST lscolors-0.10.0.crate 21103 BLAKE2B 886e8703818bbd286deebd57e1ccf846a2f8a44decea6e24496b1285033d1b07f9527a0078f943ab45df86d0a052152c0d734606129dfe32b027bf8f34dd7a7a SHA512 2ff4b1234cb42128f9eb53e3a35484ccde51621292c61ca6ff5442e6f5a343a3dfebafa9f2ba45f7bc3e2211f152e629e6812b786f53d277791555b67a4e3cd8
+DIST lscolors-0.12.0.crate 21571 BLAKE2B a3f6a44ef989493ac1755022da0c0699800cbe4ccb9f473de876e42c25063276353c976befa49bb001e91fe4b7a1f1a6ef33af4b229704900ad3c28c9d772da1 SHA512 12b3db9fe3bff515f3d92bf121d7503c4ee8553ffc660379373870977a24554fdd3b8b4947ce516748dc53444667a363f28ad808e54110ba54b9eb065494358a
 DIST lscolors-0.9.0.crate 20899 BLAKE2B 9791326ac62a80bcf221b739677494c8cb0d44acdad12e9e9f02de9a4e6a6331740cd67256496050a7d305576c8531bd12564b5c587770f4ab81b2e498977303 SHA512 eafca6524657ffd16a77d05c7bf4a2e6eb842618767be39c516ad1b14ea181c9dff4d02b78e246194a2088798ebd6e22b1aa6ff1498df7de1f43cb3920a47d7f
 DIST lz4-1.23.3.crate 13265 BLAKE2B bdf3f1e78d68968cdb7edb67e5d19f285d728a112189b77f254c51883c75e37347b664de4a6c5d8ce44ad69b3894dddbf7f39ae8ea9649c210be05d3121cbaf3 SHA512 ce68a7aeeb3dc9d06e1ac52600cfa2766170ae77f2927d2b05d14b3100198b562da1fa0a0189f598b4e4ea36165d938dba9abb9cd853b5f8808f744ae33711b3
 DIST lz4-sys-1.9.3.crate 307533 BLAKE2B 926c772d9ba2024e94e629656b684993e97a1e575ff510202fbd921beae0ad28ef8a732654c449db34c37c76bc63ed313957f58861d1977690631ac7485ac6a2 SHA512 1d73e59269236bed36fbf6379190ae0b06ecd22345d819bb02a6d7aaf94c4d936fb265af5ff5b193d7cfe59d7063be9203affa42c844931adbfc77299d2c78e4
+DIST lz4-sys-1.9.4.crate 354842 BLAKE2B ced6f5f681003284d6720f3bf4af4089b991320fc1ba52a445d67ae118a573edbba9dac656a4f04dab50e3d4ea8c1b32339f3413a5e590a597c2407a963da646 SHA512 a0cd903494db1089965f5316694eb23e219002c147aad68794d57e7206aff641824e54f25f7c4cbe08bb06a63e6f5ee4c44447aa7f7057c8467872d69c6f0b06
 DIST mac-0.1.1.crate 4838 BLAKE2B c87e9f9283f179acd28c189d02d9d3de0ec99f9cfbefa590daa2880c275894951c5b0b935b652ab6c8c0172ac59e87f52fd49b787b230e6730365dc076d17578 SHA512 dbc6def04c482911ace311f34be79992fa04042c7ce36b71459b5af5c1c43e9fa66b6b40f63f8c3647daba287bf1c1be9b1a8031ead1d855f99a988898c96f1a
+DIST mach2-0.4.1.crate 19723 BLAKE2B 8212c6e85c0ab8a6dde8f1a3776e8250bcce79cd525eb4ae00db926afdedeff6d84ff687156bf481460d56aec62c818feb7e3940c7ccf428bdcc7d216f6914d9 SHA512 eacdaa1f04602c9c0b6107a8c0493b597a81802c52a14ac66a0a46db172b3da40733af8637e8221608f62e160ced0e877906d9a79e56c586d5e0dc47f60a8c51
 DIST malloc_buf-0.0.6.crate 1239 BLAKE2B baa59345fd372db162773adbb441caff1f6bad965c3681f244161deaee76282fa09b9af0d0642cd39ef35689f85f5bd7c2efb7ba8119a58e86c7cd12d81b2c6b SHA512 463b3d7666cdd7de618abf0cc4e488060c84d6d93c56d4e922169511a0b03de380ea988cd998f5a162b244088902198763351ac16dea3762f0fa0840fc29d6ed
 DIST markup5ever-0.10.1.crate 34668 BLAKE2B a13f39ba93a26a558a8f03ebbbaa98bf2c7caa4fd393be3e307acd5b59a6d91fa8fbf4deff234266cd55772d5047145cc80c5a215ff8eb5b2fddb88468ae4fb2 SHA512 447b0f44ea8b786688127aba1b6eed826dc0127658d293c22db74864381b5e7bc0584243dcc0ee19929d3e757521167c13a108155ed5c8e78375cb0fd3c6f7b7
 DIST markup5ever-0.11.0.crate 34667 BLAKE2B 7a4e9c860949296912616fab105b688fc5ad86df012f064efb3e5125aae57869b4e63f4a551fc787e65987e5bb8c0dc26e2ff99651a2e56fa67237796f5967e8 SHA512 c9e9452f5bd43a7e578434467ce324a857ad600965fe37a24650f0f3e968fe1dc603ac8c7b9c4ebe2f624511cbdbc592ca0072b04ae094738670e199df9ad05e
@@ -338,11 +361,14 @@ DIST num_cpus-1.13.1.crate 14752 BLAKE2B 27490aeee349d944c29e50b44e9a84371030459
 DIST num_threads-0.1.6.crate 7334 BLAKE2B 416efdf395b0299b6b01e1508823afdda08cf67ca54e1d644fc5accbb0490945a492a34bc5ba70c3e838e6405d17ddce164ef87468bd9da27097de8994ad9577 SHA512 b2d9897e29e59353379b6372a629fc7f9afc89f777b4410eaeac7b4729527948a8dbecb175f056899f9076693ef855cc0d40e725cc54f28af588fbac5f7ce3b6
 DIST nushell-0.65.0.tar.gz 2325123 BLAKE2B 3a6cc5c97aeb4811627e7d733424a12d437d04f4250a09ba8a3b42f64365b0fdb03aa1eda3dca1917ba4bf7186f1ee1bb85d1830add94b8321f8a059949b7ddf SHA512 007a3351d1a2f18bb1f4b0bc8e97abf4b9f58f566eae202355263e176acf331037687205b221ce4c8185ef1f44d5081d10d04de20823d61a6c14595205439ac9
 DIST nushell-0.66.2.tar.gz 2350677 BLAKE2B b35c042598a5cf1b8b35c674bbd46de9dc63e07bb2ceb24710bf0b11b8a5401ae4b693a2b71735dcbafdd6cbbb85acf293f9a09f8ddbfded2b78a5531cbcc49a SHA512 b12fa39338e974cd3f9806fdf4ce490ea60d5ee0c38393deba7e8c583d421baca8e90e515d7062bb45ae489851f430e1ad80ca5034e00a5732832713f4f30f48
+DIST nushell-0.69.1.tar.gz 2386247 BLAKE2B dbeeefaee912c284ff8895435230ee781df002747142725331e20954bd60123ea817a48950fd7d6b58bd803f5c81e77d27d3cccd27d3e19bb5c42c453eb1262a SHA512 063026ad60a9fe0a1917d11b90efabc2fdeafa4b542c8b2a9db5022462b1d9098b99f7c0605074d81d27716ecfca46478ffde4dd568f7673915bb1e85a6f5fb2
 DIST objc-0.2.7.crate 22036 BLAKE2B 14a41a5ed6beb100d68601af12914dfef67a9f580f80d70c4578ad9df98a6b4496bc3a1003dec762a27f0ae71afe2c9e8fd41ad715bdb310722c8fc092563599 SHA512 7178870c8e4e9154b4c7b4953b3164946b7ce72c956a02b9ba18889353c72be735824bd73e44a485e42ad5f97994820d9153ac684629342755a6a63711ab5988
 DIST object-0.28.4.crate 237248 BLAKE2B eaea0931cec7c2c71f859b56a70719c71ee06cf78eedd0141467eb4afadff514eb8a996976032b7625a08dc9105e28bc6929890f2e721f7156fe21e3dfcac56c SHA512 32a20452ed62b789c859c442009faf905ba4bc28f11bddfad3da3509861afd8dbe54e5bc0523c0eea5d5ce19cb94dee2e74f218f79df52d95ad22657d571839f
 DIST object-0.29.0.crate 237723 BLAKE2B fd579be961df0d3185682348f1d9cc0fb4dde3daf9a3c5d89b16a5f03f3084f1755d1b077f8a7bd14b2bb296b3bb95e9fd85f58380bd52fe9aa885e19c1b176f SHA512 fb69ed164b9d766b2eb268b3492134ba9ca6b4358eb61712773c44c5c0676ce04e3e0c749f947658ee1423dce5e11237f6b6c0320f2d32bd6979cae141273dc2
 DIST once_cell-1.12.0.crate 31549 BLAKE2B 72a6c2efe279abce207096dfc47d207adae34764642f742bcbddcd8ebab9f78f6c2ea7750bd670844de5f6989e4951904b5f624281c28346cb6c41c585137e91 SHA512 02da0e6eccee2d5246fff5e6323bd7eff0f4641801be5e5910763929a5e9d8b62c07f81001c405cc6aff03f68a14ed5bfebd9900bbdd09568bd1ab9ca9b73093
 DIST once_cell-1.13.0.crate 31726 BLAKE2B 76519b97e04fbfd555c2ae034bd8a95525bbfdecffb7a3fc0fa7081a721b8243faa1269bd409d01a16a62186bddcba341ba13c167e8165b7b011f57aa393c715 SHA512 20a72f8741e6edc2b7f54eee822fdbea1b1c0120d3621059f61eca2d5adbcf044a474b5142871d37a3c0f90495224ec8fbb3b90e62660b66fde3a4d3a5add303
+DIST once_cell-1.13.1.crate 31335 BLAKE2B f8455c5aa78073289669b8f277490ac9bfeafca3249bd54af91a51709262562f07e3154287f7a7db1711d0884fa2804aa82df5d7efb90b8ce5b2380c851be23c SHA512 492831607d12846923107b464a70de62f5997845faaae1625f3e54e2610e96b0355ce9e554051c2fae28f7e6e558ed456a6fc0b3c6a71b26f7443ede5eff5b32
+DIST oorandom-11.1.3.crate 10068 BLAKE2B 443ced49f63015823866257a36a88e566f75adaa79511c1c73f1190ec8855ca590d2b6ece07c2ad5e9e47a89f7891af6e9e43b7d74d9ac57cb3551e60b50aca1 SHA512 51ae60ef51da56d7673f36a6c5b99b743580c5f5be54fdcb54b69e5e2f6bbba3267f96b74e7cd6dee6962dfa6696fd9ed073f22726a2861b8f2601946a8efab9
 DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae
 DIST openssl-0.10.40.crate 217120 BLAKE2B 7470af72e060a4dd087468dd8f092f7519978e49e3a9e7df78cd1ae8d33819a4a14aea078d113772528f3eb4134c019fda9458656b25b9483352b1a19259acf9 SHA512 c07b2fa47cec33ad3abfbfdfe0c8c99ce00aafed5437f864e9be1d151c8f82e52c54ba565ab710693f108429f48df2ce0d2955f54b1926d808ea56fa168afcf9
 DIST openssl-0.10.41.crate 219460 BLAKE2B 363832d3d358514d6d5c97d6e7f7d56b84b33655c3df318b38e0ebaa3e19b84f94aa600347a8cd8f1682accf24a6de342c585e3449f8f8889fe5ac40cc4a5441 SHA512 2ac24fb9b29f8ec3f54944277df924925a0b9a9e4f8a604f8efb0039794520e99520bc28d53355ba4224e69484dfd93265cd174c6463159837f316aae5a9789d
@@ -363,7 +389,9 @@ DIST parking_lot_core-0.9.3.crate 32256 BLAKE2B 79a1924a983b948a5c2b0c074452a7b2
 DIST parquet-format-async-temp-0.3.0.crate 57911 BLAKE2B bb52764553c5f78a46d21d4dd542415189f3d61cc64f73293c017560117ad37001389edc04252a306e7d8ff09b65bd861bf262f785797e87253a8f9315762648 SHA512 0077cb041989fd71f095ea31759352f0f67a1ab68d57106fa1eebace6cb3ce8f4762716ab22291fe22c2eb92702ab75ac4fb383a7d0d500aa3f37c1c4c9b11fa
 DIST parquet-format-async-temp-0.3.1.crate 57628 BLAKE2B 8061a50578e7128b827ff378e696ead1009d9c483fe6600ebd910d20cf14638faedd528805a603b924081587912f1c91e849bb25d375e2442d74547ff18e3e87 SHA512 714bd8b9f8e7b95ea9842f29343b19f51b361add55cb68b869cb4b2eee141ab1f56c0a7b08a2f825504ecf8302e2e0d7403dff85d70146a687ef9e9751df70ef
 DIST parquet2-0.13.2.crate 417814 BLAKE2B f52a489f30ca671b16b49e60a268af8798abe53c148179eac79d167d4d9c7297581292374cdfb6afe7b83b5ed73ada87b31402af1c08fbd8c51fe80056b250e5 SHA512 a99136ac5a1baf5b040aa78d73f385b575ea8fc5fbba3a40f0bd30fa545cc3383217d4dff5df2356b6fc05aca3a6f4069e40bc171f7826f2c49ec6c45f80c194
+DIST parquet2-0.14.1.crate 421235 BLAKE2B 886bf36916e01c0febb8676bab26c0fee4585c3ad4fcd842837d84b7bd69b4aa69efdebbe89f4991eb0c6303f2aaca6e93008eaf92c01c297c7ba56b49f178ea SHA512 a93895cda387ea398372377c9ca285f663da55c70107448237a7ba6d455741bb5c2c9aa6345eccdc73af8def5145f20f679a0310cf10e30ef735259d5ec189f3
 DIST parse-zoneinfo-0.3.0.crate 76590 BLAKE2B 441e96b120e9bb4f666ace28f2999974e3bc6786a8b834b07601b4a13506505a93d2647e446f1871bb072b8a1d1c2075de259319c7c1699244dc4e0b89392017 SHA512 e87eb0feca1feda438bb44d92268779053feec9b0823a336ffc593f508fb6e918add1023d4abcb23fa334efe8a07ab41143f5fe841b4f62ac000feb23c6d840e
+DIST paste-1.0.8.crate 17649 BLAKE2B 626527a8268ecb568170f1d9aa8b4c0906575429292f1817f535ee4f2bc9265daaa33f48602dda0158d081e1c1146c5c27259466f0658c658bf8b6caf736d640 SHA512 d89432e82c81166c1ad06970cf1807662e581ac3ea7ec433d381bf1713f8d0956dcdffb982d3c7c04332913db5ba5f6f58091149928533aa7cba713fc8321cc0
 DIST pathdiff-0.2.1.crate 7142 BLAKE2B 7f9a162c2add4acd69a81171fdb31aa9a67beb4e1be0fe93d76dc46b320729257240fca5d65dee38901f6b6ed1e536e3fff09c93cf3482859e6ba27e7206fc5b SHA512 a646f271ce81d5f6d4a8e0d98a2c802a8796a961cf8fe8177911e7757bdaecd8b156ff22046f1663a9efcd5fef1e6f000e5509d3949dbaeb494126b7e8a546b7
 DIST peeking_take_while-0.1.2.crate 6697 BLAKE2B 31571604d00872900abcb677a483da93654de523bbdb0331c326dc9a3e531f246e571bebcb983e79dc46e33ed6dd32b978be509841ec0d9f1e7209c06289c22a SHA512 7bf8721987c3e2e1986683dd897746592a909382f02b840b777effec7d8b0a864c1a83b03c73d555e359f22c423168a54b75448a7e7b996b739527ce8c88b721
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
@@ -386,14 +414,26 @@ DIST pin-project-lite-0.2.9.crate 27713 BLAKE2B d6985b5add432fb6287d1b0c9fb0cc91
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
 DIST pkg-config-0.3.25.crate 16838 BLAKE2B b6ebbcacdc0f440e24ce5730edd4b371387cf7f44e438216893f29c0f303ac7920791630d4a9bf13581da840c8888e18bdd78dc61458d3331e967b3dfa6d0597 SHA512 46658794f0a7446354041c1cc08cf637970f7651c0c506e2b90c9d4e284347cb82f05ce282cc55c8087bed58a5b961424a56574f4500de9f3ba9cb9e71667aa8
 DIST planus-0.2.0.crate 13182 BLAKE2B d49af4c5cd2d02b8798a43691a5fd4dc9f52e2036157153491b22c51a1809dfd2e3f391f20203b6bf89336f5f9e6ed395eacd8c5a09463a282f296fc802852ec SHA512 28bfd04809b21bd943498e34108c79ec5f8ebc8015f172c4fcad609e4d1a7e93fbf4031e74efcf682718034dddaafbdbaac7fd74bbec2a40cc1e3b616946d36f
+DIST planus-0.3.1.crate 17324 BLAKE2B 280288b40333ef0328c75145f15919cee1b14b1506fa8d3b3fa541a3644ee25031dd61e15187c7d75553a659d937f059007796fec502c67c5aaa7f2cab33ddf3 SHA512 a0dc1cbb4096cd4e096346f2a7bbd9cf698ceebacb622950f016e886309d835dba1ce9e6d8c42e423c03b765d8778307f5aeed1eb993dc0d600a9929a032f186
+DIST plotters-0.3.3.crate 143160 BLAKE2B 76e3f081e9ae580d08435ece9bca927a79d660d03dc82231784b63dd5255775d0da89adeaced54b9c108b47e832ba9514a16d4d71f6d8986c52ec3955bdfa958 SHA512 95144f0e9ac3327fb70fe2d378dc13b70466f8ff5220cb97e102338ccfbf3655710410c7e8d15fa5f30991062b8406af6482185a938858e6207093ee0902768f
+DIST plotters-backend-0.3.4.crate 13416 BLAKE2B 2b7090fb98ab9c28fd8525e1b3b4ca3410dafdb80563f52b545af70db638899123455254861e95973fb9c9e178e83cccd941c7305977de033091ed957291c28d SHA512 4784da70eda90a48aab38192619cfa7df733519cadc3b9aecd339dc735a9237e03144eee4f22f5f03ca214a732e8807d179d455032dd255a8125092ea489228b
+DIST plotters-svg-0.3.3.crate 6916 BLAKE2B 74c2c71afefe1148c82f8695ca3ae5283bad5b084e542325f3b6d587eac23f9fc087b64033043ff52ebcd661d40bb91c33ccd0de3c424ac0916baaa3a69c63b6 SHA512 1233eece4ab91ec690f93c7134ae8e6405183aaf500b2dce6973b6e212058334b7335aa80915e40363b9d2057398028c57d0b3aa974b88bb42c4e0e4726e7a92
 DIST polars-0.22.8.crate 37507 BLAKE2B 5fa2060e8dc3b168809707bb50a864a471a1958833127884635c187135b02d056d06c26f19d5d1eace523447dae7d6dd72ee2fcfd345fe5308c5aa33cf85f9f0 SHA512 2a0271fa767db632a29ac755d4db3a44811f30f90e3539079811a3961f99beba3f4229f39299f4fc5517f68b761540b628fb051d78de7e53fb06b454dc8016ec
+DIST polars-0.23.2.crate 42345 BLAKE2B d40d5c23b29fa3fe399fc6aefaa3b31bd68f7c4fe6dda0045e8b61eb233cc0ceff4f25553ecb3ac2bf18490ff1fbe4765412e2bb1852e6a9d6c4928d9155d4fe SHA512 227fed77ee58f78d5fdb22d6beacc2f4fcea3cb05838c0644b537f0a2b2d44e53f45deccd88508f5ce9c4f0c1b5ed6bf8d3efcea25b7b0582fcee8b50c532e73
 DIST polars-arrow-0.22.7.crate 34813 BLAKE2B cd2625ed3e01343ad3384799fffc335a43d3635c8d603d87db22f8d91f085bb7745ec05ed72f57b0422a13a2389dc1bc291552633dd011d60b29d70a0ee22c36 SHA512 4d068ceaa77ad6ad1e8df39ffcfd1e4d9edf842d1faccac28987c5b1a947be6996ca4be705cea024bb17f9f00a1ee38c3b5e1774e71417f499183d9d4c2195e7
+DIST polars-arrow-0.23.2.crate 35077 BLAKE2B f727555df60ffff56c30f8f42d9c67bae0b060b5b22472e84869a00605822550582cb51ca19eb0c6338530f7dd38c4068986fee0a5c7adf63d73ed0cfb33ebb4 SHA512 312e83c9eabbcf166d93f5c9f7b87a54fc601de51177ae269fb476e91d85c2e26dea0ceb50dd132e944e72d9d92e713d407f5c883fb8054282eae9185cc67ea2
 DIST polars-core-0.22.7.crate 280372 BLAKE2B 1b0cd7a3c8ca60aaf0bf8e10cbdd730902fe74db867061a20fc446bb5ee8bbe352027e2b9d96c282ee927c1f372429967c24c1056cca0428def296380f7eb78d SHA512 222760df0d03450b51dd310fafb3cd313ed127ae383fef2b4e12f399baf52a8d427c5204a4053a2b155337695f1b0c1583ef1bc6cabd2b311b9536df6204dabb
+DIST polars-core-0.23.2.crate 287335 BLAKE2B 7fda6d91f10f0781334c1439ebc63580400e07f89538e3a03f866954fb093928384854d93c2111a19af98dbd86a9afbdb823c6b62e565f472ce822a07bb3c4a9 SHA512 84c30b6cbd1ffdb0564228566fef209a783dffd69991b8c2decc522ad1142fc754a1fc5ca8a1960dccf67f8e61e674de7a5a431eb68d938e5642a805d4632598
 DIST polars-io-0.22.7.crate 46611 BLAKE2B 1bdfa061e8f261c25c425ab8adadedb3f378cdaf7b481db2296613714fd33beec0c050a7490c7b386afb6455432fc5aecc3791c3de14182a4bc1a41911ff4ab7 SHA512 7b2eeb377843a848930eeb460413e7989752f15e099d1d1364c5a74a9d79f844ac8de6c911fda64cd14655b0bc2ff430a735ffa9cb859825b7bba5dd5e436815
+DIST polars-io-0.23.2.crate 51228 BLAKE2B 485cfa1f943fa1c53ad4c99d97d5ceaa2cd16ab78f5ca9e413406ffe8a94080e96e51c0a014fc92683cd5d4a6877af0aa35d9241237675c43b82261325e82a3e SHA512 f0b24817af3ceecf21a99be53b3ce2af136cdbb70db5989d6a2ca095a8b0bbb31032743754d276a720f4f0962a4dba5e5171587fba69797b9741d97f1be11898
 DIST polars-lazy-0.22.7.crate 161031 BLAKE2B dc03859cb7f6d73be3395c344d706c7a4abccea3c8d7e42ab744747af913cfffe254bd02336f98f981d605f9ccd94cd2c8129219f478731a8843a744249406fb SHA512 ad91b1e0fd2d86e552ae23beca09a34b580185b862fb171d7ab94116ce7e2e34cdcb9f03ebb7868cba5724abff254e8b14c66054b596631c84126126b9b52fb0
+DIST polars-lazy-0.23.2.crate 174352 BLAKE2B ec8209962322293190989e1672540a542be29ced03ad2de969aa6ab5066e5129fd52bf9a4dfc90617c67972a6be2c6b3c55a8d686851bafa934db2615ba3112b SHA512 7b25316c0338e9ffb13e90873ea41f770564a9725accd9329d138808bf316abe94880f127b3e6e4c09702628b88b7085725c8a52f17605a417b7e1315230ad61
 DIST polars-ops-0.22.7.crate 9735 BLAKE2B 38312fa72fdfeb36402799cb02785da9f9ae89773c2b0eb18365b98b1c73b3c77a4e4be7069a215e2f1bb7a9493e50632f176e48c648ebbfc02489d18794d2bc SHA512 a0f9085a8b3a2f91f223227bf21d89eb20ed2e5d7ff972006681884ea78ec4641fd30ab9f9d9ce6b8946b4090c3bbaf76d676b37e273bfde89c88ad7b70f1307
+DIST polars-ops-0.23.2.crate 12541 BLAKE2B 7bb9e3565a36b62c0d91ea164d8a2c16616b66dd06044cd73f56bffb58715d78416f21f2d7106c37fae550ad761f17cc6ca121fec5506af47bd6837171c85681 SHA512 a323859b47131388126265a5e313b3c5c498aa1cff888098357691669aa36b977018321456cd01e8f977c0f047097b5df96e92446c5973b73f93bdc70d640b02
 DIST polars-time-0.22.7.crate 32247 BLAKE2B 1bf3015f2179356705caf59309b674eb2b69a5aa4511f0082c46aaa37b7f40ccecfc0b1caec73647232bfe188bc62adce7247364114b4f9503da8f55e26d7268 SHA512 4dbfe9a2d4d0a4401fcc1bec49051a60ddac111dc61dba2735bc357bf93093c85e97f39a3e517c566d64ddc8ed58c68982c866b6cb6b1507317601371a2b9c1c
+DIST polars-time-0.23.2.crate 33347 BLAKE2B 861c0cd6a1b0ce72e799de830e4abfc7c4142b24d580540c3e155d9f71d699311d398275cb637f9c9127b74f45a9ef2643e2b14e1cc623ed0b25b04ad0506e1b SHA512 8afc1819a7625d18ebbed0888a4d29874b3b8d7e6d46d14b7d427cf906ac421e4adefb6b4735cb32db7416a043b118e51f6028654c329aac08eab89032fe41f8
 DIST polars-utils-0.22.7.crate 3199 BLAKE2B 66fccc7b059d0069ce428b0e6b4c2509ea5231193e0bae3ae612c0692b934be149a997812a82ca3ddd6b7d7d253678342bf227a698dce9eb51963ec942efea21 SHA512 164016c271d921088fa95d0c1eec094e52cc2ab57d50d878017ee13a24418751a0afb0b9af07ef528383c2ea4892ecf9a51ce01ae82427fa4744f700c0a4d1d4
+DIST polars-utils-0.23.2.crate 3199 BLAKE2B 01e0cf107df88b6bf51c2dbd5a559294f12aa2d708ce9e155de2f8e63ab4a90eb3f6eaa34d2c831b91af886ddc49cad3e9e82936593e2e2a4c8754c135b32629 SHA512 f7513aa26cca6e20b775b5018ab77d33339744190f13d95e23e4aadb21ef39919a521201624cbda751ab35a2a41fadcdaa152187ff63421e21928427c214b21d
 DIST pori-0.0.0.crate 4839 BLAKE2B 5889cd5b51dae18b5159637bd95ad205aa5fa3e40dd1542a4bdd90a0b3bbd5584f6c019b9b22f2fbe3cb30d87725fcc3cc09962fa8a76ded464937b5a5e06ba8 SHA512 6fbc9e74fde5229f57a91ca48799cc0de8febb47a5c636ed54ddb64c71d793518692a664ace776f9407004809e69c11fe2f5fa68aa98332885febb715b34a5a3
 DIST powierza-coefficient-1.0.0.crate 4297 BLAKE2B 06850f714973bd90a7124e63309244ba942c8a6ce388b30e326c73018b395b4c65853417cd439a05b39997f36d5348eb2a644e9874924f12d5d91c752b7a97ab SHA512 47a274ed16d09d5524ee09526c895edeb5b6ca2eb84971567d45d0f9826e698b6f777922479e7c2c905185d7ae7835cd02e47f5e1a81dccddca17f5643ab0d00
 DIST powierza-coefficient-1.0.1.crate 5018 BLAKE2B 684a67ab4a40afa17aebf0c990dd75761319832dd65300d008aff6253560f31cf93137d083a399f61ef5401194d113ea0640ad1fa97f1ac5f239a25f4b1bd8ab SHA512 079e39dfda47cc4cc4b733dcfd768c949c425a4a69a9085a9b4824694cfe1849a5a3869dacb2366e8223c66af0e68dbbc0e77754b81de7635c8f842c71b39204
@@ -411,9 +451,13 @@ DIST proc-macro2-1.0.39.crate 41663 BLAKE2B f7d83709efa289ccf12500389c7a4f4f0e32
 DIST proc-macro2-1.0.42.crate 41464 BLAKE2B 8734bf01e8490cf208e873710a19d06631ec326aeacc244be568c689eb7e214fa298ffded01643c1e92ebd04fca866e383d0ad254e04f2e8d961c2e449aaa41a SHA512 fbf005ed4e94d6cbcd7467ccc3f0a1a59982d8bacfd379112bba6bf411905c95213666b061c1d38315962f79b640244d5a1f81ae92ceb0d77fe128610227798c
 DIST procfs-0.12.0.crate 103531 BLAKE2B e31fc6cb5f8866345fad9adbea6e0cec90938ea653ff0093abb3e76e023c22d6a0cbaebb0295460539794eb3c276a73f204c078ef1d0c9b1e6182179dc3eb234 SHA512 48bdd24c0514dd9a4a16be492085d9b6be41b81333b5dfc99cf0f04e337a532dee5d50b4317ae450f396924364f00b01fcd3b63e655ad50e53eb222f29a90499
 DIST procfs-0.13.2.crate 112156 BLAKE2B 2c992c32a61020f42d82301a843ea76975c070693b66dc099e0a6a9103f10a0304959bfcfdeca3b0437734335012ceadba28da35bcba57a37491fb61eb1a2763 SHA512 e40514ce23c6ab5504263f7225111f56a4ce7cbae12d60e794fef9a9fa20295a8e213eed3f5697cf1bb5fc47b25ed45a155f3721a23d697b8c32c5c9ee4354f6
+DIST procfs-0.14.0.crate 113323 BLAKE2B 3a07b95a547f637d92dcc820423d484fe673ba69965cbe9a105b509ffbf594c9eb45e6bbb1a0e35176528988adf68c6ae657e4c7e84d7c4282132904a21e39f8 SHA512 02c83581be51d6dcbbe9cd7408fea4f3336afb652fbfabd4b0f027b37f90354b2c8d78fdcd95c9f023c60da35ba31602a7a8bf3642ad14802e57ed71877805e3
+DIST proptest-1.0.0.crate 189237 BLAKE2B 52c7768f092677b947b8d04fb30ecfb556f5514ed29bf98c0a5ea773ab0b4433c3a04d1df8d30e4b5afb174b8c9bfc13656c75ed3ff16150d3ad3dc0924f1e12 SHA512 c8a45bdace0e836db5ec0113f3794bbcee2b75fa5b06caf84808df7a052ef117f22b48fe12413f86750da710d5e5c88457a77ecfce04e1e8fc5a76dbba3d79af
+DIST pure-rust-locales-0.5.6.crate 159349 BLAKE2B ff198ed3266e7bc7b6b4d26343a07b9ca85cf1eabbd1119e568dc8794da58de2c6f9639b01dadeb145d79ba6467bac0fc19594886cfe679a58b8baf7a3d39af6 SHA512 cb7855f243dfaee0c2f2dc70fd4eba77881f7a7309dabb60d40eea14ed2eec620385129c9bab3abd363d6ee915afc22a849533a833feb885862cf2f0e7b06a76
 DIST pwd-1.3.1.crate 4779 BLAKE2B f6fbd4268b88e444e6d6033bf135b24e61425de720d3ceb4fc60828d304a3771ad5402a98e19ad0fa2dc53b54bb972cf50896995eb3ada7ed134ea7982739bef SHA512 4c5f55fe470f04a7b0c2f33941b90eff015674a0a257f24fb12a83553c99d1f4b8ff6974b0020bb934059c8043cca0c2376af8f089db72e98cf9a5d3221a7e79
 DIST pwd-1.4.0.crate 4145 BLAKE2B 65644be9a061d26ecc4d52eb945a10e19a4bd5db8ce561a78ea877305f66e5989edbdf5f08caf31f69a361651345f338d341e57e2557e5a38744e391f320235a SHA512 ca0839275c086f69c4f8de54176f5134efc38c6dc82e2b27e783cc7d2ac6dcfd280310d5353ff8489f3641c9f9770a504e6087a4d5e9dc669902aa7580d54d9f
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
+DIST quick-error-2.0.1.crate 14265 BLAKE2B 3815c89e960923bfe0abc962c38714b953fa1d5af991f3de22d1d084a8cd1ba1761fc961ba97e06ead3992ed1b61f525d04bcce459599e5546315932281c1dfd SHA512 e028deb598466ae91663e5d090606be4f117662d0fa6e0c0b0043c7261f26787057e84e644cae72a45b1a0a7b1fb03fc9712faa3abee94b97ce2c8d25c365c32
 DIST quick-xml-0.19.0.crate 109155 BLAKE2B 7da470944f2ae138d85e3185df97e76cedbde8a1f93c7fb76f861e1a4a73ce31a11fa86bdc7de0726cff143d82f55b0291b3eb0fe028769924dcaab45de42c9b SHA512 4806683fd622671c801d66f83726e677b4cfe85632e10501d8e876b78c2271fc5786341fb778a890d073ebe384fc844b82bc3575cbc8c5bbc92ca58953674034
 DIST quick-xml-0.22.0.crate 132066 BLAKE2B 1c1d71fdaa022e430e6265530f3e40924c13457fe422e4355eedfcb5ebe8c75d0205f73ffea0968d8196d74804d7d0fbf61954852c98831d510af6c45dcf6923 SHA512 15e56fafc84e62b219977c5ab0f07a021bb71216d7cbb673a7ffec4ec6bda36f97d7b7034751b0b7d745df7c17c1a591a281cf2c97aa4fada7327979711ae3dd
 DIST quick-xml-0.23.0.crate 160655 BLAKE2B 0968988e58f0d6d37fdf73c9684ced8abf6a3aaf2f0941eacc96876237575358567c51b4ccb8a0d4864c6af02d59ea87c2e70b4ed201a537d3d634783c6b1f18 SHA512 9f2cea83e81e7f5de8a5ccd883c9d83cebf9169ffeba5a7355aca9925c7d2bb2216f0803203b91709dea292f89111bfe1e9ae6d34e84741473df5b00a3b21340
@@ -433,12 +477,14 @@ DIST rand_core-0.6.3.crate 21938 BLAKE2B 7c73e2da6d423c68dbbca31f6528bdb3f42fa39
 DIST rand_distr-0.4.3.crate 58255 BLAKE2B c93a4db62e1c27bde51c77423e15674c4bafd04a63424ee8b8863e4eb27e56f774136949edc8b05ff4189dfab1f0dffc92855706f4a612be897523e7712ee830 SHA512 e5209a78b8ca1af97ac6c6add858ee6d91e67c1edd124bb297f787d37218a5f1afd570252da2eb25738b8d77482df4e93aa1eb3c4a8165f90219410dba495cda
 DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
 DIST rand_pcg-0.2.1.crate 11291 BLAKE2B f8837f3f3dcd7ecfc90f88bb6464b9f79f7c1975ecc68289fd10a5c97323de9c1106de9847fc798f50d96044e46cca9d41f1635130be40bc789492bfaf999de9 SHA512 612c0d1cdc591f80733bf8097e251f02ef7a7e71cafb74e37b63ac68043558045c0c96196200ad07ce7aa9f2d373640c20e598ae5774935c8b52350ec20958ba
+DIST rand_xorshift-0.3.0.crate 9121 BLAKE2B 56c29e159c0beb9c751429130e84e4666f9031b6f70e180544f9cc8f8e85d98676b861b588dbda46f2cdbd254fb908c02c6ba640d53422e6bfa1ae4e48ca5a33 SHA512 256e410e5bc08c56496c53c3d53936f3b1cfed41458b0ee8879d7aa8b95375055746ca49e29000ef847b37f01e9237f569cd000c4b281f6c78ddfc78ce439a49
 DIST rayon-1.5.3.crate 167246 BLAKE2B bb312c9879fea3cedecb70bff78616eb7fc761e2201d5576d86074f4926dee6266ff6f917cc97a63b6e6daffc33f5d693a5c73daa49724643b93f3b9ac77d8dd SHA512 47909226951c4d6b774880dd308e2633b1582e41e7730ac8af902895578e6f29a9b1bc47debbd9618c5a45f317b4f264480392c8982aa33576deeb9d5f8ffb82
 DIST rayon-core-1.9.3.crate 65300 BLAKE2B de5700c9def379f6a27ee0ac0667f741913c28ba4d98e95d7ae964c32f13967b4ca160d219b53394985ff4557a11a6ab3c242333e2a6d3790801bdffef3f9153 SHA512 4b852f083766e7e414132840cc8dfef148e15db47967eeedc2ddbff9a4372521c296dd4f66e0b6990f49a8ce88ebed9d44e7ad674df42f96b99b24469b1852a5
 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
 DIST redox_syscall-0.2.13.crate 23759 BLAKE2B b59c3e923b7bddc84285377eca86e649c21ee7dd61924245d43c6554124adf689f9b92841ca64876b34797249698511b322f6e8e639d71e45e1ae9da5f8b7834 SHA512 6551f503ba52c4edc0cb4a418ff212188ddc7be80dcb39eaf3bfb82faa9a76cdf359f604d6b32be6c6a335b54180c9399a0e32670333a5a08351957308486100
 DIST redox_syscall-0.2.15.crate 24007 BLAKE2B 755a3ebbfbcd1b561aa485f8dcbaa9679151308961f25beaff974ce39c4c135a5b77c6347865b265b59560db599a448f84fa618828868ac400e03e326d9351eb SHA512 1f9dfff4050c70912d3a8c1f21c2928ec87ec43860eb67e8cb090339f9254e2cc73fc17267d7b532974bc89dee55b40190db6db691277188790ae5f0210acbf6
 DIST redox_users-0.4.3.crate 15353 BLAKE2B 5e3b4e902566620cee8856c092cac193366ddcd2f5aef787b1d485353a0da11486ae1359dc60f3c87a198cb68f93ef99ac7551cc2315412b93b10ffb10540633 SHA512 0d3366e23cf93e1b0e025a29025eaebfcd1145bd158e2663b94fd952dc2d8a25566819e3a03c4136ca16a6408d37396e2ead0814c3f0c2bb10334dfd0b838fda
+DIST reedline-0.12.0.crate 103250 BLAKE2B fe3a83a8c1306a6ada183706a4e45528ef139e05a0c7891cbc9a3ae47b5a51fb602998915be5cc02bc00cdf173614e468a13ffebea447dafc237ff539224df37 SHA512 aa47ac44c2dd4e766d2501c80ac36e95957e13e2b0408f8c8fbde640972fd2a4dd4eed7479207ffeb13efe25da12f238ed3a71c2dcb6bae0e5db78712034b041
 DIST reedline-0.8.0.crate 99316 BLAKE2B 14c9ab519af58f9e14a81f678771afcb241bbab151948fe55b8940a809357a0468e53c6d19b22b6dc193a8799c4cf20c64c61bc78df16ae9c6d5fa095417dd1f SHA512 54c13d5f22bac16e444f0a15a6a3fc88ef5da7f74a4eef77cb300907ee1f13cb1d9e06a80382208221c2edcd995b9f9f72d5051bb27c33af8e62d39df0b7fb84
 DIST reedline-0.9.0.crate 100732 BLAKE2B ff76e35c6d7dc6c69af33e4f8cf706924d7030aa57ec37e0d26a0ddcb92c90068d58d1d96c041076cf350e5abda4060c81e36876d9e6231241ff9032d2c18bbb SHA512 7eaba54dde2cdee73249c78ca15be335aaf5a50f3afe4d07ba17bed7a6e7eda8b548654c0bb5a6220f38cf0db7a8f54ceaa6b26026410be3b1531ec69f6e2922
 DIST regex-1.5.6.crate 238593 BLAKE2B d2b200d9d3d8924e7dd7a1f96c769a5bdf01d9bcd358ffb90692c526a81ac6f1a5db8ab0c343b96868ef9d71e78633373744468fe97d281676c84ac795352745 SHA512 43ad2ebe14f43d69c62f563a4fd53b5657f0f2cc130a0e6353a13073027640ff891e9f9b40ea85858507047bddb2e023d668c9bf57f2ba0ae045b74b5f0d2a1f
@@ -452,6 +498,9 @@ DIST reqwest-0.11.11.crate 142667 BLAKE2B a246903e1cf6e6d5f5262df99cd22b2d363bf2
 DIST result-1.0.0.crate 4156 BLAKE2B eddbbd153eb243b2801443d8f074c40e352694b3d369c3d868ee9cd53697cad983b0fa9575fb04ebc9e566aba0ff8c3fc5312b2c18aa6655fcfdf46fb8045885 SHA512 75354aca4a29fe544d2284039a22cfca3e386923477175984d589c90e828117a9d953631d57794f7070243eab3d8ba3c6c72c35e3147413fff29b04928dc67ef
 DIST riscv-0.7.0.crate 149655 BLAKE2B 312a344665116dd719d9b0ac37eb31dba2211e463084438d16e52c20b73fe01b8abfe4d300d84d67e6036434f3abb0d2979a2c042573fc5e027e0d47e78478ea SHA512 2d7632ce04742bd852d8a0159eb3bdcd000f23595726bfed2e9f91da5cb2b0d251613338164950fc9cf1c547de33d1a07744a3c5729ed2d4328002648f6e43a9
 DIST riscv-target-0.1.2.crate 7729 BLAKE2B 56425882a7538a1a6b1a4880268cda0e9246fd420ec4d60f181588e6a128cfc1d372da8e000f67ef192653848453f6fd1619df15349ff2f522d0ce58c70d76af SHA512 0ef77e4882fdbff20bc1c47d744f8d7f2d91c3c04f3519fe218d645a1df6074e08dcac643359d338adf1e7d351f30b61e820e58444eb0a81988ed2b91e74297e
+DIST rmp-0.8.11.crate 28829 BLAKE2B 42aeff1a8d4874f1cec8a19085e4f23ae33cebcfd024c28772c0cea36e096d5ff012e6063647f31b9e9c3ca311f1036566411675fe2f632dd9dc1d5d1f7f929c SHA512 27a499316542722a4d9fe4fa9cc005b6b5fa75dcf66686a5c08aa6130497b67511c0283419adb64fec09a51a563f4991f2039280d2e74f8ea4102afbe4977f38
+DIST rmp-serde-1.1.0.crate 30373 BLAKE2B 2fdfea3ad2a8c3cff4c68cbf8c4254c9c7dfa7cd135a9c4316eac7d6498cb650faf542737517ecc0df81e638434d86ecc3c18fcfef9725b5922043f2c5d67262 SHA512 5d6828614dbaf5939043871dffeb1fd515b27e583f6587057a1c29d41cb12c91d0657a0778196c7bff713f97c9a740619945d8988d618f9667a497b08a4efc4f
+DIST rmpv-1.0.0.crate 27352 BLAKE2B 4d0ca98f25e7c2aedefef4448103e39cb9afb20de84eecd39cd8dedb4bd0add59675e7b9c43ea8f3aaf3be59280f48def349686fb060bcf46fd2f1e90e117b36 SHA512 7d10560603064d50e03b439e8f0956d9ff01ae15bc3cdb8980cf9de7d5b52927903e7dbaa84357d658241ada6282be209ef4f0cefe92dd34079db4b891761665
 DIST roxmltree-0.14.1.crate 39163 BLAKE2B 9ae8ff27da1cbdbb48400a40ecb4435d687bae16596fba037588320750f70e90a7d5f4c5b59f6bd91251dc42c6ac655933a6480ac1f7eb33511d3c2bb03a681b SHA512 6ddf07cf54604d5e5feff2ba9c4ba3aeddb3e43f9630e7a66bd01cae7f96255eb678a9d3b7d408bf6677bbbf8243c30c057fb5634e6cef99b445d0022834a6f7
 DIST rstest-0.12.0.crate 919939 BLAKE2B 4af2a7b379448393134bd759e46be9effb32d8c8a4b8d0360d85146df6ac60de84a84686d4131ac78de5be85a30ded224c0c15fbb55e7f54c546de4898bf7595 SHA512 de633d8dfcae3f20b6ade6b503331f15fdda40d01c470ad9baedcd6837b034d620ef668d1893ad8413a1402570f203769f3bfdd931e2bfd53fc1e8133cd55750
 DIST rstest-0.15.0.crate 24882 BLAKE2B 1069c05ff1d92df6cbf4551570bfe3437162cab4bb25f0ca698e39d58dc81ae6300c11fd7b245b87e8dfcbae4a9a51b823f4ecbc1a4a3ece5db952f4f606d748 SHA512 7ec914263c9fecdeee8a1bd3eeeb8c356a08617f2fb17201d9511e0f0183607158e5fad42b4ef39fba16a9c2c5fd06b95b07282d474da61ad684c232c4f954e0
@@ -471,6 +520,7 @@ DIST rustix-0.34.8.crate 282012 BLAKE2B 5ece399ec98f87be0d1f9b2e7f73e34fc022565d
 DIST rustix-0.35.7.crate 299025 BLAKE2B 04c52f7ac6e8aba747908c21f51ad72c2f2d0402d1746b8e5de479ebd55937cbe83086ac8b11c23e60e0683219595dc83cf5fe696f021e5c96af76a97e6435d0 SHA512 051507cf32747c62a73a9deb15633dcfd6f6002d2c9808984de9607aac946ce0810db74d541f264fcb57688e943cbfbb5394c5398f8739e10d235988aa9d5261
 DIST rustversion-1.0.6.crate 18380 BLAKE2B 2969bb40849dbd2f0d3f4a190629e53204cc5ef9065be6aec7a4504470e1dba6cde7172a3075a1bade421b30b88947cef6b29c0ab5aea8601695f72a7acc45d1 SHA512 fa9efca7e49eff6c510d062d02fc73d15341b1fe16d24dada86108202a4295d2e0519aecf3f1701540cd4d49a513c05e74d3d27e21e5eb3cb1aba46c70a992cc
 DIST rustversion-1.0.8.crate 17351 BLAKE2B c3da61be9dfefb7da5c70b434070358ae89d6d36007de0779e8dc8560e6f97a5a180451735de15b3b2a2260d489d0c93919e94112592a46549676ec039d03f00 SHA512 5424e1ea0ced9bfd2e2732b087779cc04ade70bd5e62e996937470e2d103a3360aecebb16ff7a06c00eb901b162b55aee13aea77e73d5b430be8bfd341489f59
+DIST rusty-fork-0.3.0.crate 19881 BLAKE2B 01bae755c66d7e4f72789b7140de35573d82961adadcc9febb841e332fc2730b405d4f1dc8aff1db6eba3ca03ee24d5dcd9a9c9a914fd2a94428c796dc9bfcd0 SHA512 8e41e12971c36ae1d4439943e55204e32fb4e62717355a2bf79152825eef7dac305c2fe22468957cb3b7af0b27004ceb18eee2d2fa0a6f8822b28b711f64ccd7
 DIST ryu-1.0.10.crate 48485 BLAKE2B cbc0ab4e0b2031f4ca3a34914bd61395d14706d42e2414757aa23a67530d549382d61b630159c92a169d1dd3315951b0071ff18349d2b090ae262de536aa29e2 SHA512 1bd0af71a20715251dd42596df6e7677e44f712bbb40b0d9544109c1b2478a7bd2c9393535f0d4f3bfe2d1b75b3a2b899044051715a7da7d165d6d586e0775f2
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST schannel-0.1.20.crate 41579 BLAKE2B a7924b4bf0f130e2aa4668cad3c7112e39e028fdcb04259c6926fac4875f8061a9148da5f001dc49051310ed8e6ab341da0990ccf0a7cbd4dccce8da54c1ca46 SHA512 19f217fd4571a0d0fcf52060a8639e0ce7114719aa23fb0aa2ab5a531e8f8be0a21af55ef45c8da804101e5a62f15669e66fe005c4cd5bb24def09f1b4afe059
@@ -488,8 +538,11 @@ DIST semver-parser-0.10.2.crate 23176 BLAKE2B a946a635d207f14a59f3b5db3d0a6dd8ea
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST serde-1.0.137.crate 76182 BLAKE2B dffef53be259eeb051a375e532c3748219f8219413af0615debdbbce61c5ca17be13b06c0bbbd7a85a696b4bc76ae8e252d880b01ecf540b758fc10f11415b21 SHA512 28223488e18826f83a7e90029aebc0722e0cd238a2c0c021e5a162d0f5deaa494713fad10f7ac79c8e14de856af931b6d83cb3efcfd0885837fc71e35ee38a2b
 DIST serde-1.0.140.crate 76408 BLAKE2B cd89def1aef2c850c62e8efd8ed03da9e725a0e80c78de1a8b053d8a9c7d089509b9e5855b2c8b7f383cd58167125b91b9d243a6e11bb2e9fd6cb68403187311 SHA512 cdccc3ce607b327785821d8a4bf088b78380a622aa32efe7b1cf6f7554a03f7a407f500fae733bfeb170093e08ced50e81d7009ed502d1e5b4f021609fcb750b
+DIST serde-1.0.144.crate 76387 BLAKE2B 7e66355c24e1116eec4a3ba4f9164570b6d4ab57196d39d19a0bca912c9d2acfb33d8e17e09bc07903984dad154034187d0ffcc8f9073b36336ac2b38ea012cf SHA512 d7388a40e4a5e0a65ec7b49193f2d53d758adcf26b98ca3bc6270351c7553add2f38a8434223a95826994c6d039dd91fc4f4020ce191410fe57bebd29e4938de
+DIST serde_cbor-0.11.2.crate 44570 BLAKE2B facc8d16886dde89125b7d69e9e77ff586c61993c3493fe4089ff03c53e6c0808c6da45a83337d3be7414dd82f3d6a7f3d43167473e49e586a7e817d47ef3014 SHA512 12ddcbd5de0d85f2da6e078e3ccfdf2115125084d57eb93d7e9b45bca6a86daf79dcc79c8e54260c56240c3b5e814b1481ac28c3aa1d1b4b982ef5956b5cc3cd
 DIST serde_derive-1.0.137.crate 54831 BLAKE2B 19a0324c18bd00da4feabcf83dd78de2ff7a1905abb82d5600c6128a8351f5ccc37df21e0135601167a51ea1e6691bd22957c2bbd9da637653c7673dbb808d24 SHA512 ee47d3bad717ae16118c43e6f308a0e264bde80caab8f8649bef96ed3f7aa0f9b6a479311df22ecdc7bbcdade65f7b03b79100f8b86caf02f9a0bc77ce01035a
 DIST serde_derive-1.0.140.crate 54851 BLAKE2B a4a104c6a143e4f5951bb94d3ed8cd4c882a4508d786ad802db4de4c84fe932bdcd45d7882f75e5e4c4ff8cafca4188e39d62d71b65ff6ac0bb14ced9f73781e SHA512 209d66ad4cd11d899aba6554cebd517fcf1a8621c9bc0103cef51558f954d1995bd16fe6fc09ca5a242820ae4764ca774fbcfd99b07ecaf609d680fab66e2aeb
+DIST serde_derive-1.0.144.crate 54867 BLAKE2B d1eabf53f4efdf95c3c12a907090617e0aa02661fa0e3cc51bf0ef8dcdbf45f0382a57588565ce26ef7baca330c19ad216a8a0975247bc02af37c4440bdd6859 SHA512 d41208452b36b8d3f0644e58164c9c4e75f8cab2d8be09cfd1b38bdfc690e880a062e0eafe46dd4400d01f541b34c9acd3574504c4aa856afb00cfc2e9617a0a
 DIST serde_ini-0.2.0.crate 10691 BLAKE2B 40497c532b7c215cb5fe50635d7a3798dc6fcd02ad8ec842aae2a822ef6c55e4d736ec676a10ce71c1a3c72a6fad43d0b2e8e1f3c1cfb2f4fbc4177faceea238 SHA512 f1889fffb743b97da434633ad7af4d24ef9e22005bcdb5051e00802ddcd2be92567050123be2059a6986ae65bfca4090dc2b157d87c26ebc67c4ff785db8b347
 DIST serde_json-1.0.81.crate 144480 BLAKE2B 3c95d56e65c6673ebe9ef0aa41ba184c5246cbcfb0dd9edf8e87ca6cab736d195ce8b6349846806ba7047854d579517d2d19bbfa932c90b700f06e54cf49b131 SHA512 9f224b2182db2fdddfe1878d05d857c52a60a38f9b4fdfc87c09c20efc8b6ec2419bc60e4b18a0852ed080b09332773eac372f8356af5ac0ddf3da8212345cb8
 DIST serde_json-1.0.82.crate 144514 BLAKE2B dd4b5ee1b93f04be09b1c204f8484091d608acc3966ed4c8252a1d46003dd154666e2731e761828dda4123da5c45bda653f453454c5c7c11977aef05bd0e9e9a SHA512 39e4cb0d8b22c9beae6decb87b9692581698c6309b2e9fd78e5e199a200da563e7459d34435b7890e274e13357195392cab69d73d3ee2ff537c1667de32f92c3
@@ -497,6 +550,7 @@ DIST serde_test-1.0.137.crate 19864 BLAKE2B 377df62aed99eb85863b34900c249e0924c2
 DIST serde_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60
 DIST serde_yaml-0.8.24.crate 42102 BLAKE2B cf389f5438636ba60eb2525113f785859d4124efc23604a015ba52363a5c784d4ec552e46f5231e53d703042c96ac7902863902f96db121dc58391c16b979b8e SHA512 f32d3138a7879b6ec9329c48e691cd2d8e152058220402788309dbe830d90e37bcdf9d3538d79b845547b2135706b3060ff40a943d357f9d3b6dec478af400c9
 DIST serde_yaml-0.8.26.crate 40670 BLAKE2B 78ed7b0d45677e2ff5bb94e9a12be0ab72eb2229e064a3e357a7ea3566648f10fc6c2ad5c07ce6067841392c97d4034da5d54d51939a08d81f64815ccd798642 SHA512 f6bde42539fe35dcb09fd506149c564f2056102f15ce275034b33c40ae666e22d6beaecfed8a0048704547f153fe13d52b8b305c95a61007784ee42f6a8372dd
+DIST serde_yaml-0.9.4.crate 58652 BLAKE2B 6fe24572d96a83b3a2b29992770107ac60730b26040faa45c1cc881e769990409d2704055a83f81c0522dfff0db75ebfe0f957430afaf5d3c03bd6ddd1330c2a SHA512 84d0a867692ca9a62093b90e055ddebbbdab5fc7ca5aee6be7a009f215a15e8689323f0fec8bd5bb01f1d23dd462fbc0a5c2be4a201773783dd061fac6385943
 DIST serial_test-0.5.1.crate 2993 BLAKE2B c72cfcfe441d1d23128d442a3d24e83858e598dd95bccef0a462c675793db0aa1ad2cd03daa73441e84c8389b8dcef9b4698cb8eba8bb5dfbf69e524331950d7 SHA512 e1a0f7a24981698eaa6bcce8f951863f76e8a2750aff3191104d092a06021c39d4eb2e9b74e6690b0dba0d674a216ea170efe0a5367d22bdef72c2006f644a4e
 DIST serial_test-0.8.0.crate 8362 BLAKE2B a3681223fcc81d64d12f69b7c1f298e173e7600fb8ac38760f7bf1b87ec8dc422ea12a134f3d8927d6ee07c62fd915108bf0a50a953677a0d88eda5dcd5c7b2c SHA512 f4a164b5ecd6aa2e2118ec012a20bb14549ca0e06613f7fddcd9a049d9e62cabce260f440fa18d849f5fe9235e505a6a90dc0b0d085cf437c07fb62cd7465cec
 DIST serial_test_derive-0.5.1.crate 3609 BLAKE2B 54e408dc15f15c26e116157046ac609356b6d92d3e5bd27e08c31da537ec526eef8e6e52df1f06521b98c6c0695197b0b2ed654f0e46a45cf15156db82688d08 SHA512 e3f4b3c2eed1b284dbff7447c2f912343f9b95cbd88f3387c0136ca42698b38a607c752277ee4590ded9f73f475325d2652ba67ba029ddd54711d9070ac5f43e
@@ -511,17 +565,20 @@ DIST signal-hook-0.3.14.crate 49446 BLAKE2B 927363305748118e235fc4add923678cce40
 DIST signal-hook-mio-0.2.3.crate 9064 BLAKE2B 2bd11d0fad02fab92871e0129fc4ea3a609a43cee5d33737d82a624018eaa90077f2c92fec88f7b19d3ada619b8618f9d33fbd2cf6b7c63d3175dc57fb0341a7 SHA512 98429330c109dacbeca5f0788d993d1ec2830b6f95886a433592b2096508dfef2027d62a99b985654dfcd927f7f3f93fbfc19361f8efaef5efe84cbacfc1ab08
 DIST signal-hook-registry-1.4.0.crate 17912 BLAKE2B c50ade90e580e5f009832d812299b33529e53f68e6f1b7f5f9b5ac9ee0de502825c7bbd66199a65d4494152809eaf3dcfb676152c5b4f66c7a38b33551fcdd30 SHA512 b564379e5df1061739734179a69897badf9e2e6b469e091954428b05c3c7143885396df4bd008d77e08dae53729d2267d50fc8563121b086e25d8a5adabf6d6d
 DIST simdutf8-0.1.4.crate 28621 BLAKE2B 94ab48bc899e603acf3805dd45ae8489d565aa39ff79606e80a1731b59d11f429d71bb6c65becf3ceab123767f2d20612cb9f86410fd1aad00d0a796091ad045 SHA512 9f821035e147c035707910227b51e01d3f761ab8b578d95a86a776b2a4da01bc4d8ef28df7ea2c16ca125a2699d8903b826ad07a5937728e33dd58753ebd704c
+DIST simplelog-0.12.0.crate 20935 BLAKE2B 3eb63fc5127ffdb21bc4f6142971ca20d65bd05c16281a25662a7ae159709d9595b66fd41dc03d651d5e13900d9a2f4ca7eb134a324ce3041520725079e96ae0 SHA512 797a22cc8a060125e444a7e7d761c49f8a357fdead52788dbab0dd78101bd0c5bbd6280afa29ea45e203e5e8085a83a9ef3545af800367c5e6ca21dfc9ff5e66
 DIST siphasher-0.3.10.crate 9889 BLAKE2B e5dd6d265340b4c9e4266ab1ff3a20f1fb87fd493b2d7b5fba32d26421cc858b38929e4ab96941d0c055375b8acebbd04236d994cadca324500ed05064b9bfc9 SHA512 f90425a2cccc9575d377bb92a765d34653ddef1ac12b7c63dc6d700aaa74b525787e11609061c2d3e44ea56fe0e4b8f93f7b13f0279b5de2e0f710c5caffd4ce
 DIST slab-0.4.6.crate 16067 BLAKE2B 0aa3d8914479baf2409ce83644f8eca93f49b426333f1b82392b779fd79cdc04a0a33bc1aa5e34e8248df9ebd88e742b3e870716adf1787bcb7aa5b9caee307c SHA512 788837db210be63579eccf12d96fcaa3280c7515bedebe3040a71ed27d013430815ebc74acc06280daf22c0b16871bad210981d32615c26cb1da344b4b0d9488
 DIST slab-0.4.7.crate 16647 BLAKE2B f567cc822e7b84f64a0b0372c22a0463d260871455a33df025808a0476dcbbd4e051a117d8896d96d6d3d0655b7c296cd691ca22edc54486440f4e2e0f5d1e1b SHA512 659a9ca3323fc2cd236f6cb9eb6feeae8a1f5fa046fa239a34cd7a5ab8a7eadb9e5977e8d5cc41e9138900dd7c75ebc0601480771c5fdd2e084ee76619b82521
 DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
 DIST smallvec-1.9.0.crate 28396 BLAKE2B b04100f0a8db9e7c34a425e665242772c9857c5a4c5f34468a3f1b14f669d5cd21de2d54dc5295a22f52032370e8e989fc61cea3f4e6574ccca5be639c645e74 SHA512 e7158393d4257564eeb8fa53a630fdfc13edb33f3c555e41606edcfdbe9189e5c59c25d255dd21d02d4abad1ab2931e21744ec6c2f91ad4db66f87e748a45e56
+DIST smartstring-1.0.1.crate 29555 BLAKE2B e6706bff07889a39e40c764c51f0f3271570e2ddeaa2d11c510ffc9a07dc34005b62078abb7dc6f0bec5439f0bfb26d7b20be48a5189f6a468e4977352bcc941 SHA512 18e359d869bf006d49d6981c26a31ed73424c2734d8225c235b5f3c65124e5ca9d5f5bc95f4b190dc65746b73f31e2588bf9f50eb2b30535e5d05ebcd23ad760
 DIST smawk-0.3.1.crate 12840 BLAKE2B 937471e3ec3431f174264ce41e7a9c8ac781f5ce3638afe6219173730f5a0d0cec2b482ca72eeee34d5765c75db1707433b2c5b5004cd6d6fa4809f606b26813 SHA512 d6a050e873da5c90de3ff9fd02166de3be4c03931de9cac5307e6c16a71b8db1db6e8309eaa38ad408b20e0cc98eb4133595ad7aea96f62ebdcea579a643b65f
 DIST snap-1.0.5.crate 33022 BLAKE2B 0ce3c4379f4ab122e7785c23b42d463c657cee3179d2dfe909797c11a3730d65b6dd660d8626d0fabeb4344356b5cab8e632809845fb7c21e904bdc41594d52e SHA512 d9181f1ffc6605bf7628ab51479956f9769eca85c0942494dfdcf2c7e805173ee3d3bfc17510e72dad6e5c89b80b2a3f9c40b85464eeb79fd6d26de6bee66fab
 DIST socket2-0.4.4.crate 44048 BLAKE2B b2b1aad2995e44944b98ff3291479fb74e8cc965f866e692821427e488c68282290773dcd77da0542c45daf231a5e676d20e59a1d4568b8dde2da2f16425feb2 SHA512 6624fb9b933763c22e6114a8f72c6af0969912717017dd5b13f1b5df19faa1b160376c12e8c8023c435281f6a7864e802f3c4c535de8a345fe206652104f2cd5
 DIST spin-0.9.3.crate 29427 BLAKE2B ca6043c590ab002b0c252c9218290e34c2cedc5012052afe3e0392922919c866c7de400cc268ecef455708d6dbbddd1e12b7432233a2f0af7086b8c0388eb390 SHA512 2779ff3a94865e4b7cdfe8f0c22c7460095bfb2c4dcaac3f879e740799a2e6835d8acaeb6b70db4351209ba33d20c7c1dc2ec203e33844c619d3c54ee462bf70
 DIST spin-0.9.4.crate 30180 BLAKE2B 24dfdab3e643abe5cd9ecdc14c07bafe7424ef19979b7e5b856a262ffdeb87e58291061313af2c1396ea33e14d96a728719937790d204398fe271710ddf2f8dd SHA512 156b1c471292e8cb874b59129454b56b5e84a0f10b5d064433e0abfc3384c1a594b12b095acd26da350d7f81e6849da9c07c9a506b4aa0ac4808ce3f70b5511c
 DIST sqlparser-0.16.0.crate 74073 BLAKE2B 468850d1ba7110a1426de3faa787a12182308e6cd3e858a8ccb2177b9d75677f5e26c3177321a5cf0387341bb6367e5c96a52ecaa73e60dbd244b53bc6736571 SHA512 b38642e7f1c1cc0ca9c3283235d5641a2c326841d59c24936619806c9311cf5d740bdb314bb8622acce97502f0015bbf64bd52d484ced4003d9b41a25ca941ca
+DIST sqlparser-0.23.0.crate 88685 BLAKE2B 379b1e09699dc10c4e742cbe4a4ec3b2770621dab5c80b736c56afb16a391d676e51ecc4a90c3ca57f9309746dee566b049b9d25c91fe050d75cf57c2926cdde SHA512 fe3530bf3360232c0ee23cfdeff20dd46051704202133cbaacb847efea558ebd9ad61c698392d681e983e8f09360bfc3c85faf31744cafcb682855e270a9bb50
 DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
 DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
 DIST streaming-decompression-0.1.0.crate 3733 BLAKE2B 8ad52dce1eba3a1f78102b45ac78db5331ca39fa66e5ad0cba906ba37a5e03cbabaab350fb48451be63d5fb3a0b76f30a04706305d5c36522ff5c5c34fad3d24 SHA512 73f9f7a94bf92336519a53a89e31aa2217b81c182baf526cde4a06218c4ac088debd5e937e10b524e7674533ea301384f7819881e5419135aa9f5f0b74e71240
@@ -550,6 +607,7 @@ DIST sys-locale-0.2.1.crate 13014 BLAKE2B 8706075a6b908000712e3c7d6cd6eac7813922
 DIST sysinfo-0.23.13.crate 119069 BLAKE2B fe85ec69c96000991f9870ef3e25a833b50ab413c658346d39a9980ea8ee15ec001403ef0e6f4489b9dded05e1ff13ad3a046d314f9eab3d29bfc0b78ede7aa8 SHA512 9aab3bccb6dab2a2b82dc0abe23924d0993c67c06b8c2748fff61825f78c4e783f821d7f0a4b1bb8ac82f816e3542caf20f59868e5122b03086b958ed68e6cb6
 DIST sysinfo-0.24.1.crate 123015 BLAKE2B 5926c0c17a393771aa33517d1edbedb470622babc6805bfb27606770bd106a5d967aa760077a3492e147a37b0e69e85e7dccd2c5b8099e921194d1ddbe39dfa0 SHA512 b5025a5ef4188a54025b26e4bafa498fde2e4395f288a6fc2160d5af416b48583f2ec7bea676faf4ec4b81708d868e7bb39e8625e19a7af71de6337c5c336ab0
 DIST sysinfo-0.24.7.crate 124135 BLAKE2B b871d0541e4da0ba62184ccf9ede7c54c585ef8afb035a0eb8bf79ee7624bc89c555b3ba76bcf667aec097c7f079d2003c231f813938f3f2aa65c9adb3344c57 SHA512 d566701996b55cd54e656f196a824025a23b3c8e647594108aca751c97ec1c35bb32333500c86d2335e9f35c626bcea5dce54340244a9ffdd88411fe4634e8e3
+DIST sysinfo-0.26.2.crate 131634 BLAKE2B 2edf5ce2bbf3f073b53f85fef69766791f8cd56be1daa41f48853ba2dcf0bdf10e21fe999074975dcae8ec1fdce87c068cfd443af18acfb58fd741a4cd18c74f SHA512 182f56cf783b5d9fe83510c181d97c72f563c00ad86a94946478be4fb47032b8ca6bf402a9834fe226023a48e3fd8810a68acdca81e3ef15753f428e01592a2c
 DIST tabled-0.8.0.crate 111125 BLAKE2B 8d63b9648255271abb4af7ec39c40c1a268ff4f00796dc88f9a5eaf7f6abc4180241c85002e1911d6b8e01f52901fcbf5af47555b52112d3fdadb26abec4c0c8 SHA512 0232fda1fe5e627d9bd0ddc09091a902852492eb3e73acef45671eb1248b4e6c6ae9f5dd2351a7ec0035948c00dd9ed2f199cf6f21beb2d066084a03d5b384ac
 DIST tabled_derive-0.4.0.crate 7254 BLAKE2B a9ca108c29ab43396674d640d86d8f4fac674debaea4433a093418bb542ac77fc6fffbb533da85f0c77d88b78b64c03532d9534c91aa367abc9646d862be5532 SHA512 9ceea23855cdf3aeca697e9f4d7ff2590939798eb890e939b5be66f9ff2bbd46dce871244a980812e181dc090ccd64a7e269b54f62cfaf54b9eccfa0fca4fc75
 DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
@@ -559,6 +617,7 @@ DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc0231
 DIST terminal_size-0.1.17.crate 9141 BLAKE2B 048d8e8e9dad08aecde12323681d428b9182afb737136cd6699e13d231f7882091c9167cb10a08e5151df912421a6f89132645627e42ccc73d07553cadb1c8cd SHA512 96ec1bc8abd597f01ae59da567036d5d40b422764a4da662e2030c3ef4ce80a983c8b6a4ef1f34d88e649e0b1ea27b206d56a31924bcd2d31ff7e5a2e96d4201
 DIST terminal_size-0.2.1.crate 9694 BLAKE2B 5020da319ef89a0e5bf4cad1b4e7b4a8f096b578f393a8e65b3415e5ec6d456941d0f1c2c433c15c4339fbd3007ab2bc53274f04bf6826c44f694d82e829e1dc SHA512 8e50a43609ca10b95ce49b36eac17e25043325988c17a39d892aa57ecabaff988b9e24a4b7a105f9e45c3ca18f5e79485252a38d3bb9eb3c33c668a69d119501
 DIST termtree-0.2.4.crate 4416 BLAKE2B 994134f7af962123b19984aa32b30c19c6f77202067a90ddb3aa4414ec8dc541f5d8be9282244cdbb1eb16686c11750393325fc7f7005de0bec38d6a9219e015 SHA512 afe4e94bd57c9917ba48be4b3a22ff2b9b8a6c764c86871a3be9087ae0c65326fadb466e285a129082e4243ba6bca933d89ea01aa9188222c055f0c2b308cdf3
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST textwrap-0.15.0.crate 52998 BLAKE2B f6c3057ea6ffde88dd9824cd3159d398316d9d21f327d2af59239ff84d79f893a9d0e96dfbd883aab6c64b631dc99457018e38baf14d40789f02d633425ded86 SHA512 f44271c542c22f17a4e3a459255f95e6c02d999f7d6bc8414d3973fd4ac9353aa4ef436932a45340738126905463d776902715feaa9329371f8a14f14b5a7bfd
 DIST thin-slice-0.1.1.crate 4484 BLAKE2B 7efcd3c30dd24c22641139288b0c530ffe56dd82f26c2c31f557f1fa09ced695cf12b645fa6bc4c12324af0b9b05792a9cff422b6deee3bbb06b57a7cec06f47 SHA512 27b9e6b2a8485b3f89f659d80d67ccb96370f3371996e39f97784c40bdd7fef5429fb96f48d9c045eec5906051708f169fe4ca8f5f546a25e5f6859cafa42925
 DIST thiserror-1.0.31.crate 18013 BLAKE2B 5a46332efc602f8ce864024a538379b23b4586c04b18bf01b32b3cafae3ad90ae0c1ae5639cad555c01767c20f0109f87384918cb15a7ce51437094e70a2e544 SHA512 0e11aba54d38fc164c65b9357d1738ca96af2bc7bc2bcacfc4efc6f5c26a594effbb5e47aef46772ccafbe88871825a517920030572b79fae3d305550bfa6431
@@ -566,6 +625,9 @@ DIST thiserror-impl-1.0.31.crate 15283 BLAKE2B ad7afdfbbf9c42a08dfbd5a2385883bc0
 DIST thread_local-1.1.4.crate 13106 BLAKE2B 64c19368f8cec46f23b3052759c4c4ef0de50748432790e6ea11b12477239b177d54e60b9046fdcb2f495b8e0b37ad82809d03602edab9fc85cf814e3bd94fe2 SHA512 db7ff3eb88a73d9313dd58d72397614c5aae6be1d64ead7f16535cae2857be3b27d189e7955308591ec64a0d67777fd2a62a2b124ca73facb9a2d8e0458bdbb5
 DIST time-0.1.44.crate 28885 BLAKE2B 5e2ca11af9da0847239a086330d0cd00fcb5b63862f9dfec46f72a065bb35ec2236a21ee1c56bf65e3117105e7815cafe67e3725b8575373e875dfcea401d967 SHA512 736a38637be0193a06fa35d42b4873b04a0a35d84cd2af85b7f653a1b67b95078577134bb187b777730e73cce67f437b45ff5c72b8e3f1f8e2ed3420ea0324cf
 DIST time-0.3.11.crate 91807 BLAKE2B d5b80416590bf48c8f403cc0e2ad735b95d98048dc335737fe509c44f805cc911fa55d6af611d3a05150b2a9ebedf005e8903a4daf66e245a5d5f290ed661c46 SHA512 214bb8c5573d3ee405a923f55e22ac3d659c30ba413f5e960e17d8f226d094133e2b52084e34efc6ece2311e13a862f2fcded9783937d69709d11144a8d6b48d
+DIST time-0.3.13.crate 92610 BLAKE2B b9a860cd53140265c536e1750a26ac22fba59e2737a7945cf3dace23fea46b9b09c09698cc230ecfd1ae24326d9374bcd4700254a7f02d8f8edf0c29aae7fbe1 SHA512 a6b667a6ea904b830d325b2d67fb129e27de965ba85f797547799efee1a0acb47a7273366bdd03911efcd0af2934f87e952f9a199f156e4f15b12b7bd0853b6b
+DIST time-macros-0.2.4.crate 18421 BLAKE2B 6806e235cc7258a76877f705a8637c39bc30316603c7eedd4795a3a597d8d1e78a79c213af84cc184fe3b67c5c3f6f9efeb95c70f6f4239af1882916afdca834 SHA512 f3887ce839db40d13c143a9f11bea804fe4760ab2655df68cbba9029cfff7d0476135608fbfdba6cdec1f9b0753b2de0e3ce0161b40c5d2b9596980d9deaae59
+DIST tinytemplate-1.2.1.crate 26490 BLAKE2B af39d96f33f63238e455a4e38fde1d1730fd9661ae68be7b05df6ef9d2ab1a04db1332cc4ec9deb6da3a8e22b124df81b0fa8916d8491b808742bb733c8e48be SHA512 0cc080057e096f0796e72004343e1a8332c2e8a12e43f6ade150ebf632e9c29c7ad04de0b940cd57df81efdc4d07a6607da9b86a30d8383e39ac3d7be185edb9
 DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST titlecase-1.1.0.crate 7466 BLAKE2B f93bc7c751a6db351c60e045b1ea9293e91d06dee31be1bcaa4e89fc2a97f15a0f34f49fe3d2c812893837aedf7892b67e7fd1a55979bcec8d15fa6477522201 SHA512 04656c48b22934f40e90c5e2538ded9a71cbc034b9ba25fa711533716a77db43f11ea7a10f8599bc2ceb16944a71c10472037a38db9fc5d35bdfc2badad0b72a
@@ -603,6 +665,7 @@ DIST unicode-normalization-0.1.21.crate 121745 BLAKE2B e67a472d39b72be66f5f8e5b9
 DIST unicode-segmentation-1.9.0.crate 93241 BLAKE2B 359904bcaadfd161128d40a896a2d10e5dfdb4098de245c949ae3fffecce9b4b6b999bbc2c6ca522944733ab0074e50fe829690183639c312bba8f8d0ad24456 SHA512 7d0ea37bfb24a1a803b1cd40b7b0c0e6e44ebf9a474fdedf0dcca1ead25662e19f44af29b87de1b000c3cc75fec93320938bb3ab9d9e82298eda324bb97e7294
 DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
 DIST unicode-xid-0.2.3.crate 15174 BLAKE2B 5cfb2a094047106a45eaeb77ebc1ae2e17ca51ece71082c127d3e2bf36773959f52df1c6df0d0d5cbc40ec4ee7f81820a094fd7ee99f01a2f99a1f7f68317223 SHA512 2adea0c8447c9450be34859f2b2e2b87a61b5e313685da994d21bc24a96dd94088f3320bcdb8d20466a3fdafb0bc0375823f0c28ec0077c9c42a9818f66ac1f5
+DIST unsafe-libyaml-0.2.2.crate 61118 BLAKE2B b0c7e3d17a1366eceda1ddea4a56592735eb5e825074a50216d6240ad22c7e3021fcc5793cc56c67e14f9e695de676ddadf587a0aa399aadc254c3ac5504e2ad SHA512 385fed83536204170f356d3c430e7b898cfd6bd302396a63da119c55c874a5b54d0e54da0d018d7d9dab8361f268d8f645ed87f3406bbc2a07aef3a3f95712c2
 DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0866b5aa98e5bf4686cf1b1aac9b1f0a0ea3b89a01e044a2ca37830416f42d147158ea8e88f23fd28ac2 SHA512 f9b6ad99d69ff303283b3fd9e98945fbd6cb411a3d141badcbb3a0566723a451375e6dd5d5357e3eb7a1b5b1ee5756a2347c43817db2de6fe35b9004b090e077
 DIST users-0.10.0.crate 18531 BLAKE2B 18f1dba893d2d88b33785b997f6b2a3582fbd5c2c21f460fd7ab3c98572d524dc0e0fdc1ab3c5651d46f4219cdfaa4b60fafc045f01f6147d99dd3aad92c146e SHA512 21052adcd602ff6c30a4e9f4e14fdca896dce03969b1b03069f93f3e9d2b25c66b83ac2f40ed4e960dcfb5a0e67719ee45da475855f6e397f3618273ea52469b
 DIST users-0.11.0.crate 21980 BLAKE2B c106e9ed67b9ad766bb7318506261579768185aea3d956d9e8b2adb52349525fe69703ee3bb2e4fb02aa223bfa6fc92a14d8128412623f70654254f842d7322c SHA512 e28028f895780bd59a11069b81b87470a287a447e42566cfb8de0e2d4ba8c90a3ce92901e253dcd2628383c8ed06c10714bc0181a57bf257f7edb3510936e596
@@ -643,6 +706,7 @@ DIST wax-0.5.0.crate 62247 BLAKE2B 7dded708b92bbb8a71d9194a8496525c7356d162b917b
 DIST web-sys-0.3.57.crate 686563 BLAKE2B ddb687a252181a9198bc96da3feaea007ff188641996172293772257cffd748a79f306c24d9eb619c61a5ddcec4bb6e423288a831ff14c7b5ec6b37839b52508 SHA512 144a481ff7562ff5f96145c7db64ecc704863e2fd6c0c9afc87fe87513e5be660fcadec6b1114ed2c86da36ccd97024ce601b843c8768dd8b5c53c71daae9800
 DIST web-sys-0.3.59.crate 697461 BLAKE2B 07d404e9e6bd8a825b700e55282fa78de97f61de63cdf3b9b82b1c5cb8043acd1722b5e2887c6bda7bcd20c92be54f3041a036000d0915a1c423092a3ff9d48f SHA512 795810c407722771732a2237a02ade8685b6257cc9843515fcf621c3f79fcedc7c64c30dd74e611d5b218fa785f904e596d8d6beb90de9097ea49e18273633df
 DIST which-4.2.5.crate 9326 BLAKE2B 8aea79157007f2326d21083e1eba387611233a19f39368904cf2b0e9b6f09b4fdf6dc469cff83373912bec6e2aeec191d217b0b1e720ee0db1848b6f64d37054 SHA512 2b2b44773b568946799035e5b90c1f0c304b399f4d330c1e063323f631f56ddc6c5d8a9d026d987cb39c801ccbfb614450064030fc19e1de34ab6a495f053395
+DIST which-4.3.0.crate 9635 BLAKE2B 36556a9eca6d8702c0e3634abc458f7ff831aec28a7117f21f812c6f46cccd8db0e6ce7cc76f8033ba89d51858411251e5fecb0883542669269cade9c1a5aadb SHA512 cad05bd43dfcf9e50fd6e3b9dcd5d9a987175a0f44adbf204079117b70d0b42e6483e635287924698c51d0452f168e48e041453f18ff5720c0e2ec4c734d2578
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
@@ -680,4 +744,5 @@ DIST zstd-safe-5.0.2+zstd.1.5.2.crate 17273 BLAKE2B 74dc561046f9bc595c58b62bc6ff
 DIST zstd-sys-2.0.1+zstd.1.5.2.crate 715552 BLAKE2B 497901ccaff7f92aa607797970c6beaaa3fcbeb08a48a2dffdfd465af999291e65024dfb7fc844802e5befa0e67dbe225310f72e6292bdcd22596b2614665d8e SHA512 a54ff4159640d31f898cbd374b9117d1e7ee4b54c5b4a8e1ed6286d9e954341e077088c52161e086ef0f28dfec13e03f64013712fa9bc59d471191cffd8e0e1e
 EBUILD nushell-0.65.0.ebuild 11346 BLAKE2B 3876ac02460d65f99aa225cb5ed320a8540d19560073e4aabb98c1de534f9bfc21a309fe19962a4ed7f1595f688c99d823416f669beca1884505d28bd2b08baf SHA512 073b42327a11707c9bc00af7cdca44685f347fc6f2bfbf6460b067983495a992b71ea98248a620109fbd2f99c9ee7c341590cabbc558b661d777df6a15646391
 EBUILD nushell-0.66.2.ebuild 11358 BLAKE2B 43166cf9e69fcc2631307aea526d564b5269f4fb06878d7293f4dff1c9776a555d66388e6438d4e4c093b75ec1c399be6708f8e16079da578d3393f320c16aae SHA512 a3521a98ddc53335aa9b7ed12da00b61d99297b5176e468aa558bebdd00d34adb86293f5c2c4694cf6fca801ed5092e6dc7d99476bdd7b0fcbd7ef0593dcc14e
+EBUILD nushell-0.69.1.ebuild 11872 BLAKE2B d1954d81eb96935ddf27ba6bbb41f09cafd0b93120fa1230dcc5c5e766fd438416b9de7d27a273e58eceac68d3f41c291e42d611153311ad8401842158114bcf SHA512 87968a318bc3b2cb77b45093c8c19653754e73c5c749f2e222c93d4bc691c17614965fadd9c53fc722eeb8052245738f81772f9e8bdff218bb59d5f0f91f3ba6
 MISC metadata.xml 627 BLAKE2B 317bde74206813d5f2b255c04e6334fef912e3b800911bf927bef42256cf6333be0e90657538e6029d6c8bd2405ab64d2a2a02eaa755a69d73169fea31eb8c21 SHA512 d2fef5d42262505cdfa895783432f79aaa068823e49c8be97a09516d4487edd8bd682b02629bb3ef5f142c37fe23b264ebe45967cebe984057ab4b30fbe34299
diff --git a/app-shells/nushell/nushell-0.69.1.ebuild b/app-shells/nushell/nushell-0.69.1.ebuild
new file mode 100644
index 000000000000..39f156a77a43
--- /dev/null
+++ b/app-shells/nushell/nushell-0.69.1.ebuild
@@ -0,0 +1,649 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	Inflector-0.11.4
+	addr2line-0.17.0
+	adler-1.0.2
+	ahash-0.7.6
+	aho-corasick-0.7.18
+	alloc-no-stdlib-2.0.3
+	alloc-stdlib-0.2.1
+	alphanumeric-sort-1.4.4
+	android_system_properties-0.1.5
+	ansi-str-0.3.0
+	ansi_term-0.12.1
+	ansitok-0.1.0
+	anyhow-1.0.58
+	array-init-cursor-0.2.0
+	arrayvec-0.4.12
+	arrayvec-0.5.2
+	arrayvec-0.7.2
+	arrow-format-0.7.0
+	arrow2-0.13.1
+	assert_cmd-2.0.4
+	async-stream-0.3.3
+	async-stream-impl-0.3.3
+	async-trait-0.1.56
+	atomic-polyfill-0.1.8
+	atty-0.2.14
+	autocfg-1.1.0
+	backtrace-0.3.66
+	bare-metal-0.2.5
+	bare-metal-1.0.0
+	base64-0.13.0
+	bincode-1.3.3
+	bindgen-0.59.2
+	bit-set-0.5.3
+	bit-vec-0.6.3
+	bit_field-0.10.1
+	bitfield-0.13.2
+	bitflags-1.3.2
+	bitpacking-0.8.4
+	block-buffer-0.9.0
+	block-buffer-0.10.2
+	brotli-3.3.4
+	brotli-decompressor-2.3.2
+	brownstone-3.0.0
+	bstr-0.2.17
+	bumpalo-3.10.0
+	byte-order-0.3.0
+	byte-slice-cast-1.2.1
+	byte-unit-4.0.14
+	bytecount-0.6.3
+	bytemuck-1.11.0
+	bytemuck_derive-1.1.1
+	byteorder-1.4.3
+	bytes-1.2.0
+	bytesize-1.1.0
+	calamine-0.18.0
+	cast-0.3.0
+	cc-1.0.73
+	cexpr-0.6.0
+	cfg-if-0.1.10
+	cfg-if-1.0.0
+	chrono-0.4.22
+	chrono-humanize-0.2.1
+	chrono-tz-0.6.3
+	chrono-tz-build-0.0.3
+	clang-sys-1.3.3
+	clap-2.34.0
+	codepage-0.1.1
+	comfy-table-5.0.1
+	console-0.15.0
+	const_fn-0.4.9
+	const_format-0.2.26
+	const_format_proc_macros-0.2.22
+	convert_case-0.4.0
+	core-foundation-0.9.3
+	core-foundation-sys-0.8.3
+	cortex-m-0.7.5
+	cpufeatures-0.2.5
+	crc32fast-1.3.2
+	criterion-0.3.6
+	criterion-plot-0.4.5
+	critical-section-0.2.7
+	crossbeam-channel-0.5.6
+	crossbeam-deque-0.8.2
+	crossbeam-epoch-0.9.10
+	crossbeam-utils-0.8.11
+	crossterm-0.23.2
+	crossterm-0.24.0
+	crossterm_winapi-0.9.0
+	crunchy-0.2.2
+	crypto-common-0.1.6
+	cssparser-0.27.2
+	cssparser-macros-0.6.0
+	cstr_core-0.2.6
+	csv-1.1.6
+	csv-core-0.1.10
+	ctor-0.1.22
+	ctrlc-3.2.2
+	cty-0.2.2
+	derive_more-0.99.17
+	dialoguer-0.9.0
+	diff-0.1.13
+	difflib-0.4.0
+	digest-0.9.0
+	digest-0.10.3
+	dirs-4.0.0
+	dirs-next-2.0.0
+	dirs-sys-0.3.7
+	dirs-sys-next-0.1.2
+	doc-comment-0.3.3
+	dtoa-0.4.8
+	dtoa-short-0.3.3
+	dtparse-1.3.0
+	dunce-1.0.2
+	dyn-clone-1.0.8
+	ego-tree-0.6.2
+	either-1.7.0
+	embedded-hal-0.2.7
+	eml-parser-0.1.3
+	encode_unicode-0.3.6
+	encoding_rs-0.8.31
+	env_logger-0.8.4
+	erased-serde-0.3.21
+	errno-0.2.8
+	errno-dragonfly-0.1.2
+	fallible-iterator-0.2.0
+	fallible-streaming-iterator-0.1.9
+	fancy-regex-0.10.0
+	fastrand-1.8.0
+	fd-lock-3.0.6
+	filesize-0.2.0
+	filetime-0.2.17
+	flate2-1.0.24
+	fnv-1.0.7
+	foreign-types-0.3.2
+	foreign-types-shared-0.1.1
+	foreign_vec-0.1.0
+	form_urlencoded-1.0.1
+	fs_extra-1.2.0
+	fsevent-0.4.0
+	fsevent-sys-2.0.1
+	fuchsia-cprng-0.1.1
+	fuchsia-zircon-0.3.3
+	fuchsia-zircon-sys-0.3.3
+	futf-0.1.5
+	futures-0.3.21
+	futures-channel-0.3.21
+	futures-core-0.3.21
+	futures-executor-0.3.21
+	futures-io-0.3.21
+	futures-macro-0.3.21
+	futures-sink-0.3.21
+	futures-task-0.3.21
+	futures-util-0.3.21
+	fuzzy-matcher-0.3.7
+	fxhash-0.2.1
+	generic-array-0.14.5
+	gethostname-0.2.3
+	getopts-0.2.21
+	getrandom-0.1.16
+	getrandom-0.2.7
+	getset-0.1.2
+	ghost-0.1.5
+	gimli-0.26.2
+	git2-0.15.0
+	gjson-0.8.1
+	glob-0.3.0
+	h2-0.3.13
+	half-1.8.2
+	hamcrest2-0.3.0
+	hash32-0.2.1
+	hash_hasher-2.0.3
+	hashbrown-0.12.3
+	hashlink-0.8.0
+	heapless-0.7.15
+	heck-0.3.3
+	heck-0.4.0
+	hermit-abi-0.1.19
+	hex-0.4.3
+	html5ever-0.26.0
+	htmlescape-0.3.1
+	http-0.2.8
+	http-body-0.4.5
+	httparse-1.7.1
+	httpdate-1.0.2
+	hyper-0.14.20
+	hyper-tls-0.5.0
+	iana-time-zone-0.1.47
+	ical-0.7.0
+	idna-0.2.3
+	indent_write-2.2.0
+	indexmap-1.9.1
+	inotify-0.7.1
+	inotify-sys-0.1.5
+	instant-0.1.12
+	integer-encoding-3.0.4
+	inventory-0.2.3
+	io-lifetimes-0.7.2
+	iovec-0.1.4
+	ipnet-2.5.0
+	is-root-0.1.2
+	is_ci-1.1.1
+	is_debug-1.0.1
+	is_executable-1.0.1
+	itertools-0.10.3
+	itoa-0.4.8
+	itoa-1.0.2
+	jobserver-0.1.24
+	joinery-2.1.0
+	js-sys-0.3.59
+	json-deserializer-0.3.1
+	kernel32-sys-0.2.2
+	lazy_static-1.4.0
+	lazycell-1.3.0
+	lexical-6.1.1
+	lexical-core-0.8.5
+	lexical-parse-float-0.8.5
+	lexical-parse-integer-0.8.6
+	lexical-util-0.8.5
+	lexical-write-float-0.8.5
+	lexical-write-integer-0.8.5
+	libc-0.2.126
+	libgit2-sys-0.14.0+1.5.0
+	libloading-0.7.3
+	libm-0.2.2
+	libproc-0.12.0
+	libsqlite3-sys-0.25.1
+	libssh2-sys-0.2.23
+	libz-sys-1.1.8
+	linked-hash-map-0.5.6
+	linux-raw-sys-0.0.46
+	lock_api-0.4.7
+	log-0.4.17
+	lscolors-0.12.0
+	lz4-1.23.3
+	lz4-sys-1.9.4
+	mac-0.1.1
+	mach2-0.4.1
+	malloc_buf-0.0.6
+	markup5ever-0.11.0
+	matches-0.1.9
+	md-5-0.10.1
+	memchr-2.5.0
+	memmap2-0.5.5
+	memoffset-0.6.5
+	meval-0.2.0
+	miette-4.7.1
+	miette-5.1.1
+	miette-derive-4.7.1
+	miette-derive-5.1.1
+	mime-0.3.16
+	minimal-lexical-0.2.1
+	miniz_oxide-0.5.3
+	mio-0.6.23
+	mio-0.8.4
+	mio-extras-2.0.6
+	miow-0.2.2
+	multiversion-0.6.1
+	multiversion-macros-0.6.1
+	native-tls-0.2.10
+	nb-0.1.3
+	nb-1.0.0
+	net2-0.2.37
+	new_debug_unreachable-1.0.4
+	nix-0.24.2
+	nodrop-0.1.14
+	nom-1.2.4
+	nom-7.1.1
+	nom-supreme-0.8.0
+	notify-4.0.17
+	ntapi-0.3.7
+	nu-ansi-term-0.46.0
+	num-0.2.1
+	num-0.4.0
+	num-bigint-0.2.6
+	num-bigint-0.4.3
+	num-complex-0.2.4
+	num-complex-0.4.2
+	num-format-0.4.0
+	num-integer-0.1.45
+	num-iter-0.1.43
+	num-rational-0.2.4
+	num-rational-0.4.1
+	num-traits-0.2.15
+	num_cpus-1.13.1
+	num_threads-0.1.6
+	objc-0.2.7
+	object-0.29.0
+	once_cell-1.13.1
+	oorandom-11.1.3
+	opaque-debug-0.3.0
+	openssl-0.10.41
+	openssl-macros-0.1.0
+	openssl-probe-0.1.5
+	openssl-src-111.22.0+1.1.1q
+	openssl-sys-0.9.75
+	output_vt100-0.1.3
+	overload-0.1.1
+	owo-colors-3.4.0
+	papergrid-0.5.1
+	parking_lot-0.12.1
+	parking_lot_core-0.9.3
+	parquet-format-async-temp-0.3.1
+	parquet2-0.14.1
+	parse-zoneinfo-0.3.0
+	paste-1.0.8
+	pathdiff-0.2.1
+	peeking_take_while-0.1.2
+	percent-encoding-2.1.0
+	peresil-0.3.0
+	pest-2.1.3
+	phf-0.8.0
+	phf-0.10.1
+	phf-0.11.0
+	phf_codegen-0.8.0
+	phf_codegen-0.10.0
+	phf_codegen-0.11.0
+	phf_generator-0.8.0
+	phf_generator-0.10.0
+	phf_generator-0.11.0
+	phf_macros-0.8.0
+	phf_shared-0.8.0
+	phf_shared-0.10.0
+	phf_shared-0.11.0
+	pin-project-lite-0.2.9
+	pin-utils-0.1.0
+	pkg-config-0.3.25
+	planus-0.3.1
+	plotters-0.3.3
+	plotters-backend-0.3.4
+	plotters-svg-0.3.3
+	polars-0.23.2
+	polars-arrow-0.23.2
+	polars-core-0.23.2
+	polars-io-0.23.2
+	polars-lazy-0.23.2
+	polars-ops-0.23.2
+	polars-time-0.23.2
+	polars-utils-0.23.2
+	pori-0.0.0
+	powierza-coefficient-1.0.1
+	ppv-lite86-0.2.16
+	precomputed-hash-0.1.1
+	predicates-2.1.1
+	predicates-core-1.0.3
+	predicates-tree-1.0.5
+	pretty_assertions-1.2.1
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro-hack-0.5.19
+	proc-macro2-1.0.42
+	procfs-0.14.0
+	proptest-1.0.0
+	pure-rust-locales-0.5.6
+	pwd-1.4.0
+	quick-error-1.2.3
+	quick-error-2.0.1
+	quick-xml-0.19.0
+	quick-xml-0.23.0
+	quickcheck-1.0.3
+	quickcheck_macros-1.0.0
+	quote-1.0.20
+	rand-0.4.6
+	rand-0.7.3
+	rand-0.8.5
+	rand_chacha-0.2.2
+	rand_chacha-0.3.1
+	rand_core-0.3.1
+	rand_core-0.4.2
+	rand_core-0.5.1
+	rand_core-0.6.3
+	rand_distr-0.4.3
+	rand_hc-0.2.0
+	rand_pcg-0.2.1
+	rand_xorshift-0.3.0
+	rayon-1.5.3
+	rayon-core-1.9.3
+	rdrand-0.4.0
+	redox_syscall-0.2.15
+	redox_users-0.4.3
+	reedline-0.12.0
+	regex-1.6.0
+	regex-automata-0.1.10
+	regex-syntax-0.6.27
+	remove_dir_all-0.5.3
+	reqwest-0.11.11
+	result-1.0.0
+	riscv-0.7.0
+	riscv-target-0.1.2
+	rmp-0.8.11
+	rmp-serde-1.1.0
+	rmpv-1.0.0
+	roxmltree-0.14.1
+	rstest-0.15.0
+	rstest_macros-0.14.0
+	rusqlite-0.28.0
+	rust-embed-6.4.0
+	rust-embed-impl-6.2.0
+	rust-embed-utils-7.2.0
+	rust_decimal-1.25.0
+	rustc-demangle-0.1.21
+	rustc-hash-1.1.0
+	rustc_version-0.2.3
+	rustc_version-0.4.0
+	rustix-0.35.7
+	rustversion-1.0.8
+	rusty-fork-0.3.0
+	ryu-1.0.10
+	same-file-1.0.6
+	schannel-0.1.20
+	scopeguard-1.1.0
+	scraper-0.13.0
+	security-framework-2.6.1
+	security-framework-sys-2.6.1
+	selectors-0.22.0
+	semver-0.9.0
+	semver-0.11.0
+	semver-1.0.12
+	semver-parser-0.7.0
+	semver-parser-0.10.2
+	serde-1.0.144
+	serde_cbor-0.11.2
+	serde_derive-1.0.144
+	serde_ini-0.2.0
+	serde_json-1.0.82
+	serde_urlencoded-0.7.1
+	serde_yaml-0.9.4
+	serial_test-0.8.0
+	serial_test_derive-0.8.0
+	servo_arc-0.1.1
+	sha2-0.9.9
+	sha2-0.10.2
+	shadow-rs-0.16.1
+	shlex-1.1.0
+	signal-hook-0.3.14
+	signal-hook-mio-0.2.3
+	signal-hook-registry-1.4.0
+	simdutf8-0.1.4
+	simplelog-0.12.0
+	siphasher-0.3.10
+	slab-0.4.7
+	smallvec-1.9.0
+	smartstring-1.0.1
+	smawk-0.3.1
+	snap-1.0.5
+	socket2-0.4.4
+	spin-0.9.4
+	sqlparser-0.23.0
+	stable_deref_trait-1.2.0
+	static_assertions-1.1.0
+	streaming-decompression-0.1.0
+	streaming-iterator-0.1.6
+	strength_reduce-0.2.3
+	string_cache-0.8.4
+	string_cache_codegen-0.5.2
+	strip-ansi-escapes-0.1.1
+	strum-0.23.0
+	strum-0.24.1
+	strum_macros-0.23.1
+	strum_macros-0.24.2
+	supports-color-1.3.0
+	supports-hyperlinks-1.2.0
+	supports-unicode-1.0.2
+	sxd-document-0.3.2
+	sxd-xpath-0.4.2
+	syn-1.0.98
+	sys-locale-0.2.1
+	sysinfo-0.26.2
+	tabled-0.8.0
+	tabled_derive-0.4.0
+	tempdir-0.3.7
+	tempfile-3.3.0
+	tendril-0.4.3
+	termcolor-1.1.3
+	terminal_size-0.1.17
+	terminal_size-0.2.1
+	termtree-0.2.4
+	textwrap-0.11.0
+	textwrap-0.15.0
+	thin-slice-0.1.1
+	thiserror-1.0.31
+	thiserror-impl-1.0.31
+	thread_local-1.1.4
+	time-0.1.44
+	time-0.3.13
+	time-macros-0.2.4
+	tinytemplate-1.2.1
+	tinyvec-1.6.0
+	tinyvec_macros-0.1.0
+	titlecase-2.0.0
+	tokio-1.20.1
+	tokio-native-tls-0.3.0
+	tokio-util-0.7.3
+	toml-0.5.9
+	tower-service-0.3.2
+	tracing-0.1.35
+	tracing-core-0.1.28
+	trash-2.1.5
+	try-lock-0.2.3
+	typed-arena-1.7.0
+	typenum-1.15.0
+	typetag-0.1.8
+	typetag-impl-0.1.8
+	tz-rs-0.6.11
+	tzdb-0.3.1
+	ucd-trie-0.1.4
+	umask-2.0.0
+	uncased-0.9.7
+	unicode-bidi-0.3.8
+	unicode-ident-1.0.2
+	unicode-linebreak-0.1.2
+	unicode-normalization-0.1.21
+	unicode-segmentation-1.9.0
+	unicode-width-0.1.9
+	unicode-xid-0.2.3
+	unsafe-libyaml-0.2.2
+	url-2.2.2
+	users-0.10.0
+	users-0.11.0
+	utf-8-0.7.6
+	utf8-width-0.1.6
+	utf8parse-0.2.0
+	uuid-1.1.2
+	vcell-0.1.3
+	vcpkg-0.2.15
+	vec1-1.8.0
+	version_check-0.9.4
+	void-1.0.2
+	volatile-register-0.2.1
+	vte-0.10.1
+	vte_generate_state_changes-0.1.1
+	wait-timeout-0.2.0
+	walkdir-2.3.2
+	want-0.3.0
+	wasi-0.9.0+wasi-snapshot-preview1
+	wasi-0.10.0+wasi-snapshot-preview1
+	wasi-0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-0.2.82
+	wasm-bindgen-backend-0.2.82
+	wasm-bindgen-futures-0.4.32
+	wasm-bindgen-macro-0.2.82
+	wasm-bindgen-macro-support-0.2.82
+	wasm-bindgen-shared-0.2.82
+	wax-0.5.0
+	web-sys-0.3.59
+	which-4.3.0
+	winapi-0.2.8
+	winapi-0.3.9
+	winapi-build-0.1.1
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	windows-0.37.0
+	windows-sys-0.36.1
+	windows_aarch64_msvc-0.36.1
+	windows_aarch64_msvc-0.37.0
+	windows_i686_gnu-0.36.1
+	windows_i686_gnu-0.37.0
+	windows_i686_msvc-0.36.1
+	windows_i686_msvc-0.37.0
+	windows_x86_64_gnu-0.36.1
+	windows_x86_64_gnu-0.37.0
+	windows_x86_64_msvc-0.36.1
+	windows_x86_64_msvc-0.37.0
+	winreg-0.10.1
+	winres-0.1.12
+	ws2_32-sys-0.2.1
+	xmlparser-0.13.3
+	zeroize-1.5.7
+	zip-0.5.13
+	zstd-0.11.2+zstd.1.5.2
+	zstd-safe-5.0.2+zstd.1.5.2
+	zstd-sys-2.0.1+zstd.1.5.2
+"
+
+inherit cargo
+
+DESCRIPTION="A new type of shell, written in Rust"
+HOMEPAGE="https://www.nushell.sh"
+SRC_URI="https://github.com/nushell/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris)"
+
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD Boost-1.0 CC0-1.0 ISC MIT MPL-2.0 Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+IUSE="+extra"
+
+DEPEND="
+	>=dev-libs/libgit2-0.99:=
+	dev-libs/oniguruma:=
+	dev-libs/openssl:0=
+	net-libs/libssh2:=
+	net-libs/nghttp2:=
+	net-misc/curl
+	extra? (
+		dev-db/sqlite:3=
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	>=virtual/rust-1.60
+	virtual/pkgconfig
+"
+RESTRICT+=" test"
+
+QA_FLAGS_IGNORED="usr/bin/nu.*"
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	# high magic to allow system-libs
+	export OPENSSL_NO_VENDOR=true
+	export RUSTONIG_SYSTEM_LIBONIG=1
+	export LIBGIT2_SYS_USE_PKG_CONFIG=1
+	export LIBSSH2_SYS_USE_PKG_CONFIG=1
+	export PKG_CONFIG_ALLOW_CROSS=1
+
+	local myfeatures=(
+		stable
+		$(usev extra)
+	)
+
+	cargo_src_configure
+}
+
+src_compile() {
+	cargo_src_compile --workspace
+}
+
+src_test() {
+	cargo_src_test
+}
+
+src_install() {
+	cargo_src_install
+	local DOCS=( README.md docs/. )
+	einstalldocs
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index a96c014ab6aa..5a15704e7b65 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index 7c1252bbe866..16ffa6858b9b 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -17,4 +17,4 @@ AUX a2ps-4.14-texinfo-6.7-encoding.patch 1372 BLAKE2B 3eb51e4c83e60f7073c4957963
 DIST a2ps-4.14-ja_nls.patch.gz 27576 BLAKE2B 7300971fb76f6c8d2b0e5ffa519cf6064519a33f24430b9894e43778dff5b78f7cf7e2b9fe1e98fb475f452b39ccc29f88f579bbe1922ac3ef70775a05591b32 SHA512 f02f553dd9d9dbd9dfe41ebfe103493000aa4e9de5634c94e7453f73b66d88fea6b0010095913a4a99c7285990a1df1ebcc39da451b2b34f96b0c191112b125f
 DIST a2ps-4.14.tar.gz 2552507 BLAKE2B cd15a2b85f54f8bfb92adf9f4cf2c3c29091e528ae8072d0e905c58cc94caf55b76ac3e37891f8a0bc0909a177c5ee434fe5aaab3625a2c14127dabad8b506ed SHA512 fd6ac8ab47d789114c283e8ca508f7f56feabd1a189f4ac772cad9e6be7e3791e210892cfffd04ad1d39efe4b15386b2e61bf4cd56b70ed581c0554f36bfe06f
 EBUILD a2ps-4.14-r7.ebuild 3608 BLAKE2B 4cd8a24759e611dbb1cc213ebc8587154f844300a15d134b51bc26acc3e8baf26f624fe60b75d35c40f99813a32a6b5e3bf2f2ecf09ac405a192f8748b6b0901 SHA512 98130fdec528347fca365d35df2a455b8fb2986ffb22648cda7ae09d12c6a4c7a22ef1dbe500bdacdb3e9b6751d7d92a8e5d5a7eca423dfe3d789a2eb8d58314
-MISC metadata.xml 347 BLAKE2B 252d70af1bcfb8685137113cd50913be3154245eeac5cad0d719283c87b81af57a48268df9659968f98b4b1e77be16bf4b1af45cc69fd12c8cdbbe8432d4cb49 SHA512 dde37464c0674ff27febf9293b3ea71272d307ae3a61c7a243f8a61ec4283b004cb5496d121aa25dc143f0664bdb212b294dd471c7c10daa9f2f3f0fe5cdc319
+MISC metadata.xml 442 BLAKE2B 89796eb65cfc9ab8929511f94655a9c7f6a39837f5c1cfb0f8885a29d3900512e6c3ee6b44f3ee8e23eca54112f72c7462d4fb223109fdea3d203d5ff4492252 SHA512 078d824c815b9cc0c5a0acfea6f8c5203eb3f1e94778987137181f987cbeaab0040389b0e34cda160d6a3c6f00508c39a6c30404b89dfe64782db1980c9340b7
diff --git a/app-text/a2ps/metadata.xml b/app-text/a2ps/metadata.xml
index 834aba280f85..d22cb76bd2a2 100644
--- a/app-text/a2ps/metadata.xml
+++ b/app-text/a2ps/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>printing@gentoo.org</email>
-	<name>Gentoo Printing Project</name>
-</maintainer>
-<maintainer type="project">
-	<email>cjk@gentoo.org</email>
-	<name>Cjk</name>
-</maintainer>
+  <maintainer type="project">
+    <email>printing@gentoo.org</email>
+    <name>Gentoo Printing Project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">a2ps</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index 38cffbb74313..fc2dc46d7477 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -6,4 +6,4 @@ AUX aspell-0.60.6.1-unicode.patch 8273 BLAKE2B ceadde03ffb1904e58c76074444013d25
 AUX aspell-0.60.8-cve-2019-25051.patch 2880 BLAKE2B b181caf27feae7eae908c92496a5f05f7e7f1f1a089c460b757c2f745b97f5339d4c8e13cf851e704cff7952c5dcd5ad0a8496ec1ae45c1e83fb1fa577134c63 SHA512 529f3f4737d2e19f7571f4c8666b1cd089cc4e9dfdaa52dc468919f01ce9f8f8112d8fe8afda295b3dfb92f5e0c2bbd79bf1ec69f06c163c32eb28f0168ab263
 DIST aspell-0.60.8.tar.gz 3486448 BLAKE2B a72e70af65749059a576740377f93b20ab283f73fa7919894f6af189b5aa73581fa0410800851c9396e7d13f4cbc2f7edc23c53d46874d0389ffdb2432ff08c2 SHA512 8ef4952c553b6234dfe777240d2d97beb13ef9201e18d56bee3b5068d13525db3625b7130d9f5122f7c529da0ccb0c70eb852a81472a7d15fb7c4ee5ba21cd29
 EBUILD aspell-0.60.8-r4.ebuild 2843 BLAKE2B 78c523c1de07f802e43a33230ef9670f3a01c9810277ca8385f6eedbdbe719c912d918dc8c30612920894f597381f15444252d516798f781d2f935894cb6fa93 SHA512 dfb017d41b2f13a75ba839eb6fcb3697964b8f115c4016fdd9cbeb79651a74a52bbe0904e6f2180b8308a1c5bc558aee87019b036e3f78698b9d03a3cd73eaa9
-MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
+MISC metadata.xml 334 BLAKE2B 21076177b3c8b9885a962e3b809ac5dbd0499a32cd9dd8c2a656fc2f98a2ee17dd605890dd36b4567e9adda542762f4031cd53e4b72c67f712a8a8a015541504 SHA512 698c5fc0cb978c79d99db139581aad79016445eb0edae71b604792127d0a7c1e6c40f614df0afbad154ff0402cbf5685a1949ebf7fc5163b2298b05430c9d0ac
diff --git a/app-text/aspell/metadata.xml b/app-text/aspell/metadata.xml
index c07e13d4a6bd..7a5d43ec3623 100644
--- a/app-text/aspell/metadata.xml
+++ b/app-text/aspell/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>conikost@gentoo.org</email>
-		<name>Conrad Kostecki</name>
-	</maintainer>
+  <maintainer type="person">
+    <email>conikost@gentoo.org</email>
+    <name>Conrad Kostecki</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">aspell</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/barcode/Manifest b/app-text/barcode/Manifest
index 9e783f5012b4..b36618db5f88 100644
--- a/app-text/barcode/Manifest
+++ b/app-text/barcode/Manifest
@@ -2,4 +2,4 @@ AUX barcode-0.99-fno-common.patch 650 BLAKE2B 27fce20565dfa526b4240c5817ab45735b
 AUX barcode-0.99-install-static-lib.patch 331 BLAKE2B 72b6a5a31ce3c450587ae7603f802bdd9e8c467f9095538fb819f2742703be1abe749af7faf340f908ee8e5979277f7fc65cc8230685f060253c08e31a5641f8 SHA512 2033f6edcdf98efcb17296845be76d1c2cfc3504fcee965d68536e209f949d26d6ef2326858fe673492e36a5c3aebd14eb3e0ef96355ca43d25a23f19b612d01
 DIST barcode-0.99.tar.xz 586028 BLAKE2B a6ef5a4f0061bd0f0cb65a791516383259f317801e9f5ea02c626735cd3ed5f00e0a92502b9b5e3dcb8ea95c313e10f5abf9c172e1094111dea7f3cfb45ec032 SHA512 1f3015ee9cb2e57e38e56fa48fa3a38fa355821801bad3132d3e87b5b88db4f167986c33dc044317cbf18bb62062af36e946daab98235ff7015a00937c8dd41e
 EBUILD barcode-0.99-r1.ebuild 753 BLAKE2B c25d230a2d70cafdaf9394f20d7901ac41a5249a0a41edd202c1079258ab06e703823fbc61112414d3f0fa5fef8b44dadfa88dd8e4d23f0c2529f3872f28c972 SHA512 3e3486d9d952dc92818a2cbb6ea420c5da299716dd97d3c134e2dacfd8f591bb84760996853e21ed41a4893196ebf44d39cd86b6bbc79df6f04236d16dc6d0c0
-MISC metadata.xml 244 BLAKE2B f06f28c2ffab348c5d491944712eb7016f0f4d8ff911d3271723814c8d9f3ca45ed9150699f2895c65cd1a7ca25f2e4aa872e7a562ef58fa1f172fb41194fa1d SHA512 0852b52ec19f2637ef378f7ea2b143d80f1f1cf46d1e099f6b1de24eaa79b6ee3abb32f75c07dcf279a30b0c6028677481af36314b09f7d31587b9b2af072899
+MISC metadata.xml 332 BLAKE2B cbd827ae4db4f4230f7ce483ada7e58d976fd4fa5a508e35725ce97dac038416fdb73969f0bdbfe313ae85ddcc8fc9e43bbd5959af3105de8b162abce1267fd3 SHA512 2268bd4b0e057e8a1bddb53e1bb1d82f69d28f62cd02f297b55fe1403c1ded3294912009464ef3b21a3831ccede5c496f24a2c60a11fbfb4586d20fe527fa34a
diff --git a/app-text/barcode/metadata.xml b/app-text/barcode/metadata.xml
index 3dcb3e34c200..b4e14c04b700 100644
--- a/app-text/barcode/metadata.xml
+++ b/app-text/barcode/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>tamiko@gentoo.org</email>
-	<name>Matthias Maier</name>
-</maintainer>
+  <maintainer type="person">
+    <email>tamiko@gentoo.org</email>
+    <name>Matthias Maier</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">barcode</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/enscript/Manifest b/app-text/enscript/Manifest
index 8d377836c452..f4c6c9cd4be4 100644
--- a/app-text/enscript/Manifest
+++ b/app-text/enscript/Manifest
@@ -7,4 +7,4 @@ AUX enscript-1.6.5.2-php.st.patch 210 BLAKE2B 85f6531797d84e8b6ad3933785e5a019c9
 AUX ruby.st 3904 BLAKE2B 854c86166a43715e85e91802f2d82eae71773d9caabf604bd5edc0e53046ed0fa9944ec61c5ff7516e22740cc90ac73dc1d8edbdc0e9722ec876be3a129d2183 SHA512 43af0998ebe95530129aec126b9f91878bbbf7dd52530cb162b25f5779f9eb5b870f41727665e66dd5cf42a6d5e790899bf03c38c1a914adf2b0eecac83154e2
 DIST enscript-1.6.6.tar.gz 1330493 BLAKE2B 02e333271ac6716e049402d5904b0ad6926b31d4533c813a9e5bcf76045d4100def2476426b97c52585e8f5c0a741159fb3e78de79c817e75de81ebd464c0d61 SHA512 bf1c2b9ea7723518a1ef312145ddcd6ffdef0c6e8b5795ea84cb55d76fccc02f441d0c2dc6897e970368186e6a829ab74a090716624e0f7a8f575653fa495ebc
 EBUILD enscript-1.6.6-r1.ebuild 1304 BLAKE2B fb16c54147f6ae46e27b135c57803e611c477d9e58113811cc1f78c5396624a1944a6aa57fa0e001f9f9d5e0333a2db23d700267a76d7629f96d84e4c4465e13 SHA512 9954ba339e91ab6c2208305686f315fcd32c509ceda451e0a3db7847d4ac1202337d4202a278da8b90facab87d541a7f494509458e2750d6f2e5a503f9a465b1
-MISC metadata.xml 256 BLAKE2B 16ea76357721c3ab7d672ade29d27338ddf9da983571e4ca4efe2520c741fc71315d9609b711850b00c19ed4eea848dea0d5b3955eecb401c42c4db257c300bf SHA512 2748afab7ffea0b3ddadf72dc720f7d83a1d76453fa569091abffe834ec187144a47f9365ccb4a97f676dbcfd799a6be92671f283b179fe4589d95486d7fd24d
+MISC metadata.xml 345 BLAKE2B 5f506e3c1e1ec31bafe091fbf17b256482ec6ec8bdce90d9981355341695fb7feac37e9db828d0b1dccd9a9e23f4d015e15597ffd72c346652dc6bdd92284889 SHA512 a06aa8b58967bd1a4f7bd65935f6ba3a569c7d3dfcb28458b41885267e92d060873024c8663a72fb94109c0081a18ee516b660943c24a0838d6270d9be3c367f
diff --git a/app-text/enscript/metadata.xml b/app-text/enscript/metadata.xml
index e2fedda90ee1..167f8f30a26a 100644
--- a/app-text/enscript/metadata.xml
+++ b/app-text/enscript/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>printing@gentoo.org</email>
-	<name>Gentoo Printing Project</name>
-</maintainer>
+  <maintainer type="project">
+    <email>printing@gentoo.org</email>
+    <name>Gentoo Printing Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">enscript</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/ocrad/Manifest b/app-text/ocrad/Manifest
index 19d6babdf34f..39d6e17bb67f 100644
--- a/app-text/ocrad/Manifest
+++ b/app-text/ocrad/Manifest
@@ -1,3 +1,3 @@
 DIST ocrad-0.27.tar.lz 91709 BLAKE2B 4dd152e6ccbd41d2ce7e7e3d4fc38e30af4f0bb9c36e32b1f32e67772347af133cf67a8b89c03d5c9924a1d4ffa009205b80609cdb96a59b3dbeb76709a8e8e1 SHA512 2a4731e0e26eefe6d37b08859c4d3cc2b54180411b0f846f7b7e873b9da5b4596ca3c6042ee42284a07aadfeb96d953dce3e95ce2410e48624d1b6020750539c
 EBUILD ocrad-0.27.ebuild 788 BLAKE2B f637f6731cf32336a5e775e55f5ff3a47cae1edd25d30032d2553a2976877e16bab4c11bc099b7a792bac38dd9585f788652125fbcc19b0d2f8b0d3a7b77d07f SHA512 db4aef8384dc9d4a103aa46b721b898dde07b1197a286527a28893b0c3d1169361b40dc0775a29d8fb86cbe969c822e26c1f9a9b6051cce2203c83e13c68b080
-MISC metadata.xml 419 BLAKE2B 4fc7676b5c98871fcf256365d75d6e778ff10dc528a9a4c890bdda6b7c279ade210f6548f032ea8970e52a493d7c85ed606263ffcd91457e5b9b8b754de43862 SHA512 1462ecbd11fe23ed10f4db07b5bd0672c711159f0c9b72b8502336b1337a43a2e91c0efd2a81e4c5f127596f4a959c0901d1de6b0dde96a8bf1126c105b41ebb
+MISC metadata.xml 505 BLAKE2B a4fb6e973e05860f913c1c2c345ec6905e268a00f873b7d05d75d06b796f4f0c53334bfd9f6cce0d628345c7ac839db2e0c0878a67cba94eea2b25743b5b12a3 SHA512 ed7b97ffd080347154ab918c7bda56344660021586803782ff236c95ab7874e0a8b4c08515439465f46acbba703ac0e51c521721889b8855296d4534386a49f6
diff --git a/app-text/ocrad/metadata.xml b/app-text/ocrad/metadata.xml
index 7dd28abde319..1e689d2596fc 100644
--- a/app-text/ocrad/metadata.xml
+++ b/app-text/ocrad/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-<longdescription>GNU Ocrad is an OCR (Optical Character Recognition)
+  <!-- maintainer-needed -->
+  <longdescription>GNU Ocrad is an OCR (Optical Character Recognition)
 program impleme nted as a filter and based on a feature extraction
 method. It reads a bitmap ima ge in pbm format and outputs text in
 ISO-8859-1 (Latin-1) charset.</longdescription>
+  <upstream>
+    <remote-id type="savannah-nongnu">ocrad</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/teseq/Manifest b/app-text/teseq/Manifest
index 9578a69772b5..e62b8dbf2fe1 100644
--- a/app-text/teseq/Manifest
+++ b/app-text/teseq/Manifest
@@ -1,3 +1,3 @@
 DIST teseq-1.1.1.tar.xz 240256 BLAKE2B 657579ba89c2e7cd4cd2e54234d3ae79d9f8d999475a33ba78945da223457a065a631baa397ab06a137cfdfac360d83992a5f39d5bd3b97fd8cd96cf29c68ac2 SHA512 c7747c734e640f7cc607389e001ab2cb9e368b504bd41406eea4dd7ba8bfead79659c68b148e33e797b843e9a46de38d104172303329b88e3fde0266aa1ffd7c
 EBUILD teseq-1.1.1.ebuild 332 BLAKE2B 735e94cce3d1cc3f7796ff0fa2048cb95b8226f9cbfcbf206f53704655def1878d707d89cf57e494b72bdd8861dab16263e5295f37d8703ff892d130726d3e15 SHA512 c80124baaf706f11c002e6b35051a973ecea6334c0fad72efe71df98f455d92f7a7ca4fedcfc6a5230e51804baef16911491ba1042b6682c7b87d8463251ebe1
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 245 BLAKE2B 7eaa8f1961243c34a9026209e970c173a53efe21fa7033783c42928f8f1d8140facc1c3d121ad26b80fac750016982c55c6a07ae4205a2b0d49eabcab0b861b9 SHA512 9ee5fecefc3387c998dfc60302cd7c9669a7b728fc4bc5e0607d9024caf8c3b63ae51122bea7c0a165e20bce2b9a35e719d364a21e47874309b256a8f49e03f0
diff --git a/app-text/teseq/metadata.xml b/app-text/teseq/metadata.xml
index 85e4ed814fa2..f2d895595ee5 100644
--- a/app-text/teseq/metadata.xml
+++ b/app-text/teseq/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="savannah">teseq</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/texi2html/Manifest b/app-text/texi2html/Manifest
index 15c8d8a0f804..3cb2a9d0f0ec 100644
--- a/app-text/texi2html/Manifest
+++ b/app-text/texi2html/Manifest
@@ -1,3 +1,3 @@
 DIST texi2html-5.0.tar.bz2 15397249 BLAKE2B 3e502d9424c2936a922488aab7a66140c0a8369253a5500beeebcea0942ffa7b97fb7021b23212264e110d4bdab4850f263269aacf61de23ac6e052dfcf10d67 SHA512 50afc2f1f8875d3e62a51cc0339bd4c4f058041f42a9fda9cd5b02960f0d5c72838e4f010702ba716dbd256946f64520ce1e5b86539b6f7b8b7ce24a43c98e9d
 EBUILD texi2html-5.0-r1.ebuild 1347 BLAKE2B 8e5a3d44afde04084bd5d9e695fa8d13d88014502472ba9a5032237778e29115ca7ce4cdaaeeba12490eb274cc6ffb5f9c158a8f2e03195ca3dcc9c588a39872 SHA512 5bd3546c48541b767510500425d52f34055fb2bf60e4b4462d448ad3e114c17b7025dd06bab7e958faff0c28add6988f568924f28e30620f556fa32c34f5ad4b
-MISC metadata.xml 246 BLAKE2B b56c934f8eecd3492d6abe15cf5883fdbc1979c37abbc5ad196e345ee17bb865db5eab10ac7de93bbfce94c4e865bf6b86d5f8bc081b5cb1d3d58d1158b81921 SHA512 b61f56c5e078714565ff9e33c81217e788f78bae9cf10d6ca78a82703a8e08119dff3afa68306eced0b7c62db9220d28efa4c9782e943c991e30b25b9ead82f5
+MISC metadata.xml 343 BLAKE2B 7a7bf9e9fd177ec4d24882c9d9ca602f6a70f1f5d318ca4799adb6bfb5e80664d87a25f63552bc9eef842d48df8553670a4b5c9e0042b4983b9081bc9229650f SHA512 9e7cda1b8c50d834288e03f540fb72aa8cc4e99c930e158a6dc2543c0d7c9bb52d04c084bba0a9ce4dc240ce022a959c4e14f21c13f62a58944b32196fa5be56
diff --git a/app-text/texi2html/metadata.xml b/app-text/texi2html/metadata.xml
index edfe97231997..5e7a2226a9ce 100644
--- a/app-text/texi2html/metadata.xml
+++ b/app-text/texi2html/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>tex@gentoo.org</email>
-	<name>Gentoo TeX Project</name>
-</maintainer>
+  <maintainer type="project">
+    <email>tex@gentoo.org</email>
+    <name>Gentoo TeX Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah-nongnu">texi2html</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/unrtf/Manifest b/app-text/unrtf/Manifest
index e396f32f9a4a..a8ed0fd1b72a 100644
--- a/app-text/unrtf/Manifest
+++ b/app-text/unrtf/Manifest
@@ -1,3 +1,3 @@
 DIST unrtf-0.21.10.tar.gz 812696 BLAKE2B 3edc654feee461bb785877c3c3829462b9f55556e352bd12a19e426911336e161431badf5fdf5e00b0c488ca1804a0922ac7eb6980ebec58232112f6cf156f34 SHA512 31bedd1a23a052c1235e1328a12b346a0fe48b3f3cf78d72c068fe0d3edf18bc78f4c9dfe2f093ee8b4f3c79e923c6ceda49bc257d191dd5371f9273809343c9
 EBUILD unrtf-0.21.10.ebuild 418 BLAKE2B 8b64e532e9e5245a02437b4946fe49a9fc45061b1b4d669120061563253a266790e730d73d77503a85d68c9d018a6249152d1697c8d633d247ae59a16ac3d9d9 SHA512 fff47f1c8be4ad7e2f6956d158703b29c7d48db3339d95eb50151ec2a7c21aa99db19152779de6b4b470aaa690b8ebf1805fd22d567f315dbbc85f3d90363f72
-MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
+MISC metadata.xml 299 BLAKE2B 492d0e3ba9bff1a327d49c13d54bce9fadbd690ce4ebd5f62b283545b098f553d93cb1938c0c66da695f06775e6a035e87d70c01dd04985cd9e850d360ec377c SHA512 b4d3519e2e55716235643397e55b101a80808ed1cb82f2618f0779551d0d6e5ed8abffd65e2203c64d604f23d23575c0f93bd2c897cb3e29ff0ed73c32d30ca9
diff --git a/app-text/unrtf/metadata.xml b/app-text/unrtf/metadata.xml
index aaab041e8885..a85206b18af2 100644
--- a/app-text/unrtf/metadata.xml
+++ b/app-text/unrtf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>robbat2@gentoo.org</email>
-</maintainer>
+  <maintainer type="person">
+    <email>robbat2@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">unrtf</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/wdiff/Manifest b/app-text/wdiff/Manifest
index c80186287d49..8c7aa723ee8b 100644
--- a/app-text/wdiff/Manifest
+++ b/app-text/wdiff/Manifest
@@ -1,3 +1,3 @@
 DIST wdiff-1.2.2.tar.gz 1478567 BLAKE2B 80de7ecdd8fef1a4c9e6e0830e1af52d5087abc235dbe2bcf7542c0f017c1a21036243162fa6f70e714f3544d74e9a1add70dc22e69f306a17ce9bdd49c5bc15 SHA512 9272c225f4f61612197fe151cf8c913107169ac9fcd6c9f8472a0f56d9124d78a060944cea1b51489ca34311220f23638d043d43c733a3252cdbb7cceb1085ed
 EBUILD wdiff-1.2.2-r2.ebuild 877 BLAKE2B 4b52042a689f1cff350530def560e77363c5be4f24299bf337643069266dc9c6d6b693077708e9b3d9581827d69c0b4c25935901665ecf78a494e122662988cc SHA512 d1a7c44fe9514907f5487d82f6db161e7a7e16fe94c03195aa6286443c399ba6a88e88bc42a658bd3191f056091f9dc124dd7e4ed6b2b664df42232a52f333f5
-MISC metadata.xml 378 BLAKE2B 95e3d451a7fd7af4da58c03b88615a0547c6063c0e4601dde7781db46f0805b06a76d900a0407ace672cf76c2b6c481f775c2b1d7da5653418e26ad71ae7ec32 SHA512 1da43e6a6e6907de98682dcb9221b33327d2fec70675452e40262eada16d7c94f312a1dbe40a770b064d4034848d84801f3a9c5f887a669664722198cadfea6b
+MISC metadata.xml 454 BLAKE2B 6d49b2f1567da8dc620744510204eff45d0af3bca362d79282c90e6a14d0a208ea7195a7ecbc21d694934daf6f3b873f0e9eceb09740a3243fe482bb68ceea93 SHA512 93304e13f51fd285ab2eb2d82ef888290a5327e3d9cf7a12a2f792a36ffe170709f13e17188c856c47ff4fd2a8506c4ce5ffb3cacfe4bc237b8a017b8347540f
diff --git a/app-text/wdiff/metadata.xml b/app-text/wdiff/metadata.xml
index cd21cfd82da6..988be0d02805 100644
--- a/app-text/wdiff/metadata.xml
+++ b/app-text/wdiff/metadata.xml
@@ -8,4 +8,7 @@
   <use>
     <flag name="experimental">Build experimental utilities (mdiff, unify, wdiff2)</flag>
   </use>
+  <upstream>
+    <remote-id type="savannah">wdiff</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 218df584478b..7c89aa8408aa 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/pngpp/Manifest b/dev-cpp/pngpp/Manifest
index d0ff2412e84c..b4c0a65060c5 100644
--- a/dev-cpp/pngpp/Manifest
+++ b/dev-cpp/pngpp/Manifest
@@ -1,4 +1,4 @@
 AUX pngpp-0.2.9-DESTDIR.patch 379 BLAKE2B 108fbb9547615a88e4a6576728ef21c1aa7a51ab807015064f28064b4c1583a4d4fbf5334d82da5fcc6af25aac0ea5898c58e2d08787fe03758b78dc1a5fe302 SHA512 21ec246b271d3715960cad9f57613aae35647d0d427d73dfb8cf847252d5dff5b53b02fd57fe76709be5f3dbd2ef9711a8d70cf3bb2ffde70e0c0f05ecbd37eb
 DIST png++-0.2.9.tar.gz 592770 BLAKE2B 12419e3c964f92022f992e25d2efcfb01c7f6275aba1db159372f84cbf0e0bf0e92e95dac419ff0f6248dd1ecf63918b11096e7e6baa8da5704909e69cb7aeca SHA512 905e037faf26eef9ca1d9508471dde9f480f41a87d72133057865078b2fd040b1cf84727ece48d79117d615fdfbc0a749fec7dbe362366763e2017865a7fe132
 EBUILD pngpp-0.2.9.ebuild 669 BLAKE2B fc8d466f62a834c96eb34095e008110746ded67cff3fe993ad3017f2de2c7e473819aaec45645e913cb3f30628c2b5e4dbc1dd3112074a31a902b0dbbc34a89d SHA512 e0c897e3cf3caca80e1bfd98c3bb6ed0762b86842cc3f23ae7531c7e292fc8f835214d6d58535dbd8afc620b5344f4348a13ae388a31f0e26eec9310b37e2dc4
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 252 BLAKE2B 93d662876929e0622a2ca363524501f784a2b1740bd40e119b9c77f5f884fa08f0149756ee366296909698cb9166b2b63055b8df994f7b6c4f54b3e2e045635b SHA512 8b4d19a94c7c00ed472f14ef1f57971e040baaa50d73a229292531053c0dd06bff9bd449beb86becba012dbd2c69272039e0da0d6223fdb2a4dc90b03ff51095
diff --git a/dev-cpp/pngpp/metadata.xml b/dev-cpp/pngpp/metadata.xml
index 85e4ed814fa2..1f31b41ecd09 100644
--- a/dev-cpp/pngpp/metadata.xml
+++ b/dev-cpp/pngpp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="savannah-nongnu">pngpp</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index 79d8c8e4c24f..c1cd6171ade8 100644
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
diff --git a/dev-go/gopls/Manifest b/dev-go/gopls/Manifest
index 1dad1ef86ed9..288abf104607 100644
--- a/dev-go/gopls/Manifest
+++ b/dev-go/gopls/Manifest
@@ -1,7 +1,7 @@
-DIST gopls-0.9.1-deps.tar.xz 21987952 BLAKE2B 3279c9bb5223460ea4881ad2d4061a7eaf973682af26f8af3f6a19436310bd7037ec4e31594e019b2cf17e51784945d89808bd9fccaebbf654b4865383fddef2 SHA512 d29177bab21a27c67ea664f7b1264b5a9ce889d597fa150a9c008a10b0609186fccaae3a0cf6330cf0e88e0fb98c010546be7364486696d0ccebbaf9e5256043
-DIST gopls-0.9.1.tar.gz 3101075 BLAKE2B a9e05f28868f733c9ef60bbdf3c6b54f2507eae6b23d18a85d7fd0df69ff3c5fe2806a280a918763aa6e34db7e4d6ca4e3160c7c280e5e9d95511a3ad3846ee6 SHA512 f5a3863dacc5639e1773ee70608d0c22228e348d00cda5303044ad13c6be0d212b64f3866d541459e8e188461bd84e4b2270d5e40baa105f9f0c749db86df9ab
 DIST gopls-0.9.4-deps.tar.xz 21995720 BLAKE2B fddcc1b1417979baacf1c1d587b835dbd00638a5fc7fb8bafe54dbe0f399d3d6b0f6b48c0ecf682c563f714e6d8adcb74763bf5021a31b7e5ad3138768d1dc6c SHA512 705908bba1ce599b7749704e7a031df9d9a5d22aa0c57a3fd4e3cd591aa0b0c22e351222d6504afbbe2df47e0a939b596550c19e42eaf3700305ec6179cee18a
 DIST gopls-0.9.4.tar.gz 3159131 BLAKE2B f0a317dd23e74682e31e6587eb8e0a1d110472d2c98add5ef29592f9aa45036343da2e5d1f404f88875505ffd13019ff8a25ed8eda379eb8c3104d59e6a98e48 SHA512 3ee97b1090b355f79ae9a5a045a120ea6230b320d5b26fa0c1f42bf2288707922c5f111ef4dbdab7cd893245330eb9acc163cb452a2610941775b06536d921c1
-EBUILD gopls-0.9.1.ebuild 910 BLAKE2B d288d2e2ed305c441e74d300645194d5730b6504b4318326abdb2424658600b3798e7b0ab9ddd5f14543515ccf1df4626494280be04236f09f2281d14897866a SHA512 ffcceba396b2c81eca2d42866591301629f05c7ec4f80d52276b6387342ab4f2cd632b67a4e55911156fd285a0fe9a0ad1057312f907d5c113755d1d02d8358b
+DIST gopls-0.9.5-deps.tar.xz 22410984 BLAKE2B 5f15c1b8fa75fac10b0b126071968ff9640200844df82a0f1586f7d119b99ce70dad2e05c11230241c1b02428f7a17034750c6bf04062316371623539c618e12 SHA512 190a63a20c89c7a647495a9e8fc20181bc570e3dc8a6c85c944f5da8a76bcd9d29d72a05bf9186e578928cdc5f14d548229f59b8771c1e7a3c2d72579da7082a
+DIST gopls-0.9.5.tar.gz 3163807 BLAKE2B 3792676e4f3f7cd5abdfde35d875914982edd4d0cce370ff2fb74f36eb5dc9bacd0f494a3f3668befd6fd40ebd62b3cec077953505b9f68f7795f3d3eb2ab4f2 SHA512 55bb1128920854f6d4c8b61ce8edf8b97d3ae14dc5ecf8cb9c8eea06223be9920161e6e0c3bfe27ebac144fc85de753ed98dde8284b817e669fecfd688c7e10e
 EBUILD gopls-0.9.4.ebuild 915 BLAKE2B 1bc7d1251e5be321f66cd51bf208d5d6ec94d5fb11e1e1fe7d729563d0a66d6f44f12ce4e451503a1740902d4e12375d70fd8377274244b43c7f97d09a204a26 SHA512 87f0a8e22987d40d93c72e7a151d6f128663df5f0bdba2d559867dddeb5414c4ba6db9ca8d8bf23590693f0fd81dd3160f3c8daac08af33e108854d8ebbd1ac4
+EBUILD gopls-0.9.5.ebuild 915 BLAKE2B 1bc7d1251e5be321f66cd51bf208d5d6ec94d5fb11e1e1fe7d729563d0a66d6f44f12ce4e451503a1740902d4e12375d70fd8377274244b43c7f97d09a204a26 SHA512 87f0a8e22987d40d93c72e7a151d6f128663df5f0bdba2d559867dddeb5414c4ba6db9ca8d8bf23590693f0fd81dd3160f3c8daac08af33e108854d8ebbd1ac4
 MISC metadata.xml 296 BLAKE2B 648d52b08067cb13811211594b39a985916c22bd5f5fb36d695b790061131622dfc0748429340f3a48e5db927bf7f8ad935cf8884c9453fde5780a396a4ef8df SHA512 3f564045b89d59788d47d3d37d4b0d68dd949c225f27cf6be981b3508b34c796e01df6399f444124c679e1a0c9e6aea36a3eb505680dc0ddf1d39f079d2e0a6d
diff --git a/dev-go/gopls/gopls-0.9.1.ebuild b/dev-go/gopls/gopls-0.9.5.ebuild
index 5952c14f68b0..965c22e94bb7 100644
--- a/dev-go/gopls/gopls-0.9.1.ebuild
+++ b/dev-go/gopls/gopls-0.9.5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit go-module
 
 ARCHIVE_URI="https://github.com/golang/tools/archive/refs/tags/gopls/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 DESCRIPTION="\"Go please\" is the official Go language server"
 HOMEPAGE="https://github.com/golang/tools/blob/master/gopls/README.md"
 SLOT="0"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index adbde1bc1e68..89aa0d37582f 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/jackson-annotations/Manifest b/dev-java/jackson-annotations/Manifest
index be0d16d6fb32..3415c6141bee 100644
--- a/dev-java/jackson-annotations/Manifest
+++ b/dev-java/jackson-annotations/Manifest
@@ -1,5 +1,5 @@
 DIST jackson-annotations-2.13.3.tar.gz 1984205 BLAKE2B c577fcdcb40c44cf1cb08ebe467318ca4e4fff9fdeaf756360ef202275a48b5f5a93135439567261651b5731f523588f0c29a17c05ba6d03fec0f19ed19d9c5b SHA512 c00aec542c8ddea999fb60536cb2cab3edbf4f1d20b29e404d62add54a22546ca195ab7faeda4a2cd1d3a827f10420ccafe1dfb0065742f46aecfc2d00f2c1fc
 DIST jackson-annotations-2.13.4.tar.gz 1984001 BLAKE2B 8c4eed89fc0c5b3d68f25f2db28a38e55a2e629c7c38289a82f4ff4a122967326e0221cb020afb69577fe4d5baa2ba89f8db5a398302cd25404083a5d0830eaf SHA512 5ad1d07b254956f9d4123eb01e32d8a8f43eccefe60c6841675ccfecd8837feb4de9352d90f8b8a2703f0f12a0fd20083f8d274594e1ca5674894b2cd76ce322
 EBUILD jackson-annotations-2.13.3.ebuild 1402 BLAKE2B f3e9f95e8f598a5b273be9727bbe03e6680b064185006458730bf943068b8efed951c326d16901986deb50be9a642b787321ae5caf4fa7ce59db22c10cc886a9 SHA512 bd3991128d6edbc1cbeaefd0ea88b56c4c00dd29472514de71626a3759ac66f348377a920b56b4ecae4df51d579fc9294c04acbdb9f729c31bea8db9e61a1bf5
-EBUILD jackson-annotations-2.13.4.ebuild 1326 BLAKE2B d8df8e017a4556c5cd632c04c76c143aa7f01288e75493c4e0e4bee85a34b93fe04c1ac90ad0f8a75c42a06a5b1cb2722cfebbb2faf9a7483b830bd9de2658a9 SHA512 f39338c0187102b1364ef6b94bed0db4e01f1e91553557839918150f2f707f2259d729a68b3d3d060da2ebfa5ed2254d4962b173c8704dcb1d9443a46b2d418a
+EBUILD jackson-annotations-2.13.4.ebuild 1325 BLAKE2B d5813cf6f50056b2da2627d0ed6087b12fc9b9a7fd04657139fe96e6eafa0609798004f66333954ae333baf3924d3d428f5add1ad3d1e6b5b070cb7391e4961c SHA512 179d5bbf970ec354d4f742bc2fc25824b88e76431d38d9b02ca7ba0dce0522bb1d507a72f11b4bfdc67d9a04b3aaa38bbbd4ffa3d10f879f2b5b24889757f065
 MISC metadata.xml 341 BLAKE2B 1a6bf9fc13afb0c6d95cb0752f40474fff4135031e2771f3c0555cd7961e23ea7c026d6cf905acb505ceb2aa4fad01ea5dfac310004b51828b1383dd9a44f9bb SHA512 51655fad0847b2bbc92ed31310c155f26edf6dc41da35cbe239c99eea205a054f6bf7a7839201b8f8fb397110b50935d7c069f3baa7650970580a0c9ef156f12
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.13.4.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.13.4.ebuild
index b3c129924495..5fe74f89d791 100644
--- a/dev-java/jackson-annotations/jackson-annotations-2.13.4.ebuild
+++ b/dev-java/jackson-annotations/jackson-annotations-2.13.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
 
 DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jackson-core/Manifest b/dev-java/jackson-core/Manifest
index 83b5ff5ee160..264193987f79 100644
--- a/dev-java/jackson-core/Manifest
+++ b/dev-java/jackson-core/Manifest
@@ -1,5 +1,5 @@
 DIST jackson-core-2.13.3.tar.gz 12268319 BLAKE2B 8053988b060cd625670c643d9ba12d9ceae72dffa583bfc78e87044ac723c78bc44dfbdbaca0331098116a43b273dac844721a9e44ba1a536cc457f841d89b56 SHA512 9e7a9ec54073fa6faac36914c496df38bb6c201a37ade2b32306561b71e1b78a0ec4f48b006d4fb10cbde21979a16d117706b59338ada7aedcb593ba5c31ea52
 DIST jackson-core-2.13.4.tar.gz 12270995 BLAKE2B d4556ad35eaf4f3182cb07eb39b14691a0d9c5d7801a4f6450536fcb33c19e9d6f24e80477c09dae167d4ff3b3e57798d63f4c24ca689a902350a6ff4ce0b19d SHA512 95fba755c9289728ce6168e57ef8f2417df03616b5839beacc338947d1447719e930b6f820144c0f398f162676e5d56a6a5bbcb86cbdb15f80de566ba45c478a
 EBUILD jackson-core-2.13.3.ebuild 2086 BLAKE2B 1b69c3b0de10a0c8ca84f7a199a326ccfb2740d1e2e7ee454ac1168310623b26b9a70967ff7ea8390707f3402404b9d30044f4a1a75b07e3a09b3bd202404b89 SHA512 f793d30d514a016db0008fd4df7bf1cd02a27d2dc153906625f61a41c611f610b540126f64ef1858b547799f7740e8f43979188cdb086ae3edc07bf4d66b280b
-EBUILD jackson-core-2.13.4.ebuild 2009 BLAKE2B f11f8d0d230017682f2fe9ae4b7ffb25dd5757965cf19965cda9f9249fef36704591fc2c6789ca9ad230423bce4dc60386c1e7f551ae70c93be3c1fe6aaf0b69 SHA512 c45da0dd36a62ac5bec8c997557e4e01a5e906d2437bba92aeb2b5671ad5fc6191abf480787072be0d5518bec86ca15582946ad5f68ed49909e798092628e33f
+EBUILD jackson-core-2.13.4.ebuild 2008 BLAKE2B c52663e7cec20e00528fc1268d05aec0980c75e8dfa7d518a6c042ff4c1619837eef5b87d6e430c67e1af6821e37023111988984aecfeec9829982cedd17a99c SHA512 04fa6de5f256032f423384c24ae0caf5fa0c9a3da82b42ab71bec428f3813e37d7a257c04c2a3eb5adc9bf22818b5570c37618ad45a525f7effcd4efdb3a68ec
 MISC metadata.xml 312 BLAKE2B b1beb51833c35e3ab2191a3c722768a34ec6cbf3ee240d67381b5137aabc0bb8be862f32638f35c1ba84a75498bb66303223c1d43b7d48c8bfe143ee837d6338 SHA512 b85d17092438f67523cf8c3c861de1183e061f55620342239bd662e5e90058f82fb501ba24bf2c1de6ebbe512ae4559d4b746a575261cbf2feb142e120118372
diff --git a/dev-java/jackson-core/jackson-core-2.13.4.ebuild b/dev-java/jackson-core/jackson-core-2.13.4.ebuild
index b1e140c57ac6..ecf4e9e34268 100644
--- a/dev-java/jackson-core/jackson-core-2.13.4.ebuild
+++ b/dev-java/jackson-core/jackson-core-2.13.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
 
 DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jackson-databind/Manifest b/dev-java/jackson-databind/Manifest
index 4415f5e869f8..d2ea9b6c2ab2 100644
--- a/dev-java/jackson-databind/Manifest
+++ b/dev-java/jackson-databind/Manifest
@@ -1,5 +1,5 @@
 DIST jackson-databind-2.13.3.tar.gz 48056095 BLAKE2B 04751cd99eae3bbf3c3a30993506f05b47a85782f52e2cf51f50de9bcb5e9c3718d6ba6105667226272d644dcac6aeeb3ce06dc7ae737adf0392a7a7eafef2aa SHA512 785db6cab20ee74ff90815b8a1afedcbf10f13f60c336a61c20513757cbcde80c073d5f4dc60d390a72600a2b5719cca22b4c71220707dd4edd67dd87f6a7ac9
 DIST jackson-databind-2.13.4.1.tar.gz 48063423 BLAKE2B 88370810068f3c1b3973f310e55e6fb53067ff9796de960d2c57cd50ee59dd552f58b4e73d4455076b18ec996ce7714ab84000a4887a1779fcf259859c891346 SHA512 22b7a4225903a0fad3d7d17a5fad79905da96a4a7ebf70b7d9f2c778e88f8c9c2a27d96f66beae96f189ebcd9ca19fd7b12405009ae38023ec8b0511e1ba1af2
 EBUILD jackson-databind-2.13.3.ebuild 2675 BLAKE2B 99fa6669fa6749115b81c20add20b3c0d15dcf651ef508cabc1ef3eaa9f0a1f3cde300f94744405feb38833d34bd0fd0e15ff67276302dd3ae44705b76bab00b SHA512 7ea0d52d689f2d4d6477c45921d803d53d58d469e425be587dd6a279112becc2324186d87641e4f7d1b97e210b35e26527c61198c908503e6fa5d7fe8c32eed7
-EBUILD jackson-databind-2.13.4.1.ebuild 2527 BLAKE2B 6f4334244fbd383bfebbae26679ebe57407277efa1cbfeff1fd97806452456749bf70abcd79151fe36aa6d9c400af90806917db6ad0d980ecc678379ca08dada SHA512 ed3cbfa040f43502647f791d99f73d219050c39dc533026051da86599b2b17dd2ef274e6dcd0002c92e0107d5ca58faf6eabd18996a3e5ca7c8aac5499b0b3c6
+EBUILD jackson-databind-2.13.4.1.ebuild 2526 BLAKE2B b2d72e64525247f437074f66baf2511959de663b021124ae0f131dabfaa0d980124f9edcb1fcbeb1651041088b17dcfe4d2937c6180dbe70238e7e4e1fe7527c SHA512 eea4cab22391df2ebdee7c1acf96f3d063887cd5a1f407d06cb9e6c92402098802c9c2a706e2dfdbc6cdf8a4caa89b87529ef02c53b36336f569ab525db46d51
 MISC metadata.xml 316 BLAKE2B 06c857b21b1c39450aefd3a56ee67e0a9c57ce28f434e0af285397bf9c0a73801983b71415c1dd3ee1b53e9b1bf855d81b204559ccfe5bda7cf0703975a8420e SHA512 3308a8e0872865b0da8c3c5720364f786764d6cb751b6ad465dc450338b8c3f672b8266ab957a27609363d507b7f711ccb0edb921388a8f50cba73424fc85253
diff --git a/dev-java/jackson-databind/jackson-databind-2.13.4.1.ebuild b/dev-java/jackson-databind/jackson-databind-2.13.4.1.ebuild
index 4d7dcd925cac..96514cdf629f 100644
--- a/dev-java/jackson-databind/jackson-databind-2.13.4.1.ebuild
+++ b/dev-java/jackson-databind/jackson-databind-2.13.4.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/jackson-dataformat-xml/Manifest b/dev-java/jackson-dataformat-xml/Manifest
index d3f2563ab4d3..785cc671d838 100644
--- a/dev-java/jackson-dataformat-xml/Manifest
+++ b/dev-java/jackson-dataformat-xml/Manifest
@@ -1,5 +1,5 @@
 DIST jackson-dataformat-xml-2.13.3.tar.gz 3201473 BLAKE2B 90f6b98325e3ae43e7ba560b077ee8fc8e5ad5004fd23b7c10a2c2a3ec7a674b700b80766690d2442820f87698fa5e33c440c2aa12cd521b7566e78eca50bbaa SHA512 52e26e1a398d90f75ef61d074ed1d149b9f13555f1878703b3148ed008f29f8802586a6020f3c1427a748a73b9a4ca56d86ffd769cf6cb7317a69e039345eefa
 DIST jackson-dataformat-xml-2.13.4.tar.gz 3203115 BLAKE2B c959c878c6905de9fee73fab87381296d30146ab755765e715f49f141ea80d3843116752710e78f270c96abb0a2dd784fff01769ce68c126b3c7bd5acbe1a880 SHA512 8b6c76d8b324ceffece806f2de1352e2b2b557d64f51885bec8e60033c254e9c5a9adad29c07b6a5aaa77d535245ad581f67768a62af7a44160221aae62115e6
 EBUILD jackson-dataformat-xml-2.13.3-r1.ebuild 3892 BLAKE2B 8992fdea96019a8d1ddc92c7ca266835071f8e14f6f0fb73ea36d55c9137e4f58712ec66e9f9333faac7c0fa92b36becc504171eddaddeb44091abaac81570fc SHA512 4465715395e23a878b9a9b334ffc419e56edf7a1454cd58295f48cd7801cee60ef56f7869514c901c6bd290d123410a0410b333de661cdf2a23da530d32a26df
-EBUILD jackson-dataformat-xml-2.13.4-r1.ebuild 3818 BLAKE2B 275e0ad93aa1dd6d51543fa25c772ef3bd0201f49ea2dbde73fe814745c61d27fb78a39518a4a2a638b8b0ec5ea641d5d2b390c4e5bfc40d7deaf6d8e8ec0135 SHA512 bec087f671e7400c9093e084ecaeb7179869fe4d29738dfc9cc402e45c53b3722dc2dd9ee6a3aa085ccdf802d7c1d1dd8320c985d54b6a7cf18afe243271494b
+EBUILD jackson-dataformat-xml-2.13.4-r1.ebuild 3817 BLAKE2B 7428908195261cb0086571fe78e45fd7d05a0a72fd3ef9d0aeb89620333fb20ec00218dd8c427139941a31b36aac975890d85c0cbe29241fc15f5ea8055ac99c SHA512 d6f081e4c80da190a7434e59732df30bc25c62f8676ce4b439a0a0ecb988e8ed4ced4f61bd870d67b3048e29b60a6e1d4d878dc2f082b84ff029faba5251f70f
 MISC metadata.xml 487 BLAKE2B 0e5e73be66b890aab37fce8ccd162c168c7cff415c418a30f5cdcc76624499633abfd366f86ece75de208b981a03364566659e37c2b3a34ad90a01f3577a707a SHA512 b920c1d3b8d8f6023df6c100ba4b36282c7cbfdad4a4690055d70cd3dac8d0da91f236a38565bee798342dd94c49cf2c9ce125282a7e5fd818321e28d288b3f1
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r1.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r1.ebuild
index c4149a277813..2658f27936bb 100644
--- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r1.ebuild
+++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/jackson-dataformat-yaml/Manifest b/dev-java/jackson-dataformat-yaml/Manifest
index 7a38390aca5b..abc755db9d6b 100644
--- a/dev-java/jackson-dataformat-yaml/Manifest
+++ b/dev-java/jackson-dataformat-yaml/Manifest
@@ -1,5 +1,5 @@
 DIST jackson-dataformats-text-2.13.3.tar.gz 3528981 BLAKE2B 98593f45e663905c15ab5cb37152c95d69a0121515990fac0c66f640d93af83cd51802e2856a4e8df6b82c0121ac4fcd20774fd6a3841e019e1da56c599ed9a9 SHA512 77fad3e6ab5ad55d3a46ffaee3482e9f0dbfa36ce67d5ad31e0b7cde667536387f1dce5bc8296733a28efb09f423785aca7291d9ba85a67ca2b94ef4c8766d7f
 DIST jackson-dataformats-text-2.13.4.tar.gz 3530892 BLAKE2B 3cbfcbbd33aeac67476caa453b77c19a1da88a9fb9482360bf427af3f41d689a04fc1ecb28d4424c5bfd7436979f1b03c215ca88a0064338f53dfd169f288562 SHA512 792f416c7cabd639b42bd93205e55328ace53c093e59d57eeaedc27a61358527515031c70dd503702471a13237f6389ca118e453da0ab002e20a531885d58a11
 EBUILD jackson-dataformat-yaml-2.13.3-r1.ebuild 2206 BLAKE2B b1205fbeae520f8f86a70e313fdf39bcb37227c273d75b6c3eb7f45964a067b8f2bfc7d6bd4fd8efbdb21ad9e840f84d386bf9238e7d2c4258630a0b77d60b26 SHA512 702a3a3403e78e03bda687d69df16c2f2507b924decfae2a76860671f3d93cd82abb1d07e6736ab3f2368bff107e0cdc2901910faf042ee55e37156173414d3e
-EBUILD jackson-dataformat-yaml-2.13.4-r1.ebuild 2201 BLAKE2B a3cf6561c86a606909a42d8800fffe9b09096e9859eca553eaf8e4bde277bf454a5de133808455ff0c54e9a0213bb5913b64ee6820b4b0b0d02bd012822c7735 SHA512 f0a96e721de91de94a5514c228bdd758b140be201bf49b217cf3da46cfcfcf806cd6fe31154d1c48897e6988287256983b673b43d1c8d18e5a30d25c568d6629
+EBUILD jackson-dataformat-yaml-2.13.4-r1.ebuild 2200 BLAKE2B 41306da07cd6b73dd58ff71a494c01ed93ad6f200bf0dd177b8799401a722a19d16c217ad6bee48e895caa058409b49281365640a2826d42b0a0c3f192e4fa27 SHA512 00b3e75ae2d413a1e6f6c1edb6e4d0b7e3c9ba06324be0da060cb2342bf7afdcce690715ee432db839082dedf68dafe45ca89ff6a73074fa29830449330a344f
 MISC metadata.xml 398 BLAKE2B 35f92ae137b3d4f6528c3987d1f9a4e8a1492688a687b4fb133b9ac5c02e6dcbde37807569463d8eebf26c078f55199e5848efcd6e11104599e5895044b61d8d SHA512 621d9b0635a22bed22305b4a7724e96beefdb57ff6b2553612f3e4feeeef080d02bc48dd0fcf3cbb3a2f4723c89bf8824f18adff1501fd3876c73e4e85fa20f1
diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4-r1.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4-r1.ebuild
index 092129fb155d..fb49f4628461 100644
--- a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4-r1.ebuild
+++ b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-d
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
 
 DEPEND="
 	~dev-java/jackson-core-${PV}:0
diff --git a/dev-java/jackson-module-jakarta-xmlbind/Manifest b/dev-java/jackson-module-jakarta-xmlbind/Manifest
index f22abe78c176..6c36b0b522e7 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/Manifest
+++ b/dev-java/jackson-module-jakarta-xmlbind/Manifest
@@ -1,5 +1,5 @@
 DIST jackson-module-jakarta-xmlbind-2.13.3.tar.gz 2145569 BLAKE2B 13864e4272d40e8425232482a67a2bc720ff294e93ec623589bd0b7286e2c63c2b724bc1033eb19437cdea23db0b11142380715fc300c32e8af9dba22eeed407 SHA512 2807a9e1d3531f3553a2ab6bb64e0ece2809ca9d2facae320dbd38efe0797cdc7ab11e9b284122d75a98a50eda9bc0cfb0f098ca0921e3bf67a0e38b5252a14d
 DIST jackson-module-jakarta-xmlbind-2.13.4.tar.gz 2146134 BLAKE2B ae20a115464a052a8403172706025fc595d6e6aeafda60cf3cce784e1e0a29f38d672fb5205e9dbd74de1ef9615f3bfd0268711d9992c123cac0ef692e59be3a SHA512 0706566a9e5e68697d54319a425fde53948ad610a6eb9519d2e02d375ea280468c7e9e3d5ff4378535ed3a71480f207257a558f73819b1b81edc69f9d3c317a8
 EBUILD jackson-module-jakarta-xmlbind-2.13.3-r1.ebuild 2883 BLAKE2B 6e7d8a279484b1a7f05b161ed31b008527d8d7e6c5c2ca6574dd3e172bde39a02aee6f88116efbff79d8e581b2153bc0eef65f68d01c964f9249156eda2f582b SHA512 2ff9cffc503d756e7867e156b4b78fb50379ca41de648db4f7635587b4e161252e0800b56c94fe00adf5078ee61638b74c15a43cdd55cd9044357b85543476c5
-EBUILD jackson-module-jakarta-xmlbind-2.13.4-r1.ebuild 2814 BLAKE2B a0b20a10172b953d20af12dc6126ff77d7b63d2451f0ecd74ef8832e48d6bbede02e43b7b78c1edf29e810140d2757a84a9de9426799f751a32dddec056814fe SHA512 e813c8f5582a5e053dd039a668f779bb36c89f368a83b9eb95806fe709855f9f92f282455f7f7d60856e0a337ed090792df9203a4881542ce6d22adca0eda6de
+EBUILD jackson-module-jakarta-xmlbind-2.13.4-r1.ebuild 2813 BLAKE2B 8578662b0d43d981351c6a933be98be93236a6e77dd428d4243f283c6cf72858ee0b878b9104ef4d1ee549e98b7f42857a5a99d6136a4fb75c415182f5026e1b SHA512 48ad762dd6e61e3a26f755f845fb05fa232e5f3972b4d772aa57b5d416f4318ad7ba89f267a75c7cf495c5396cb9975f391427e80baa5e5ebe93b2fe57e60fec
 MISC metadata.xml 506 BLAKE2B 4e62bddea5ad8f7e6b73de9a173dbc8416b309caf4e4f9801496712f1cc88bdab646d237e48c3f55c99d95c198056b6642cf19070805f694b3a8e996e9bd0528 SHA512 96825b1a8ec0808f4dfa4a2482a1c184acab23d624ab178be8df496c67ff3ca5cd7cf012e6e7017721a3355a6ff3265d6f76734a655bfb261d3530781825f5d5
diff --git a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4-r1.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4-r1.ebuild
index e71982d5738a..0389701acba6 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4-r1.ebuild
+++ b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/jackson-modules-base/archive/jackson-modul
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 86c2807f4c1f..170f8428d7f6 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/gforth/Manifest b/dev-lang/gforth/Manifest
index 4a76021084ee..7e00a4a192ee 100644
--- a/dev-lang/gforth/Manifest
+++ b/dev-lang/gforth/Manifest
@@ -5,4 +5,4 @@ AUX gforth-0.7.3-rdynamic-auto.patch 634 BLAKE2B c824db023b690ef4e196715589017f2
 AUX gforth-0.7.3-rdynamic.patch 578 BLAKE2B 10e978a2f4edef4d66e839d2f9d047526e54235ed8c6a1a0b754a38149c2a2db2481bee898dfbc209cf8559b6f2cc408b13d594b7007b7710f3c619549321197 SHA512 2bb1491b82b87bcd387822da501078daad171950cf870f8644d909a848a4843e3fa99d8782d16524353edbffb71f704ff7bf5fa7bf326501f7dde2c294b2c8ee
 DIST gforth-0.7.3.tar.gz 2523433 BLAKE2B 1ba9095af7958aabf0d671f982c483f2046392fd9872678a58f314357875d286bee7f0d7bc38e9b21331acda80fd285c0489fed44d59c148ff6ec6b6bea7c174 SHA512 f034234acfb0fc727f28b564432219a100b916c6df4b847794a55b2fc3b8ed8714eca6de0df67c7c427b7c2bb4dd00f65cfd34e6eb60181e41ab84fea30304e4
 EBUILD gforth-0.7.3-r2.ebuild 1660 BLAKE2B ef07d315844bd1bf5acb91260dfe7485579083571df92c9e1fc57ec9db71b3c5a56d52e4c1277814d714900add6d1cf9ccb1b8751afaedf19a18cd29c96dbc56 SHA512 c9c72d411ca3ded919d92b7c9351dcaf82cb6f779dd33bd67c95f9848009b742b955a1b71467daf5d13841a5135856d158064867d1f3cbb5f819394dc0defc89
-MISC metadata.xml 243 BLAKE2B 4fda5b7957b10262e59d99d603e6ae53c3f3918800665006ae11c825d1709d41f80b8df4f0ae7d02aa04eef13a88ad0f5a4475d9b00296edf197c11d0558b972 SHA512 1deca6a3ffd886a96cc4ba4a65ac44dad8a713e0f552705ed7be18aff282bdb769367310f66e8d10dec76f40466d6bd72808da00c90c67d488e490d47557221f
+MISC metadata.xml 325 BLAKE2B a8ad6b3abbefe4d64d3a89834078c8a0414ff62eb96e743ad62007474e0b95c4b58f01d236e9780a9585a4493b7bb3c0ef331cc4197b580376dbf746b28eb879 SHA512 5c3bad652b60972773d4eecffb79270b3355c980c5d1a21a072c60f8af7dd54c52316aa4a74a5f8922f35241341e39984379b5f63ffe90796c773e191183d275
diff --git a/dev-lang/gforth/metadata.xml b/dev-lang/gforth/metadata.xml
index 515c2b48cc7e..0550e5bb8e08 100644
--- a/dev-lang/gforth/metadata.xml
+++ b/dev-lang/gforth/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="check">Enable build-time sanity check.</flag>
-	</use>
+  <!-- maintainer-needed -->
+  <use>
+    <flag name="check">Enable build-time sanity check.</flag>
+  </use>
+  <upstream>
+    <remote-id type="savannah">gforth</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-lang/gnuprologjava/Manifest b/dev-lang/gnuprologjava/Manifest
index 18d687e8b6c7..a8b7c0277a16 100644
--- a/dev-lang/gnuprologjava/Manifest
+++ b/dev-lang/gnuprologjava/Manifest
@@ -1,4 +1,4 @@
 AUX gnuprologjava-0.2.6-manual.patch 414 BLAKE2B 6bad70e46f1c2e9bdf9e4ef45cdbc4a4074671de28188aac7b69082e44eed86ef3fc1be1b5e83ea81da52df5d1b218583ab7ae73fdeeeb8241f50e8d45c23713 SHA512 419b509abae773e5ac3f2d79328bb4014776cc7c6390b8afa2d3d7242afec41e92d22830ed1be3c15f3d007c9fa08b303b553d883b18e1bde1fe9af09a0c7644
 DIST gnuprologjava-0.2.6-src.zip 477058 BLAKE2B 00248df0b307b733595b585ed5b847413d5de32c3348008ce53bb4dab93bfc465531bd59ea224f5c0bc6a66c3186ff55d353a0fe88d222b490927100cbafceea SHA512 b175c74e754a7176f5fc38ea2215809bb9d60ec5b8852f99a48a72a0bdb316b33b7195ff5c85398bb63aa2e522d12dfc75e2ff3af9f89ff44448d2f73357f0a4
 EBUILD gnuprologjava-0.2.6-r1.ebuild 870 BLAKE2B f148dec06e873bdeb9da63809b082972fbdcec546958c12ee9d284b56195217f0713d150c5fe49eebcc90f7c983a35937b890fbae6c6c321d01bc6f5c0d953ef SHA512 dab943589df310d16fca5c38e381fdc2926fe5cdad9c5011e7b205c1dd7b590392d6352644c11cddab437a0067f40b67f9956af5998a619ff9374d61e2096ad7
-MISC metadata.xml 237 BLAKE2B d4347f2b84f6246e0bf64c19548b9bf8ad5094bf392fabb2b5add3bdb2af1e866aa34f67d4dad5fd6595daa79233456e962684b4d062bdc7be1f4ee1ef92d3ee SHA512 525172b6046cff15248158e173c764b9294cf0a8220914ef6b46ca4f15fdb79caca8089cb04ac0b1ca56e2496dc84d1f933b2d56e806007883cbc914a1a4eca5
+MISC metadata.xml 331 BLAKE2B 894fdaf1362143a9ec76d1354117ad387146c835993cd67fe0ba486333b93bd57e8395279ea5473844dc0a2cb39fae18b5bc883980136fe8bdfe0e2c123838ba SHA512 92eb687f37e4e8d0537d132021b672aaf7a523ac4ac8732657d9a30513f87e7e4c463b76aaa38b11d757c6c648a0662e10f259607b2dd9faabcd336ae4356eb4
diff --git a/dev-lang/gnuprologjava/metadata.xml b/dev-lang/gnuprologjava/metadata.xml
index 7b573c773244..7339a2f9106e 100644
--- a/dev-lang/gnuprologjava/metadata.xml
+++ b/dev-lang/gnuprologjava/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>prolog@gentoo.org</email>
-	<name>Prolog</name>
-</maintainer>
+  <maintainer type="project">
+    <email>prolog@gentoo.org</email>
+    <name>Prolog</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">gnuprologjava</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 6cdb6e5f091a..501b64ae7a5c 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/clhpp/Manifest b/dev-libs/clhpp/Manifest
index 266f31ea5836..bbb306d84c5e 100644
--- a/dev-libs/clhpp/Manifest
+++ b/dev-libs/clhpp/Manifest
@@ -2,4 +2,4 @@ DIST clhpp-2.0.15.tar.gz 99826 BLAKE2B de5f6cab05d21199ffea37bbbcc5d312a4b812b60
 DIST clhpp-2.0.19.tar.gz 106871 BLAKE2B e8c94f3e242d272a7eedbb13f7ead89cacaffdeca8b837fab29eb023e60efc7eb730b3966702474168071e7c884801fa24f0eedad95f6ea866f27dddb3af4a4e SHA512 f2d37eaee7a46b505844ddf45ae94f5f94241dea0b8f03f6bf4ba7524d7556c9ed19cc2f702cdd9becc469816ffa3d8371ae3561aebff5486cae9b623a10f58b
 EBUILD clhpp-2.0.15.ebuild 582 BLAKE2B 136db303f1a442c414151dda935ef39401f9e25608336af16bf94600777d4b8da2de0686070b7f2cd04b7ff0932e8ab51f1c36d57b601f90a3de8fdfd9b75d44 SHA512 c3d4bfdceb1250ff9ad1b5b7d1539cbc584ccb461de72178dc3eb721c0cd0d807a16f3907b697b5109f7b681eb707081725de72b69637e343a3e63b8bca3bb8a
 EBUILD clhpp-2.0.19.ebuild 1200 BLAKE2B 5e7a50dc98a9c51da8edbeddc10d4cd613fff1634fed87f1c7e364fbcbd554de371c7b240bbf33f1722417e59d6579a5066c5e5c48e511c4fc6d293dbc2c9819 SHA512 23ce6fc6392ee19f12ceb278ff7b3c092c2da94b4ad6ceaecae16e0592e9614230e5225d7b28838eaf22a9d53d4c195a8fdb222bf4d1f1a70da516ac0e8881c2
-MISC metadata.xml 333 BLAKE2B 3cc0969695eaaef765ef2fcf3b7a529324f4e73e80e51c120a18f21f1a3fa4ad41329d61e89a1eea6a1e175f23441d615a341034edc7d924262e1b0b1ccde29d SHA512 8a62b0bd67dcc8bc40ed01b590863e748e56abf19f4a4ea2b44c0747cb017c111246f6e5b30255304ee57dd9446e61e9a193138acdc776d4d615223dc2ccfc0d
+MISC metadata.xml 447 BLAKE2B d5c2cc2fc3bc07611a83a0cd9457b0c84f6639eac864fec190df2c5d078ce719fca55b3af1925867bf6f114858f9e91ab750a041f4a28c729acbc58f743e271f SHA512 fa79dbc0965cfdb94d995476a09dd414743cae0c90bb1038b4126e476133e81cee54130a0a6a10c53a83142f990b38a409834b90688b410dfa5339f90d3072cb
diff --git a/dev-libs/clhpp/metadata.xml b/dev-libs/clhpp/metadata.xml
index db7a35b58748..cab832e30350 100644
--- a/dev-libs/clhpp/metadata.xml
+++ b/dev-libs/clhpp/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-<maintainer type="person">
-	<email>marecki@gentoo.org</email>
-	<name>Marek Szuba</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>marecki@gentoo.org</email>
+    <name>Marek Szuba</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">KhronosGroup/OpenCL-CLHPP</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index 9cd52d0a5195..70da5490db1f 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -1,4 +1,4 @@
 AUX libcdio-2.1.0-ncurses_pkgconfig.patch 923 BLAKE2B 848a76241ca173c452cf7b04142c249ca6c33b7d0514f03353bb7b1f43635d1bec36cf9f3e3ce61ab51d6cb42ab123f620fe6fe1706b71148ec2ab9592c0bc02 SHA512 98c16eebd1cd6bf57e85dd3abafba22a4a1f2f88e0d5f1c9ee98d7409c360c6e3dda43233823de97429a54be66969cec1eb8df4bbb7d0341a54c6a1ae475dd7b
 DIST libcdio-2.1.0.tar.bz2 1759040 BLAKE2B 4859fc545cf81246279b7b0434c02916e874681b40d00f8253fd7837941a34c5a717a81b1c3b1714153ad343e03c28668984f6fd5647662ec4e6759752326cb0 SHA512 c290821da55fd9ae366670a58857aa6efcebc9f25b7caea063cf12f9cbda84fe770c5f59f972227fda50517ca58c5f39c0137daa0f93179e3daa45303d8b610f
 EBUILD libcdio-2.1.0-r1.ebuild 1804 BLAKE2B f573289277702791fcf1d6cf3156820306bd523e087ee98af0b66810a48f04d97559a3befe0fac13f58fb06d0a7e993aa6dab51835dafe2420f31ad0120dbe58 SHA512 ed841a3e8801138e2108ff87de988797de65c4cf0a0f9c1cd5ac74e047bad022ca4bed96d76c8a8f048675c92773c0330a61b801f8a3d581432115b1d94b0acb
-MISC metadata.xml 529 BLAKE2B 904a44230f894763ce7100a7816ec624427963881db42af35739fb3b31c811df8142eed82fd20946bc4fbede978bc3f561fbbcb85fe949f21cbf2e72bf6a1169 SHA512 76dc080e917f5d0bb5238eab5af3d890b6e2023866ddd1aec938f12044347269bff733278a4bdfa7655759baa20056ef565aebbcd4eacf78a772ac40e64386a8
+MISC metadata.xml 607 BLAKE2B f3850b573e21dbfa2c9bb30265db3bb9db41408685f7aa6234b77f2cf73d8e304ebe8b2a4ff3f6bcb67a9291f38138c18f2740ac166a96cb45a94e5c1981a27d SHA512 b07c8e25ac87bb07ce32e4b92704f1c5bb0f52fb06ab77267655449e005b159589eefef1bf7bb2318ef98f83fe34ec2f224c29ce0aec41b665161fc1e5d123e8
diff --git a/dev-libs/libcdio/metadata.xml b/dev-libs/libcdio/metadata.xml
index bc4c2d22d578..af69d3a4320d 100644
--- a/dev-libs/libcdio/metadata.xml
+++ b/dev-libs/libcdio/metadata.xml
@@ -12,4 +12,7 @@
     none of the command-line utilities are built, nor is the CDDA library.
   </flag>
   </use>
+  <upstream>
+    <remote-id type="savannah">libcdio</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 9a5bbacb6348..ae77577e3651 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -3,4 +3,4 @@ DIST libevdev-1.13.0.tar.xz 451328 BLAKE2B 07b15bf46ca3b01d9a93da8d93fd60b2f1eb9
 EBUILD libevdev-1.12.1.ebuild 1124 BLAKE2B b39700425b4711359fb8e0f05f5473420ce3ad87eacd8cbeaf40c605c2c8a5853df8b60f137dbed41db5f9c401b2336835bf78af074676891c97f2461434e563 SHA512 f86f50f39388d35606ead66f16594f2bcf3c4de27649cc956b11f59bb61636b593f44aede81c4cda16b854c9d128874071df69e4afa573e87679c7bd450e9ab9
 EBUILD libevdev-1.13.0.ebuild 1132 BLAKE2B 908d612d293cb14f7e68258fea049c671be7c76a649eb675b533d20ad5d697a55c5d6d3d2978bfa1ee921fe1994dc0b051308fdfcb6833c040cbbd4b7a875cee SHA512 3b400c6ea2bd48837767f2f00698f61b41cdf6857ec47bb46d671c956e188d64a902290d6b8dae1fbcd8db54fda6c45d02f2cb65a082837122557cb3c3f3d9b1
 EBUILD libevdev-9999.ebuild 1119 BLAKE2B dde6bf4c9c7fd7ff688237ec8a793d9d2303a0e78178cb79839ec0332e7a1ad3a3e139ca285b92bf55e7aef054953d58e4c8b360b99adf7af04cf36783019281 SHA512 26c9e626570a80ba6e0ba5b59932830fd4cc7817f0f2dc0f7bd6c8635c71dd1fd9f923623b4bf9d39e3f64d882187fceb4fbe4be46468589c2f85e80b857bf8c
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 339 BLAKE2B 17485a5a6202c366cf975f0c34aeb9521d5190f2ada003bdcae8c3e561740b3b43809b177baa2cab87de46e2f234b48df5bfa6c8df5dc2674f95e6206f0e4398 SHA512 26ff955c224a24cd58bf4eed14d99a0b7cf1b078e0d93bbd115a9193656180f112cb0f27bc6d35b2ff2e062a58775fc4b4310d6ffeee322b39963143f079b3b8
diff --git a/dev-libs/libevdev/metadata.xml b/dev-libs/libevdev/metadata.xml
index e17a5bccb78b..86a8c5281be0 100644
--- a/dev-libs/libevdev/metadata.xml
+++ b/dev-libs/libevdev/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">libevdev/libevdev</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
index a7bff0e68e21..72a5fde72e5f 100644
--- a/dev-libs/libiconv/Manifest
+++ b/dev-libs/libiconv/Manifest
@@ -7,4 +7,4 @@ DIST libiconv-1.17.tar.gz 5413283 BLAKE2B 1d317dd0655c680a2082c38561cdff51ac1a91
 EBUILD libiconv-1.15.ebuild 1661 BLAKE2B 71536b7702adf5254b7018586b1013bdffa69f012ed63debf67d6928436b78e1cb40d423cac2d364632e87e3a24e6910bbc20a99bb29a1e733ccd417e3505df9 SHA512 b6073de175b3f5ebde9fe78b92017190344f8f9c98f76a33b9624be25fa1742ee57d43e5c1a163d5168d8ff27b445966db1deb5456dad201040d6a0b451535e5
 EBUILD libiconv-1.16.ebuild 1509 BLAKE2B 2ed27646d9ade07f36d40d8cc169f79f24916891355168a4872e09a8294811a9136eeca7b2b61357fb7589e6f6ae86f89b0315f7ff0f41196d2f82e0d08ffa7e SHA512 c8aeb2cba82f35c60d4364feda8cfe88da5ffd2d49a183dcc5de5a46a2398d2d8493d3faf1d9274573acbba999abaee121e146fe39593d8973d0fca5a9dfb667
 EBUILD libiconv-1.17.ebuild 1448 BLAKE2B ab9b62762e91b21e7ad3caa3e4405e54c8717ea8f5029e07f2a095e6147977e96b9e59c9912680df4786f75084a0870dc266ebc2ec90d6e3c73b1b7997c74eb7 SHA512 5b28395bbf30c90877cc222bb8ec27cdc14a3a546706a64e9238144aa6ef22c32b027546693deb1cbed0d475c8a962bbf2941db6b6a8d0c7731472cdf2071a19
-MISC metadata.xml 466 BLAKE2B 6393ff7a79bc98751c816e1c753f86224a305e5cf242028d29559ce27f4439f76cae30f735298efb69ad2d1059d636d8c753e21c4f12000c8e024afea9f0df5d SHA512 71547717b83a866737aa75d79a488a6c1ac1003bd44fac367df845a2bca95d986b7e90c0d85e807212f66ef7ca23ccc622c239ff1ebea4e8d331bc013ea97d55
+MISC metadata.xml 557 BLAKE2B 30e8bc0ada9814b38e935d1e9fbaad110e6bccd6843487e6daa050437d642013d7f9d5165aa68f4339c28b6bab3385f49f4ce9d01dfdcfb477ac8f6fc1ccd64a SHA512 51cbd596e7d53f0ac754d86ef8bb038509f38d64b81d2558a6837efee6fa5a047e169934fbe5268f18dc165b99040eebb77eeec84269796b9fe880f7ad4db461
diff --git a/dev-libs/libiconv/metadata.xml b/dev-libs/libiconv/metadata.xml
index 0e76a9f8c44f..09f59a60671f 100644
--- a/dev-libs/libiconv/metadata.xml
+++ b/dev-libs/libiconv/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>prefix@gentoo.org</email>
-	<name>Prefix Project</name>
-</maintainer>
-<longdescription lang="en">
+  <maintainer type="project">
+    <email>prefix@gentoo.org</email>
+    <name>Prefix Project</name>
+  </maintainer>
+  <longdescription lang="en">
 libiconv is a standalone package which implements the iconv() related
 functions as glibc already embed. Libraries and applications needs it
 when built in a non-glibc system.
 </longdescription>
+  <upstream>
+    <remote-id type="savannah">libiconv</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 7bc17b5e94a4..b783f11faaae 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,3 +1,3 @@
 DIST libinput-1.21.0.tar.gz 988650 BLAKE2B 54c63beeff8dee93a52774220b45321d8a94261687b463319fbae9246331b532be7995a5b32c30425b9d0708b2ba69d4b4e83e8dc7ecebe6fb1237b723a266b6 SHA512 510273d68f2d4cfa61564a706b1f334f6bfca0d1c8faf0bb8aa656cf3fbd5e38d79d6fbaa01a20d38bc15777c9afc341e4ed08d35ef367ef3803ce788cbc4a0e
 EBUILD libinput-1.21.0-r1.ebuild 2289 BLAKE2B c89e242476aef8f5eda9db495a361a9118dfa385d42cc620cbef880436f61b773e9962effe4443a0915342a196c497721da5b1b5651e969299ad225024d5898d SHA512 8dc50c92765e5877c1d1d0bff8fe002f190b835b02d8f90d6d18c14a4a1602197e7f5854ab284f47c198c1c73e83f05c85bae56b105bb29026560141429275a4
-MISC metadata.xml 341 BLAKE2B e1cb7769e8f3063d1245baab1d245aba45bdb7a999b7e5aa14d8fd5c1c22b536c06ec9ef05fd7d80cbe6ffba5e1098e92ec8e171ca4ed60738f5133756f56298 SHA512 67fccf3af813aff702fb1e0daef3cb76e394f706741ac823beff0148b2da9f922a5ca5747dc44df28c08ec7dd255a09c7b48735fc0f42ed4adcf82cdc623e396
+MISC metadata.xml 459 BLAKE2B cfe953562cf380cbfb152378fecb5a927c2b54ec26c53cca6aadc8835ec9e0c07620ac3cda810683c236ec3ec2b867ceb0efdb169d8fbbb1fe51616a7bd1ff69 SHA512 603f3e481424fc4bb631b7207682cb36144a15db143bae8df3b8fea4a10ac1863e03ff9e8106f3638f0aa41487adad7dbd7c2e74e01a7231254829b7f0b699d4
diff --git a/dev-libs/libinput/metadata.xml b/dev-libs/libinput/metadata.xml
index 5d5a1389f157..33243afbabf3 100644
--- a/dev-libs/libinput/metadata.xml
+++ b/dev-libs/libinput/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">libinput/libinput</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index 275129e8cf99..7e995f1a9c60 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -6,5 +6,5 @@ DIST libksba-1.6.2.tar.bz2 667846 BLAKE2B 93abe745fe951ead0d1c05a1006e8ec20ab68f
 DIST libksba-1.6.2.tar.bz2.sig 119 BLAKE2B 5ce2bd1065996ecb2a6e687eaf96ce52ba807f5ae487612c43a8da8da78a91985f37257396f1d179a4a38a8d1efb8cae8c7a57f5f1b4eb92c33d70559e3c2186 SHA512 e84f653ee64a6769145df3e4b8e36f9c19983771d63c14e1a27a7f27b8cbed00af44f46db69a47ab9b282c405c21a9445569630b7b7f7ee7cb91b4d836524fc4
 EBUILD libksba-1.6.0-r1.ebuild 1129 BLAKE2B 02bc3e3ca7d5ff452f0adabbde65371df3eee9ad17fa8972b7440637dcfcc1caf9830b1b70645fd6bc95c49de6a9dd0f8d0f90009bf169af9f4e64bc2e1d06fb SHA512 211797f35a8f267e511fafc946fab54a4aaf8bcd52c6df6ea1d46c6c7f58d952adb92f175f940c49dd2b58443ce985b196256e2e39a247f94334aae54967c1df
 EBUILD libksba-1.6.1.ebuild 1337 BLAKE2B a04dabece502895887e9593bd75adab5351036018922feca1819ccad22435bfd575178d43f21eda1ce00f98c48301156c3dfa2bd63356a5cf75825a0b789134f SHA512 89f5cabc2341a8bc2de8a60d3f4f11e2bd8d2dca34ee8291d45e763ad98839b451b956383b86dac5d6b42d0b3681d1f0c1fa3d2e2547621cb1494f2e559c2028
-EBUILD libksba-1.6.2.ebuild 1624 BLAKE2B 5b2c3463ceb046ecaa1e442f58136f96f0faee0bd6c19b2e9cbf483db6f7b195a5d75c1bbd7b4b412b7dff5dce2cd12b7434f8ff52a31697c0207f2604eb548c SHA512 0d6eeb5f65506a87c42f23e44a6ee000aa312b2f93ddd475ee669c29c0a187b2a6288cf4a61ae879742d49fca451102e99b8fbc97f659f24194225c9867087d8
+EBUILD libksba-1.6.2.ebuild 1623 BLAKE2B 1dbd7a84eedf553cefa52d8111fa43f5509380c4b205792a1dabfe858100e881f522ce9b4bd358992a89341e490b868d123d0f63adb834298c5a68dbca8481ba SHA512 12af95770b634da20c46b3070cf07080632782d88edbc9e44fccde45b6d8472315e1fed49f715ad4b7dcf8b8f51237ed213c9b732c1e3789e4f4e813b61d34bd
 MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
diff --git a/dev-libs/libksba/libksba-1.6.2.ebuild b/dev-libs/libksba/libksba-1.6.2.ebuild
index da8db458d8cf..92984d1ad4c2 100644
--- a/dev-libs/libksba/libksba-1.6.2.ebuild
+++ b/dev-libs/libksba/libksba-1.6.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="LGPL-3+ GPL-2+ GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libpthread-stubs/Manifest b/dev-libs/libpthread-stubs/Manifest
index 8f6f08b4213c..0e8e02b0baa0 100644
--- a/dev-libs/libpthread-stubs/Manifest
+++ b/dev-libs/libpthread-stubs/Manifest
@@ -1,3 +1,3 @@
 DIST libpthread-stubs-0.4.tar.bz2 57565 BLAKE2B 0c59ba509aa24ce0d255790363d78d670be0bae5fd9556798f276466ecaf70c4d93064b531dd9870da8f934da6660fba71a7f0b402bb6ba5420fd6ee5ca546df SHA512 0fec563f3833b84311b32cb13a4fd9832aeb0204c65b1541bf453d5d35693b2267c3cee656e00a4b8533b07a8f6320ca5c3672dcf8ab047cdac8628154c08954
 EBUILD libpthread-stubs-0.4-r1.ebuild 820 BLAKE2B ef6c6220e61b83233ef808f460ca37f6c1729cd19b5100653a2ecd704c217dc9704cc06a7247bbf45d7dc80a9bc5d90b088ac578f932cc61c6ac857118f39679 SHA512 8ed1cc22a46222c858883ea627989e398488ee54c313aa14b4a8ec4caeaa458956cac3c406598319d59d2cd31e734bdeacbc9e5140d2dbcbf5080f5d021cdd44
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 344 BLAKE2B 61a2b63e7c3a20da59dc96307404a597cee8323050a68c00ef76c58c44f264eca2d0f85a6ce207b28834a99fadbbd3f40795c16394f01231f6678f0c8ef80fc4 SHA512 9579ba7722bcda8f2aa1fd22fef12828860b70405c4df60f830aa1a517d31667ea61375c2479f430c00c45c9c6013376ba67c9298ab7cd0ea3ee119c96febc8b
diff --git a/dev-libs/libpthread-stubs/metadata.xml b/dev-libs/libpthread-stubs/metadata.xml
index e17a5bccb78b..0330abcd09df 100644
--- a/dev-libs/libpthread-stubs/metadata.xml
+++ b/dev-libs/libpthread-stubs/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/pthread-stubs</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/libunistring/Manifest b/dev-libs/libunistring/Manifest
index e48957674815..4e67de642f6a 100644
--- a/dev-libs/libunistring/Manifest
+++ b/dev-libs/libunistring/Manifest
@@ -6,4 +6,4 @@ DIST libunistring-1.1.tar.xz 2397676 BLAKE2B 721adc90884006480055b95d0fa06cd8624
 EBUILD libunistring-0.9.10-r1.ebuild 1034 BLAKE2B 12a4f6cdb696d052166e1475a536be7b5e689fdbcca82b8a683c640f5921795777c0bbdfadf0814909cdd5b73b4f790a651b0a8b4b8228710aef6e828a25d678 SHA512 792b02dd7025bfdde692437f558305a4281e77f11622cbe9c707eb7139b98032bf1416754e3a145c1f5d22052143cfe67817f8cafae84e91d27ac3bb5d85545f
 EBUILD libunistring-1.0.ebuild 1015 BLAKE2B 7f2bc1d6fd0d579ecd7ec814ee6b35f5592e6862fda2e1f82e8d4f0048d3c2b6312fc52fda35064ab6e3f2131876fc78304cfdad8fa464feb011755ec8277336 SHA512 e01ec195a1b7c8359b532fb590155d5f03c9a1605c5d9755df637f71dda0a3203bbcc147a87bfc1ff7e0f3d0bdf5f2c79f62a68749d3da3d10cfe985b7103a20
 EBUILD libunistring-1.1-r1.ebuild 1055 BLAKE2B 9e1e1e26fda43ef5d393272bcf9c173fe0b3994424257a11c4aba3cc5d1506acb009c1af2c9b57ddcc3185aa0c4c43b9a5a6b84c505443ea3c8566f583b19d39 SHA512 d4cd86e1a4f7aacf59317edcbd68a502bed073514b9d30939b5a52b5151ae074cfc5b24ea9193281a65401b00ba97591ffb5d31a7c5245d3908c78928b3284a7
-MISC metadata.xml 974 BLAKE2B 367ac9d8c34135ea5c1b1a7fafb89254ad3c25deaa183a82f40ab4289c76a311eff909e4d1a2cbb361104706786471f24bfd0f9a1da20e1eb20bec3178c43b5c SHA512 89ea5c6b84a94c713ef72b9c3b921fddb3a87b8d0ea72eb924d379eb7d46974cc9b60e350007752aabf802bcc0fcb5fe6437d11e15d1b74d1efd0a537a474bcf
+MISC metadata.xml 1056 BLAKE2B 17cc1b06c1e58f1ba1de00a6fb7cca12f921bfc855084c7293310b6d846b6e81454451e2e8477ceda4bc8bff38df120e9f12e5b121ace4bc4222d101356582ab SHA512 47a9477e2f9bc530fa79f288d003a679919aba6a32dc18b2025d3406ca5e3ad97d73f96549d0b0cc951b7c0f8ba3a7755907334958cd085c98d876dd3a06567b
diff --git a/dev-libs/libunistring/metadata.xml b/dev-libs/libunistring/metadata.xml
index f757bba21c45..8981d9fb495d 100644
--- a/dev-libs/libunistring/metadata.xml
+++ b/dev-libs/libunistring/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
   <maintainer type="project">
     <email>scheme@gentoo.org</email>
@@ -17,4 +16,7 @@
     This library provides functions for manipulating Unicode strings and for
     manipulating C strings according to the Unicode standard.
   </longdescription>
+  <upstream>
+    <remote-id type="savannah">libunistring</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 1093a2903985..b718dbdb82d9 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -9,5 +9,5 @@ AUX nspr-4.9.5_nspr_config.patch 251 BLAKE2B 65ae8b981e758e2955b7a3358f24b7b17dc
 DIST nspr-4.34.1.tar.gz 1096874 BLAKE2B be12bda63a72d25a60542c5cdadaa7dc59ad2d40d41affc0af5eab07659129ff235a62227a78285e4c00bc72a365b49691658aee7818ffc4c5d014aa0c2b0df7 SHA512 b77226c3fbba6fc9acc90deb8496370dba1384de72ce564524c03bc239846fd17c27d7e1fd7ce99161faafdd8c92413ee58ce1a74a41c786759210bbab478991
 DIST nspr-4.35.tar.gz 1096974 BLAKE2B c80402d7be9e69ab6d1e768a18d271a8d28900f4cae7df2709d1ab26e100d908f508762bb771d4042aa7152934ce83d495e2102e894c56574187be8040d65629 SHA512 502815833116e25f79ddf71d1526484908aa92fbc55f8a892729cb404a4daafcc0470a89854cd080d2d20299fdb7d9662507c5362c7ae661cbacf308ac56ef7f
 EBUILD nspr-4.34.1.ebuild 4860 BLAKE2B 9cc8a8f045aa6f69987d7285927566dcc4578c1a9d16ae52de238462936565459e5f4a5dec655c4fa70dcb95dcdae461464422b10bf54feacaa2676825743520 SHA512 9e3f5aa90aea50e0c3b5e350d841f5c18a1dd41afa5aa80807454f18c339aa3d95b3e717b77fd1747de5c46f0cf118d1f7efe1ea496259d7a053f76e3a19d60c
-EBUILD nspr-4.35.ebuild 4825 BLAKE2B 68f0b9cb6f5c16e95f058dcf15e51cd84efa63b3064b7bc1448f098bdb2cdea9c1d6b878a4fc140f1590a7bb74cc39c02ebb40bf9d156be5f0e14dadf71cf529 SHA512 1f2014764123a7ae05fa31a562566e993f7e1eff343111461245b6712a0f4da6cb33d2a1e41aaf4bd0f69ccd8c625f0f600b3cc22075676147cf886a0fceffdb
+EBUILD nspr-4.35.ebuild 4824 BLAKE2B 68fd8dfae42623328fbe27f0d8cb9cbe6435ca8d58ba4d84317763f35545d49e1f269288124c430da0588784320e5e6791c86719a5fd3032c043ad5fdea1fb15 SHA512 a430ae92d0ec4136a0675cad03574decb545c79a1bd3cb846d6fa7d69ed69824ace830d00010aa99440c5a064c997fec62b2400118ec3e55950e71c11d0f5e37
 MISC metadata.xml 350 BLAKE2B 0f4d7850a3ca725af4e01a47e4db4219d2465b6d4db8c44e12b8f57d2064fd3c6ddbeec16888a316627f96e1f9415777f3fedecbd7065e4d13516bbed473a6f6 SHA512 2cc7f3e6eefcb5ba16c4b2127e751c47ea7a6822eb71080c96c6850ef741acff8d424c520eb60288ca32ccdbe825568d7aced9f57148e304dddd0afb7f4a8883
diff --git a/dev-libs/nspr/nspr-4.35.ebuild b/dev-libs/nspr/nspr-4.35.ebuild
index 5a491d16187d..0ad77dafdeda 100644
--- a/dev-libs/nspr/nspr-4.35.ebuild
+++ b/dev-libs/nspr/nspr-4.35.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index 80bef5a61530..52fcb57e2c9e 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -3,4 +3,4 @@ DIST wayland-protocols-1.27.tar.xz 82604 BLAKE2B ae1c19dffcf255c88e6d646f321ec19
 EBUILD wayland-protocols-1.26.ebuild 755 BLAKE2B 3fc5c050521210e255e4f84757d8db55799f8f1f24a29cb80212e7961f73c16e043a64f76dfa3185aa56ed20a3e0759247f87cc41ff9f1adde61b147a276d2f4 SHA512 9ba008e0875dbcc8b3c597eb49073bce8afc3d94c0bf6837a684ef692e202b85eeb162640229199965922625763107080e4bf76388fc31b30d3eac2c758e08b6
 EBUILD wayland-protocols-1.27.ebuild 793 BLAKE2B 3988e887ac66b0b91eab437d03c0ef24ba50d88d96241bd9e8d746c67a71ab49a65f63bf36be45b8f94d49e92d122cf9dbc7eb941b630ddc4afbf4ac8e3081de SHA512 c4c856228ccdb277168dae9d53a24928ce6515a20e7a4a7849b895125393bef4f0c188843fe992d08e70a8d7f27ea5a3a9d6d6150e78a4ea07f22a3f5a68dda3
 EBUILD wayland-protocols-9999.ebuild 793 BLAKE2B 3988e887ac66b0b91eab437d03c0ef24ba50d88d96241bd9e8d746c67a71ab49a65f63bf36be45b8f94d49e92d122cf9dbc7eb941b630ddc4afbf4ac8e3081de SHA512 c4c856228ccdb277168dae9d53a24928ce6515a20e7a4a7849b895125393bef4f0c188843fe992d08e70a8d7f27ea5a3a9d6d6150e78a4ea07f22a3f5a68dda3
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 347 BLAKE2B e4265a94e0261094355613ac8617c362f90dc7207188658bf37d7d3d0ea87f598d0a5367d44c95cd3688cd68aeaad6be95ca1707430d06ad8b34bfaed9395f29 SHA512 4db809b42f57946d21f5c0ece2ccba39684da283ddfb72ed2bd6c1ace305c18381904dafa2abce56950cfb2bd1ead0839124c59302b1bb71c0fd8fc8f4a52846
diff --git a/dev-libs/wayland-protocols/metadata.xml b/dev-libs/wayland-protocols/metadata.xml
index e17a5bccb78b..a6216ff614d7 100644
--- a/dev-libs/wayland-protocols/metadata.xml
+++ b/dev-libs/wayland-protocols/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">wayland/wayland-protocols</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index 7e4030b8f135..17ad0ab88e71 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,4 +1,4 @@
 DIST wayland-1.21.0.tar.xz 225936 BLAKE2B 2b43eb1517d476bb2b4daed1083373655b57d047968fdb93dbbbbe4235af12e25557627e30b5c3d2575bac4beaf1e0a0b8ef10a3c673538d9097501f33c05836 SHA512 5575216d30fdf5c63caa6bcad071e15f2a4f3acb12df776806073f65db37a50b5b5b3cc7957c5497636f4ac01893e2eaab26e453ded44b287acde01762f5fdc3
 EBUILD wayland-1.21.0.ebuild 1478 BLAKE2B 0884da89055eb938e9dd782c9ad0e50358205e4752ed4600f8f216f08081f34252c9f1122edffd1123be6f3693d0fe4ddbfd3ad4d2a908e2410ba911d18e44ad SHA512 f6a4e29a0bd5c0bf567a378dd3a715ba3b1f37731777766591467707b426fa845c33e5726e69028093cd5debb300368a73d41190bcbc2e5132479ba0d1397fe4
 EBUILD wayland-9999.ebuild 1485 BLAKE2B 8e82cc08d4efab01be9e60daa08f568c9c2760cd5247f66ac2aac0886ec0dcb3b9d5cc262ed7612e08c77f97c08371b454a35f2af693eb6a8cc88a19c23575d0 SHA512 fbb427c35c1e5df874e99391438babcca5c943b548dfc8c4380e694979833045a94be367d920d696c9e5b332171351e2ff298214e7e82c0c4bbc42a669ca9f12
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 337 BLAKE2B af249efc25c3eadde73d0b49cba0e6c8a021fb4b7c9a0b96f27a4e71185c76f8ac7ff0b9efdfeadf2df324cfa578db3a73fc7bee8c249cba35d41e2145017e16 SHA512 771b226f8e16d8c570bc2ea89ee3c5176e1d0f2209afb3b2af5a9d19fbdc2037a411b84d546bea054449c8074fb0fb3c3726fb2692d084521c64cda60600c0b8
diff --git a/dev-libs/wayland/metadata.xml b/dev-libs/wayland/metadata.xml
index e17a5bccb78b..8cceb6f871ee 100644
--- a/dev-libs/wayland/metadata.xml
+++ b/dev-libs/wayland/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">wayland/wayland</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index e6f9074e1480..3617aafb1e96 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/git-review/Manifest b/dev-python/git-review/Manifest
index c54112623854..5eb082a29231 100644
--- a/dev-python/git-review/Manifest
+++ b/dev-python/git-review/Manifest
@@ -1,4 +1,4 @@
 DIST git-review-2.3.1.tar.gz 66400 BLAKE2B 67b2bf60e91a127144995231b94a48eaa03cfe8cb8e27513183f21b4cae1fbe2eeaa00a23d21da2dd7258aa794ce4cb0ee06e91510d707116699da1702bbebac SHA512 b3fe0ab40c473c80da20c42b4104e82115c9ea02bda01580aedb69622e117d733160eb42027432eec12379250186ea7b6f9eb4cb86b128a591816243a0c0fadc
-EBUILD git-review-2.3.1.ebuild 782 BLAKE2B ff9255a07fcdcc81c3f17f4f9067ae19d7e717e1dd3fafb087e96066ca621350142027eda30cace90561a6d63dcdf9a09c4a5643cb71b30598f20c28675c72ab SHA512 d6314d81c5fe52d91684c2c313cf2969ad57001f6ad5f00d001d12fbbf70a8144bf9de9869579c150f558c1c359a4ee727a05c1628a9186374bb2d0445c29c7b
-EBUILD git-review-9999.ebuild 784 BLAKE2B c2d971221d2bb7a6d07c4d961505d2cf7cc03785ee94eacb7496fad6fd999ee2fa21971e302a0a25de533a9153d36f92405bfe575dabead70afff8afa11e9ca4 SHA512 7267baf2963f6338b961241af52af728af0b8c2d8430c99e139f8f7e1f20800380781abb90cf9cb3fbe44f2e43955321953bdad5d14ec0cd28799e9b63eee875
+EBUILD git-review-2.3.1-r1.ebuild 862 BLAKE2B e1c9328e5e94517b2a2b149ebd7507d7333183e3456d1c7299a6d94ccd907b7517e8617faaf454a21fecbbcad571a97eafc3d2264ede307d58e8c6e37627a140 SHA512 6a45020b69fb5669989ea902ef6a21f260b616d37a31e42f103087dcb44dbe5d44e15a8a0bccc26d51a6182483257ec952740a1128d8e561c76dd49c2d7bb96e
+EBUILD git-review-9999.ebuild 864 BLAKE2B 47eb0e743ae441bc6bfbd830518e1a2f89816e7623f9cf62ec86b7643dee04e6392e6f3d35246192edbcf5b06bde4fd29605cf669dee9cfba5f2d8f2441c3fd8 SHA512 e025c85dfe38a9a7edf2f5f96a0b65f7502080773456f1eba754bc9aab16933767b73a2d7592365c0a759a83b95dc6a226c9f3e19c0641468b6d51d1d2532fc2
 MISC metadata.xml 338 BLAKE2B b891e2436716d179293d3a1844dc671cb2c4270887260921b04fa3674d999805d4845337b73d3e45a34b2105b900209c7630f85962ea59fa8b472946981b4b6d SHA512 b8e512c07502ddba83bd5012ca036fb364ecf433408e70f036290b4209f0f06bf085de7a7519f47f46f1e68df9e9c97349cc55454b48ccf9dbf57dddc1ec28fd
diff --git a/dev-python/git-review/git-review-2.3.1.ebuild b/dev-python/git-review/git-review-2.3.1-r1.ebuild
index 52acf643695f..2e2e15a3f440 100644
--- a/dev-python/git-review/git-review-2.3.1.ebuild
+++ b/dev-python/git-review/git-review-2.3.1-r1.ebuild
@@ -32,3 +32,9 @@ python_prepare_all() {
 	sed -i -e '/manpages/,+1d' setup.cfg || die
 	distutils-r1_python_prepare_all
 }
+
+python_install_all() {
+	doman git-review.1
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/git-review/git-review-9999.ebuild b/dev-python/git-review/git-review-9999.ebuild
index 16e5454edee8..ee331b500152 100644
--- a/dev-python/git-review/git-review-9999.ebuild
+++ b/dev-python/git-review/git-review-9999.ebuild
@@ -32,3 +32,9 @@ python_prepare_all() {
 	sed -i -e '/manpages/,+1d' setup.cfg || die
 	distutils-r1_python_prepare_all
 }
+
+python_install_all() {
+	doman git-review.1
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-libevdev/Manifest b/dev-python/python-libevdev/Manifest
index bf4d34d7fc43..1d1be8ab2d15 100644
--- a/dev-python/python-libevdev/Manifest
+++ b/dev-python/python-libevdev/Manifest
@@ -1,3 +1,3 @@
 DIST python-libevdev-0.11.tar.bz2 32406 BLAKE2B 0291a9008590a2900961d9e790c2946b67bc045a5b0df43f9f40d9c8838b332e1a839c21411ee88eddc92e9c59a038bc7ce8dd365bab71075fdd0a8c629c3a34 SHA512 6fb6181fc97cb1a7a087d298a933891cf05d0160d033c6d6300bcb6a904064b727a15e8e75665ee2933d0e8a0aeab2638f01bbd8d9f803f508157fd0e5ca41fc
 EBUILD python-libevdev-0.11.ebuild 742 BLAKE2B 61cb6e90e020a8d167e6a63a43b5f822bd87941d12ef0ef4704aac590c6799b1596881b0204eaabe0e0073a617867b03734e8dfded8e52c3d36ee39ff2aed879 SHA512 a10c1e5aa27ebb8506c0ceeb612ec19f8876880ef95221a2676c51eca7ad39eb32398a64e5a1ed2fd090e356fed2cf45172e1fdb03e16deb7b2eaec09da2788b
-MISC metadata.xml 431 BLAKE2B ec6c61b87336524c898e27258485e09a41cb406113bdd78291111b8988268cab3fcf459395bbb5e15b35e7889ea70c2177afe28b9015fb4baf60218b87aafef8 SHA512 4dece3b0b4fe8309ad780adc408dbf282c29e7f08ff5839dfb1f3e4d1a3edf3be7a1e0ad3943b42dae4eecebef92614e9c12faa962c2d5331518fd1925d05b49
+MISC metadata.xml 526 BLAKE2B a0b2eece31817326e798aa0cda3cef3343c4c4d1710b1fb98a222cb6f6fd47073126e8119a692301c9ec6d3ad2863082b9a2e15cc39bc2e976078e2f29d6ea26 SHA512 e64c0f5cf601dd3ae1f2f8c5cef3775c7c756756ea0f18561911dfc361cbac1d1a949dbed22a704d5eca7bf5ca60318e97f6c3576f03f3c45648f4abbff6e48e
diff --git a/dev-python/python-libevdev/metadata.xml b/dev-python/python-libevdev/metadata.xml
index 74bbd50a95f9..d243c4c9307f 100644
--- a/dev-python/python-libevdev/metadata.xml
+++ b/dev-python/python-libevdev/metadata.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">libevdev</remote-id>
-	</upstream>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <stabilize-allarches/>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">libevdev/python-libevdev</remote-id>
+    <remote-id type="pypi">libevdev</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index e059e9f3e1d7..4966e6ce6db0 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/guile-lib/Manifest b/dev-scheme/guile-lib/Manifest
index 5f774265a8e6..2a94bab11c76 100644
--- a/dev-scheme/guile-lib/Manifest
+++ b/dev-scheme/guile-lib/Manifest
@@ -1,3 +1,3 @@
 DIST guile-lib-0.2.7.tar.gz 451202 BLAKE2B d8420a718697611443a40af089aad6e1d48390e5bef764f84955beeec8d6346066547d73c30898b96e727d4f470df6a032438067240bba8b25058bc65b85d9fa SHA512 d27d1398f81172e4488c5ac5c2d076baeeeaa12fa19d83a87faf0767c255b79f8eb24438950da3865e797299be90f7dc1dcc964076d53df9cab5925a61ad0d1f
 EBUILD guile-lib-0.2.7.ebuild 700 BLAKE2B cb6516946c1661b411a9d06007f716db055b7ec0a109e622a7ba5b1d0c5ef8460311d99192cbee351f885ec46652c862c10e1e5cbd682c8636523c9a38bb50d8 SHA512 b7b0e196ba7956b0b99f00bc7285d67203d3c273fbfc1e7039cbf54d4f1b19606b7eaa5c2c45b9665af516337aa7a37cd69103d7537979d7d7e7447daf1da9aa
-MISC metadata.xml 549 BLAKE2B 89c7b27010442ad8a785a1131687ef08e003f57a746f979cb0a7830ea514a1526ece108970f9d9d7737192a7d28622f179eeb7a3d1e683b50cdb64450e6d542c SHA512 a1d05f58fa0b97ccd796a85084aeeb7ab494f74f8f5a0e90b55ffe37eeecfa496d8ff5a20361152ed5b108c43c86e16e1a2e1f4d6ec7ef2009b813319ddcd7d7
+MISC metadata.xml 635 BLAKE2B f0f88e15dc93a28612644bc4de79e5fd8e50493a8fe82103d945c336c2f3a78bfad3fc176b1929b868809e3b7c79161db3e909b2224f93d4459bf044091bd65e SHA512 e839b41b146fc0a2ecf03559e886c15daeca4518ff887175877690456d82b1971d30bbf6dcc1dc33df8e7393f9f79b4b58391764070d7ad50018fa26a6cdda3b
diff --git a/dev-scheme/guile-lib/metadata.xml b/dev-scheme/guile-lib/metadata.xml
index af704cda2400..1baf3419e74b 100644
--- a/dev-scheme/guile-lib/metadata.xml
+++ b/dev-scheme/guile-lib/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
   <maintainer type="project">
     <email>scheme@gentoo.org</email>
@@ -12,4 +11,7 @@
     modules into a coherent library. Think "a down-scaled, limited-scope CPAN
     for Guile".
   </longdescription>
+  <upstream>
+    <remote-id type="savannah-nongnu">guile-lib</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-scheme/guile-ncurses/Manifest b/dev-scheme/guile-ncurses/Manifest
index 2f704c14ce15..de50d5625bee 100644
--- a/dev-scheme/guile-ncurses/Manifest
+++ b/dev-scheme/guile-ncurses/Manifest
@@ -1,4 +1,4 @@
 AUX guile-ncurses-3.0-slibtool.patch 1593 BLAKE2B ffabe52966b527e6d27da9a7d5518d48db875b5cf1dbbb1c435d990ced5011c41a2d81e9c0a8dc1dc7e2cb042643989777262e9c856c02aaaa8887494859b4c1 SHA512 9c7b1419c21525c6abc91d5b9c9b00ad3ae64a97fd6f1f1bc05dd80f77603706f702def71af5f0bbc85cd5eb4beed4c35b14cadbb289c726d14aedb4e2bda897
 DIST guile-ncurses-3.0.tar.gz 910030 BLAKE2B e7bfa1e7c7ff8fd4e8b653a5bcada99f8f047142322e4abb946cd42b27bd1d2014f904b5a73d5356ad95bec1c394d0b76ad06204a7d117ab4c2e9a3181633fa2 SHA512 6f36ec57b1835dc90f6691243e3b627e067522c78ea620fc109bf270016034842a933c2d9e09c1a3998a740ae17cb1b7ae291d3e4c578c54128eae4c88a450ac
 EBUILD guile-ncurses-3.0-r3.ebuild 1522 BLAKE2B 880d6941a01babcb35ce3f2294eb4696fb85f196968d089a4e8792b14f0c41fb2927c2791aebe1cf487445054c22a3815e1461dd0f49775ee08a7e51c514448f SHA512 d252196876f0e432c8e83effcc291a89bb8c2c3db6addd28598e06583cb418afdaefb32b80bbde2fe0c8489107799d0f98ff8db8bd24a7e4f428803a1ffccf8e
-MISC metadata.xml 547 BLAKE2B 6607b13dbae6f4aa4364cb8227c49bc96ab5bccd739af9c8c6731974132be80f9ef891c642c58cb0591678fdca5902df765f35a56df33faefd9833e695d950cf SHA512 a1fed1ceed50336ecdca1b6f8e17ea85bf81808fc2230215e52e654a3a7c8f10890978f057972f501d72d798b1e75b114fac4c6f53621120c205fdea1bf39057
+MISC metadata.xml 630 BLAKE2B b0867d55ccfe84db33d8dc2675a4a8928d253f1e616d0a8d3836130c466dcc822bd78a432d3ba11257e0c77d3281dbb9e6db41a5a5f34056ce3f086da47d207b SHA512 4471f1852f73f9bc1654c333092e1e230c3395e705cc5cbb5a3a3c1eb3db1ddfa124f4efe020cd1eaef168150a9de6f8c2b35585d7c13de7d4d76717c6c0f4f2
diff --git a/dev-scheme/guile-ncurses/metadata.xml b/dev-scheme/guile-ncurses/metadata.xml
index 8619d62c721c..4b46b92b4643 100644
--- a/dev-scheme/guile-ncurses/metadata.xml
+++ b/dev-scheme/guile-ncurses/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
   <maintainer type="project">
     <email>scheme@gentoo.org</email>
@@ -12,4 +11,7 @@
     interface functionality is built on the ncurses libraries: curses, form,
     panel, and menu.
   </longdescription>
+  <upstream>
+    <remote-id type="savannah">guile-ncurses</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-scheme/guile-reader/Manifest b/dev-scheme/guile-reader/Manifest
index 8842880a0b66..5ad63996874f 100644
--- a/dev-scheme/guile-reader/Manifest
+++ b/dev-scheme/guile-reader/Manifest
@@ -1,3 +1,3 @@
 DIST guile-reader-0.6.3.tar.gz 691612 BLAKE2B 504152d3a194705435efa4e2d2b51fd1bc22a998161b09ef0157c13bf46ef593be0101d6b72e197818a8ba18406db0de518423a168d36f54616dfcd4e807f3b9 SHA512 0f9f47ee5f24ebb79894863ac96d63b0c7d2801020a212c59d11c7685ff4006a646be988a696a9b623dc0e0605f46d4a9a8680bfabd299878e41eab92e75efd5
 EBUILD guile-reader-0.6.3-r2.ebuild 764 BLAKE2B 2294e8e060d91fecc9e72666c6fdc23b0427f7212924f45d38da28ba90b9cb5c691eb80ffc3b20372291dc2a893ba7da552b4bd8b10784f6addc7dd32329ea95 SHA512 83e660e00c4fd7940d53d06a4d8cb30dc7a3c64351d28a3da1eb08ceac7c98ad9c0040195f28d4ff893b7bf1d19afb87470f8c5098e622eb27c7de35db53cb67
-MISC metadata.xml 885 BLAKE2B 25f338ee36a7e294668db31c6f676b1137d8538a24fe22738b9afbe6417992fa1045166e255047b625b96f060094fa597d875c88d91ad6e7ccc8fd207e01d111 SHA512 fbe036926ce498cf2d3626962e5e178d9251fd708416ccd2e5873de9713185dfb68ea6b45a92d7d8687b95e729e07c64c328cb5926dafc0b35db7db24adaaa6d
+MISC metadata.xml 974 BLAKE2B 1ae5959d148b9110d539b6399d77b5c54d873423ea79e33533353133c2d4c4adccc63213ad22c15ea0d4bbee47e82f8f5ac507757f6de903f2b6305dab42c46b SHA512 eb374317ab6b7b81f34241f454ece70defe34c319c1266b7eaf03502f96f77b4200cf1762a035c26f67d86bea43db633c6375528c49d7260c3114ff469709c44
diff --git a/dev-scheme/guile-reader/metadata.xml b/dev-scheme/guile-reader/metadata.xml
index c3ad052549f5..118c6ab5a22f 100644
--- a/dev-scheme/guile-reader/metadata.xml
+++ b/dev-scheme/guile-reader/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
   <maintainer type="project">
     <email>scheme@gentoo.org</email>
@@ -17,4 +16,7 @@
     hopefully more powerful and flexible (for instance, one may instantiate as
     many readers as needed).
   </longdescription>
+  <upstream>
+    <remote-id type="savannah-nongnu">guile-reader</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index acbbd962d3bd..4fd6d71d545c 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -16,15 +16,10 @@ AUX guile-2.2.3-gentoo-sandbox.patch 361 BLAKE2B 997d4cec108f302f34b42c59c78d420
 AUX guile-2.2.7-stack-up.patch 568 BLAKE2B 11f19c9e657b9b23c033e0edac9d06fcaa2f56f69230d526fc42eed6050022395599855015539c32ed83b6e3f5c8a94744ff6ef50b3c9284818d0d8f725f18b6 SHA512 f312e4e5d8d3781efb6fe65f4ec94431d8b19a7ac3e3e9e461748c60643088237e570314e74b5253418a01b129586465ed43107463d8de182e362393f75073bd
 DIST guile-1.8.8.tar.gz 3956654 BLAKE2B 4820d635ac2c57526c0c03f3e0e6e4ac4276533ea8db15e6d1b759c33edec094a1a4bdc3e09ccae61f1b271d63565063746feea242a90c18cd575775444a42ef SHA512 ede6feb90cd419d8763feb8c5169275490a653919573c4dfced025b74cf591072b3a10ffb9a3f6ee3fe7b0a0956ffcf434e0859b421455c8349cea56bf427db0
 DIST guile-2.0.14.tar.xz 4615196 BLAKE2B 97e26635c941309b713b632371bc9df7361d3d7d524af3d2c67275f3151dc9c51bd774155bd3c1caf6950d4e839afe8b019f553b5a7223c447bb19c8a97d608c SHA512 2cad60ab8aa77be44bc4988eaa3a2f0652637f315322abd6011c18f1800c3a461eefa15a14fd54d0d48031b093bc56dfc6cd15dc0a8260b97b40521bff793db6
-DIST guile-2.2.6.tar.xz 10875692 BLAKE2B b5602e74ee62886bea5b9dc2606cefdac6de254cf1da6ae79d6d6f651a8cf5b27422bf66883a5ac44337130dad0bd8e250e82b83907a440c122d42085a34fc23 SHA512 68c31e47786838f4f1dda63bfa99428a0092383f1045e836b742ccd8021fbdd83ef910ba35858c2855b3d748f228d356536496742feba5b00e07fdcc0c5a5628
 DIST guile-2.2.7.tar.xz 10881984 BLAKE2B e2b1fe7cb010371beaaf32f8f173397c90fd291ed7d5835b9d976f37fd133254841b4179bd1e1cd02e604c7befcab6c25f85d20ba0850f96978f7c32ca1fe6d8 SHA512 6f60b3489e26f5ff32b55c89316cdcdbf3ec1f4344726006e445f24098c922c50becdc748f1b66d2b271dc002e409ee6210bf85da779cee1f68c9111b3b5c543
-DIST guile-3.0.7-gnulib-glibc-2.34.patch.bz2 60359 BLAKE2B b21adb981d4242c62b3038f14cf2048fdd5fd1aa00aae937cab6e9b6dfa1331adff1291484bb7f39ddf8e93159fd0c424dc6e4d83fce0083daa6eb661b651cfe SHA512 be2985b41cd567a549ba96dedda2a24355be40a5aad408a7f0593b6e6c02c9719ead27463a786736501ed26c01c65f9a403160b2bd1660d60d6fd4932c92f095
-DIST guile-3.0.7.tar.xz 13208808 BLAKE2B 074ecf118a9638351464a57e7124ffad6acbeffada25191f5f9ffeabb956a3fe5c1e877fcbbbab601fbfc908a6a87692ba332f558f46dd9bbbe29c84e8455ffe SHA512 b89a3856009794c009ae3529b6a73dae565173e9c839272668f0985029d353178ac009507062a2737ad7d95f5715f3af2a6aee098ff94a7c6cd747cc6782a062
 DIST guile-3.0.8.tar.xz 6200072 BLAKE2B 6ab6bfd18889d0d263e5e06ff1284ec025437e53541eb8e9632bd345fda34e394b2228661e9319e8a4e87fd8c675605184b290d875c5c1bbc20bf8c4d32a92b7 SHA512 5d1d93e3e22c524ea3c2fe28cf3c343ab8ba99bf5c7b8750c4ebcaf556ae21485fb99e5ccc50c4b07037cdc678552557753d67ef2c93d8c1b62603e1809418f6
 EBUILD guile-1.8.8-r4.ebuild 3108 BLAKE2B 6cdae9c84f0696c792b2c8a13856853e700ffc5d4ebf123d2ea50d8a03a42d8ee671da91c21e652da878dd404a95a7b6e0904622717369696724f1afc1029375 SHA512 42a2b19d45dd284877b4f88f487eaaf45997c6df9d0a007d2832215b9d25a34ffda9f51c3ad72d2d8df10cd6085179845ef18e04712e32ecb098d3153fc9525b
 EBUILD guile-2.0.14-r4.ebuild 2369 BLAKE2B c4ff72e68e661d60acb144445bcd7eb5a1d6bf44be42134e1d882e72d47ec91e521f6b9a711256a22f1aa725220d7c7fbbe8bd1eec143894b2ece4769526e733 SHA512 ccf99867f719607702e5d24bffc1c21af1ddfca0c3d662e8ed3f97f31c13392cde84fa882efb81c3ede24533059e40e0acba81f322a96a330a814e08c4ebbe02
-EBUILD guile-2.2.6.ebuild 2256 BLAKE2B cc76cd57484e689fe9f2fddf5672698b5d11794b974ae8cfcf963f5f5c2341bccf92ad3aded25d5127bb7b46232eb5f94d5358ce98aaad3ed62c3689d5511fe3 SHA512 45515f0a378ed521302b5f1565f769d253ca82890e38da70d5fc8e5f95edc0836024265db00a46b723dd5e054d7dadd2fb5a87c3153afbd598c42ab34fbbd6fe
 EBUILD guile-2.2.7-r1.ebuild 2153 BLAKE2B c89758d4351f7259ec7d711de043741687ef6f7ebe32e64676d2d259226816daa941d23b438eb4e43b2cf02472b67a1514e08f81385f128a82281c8dab64a6b0 SHA512 9d076d43e33ef88c28855e86e6a170fb32ed177252f402602dbc3a97f28276bb4c378ffd0e4db59f3b480edde7dfbf5cf1d92dd8e69cf6245c4a392305f09a77
-EBUILD guile-3.0.7-r1.ebuild 2353 BLAKE2B 1fc8f5aba2b9fefc9be56ace97ef6999d2925ed1b3bd0a3a77eeb9062a0a7793fbac123ab0ec5f71bc7ff052920c0d45c1e8376fc4f6db42722312f6e9406e50 SHA512 cb863c4d5f58e4f091cda7fdbdf162cee9d9df0a42af2147ef91162b6f70a69313a25eaad1a1656fc3035b3b93f0f14dff1bd890a368892136c5bfb107076e45
 EBUILD guile-3.0.8.ebuild 2109 BLAKE2B fb5bed8658610a7abbcffa6325a0e97b8575521719b9b70cee031fea89abf49e60cb19e99734dc6d2460ff72c0d8cd6177f58b976bec740df02388d5c0161dbe SHA512 5ded209512cd8c7624e04a08bd5d6c134080395449e52ba4bbf057f5298e17efbb8d91802f5b0ba3677cfa2c15a4554c8d2fbbe66555ce90e6e34de3e00e4e09
-MISC metadata.xml 1041 BLAKE2B d01e2b55f3618fa4056f46d0a3cd2e2c5e006374a8c9fbc28adca37f4b4e5978e65c968762e5675e0f98ba2ce686e09f2997481c1365eb0787e979d9bfd012fb SHA512 ace5d0cea917c980c1958c174b869692d7a407132be9e9b223ac970ef3d9323c76a23e009e45990583993de0bb3c423243931cfeb9de7c3383d6b4b5efda4b3a
+MISC metadata.xml 1137 BLAKE2B a7804962f0827541dd7e1d10d962700f32734d5dd4f04688c1f07838109ecf68f68d3601f86786a893c6c68c1f8d5144e254d4c82fcad53f6edc12bba9f6cc51 SHA512 5bb0ed15c972f967899c24e290550fb10bb830222dce3890413d9978870d0f00942ebfec738372418958ee99048017ebd25e8fc4c6d175027eef1448bc12384a
diff --git a/dev-scheme/guile/guile-2.2.6.ebuild b/dev-scheme/guile/guile-2.2.6.ebuild
deleted file mode 100644
index 492e1bc0873d..000000000000
--- a/dev-scheme/guile/guile-2.2.6.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MAJOR="2.2"
-DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
-HOMEPAGE="https://www.gnu.org/software/guile/"
-SRC_URI="mirror://gnu/guile/${P}.tar.xz"
-
-LICENSE="LGPL-3+"
-SLOT="12/2.2-1" # libguile-2.2.so.1 => 2.2-1
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
-REQUIRED_USE="regex" # workaround for bug 596322
-RESTRICT="strip"
-
-RDEPEND="
-	>=dev-libs/boehm-gc-7.0:=[threads?]
-	dev-libs/gmp:=
-	dev-libs/libffi:=
-	dev-libs/libltdl:=
-	dev-libs/libunistring:0=
-	sys-libs/ncurses:0=
-	sys-libs/readline:0="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	sys-devel/libtool
-	sys-devel/gettext"
-
-PATCHES=( "${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch" )
-
-# guile generates ELF files without use of C or machine code
-# It's a portage's false positive. bug #677600
-QA_PREBUILT='*[.]go'
-
-DOCS=( GUILE-VERSION HACKING README )
-
-src_prepare() {
-	# Remove tests that require network
-	local bad_test
-	for bad_test in test-suite/tests/web-*.test ; do
-		echo "#t" > "${bad_test}" || die
-	done
-
-	default
-}
-
-src_configure() {
-	# see bug #676468
-	mv prebuilt/32-bit-big-endian{,.broken} || die
-
-	econf \
-		--disable-error-on-warning \
-		--disable-rpath \
-		--disable-static \
-		--enable-posix \
-		--without-libgmp-prefix \
-		--without-libiconv-prefix \
-		--without-libintl-prefix \
-		--without-libltdl-prefix \
-		--without-libreadline-prefix \
-		--without-libunistring-prefix \
-		$(use_enable debug guile-debug) \
-		$(use_enable debug-malloc) \
-		$(use_enable deprecated) \
-		$(use_enable networking) \
-		$(use_enable nls) \
-		$(use_enable regex) \
-		$(use_with threads)
-}
-
-src_install() {
-	default
-
-	# From Novell
-	#	https://bugzilla.novell.com/show_bug.cgi?id=874028#c0
-	dodir /usr/share/gdb/auto-load/$(get_libdir)
-	mv "${ED}"/usr/$(get_libdir)/libguile-*-gdb.scm "${ED}"/usr/share/gdb/auto-load/$(get_libdir) || die
-
-	# necessary for registering slib, see bug 206896
-	keepdir /usr/share/guile/site
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-scheme/guile/guile-3.0.7-r1.ebuild b/dev-scheme/guile/guile-3.0.7-r1.ebuild
deleted file mode 100644
index d2e5f9f431f3..000000000000
--- a/dev-scheme/guile/guile-3.0.7-r1.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 autotools
-
-MAJOR="3.0"
-DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
-HOMEPAGE="https://www.gnu.org/software/guile/"
-SRC_URI="mirror://gnu/guile/${P}.tar.xz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-gnulib-glibc-2.34.patch.bz2"
-
-LICENSE="LGPL-3+"
-SLOT="12/3.0-1" # libguile-2.2.so.1 => 2.2-1
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug debug-malloc +deprecated +jit +networking +nls +regex +threads" # upstream recommended +networking +nls
-REQUIRED_USE="regex" # workaround for bug 596322
-RESTRICT="strip"
-
-RDEPEND="
-	>=dev-libs/boehm-gc-7.0:=[threads?]
-	dev-libs/gmp:=
-	dev-libs/libffi:=
-	dev-libs/libunistring:0=
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	virtual/libcrypt:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	sys-devel/libtool
-	sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch"
-	"${WORKDIR}/${P}-gnulib-glibc-2.34.patch"
-)
-
-# guile generates ELF files without use of C or machine code
-# It's a portage's false positive. bug #677600
-QA_PREBUILT='*[.]go'
-
-DOCS=( GUILE-VERSION HACKING README )
-
-src_prepare() {
-	default
-
-	# Needed for the glibc-2.34 gnulib patch, can drop later
-	eautoreconf
-}
-
-src_configure() {
-	# see bug #676468
-	mv prebuilt/32-bit-big-endian{,.broken} || die
-
-	econf \
-		--disable-error-on-warning \
-		--disable-rpath \
-		--disable-static \
-		--enable-posix \
-		--without-libgmp-prefix \
-		--without-libiconv-prefix \
-		--without-libintl-prefix \
-		--without-libreadline-prefix \
-		--without-libunistring-prefix \
-		$(use_enable debug guile-debug) \
-		$(use_enable debug-malloc) \
-		$(use_enable deprecated) \
-		$(use_enable jit) \
-		$(use_enable networking) \
-		$(use_enable nls) \
-		$(use_enable regex) \
-		$(use_with threads)
-}
-
-src_install() {
-	default
-
-	# From Novell
-	# https://bugzilla.novell.com/show_bug.cgi?id=874028#c0
-	dodir /usr/share/gdb/auto-load/$(get_libdir)
-	mv "${ED}"/usr/$(get_libdir)/libguile-*-gdb.scm "${ED}"/usr/share/gdb/auto-load/$(get_libdir) || die
-
-	# necessary for registering slib, see bug 206896
-	keepdir /usr/share/guile/site
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-scheme/guile/metadata.xml b/dev-scheme/guile/metadata.xml
index 907cea272f0c..eb3a100fb5dd 100644
--- a/dev-scheme/guile/metadata.xml
+++ b/dev-scheme/guile/metadata.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>scheme@gentoo.org</email>
-		<name>Gentoo Scheme Project</name>
-	</maintainer>
-	<longdescription lang="en">
+  <maintainer type="project">
+    <email>scheme@gentoo.org</email>
+    <name>Gentoo Scheme Project</name>
+  </maintainer>
+  <longdescription lang="en">
 Guile is a library designed to help programmers create flexible applications. Using Guile in an application allows programmers to write plug-ins, or modules (there are many names, but the concept is essentially the same) and users to use them to have an application fit their needs.
-	</longdescription>
-	<use>
-		<flag name="debug-freelist">Include garbage collector freelist debugging
-	code</flag>
-		<flag name="debug-malloc">Include malloc debugging code</flag>
-		<flag name="deprecated">Enable deprecated features</flag>
-		<flag name="discouraged"> (implied by deprecated) enable merely discouraged
-	features</flag>
-		<flag name="networking">Include networking interfaces</flag>
-		<flag name="regex"> Include regular expression interfaces</flag>
-	</use>
+  </longdescription>
+  <use>
+    <flag name="debug-freelist">Include garbage collector freelist debugging code</flag>
+    <flag name="debug-malloc">Include malloc debugging code</flag>
+    <flag name="deprecated">Enable deprecated features</flag>
+    <flag name="discouraged"> (implied by deprecated) enable merely discouraged features</flag>
+    <flag name="networking">Include networking interfaces</flag>
+    <flag name="regex"> Include regular expression interfaces</flag>
+  </use>
+  <upstream>
+    <remote-id type="savannah">guile</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-scheme/kawa/Manifest b/dev-scheme/kawa/Manifest
index bb59c87e125a..b09a0b8c3f8b 100644
--- a/dev-scheme/kawa/Manifest
+++ b/dev-scheme/kawa/Manifest
@@ -5,4 +5,4 @@ DIST XQTS_1_0_3.zip 30956043 BLAKE2B 30d8980e8076eec3291487e582139f1e6a47e6c819b
 DIST kawa-1.14.tar.gz 2691484 BLAKE2B bd4e2e725cfd51d65ba55d6511f09ab99ea6d9435d95febc16f9486b47b1bf1cdcde601b58266ae20059f6e776d2119bcb017d7061ff571bbaddd5bcbb297b8c SHA512 e0a0eafd4ed0ce7d254f295db8e920b82cfef6f4f71c440db655d73761a2f99ab743def1daa54241998497db8f29269c7d98f7e3bf819a36d7f7151d3ba2913e
 EBUILD kawa-1.14-r2.ebuild 2534 BLAKE2B fa3cc1865cf3dd81cb12fa3c8b779e0b1639d3d4a36b18348c61089fb13eaf523a9cee28027770d6a8314bb60ac1b2de1794a061d8546265cd78ef4f5e06c6d5 SHA512 7bf8197e38e2548d64005be55b3321c7518306dc43bc816b5a5df8057bc7767025b4615d0bb9367c9c7810ebf0873110997819d0fa296f76184d48db0c553f4d
 EBUILD kawa-3.1.1-r2.ebuild 2083 BLAKE2B e60d221bbd3ad4ff76091de0d1f3741cb5a1af42c90d3a519aeeaf1960def524d4ee3c3d2b57e84522b1b69e09c9e46acfe9bf420068a55b7ad043503b36dc5f SHA512 59417528b06f6899a5ecffccddec173fa5fe8024d36b65e3b792cbe7a5c751b1a52b68d1fa2e1ee445dd78ca4de9b06291170289eab235848a19dcba8ddd9b6e
-MISC metadata.xml 1178 BLAKE2B 5a7b5ef1369023679f8227368b53f9a5f18307ff19bd2d34c50e42ec5529c53cc74d462ecdcf0ad117ee0d6f7b2d8651e184e154b3cb40ed9eea91ddd4966e57 SHA512 137a0aa387493f4977a4b5ae7855360a858d0c33417f3b6473cc9354745bff5386c7c15598cafa874021c3027588d66e50c1c50aa2d5c1937b0a14e1875faecf
+MISC metadata.xml 1282 BLAKE2B 3b8367cab14c4f88b83c39f7176ec3d558a03ca180f0399bb82263c45f9085a0b51ab78ed205fbefd2b39d04cb6ed1d19e2740b100f1fa3309ce917048ec41fa SHA512 fd40f62e5453aa75899734ee39cae7668325fbb4d2edb1a38eea704e2be2142d57eb49e5b68b2287e10cd21a27d43257c53b05b9cf18a90ab45b63c9050f1822
diff --git a/dev-scheme/kawa/metadata.xml b/dev-scheme/kawa/metadata.xml
index e615c19cca90..ca065e85243e 100644
--- a/dev-scheme/kawa/metadata.xml
+++ b/dev-scheme/kawa/metadata.xml
@@ -1,27 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>scheme@gentoo.org</email>
-  <name>Gentoo Scheme Project</name>
-</maintainer>
-<longdescription lang="en">
+  <maintainer type="project">
+    <email>scheme@gentoo.org</email>
+    <name>Gentoo Scheme Project</name>
+  </maintainer>
+  <longdescription lang="en">
   Kawa is a full Scheme implementation. It implements almost all of R5RS,
   plus some extensions. By default, symbols are case sensitive. It is
   completely written in Java. Scheme functions and files are automatically
   compiled into Java byte-codes. Kawa does some optimizations, and the
   compiled code runs at reasonable speed.
 </longdescription>
-<use>
-  <flag name="awt">Assume AWT is available</flag>
-  <flag name="frontend">Build "kawa" front-end program using
-    <pkg>sys-libs/readline</pkg></flag> 
-  <flag name="jemacs">Build JEmacs</flag>
-  <flag name="krl">Build BRL emulation and KRL</flag>
-  <flag name="sax">Assume SAX2 is available with <pkg>dev-java/sax</pkg></flag>
-  <flag name="servlets">Build support for generating servlets with
+  <use>
+    <flag name="awt">Assume AWT is available</flag>
+    <flag name="frontend">Build "kawa" front-end program using
+    <pkg>sys-libs/readline</pkg></flag>
+    <flag name="jemacs">Build JEmacs</flag>
+    <flag name="krl">Build BRL emulation and KRL</flag>
+    <flag name="sax">Assume SAX2 is available with <pkg>dev-java/sax</pkg></flag>
+    <flag name="servlets">Build support for generating servlets with
     Java servletapi</flag>
-  <flag name="swing">Assume Swing is available</flag>
-  <flag name="xqtests">Support XQuery Test Suite</flag>
-</use>
+    <flag name="swing">Assume Swing is available</flag>
+    <flag name="xqtests">Support XQuery Test Suite</flag>
+  </use>
+  <upstream>
+    <remote-id type="savannah">kawa</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-scheme/skribilo/Manifest b/dev-scheme/skribilo/Manifest
index e8605103d902..6ec87a2eae6d 100644
--- a/dev-scheme/skribilo/Manifest
+++ b/dev-scheme/skribilo/Manifest
@@ -1,4 +1,4 @@
 AUX 50skribilo-gentoo.el 116 BLAKE2B 1b699d8a6965131650d6d46cd5d2f0280a6cb0c781194adf48b708fd826cc8f94c8d3e1109766e3966e26f161cd12e89f2cc61bd7a3cb0bdbf74051866cfa467 SHA512 f8cb01127dfcdf8f5c88a4c928f2f80db70a40f03166744d3a7989b34a6d4cf92e1815da329f64dccf7ea6fa1d489744a786f04e7f34fbee654bb80294e81356
 DIST skribilo-0.9.5.tar.gz 1520763 BLAKE2B c624174a29cb7eb7236b8de506ade00c58fdd895807bd3e052872b7d950be9106daef6015c34ff8b5e7888b43383cbfa5c29c62835d02121cac19062985c6032 SHA512 22dff4523039792bd3662f9f1302569bfb83d92b7106ae22b8926e264b00932ea50ab753bb83aed499d0aa651d0fe99fdfd28b83956ec3ad84b81078391fe014
 EBUILD skribilo-0.9.5.ebuild 1505 BLAKE2B b6c84dd3e5c5e33b14bf8e7d86222959af418c6a83d5f1c493106db3e9600fe1d0ceb06ab331ee30edb319f1e0ef9a59eca1c30fe30a0da17a045cf73982c019 SHA512 3660956df88e8a50f4c889b11c6f959dd2aca665823f7a71776bb763dea4fed47fa970565793684c9f21a46130da87ac495f1e3c7179e34c71ef4487497b3e12
-MISC metadata.xml 968 BLAKE2B d503b255bcca3c11002b1a09dafb983742b0e9610be1c4361c764fbe3edcd5c85ba60a9157825ce7f8e95bf73066bb8204d45d4fad372c36cadb14d9b237da3f SHA512 254374cdbc550ab09b684670adedc14dbdb29c95741d030959a3b07d830056561be40b4874def164688a2d7d2afa0474eb27ec17348717363e08351ad4660cfa
+MISC metadata.xml 1053 BLAKE2B 452f296854af714d4ad057767f6736532d03e79fdee2c36b6f7bb6e4c0e3dc37d3855455f964ee006f312e641b393964f987db4a102629c220445bd46d7757fa SHA512 234d00b57d14a7c4efb063ae78f590a695f2bb5cdab60cd5020fc4561d87f4f09e40fdc1ecf41527f9a8c491b22fdd62c8969f236b2227a04da7f40448022608
diff --git a/dev-scheme/skribilo/metadata.xml b/dev-scheme/skribilo/metadata.xml
index 24602493b44a..40b5bcb1eb93 100644
--- a/dev-scheme/skribilo/metadata.xml
+++ b/dev-scheme/skribilo/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
   <maintainer type="project">
     <email>scheme@gentoo.org</email>
@@ -18,4 +17,7 @@
     conventions used in emails, Usenet and text.
     Lastly, Skribilo provides Guile Scheme APIs.
   </longdescription>
+  <upstream>
+    <remote-id type="savannah-nongnu">skribilo</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 8c77d3ccdb56..b373e17dd8df 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cflow/Manifest b/dev-util/cflow/Manifest
index 49b67aedb4d2..89e231c504dd 100644
--- a/dev-util/cflow/Manifest
+++ b/dev-util/cflow/Manifest
@@ -1,4 +1,4 @@
 AUX 50cflow-gentoo.el 177 BLAKE2B d43229ed9ebeea653f91ceadd84f641eff4bf1168cf6e94524c228c943ff973e2cf99216bf7be10dc766014d607f9edf1ab74230e963fbe62561c66914665b15 SHA512 1edbe2c330206fdb9ad3844a2278dc71d13a0ce7c46c73030192de3f05634fe08012c04e7c94883b1f6fde21483aba29e16f7a1466719c975e9c60d59507c5e3
 DIST cflow-1.7.tar.xz 727604 BLAKE2B 0d015f66a1cdeb5119d09c6a81231414362bb5a130d744a4532f3eac7de54f05472716afdcf244d413f510f2f955655654192ef467c56588a09a69b064bd43b7 SHA512 e92a559c5a7141b6c94b700b91e5737b22ddd8236771ebef420a71f2d3a979a64339f56163a16b00e11125f5730927dad29f39ab1c154ceefe3ac4d622c82b02
 EBUILD cflow-1.7.ebuild 1066 BLAKE2B f9bace29bdad9b9bd5f1f29dbf1dc625615b416a1f8893957591a33cb3aa5fce4cd847e4d7209a55e0eb6028770c20b8e9097f54ded19588636ecbfcb02f28c8 SHA512 16fa9db42abec33f5c41bd2328db4c61a04188085462b7156ea1b8ba95e219869074959ddfbbd4da5072903a52334a8d0560eb95f2cffbd3230bbd1da7f8ff40
-MISC metadata.xml 537 BLAKE2B 28d8ac6a6b52ec06d826dd74958b941c4255fafd09ba59b1f88f6d820e639576230a4b5894c4bf46f357884e1e81cf3249ea28732d9c869c586f6ba412f82ca8 SHA512 8afc2cb05d0ad512ec8f4a8de9b160a68448eb4c6fbdbc05b5e07f11a7658cf0cbe18cc25bcb70de796303ac220c287b99b377a60a9245e2ee66d0b572b8683a
+MISC metadata.xml 616 BLAKE2B 142b797410bdcf4a201932a28b39e1f1428494ced7a561a0fe82993d5631b58dc06414022a197510598fa4f65ce6b01b1f6fe7d0043b7dcbd999ce97aff7c4cd SHA512 d13be0287c24f00b22347ff05c22e4496f9678d864c2b3acbcd6ffc4a142c5417dfe8da845a08503b635d05fec6d4cd54f145e72dd3503b108f9ae89e9bb8ba8
diff --git a/dev-util/cflow/metadata.xml b/dev-util/cflow/metadata.xml
index 6d3bf1bb9bd0..2dbb79475c73 100644
--- a/dev-util/cflow/metadata.xml
+++ b/dev-util/cflow/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		GNU cflow analyzes a collection of C source files and prints a graph,
-		charting control flow within the program.
+  <!-- maintainer-needed -->
+  <longdescription lang="en">
+  GNU cflow analyzes a collection of C source files and prints a graph,
+  charting control flow within the program.
 
-		GNU cflow is able to produce both direct and inverted flowgraphs for C
-		sources. Optionally a cross-reference listing can be generated. Two
-		output formats are implemented: POSIX and GNU (extended).
-	</longdescription>
+  GNU cflow is able to produce both direct and inverted flowgraphs for C
+  sources. Optionally a cross-reference listing can be generated. Two
+  output formats are implemented: POSIX and GNU (extended).
+  </longdescription>
+  <upstream>
+    <remote-id type="savannah">cflow</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-util/complexity/Manifest b/dev-util/complexity/Manifest
index 2d78b960a9b2..f0a884018fc3 100644
--- a/dev-util/complexity/Manifest
+++ b/dev-util/complexity/Manifest
@@ -1,3 +1,3 @@
 DIST complexity-1.10.tar.xz 422012 BLAKE2B 7010647a6de95bed56a724aa890a4d07f4a671ec0190eb9ebdff8d1db0bd1c73916dca17641dc539a5492dd3acf7c666b9c2812b82b980af8b4ebcd951dc15a4 SHA512 3c9a935b55981a420f5f81b055c921fee96f294bf052fa8f7b7299a538b154659161e24bcce549e2a20706273c48870477cb26c4b4120658de985ab653a90bf1
 EBUILD complexity-1.10-r1.ebuild 462 BLAKE2B 67ed0b28cc43ab45978faae39e70a90af4fa30864c0a23fd94f0fd71bfe988de6090931bbaa762ec9b35971bea2a34f08f135b9ea55007d72c49ddd26063c7c2 SHA512 93388ae5794b930a8e22eeb68677ac583a775b009fddfd5dabd2437cb3f1429c8050640eb78f1bf9ee18fb2316edbb818b544c1f08a174aa33c7915bf1aefe55
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 250 BLAKE2B 4d291e2618105acff51e741cad8f182541a11e421b65558d81011d6c385bda779276603b2096cb277963fdd2fc12eb75a625a05fea737f17149122ba564678c1 SHA512 75d7fc51e695f171d0509f5641696364b70787b1c82f4943fc94f25468db2016c0855e04f1c0e5fc9b3f836f43947ca33d9d155b0071683a09a79003a4a3bfb4
diff --git a/dev-util/complexity/metadata.xml b/dev-util/complexity/metadata.xml
index 85e4ed814fa2..051ac79594f2 100644
--- a/dev-util/complexity/metadata.xml
+++ b/dev-util/complexity/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="savannah">complexity</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-util/cppi/Manifest b/dev-util/cppi/Manifest
index 16f83e0aa374..b90850eac6f8 100644
--- a/dev-util/cppi/Manifest
+++ b/dev-util/cppi/Manifest
@@ -1,3 +1,3 @@
 DIST cppi-1.18.tar.xz 515664 BLAKE2B a9f354f4aca8e46f362c733a6fbfc5984bae369d0dde2b9aafbceae2ebb33d0ab2311479820c98c64406533494a1e201e704e763cb8df06e8fd1f11761684a8b SHA512 eec4f67d857680c763802b04c3964ad12505dcffe80f12567a729bea30fdd459f99af0e0f6a8179952bb356b5dd753d862782bb3950fa07e54ffe723565df7de
 EBUILD cppi-1.18.ebuild 451 BLAKE2B eb55ab0f811b84ba31f2b4e7c764f4aa7b257b7619143de93acddc2a1d9751607b1c887dd47ef89388d170363c93ff8c8899ce59d96ae7d573ab72a2322bb5bc SHA512 65e5cd52f4449e0d0d35d0938fa427f34e71ba53a117b46c5bdd453f83dec951f3104c82b007d2058707ba479f610c241b5679afc3bc9d87e37ec1bdb797d175
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 244 BLAKE2B 00a476f125166dae0767a542235e147f407859ceb876af9b2e2ef3ffe070d0d125968c2f67876266b1a631f201a874a09d46cf710496a404723cafed28623cbe SHA512 5a93fc81a24993500fa8059e8833aacfc3f4fe71f5bd263e0e8de9dfcc11e8501d8a353488d3b7935cd099524fee37b67012a713dc30856f0c32d2e191d1cdc3
diff --git a/dev-util/cppi/metadata.xml b/dev-util/cppi/metadata.xml
index 85e4ed814fa2..b6cf9a0d46b2 100644
--- a/dev-util/cppi/metadata.xml
+++ b/dev-util/cppi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="savannah">cppi</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-util/cproto/Manifest b/dev-util/cproto/Manifest
index 532843a05ad6..bb39a3c8277e 100644
--- a/dev-util/cproto/Manifest
+++ b/dev-util/cproto/Manifest
@@ -1,4 +1,7 @@
 DIST cproto-4.7t.tgz 181095 BLAKE2B 60e8fc26acab8a7475d08c413b85bfc68b1fec877845f6302f741665eb3f779faf313d5463ec08f6a41a04737a9c280d3f8d5247bed819a21ea30a3c2d11f197 SHA512 ad5abddeec7e92ec85ac5d19f025a1d3362ed0a082e3a00fbc64545e3ef6e34fbd9cfff36be01276836d1d834c481927d12f747b0904dbc644d43f2e879bd82f
 DIST cproto-4.7t.tgz.asc 729 BLAKE2B 9b668a41374d273263d535fb4dba5038a72f3ee3d0f44a2bc5f6fa85a426f1c2209dea4655639b772f6d5d036af1131dec476c1e2e9dbb808a18a734ff538ede SHA512 d3874a04159a092322097c254a2a855db55409eaa7d529eaee973a4763bf71c525f8b40e9d5fbdf5028108713a8e891f45b26e31bd5c879d3d4e5249c8dcae3f
+DIST cproto-4.7u.tgz 183364 BLAKE2B 679cb2c41b396e363ebcf69c61c8b00448ddd27c4d1126b8d3eda1f1b429a7be42359d1b695b94dd1095b707d70a1b425930acc7d2998634159836e4a51ef953 SHA512 6ed7e98319cf2b8d701dcd0ccdbe29537e3b57725da527da1b3889edd696374728ae87cdda34c68314c3e3f80f10e5f99199771200ffb429091c91d378c672e9
+DIST cproto-4.7u.tgz.asc 729 BLAKE2B 4120151f5ffcaf42c1134e8998cd767aab58c4f09bf488186829d96bdc44266273e89b96e1bcad3b84d998ca3d82c4b1bc7d9213f11790853d9fd2f4d0a7c901 SHA512 bdaa60edf0a04e15f2de61398d118efced4c25849d8d2a326e2ad21cd296b73cb6a809933476fcbe7b4471b297368c8090b31e725a9ab3081e334a06c2282753
 EBUILD cproto-4.7t-r1.ebuild 676 BLAKE2B f95778bdb6886633ad6da30650bb804484f54794f20b27717a4c6f69b93b32b5eac1a78f0f0ec27c1155faa6c3725cc15d198d47d421ecab39e0890a4ffa7612 SHA512 03e19ae46769f46aad33932a456ec8871d61e7a16d5ff3bfb773a3ae211d46f2660dc1f94695a691a0144a02dc77a716256628a2e10f285803a24e6498725e68
+EBUILD cproto-4.7u.ebuild 679 BLAKE2B 9978fd7c2671d07abb5747a97ddefbace95406a8edeb02e617b220bcad1a489f9c799a4bd631689dcdc41987d9ba68bfde6e3119b4ba10be546284f825e29179 SHA512 57aec32ca93df33a864280d4705cd9a2b8425bebbb31030e12d94eb4d1579d506ed8a6b06e16b7faa8862ed3c46a74c5f7439f56a81964f0b402c5fe2d803846
 MISC metadata.xml 336 BLAKE2B 45d3b05d925b08b4b9ba679e197b059295c82cfe43bdae1e99739c0f6887c0639845a78d889327f736aaec542fcab50c415f8711b64db58affee810088eefb0b SHA512 7284fa1ca3610bbbf0ac1ed50a23c1b09155ce124eb8d70dce99bac08bafc56f2396aa06e085ffc559ddc0153e94d1e9e6c7c6e5e01a2ee8d392ef1af0a279e6
diff --git a/dev-util/cproto/cproto-4.7u.ebuild b/dev-util/cproto/cproto-4.7u.ebuild
new file mode 100644
index 000000000000..ef6c3626dba2
--- /dev/null
+++ b/dev-util/cproto/cproto-4.7u.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+inherit verify-sig
+
+DESCRIPTION="Generate C function prototypes from C source code"
+HOMEPAGE="https://invisible-island.net/cproto/"
+SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="
+	sys-devel/flex
+	virtual/yacc
+"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
diff --git a/dev-util/ddd/Manifest b/dev-util/ddd/Manifest
index 0daeaae24fd0..cadee12fbd56 100644
--- a/dev-util/ddd/Manifest
+++ b/dev-util/ddd/Manifest
@@ -7,4 +7,4 @@ AUX ddd-3.3.12-parallel.patch 621 BLAKE2B 57446f5c7e797d7ddab5ed6aca01a5ffdc6af3
 AUX ddd-3.3.12-tinfo.patch 330 BLAKE2B f0e29f408f1e5e7fa40e386ab2a1f6786a9a14dc6722aef3fc8132558b624c233102b4290c0ba0e5d55b27aa4b25e6bcdd6fcd1b4ae237540621f3961e92bffc SHA512 a3cd3d59bdcce6c106d4488ec9a6c32d8baea49963f61e8e493a01131fd604664dca2e9e548852ff4c538c7123f5c1572bc54d6143340167fcdfa754002eb224
 DIST ddd-3.3.12.tar.gz 5687115 BLAKE2B 52c448eda46bfdc4f5720abda569a0c70f3680c3fdd543f6101c9af8c4c448496414c1c2a7be91590d9f14d0c8c2bb053a234d179bf900ca52df0ea8c2642131 SHA512 1249e4f5f25335f8f2c3616470f7a8f36262c00b8ac12b79f2b2806228de2831ebeb780fe09490e5e8b5b1ca108fe936ae70856f6a6ec02876fc75c7b4a7dbf3
 EBUILD ddd-3.3.12-r5.ebuild 1956 BLAKE2B 8159630e366975aa5613c09486f10a74dbfb1f68a5fc3601db7b74d0d2b0c3378402d7916097bb5137ec2fbfe14d48b75489947e95a15f9be367789623b1c9bc SHA512 c2bd040baf2376edd1c683e0813da4a333eafb5bcaa65ba2014ae3113ef30710f977c79e675da88669b1ecef8de4abb53423aa87712f1b83f89382872033c576
-MISC metadata.xml 659 BLAKE2B d7b9bfc310cab0177035545cfb4be317669aa1b2a0f94d1ce34d7cba4d95f64d019e124a39502ebdb49df34fc9e85c932e9a01356225ba04e22d4b2205b4dec9 SHA512 7fbd41623ef746be66044ea8d2780adbfb119df925fc008bb3328637f8a467c7c168e4f3af7c93264fa7f3a1ee6a62899506d2c83b74a725a87cb73d01e6578f
+MISC metadata.xml 741 BLAKE2B ce0a1aa5ccf21951fcc5fd69d9dfd6cce8eef7e82d6cf5314a92bce28f7604faf7f5162efe9074aec305b183dd0f98b9c69dc9c42fc2b2318857e9c21cbb235a SHA512 38030c88852f9e1b98db8272fdcce9dae23a7eae0f8e9bba4de8f0246fe90e2c47b4fbac1cbea9acd6d20fb4b387da87d23ccac46496a38060040b33476afb0d
diff --git a/dev-util/ddd/metadata.xml b/dev-util/ddd/metadata.xml
index f61742707898..0831f299a2df 100644
--- a/dev-util/ddd/metadata.xml
+++ b/dev-util/ddd/metadata.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>reavertm@gentoo.org</email>
-		<name>Maciej Mrozowski</name>
-	</maintainer>
-	<longdescription lang="en">
-		GNU DDD is a graphical front-end for command-line debuggers such as
-		GDB, DBX, WDB, Ladebug, JDB, XDB, the Perl debugger, the bash debugger,
-		or the Python debugger. Besides ``usual'' front-end features such as
-		viewing source texts, DDD has become famous through its interactive
-		graphical data display, where data structures are displayed as graphs.
-	</longdescription>
+  <maintainer type="person">
+    <email>reavertm@gentoo.org</email>
+    <name>Maciej Mrozowski</name>
+  </maintainer>
+  <longdescription lang="en">
+  GNU DDD is a graphical front-end for command-line debuggers such as
+  GDB, DBX, WDB, Ladebug, JDB, XDB, the Perl debugger, the bash debugger,
+  or the Python debugger. Besides ``usual'' front-end features such as
+  viewing source texts, DDD has become famous through its interactive
+  graphical data display, where data structures are displayed as graphs.
+  </longdescription>
+  <upstream>
+    <remote-id type="savannah">ddd</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-util/dejagnu/Manifest b/dev-util/dejagnu/Manifest
index 3e98748d5344..e81ab851663b 100644
--- a/dev-util/dejagnu/Manifest
+++ b/dev-util/dejagnu/Manifest
@@ -2,4 +2,4 @@ DIST dejagnu-1.6.2.tar.gz 525879 BLAKE2B 1a4cf8bea350d7fca8983fe9f5f77756746e9ef
 DIST dejagnu-1.6.3.tar.gz 622059 BLAKE2B d22d66a233c2643c98f45d260585790b4c1293de2bc84470e7942e0364e0cb15f55888a3b6ab13e82823f4e03198159c93e1904571a5df3fcd6f2da568078726 SHA512 1a737132bd912cb527e7f2fcbe70ffff8ccc8604a0ffdecff87ba2a16aeeefd800f5792aeffdbe79be6daa35cedb1c60e41002ca4aabb5370a460028191b76c4
 EBUILD dejagnu-1.6.2.ebuild 520 BLAKE2B 5d35364056aa60b443fef9785257ed648c3493e599c680cfc210e95153cf12282764d97e391d3e115bd5ecffea9f4c618baf90a1847eb2488be94ba8d69d61ef SHA512 d0d23efa9a108005965090718a4102c47c07c6186200d642cbafce55d0982a9e2f5bb1842aa383bf18a5d52a4ee34e87adaaa96a4e37daae061f1df25dd020cb
 EBUILD dejagnu-1.6.3.ebuild 586 BLAKE2B c7d802d3e1beb9c58c537a94750cb158058e9598985245cad7619f2bc45687f1976b41ddf4ee765dae0f3a3974cc9b5c4c0165604fab61a2c45363ef8812975e SHA512 18ade392af0889737cf07e45874a8696baf12e62c973efc72b4552907627564f511703a4bb82d3b2853b8e873859a1c55d3cfe989408a10f307e2fd6919f9432
-MISC metadata.xml 258 BLAKE2B f45bf60ab247635720461e6f8028b41d748c2c0fecea4d5b6eb29a9f532de573e8054773a084b99b2a6a040e980cfc41c8839b13bdeb8ebe6e1de12a1492873b SHA512 2cd16eedd80ae476d1611112f620d3d5eee88fd181fe635d9f9235ac312e24bf8eac5b44f54ff55806ee7a03aaf1d1382a734f7b3496814853d238b9a7b6ee1e
+MISC metadata.xml 346 BLAKE2B bcd7b010b14ca00937b7241ff66ef048fc645e1724c33e18d12c3a91d6a117889535fdeba947d2c7071ee5b75b85c3354955014ed8b943685df39a3376fa764e SHA512 cc7e8b6ebd769fdf5fabe1009b7ab1fbd5884e6df686121df1e6fc58d1ebea51e3c15b1be7d6f455ddf3142a2e6ac57780d26a34b4421259df5745689ebbe1a8
diff --git a/dev-util/dejagnu/metadata.xml b/dev-util/dejagnu/metadata.xml
index 5a1e1dee65db..0bc23c3fa166 100644
--- a/dev-util/dejagnu/metadata.xml
+++ b/dev-util/dejagnu/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>toolchain@gentoo.org</email>
-	<name>Gentoo Toolchain Project</name>
-</maintainer>
+  <maintainer type="project">
+    <email>toolchain@gentoo.org</email>
+    <name>Gentoo Toolchain Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">dejagnu</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-util/gengetopt/Manifest b/dev-util/gengetopt/Manifest
index 74b50dfe0c3f..ea7351945d8f 100644
--- a/dev-util/gengetopt/Manifest
+++ b/dev-util/gengetopt/Manifest
@@ -1,4 +1,4 @@
 AUX gengetopt-2.22.6-docdirs.patch 364 BLAKE2B 06919d379a6f0e13271d89dda845dcc920a7581ff380d52318ec11f658327c73c1102326108080b9129610fe89b80aec39c01e0923c1449ae2d00123f4e8609d SHA512 f2bb3ba6e63c32deeda6d0408621a480b0902d2e93a3ceecbe3e79f72c79f3269bbd2e2fd3cd6bcb248bd81d0105dcd8520d44d523c53ce58843bc38a9cb21f6
 DIST gengetopt-2.23.tar.xz 584860 BLAKE2B efd94e28d35319f3a04af4f97b87fd8a07bef93856da0dcfad54ab4800d43510f7948bbb7440f39abfe242aede5657abd874bf4ab4dd311336e10f37e7960cb5 SHA512 3749191d35acbeff6680f2a4d0516706a0491053f632aaa44ead7c3a42e56f9870bd7c4a85a1886f2052e17d86a2853e2f65d445e0c9920e41f1dc354f003712
 EBUILD gengetopt-2.23.ebuild 701 BLAKE2B 9608ab7b10b92dc8e86ac743d13c71a5505d23eaa1e312c6b547e4edb61689d4fffabf810ace5ab54f95bf274c4c1a92d8c492d1a80394b2fdf2b8b25629c278 SHA512 888dc59f7d8ed62722c7956ec2b5f678b4ecc35a656be15ba0d9e0fa43294406b7b82a0491680d1e936507f87ae2e5e9c208531e36bcfee34867314c09637685
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 249 BLAKE2B 0d3d228dea2987e4570c226d0884d525dabf87d6e6ccd0fc77f80bf15167cc549b1370525b66f16424725e3e28b000bbee903a91ab6924169fce6187414c759a SHA512 607b41efa842d0b95452f5e549c3a651f301bd5e8e61445f144e948f6c74626759df6f45dc8065bf86d8adaa71dfb79b1c61e84a92532633a2a4eeaeac234f3b
diff --git a/dev-util/gengetopt/metadata.xml b/dev-util/gengetopt/metadata.xml
index 85e4ed814fa2..d0a2d7e07043 100644
--- a/dev-util/gengetopt/metadata.xml
+++ b/dev-util/gengetopt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="savannah">gengetopt</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-util/global/Manifest b/dev-util/global/Manifest
index 5f5b24faf79f..8ae426388021 100644
--- a/dev-util/global/Manifest
+++ b/dev-util/global/Manifest
@@ -4,4 +4,4 @@ AUX global-6.6.4-Fix-build-with-Clang-16.patch 765 BLAKE2B f12caf24c4c1ee74ee70b
 AUX global-6.6.4-fno-common.patch 946 BLAKE2B 8063d13db0942c0face6fde1411b96f352d706a85a4cf9f4b5c1eac43f6855e4c914166df2da8d01521a73f2d05b20df65aa25f6a3b965379346d2b523c8ca88 SHA512 f2579cbe22a4c97be0e7ccbf945b9d509bf22cdfa064e6e9fb6182204edf6085e97166ef3f771fe65942505259aa9b42b6c164c644ae95bba8d1e11f1319e0f4
 DIST global-6.6.4.tar.gz 2988969 BLAKE2B 784087537094d27c10d1f2bc992e799c35ab6ce3b86e041c31279e6954b203e80676b3158ba95e7957456b75a213d70998aae9047836cd4d388212236f05a081 SHA512 cb4ed451d3aaf47c4c59cdc3f74c97d3171108177d4846b5dac843589710e66d87c9d7bbe080c3770329e8e40105ac52dcafb4609257347593cca4d94711f483
 EBUILD global-6.6.4.ebuild 1754 BLAKE2B 6d8418ee6ff003ed998a6322fc9d279878c41b64b319f51746230520d4a2ca1c7bb447752b78f2c292c3e663d238fe9590ce14e1ae24dfb720b8c05708f772be SHA512 d4f5df9ca59748b7fe5cdbd73611153c5ab41f0dd4c1badaad751cc6e3df74c12297a6dea427a7db20e23653d2d4aff24b85a4198fd2380e5ca3685c210aadf6
-MISC metadata.xml 440 BLAKE2B 30e5dcd91d136b7289fb2c27342e7cf137c4ea0051fc9daa2caca7aac73088aeeacd2cff4f808f1bbb299de2d0011ff10b9f861f70efb1b8e1fdc78c6613615e SHA512 5cfed438b49ef4e50cbf21a26b8c8e3dc0c4c3cf4c275eaf20a0165e3c9277b694fb0b0b180287fea75fb7da8e35a446ce22cecae69a277a21099770032800e4
+MISC metadata.xml 531 BLAKE2B e924bbdcadc141f5887406f1d454e4ec6c0eca649b5b4bce6bf0c014c636ae10c2a1a95c85c1e772a4172ff678405c545971c5326342dcc57e602184482e65d3 SHA512 121675702866a2c22cdf2d8677aba864bf86f9ac403ab0e95034af8c7dfda981d06316853f1fec8dc0e3600ecb8d07edddd698bd39fba9fac05d3ccdc18e06e4
diff --git a/dev-util/global/metadata.xml b/dev-util/global/metadata.xml
index e3128e7a4dbe..578ce6e83983 100644
--- a/dev-util/global/metadata.xml
+++ b/dev-util/global/metadata.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>naota@gentoo.org</email>
-		<name>Naohiro Aota</name>
-	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>arfrever.fta@gmail.com</email>
-	</maintainer>
-	<use>
-		<flag name="vim">Integrate the GNU GLOBAL source code tag system with Vim</flag>
-	</use>
+  <maintainer type="person">
+    <email>naota@gentoo.org</email>
+    <name>Naohiro Aota</name>
+  </maintainer>
+  <maintainer type="person" proxied="yes">
+    <email>arfrever.fta@gmail.com</email>
+  </maintainer>
+  <use>
+    <flag name="vim">Integrate the GNU GLOBAL source code tag system with Vim</flag>
+  </use>
+  <upstream>
+    <remote-id type="savannah">global</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-util/gperf/Manifest b/dev-util/gperf/Manifest
index 491080c1f41a..5a6cb80133ee 100644
--- a/dev-util/gperf/Manifest
+++ b/dev-util/gperf/Manifest
@@ -2,4 +2,4 @@ AUX gperf-3.1-strncmp-decl-mismatch.patch 819 BLAKE2B 627af81f91b5fdfd1bd3978ade
 DIST gperf-3.1.tar.gz 1215925 BLAKE2B bc4c54ade3f7dce484714d77cb5759dcc02b7a607d7b1aff6bdbcd06ee4c83e9449038a7217d5f25bcbef058ba56e1fce9383b9599de005154e5a9b566ac9c69 SHA512 855ebce5ff36753238a44f14c95be7afdc3990b085960345ca2caf1a2db884f7db74d406ce9eec2f4a52abb8a063d4ed000a36b317c9a353ef4e25e2cca9a3f4
 EBUILD gperf-3.1-r1.ebuild 667 BLAKE2B 62e7eb9a8f756795ac270165257fddcc227fe7f2760077829839f624f67a1e27661daab3fdbebe21415f99bb3b0deacc0031a102ba018fc086bff0dfca07b2f4 SHA512 7b4329ee7a2e34c2662c947ea63a2b9462a651cc0c90bb544b52d3e81ba271866c0389adf9e46445f0898000f3ee7db0a862b9d6487261bb3d77f50195eab117
 EBUILD gperf-3.1.ebuild 598 BLAKE2B bc597678be8b568a5a249b9c3e49b40ad99beb65d3fe207d08179499cfac69cd41139322fefc4c76e0ccded8fe8e6614d2e09b77395e8502acc512d2811a296e SHA512 0524b8e6cb782ea9c839991192163d55eaff8d1b10bd4b9045dd7311e1ac2acac684a6d92e1be0c0d0b56af1d2c7d30ee5847cc580387b05eb7aa9d79d227463
-MISC metadata.xml 220 BLAKE2B ef647496f8e98824616f4a40ad14fa971c39be34ae8e935bce469869c10e204b07422c5b46ea9f5c8e61b30ba1b05a3f1c177427a049615618635cf453364898 SHA512 7353c5b784c0cf1cfeb280d9042e72c932bdd1ded3eb75bad6fcca2bb7cd1b0660ead9e11d6a2c7644a1602d0c443b96fdf0ca4a73d16a8ed497c5c772610c9c
+MISC metadata.xml 300 BLAKE2B 08411b1e2990305e2459a483ee439bd127e2f6e556b621ca68376c3b22373123e5382d5445321451c502237046c5b7c806af389c3115729e0c96c6df3ae45d05 SHA512 094bde403ea70f64268a627bc5d9342f8e86d727c7c10b74214a1aa65d23baef8fc189a4771a4c838ee098b979af8e27614fc2480ce258394276df5b5f18d13b
diff --git a/dev-util/gperf/metadata.xml b/dev-util/gperf/metadata.xml
index d69e5f6f2869..8ec7a6f18641 100644
--- a/dev-util/gperf/metadata.xml
+++ b/dev-util/gperf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>blueness@gentoo.org</email>
-	</maintainer>
+  <maintainer type="person">
+    <email>blueness@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">gperf</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-util/indent/Manifest b/dev-util/indent/Manifest
index 209351699a9d..4331d60918a9 100644
--- a/dev-util/indent/Manifest
+++ b/dev-util/indent/Manifest
@@ -1,3 +1,3 @@
 DIST indent-2.2.12.tar.xz 620280 BLAKE2B c3414ebe58d75b74356b5c37234639dc34998b73e45a4c28ee20ab2932c523b528d577c45c32db88f2ee4aed58d1dceeda2fe68b8975d211dc0dad4a3a20f7c7 SHA512 dbe73bd3729074825f9f5b4241a4c539ad32069df56511963417caf0351ff9ec5edd77e9580338301c8abf89ab9c0592bc7e82c14eec7450c496259d7e9045dd
 EBUILD indent-2.2.12.ebuild 1126 BLAKE2B dfe77919602bc72aa0aa2feaf1b552a3ddab9d1a1aa88f29c078e9d5091f19c1d50b7eb49c56f9f180a57d27067268f7ae1625bee599aea7f0067360dbcb927e SHA512 3121181c8ce7abc44af596bee07d560990bb5c22dc0398ce50bba0a477c7dec817e9a0ee0a8adccf256b4a9914ecde4df09c6a5146266bf34148e9d27dd879ff
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 246 BLAKE2B ac877f4d9efd245589942e444e49aa217b48ba48af50fdc8d5893ca70fd04fc840c96eeb8e61d93bef5322fea198269813f0d674d481552ec3ec08a042016fc5 SHA512 2a28c9351bdec8b63ad5df5151c2afc18fc5c4afa9f41525a49bd20cd477974f15796b01f7727d2a2723907b8af233c351a5fbaacc2f9e9a89c71119cf34f287
diff --git a/dev-util/indent/metadata.xml b/dev-util/indent/metadata.xml
index 85e4ed814fa2..76627a6353fb 100644
--- a/dev-util/indent/metadata.xml
+++ b/dev-util/indent/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="savannah">indent</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-util/poke/Manifest b/dev-util/poke/Manifest
index 1b95eec3e08b..66e7112a2d38 100644
--- a/dev-util/poke/Manifest
+++ b/dev-util/poke/Manifest
@@ -2,4 +2,4 @@ DIST poke-2.3.tar.gz 7369945 BLAKE2B fe9274099a9ddacf1f46b7cec1f98cc6c442b24f149
 DIST poke-2.4.tar.gz 7372092 BLAKE2B 64b8b22713bb581c30b624200c0a283a8de548895db2c21d83babbb18a93f3a8975dd7af752bd7ea856242f90035add249fbb62462ac632bec351598bcca0fe5 SHA512 6fa1097a5cbbd4171b6a390934c5648b4c382b8b8c8dd4955bba82cb57107f67e23b39f2df2081904a02f457e6c5b2d10baed710da3ed4b9b9eab3f4127e12bc
 EBUILD poke-2.3.ebuild 919 BLAKE2B d5edcf4aca522c508b2f3b3116983dda26824b50d9390e498e37c3d67f43e9f5f62391501c0dd9b77769ed649d2e177e243f32067948751a8168b7dcf93ddeec SHA512 8c7a9c529e2f32b51c7cb79e2748abbd805420254f8f398a8cc7b35136b2a5a71a44ac40e04f869e97e58286815b6037bdcc94e51184625ee7773e895e515a14
 EBUILD poke-2.4.ebuild 1107 BLAKE2B 70438e44aeccfc598d118c53a522e1dc5c2d77be82d10b2463ac2088601da86b39a676e1e6a9001a7331f22d846ae54c0dbd3cd83102c32c50dede0bfe203c04 SHA512 d0475717a9d091d9eb47032fb7fd5dfe7f9382e31bc14f67b13d85f29dc102b85493ca31d00ebe704ca65a898da9b4b17f6f45cb977b54bf3bee76ab74779d41
-MISC metadata.xml 581 BLAKE2B ec95051ac0d19a1c062e58c36cbeb3e09661cfc00a11854c3795a5ca7b587ac01230ecef242576b49d69f1e2c7e400590541aad517c790a13cd028d3b594a76b SHA512 8b6d7acaf17c56d40d71851cc36485f00e4154d072ef430e9f0e0a4d7a15bac0345456a7c7d99db98945f43257d87f662d13be54adcef93f36c79a3891e3efc8
+MISC metadata.xml 674 BLAKE2B 49967bd2b2686b6fbc52e0793b3b6196911b1badbceb1828459e422f0bb5a4e8ad7cc9ab8c10fe87c81040305a9a58ce8f0ddf7d2db4a25861b3605f81bfa775 SHA512 4c7deb851048c0570c840240313d5a094bb6945d23ff8a51d5e7b154913d6527c1735092541bd67e84af13d54bfd2e780b6081fe67255df1766fea64d04e17de
diff --git a/dev-util/poke/metadata.xml b/dev-util/poke/metadata.xml
index 777e0547b116..16899f52a82c 100644
--- a/dev-util/poke/metadata.xml
+++ b/dev-util/poke/metadata.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>arsen@aarsen.me</email>
-		<name>Arsen Arsenović</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="machine-interface">Enable machine-interface protocol using <pkg>dev-libs/json-c</pkg></flag>
-		<flag name="pvm-profiling">Enable profiling in the PVM</flag>
-	</use>
+  <maintainer type="person" proxied="yes">
+    <email>arsen@aarsen.me</email>
+    <name>Arsen Arsenović</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <use>
+    <flag name="machine-interface">Enable machine-interface protocol using <pkg>dev-libs/json-c</pkg></flag>
+    <flag name="pvm-profiling">Enable profiling in the PVM</flag>
+  </use>
+  <upstream>
+    <remote-id type="savannah">poke</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-util/shtool/Manifest b/dev-util/shtool/Manifest
index 19905b17fe88..73beecacc289 100644
--- a/dev-util/shtool/Manifest
+++ b/dev-util/shtool/Manifest
@@ -1,3 +1,3 @@
 DIST shtool-2.0.8.tar.gz 97033 BLAKE2B 05096c0cf4a20ea86a77db59b4d4e0f8431d1cc331c3dbaeac089dc7fcf89cb1ad391b731dab8d31bf010dfe9129a2710f71657600953464b59e0062eb7a7254 SHA512 f0c9292e8d980323d587b70e582574ba1cfe3c26296a01d51a2068a7886e5b1f501e8c5dc37b5d4b0f7a34217c7ad7f6f3011969d9c2d65776fe66e8287c1758
 EBUILD shtool-2.0.8-r1.ebuild 489 BLAKE2B de3d468fd47914dab253a018507b47a10d804475841e92c9087a83736e95a1d56fe2a689b38f752e67ef34dd320b443058f9d2e0cab1014260de09dbccee004a SHA512 ee8ab6961dea1391b82cd04694d303a04a56587637045302aa19fc874483e2f4f152eea3c7da93cbfc20c4676acffd69c1b1878232d4a4512969edb8fcef1bbf
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 246 BLAKE2B 01e47df91ae75e87a0c38c554aa56848be503c8e8267fc809aa964e9c0f374da08047db5a46ac0e24d3f0df29cdaabbd08e3d47340e1da8a8ceb37ca7746bcf5 SHA512 d0faa13f1442d71694937bd59f50dfa457fea30bb2160c71e22cb46669b9832edf1672b34ef2e7b505b50edc97441bedbc796b0dee1bfe2dfdbd84e6dbfda728
diff --git a/dev-util/shtool/metadata.xml b/dev-util/shtool/metadata.xml
index 85e4ed814fa2..012a86d437af 100644
--- a/dev-util/shtool/metadata.xml
+++ b/dev-util/shtool/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="savannah">shtool</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-util/wayland-scanner/Manifest b/dev-util/wayland-scanner/Manifest
index 30fe826f049a..ace05db2a949 100644
--- a/dev-util/wayland-scanner/Manifest
+++ b/dev-util/wayland-scanner/Manifest
@@ -1,4 +1,4 @@
 DIST wayland-1.21.0.tar.xz 225936 BLAKE2B 2b43eb1517d476bb2b4daed1083373655b57d047968fdb93dbbbbe4235af12e25557627e30b5c3d2575bac4beaf1e0a0b8ef10a3c673538d9097501f33c05836 SHA512 5575216d30fdf5c63caa6bcad071e15f2a4f3acb12df776806073f65db37a50b5b5b3cc7957c5497636f4ac01893e2eaab26e453ded44b287acde01762f5fdc3
 EBUILD wayland-scanner-1.21.0.ebuild 1023 BLAKE2B f9dc1119418dd9e0c9b9b75386eb92b9c04d042e272cf51396b8518195d3a0393e73a1cadf920bd670c59409c6812501beec53c66f5e742aab31fa555b7b4b38 SHA512 53e6eb2afb669fd64310446a2233d1cdc5587319ac915a8c3d0d06923261a5231bce8290f70921fc3d7caa47b5a5027a00726c7e643044e9855c65bd0a3fbe37
 EBUILD wayland-scanner-9999.ebuild 1030 BLAKE2B 69772afc5b2457fb4c2a3aa983a1b84776b94a03b220bc5d37dd76791188fb210d94c5299933737aa9e8d27c3cf7ef679c99bbff2f1daa7e9300241e9ca35041 SHA512 3e38ef866c22d8e8c4d125489577e4a72ef6e658b849714d7e79ef0c6092a86d66a6fda20b0043e83e52b30c96fbfd3eef6bb32a27918357d44f77c9ebda2349
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 337 BLAKE2B af249efc25c3eadde73d0b49cba0e6c8a021fb4b7c9a0b96f27a4e71185c76f8ac7ff0b9efdfeadf2df324cfa578db3a73fc7bee8c249cba35d41e2145017e16 SHA512 771b226f8e16d8c570bc2ea89ee3c5176e1d0f2209afb3b2af5a9d19fbdc2037a411b84d546bea054449c8074fb0fb3c3726fb2692d084521c64cda60600c0b8
diff --git a/dev-util/wayland-scanner/metadata.xml b/dev-util/wayland-scanner/metadata.xml
index e17a5bccb78b..8cceb6f871ee 100644
--- a/dev-util/wayland-scanner/metadata.xml
+++ b/dev-util/wayland-scanner/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">wayland/wayland</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 553b0de6748d..66ac88637ca0 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/cssc/Manifest b/dev-vcs/cssc/Manifest
index 0aa0ccef5f18..d91dfc687b2b 100644
--- a/dev-vcs/cssc/Manifest
+++ b/dev-vcs/cssc/Manifest
@@ -1,4 +1,4 @@
 AUX cssc-1.4.1-m4.patch 351 BLAKE2B dde4c1f2876f8e84587ad531a094431d1854652f901a2875a7fdd758a6780570dfbf9e629e3c00f2f41644a063bba08b4d201e215c4945baaa2cbd2a5649e736 SHA512 57639a4ec54f9e2dfb594de179e7e8539385890ab6d58fc5bb39f44497f530e2a9182edbd51c5d815244c76fc80e401f002e60d9ba29c8dee0e229cea7174153
 DIST CSSC-1.4.1.tar.gz 2269725 BLAKE2B 264e996280ff23818332dda62d80adc61fd6a2e924af26a044168bf136c22b22bb591d37157030dbe8e2360a2687b0dcbf843f3af8683b08593fded4ef982739 SHA512 b843bd636b15830b2751c423ff2f2e7292e0942d750ca57425d9674b74c7291fe34db33cbbc4b87d27f80d3b54b0074207ceda612faa651b6f01486e0b2485d5
 EBUILD cssc-1.4.1.ebuild 856 BLAKE2B c735021a9fca1f594648cce481cde1d941cfc67ec1d270ebbc10369426ed5f547b6882c27250ef2068537071bc341fde0564b94954fff8d63446d283dfde6078 SHA512 44980aa7e9704907bdb6b9551629c6d51b9ec72ee36d9cc60a126df641d277eb42598da0824b9f9afcc343e0ea3ca3db9fd63e854caf982023b5b82f0d1cf5f1
-MISC metadata.xml 263 BLAKE2B 90f8afc054f120838c8fa7d070d9efe634be1095c337e8fc7654c2d287fd7735c2d28a9759d51fbeeda6ba884119c697fae835a9365503d28d626e335e2c32d3 SHA512 05ea6673e2a3895cde052b6bdda80daaf21e1e0e50c4f3bbfeccfecca1b64cf30f2aea4d73f73b1481db3ecd560e9cce19247dd957c87b010d002ac3d3fc46c9
+MISC metadata.xml 348 BLAKE2B 7a97d693f19bb3f0deb2cfb8ba26a0784a62017e528f14ba6e2db5eb843059eccbee13ecd299b35fb720d503bf146a577acefbc3fdaa3fec763bf7d6a005a7bd SHA512 7e28de9c70e9390a6e2e3c14843daf10094458f244820ca234b6b9db88f6310bc602d7ceda255291f33cea5a67e702d42a7e0fee3f3480af5851323bd96d3260
diff --git a/dev-vcs/cssc/metadata.xml b/dev-vcs/cssc/metadata.xml
index e2c9e1c8eb0a..a5c17692a105 100644
--- a/dev-vcs/cssc/metadata.xml
+++ b/dev-vcs/cssc/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-<flag name="valgrind">Enable usage of <pkg>dev-util/valgrind</pkg> in tests</flag>
-</use>
+  <!-- maintainer-needed -->
+  <use>
+    <flag name="valgrind">Enable usage of <pkg>dev-util/valgrind</pkg> in tests</flag>
+  </use>
+  <upstream>
+    <remote-id type="savannah">cssc</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-vcs/cvs/Manifest b/dev-vcs/cvs/Manifest
index 181d1bd7fad4..0007a2d2b607 100644
--- a/dev-vcs/cvs/Manifest
+++ b/dev-vcs/cvs/Manifest
@@ -22,4 +22,4 @@ DIST cederqvist-1.12.12.pdf 1252423 BLAKE2B b7649c1165695776e914a3b287fd8883c512
 DIST cederqvist-1.12.12.ps 1262208 BLAKE2B 4e26173e7deac7fbcd6ec8d50f6be8432df00ad15ecaadc3a64de15d53c4f1220f0496f270688baa4f6b29cfb1f5a1b548c7330408cc0afd94c3de2070a1eca9 SHA512 9a061ef90c664fbb4f882644f72c4f80ffbe0233b6b364511b1c7f18f0a53383980a6ddda326b6df1f2fe1899aed3225de89b55a65a1d9101ba81d1c10c067e2
 DIST cvs-1.12.12.tar.bz2 3197171 BLAKE2B bb0aeacd4d89d32c7aeb30b2f96ec9c89277f01c54561ce082031433bc9914c40c1c7041df3859868e879ccaacc7a47aa915fb18aef3777463ba11a7077e99b8 SHA512 31c679b77b887e02d9c8c381b0dfb42f1207ef4ca806cd92843638eb2126ed032e99bda70a3e20ea2a029670ff39c40088a43435632e381739e6c2f978e6f4bb
 EBUILD cvs-1.12.12-r14.ebuild 3004 BLAKE2B 4a174b9890bd0a95763c4c801d28bbe5fea31a377893ebdf7a4b808c7e9124ddc0e8dff6ad051a0dc42c335d244bdf42a6c4be8b21128db6314da5098e3fcaf0 SHA512 88614ef8e78b8e12dc6b58afc265135c4b941b460eaf33079236788fa6d05f73a5d49231d0ec31d65505620bf8ef6bc6711cca79b08224c0b71328336598ff54
-MISC metadata.xml 239 BLAKE2B 4512d26ef49f8be5951a62431eade863184ce1434a783b3f46e0c9d11637b1c051328f19b6b1eb072bb15eac91acd9de87ac1cb1ecc4f218fcab76a0e62809d5 SHA512 ead5297bbff4ed78327587de93404ddc4865d2390f7269ee7e63c8311644783b206a0fe7163c5696af3c319e1469a311a29b4340230ce7c0d9c84ce78f516a4e
+MISC metadata.xml 313 BLAKE2B 146e5250368e0afe0a23c68dff542e20941a1b66cc0379d504cbceb707a3caaf2404181546ec8fa114ac815fc5cdca8cbe20b8e5e4ebbc79f4398112ff3f7389 SHA512 84c13776b7edc8c0a0ec81f093d272b6f28c09682f3a076d23e40c61bf9e1512401fff51a7e12b7103dd6128d0b6e158dbb71fd0fe68f624bc86f5ec86638675
diff --git a/dev-vcs/cvs/metadata.xml b/dev-vcs/cvs/metadata.xml
index 8f9996e69382..5cbae58882ae 100644
--- a/dev-vcs/cvs/metadata.xml
+++ b/dev-vcs/cvs/metadata.xml
@@ -5,4 +5,7 @@
   <use>
     <flag name="server">Enable server support</flag>
   </use>
+  <upstream>
+    <remote-id type="savannah">cvs</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
index 0f0a58fd95dc..9d14599dfb7a 100644
--- a/dev-vcs/fossil/Manifest
+++ b/dev-vcs/fossil/Manifest
@@ -2,5 +2,5 @@ AUX fossil-2.10-check-lib64-for-tcl.patch 445 BLAKE2B a8282820edafb15ae6542b9f13
 DIST fossil-src-2.16.tar.gz 6275775 BLAKE2B 504f828f121385ec73311b340e0abfdba7da6a8571adb390c55c75fea0ef027366fb914c12552e177988bedbb735a3148d87ebdb23ffc2ce4b7bef8ef603692a SHA512 0569640a3b509c592f812a42526eec88ead034ba0ba3de93da62cfb1caa751954ae185eaa3398d411a02ee2a858ecae6cdf4e47199847527f7524fc9798a4b12
 DIST fossil-src-2.19.tar.gz 6435868 BLAKE2B 414dd8b1630bb6a8bcc22f3528da60386663e7f31191e5134474e37211e55323af45947452a0f09e21964dd3cd94ca6cf6e34ecd74e0d3e4f0dce7a50146f0ff SHA512 fcd84df2d84c3a958bb19228de4320456382d3c925717c58bec42de86d96383a9208fb31ba6aaeccd9bc6bba949048d5c1ce3d2b3e8535951956ae18d9aa34e4
 EBUILD fossil-2.16-r1.ebuild 1891 BLAKE2B a14d37b8d26d8078112c7e60ecb7d6f3e45becfb5e0894e0955dfacc5281aba4ba480678d99bb6a57b356ca355f37f5d3e7e8ccca5a725915b08d2923b93a919 SHA512 96e2c2f724f6a4149c279f3caf61ba8defa4a56b6a8e471d9119a7ba46fcfa35c597fd58193af6cedbfad34ea676230650e77b977bcc268a9cc6d85cf4a924c4
-EBUILD fossil-2.19.ebuild 1995 BLAKE2B 2507b78cfea350ee86446146218e396fe7ffaccebb626e2876982347c3e69c30122bcbb83a0bc89b33e4577bea00384e635f042a36614e1627cfce7a6f1c9bfd SHA512 6f7a7f4f40458e18a6af5550761c9007792e6ff565234e99ef89c17ff75d9e8e8783e65372caadc06f97f0d384ba1f49ebb4302150c86f7e78e70044c7fda5ed
+EBUILD fossil-2.19.ebuild 1994 BLAKE2B 7df2a35d97ccee4c093454dae973ffe8361fd7d86ab7061c4b6062e28cf16747013de4f988ce73b54f70d8447c2086191fd3871d1fdf6cde8735a432b827436d SHA512 e9c9edf04d1be6a7a3d79d497df2223ea00846f458dbe33232534a12c5fb2491f01e717c9db0e554ee6ad810d33a6a4816aeaa14852739c19482a5e548f1182a
 MISC metadata.xml 950 BLAKE2B 2c6fb55552dd44c01649e8f394bbd56c49b3e01857493de3ad907e1058ed9f25d7bcfbe9aea0da21a578090d5e8a2d75edcf9f25cf25f2b54ca909334a522289 SHA512 f8c769c99b4889ed79011f460e0dbf2dc7d9c6576256a5c7523abab868e2a5c4d61ca1719813584051b3a8e72051cc88b06a34316ba267415c0915f3fb30dcf4
diff --git a/dev-vcs/fossil/fossil-2.19.ebuild b/dev-vcs/fossil/fossil-2.19.ebuild
index e3b96679439e..0d5c08d8fbd4 100644
--- a/dev-vcs/fossil/fossil-2.19.ebuild
+++ b/dev-vcs/fossil/fossil-2.19.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fossil-scm.org/home/tarball/${MY_TAG}/fossil-src-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm ~ppc ~ppc64 ~riscv ~x86"
 IUSE="debug fusefs json system-sqlite +ssl static tcl tcl-stubs
 	  tcl-private-stubs th1-docs th1-hooks"
 
diff --git a/dev-vcs/rcs/Manifest b/dev-vcs/rcs/Manifest
index 5b05e72cd381..876fa582fb91 100644
--- a/dev-vcs/rcs/Manifest
+++ b/dev-vcs/rcs/Manifest
@@ -1,8 +1,3 @@
-AUX rcs-5.10.0-glibc-2.34.patch 1276 BLAKE2B b254af7dd5c8fa14211b0501be41a1e9411bf67a2d9351bf1e375eba9ea3cc118be989f0fe7ce4504329c40ba3a36eb84ba2b66897317328e90108e1190fb238 SHA512 3d398005e3d9bf2143a4590abfb82094287810e7bc6274869d64b3800ff15faabfa12a3cc5b5d087fb1831adb1394b22324d3d80d7e0dad47e3d1a2263573361
-AUX rcs-5.10.0-test-t632.patch 976 BLAKE2B 95837ba618cf67ffb46c58b9389933615874e318205e3e755a0d34137b8aafdde8f8772669d78c79df6e314ac958f20f97cb4953e756907a36f5db7d30cf99fc SHA512 08d4c1537d78217dbe9f0157cbb4649790d1863ee36623b2e05219ba91f83b55b20eb59149ccd98d67b7a6a59d0236c645045d613dce24a77b6b3dc9b56d8a3c
-AUX rcs-5.10.0-test-t808.patch 895 BLAKE2B 77f406a10101aac745b5ce8eef14514eb4b7722a0b8091f3e39b2ad5db8fc5e569aa51abcccbf90c7278a3dfd3a84b1e95c4c949c8140b1f84a9fe9c37cfe686 SHA512 15e81e6eb3520101237bbfd6d45fcf80155084f13f892d1ac38dc216e7f5aac1e2a469a9546dea8711dcbfba37b8079a6a9c93f50b0387bd936323aa456605e7
-DIST rcs-5.10.0.tar.xz 890872 BLAKE2B 32000df00c639cec90fb9128503b67957a23c82a08651953b57434c3f14ecea555155da933d5be801ad216aa27ccf496a7aae325cecf73f9bc121f3a3c659cba SHA512 d42bded1214f27dfcbe912bbabad8479555a02bc57000a62512d63ff0672de1ed23911cd15c9d1aa4b9a53794ac3fd45937fa1cbc0fcb9d54a3ede4d831f76d0
 DIST rcs-5.10.1.tar.lz 917331 BLAKE2B bf439b2bbb6d5d427f28b13d739f2a5902aa3113e958528028ff553007ad124a8c386141e10ff2d0157468d893e1da4a19240acb373a3f375aa21d97c187a4dd SHA512 4d3755d704a05da8582acb78a83845885f34b3144af6d19c568e6707831563b077ec5603a12f5d4de6ec583d0886d3a8ccc7ee0e1f10070f9e6de142198cd530
-EBUILD rcs-5.10.0.ebuild 1151 BLAKE2B 9e977bf0f3c1a2c9d96dd313f276e4870f0f064156f0bbcc569e875dde96cf478f24a023543208f7d5ec81fae9181845da8f17d083fba611ede2b9423a1b46d3 SHA512 ec5f4d46c0f17e5701ee22839e04f838938af79b22fe3df9500f2a0ab04a356dcf784ca9103ed7c38d067b21147bfefa00bb2c34e7d5a928285086704178120a
 EBUILD rcs-5.10.1.ebuild 1055 BLAKE2B 918aad5d9243ea4443ad2976811f93da10af7696fc7aa5e90c02f50ebc54ac9dc036a3ca934977237128641193a9845801e00588d570fba17b687e5ad60838be SHA512 aebf1408abecc4a85147e5f65b6a9842c7ee93ee90a575b54716836ef1f1baa182a24084c7824b7b7b4640123241613e9b7bcac75db2754a30c6fcbf828106a2
-MISC metadata.xml 615 BLAKE2B 4e00cd56075f6ac650d317e09a31bf40b3d64c098ff472f032bbeed9e30188e98e81fc0175cbf9d0a565cdc4bcdac6e6da6d551d48e6cb9fb82e45de0c840f42 SHA512 c51c417b5440c81d4517879495ba0f8b941d8201089bb09499045ba7b16a4de1c29938e9124d43e244639cbd2177cfaa3b8432686a7ce23421e7386471fa4032
+MISC metadata.xml 697 BLAKE2B 4770117ea60a6aa805fa1d264d758b57f60b642f682c87525be0300ecad3757ed20f9ede303a97e377f3ad0549b694ce6745393194184cb10b5bffbe5a052f8b SHA512 fd46936d0cf4c0a5307f5afcf59e799502b942ea046969c32df658d95cb623ec31a1012557e5ba6a63bb71092c8207709f96a4abaf4c823f1b677b8e7f691c90
diff --git a/dev-vcs/rcs/files/rcs-5.10.0-glibc-2.34.patch b/dev-vcs/rcs/files/rcs-5.10.0-glibc-2.34.patch
deleted file mode 100644
index 5ee636bc522a..000000000000
--- a/dev-vcs/rcs/files/rcs-5.10.0-glibc-2.34.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-https://git.savannah.gnu.org/cgit/rcs.git/commit/?h=p&id=10fb2a018f320ff3c1615baa5af491410d9f8d09
-https://bugs.gentoo.org/806356
-
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Mon, 5 Apr 2021 10:13:49 -0700
-Subject: =?UTF-8?q?Don=E2=80=99t=20use=20SIGSTKSZ=20in=20#if?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Problem reported by Christoph Karl in:
-https://lists.gnu.org/r/bug-rcs/2021-04/msg00000.html
-* b-isr.c (ISR_STACK_SIZE): Remove.
-(isr_init): Don’t assume SIGSTKSZ is a preprocessor constant.
---- a/src/b-isr.c
-+++ b/src/b-isr.c
-@@ -198,22 +198,17 @@ setup_catchsig (size_t count, int const set[VLA_ELEMS (count)])
- #undef MUST
- }
- 
--#if defined HAVE_SIGALTSTACK && defined SIGSTKSZ
--#define ISR_STACK_SIZE  (10 * SIGSTKSZ)
--#else
--#define ISR_STACK_SIZE  0
--#endif
--
- struct isr_scratch *
- isr_init (bool *be_quiet)
- {
-   struct isr_scratch *scratch = ZLLOC (1, struct isr_scratch);
- 
--#if ISR_STACK_SIZE
-+#if defined HAVE_SIGALTSTACK && defined SIGSTKSZ
-+  size_t stack_size = 10 * SIGSTKSZ;
-   stack_t ss =
-     {
--      .ss_sp = alloc (PLEXUS, ISR_STACK_SIZE),
--      .ss_size = ISR_STACK_SIZE,
-+      .ss_sp = alloc (PLEXUS, stack_size),
-+      .ss_size = stack_size,
-       .ss_flags = 0
-     };
- 
-cgit v1.2.1
diff --git a/dev-vcs/rcs/files/rcs-5.10.0-test-t632.patch b/dev-vcs/rcs/files/rcs-5.10.0-test-t632.patch
deleted file mode 100644
index ea86af8fd022..000000000000
--- a/dev-vcs/rcs/files/rcs-5.10.0-test-t632.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://git.savannah.gnu.org/cgit/rcs.git/commit/?h=p&id=8883c4f5a29be18e9ea09bd27a7b660830de45bb
-https://bugs.gentoo.org/820230
-
-From: Thien-Thi Nguyen <ttn@gnu.org>
-Date: Fri, 23 Oct 2020 09:23:49 -0400
-Subject: [v] Don't test signal handling if stdin not ok.
-
-<https://mail.gnu.org/archive/html/bug-rcs/2020-10/msg00014.html>
-
-* tests/t632: If stdin is not open and connected to
-a tty, skip the signal handling portion of the test.
---- a/tests/t632
-+++ b/tests/t632
-@@ -40,6 +40,15 @@ echo | co -l -I $w \
- # (This is skipped if GNU coreutils timeout(1) is not available.)
- ##
- 
-+# <https://mail.gnu.org/archive/html/bug-rcs/2020-10/msg00014.html>
-+# The timeout test needs co(1) to block on input.
-+# If stdin is not open and connected to a tty, skip out.
-+if test -t 0 ; then
-+    echo STDIN OK
-+else
-+    exit 0
-+fi
-+
- # TODO: Don't be lame!  Pick one:
- # (a) Mimic timeout(1) w/ sh commands.
- # (b) Incorporate heart of timeout(1) into ./btdt and use that.
-cgit v1.2.1
diff --git a/dev-vcs/rcs/files/rcs-5.10.0-test-t808.patch b/dev-vcs/rcs/files/rcs-5.10.0-test-t808.patch
deleted file mode 100644
index 86ebab5f1475..000000000000
--- a/dev-vcs/rcs/files/rcs-5.10.0-test-t808.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://git.savannah.gnu.org/cgit/rcs.git/commit/?h=p&id=5df4567e69fc7f46d14cfbf396525c3d05bcf970
-https://bugs.gentoo.org/820230
-
-From: Thien-Thi Nguyen <ttn@gnu.org>
-Date: Sat, 24 Oct 2020 19:14:26 -0400
-Subject: [v] Try to handle whoami(1) returning no info.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* tests/t808 (user): If whoami(1) returns no info, no longer error out.
-Instead, jam a value, and set env vars ‘LOGNAME’ and ‘USER’, as well.
---- a/tests/t808
-+++ b/tests/t808
-@@ -24,8 +24,14 @@ rerr=$wd/rerr
- 
- user=`whoami`
- 
--test "$user" \
--    || problem 'far out, man ... whoami failed!'
-+if ! test "$user" ; then
-+   : 'far out, man ... whoami failed!'
-+   user=jrluser
-+   USER=$user
-+   export USER
-+   LOGNAME=$user
-+   export LOGNAME
-+fi
- 
- must 'sed -e s/ttn/trulynobody/g \
-           -e s/zurg/$user/g      \
-cgit v1.2.1
diff --git a/dev-vcs/rcs/metadata.xml b/dev-vcs/rcs/metadata.xml
index 844c10a9ea90..e69b106e893c 100644
--- a/dev-vcs/rcs/metadata.xml
+++ b/dev-vcs/rcs/metadata.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>titanofold@gentoo.org</email>
-		<name>Aaron W. Swenson</name>
-	</maintainer>
-	<longdescription>
-		The Revision Control System (RCS) is a system for managing
-		multiple versions of files. RCS automates the storage, retrieval,
-		logging, identification and merging of file revisions. RCS is useful
-		for text files that are revised frequently (for example, programs,
-		documentation, graphics, papers and form letters).
-	</longdescription>
+  <maintainer type="person">
+    <email>titanofold@gentoo.org</email>
+    <name>Aaron W. Swenson</name>
+  </maintainer>
+  <longdescription>
+  The Revision Control System (RCS) is a system for managing
+  multiple versions of files. RCS automates the storage, retrieval,
+  logging, identification and merging of file revisions. RCS is useful
+  for text files that are revised frequently (for example, programs,
+  documentation, graphics, papers and form letters).
+  </longdescription>
+  <upstream>
+    <remote-id type="savannah">rcs</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-vcs/rcs/rcs-5.10.0.ebuild b/dev-vcs/rcs/rcs-5.10.0.ebuild
deleted file mode 100644
index 7a3d453f1e0d..000000000000
--- a/dev-vcs/rcs/rcs-5.10.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-DESCRIPTION="Revision Control System"
-HOMEPAGE="https://www.gnu.org/software/rcs/"
-SRC_URI="mirror://gnu/rcs/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="doc"
-
-RDEPEND="
-	sys-apps/diffutils
-	sys-apps/ed"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test-t808.patch
-	"${FILESDIR}"/${P}-test-t632.patch
-	"${FILESDIR}"/${P}-glibc-2.34.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e '/gets is a security hole/d' \
-		lib/stdio.in.h || die
-}
-
-src_configure() {
-	append-flags -std=gnu99
-	econf
-}
-
-src_test() {
-	# Tests attempt to call rcs commands on /dev/null and /tmp.
-	# https://bugs.gentoo.org/840173
-	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
-	addpredict /
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc ChangeLog NEWS README
-
-	if use doc; then
-		emake -C doc html
-		rm -R "${ED}/usr/share/doc/rcs"
-		mv doc/rcs.html doc/html
-		dodoc -r doc/html/
-	fi
-}
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 7ee649d2f16a..2c03a2e637e5 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest
index aefae7b90e36..e038d9c6f163 100644
--- a/games-action/polymc/Manifest
+++ b/games-action/polymc/Manifest
@@ -1,4 +1,4 @@
 AUX polymc-1.4.1-include_QDebug.patch 338 BLAKE2B f9a16cc8c4e6c9c6b4cacaf7aaee66d2230a89f4c18b79677f3f25efdf430cb8f3125a6018ed6fa82f5e8c7d5e840012d260b4dad9a0a924c67abb8c009727e1 SHA512 17107c35811afd7c3f2e654451e9b0acda8234e032d62c22d9f13b5def659f25f367f980aaadb67e91309e67998f94513f15971a348e2da6b0f749cf4e2069ab
 DIST polymc-1.4.2.tar.gz 5766773 BLAKE2B 0d40f2b1fc6df28089d874a2de949b24a719936b0961fa08a0e909a82931b411926464328ada8ec05c148ba39e405ff9f4d336fc4ade316725756e235231eb60 SHA512 6212752a176e0d3414f66b013b46adc500c5d9e7fa250646aaf9b6bd42b9cbaa7c23282c7da6105e37d6ae77f790cd0036ad4e07b8aa50b611d41045035bc533
 EBUILD polymc-1.4.2-r2.ebuild 2974 BLAKE2B 4dba48266d57157a7a043db90174b7892da48041fe2ad7a66350e3dccb80edbbe8f3acf0c8d68b5a04cb1d1e5edc1b788f0d8de1066f9b8edc1023ed6bcc5c50 SHA512 0acced994c0f0fedee6c74946cac966b7d3e1b7f0c86d8fa78a8564998d8cc2c72f71bfee1c5112c593796754cda7029ed9a952d45cf428825693a0eb267fe91
-MISC metadata.xml 1166 BLAKE2B 90d798eeae66595a665d2d694e6b4acecfc1236316ec6b254efddda7048593ee5c0045ae007498e759e9166560edc66b2c99283c3254af0a985689dcc2817dc1 SHA512 e312aaf618a920779c007beae2bc323d7bb184140e14eb0d7eacbfa1e8c182dc2d931e84fd8d0e4e36d7e513bf4b490b450fb15a87ab7728ea8f5c710edab262
+MISC metadata.xml 1088 BLAKE2B 5a9d980fb174d942db61bacb4e5b7d65b59f2ecbc91e4e4a5b15b91fc1abb1d6ab9e8acd3a9db6e526df1321e25120ba89f0802f859daae86a2269542b51db3a SHA512 1c2657370e99a198fc2dea81e9829509e0a49a0a87230cf51b6c695ea1f46a85c0a9a4c001c793b733eef2134db8966ba54d6188e4241095a330604dccc91f4b
diff --git a/games-action/polymc/metadata.xml b/games-action/polymc/metadata.xml
index 7ba4aabb75f4..f704149126f6 100644
--- a/games-action/polymc/metadata.xml
+++ b/games-action/polymc/metadata.xml
@@ -25,6 +25,5 @@
   <longdescription>PolyMC is a multi-instance Minecraft launcher focused on user freedom, redistributability, and simplicity.</longdescription>
   <use>
     <flag name="lto">Enable link-time optimization</flag>
-    <flag name="qt6">Build with Qt6 support instead of the default Qt5</flag>
   </use>
 </pkgmetadata>
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index ddd4d634f819..085a30550bdd 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/awale/Manifest b/games-board/awale/Manifest
index a567f9a1cd8a..67a84a4f54a2 100644
--- a/games-board/awale/Manifest
+++ b/games-board/awale/Manifest
@@ -1,3 +1,3 @@
 DIST awale-1.6.tar.gz 490881 BLAKE2B 721b8dfdc6dd7a558e43e00616372b2b1a89acf1cc79cb051650809b54605d4d0c2fbc91168ad940356748c0632fba7bd016db7afee2f977f8d52f64bdd08400 SHA512 0b9e4f18d6fbd5e8acdf8e5ecbbcebad4d732993cb61b8d84787fa2a9dad5b73eee62462fddc9296c050019de76a73b1e6d8d29d3ef57148ab086e49b1016f0d
 EBUILD awale-1.6.ebuild 665 BLAKE2B 1f07a24082eb6239546c6c3d44772d1efdbf754299437c1d686e4066769a251096e204571c91cb1bfd1783a6256b51041bcac6656e5340708ca32882f8c3f720 SHA512 191429e369d3fe150a0d947da2ed08c676482420e2f808d944bd8f95da296d678871b76425280cece046b40ec48f3f4e757cf4aabf630239a5687809b1a21bde
-MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
+MISC metadata.xml 343 BLAKE2B 0824a4cc2acce1996692b7b20223946d3fe0c11cbf78aafdd3f54069eee9280d572399a3dc5145b02f6a3953f060e144d81c644767feb59c8c0a53b2df69a894 SHA512 16f4aa22c18927d5d37de7ebb05dc92bd227b052b5ec871b85a4770657fa5a77fc94b4a0e700c9fb13f3896d34dee95daaf1277636ca4e2e9f7593afebb09f51
diff --git a/games-board/awale/metadata.xml b/games-board/awale/metadata.xml
index 7c730d47817a..b64c8f429d0e 100644
--- a/games-board/awale/metadata.xml
+++ b/games-board/awale/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
+  <maintainer type="project">
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah-nongnu">awale</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/games-board/gnubg/Manifest b/games-board/gnubg/Manifest
index f5439ef54268..3f014063a978 100644
--- a/games-board/gnubg/Manifest
+++ b/games-board/gnubg/Manifest
@@ -1,3 +1,3 @@
 DIST gnubg-release-1.06.002-sources.tar.gz 13163681 BLAKE2B 1b631af8b268c722624012f86318844376bb21158f231d807cbfbb101ecef03ed90f7f253121844dd4221dc8026af5619fe9f62aff64e20d6c2b84450f9705d0 SHA512 77594209032a0d81deb802da249d7f40812127dd1e080413eda75015f324fec9592b1b51772403f501b21e39d3dd371931d82b43c24f614a7d16c5234d271948
 EBUILD gnubg-1.06.002-r4.ebuild 2228 BLAKE2B 5a453ede684335360df58ec6113d581b72f4e28a13ea5b962c5ab9403d6fa53c83b241dfb90ad498b8badf936210b68aa984b9fadddc4491b7feb950e1c49ef4 SHA512 8321d16115094d36486b627108d1b2d0214c590970b8bcb5dee776e1611465f29e97a2c226d9ccc486a2cafee407e710567cf00479dc51a9668542b1d901f84f
-MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
+MISC metadata.xml 336 BLAKE2B 4e2af69698fe9f6350d1e9092e436c8d7434584491201c92ad5aacc1090269fe234a3e09656b6e359b7d614bf9198c524e1a85323e0dd008eb515350c87553ca SHA512 affd5e682928eb13dc8d22d6e531b78a61774be0bdc5badb5753c7a7552befd0aec84aff357c001193faa9df502c02073eff22215ffaedc0d75a3128586beca2
diff --git a/games-board/gnubg/metadata.xml b/games-board/gnubg/metadata.xml
index 1c3ba213c494..57428f3202d7 100644
--- a/games-board/gnubg/metadata.xml
+++ b/games-board/gnubg/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
+  <maintainer type="project">
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">gnubg</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/games-board/gnushogi/Manifest b/games-board/gnushogi/Manifest
index de56a33eebd1..422b80914501 100644
--- a/games-board/gnushogi/Manifest
+++ b/games-board/gnushogi/Manifest
@@ -1,4 +1,4 @@
 AUX gnushogi-1.4.1-fno-common.patch 366 BLAKE2B a84ecad2b955c0866ae0bb71bb7efe3c234d3a796ea94b07449e390a1839a52cc0ceb5f4b679cfc03ab20f30e2212c2cde652872ec6045e6e821795473ef3014 SHA512 61a53e379720b7b841f0fbb28972ef0f776c8f34efb45e86741fc023f6f3e439304ac180e116ebf038f99419b60f169c2032c88becbaaa170d4dc06bb9d3c3c8
 DIST gnushogi-1.4.1.tar.gz 542301 BLAKE2B bc2c0c89ca63d4cc617914771f9439d1e99ef89c87d46b3649fde97d521b874c74f049fe5340a5ccab603e7f532441821b7785aef2b50609903e926905d75ba9 SHA512 b997f309bfba85553465ceb262094aa0a9a53dc7ad970f77c0eb0c1558ba12f9dd15b42a6abfc85f5ac08bbfecc7816a6e3e4fb0efe2caabb043fb343b1ebecd
 EBUILD gnushogi-1.4.1-r1.ebuild 1080 BLAKE2B 8484290f582100bcdf648b815e45213f430173d5b4abc1267be1a6d26368a1ee38cfd0938df076c234a253f1208dbd1def2aff18cd5d16c0c8221865ed487e81 SHA512 d7e7ec093b03a11091142f672c8dee5049fd6dce1dc797f1627b4935d0a76d61b01d9090f31d04bdeb0b4f7bd73def71790bc33b58a4397809f3c8fc18a2f074
-MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
+MISC metadata.xml 339 BLAKE2B 19bfa841e05de54536d3f4794347f49e9b6e441613650a2aaa9059fa1f2fb3e92dd0f96eb85008514a6b72461f2fcaa4b43a45eaeca78b88d9f9ce6a6ad43254 SHA512 aec0424b176ab9cc6e93128a8001fd3ff4b13658d66e337dacf25fb0126097b5923120ab617e0c3ed151a2c47de1bc3766f3b662a94478172b2fbb0df304e961
diff --git a/games-board/gnushogi/metadata.xml b/games-board/gnushogi/metadata.xml
index 1c3ba213c494..2c979d8fcdad 100644
--- a/games-board/gnushogi/metadata.xml
+++ b/games-board/gnushogi/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
+  <maintainer type="project">
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">gnushogi</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/games-board/xboard/Manifest b/games-board/xboard/Manifest
index c5e3aea572cd..0134b4758893 100644
--- a/games-board/xboard/Manifest
+++ b/games-board/xboard/Manifest
@@ -3,4 +3,4 @@ AUX xboard-4.8.0-gnuchess-default.patch 1441 BLAKE2B 2b37c3650d45fb46bdf57b93152
 AUX xboard-4.9.1-gcc-10.patch 951 BLAKE2B 223ddeed108ad686ff600186f094b68bb3e7e2fc3d72ce3ab3fc1d7c217e1a9b9c9f8e4b5e347a68d8d55ae8e2c7ddccee70c7f7a3ef93da84eb671403928e92 SHA512 ea4c03b70136c587c4d010443297acec84c7a7a274f3ac5c0b15f4f1077c8bf6b9f58e4dde7ff7154f222bdb8c0674d240bb234df252d70edf2726f3dbd70bd9
 DIST xboard-4.9.1.tar.gz 4015017 BLAKE2B c886cb06d9b4ed394220f133915a55e1dbe29d317891d00d880c597abe0ad43a8377c926d844318b0092120aee7e40fe8c6c62fff41890c35bd768575ccef731 SHA512 7c6f17450edc3f56d5987f6363da01633850b87b0d6664524a4697216dc66aa58f84314ba57ee68aebfbb01ef96995e34be4e98fb4a5124e3f5090690f91ae08
 EBUILD xboard-4.9.1.ebuild 1899 BLAKE2B 600594d42a3842769cb36e7a72f18e98ecca422815539cc41f186789bf3377a460e86a518ca309f05a75ec84318a9021ea5634c2026573014a14bf123b3238a9 SHA512 21287e6e4a7193566ec9e4147d8650a2d67f028e3c8fca87585f10aade38c3f294ac647b4a9c9000efce71972919dba4292d8f7165259dd922ac62e3b3f61e9b
-MISC metadata.xml 419 BLAKE2B febc95ab40d52a875d3c479b4b7a0d9f669b31e0268b1dc70214e7c5040fff3c3cbce023da1f25c106b6f7880802b28516143533e9a4098273481b51c8a48b2d SHA512 567e7bd475c57f14a8f65706e24dc9efcb712c6a92e567dc3d337f9f3287d2760d787530fbaf9f28a489fdbd841f6da3d768010db657275b712d9607a5f2dc4a
+MISC metadata.xml 496 BLAKE2B 03e7a233c195fcb078811eea796012123d17f03a3ca8d6d5b23394da5d27c536eb9d2f2946f494e6e6b70453e32e668c3ebc52a70044d43366c8c99f59597e38 SHA512 3a53c0c480f4a3b066ad4f83311642afe3a3a2ebabd2b47147ed21eb09bdd641c314e9b310821fdadf330e1ffa8ad82a63f7679b6a51d14d8d0a2c5f1387252f
diff --git a/games-board/xboard/metadata.xml b/games-board/xboard/metadata.xml
index 643fc2c1cd98..2ece8a89024b 100644
--- a/games-board/xboard/metadata.xml
+++ b/games-board/xboard/metadata.xml
@@ -9,4 +9,7 @@
     <flag name="zippy">Enable experimental zippy client</flag>
     <flag name="default-font">Install the default font that xboard uses</flag>
   </use>
+  <upstream>
+    <remote-id type="savannah">xboard</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 74a55eded90b..4587e64f3064 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 1ffa14b0f412..1646fb820772 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -269,5 +269,5 @@ DIST yeslogic-fontconfig-sys-2.11.2.crate 5763 BLAKE2B 80dc12f2d668afc1a49d6ba03
 EBUILD librsvg-2.40.21.ebuild 2607 BLAKE2B e1c974514e0deb7c81ff027747a00bb8bfb1902a140711a7207e4d126c59ef5ebc0252cb64c6ff379822db65bcf3b60992ec72accf3d1d3d6681ea65d1df6b49 SHA512 a2ba181144cb049e66af4743e1b84ff3865d7aed0b4c1f06c985616fb1fc72f39845926def6b81fafef041f59bbaa8b136782be1de99127af651d2b916724ed4
 EBUILD librsvg-2.54.4-r1.ebuild 2767 BLAKE2B 94fa64e8ba60213a641f729f0846a03180aae001af114fe4a421f36f0a43f6623964e499ebab43785317e4145dee44f4fb09b291dfd0b25a5da0334b160b8a5b SHA512 fc8a53acb6e2915f84618f440160400eb089f5f713e65b9734e350a6de4ce6624b4b273f6b8499f645a224e35a7b7e4eeea53b3a4d9badcf247024b0de9909f5
 EBUILD librsvg-2.54.5-r1.ebuild 2773 BLAKE2B 9b4836911639e911b3dce46ad3d6dae2ff2da2eaf16a8ce31ee0f783b52441daca04193714f3b531faa6e33ecd83d5f839c7536405543734bbb2ddda49f9ce35 SHA512 3376950bd14ae7d8793fcfd7d69a8d4e547beae52494af7460fc9886969f48f57115441b2f3acae97b338b01cd84180ef9ed5358423e3143ab08e0f30cce09d7
-EBUILD librsvg-2.55.1.ebuild 7935 BLAKE2B 29766ad82ce1a606db7d0e1ed5d994e110f971e471c38f21a03a75affbc60fb5437d1211193bc52164c5b6e365b764d3f2ebae55b8e0fca6fb5351e727d634e4 SHA512 21c07e4157daceceb49751e9824f2c1ff1a246b67d36e811d71e615f64e915bce33c54c0742eb83492c68d1e6503b6c6e65f99bab78a44fc70e1aaea4c1a34ce
+EBUILD librsvg-2.55.1.ebuild 7955 BLAKE2B b598d095a91714f248edb3707efd719e92bbde28edfdfd886b2a800b8a369f9f73545f798e29ae3765b294e4f90a2f4d7fd5d0dd2b130d847259843440eb7fe6 SHA512 8923dc43805def46c0c4e4aef1a6ec861fe6710724fc465ec130b5ea838bea5cd7c38c6aae05cd0381e96aaacf4423ddf324580fbefe1fafb78fdb1a647775a1
 MISC metadata.xml 312 BLAKE2B 9a8c74fbf88673a6fee588b6c7368d4d40287b3dbb46d591878f5744ce3eaf5fc6b4e711cd50d2ff830e9c0139cd99f629cb378039376dded59373216ec19038 SHA512 0715a267ceda6ecb4d9499951b0d3343b5ccedbfc85441f3001d9293dfdd2d31b214f907c5466676cce899c67f4249cf4b643a46b4d16e1ab6b89ccaac763e26
diff --git a/gnome-base/librsvg/librsvg-2.55.1.ebuild b/gnome-base/librsvg/librsvg-2.55.1.ebuild
index 9eeade9367b2..cc3754138332 100644
--- a/gnome-base/librsvg/librsvg-2.55.1.ebuild
+++ b/gnome-base/librsvg/librsvg-2.55.1.ebuild
@@ -301,7 +301,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
-	>=virtual/rust-1.58
+	>=virtual/rust-1.58[${MULTILIB_USEDEP}]
 	x11-libs/gdk-pixbuf
 	${PYTHON_DEPS}
 	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
diff --git a/gnustep-apps/Manifest.gz b/gnustep-apps/Manifest.gz
index d49ba69a292e..6aee3b0e9625 100644
--- a/gnustep-apps/Manifest.gz
+++ b/gnustep-apps/Manifest.gz
diff --git a/gnustep-apps/fisicalab/Manifest b/gnustep-apps/fisicalab/Manifest
index 27ace19891a1..d054a5a4eff6 100644
--- a/gnustep-apps/fisicalab/Manifest
+++ b/gnustep-apps/fisicalab/Manifest
@@ -1,3 +1,3 @@
 DIST fisicalab-0.3.5.tar.gz 7801631 BLAKE2B a4c07f951620ade580dc788bb5380f400b95b71e69df87288836b8eb221b76998ec9214a23b2c75e39a46816deefa65a935b5196c9281008e1ac44924b29893b SHA512 03ac3f67c3597fda8418f6b5e7612c2b56cd90a5afd12834e57934a0a453f7afd7488ba0476af576275a3e2663389d4b18de590bfc954d2ca38af6c31cbd790b
 EBUILD fisicalab-0.3.5-r1.ebuild 424 BLAKE2B d908ab3f3dd950e42c9e2470451590c26a40641a221010ac31c006900259da2ee124975d1e4f5c372bcb7597e57e85695b1f9fc663e6c0bf56b1127ef3b160d4 SHA512 e0723dc973aa4224d4c2c7a177e97631666cc24692eb002207b972e039f2530e4128de78fcb0aa0115ee7cb59309968176d0d78dfccfbcf95e971afaf41579bc
-MISC metadata.xml 694 BLAKE2B 5cf3ed11c52e16dcca3d6af16b276141774ce3760416fb8a1fe9f8ca961a8a8c9edb91767d1926905f122dde485f892f6425821ca65459611b7e02be7993ec88 SHA512 e81165dd03f1b6411b507244e9aa03755873b62c6a0fe8d28bd513fa68b1f36c5bf8382b0c8055a35cb077992f0b98f9171e9c6aa83a922fbf1bcd998a2fafc5
+MISC metadata.xml 781 BLAKE2B 2622e6291e226a8747e9e30ce810f82d4ef164ad87a89780955de14d81e9480342ff296ca36edb00bab808d1faf4c9ca63869a2adbf0e2067313068b69fd0dd0 SHA512 14da0c8b33125f1f71e72418d35fde2cd38549a4a966d6525c06a6fde03cf997b0609b5a744dbb7d2dbe6fea0ac86a403c9cc87770e808cc092957f4d199b2d6
diff --git a/gnustep-apps/fisicalab/metadata.xml b/gnustep-apps/fisicalab/metadata.xml
index 56bbc8160368..7f3222745cf0 100644
--- a/gnustep-apps/fisicalab/metadata.xml
+++ b/gnustep-apps/fisicalab/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>FísicaLab is an educational application to solve physics problems. Is made with GNUstep and use the GSL libraries (GNU Scientific Library). The problems are setting adding elements from the palette to chalkboard, and writing the data of each element. The elements are objects as Blocks, Pulleys, Mobiles, Forces, ... . Use the SI and English systems, scientific notation and many conversion factors</longdescription>
+  <maintainer type="project">
+    <email>gnustep@gentoo.org</email>
+    <name>Gentoo GNUstep Project</name>
+  </maintainer>
+  <longdescription>FísicaLab is an educational application to solve physics problems. Is made with GNUstep and use the GSL libraries (GNU Scientific Library). The problems are setting adding elements from the palette to chalkboard, and writing the data of each element. The elements are objects as Blocks, Pulleys, Mobiles, Forces, ... . Use the SI and English systems, scientific notation and many conversion factors</longdescription>
+  <upstream>
+    <remote-id type="savannah">fisicalab</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 108d300349f1..5b84d31d7428 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/encodings/Manifest b/media-fonts/encodings/Manifest
index 0febf846852f..1463e2a9d59f 100644
--- a/media-fonts/encodings/Manifest
+++ b/media-fonts/encodings/Manifest
@@ -1,3 +1,3 @@
 DIST encodings-1.0.6.tar.xz 312720 BLAKE2B 4649d8d12fcfcbb7de9e8bd8aa7e77514835a56990123549137b4bbe5615c1e9fcddccb13b6442d8a525efd147926801a5029cb10126462b29e31e3354da3683 SHA512 2d52486996939401121bc858ba23031f70eef857760db8da4c84f083e981868e4bc7a8c2ab6d59274a0cf95f592a0dbfad47bce6c9299bb45d115b48abc39134
 EBUILD encodings-1.0.6.ebuild 688 BLAKE2B 3fd065aa633c63beec5ca01550c3d93e28345fa9c4463a2a2df58c4cc806d8ffa3a81533fff9481f48bc00d12f2cc016023df033d3ec3cc670a7fb8fd7f31058 SHA512 dcd38396dda51aa217c1013ed322060125f09a472282d17e1b683af9139d315a4061bfacadef6212bcdee258e56e0f40e3c5512e7b100045f08b4efbbdcc44c4
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 341 BLAKE2B ff668fe646cbd5895866eef4178c3d51c0be0524644ce378ea0f798ccf78f6e54caee6ec4ddb48feb8f24c12fa580c9f3910f896e510ab5066223f68c19df9d5 SHA512 1ab7f8b64854de585079f24dea9a93a599acb701fa1ae9f93ae80f06d929dfcb46169f8639f0edb6d659aa6008f0f3686098e5764f91b2174c3c4273c76ce7ac
diff --git a/media-fonts/encodings/metadata.xml b/media-fonts/encodings/metadata.xml
index e17a5bccb78b..8c022b564e8d 100644
--- a/media-fonts/encodings/metadata.xml
+++ b/media-fonts/encodings/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/encodings</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-adobe-100dpi/Manifest b/media-fonts/font-adobe-100dpi/Manifest
index ae8353a16d87..65169324b70d 100644
--- a/media-fonts/font-adobe-100dpi/Manifest
+++ b/media-fonts/font-adobe-100dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-adobe-100dpi-1.0.3.tar.bz2 1113104 BLAKE2B 055d8723af853126125eed181d3752c8aa58f5820f7835fab624917ed8bd1bf428064e472811f6538116b3dafd8984f4a651a4ee26924722394535b12e645aa6 SHA512 27ed98dcdbb9c174c7090cdd8fe230f7471d10b5dfc63e092640b5d0fc6ab351bc8ffa9a92bec1755f2780b3d9c1de3ad298c64b70a68b5e6879a8592ef32987
 EBUILD font-adobe-100dpi-1.0.3-r2.ebuild 304 BLAKE2B 0de2edd9466a6477d7bb0b2780f1941640691879aa838080808551a1923013608503fefff661703a6fe86a5b571b54242cf2ada88abbfbd52b035d3f13e4e6f5 SHA512 3261bc1da6fb558949e609e0987b57252aa76eb60156e287a18124ab939fc5994492192faf243d6e986f70f6f2fc04c604d7d6eb0924b83524d87daf21fab487
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 344 BLAKE2B 0954178dff3df3a40cd5cc6ef0bb5ad5b7822d324472a53621ce6c061fd51fe96729abf317974be81f38d7434d2f9050f47ab148d69fc4891e61fca83f6256dc SHA512 93645580fd6d6be673913b2017644ee58e03246ac087cf0e4712e470ac999c342b4c1477e2cd25f8c768aedf2dc3e88723f54cfd86bfdced50caa97c9658d76c
diff --git a/media-fonts/font-adobe-100dpi/metadata.xml b/media-fonts/font-adobe-100dpi/metadata.xml
index e17a5bccb78b..e8d469d8207a 100644
--- a/media-fonts/font-adobe-100dpi/metadata.xml
+++ b/media-fonts/font-adobe-100dpi/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/adobe-100dpi</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-adobe-75dpi/Manifest b/media-fonts/font-adobe-75dpi/Manifest
index c2ae8b0b90ab..e1199240f5a8 100644
--- a/media-fonts/font-adobe-75dpi/Manifest
+++ b/media-fonts/font-adobe-75dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-adobe-75dpi-1.0.3.tar.bz2 889542 BLAKE2B 5ca08b27bbf9880794862615af9e6e5b566fea6529523fa393136221690bb244c1a39ef90f939a0275fa8e176a84f9a4bfe0f464acb0549927bfecf6c6831e13 SHA512 c0d851df5732e81027e265370751a606c6e4f5eea546d802608988dde02de35fa28238f709f48567191090bf18814f671b1a7f9f0b528d54949b0aa9403f266d
 EBUILD font-adobe-75dpi-1.0.3-r2.ebuild 309 BLAKE2B 36b0d9bea4bd68439b08fac4b8fa60a1deb2f54f0722659030cfd48622371af10a273db458e88495d2aa8c34f84b3679082f4a376bd0f3bf3102e65914d23157 SHA512 a49802eb13c92208f74c008df8a2e1f690888e5420ed04e2c7f81e9e4849ad9f64f13e6e32a7df2691a04d42359190c2c8a9960653f36683ba00ee8fa880a834
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 343 BLAKE2B 7e7fe6ff2d453204e5f8cd28a1620f0c6d04920941af5f821cf15e68a156fe88205c6050f467e561bc439f2fcbffc4f9c889b53449ccf46a9c1562edb84967ea SHA512 7ae80ab0b1a0801e3af599de60f33a579334ead5fa82e900037692c3adfab54acbf1c526b193caef5c0e64c97cdf016fb7b8e10a823f993cc1bf7be167466323
diff --git a/media-fonts/font-adobe-75dpi/metadata.xml b/media-fonts/font-adobe-75dpi/metadata.xml
index e17a5bccb78b..261ab7d3dbd1 100644
--- a/media-fonts/font-adobe-75dpi/metadata.xml
+++ b/media-fonts/font-adobe-75dpi/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/adobe-75dpi</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-adobe-utopia-100dpi/Manifest b/media-fonts/font-adobe-utopia-100dpi/Manifest
index 5275d5d9f82f..c6461ebfc192 100644
--- a/media-fonts/font-adobe-utopia-100dpi/Manifest
+++ b/media-fonts/font-adobe-utopia-100dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-adobe-utopia-100dpi-1.0.4.tar.bz2 353852 BLAKE2B e5d37b5608725ca36987999aad269e3ed5a988069cbe232ece934f2ed71dfaa94ed78499e911f16f7f6d8114e684d501920bf927ab3551cc211f27deace2f613 SHA512 fecb9a9bde99a82787d12779ea579c8696dcce168acd74b478a879ae24d421d5978d5f69da651e8ff3b25dca355960aaa19f69f2bf61e540464887e546a7b94b
 EBUILD font-adobe-utopia-100dpi-1.0.4-r2.ebuild 318 BLAKE2B 5730409a15543fb9a73256bdb2e9924b347bf50366c813fd78bf5920fd93dc1fe570dde5d0397219f184c509a9f037281843eb4aa07f9aa9ab1ad0b6b0edb965 SHA512 0e8ec8178b5a89472bc8a3f66b7f57d3066aa398db78b77c0080ea53f4eaa40ca622ff4987fec715ef779aeff8f7858f3ff0d19777e85f29e952af4d79583d06
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 351 BLAKE2B ff8d67016e3ef1870ce9203ae6e768c14287991ac01204fdf9adad84fc210ceefce57817fde30ae960f1927b8f6ba2eecda97e9e4378a1546b986963d6d146f8 SHA512 b2581978a8b9063a864947eff01c8236b035e7ddff697941a6ccb17c4655ec75501b8b1d25930c19991fe0eb06b4f0c8920efb104ef85f71b5667eaa2a2b7b6e
diff --git a/media-fonts/font-adobe-utopia-100dpi/metadata.xml b/media-fonts/font-adobe-utopia-100dpi/metadata.xml
index e17a5bccb78b..c865ae023263 100644
--- a/media-fonts/font-adobe-utopia-100dpi/metadata.xml
+++ b/media-fonts/font-adobe-utopia-100dpi/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/adobe-utopia-100dpi</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-adobe-utopia-75dpi/Manifest b/media-fonts/font-adobe-utopia-75dpi/Manifest
index b1e2909d05b9..3d86771eee90 100644
--- a/media-fonts/font-adobe-utopia-75dpi/Manifest
+++ b/media-fonts/font-adobe-utopia-75dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-adobe-utopia-75dpi-1.0.4.tar.bz2 273484 BLAKE2B a304d690de9727c5678dc1613cf7c8960594607a5f21fea15d03caade18df23ea83ff62fe7bd6c12750a0c9ffd11c28d4507e811eb271a1d1f874f0bcf0e3a92 SHA512 c569af760a62b00738be65546364587638e8c46e4a0765013747e9595d51bc0633908c72359e42e7ebf6240fdc6294b51512c0a096a5fe64b2bd300ccbff7b92
 EBUILD font-adobe-utopia-75dpi-1.0.4-r2.ebuild 317 BLAKE2B 7104d7fbe50cd9ee808d4a24f7bd375bd8a7b28ee19e95340f0a7e58edb5435fc387ce69ad7eb0ad861961bcc09ddb275915469d67360ac92c0c9d2d06bc04fc SHA512 ca72e1092b41fc9568378dbb9a8d9c8e5ca7178bd7c97ba88b1ee4bbf260294ee6fec670a61013f7063c20dbc6a1884e12302af5994d516daf375d542348017d
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 350 BLAKE2B a41853dea3e43b6a86ea7a33573d4d39da5668bdafbddc77bf5c6ccf17429e10e2f906a930b008a27adb6e5d809e6527c4288639d925f55caf686a4691123d7b SHA512 18d198deeb929f2b964a763aad631ae83bbfc97788b8aa8bcfbc7d35958809664616d3a59a3d8a0b4c5e3aec43dfa4fc478a2624e95addc033f2c8b6a9073eda
diff --git a/media-fonts/font-adobe-utopia-75dpi/metadata.xml b/media-fonts/font-adobe-utopia-75dpi/metadata.xml
index e17a5bccb78b..76413a1a33b2 100644
--- a/media-fonts/font-adobe-utopia-75dpi/metadata.xml
+++ b/media-fonts/font-adobe-utopia-75dpi/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/adobe-utopia-75dpi</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-adobe-utopia-type1/Manifest b/media-fonts/font-adobe-utopia-type1/Manifest
index 1ab0a815616b..788ff8a90d22 100644
--- a/media-fonts/font-adobe-utopia-type1/Manifest
+++ b/media-fonts/font-adobe-utopia-type1/Manifest
@@ -1,3 +1,3 @@
 DIST font-adobe-utopia-type1-1.0.4.tar.bz2 269159 BLAKE2B 0e23240a7b79a43c0508935b460e1f7f4cedc72e98dd903644b97d042983dde4c62610f53055d35717bdad56c5a9f52962bd11c4ee484cbb9b89b6c4c95752b5 SHA512 53ff2ce7b17824a0eed1be6c3e3386e51983389f5623e732ac898c4e08769c8720f6d6b7c75b6455e050ec5dc390376747ca4cdb9f831a218f9dd5ee5edcd0d6
 EBUILD font-adobe-utopia-type1-1.0.4-r2.ebuild 306 BLAKE2B dc2c2467ec0a02d64267b56b5b6dc53953f559dbec140cb3b95288c98515c46fcaf0b846dc77376d074b774d117438511c30db3611aca36c349d9b15d5391133 SHA512 4828def90ed63937980df5a62189535f7e81b40132e5b22f4852eb1d44be19b216474f17671985c894143e977b8be73e4c587ba8a2fa48b842802c1f28256afd
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 350 BLAKE2B b5a231696c069a2bf0868547d1292f8d522237738e4dc05a703a3d81dbffb9ee9a6d1a62f7c84479585d06437d85fec288cff15ecefcf4ed5fdfb65031ba5414 SHA512 99e10e2ca4ab4306eb6b1478ff907d6c205e90de3038ea0eecf9e216b0f725121e129a46d2bcbe31cbbb085aaf6c18a1a1e477058d7571638af0f2e6c6dbdafd
diff --git a/media-fonts/font-adobe-utopia-type1/metadata.xml b/media-fonts/font-adobe-utopia-type1/metadata.xml
index e17a5bccb78b..f7fb30ef1fa4 100644
--- a/media-fonts/font-adobe-utopia-type1/metadata.xml
+++ b/media-fonts/font-adobe-utopia-type1/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/adobe-utopia-type1</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-alias/Manifest b/media-fonts/font-alias/Manifest
index 09c92f98fb74..31cf9d8b70d9 100644
--- a/media-fonts/font-alias/Manifest
+++ b/media-fonts/font-alias/Manifest
@@ -1,3 +1,3 @@
 DIST font-alias-1.0.4.tar.bz2 119248 BLAKE2B 40f4fbc7924c57d17cf7166d0d60c4231f83cbb85225c94e6387c0dc72aef106b1e665a1700ec857784047d9ee04eab422cc1f391a952dfdca1b7cd6af2a503a SHA512 c67ac2ee344a601fcc09471580214b30c3fd6acc4800702840de44f0733e6d18b3faeec2fa3f4e2314025cc1724d7d6796ebaf620398fe350710182fd2c4b07d
 EBUILD font-alias-1.0.4.ebuild 549 BLAKE2B 3ba56d2685b3a10f290b18723c1f2c7317e416f794f57ba14d50c3f6ad117c31554d50e039b254c6f4308148f3084b63378c83c6078cf41bd235f13bdb12de97 SHA512 6acf3b033bcb99672d7634cc636d183367c3a6c78fb0c2cf29243a860f82d86cac6aa2f3f04f2c802ed4edfa9bdb3bf77d47b41ee10b57c8ee47ac8267c147df
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 337 BLAKE2B 7a4202dbc763385b623ee16a9584407dda7da1011b2ec7f80678d75e7346563542475ba40f0a9a9f22c29fbc8130b01251783827dc3e021694f65beb4ca83533 SHA512 4737118a915f00bda509c6025c71e08796f3162d6901e670d44915663fbaac968d266d1324c5c459f70caf646973fd7cd7670edbef8ee4ac077238538e4d9d83
diff --git a/media-fonts/font-alias/metadata.xml b/media-fonts/font-alias/metadata.xml
index e17a5bccb78b..a60b7c4a740a 100644
--- a/media-fonts/font-alias/metadata.xml
+++ b/media-fonts/font-alias/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/alias</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-arabic-misc/Manifest b/media-fonts/font-arabic-misc/Manifest
index 14a478e96be7..96260c919fc0 100644
--- a/media-fonts/font-arabic-misc/Manifest
+++ b/media-fonts/font-arabic-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-arabic-misc-1.0.3.tar.bz2 112136 BLAKE2B 7ccd19008955a016398afcbb1202b9df34e7cfe6937152d443f2ff381564ef1e91dc4bb7dbb4ba6e5931bd7071ac4f570f2d8167dbc58029ee9a88f5ab18a5fb SHA512 46a416bf888afdb54f5dda6c9a7207dc069d14089ba14b262c60cb9ad427784c46e2a61b32a79f1d745e73ea657bbc36b48aa5d4bbd79f73a2d997b027ddfbc0
 EBUILD font-arabic-misc-1.0.3-r2.ebuild 293 BLAKE2B 95da8ad456b1ebcf9020a70e334867d771dcbd2744cd48026ec2725625f74289d8b2c6e7d01117e254d65ae4a6a5f300b4869e2b0cc0290c81cb39460b882ecd SHA512 5aed3f42f90c76f4029ad91469efa690a51cdbb1fc7de1925f17a3d2d7a7cab87ff6025bfecd54dd8653480f083feeb9c2deaa9392e239191443d5dc15c53c73
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 343 BLAKE2B 77512014344483dae48adcde3acfda8f7a81e3226aa7bb8354ac637a98ce8f26ed16eb1162b57963941155d54073642b2fa8b7b43e936628ac11fe89ba7bac16 SHA512 d4b349e73b2ae30aa84261cc463d389b91c8aea932cce026164830c37efbea80fe277fa747e0588ccf540e62a85887f17b07e267e12918784b85b851a444f0a3
diff --git a/media-fonts/font-arabic-misc/metadata.xml b/media-fonts/font-arabic-misc/metadata.xml
index e17a5bccb78b..f73f9afc9c83 100644
--- a/media-fonts/font-arabic-misc/metadata.xml
+++ b/media-fonts/font-arabic-misc/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/arabic-misc</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-bh-100dpi/Manifest b/media-fonts/font-bh-100dpi/Manifest
index fb0ce5c23101..2ded2bd5f37c 100644
--- a/media-fonts/font-bh-100dpi/Manifest
+++ b/media-fonts/font-bh-100dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-bh-100dpi-1.0.3.tar.bz2 713206 BLAKE2B 3433efac96d56d91685cacf3a1ff93fae0378831164381b2e8f16dd216a042c8ed3d0ebd6c622b592b11cefe7822814df57c74e42ee846905a406af208616eca SHA512 60532fb3bd25bad08b1db65f96fdd1cdb2ae5fd580729d7851f5b619f1ed6bdef4fec30111ec408cec9ae5e94f92ad9cf214214c01ac684f3a4bd8d43bafd8a2
 EBUILD font-bh-100dpi-1.0.3-r2.ebuild 369 BLAKE2B 527eb0053cc89382e532d0a2477748936205faf8a8f97a38439e91d06e4bfc6482aec4372d2ab5bc0417bc7caa201f050b06efa4dd20c717dd575fe6273f886c SHA512 f0b09aed478990c7c302866037db72b3b5455da61a2fc1707c64adefea23e94eb643212a702b77286d8195e5fe67f0f31317773a904f7d16d6966c4688e41af3
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 341 BLAKE2B 1e1930e8e5dfd5eab79d0033ceba1296f6e64e617d98b8c639ff9d48c16d411ea8c8e958c05b4c159a08c52ffe5aa8925b41fa2977c2146457df44a9a3a38ad1 SHA512 832af6d13a7c9b59378c28e4a3307513be6b59dc66cfc95848e796387b33db04338886449ea47302d259b67af9b865597e08d8ac0832f684fae3e43b7ebc7ae8
diff --git a/media-fonts/font-bh-100dpi/metadata.xml b/media-fonts/font-bh-100dpi/metadata.xml
index e17a5bccb78b..98adbcc2e96e 100644
--- a/media-fonts/font-bh-100dpi/metadata.xml
+++ b/media-fonts/font-bh-100dpi/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/bh-100dpi</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-bh-75dpi/Manifest b/media-fonts/font-bh-75dpi/Manifest
index 201f5dcbfb5e..9e8531652d5d 100644
--- a/media-fonts/font-bh-75dpi/Manifest
+++ b/media-fonts/font-bh-75dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-bh-75dpi-1.0.3.tar.bz2 553016 BLAKE2B c39213ad487d577763939507c24709413e56147901d4bda5957004ae4c9b53dba4769e93886a7827da4ea149303d92d780f7c745f7de6cd89b6d69770158a52b SHA512 fb19c7fe91b6cc0670b01d5b8165075866ad08796293650d6037d79211ca668decdcc1b3684774907c06073145919655690d78ccdcf2511db38b5879328a9f50
 EBUILD font-bh-75dpi-1.0.3-r2.ebuild 368 BLAKE2B 5e8873a23ce39619e2479f6864b13e25e7036d42c86ec5fd067bfc54c4f85d35135158dd576181e4b318a539e174da5a7d1310eceb70f4100c23cd7550c02483 SHA512 adbdda07f7ef6f712f0fdf047ecd16544d0a84e759565085916f385f6aa25ceff2111c67afbd3aca2f504f44f768adee864b3de6e320baeb4f4fe0cdd10b83b7
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 340 BLAKE2B 0a82149bb52ebecb0ed9156c87a60746fb59b62f9404e33465bf55022cee63871b4718fda5f09c9a20c24cd8903bc07ac6fd1cf7c354bb1c6237626f374a4afc SHA512 53a6cc6782a0530469d0ab7639d7df16250a51196daa3e904a5f941f2f5ed9fa93d6de152fb4ae2bfd2cc9b93ff8a7359e8980117d20c28ba9b4980623d2b7c1
diff --git a/media-fonts/font-bh-75dpi/metadata.xml b/media-fonts/font-bh-75dpi/metadata.xml
index e17a5bccb78b..5272d9cc78fb 100644
--- a/media-fonts/font-bh-75dpi/metadata.xml
+++ b/media-fonts/font-bh-75dpi/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/bh-75dpi</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest b/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest
index 04ca0a27986c..7d8ecd56bc1f 100644
--- a/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest
+++ b/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2 245807 BLAKE2B f2cd40b5621aa3940e8047bd6b2ca588fde367512da196ebfa32469be06ea15c87641da8f81f14191a65dd5eb791de1256e26c5cc20e0dab3883834028003665 SHA512 1862003c20aa7709ea07487a4326c619e2beb33b7069d644f438d64182b41a06039c69e2867921b4d12939612a4b8e1e1727fd15851aeab9a0361060183e3b0f
 EBUILD font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild 394 BLAKE2B fef91b918a13524fba62d00352bcbb1f4b1903ee2a4d86d18397ef397f3842ed2521eaf4993c06570232d8290e9b1c3454d1f0d21470c5e84561ea0767a195c5 SHA512 7f1657b3737de62517cd620c1c0a20bd261fa7c49ac2af2af93012127bab5b4770e3377d4ce514b0b76337eb6c94e3af62d657c4872d3292fdcf838b928c877b
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 358 BLAKE2B 2242cb64886de970ab535d45c88efe309e5be0e7996352d989705718a5c13ff33d7820517c038766cd5726f5cf5bc775276d5a898ef94073f6f765ae0a7c7a17 SHA512 a4bb994e175612673e09a050a708adce009621e7c29f7bf6feb1d6bacc7e049fa27fc0cb8d4ce0093bb1f467890337669bdb9ee617fe8df8e3295f060072795f
diff --git a/media-fonts/font-bh-lucidatypewriter-100dpi/metadata.xml b/media-fonts/font-bh-lucidatypewriter-100dpi/metadata.xml
index e17a5bccb78b..87e9acc2a035 100644
--- a/media-fonts/font-bh-lucidatypewriter-100dpi/metadata.xml
+++ b/media-fonts/font-bh-lucidatypewriter-100dpi/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/bh-lucidatypewriter-100dpi</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest b/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest
index e7e37ac3b235..9aaeae9a6957 100644
--- a/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest
+++ b/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2 219511 BLAKE2B fe05029295ef04414dd37fe80d023cfbf423fd3c314d53cb71dc2e4c623634e8e5b911f7a92851f49dd66cc9939d4998d4ec78f705a52908d01e1dcb91f08387 SHA512 2bba19c10df8e95f95d59d5fc7c15380c91a5140b0fa490497dbdf78a5574adae06a5566941c8c61e4a9850712fc9ca16974173aeee771f41976f472f0a2de13
 EBUILD font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild 393 BLAKE2B f039592b208bbaf4b829f52d1ff634f74d2abc0e74b602a54fc24852428466fbe524f1f6880fe73ffa8d2c30b292560dacd69424c5e3e93b6b10262c17bca3b9 SHA512 0262706024788132a21043a42a3055b90f92f2d045893498150d1a557874591d0e8cbb16eb38b6bf2638313b08bda3d37950c283bd0d2b1b0ee1474115afbd96
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 357 BLAKE2B 79343eb058fc9c8deaf7989fc99fd4dcf5921ddd69f39c6caa78af1b0965b539f3dc8b437ca95ecf2e167e531cf4ad278ef78043d9ffa5dc24f4666a0e7a916c SHA512 a4378a384920b13baf028f5836e114bee74b4b08c8a126ff3cb06b41e73bf1e0649d70b51a4f9a0751ce097a1ab47edc876f5ff68c5051a42ca8ac80e60bf3cf
diff --git a/media-fonts/font-bh-lucidatypewriter-75dpi/metadata.xml b/media-fonts/font-bh-lucidatypewriter-75dpi/metadata.xml
index e17a5bccb78b..b1435abaa329 100644
--- a/media-fonts/font-bh-lucidatypewriter-75dpi/metadata.xml
+++ b/media-fonts/font-bh-lucidatypewriter-75dpi/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/bh-lucidatypewriter-75dpi</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-bh-ttf/Manifest b/media-fonts/font-bh-ttf/Manifest
index 28db9883d859..f15c1ea04eba 100644
--- a/media-fonts/font-bh-ttf/Manifest
+++ b/media-fonts/font-bh-ttf/Manifest
@@ -1,3 +1,3 @@
 DIST font-bh-ttf-1.0.3.tar.bz2 465351 BLAKE2B 2d508265128262b479f184341862687235af0bec4098dec269f257ad3d2ec94de08ccee4701612c9b747214b38587840a4051dbca2fa1852e859482eb8cf6ecb SHA512 36b5b6bbc2894cd90a372e8131281a462b42d503be3e9af8565edbcd954b336690aa86a0b6fb162d865ba71b65669c5b911658c5b820effcea39d086d485be25
 EBUILD font-bh-ttf-1.0.3-r2.ebuild 335 BLAKE2B 4499dc99020821c1ed13bb8fcc300012ce338fb8febcfa0efff804c37443e0b9322219074df440a6cbc746f5c7b168e8cdd115715cbbd2de6914462d45945b75 SHA512 e917876b8632a13a7ee91b48a77201a63c395ddf998635352176ddcdc10ed747d02a37aa5a5c10fa5f3427f5f3d7751e638ae493ce35b25c70b98cadcbb9dd10
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 338 BLAKE2B 353df9a92cdb7dcd02b9b4dd447b2045d5c76116258cd33826bc5b4ffb1f5903e85e05abf782aef2f4a9b0affdfc34153420db0f7fd5c7bf04c1912867cc8ba5 SHA512 a9469ad9f013b3430745f90d9913d166948f199734b98635115a197648850aa6c66c0b3327db30b3da1a349cdb6bee9948daf3b73c5014e7f9df83ee5602368d
diff --git a/media-fonts/font-bh-ttf/metadata.xml b/media-fonts/font-bh-ttf/metadata.xml
index e17a5bccb78b..3aea686ff377 100644
--- a/media-fonts/font-bh-ttf/metadata.xml
+++ b/media-fonts/font-bh-ttf/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/bh-ttf</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-bh-type1/Manifest b/media-fonts/font-bh-type1/Manifest
index 476fd9384020..853a5f8e9f62 100644
--- a/media-fonts/font-bh-type1/Manifest
+++ b/media-fonts/font-bh-type1/Manifest
@@ -1,3 +1,3 @@
 DIST font-bh-type1-1.0.3.tar.bz2 637337 BLAKE2B 122df86566d86a8fa85cc1da3f7d1913a2df589c301540b2bdd73e96726dc5fdb16184f80d8a3a58e6bd1ca54e0f4a3a0f266a35747f500065746f0be209484f SHA512 dc6cfe7d78a549ae5368ddd2bb3edc6746648b32e1f22bce87f6adc0845ef4827cd3b2472d0afa17a16a2c384e84f74f1c7d807510798bc69089920fdc5486da
 EBUILD font-bh-type1-1.0.3-r2.ebuild 329 BLAKE2B ea52ab0b0f402bdb2b9ff0f09e070be87096da888732809afbaf58091ddaf08164a95862848dec39404863a0424682ef57f4fbc449114399ea49c382dbba2239 SHA512 628519cfb444c963de02c7985b4b5074a7f5da095592477c995bc802f6c3e3804d6515b12f05cc600afbbda3064a3c263a8b38eda5daf526ed4699fc49522b27
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 340 BLAKE2B 7745bd7b2bbea9711573d1f836fdb539165109f39234e0860d1a53c903d0cb20b0af4644908012a7cc6cbd72c71fe5e3ab970e1eb0d9e01020212e8e4c0b1b39 SHA512 5555e457025bd9b0086126bc8f3140d37292e30f48448decd18cddcf23d20c3bddd89894f1e8b1921d09e77b9cf2a6e5853bd5cfd0b54f91240e7f0d5f0a955b
diff --git a/media-fonts/font-bh-type1/metadata.xml b/media-fonts/font-bh-type1/metadata.xml
index e17a5bccb78b..08cc4142c3f7 100644
--- a/media-fonts/font-bh-type1/metadata.xml
+++ b/media-fonts/font-bh-type1/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/bh-type1</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-bitstream-100dpi/Manifest b/media-fonts/font-bitstream-100dpi/Manifest
index 2ccea7daaae4..7508ddc1f84c 100644
--- a/media-fonts/font-bitstream-100dpi/Manifest
+++ b/media-fonts/font-bitstream-100dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-bitstream-100dpi-1.0.3.tar.bz2 200276 BLAKE2B c5e4584642f49c30d8a1a17f3384a9bec8c3363ff7bc2cc1cfea8d04e8ad39e3f44ccffb461cf1508b5dc96b8a7fa6612b754cee6214fc1c6e6689c68e650819 SHA512 10fd920d46d2cb1b314e8c2f05c202e9ffa74a4e5315f34790eba8bd8fcda865a6932eb712a7538624e69367647bcd6891e7015099e65463aeef772d0ba58bfd
 EBUILD font-bitstream-100dpi-1.0.3-r2.ebuild 301 BLAKE2B bbfafa012b8666a8039c382888633028cf3a12e39036a93daa15bb058d90a02c74cf69902ecae9a3515c17db97c0ac85a5f73a94b8e14a3a8aef786e6180f933 SHA512 a01f46abbaa75c0b92b790865eb246226e1fc7bbe1e680481dd04c81c06d11d8cf40c75bef2fb63de7d97f3c0f84f56d8e38589eef2bb4ac49d371385057cb76
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 348 BLAKE2B 05d083d2e5a3a381a49ae04090a3a003c46a97212b76c53c558c9aa02f703b213bcb39cc7503d3a9d30f3db87888052d14fa848ea8e8888a32430628d13b101d SHA512 05405ca206ab3c7aba66085dea1e0f7d4672607d54976b6b9d950dec5d20cbef57349abbfce6933bfea85d33f3c020fb3ae69d1b8d7041e117d81765c21e571f
diff --git a/media-fonts/font-bitstream-100dpi/metadata.xml b/media-fonts/font-bitstream-100dpi/metadata.xml
index e17a5bccb78b..b2c576d6749a 100644
--- a/media-fonts/font-bitstream-100dpi/metadata.xml
+++ b/media-fonts/font-bitstream-100dpi/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/bitstream-100dpi</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-bitstream-75dpi/Manifest b/media-fonts/font-bitstream-75dpi/Manifest
index c740dab6cca3..d693fed8f40c 100644
--- a/media-fonts/font-bitstream-75dpi/Manifest
+++ b/media-fonts/font-bitstream-75dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-bitstream-75dpi-1.0.3.tar.bz2 174603 BLAKE2B a4d57cff621d57c27830e4ccf870d74fffe699d0ade6df32300a5f4de1237b263e449fca46879ac21329888820e48efd49f057192ce3ac11aae56243bcc3e1c3 SHA512 9311a5b0cbe1613aca87fdf7fd9ab263eb1129e3c3eacbce54547f2185e151fb1237128b1b6d39f716f28694a486909564ecc9a0aef061438622d11b5661d650
 EBUILD font-bitstream-75dpi-1.0.3-r2.ebuild 300 BLAKE2B b570837682ec83b5aa5790a5a17ccf8fd37efc57cdeb3eef7ebc0f338ef74a51b1468a4982d4e8b9da6a2962a62c44bf3f519a27d4bf1fd5aec75e3d1362e908 SHA512 5af22181a6b9d648f684ecf16328180103e479d6d4fe84f3cf74783b35e24109a7cd8063705748903e7590ea7bce8f2cac077ee1170e747e5290a211c4bc3cfe
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 347 BLAKE2B eb23f45d88568bb8a1680ca22a8b1d5015650bd40ec7f2dc3a93226000ffc65fecf4fed51bfb03ec0ca54e6b043d50554c6f36031711860922d5643b8a5730ec SHA512 64d9facb99cce7c754d0b2c8cd57c61b6498c9b33c0e34ac07fbf3a50095aba153bed7f6c18867cc52d453713020fc92897559dc21b3ce1210483e4aa2e99565
diff --git a/media-fonts/font-bitstream-75dpi/metadata.xml b/media-fonts/font-bitstream-75dpi/metadata.xml
index e17a5bccb78b..711a8b343539 100644
--- a/media-fonts/font-bitstream-75dpi/metadata.xml
+++ b/media-fonts/font-bitstream-75dpi/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/bitstream-75dpi</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-bitstream-speedo/Manifest b/media-fonts/font-bitstream-speedo/Manifest
index d75542e3bc84..2e051ac4f836 100644
--- a/media-fonts/font-bitstream-speedo/Manifest
+++ b/media-fonts/font-bitstream-speedo/Manifest
@@ -1,3 +1,3 @@
 DIST font-bitstream-speedo-1.0.2.tar.bz2 415776 BLAKE2B c9dd88ed2e7e4a4151254ffadf5254aaf460bf72086a798bbb946a3729be4795a477cced5441792e0d6967e6faf4ddcf72a212ec31b5641b5b67357d659b26e8 SHA512 78816cc0dd0c9ba3f1de6ba39754bdf19253fea3583ef1bf459ead4b74f2587bc38bbc0bfdc5066a8055c1c45091e44987f6d15e98b6cf4ee18f60c2431349fb
 EBUILD font-bitstream-speedo-1.0.2-r2.ebuild 295 BLAKE2B 332d92a4be6356aa5156c7dad7076d113bc4facb9a466602bb40b088a8bb711cb29a14c541e8910d8d994ba8ad7818e5e8b54a5403380b0f879f5bcac5017e1a SHA512 e09faa5ba05da04e293be0484be1bab009c7dc9a0aeeba8f234863149d386cc12eff463aa2fee61e87024db93080f0c41e39539affd9ae8bc1defb7b8ec4a7c7
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 348 BLAKE2B 283de69ff593efbc995f4ead5d447084dee5850ef8d50094ca37b200b65d4d4211cc5ab6e66bfe0dcd72766364a9b93f06a002884de890defe067215916af033 SHA512 67682249c5ad3f27906e52a7209ffc35009e6a66b551a6769b99244ee3acdc7933b9c796276a48422a42032d7f498c7ab60b42383e1b8cee4630a2429003fbc2
diff --git a/media-fonts/font-bitstream-speedo/metadata.xml b/media-fonts/font-bitstream-speedo/metadata.xml
index e17a5bccb78b..e216a4fa8a9c 100644
--- a/media-fonts/font-bitstream-speedo/metadata.xml
+++ b/media-fonts/font-bitstream-speedo/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/bitstream-speedo</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-bitstream-type1/Manifest b/media-fonts/font-bitstream-type1/Manifest
index 3d494752ce61..91b46d68b820 100644
--- a/media-fonts/font-bitstream-type1/Manifest
+++ b/media-fonts/font-bitstream-type1/Manifest
@@ -1,3 +1,3 @@
 DIST font-bitstream-type1-1.0.3.tar.bz2 415980 BLAKE2B 6877549e25cec38f46ef19ee3b34cc3c2b0f3aaaa497ab3d26e8514405ad09a384c87667e82a220d14a85f4ca448a1f939739b618e3ae62c1214b7c7de39a422 SHA512 71883f7fc0a68b4fb8ef30b8b8bdfd73ae1194b6d6495abde6c819eef7a91d6365ef1b4cae026d6c3fa7fddecc643b46b7ba1232cec404fcada49a92aaf1af61
 EBUILD font-bitstream-type1-1.0.3-r2.ebuild 306 BLAKE2B c326316eba8150d5a32e30f67445a37c085b6b2b0b1aa548b962e001d5c59dfd4950d6aebf04fc28b6fa98ce9b21f1cd6bcb3c4c0c786177c72d6b74263838f9 SHA512 5a2f1aa5878d341521395505e1df555943acea3018c6832fe3c2e5f4f7cddc206c1dac1933288997b77c03b71de36b10362dcb2d89d9f382265a50cc2034d001
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 347 BLAKE2B 579c49126358e7d6badf1e146fb4b2ee252332de9d2397b18bfd5e524c2194171394b9dedac9077f2d78b383d6704132a13e58f5944b57ed83ed2567d7789844 SHA512 f4986ee7bfbb3c9e15e2ed65c685d66e2be9fdc7fa9bec23a264b8af901996c81cb554f8afaedaec54e5e7555d2bf095c47f0c2f10c366038107050fa4e0b255
diff --git a/media-fonts/font-bitstream-type1/metadata.xml b/media-fonts/font-bitstream-type1/metadata.xml
index e17a5bccb78b..ad8eec6a5eb5 100644
--- a/media-fonts/font-bitstream-type1/metadata.xml
+++ b/media-fonts/font-bitstream-type1/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/bitstream-type1</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-cronyx-cyrillic/Manifest b/media-fonts/font-cronyx-cyrillic/Manifest
index bb57a2fa4605..89c88bb042ad 100644
--- a/media-fonts/font-cronyx-cyrillic/Manifest
+++ b/media-fonts/font-cronyx-cyrillic/Manifest
@@ -1,3 +1,3 @@
 DIST font-cronyx-cyrillic-1.0.3.tar.bz2 262896 BLAKE2B 928c67c3adcedc7e507d097bd522493f4f035e43037792f88e7c239f26b955734023c7c4686e51e9f001804f3f0bffc5025cfed50571bad19c27917fc4f92ef9 SHA512 b926c425644f94548ad831c38573009ae97d207a05c9d8a917018c2518911960280eb3861ae11d99bc8d001fb0dca1967712fb70ba4f413bc9d6ac8ef904b456
 EBUILD font-cronyx-cyrillic-1.0.3-r2.ebuild 299 BLAKE2B 4cc69411e2d70de1192e496e9b808e8b37b610088ebab4445908e62b698df53eac7e9ee13a7722f1aeeafc7981e9a2fc5b6c69b20ac267e29ed766c6d4a2a58b SHA512 cabc9a3b822cf34b201ecdd9fdb1691f6e12b7fddd69c4cec9616e05138395267429815b070e56039c66ac5bec6c59c93a4b0e40ac992fbbf94bbb8f90dcbe26
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 347 BLAKE2B 1c687e90a236e88d541b564f14b9050e748399a17db8e2ff5a1b2de6508bf8266d0ce75995a7449bdf454cdd5943e25d830ef787c6fb107f5aadd9a2e6119512 SHA512 fe088a531729d6806cc0f6ffdad0bf1739c638c804d0c20a5d26e95a48fd9f7864cfc4bcd12cb93def22ab45a44a1b7adf1ae1eed3a6d59c8eae91b13f9b72da
diff --git a/media-fonts/font-cronyx-cyrillic/metadata.xml b/media-fonts/font-cronyx-cyrillic/metadata.xml
index e17a5bccb78b..42a91933036d 100644
--- a/media-fonts/font-cronyx-cyrillic/metadata.xml
+++ b/media-fonts/font-cronyx-cyrillic/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/cronyx-cyrillic</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-cursor-misc/Manifest b/media-fonts/font-cursor-misc/Manifest
index 8cb4e7e8de7c..879c3ea0ffd1 100644
--- a/media-fonts/font-cursor-misc/Manifest
+++ b/media-fonts/font-cursor-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-cursor-misc-1.0.3.tar.bz2 102041 BLAKE2B 13ed204f19b64c0e392664665bf670a497b9ad9efaa748ff521787d8f3f0e170c9361dccf97c4e106be557743b57ebe61fbe346f7e0f71fe733df9c6aa378f14 SHA512 7ecb7f1c3c11da8b81fc0ff121fa6c1026b11f6c7878ffd0e4959df036511bc579d6b0552422ce13e26a8d188e3406631d2de55cab6b29bc7fce0416a8cffc83
 EBUILD font-cursor-misc-1.0.3-r2.ebuild 295 BLAKE2B 99c862fa432241cc6553469fb4eb46574c5a582f3b1d22c877fcfeeefb5da0f6384710e54d4c5d6e86d42a07ad7ba488095dd3e98e1005bc564e472b8a2014f8 SHA512 b77a526a35af2e3a43e8ebf5e6cc4d94b50d6df10def5dea5c9069c92f71ae3700a17eb98699b8e4e1b0191bdbecd0a70e9762b90bcdb3534e2ab308c2d743bf
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 343 BLAKE2B 2184430c19d6c6f239a17656dbb5f675508a47a2f80136b9dd2b00d689c038f896bc78557f95896919656b2574a68f6b21e910991bfb9410633109cf31aa040c SHA512 080a4b55aeb527f40581fcaff03f3d636893e50e731ed6c9289e922bd3da63f4ab262768b0b63375f12ee36710db656a56fc2625aec6744141311f06e74ce624
diff --git a/media-fonts/font-cursor-misc/metadata.xml b/media-fonts/font-cursor-misc/metadata.xml
index e17a5bccb78b..571a92472ed5 100644
--- a/media-fonts/font-cursor-misc/metadata.xml
+++ b/media-fonts/font-cursor-misc/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/cursor-misc</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-daewoo-misc/Manifest b/media-fonts/font-daewoo-misc/Manifest
index 1c1de824bccb..10fc868b3589 100644
--- a/media-fonts/font-daewoo-misc/Manifest
+++ b/media-fonts/font-daewoo-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-daewoo-misc-1.0.3.tar.bz2 723414 BLAKE2B 5edc33bb4b3e870158235bcefebde9bf0858e7c9ab766659e2859c69562338746186d9ff59bd2b6bf50abe2054b4f595cb7b55454cf671780f28a3245d208002 SHA512 7e97bc580f66a1316e366617d34e1dbefd576b47b9373ef34833aaaf2fdefc50befc2add5f038915db0b45fbdd56b77304a8a980bb72726479d429085c406f06
 EBUILD font-daewoo-misc-1.0.3-r2.ebuild 286 BLAKE2B 3107f810b6fbce73dcd693d0bf2d9dc7ff9037ae9e84e8c9b697a92b532cacd86599145c31e4995e02e7139804f77d3d33eb46c12aa8e19fab30fc9d0de620e3 SHA512 cb950efbfbef72ba5a277f9665882278db23a9100a8360a4718097d0e5693d7aa60728b231e760f00b979207e26f1235b103f0f0d788c165fcbaaedc8c594951
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 343 BLAKE2B fb3b217983d1d157d59989d953203c041fbd302db820505d5b87a56701ec257684796ce6e4621c7d670f2e0d5e770239b23a713643d909d784fa9fac77905aee SHA512 184890d4a3cbb3f39ef24507ea93391e59d6b23afa30cdcaeb03adb39d377d57166c8ad3e746ee196b2d236e8c041c016a6017894ca9de8af82b50ae018ef5ba
diff --git a/media-fonts/font-daewoo-misc/metadata.xml b/media-fonts/font-daewoo-misc/metadata.xml
index e17a5bccb78b..5032db281fc6 100644
--- a/media-fonts/font-daewoo-misc/metadata.xml
+++ b/media-fonts/font-daewoo-misc/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/daewoo-misc</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-dec-misc/Manifest b/media-fonts/font-dec-misc/Manifest
index c876f1f3272c..e5c87baf0cf0 100644
--- a/media-fonts/font-dec-misc/Manifest
+++ b/media-fonts/font-dec-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-dec-misc-1.0.3.tar.bz2 99832 BLAKE2B 930c1435240a485c2bfb55234f767da4aafdccd2fe3d7c5a760acaefc4d145a68bd0cd5757d4daeed61d8f3ef4eb9bc473454402f6eda62d4a298c79bcbdac6c SHA512 af755d51c4c59cdbe5d3dccf37990bc787373958feb984bb037c8d8aba8a0eb410965a3600886b5123d89e85e1ea0498b84dfa384fccbbcbcaf3549b83c839c6
 EBUILD font-dec-misc-1.0.3-r2.ebuild 280 BLAKE2B 2125637b9e2d2eb24b46907e00c1b13ac329abb34a5d6ef864f4c7d830777e7531f67c5927d051c94166b2e1d4f26c5a4de13081e1392c3c37f4b0f0e5cea285 SHA512 e95d0cc5653549491b667a4927821fa81a274cd3470d2df116691d2d48e8fb600a58290a874b51f38df8f4e90e5f8a4c7241eb694d74ec449a603a77d55eddb8
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 340 BLAKE2B 5f6fcb18d216dfefd3560892f553b5b32b80bfcf91660d535b0f353cf8f4bcf5374f1af2e48ab0a46bcbf006d7b2c25a9943dd5bd5499f417a9a76f90a72e461 SHA512 082629349694609620c800048e57e011f50001247ceb42078351961ef5cea0f4e183bc1ff24fc8a86d105ea9054dc935858f5a75a821d96d9628126556649e58
diff --git a/media-fonts/font-dec-misc/metadata.xml b/media-fonts/font-dec-misc/metadata.xml
index e17a5bccb78b..422570567280 100644
--- a/media-fonts/font-dec-misc/metadata.xml
+++ b/media-fonts/font-dec-misc/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/dec-misc</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-ibm-type1/Manifest b/media-fonts/font-ibm-type1/Manifest
index 6a317f917e7f..2c136182ddd6 100644
--- a/media-fonts/font-ibm-type1/Manifest
+++ b/media-fonts/font-ibm-type1/Manifest
@@ -1,3 +1,3 @@
 DIST font-ibm-type1-1.0.3.tar.bz2 376985 BLAKE2B c8563fe5fb44975dc6d99f8ab106c3040276280969df6fd33db23470eaa49acffb10224fadf19867d71346d357bce96a2be898d256fa7adc9be66469dd822293 SHA512 cbd179522c936c4f956ff1fbdc48fc3a55990083b4f858c938c6a54c8526641b4f25eb3a6795d774630b75a0f4fbdf9c16e861e88b2cd95f04c524f95d40f90f
 EBUILD font-ibm-type1-1.0.3-r2.ebuild 288 BLAKE2B b56ea5ad64cfadbbe4bac1a9ff101ed3db169411059b92d6232b0c12b8cad083d3c2c157a7787458f7c6acdcfc1e60e82cfda72d8e5d10bed45a31b35672f71c SHA512 263e59763b375c4ff09ef0e4ea36db4ecab03489488861a5cf529da0419762f22c8986fc1e79f7927da2290aa61c275028f9bc09d73a00e4a0546069ea43c807
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 341 BLAKE2B 7f736bf8fe43d9b933b0fa1084695d76065be906682627f1cb71a88dc55ddbb36c338d318f1bba04488d67a487b6e043217081e8cad5bb029292b7cbe58bdbde SHA512 bd06ca8b728936a267b5c31b386c2e405f317d2df5d694e098b2220798908edbf05e3ccebad08e77670d3231a785cf298412117e03e53718679cdb81ed1cec5d
diff --git a/media-fonts/font-ibm-type1/metadata.xml b/media-fonts/font-ibm-type1/metadata.xml
index e17a5bccb78b..97adc27be185 100644
--- a/media-fonts/font-ibm-type1/metadata.xml
+++ b/media-fonts/font-ibm-type1/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/ibm-type1</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-isas-misc/Manifest b/media-fonts/font-isas-misc/Manifest
index 20a8eeaaaccb..8b2bba78147c 100644
--- a/media-fonts/font-isas-misc/Manifest
+++ b/media-fonts/font-isas-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-isas-misc-1.0.3.tar.bz2 845282 BLAKE2B 4c05c83b64617e1f0740d54c53b13b628affb8c9cef43e785f8101ab5a7fa730d9500f2af45a1c4de658e94e2d7c5e467b6e4761fbb27f4767fb8817e77272b1 SHA512 be6fb1d2c53550a462d1ab010fa7ac913990e83a22d4580c93b8f1f087aa6caa0e46bc87debca2b13b10e5611bd2fe7f6b4240367fb24f59b37f68ffb0e2586b
 EBUILD font-isas-misc-1.0.3-r2.ebuild 330 BLAKE2B 39c08b2a7e1a080560b827673e307744a2d48a5460ad2965b18789261467215fe3e35a381192796b5c8edb2c3fd132b0b630dee48c402c6fdb2d551320b2afab SHA512 e5a282b56621a082524deb2ce55b72789a00d875653a1bb5423c22069b127b40fb99ac74d7fc4fdc2d72f2f9cf812a7177c883766a714c574733b50f373a5995
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 341 BLAKE2B 8d3e0e274660769f9b1c063415678d80999b811bb921fa4c19506754f2fe6c62514f59e4e9e0f27a4c94652e818c0b58e6b99ec53cca7237c40851addb576956 SHA512 be7960222dffede9786b15697a3322584be002cbad9790eeda019e154d23f5e43acdb4bd673d0ddd2442a38351a3c5db26b2319507ab9d2e24c4769c83327819
diff --git a/media-fonts/font-isas-misc/metadata.xml b/media-fonts/font-isas-misc/metadata.xml
index e17a5bccb78b..236d66e28f3e 100644
--- a/media-fonts/font-isas-misc/metadata.xml
+++ b/media-fonts/font-isas-misc/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/isas-misc</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-jis-misc/Manifest b/media-fonts/font-jis-misc/Manifest
index 21badf90d8bb..0c393ac4d0d1 100644
--- a/media-fonts/font-jis-misc/Manifest
+++ b/media-fonts/font-jis-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-jis-misc-1.0.3.tar.bz2 621946 BLAKE2B e188c7f1d0e0b22912062dc94f1e9dba75c0990a497b88886e365d635621366af940d77ee2e7eb5f687e2ea6296cfbfed14ec45a0aa59c1d803010e7b8a6113c SHA512 3ce4c96d54440045e84f54f7d790e350c05b0c56a72491941f2cd9ed7e2d1735ff4b41667501cf08d5d81ee19c9de6d43f88a8b59a3c5c55de9fb1696cae208c
 EBUILD font-jis-misc-1.0.3-r2.ebuild 290 BLAKE2B dede57359d016b428a4afc6a773d6a0f09fb3e0c913f43c5fcd7fae94b8f96879ea2efa95bdf5b1baaa0ecb27f15268460f8797c6467f3ff3c4a638ea740dbab SHA512 8aeba8cf556e64c0ed3656daacb9a7ddf75fd6abd1098d2d83b3c5f26d28c5d5b6063cc59af31f7766f994a94302f0607d61e04a72f83f2f38195a71ea3b2fb5
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 340 BLAKE2B a44cb1d8db035442895e648f70877d133e8e7f51794d67e861956f92e1b02a1b1e7ea3f638f2b8959c5d81b8201398a35d0042a1e22e457c4820043b0d813e20 SHA512 6db86dce7e21b48a0326ab8fbd5a85300747e7c6473a6dfa3bc6684252684cc3772949d22f3d0d8ca920087ab8fe15f5aec7ec4ae58abc56bc73543f3c1ce235
diff --git a/media-fonts/font-jis-misc/metadata.xml b/media-fonts/font-jis-misc/metadata.xml
index e17a5bccb78b..975c087c1c7f 100644
--- a/media-fonts/font-jis-misc/metadata.xml
+++ b/media-fonts/font-jis-misc/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/jis-misc</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-micro-misc/Manifest b/media-fonts/font-micro-misc/Manifest
index 0e23764a8df0..0a3a4fc654a5 100644
--- a/media-fonts/font-micro-misc/Manifest
+++ b/media-fonts/font-micro-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-micro-misc-1.0.3.tar.bz2 98366 BLAKE2B 98e6872807c35d6fb8bda2be46fbd0d23720af967d068a6abdbf20ac364484d8acd9f4217f739d853c9d373f3c86c1519ebc9854ff671adf955c603ede7f4c7a SHA512 7a546432225c22ae0aacf9ce88b617a7d1d6678ee1f5eb4b3a93e33764fb752f27bca3feda1312182517bbf7babd5f3700bb9b8de0ef6c35b1ae6e2ce7ab0b69
 EBUILD font-micro-misc-1.0.3-r2.ebuild 312 BLAKE2B 03defb309a37e5bd4aeeda9f3e149fd15c0598aa53326d9d2e111533a5970129c73e3b3b72559e7e7d98858bdcdb1b0c25d3146d5542395961f399f209b5116d SHA512 8ace74d7707300d989bfa5c2828e1df8e8cd1603a1f6128f36ffdb918c9f8547c352ee99e39841a1e418f96fbbed3f7d255cf791946a4590cb911e24b7abea5b
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 342 BLAKE2B de59111645d249e06f9f9a8a8d639d0eb1ae461c37839f57ee2826aad0dd9bd51ecf2e66d8807b88c4ba1d8b7670e0f74a8d47aaa8ef5084d481c2d538b1658b SHA512 505d32057a077a95832355d4ea08b768d8407b2cec11cbc47ed4f83323475ddb7d9a1a92934a0fb064d46442b78dfd79e3d916e54c390fe4677c242c3b133a43
diff --git a/media-fonts/font-micro-misc/metadata.xml b/media-fonts/font-micro-misc/metadata.xml
index e17a5bccb78b..0cd6e5291ebe 100644
--- a/media-fonts/font-micro-misc/metadata.xml
+++ b/media-fonts/font-micro-misc/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/micro-misc</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-misc-cyrillic/Manifest b/media-fonts/font-misc-cyrillic/Manifest
index b1257ebc298b..6d8367e7db68 100644
--- a/media-fonts/font-misc-cyrillic/Manifest
+++ b/media-fonts/font-misc-cyrillic/Manifest
@@ -1,3 +1,3 @@
 DIST font-misc-cyrillic-1.0.3.tar.bz2 125971 BLAKE2B 4b714d9254f00e88537597629944d906766c5f89729fd944a276bbce3c05cb13d5f538e7e046c3bc5651e2a230ccddcb249032228ca5837d04a245fd2a9987f2 SHA512 75e49cdb633f7ce5b9612d5adb0a85471c8fde5d55e8ccd9302f79f01e99e78b02449642c2cf785289f58d833bfa62042fce4253093fb17c87471559d1f9bdbf
 EBUILD font-misc-cyrillic-1.0.3-r2.ebuild 295 BLAKE2B 9dc23325c1d9afa52be90da4c92ed4fcfd0cfe878a043727c72d99adbd4e0b1e4c9b3137f2e0ef92318cbbf937fc386df2aae40133ca99d0917035632d8346a2 SHA512 b38e50c7b14450e9951fad0a4ed49af892061d3c9f5bf6cba4907891d428a4b79db4c0c6404ee75ed9fcd1a565986e084997955ca2284a83b35f2c3d2586215b
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 345 BLAKE2B de76977f8b8b33f8028373a807a1a3dbad59e0573d53841349e8f26a015a3fb4508b4eb35da502bbbb3aff07bcab7c8b5321d4b260b5f100ac2624b0e7a16442 SHA512 a3685291b8aaef1449f55259a73a587652bf21db10f14a8ade034ddc9e916ecf64397b53f978142a9c62289fe451fdacd5921d19365372e29c52ae3c86f665e9
diff --git a/media-fonts/font-misc-cyrillic/metadata.xml b/media-fonts/font-misc-cyrillic/metadata.xml
index e17a5bccb78b..319b119ca252 100644
--- a/media-fonts/font-misc-cyrillic/metadata.xml
+++ b/media-fonts/font-misc-cyrillic/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/misc-cyrillic</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-misc-ethiopic/Manifest b/media-fonts/font-misc-ethiopic/Manifest
index 3d5b756b34a2..72b9d24990bf 100644
--- a/media-fonts/font-misc-ethiopic/Manifest
+++ b/media-fonts/font-misc-ethiopic/Manifest
@@ -1,3 +1,3 @@
 DIST font-misc-ethiopic-1.0.4.tar.bz2 270076 BLAKE2B b27d188fcb5be3e4e5fed810f26c0f5edf5a51a3532bd51b44e55283518bc1a353054da4f37c5535197eeb6958bfe1567ab54d1d9f428b046b84c5d1233aae21 SHA512 4fed9ff3782746898c56dac199e9ca89356f4967779937049b9ff4ffad202317c023859f92d44b371dfa5485d5368ccad648e64b12cde0ed21f7d4aee5affcd5
 EBUILD font-misc-ethiopic-1.0.4.ebuild 744 BLAKE2B ef067207530c44e2b272a7b521da31bfe6f252ecc4b0ee51bdc5d9b106b74c861501cb1ff883ac1a1386042db8c09ddb856df8c15f2923dffc1498e84c24a699 SHA512 81b63081af7ed36f1003fbdb54713216e443f601924a3af08c9830b2ffbb1bb15577bc676f97d5bcd6fdd4a4fc8ab0b161364d8322afad9e7dbd3bbd288f3702
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 345 BLAKE2B fd2d91ddac540c448d4a5e6033255b74cf20e1cbd0f7116b62bcf93c91f21afbf7bde070b8c4b233fea1499636d6e4f34aa15c45e2a2c50cadddd64b0704d4cd SHA512 64522a3bb3a8dbdd636466b02d9740df8664950076ef72af3673ed57512b9ac1dc9d61f325cf809d25997b3092ace35c5dd15c0bb012046f5ae9fac4fda78387
diff --git a/media-fonts/font-misc-ethiopic/metadata.xml b/media-fonts/font-misc-ethiopic/metadata.xml
index e17a5bccb78b..b4891690723d 100644
--- a/media-fonts/font-misc-ethiopic/metadata.xml
+++ b/media-fonts/font-misc-ethiopic/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/misc-ethiopic</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-misc-meltho/Manifest b/media-fonts/font-misc-meltho/Manifest
index b5d72366b5d6..1347a46ebc0f 100644
--- a/media-fonts/font-misc-meltho/Manifest
+++ b/media-fonts/font-misc-meltho/Manifest
@@ -1,3 +1,3 @@
 DIST font-misc-meltho-1.0.3.tar.bz2 1578992 BLAKE2B e76691a76d1416c7e7188ca53e0ebb639269333f4078fc0de9c1b7ecde69a7985115f7a347e55a3bd86a268b0de36b7a02ebaae343743dd7cc934038928cd7ea SHA512 3f42fe3e127f74259d50754f4bb6d2560cb32d810fecf663bd09fddb34829d29b48f3cbfaf43d02dab70b559afb2f806f321076f83450ff3871604345a0cdb56
 EBUILD font-misc-meltho-1.0.3-r2.ebuild 308 BLAKE2B c9b10b6d34a95f91549be486b6322d38eaf82c0f82f0b0e129c556f411fa5189df15d07aa42cd0c80a739e2cd431fa99b130314b8d0754a29b3caba699974b27 SHA512 c4cedc0198a954aa758091075aaac7d5b8b4184941cd037385e7d372d79b237a7ffe6f0a595865c8c2f62cd70fdb9d5463e8deea755441da6629c50513ca6715
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 343 BLAKE2B c5c02898b99cc9b63a5eb3cf8deed166a9bfdef3d6dddfbba50fa751df19b6d07b5015bf286cb89f5c822bfa1faa3ed2ee8d543d1a6571bf2dc9fa87449bc8cf SHA512 54388cefe78fed20e05d805374944f182b7d0879c5b889ed34a32c7fe8488d2f4a5ad890a2e97c16ae3caaaa3359d4387a7e9bed8915bb534a641018da0c9e35
diff --git a/media-fonts/font-misc-meltho/metadata.xml b/media-fonts/font-misc-meltho/metadata.xml
index e17a5bccb78b..3b314207f3fd 100644
--- a/media-fonts/font-misc-meltho/metadata.xml
+++ b/media-fonts/font-misc-meltho/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/misc-meltho</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-misc-misc/Manifest b/media-fonts/font-misc-misc/Manifest
index 5972b02ca0c6..51a5863a414f 100644
--- a/media-fonts/font-misc-misc/Manifest
+++ b/media-fonts/font-misc-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-misc-misc-1.1.2.tar.bz2 1933789 BLAKE2B ec60ab2f9c18b5dfe272ea48f46d0af064b1d156bbb87e261a4c1ad60f5771e4a2b3464f054e6264c16e978083cfbb3dbc05a8f96f2041c1efc61f4bf4ee0ab6 SHA512 d0bf74142f9621746846ea7a6fe9ae298a303a09c65e05c7decb4f37b2f513a88d727bf3dc5a3566c30de83b83493f164be0118b41d704464f75700b55018c74
 EBUILD font-misc-misc-1.1.2-r2.ebuild 394 BLAKE2B 2f219aa607fa4a6923bea2da17c4807c3b60564aa0ea470b3082c95252e10faf45a14c84fa0681955607c21602383f60202c0db2f20f8c03674179d4f8b14317 SHA512 c8b7c488419f5b8dc9a1838367f8b856a2a77a2c6c4cb15756518d6d34e57c1da211249509e7d08106aed87e2f1572fc1f675fb76f36d7667da91713fd43a9ea
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 341 BLAKE2B ec40d561e4bc60a47a236bc238303bbbac93d36d2987ae720de78874d306137837937df8a255095effa0c877c59bb9c290c53a91cce853141fc6f61fe2d92f45 SHA512 a5c9b5511d9bca451bce77980a3af80d674c7b638300018754ef513ebf63a825d1b6ddd3ecdf3cc87291239f3c4b24db20ec71aedf3a7907177705919a1b9a59
diff --git a/media-fonts/font-misc-misc/metadata.xml b/media-fonts/font-misc-misc/metadata.xml
index e17a5bccb78b..31df163bfcf4 100644
--- a/media-fonts/font-misc-misc/metadata.xml
+++ b/media-fonts/font-misc-misc/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/misc-misc</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-mutt-misc/Manifest b/media-fonts/font-mutt-misc/Manifest
index 8522ce16a97a..58b368334051 100644
--- a/media-fonts/font-mutt-misc/Manifest
+++ b/media-fonts/font-mutt-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-mutt-misc-1.0.3.tar.bz2 266510 BLAKE2B b3e460b5837accf613c9a4b5285a40f160bbf1b791cd90534cfb58da4f1857c1c5ec659ff4b1b6268573574ce2f4ff7cf6bb5abd7512c27fffd9696fb579869c SHA512 7b152f6c1464d806b1f76664d9b619858c3cb3ea63027b6be1f69897e939e3a0b5312ddf230e0a42a8f3e3701e50f41917cac6ce566c05bc74dfa49bdf2ed4db
 EBUILD font-mutt-misc-1.0.3-r2.ebuild 286 BLAKE2B 47099820ab59fcf390d761e16688323ab4e3464eb977d990e83988f59471e6bb6441ad54314f375bfbaae9671fb9ec31620a3a6c6106e6aee945a1813e025c41 SHA512 5597072724a73f2e5dd9c5dba70c989e88647953de8a02509e44bd910c3750e8351b6a34b6c69536337d715edf6a2d0868b5bf045f2442e5eff4334ec850febf
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 341 BLAKE2B ba197b5d1010ddb46809a80ebff1455e91fa3930a7fba30e2e391fbbc0758084169db2d24649a8d4527dd4bd807bba9b804200de38f31a024eb4ca313af459f8 SHA512 e419842a037a546046c4b8318e4d20d24158728ee74c9f1e23d4c98638a8455d4589c3249377b06f67754867984fcc513a53e2062be74ec3612880abc7de5b0b
diff --git a/media-fonts/font-mutt-misc/metadata.xml b/media-fonts/font-mutt-misc/metadata.xml
index e17a5bccb78b..e74ff210d68e 100644
--- a/media-fonts/font-mutt-misc/metadata.xml
+++ b/media-fonts/font-mutt-misc/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/mutt-misc</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-schumacher-misc/Manifest b/media-fonts/font-schumacher-misc/Manifest
index 11beb4f1a0a8..e0006217c46b 100644
--- a/media-fonts/font-schumacher-misc/Manifest
+++ b/media-fonts/font-schumacher-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-schumacher-misc-1.1.2.tar.bz2 141170 BLAKE2B 4a71f13cbd81b50e4a71968561a621cb562172ab547f5dec65e28f610a1053067029e4ce5b7d10452ea3426c459049962da8855f9d4e111ff6331bf6e706041b SHA512 f37a2bfce95458b11376c89767b5adaea03dcecd7ed5b99a19a3d263f48e70b15bf679826a794c55da26b5f1635ea5fa5772ffe44c9f77a1daab0744ed92300a
 EBUILD font-schumacher-misc-1.1.2-r2.ebuild 305 BLAKE2B a7d600b6753b21695b922ba7e6cf53aeb29b199a056bd9d6abf4afd7d77f3ba914b2268fb779550ad3c95c9926d84f86902791f76ff8bf6d27195bb99e7d1ce7 SHA512 1bc145f02934df44842cc33db54293b3c46ee63ee50b57de0fe9563bb06aa6ff397cebcb59b7557041877279474f4b72b15a49ae9c58b283603a187d2f643b40
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 347 BLAKE2B 4fd3b82ae0d4f819d9121110a0e9c81a44ce499b390b9d94fa99e2fd21494218aa30c285198302ec53c50bbbbcf540ed06fa5a2d126ee643674cf68adc209116 SHA512 a3fb76f61271bce0986109d6ae0fe5d6ab2aa9a8ca5ebc71511d8e9fa0e7d91a4fc4397477a6694d31bdb44337802974b0aaf0aa715370a5517d1768b73b7ab0
diff --git a/media-fonts/font-schumacher-misc/metadata.xml b/media-fonts/font-schumacher-misc/metadata.xml
index e17a5bccb78b..5d2df844a1ae 100644
--- a/media-fonts/font-schumacher-misc/metadata.xml
+++ b/media-fonts/font-schumacher-misc/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/schumacher-misc</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-screen-cyrillic/Manifest b/media-fonts/font-screen-cyrillic/Manifest
index f7182e50e5ce..c114f7a24dbb 100644
--- a/media-fonts/font-screen-cyrillic/Manifest
+++ b/media-fonts/font-screen-cyrillic/Manifest
@@ -1,3 +1,3 @@
 DIST font-screen-cyrillic-1.0.4.tar.bz2 103168 BLAKE2B 6ef447905bc848dc7e31aae0f0c7649e17dbc46ccbb8a09da60cbd1a232891f0777558febd6e91e7844b66cc25796ad54ad6600ce033ff7f493741099c67b52b SHA512 58f12a4cbd18e323daad75b32a01ab3980dca0046f8dd94ff4452606ab9316b8a208dda3bc8e9346c02993bd2b8bb2b3dfe3413ccf9fc6a907fc1ea5d236fa51
 EBUILD font-screen-cyrillic-1.0.4-r2.ebuild 299 BLAKE2B 7a1627c7dcd08ab348fda294e36f4c42306b6e7a4dd8c0159bd109ca0dc0816f78f005cba3d2bee81eca6bba1fe0e1f7d5c72aeb36cb6317b30580e72385ec2d SHA512 e69785c383ba58c73e77caa7667b553bcdb885f43ca78f32f292d8659dc1281250e31edbf29a171295265edcb79ff43ae58551eb19d26237437795b3e1521f28
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 347 BLAKE2B 2ddd3b9945544506be2e2d16ce94110460bcb534b8f5a1b5c70ca1bf97d5474c1e614d9106d7a532a58b5296d7e26c7969e877be6deab1017a85efb9b1391431 SHA512 370e46a3430dbc0c4bc3fafe82a2b175a0c840b878c7b1b89ded4b93e9c2869354717ba3701f392c993fa3597839bf6fccad25f7e3cc43bd0be85e491a081335
diff --git a/media-fonts/font-screen-cyrillic/metadata.xml b/media-fonts/font-screen-cyrillic/metadata.xml
index e17a5bccb78b..9e7b341ba6ac 100644
--- a/media-fonts/font-screen-cyrillic/metadata.xml
+++ b/media-fonts/font-screen-cyrillic/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/screen-cyrillic</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-sony-misc/Manifest b/media-fonts/font-sony-misc/Manifest
index 4e3895161350..8c2a776a1e1e 100644
--- a/media-fonts/font-sony-misc/Manifest
+++ b/media-fonts/font-sony-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-sony-misc-1.0.3.tar.bz2 108098 BLAKE2B 7e095c70f6f10e8fa8e65686622ba443ab49704727e8d9e4067f273e160cfd1c0a0a475c720405ac1a5df8e87cf17e8f5ab53ba5baef80f6145d795a2ed419a4 SHA512 c397b4e5081b2946799d701b8c48fca9fd2d55b8fa1dd96d2b29c5cd9996bb7356ae12671bf3bd964e6313bdc154020ed6377534e59ce53067e955e4b37aee1d
 EBUILD font-sony-misc-1.0.3-r2.ebuild 282 BLAKE2B a59deb16ebd58dba6d497f42671790d326e25b9bdc205bf2000fdd2845618627636d0c9a845bcdbdf66b87d4759cf32452735a0fc61b2af61025ef4341505151 SHA512 a6b059b961e101b9920170adf083f37fcb6e20d6f48c0683831121e2a06ed6a81e96e38d05e3ff17bfea172ccd3ae13d35fead5b52a9b2d442827fc8d0197561
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 341 BLAKE2B d32797229d3819a2bb0f432fc6499cf38437d905a04b243e65d38aacc7962115b7496bddb03686ad1a97c48d5245f2c20cb39ab6f8aaae75bc1de93e288453bc SHA512 1008e795a408f2d1e64c2a38ca1abae368eec607b337dcca87cc64482f1db854e18d50827b48ceab6c03568a8bdf5ebe4462ae5c7ec4dafb2010189ecfe8cfd8
diff --git a/media-fonts/font-sony-misc/metadata.xml b/media-fonts/font-sony-misc/metadata.xml
index e17a5bccb78b..ee6fb5e9d62b 100644
--- a/media-fonts/font-sony-misc/metadata.xml
+++ b/media-fonts/font-sony-misc/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/sony-misc</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-sun-misc/Manifest b/media-fonts/font-sun-misc/Manifest
index 23e94e4f01e1..9ad3709c8367 100644
--- a/media-fonts/font-sun-misc/Manifest
+++ b/media-fonts/font-sun-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-sun-misc-1.0.3.tar.bz2 116360 BLAKE2B 16ed83ef2fc7007670ac91f8356c8bb75775f78cf0a308fd02c2f702d7d2727702ead24c83d843c267ef4ef636f4fd1f0a59d3ffd0883e55e78f87d9cfabd8a7 SHA512 52c4a38e49a94831999652d9830da841949c319083ea40492e83690e1e5c2d31ea1979046a420af0e51bc105b8697bb06b4a438485e82b130d7469ad4519e275
 EBUILD font-sun-misc-1.0.3-r2.ebuild 304 BLAKE2B 6a10879295bdf287ca7f1c6feed768d9158826028d2be6f7457ad7bfd7c9164683785386a151a6931e81f893e6bb325b6e0c7903234172d6973be70d4cc952d2 SHA512 cd484e2aeb291be28c44e294e5c1ee19d5598c428974004fe6aa0873d9a7e16b2cbd159b4cae2d57cbe4a3f21d52502d7e0ddfbd5a5c343e6113729506b06002
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 340 BLAKE2B 46997a05c1628085c72c1c54239c12ed8acc4cf19a18f740317979127d7cbe9c98f7c217d70f2080d6c304569c8d68dfb7e161faa09ddc3cb5fd3efe2eea3f2e SHA512 1d7ec41e7efe5d2c9cf1160f8b41d4b5d0622b897cbbd27240e48869a910c5070f71d27f61fcfd316d8b2173a64e60d257b63eb0f30da5fe7752cfdc767e9816
diff --git a/media-fonts/font-sun-misc/metadata.xml b/media-fonts/font-sun-misc/metadata.xml
index e17a5bccb78b..be3de6b413cb 100644
--- a/media-fonts/font-sun-misc/metadata.xml
+++ b/media-fonts/font-sun-misc/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/sun-misc</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-util/Manifest b/media-fonts/font-util/Manifest
index c027b65ca802..29b4fb35cb1f 100644
--- a/media-fonts/font-util/Manifest
+++ b/media-fonts/font-util/Manifest
@@ -1,3 +1,3 @@
 DIST font-util-1.3.3.tar.xz 142544 BLAKE2B b893159496fb242c33facda98597e200b41d05fbc28c9c1cf04f5214788f421472562a79ad24cffddad72ebf38f751858712a5c7c2904370ea77f501f78ccc77 SHA512 5e1cb8af44fe0bea72b1a6a4e455f50ca49b7531c2f4b605800c0b2b7578b9826ccf17fa195c505ab1d6339fd4ad697c01ba3b9777616f354ab62b23434d47c9
 EBUILD font-util-1.3.3.ebuild 554 BLAKE2B 61d4b30a09745b02e5929eab6fa61355cad610fa9baacb19c7e025aa72fc1f2ebf18043517910863be5dc1bbb221485174355f9b056325412efab4585fabca15 SHA512 cd3c315b3ca60621d209a1d98810c8e11e3d9913c5b22e2445314a1f14f654bd2c3569a349e9dc4bd9303d050490596f608f8a32d67b9e4de6401448fe0bbd15
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 336 BLAKE2B 2576d857840cc0742fee4e2656b24f38543339ccaeb105b6ae4c878b6a3d51642fe1917644338f2a1b6130315406fcf04eaa46ea0c55b8312cea061718c25c0a SHA512 d25c57a37506034155273892e20612dfbc5bbf5c3eff868416e08c96e0f5c00deed63fb89f5278f2a78c57151f8a54a146a223010ce7908b28df7edb9c1081a0
diff --git a/media-fonts/font-util/metadata.xml b/media-fonts/font-util/metadata.xml
index e17a5bccb78b..92cfe5893012 100644
--- a/media-fonts/font-util/metadata.xml
+++ b/media-fonts/font-util/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/util</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-winitzki-cyrillic/Manifest b/media-fonts/font-winitzki-cyrillic/Manifest
index 9ac05348d054..582a277ae803 100644
--- a/media-fonts/font-winitzki-cyrillic/Manifest
+++ b/media-fonts/font-winitzki-cyrillic/Manifest
@@ -1,3 +1,3 @@
 DIST font-winitzki-cyrillic-1.0.3.tar.bz2 100564 BLAKE2B cc2de32277e55a3f7a92be7deec895e23f75efea541e2dcd33a56e1911d7216af149234fe010bd6445952399e246a4bb7123ff2bd220d44874b065a56ac4155e SHA512 f98fa99c1b0e60160b362310a7fe5fd5798aaa686751a6784a697c546ed754e885537eeed39a1f973dbceabc962cb65b39af1d336649381a49feb6df9f23e2b7
 EBUILD font-winitzki-cyrillic-1.0.3-r2.ebuild 302 BLAKE2B 0d1e59a791f0eac795465564ca96f6befc60d7f2261d724728bc417287b6d7ec7c3851d4770807c9fcb9a3861fe8207c2314d852ccba4bc53946948d98c6f1d6 SHA512 a96ab27110b9201472930b61dd40cc2c67c8b09b7c9d9847bac11caf3790e05c27a490fab1c897ebf9be47b1792b26fe5df1969f1eb686c0634beb3e17dec554
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 349 BLAKE2B c5f3fcfab465ba9c86f831889d3d9f95655aad88a1fbe9ecafb68a47601f4f74f1e8568dd0d9a0271324abfdf33a79c69ce909c32d6bf5f8acc8d4494dec6408 SHA512 fcdd8455ac32eb07dba4d64ab8a3a1261aeb01881ebc8046a531c516aea0871013a54b3ca70a8977b0364f9158183601423f1a597aa1ec1dc405a47949cb23d1
diff --git a/media-fonts/font-winitzki-cyrillic/metadata.xml b/media-fonts/font-winitzki-cyrillic/metadata.xml
index e17a5bccb78b..aa69891fae60 100644
--- a/media-fonts/font-winitzki-cyrillic/metadata.xml
+++ b/media-fonts/font-winitzki-cyrillic/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/winitzki-cyrillic</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/font-xfree86-type1/Manifest b/media-fonts/font-xfree86-type1/Manifest
index ca3c26db8af4..f9656e94ee7f 100644
--- a/media-fonts/font-xfree86-type1/Manifest
+++ b/media-fonts/font-xfree86-type1/Manifest
@@ -1,3 +1,3 @@
 DIST font-xfree86-type1-1.0.4.tar.bz2 126641 BLAKE2B 12588b7cc3a489854695cf0cc6a9edd18840e0048b4e35a76eb6f3642807e208823133368299d6ff65117699bb7312d3664ae9fe8264631051fdeaf8f157b516 SHA512 2b4afc6cbb7953f8ba4aab7862d16b7b988ea6a4df6de8d41c8340d35a1cd53d6fcc26479ff88189d1de9f42804e4f56d70e9dbd7e75820eab4ac6ae3a96840c
 EBUILD font-xfree86-type1-1.0.4-r2.ebuild 295 BLAKE2B 6e99c58f8ac805bf996b02731650c86b63a5cce29886e4506352fdb64d34a44f5fdf077be206b55567df45d80237ae86d7a9538eea7c8b9134d325e44b77fc8d SHA512 b3552ea233a2392dcea43d3915d417934adac3906d6a2b0f212ab3cc10c9aa1ea4612c984806c3060ce0412c6c2663ac2d1fe1aa863eeffc55af3ebb7727bb4a
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 345 BLAKE2B 277a98b6f8a3db93936791d0c52bcce90a10aaa4486aa0f56f50f4bccff08fd927ab0e694f650113626c278b7f8f07959f5795bd7fe3086c4d79336bf15f014d SHA512 b4215b79610ef0ad68a59f0e970d2b409778b717ac95ecccd3cbd8c0a85c05cd007c55078884923068f1ec650213a4c57c7ac69dee40e8716f858a8c54a1b5ce
diff --git a/media-fonts/font-xfree86-type1/metadata.xml b/media-fonts/font-xfree86-type1/metadata.xml
index e17a5bccb78b..72c56441d422 100644
--- a/media-fonts/font-xfree86-type1/metadata.xml
+++ b/media-fonts/font-xfree86-type1/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/font/xfree86-type1</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/freefont/Manifest b/media-fonts/freefont/Manifest
index eed200c0cbd6..0436f96e18b6 100644
--- a/media-fonts/freefont/Manifest
+++ b/media-fonts/freefont/Manifest
@@ -1,4 +1,4 @@
 DIST freefont-otf-20120503.tar.gz 4487813 BLAKE2B a280bef885bc71897a8475814602d7537b05d14a70e5857acd1007bc0a074be9db1e08fbd63fcabf3fde7874391bdd319d00b213e29b203d474fb320e91b82a2 SHA512 cee9a573b17ccc689b61f0925fb6624d58e3a3369d996e379e70c3a4cd750429d68c14c85fbcab4381101c8f4bf56730ef40e0045fdd79647019db41b4ec74fd
 DIST freefont-ttf-20120503.zip 6076197 BLAKE2B 949140181561e89bbf0487f1523a433ec0e3cbb7548a2168be6e1720d7e132fb2250acd025ab57b1ba4b295ed4021eb52de2e8f672c9767f63b06269cd6cb3c4 SHA512 dcd6f525e8f97631c6f84ab4cc2a31af4614dcdb9a4d434bd890baf18e0c2934032f2915384fc27fbecf60d259d792e48f52d357b07e3ed2616d3c8c3544268e
 EBUILD freefont-20120503.ebuild 645 BLAKE2B a625de684b1842bb023bc8aaf0a5ae7f1f8582e5f3fded2d62432a1a63d476879d73e5501a6fd7cfd29bddd937adcded14836fc55a42fd4ed02449715fbfabfe SHA512 12af51a786adf3657c98d5f58f45688672ad8438f78a72ae3d268672df95b1c1adf08a2223eb691b87d8a2ceca37dac439a5202d85848568dfd647639ea03e16
-MISC metadata.xml 239 BLAKE2B 5aaac778361cc8f607c6587e338cb80fd9a032e722766c60e011327e58b327fd4ca5113b66b281273c718c7492edd2477a0d702acd900fd9e376faeaedf717b0 SHA512 333c4df4d2002923cb872edc1e4e4f121563d73b157a8b2a4605ee449c759417014e9bc1342acaf697325d3d3bd8babe5930bbe4e08df90650cd1a52a0ecd337
+MISC metadata.xml 324 BLAKE2B b9e77e19cae996e79d54899387bf49884a76976752c952c85d72c3d3b420b49709b852c87e00c7cf469b2a4621608b8f0da3276cac6a1dde9e263c3d55db7a33 SHA512 87bd4edf73169af147b6ca986f84042427c7da63d28bef38b41617237b322a64a2fb7979dbd24798e7e4a07d8551e00b0eb720d99ec76d4fe685a0079659ba3a
diff --git a/media-fonts/freefont/metadata.xml b/media-fonts/freefont/metadata.xml
index ad76811405bf..934ecb4f8112 100644
--- a/media-fonts/freefont/metadata.xml
+++ b/media-fonts/freefont/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>fonts@gentoo.org</email>
-		<name>Fonts</name>
-	</maintainer>
+  <maintainer type="project">
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">freefont</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-fonts/unifont/Manifest b/media-fonts/unifont/Manifest
index 41d2025d02fd..55c674dcd2da 100644
--- a/media-fonts/unifont/Manifest
+++ b/media-fonts/unifont/Manifest
@@ -1,3 +1,3 @@
 DIST unifont-14.0.03.tar.gz 27451330 BLAKE2B f0ae933fc493d7e724b0526968d63fb4209e28526346a835b918aa6a31cd1a31c15a0c00f89196f6fd42cf2a0b2db8c51d9b6f9d7648938609e8b7e4122078a3 SHA512 de80097a4e1751c6ca21775c8ffe19716a910a0d110749017eacaa50a9f8f02d80e0b402426f3c2309e64e129a0386e29015d1116ad5fd64f97e5dc7fb75bdce
 EBUILD unifont-14.0.03.ebuild 1100 BLAKE2B 1f2d335c95d9bc65e58472a298f8d866838a1fb42f71fbd8b77c265c78c9590c02958ed36c44d3cfd50767b8940d344465588ccc49cf519cb728c1b2f67fa555 SHA512 2ce0d9c75766e4801899847df13dfac9c4ea7bf54c538a966b5c005e431db03a2392a57a0fed0e24318c44919781910b89b109382841828deadbc92d1160f974
-MISC metadata.xml 485 BLAKE2B 5547944f4afc22e78b218df90194a20fd7d3a2bf012d231a98d51e570be16bf1644890541dea1e3ddeab2ca6e621f62c26e23ebc18aaa7cf7118f4aec639260d SHA512 fbc4063b1076aaec7f62bec624dcab2b76ff170fbe9cf3abcbbd0aa64610472b39555df1a5a706589781684590b8eb465c7467446bed63d20a8ea0e8ae21ba8e
+MISC metadata.xml 593 BLAKE2B f69d8a92acb780a10ab7fc0e368f8fc16d4d733d15d9c1c893976cd287401e8e9c69e61f1bdc5f8160318c477923081b57d39b202604a1b54b11bed4d48f79c5 SHA512 a665a8e85a957dd769811b9a7a43efa40289f12fa864e4f373e8734ccc35269858cfcda0ea7d4c80cac20b7a3e66e97f0b6a16b35635a6e68181c9834a3ca05e
diff --git a/media-fonts/unifont/metadata.xml b/media-fonts/unifont/metadata.xml
index 588a3c8358b7..4e8b64b5ee7f 100644
--- a/media-fonts/unifont/metadata.xml
+++ b/media-fonts/unifont/metadata.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>fonts@gentoo.org</email>
-	<name>Fonts</name>
-</maintainer>
-<maintainer type="project">
-	<email>cjk@gentoo.org</email>
-	<name>Cjk</name>
-</maintainer>
-<use>
-	<flag name="fontforge">Use <pkg>media-gfx/fontforge</pkg> to build fonts from source</flag>
-	<flag name="utils">Install unifont utilities</flag>
-</use>
+  <maintainer type="project">
+    <email>fonts@gentoo.org</email>
+    <name>Fonts</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <use>
+    <flag name="fontforge">Use <pkg>media-gfx/fontforge</pkg> to build fonts from source</flag>
+    <flag name="utils">Install unifont utilities</flag>
+  </use>
+  <upstream>
+    <remote-id type="savannah">unifont</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 5f50c2f7839a..9123ecd4135e 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/icoutils/Manifest b/media-gfx/icoutils/Manifest
index f74f80b889d6..e5c701abe301 100644
--- a/media-gfx/icoutils/Manifest
+++ b/media-gfx/icoutils/Manifest
@@ -2,4 +2,4 @@ AUX icoutils-0.29.1-gettext.patch 354 BLAKE2B f165b759526678524344a516a0953c028c
 AUX icoutils-0.29.1-locale.patch 831 BLAKE2B c24a99e4c186759f3c40e1635f919a9f802af28971c803b31a67b4e990206b0aaf4f7787204599b45888a6615c4bfd7c777bfbada6d67248c6e8e4cf033bdf07 SHA512 bcb0ef117c7f1434e63e411d270a2cad8e4d0ad214c7bd516494c7718b605234ad5920b9e16c5627c98e8e1065bc2550e55b1e2e8b846a5854999419c999107b
 DIST icoutils-0.32.3.tar.bz2 609286 BLAKE2B 0d65fbadb08e4f2e7a60b5ffd4bc14dc82e90abf0a56ddb89f9717a479ab45a50b9747c986c954c3a01e4d8a51d8396ec9d8796dc4a1d7430cb3169c13e06e13 SHA512 982a051a5dc4a63bb2a9f23e78e5a88e481e5c7a9c25789253e1c396e40d4c093e5a9b399966d660e4f2da21ce15d539cb9d20bfd8126b1138f148b86baa6726
 EBUILD icoutils-0.32.3.ebuild 1023 BLAKE2B 980f66aa0b3e8588b2e336b5b0cefb77b322838d729662e28963f750430074dd9d7f52d36bf61f1237f0b1d56ce9e07af423f0bb76b8b343aee41aa83b824302 SHA512 c6cd8393a57d2d1b593534a754ff87ff144a7ad04bd3468f946ada45f7b72be85b78c547fc2750ea682c61a9416f2697e01fa70b58405e75845508b2aa382220
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 255 BLAKE2B 4900a3d64ae1bb7a07d43b3b26635e28ce8c495f9800764930bb2abe1061127e91e313a8d0f68ade5f4ed98ea5e24bb39360a1611d0b50055a01215758d6c659 SHA512 6409162d659a1bc391c9e24d27f79bad3bc6c006a36d7de65b1b71ef6810e769dc22f2e1fde0893b517abb7a1d1dcc09a4c65aa229363508ad66d1c2d4b869dd
diff --git a/media-gfx/icoutils/metadata.xml b/media-gfx/icoutils/metadata.xml
index 85e4ed814fa2..d27135214b8c 100644
--- a/media-gfx/icoutils/metadata.xml
+++ b/media-gfx/icoutils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="savannah-nongnu">icoutils</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 180db82b18c9..f9db13bca398 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/glu/Manifest b/media-libs/glu/Manifest
index 04d644156305..8aeadbc62161 100644
--- a/media-libs/glu/Manifest
+++ b/media-libs/glu/Manifest
@@ -1,4 +1,4 @@
 DIST glu-9.0.2.tar.xz 436176 BLAKE2B 90485938e4809ce7bb56da25bd60be9f3f7b7f40d511ea6635e40d749e519d1dca6241d891224d3cf331b911f545df4ef9aa2101baf4e3b18df69244edbcb8a4 SHA512 2517d7406bb643d12c017a95dcb5d8716f307344332638bcbdf274a90752a7c22165d34745f1b082ed916bb07d40e62d1d1d67d96426225be63166f3480d6f64
 EBUILD glu-9.0.2.ebuild 901 BLAKE2B c6df3be717dfdaf36be56cbfa12f9ddbdd4284a91bb5510a983f5881b40dafcfd8ea41693270a1d9b4ad78f94cf174490e97f9ad9c0215050de0cd6caab5354e SHA512 5cbd208dd237c5cbf1a1feacfdcbdee1dc562e0becb2daeb4afe1491614ee71782383d752006ff5ac45841d4d98e801bf06a8aae3f7514af5323b120fc01a0f3
 EBUILD glu-9999.ebuild 901 BLAKE2B 2377cc6c78fd9bca5a1c31e2ad14cb30e5f97cb0e7f9be7d2900874e6b1d8481766afd939a6c312f98a6e55d3d35cc7eb30ed1f971e4ea5473f4572fa3b01f85 SHA512 4bc9bd397157b3bdc2767b75537650829502a278276479d8b5d153649286c32e39504ba8dbddfe79cb090f3d874eb730cb959af201374c89b7af3fb0aae8da0d
-MISC metadata.xml 241 BLAKE2B 6fe56bd098998705ece21eed6d30e595c470dfde14e39c39e6413dfc3a7b5a207742d52f5c8cf7a582bdbdb651b0a8fd9729a334393386e3a1afb1587fad1531 SHA512 672a7690a5fc03c8758403450a5e320b891b58fc523fbfe258bef0b214fffee41e43df65cff1528379343a5d8b815d1bf9edb9001049748c1cf118b52450c412
+MISC metadata.xml 330 BLAKE2B c701978981b17870680d98907aeab6ced8e56af401a502cf0545a1f22188e86820b580714fe4e141c7d2b2f7d5f892ca85a47fc2529e79c05b7823addd059136 SHA512 768536ef9f7996f6e7f8028abbe275036bee70c5abb91096e0d2d24e4c14ac3d28377860bb75d153c883b755bec67c47430ae577c1788f2cd596628905cad922
diff --git a/media-libs/glu/metadata.xml b/media-libs/glu/metadata.xml
index cb69d33c69a5..4b2d406bc746 100644
--- a/media-libs/glu/metadata.xml
+++ b/media-libs/glu/metadata.xml
@@ -5,4 +5,7 @@
     <email>x11@gentoo.org</email>
     <name>X11</name>
   </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">mesa/glu</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest
index 9cc7bc333f33..13f7578ef3bf 100644
--- a/media-libs/libavif/Manifest
+++ b/media-libs/libavif/Manifest
@@ -1,7 +1,7 @@
 AUX libavif-0.9.3-dav1d-1.0.0.patch 1428 BLAKE2B 51780bdeb22874bb23b8f461da1a98dad9b88f6e559ee9de60588a586c7009726d5b9a2db40d53ee660705110d1a61730b60c3caed876b359cdc1302e7a09c6e SHA512 905d5893d2a82717d0e488220a4e6e8dc46c0a3c04b2bea1feb5f618cddb9171e2c8d9fa72d6eabf898d0cc8abe41e3a9f510c7a1eef68c55cbe81b2736130e3
 DIST libavif-0.10.1.tar.gz 2085698 BLAKE2B 5be3f9adf7e0a5747e42c90ce2768eba90053c821805cc8e39915d6cbc4cd42554b1473118b41eb25010d20a2b5a3c141b9cbd6ff55c46abd79eb97cdee6b0e5 SHA512 2f6f248c56c983761149d3c201fc2a2ea5072a32516578a7fdb2c66e3cd22491540f400e23581f873b15454250eeec8d433924ae2c1de9371b7924a5d82bef6b
 DIST libavif-0.9.3.tar.gz 2000521 BLAKE2B b9dbaf01e58058a1ab9191081242a0f669b714d319075b6330963bc8ae31f576fb77b108de4745125eb42d39682e74a3174d062a029ccb765b3030f4092a96b8 SHA512 8e95666c784d1badc7e18d27a7c21cae3b8ef3b8da9a762eb8f7216d77fba29b9ca309c01d13bcf4890e03c6bc335ba4baf3f5877396bd0584be9ea60018daa7
-EBUILD libavif-0.10.1.ebuild 2723 BLAKE2B aaa0f602a557921a6b169ebe7c89cb0e93747a298f0d59c4f7f2e9e3aea3b9c7d8a6a77663667fe97658ecbb6b5b55385830b777151048130a6a303e915e2c3a SHA512 2c8ded270e938bf01a223ff875a826579aaa90a240459f9e5a791dc85332613aaf8ea0dbc7c390909c13c3500320a5f857b31754346f67e9c486206e34c29367
+EBUILD libavif-0.10.1.ebuild 2722 BLAKE2B a7619e9ff49f10d6e1e17882b83e96d45568c84efa0d0a7da2de8b2237a143d5fcb8144821bc48599104f497ea8295b9eb8187b0bec879e501cb77db858f6935 SHA512 30f6d00749f4995f2a5030bd2fe776c1c8d11a5fd64457d978398f1edd4238fcada7f62484a7c5f0c400ab5a9ca281be63ba6699fd50ded12566af40978d327c
 EBUILD libavif-0.9.3-r2.ebuild 2698 BLAKE2B 7adbbc0d25de9032023b9ac2775d385f4bb7a722e64051fdd341d131f5ea1803e50c0cdbec6fc227c1b45ca531ed212acc963fa4103253494ee0193f0afa9da7 SHA512 e2083ecd5a2b39a56dc68828bf4ebb6d9a562107e43eb44ca6bba1bfac37ad6f982f51f96a4fa5fa67646879bf8588fbac850277abfca0eaa6187ce5a185b458
 EBUILD libavif-0.9.3-r3.ebuild 2754 BLAKE2B f6dfc1db692f53625edbe69ae667dd31f1cd99a12d45e5503ea4c226dcc7894e32781923714deef7200f327dc81e4a6672e5ef4145a97adbb808a9cf0142ae01 SHA512 2a232a397fede6063ef17a6886ff3543675d4bd24a5723dd7157f0a41785cab58262454ba421df4a8a5348119f6b3d7184c7623c943b4242a247cb5bab69dd6b
 EBUILD libavif-9999.ebuild 2662 BLAKE2B 68435d43e38208d1e9a836c7da8c6aa1545da5d7da271b2d422bd93e41df8298262a6f85629cd8d4327f84efb376648bd6af10f6a5af7452d58439a0fcbff9c4 SHA512 a21ba858eab8456af19751fb00d3776f849d32da8d51f98fb70708e1efdf90fb09191a53c6eb2c4253a66a2f22882d4994790116e87d1297501cb541de619210
diff --git a/media-libs/libavif/libavif-0.10.1.ebuild b/media-libs/libavif/libavif-0.10.1.ebuild
index 54f68796bb86..6488c7ad6601 100644
--- a/media-libs/libavif/libavif-0.10.1.ebuild
+++ b/media-libs/libavif/libavif-0.10.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.t
 LICENSE="BSD-2"
 # See bug #822336 re subslot
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1"
 
 REQUIRED_USE="|| ( aom dav1d )"
diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index a4faf9344bca..8981dd5fbed3 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -2,4 +2,4 @@ AUX libextractor-1.8-exiv2-0.27.patch 3364 BLAKE2B da55735ccab9a3cf868f274b82951
 AUX libextractor-1.9-CVE-2019-15531.patch 518 BLAKE2B 2310c4863dcce5324706a96fb86cff7b72473d0027027bf8f40453cc863296a5c1880577af8a95f0875522da4d5251690c77cd8571e87d5c048f18240b8aee03 SHA512 5b50c20ce0e77f664578e1383e481694388e6200f01e3eef0029296deb3cc35cc76b2277d4a1f879f3f1d1b4d24235d2e17f26eacf0a5b963f1c1433a615eaa2
 DIST libextractor-1.9.tar.gz 8323852 BLAKE2B 71e81e57ce7857b7b7f0180a7b130b0808573d71384c61a1a079b0ce9c02bc4f1386d3b27c68d668b555a692e523a7998d6fbc675d15f8ee26b487b0b5b31927 SHA512 c2539b144d026fb0e871c5776aee4deaad4a987a730350744a7e5e74fbe98a4abb635dbe206b93c3aa9cd676b8797ea0b97271de0c903dfb035e245ab42ea149
 EBUILD libextractor-1.9-r3.ebuild 2847 BLAKE2B 7127c16646b09201fb68c92e063c94288be9766a9a8cc648860fa3b4387a628341d37f8a45f53a6b839563fbe2d465ef6931247f4eae4d710a349b4932fffb86 SHA512 e3ee099de134402ff30cf74e8f2c85cac586184197b72a909f8cf61a8bee90f315ce493aec5f672b5fc5cf2bfcc02c1f0d19a6ff04f4472bc3adcbe2c7761f4d
-MISC metadata.xml 466 BLAKE2B 824c0c14cec6429d914b33c019e3a38e52e1635b3371003769713193285c66de9beb63583be6c437e6b2a9cd283fa46115818009ab953276bf3fa585d6660048 SHA512 c8b484ff176f279e75f6948fd2d28dbc78d70bf5c50b1e54ab92180a356febc646dfdb0463e2198b591cdb1d3a818da9e85b560844daa2acfeb7e7ea7a92b816
+MISC metadata.xml 549 BLAKE2B f25ce221cf80c66d32c5989cd0b6a2e61ef5a665152d95fc20f2a7959cf185a33c50c223b81428feb77ebb1550ae2aa448d105db5c9b3b21f35751d1d9bb3954 SHA512 7405ef5efde10dfe76f12c0936371c9f504d1ccc3922b868cab680fabb2bd6bb8ea8a5d57f452237fc2697b63fe1225582a0d8418b3b0ca7a89b4d9e80403643
diff --git a/media-libs/libextractor/metadata.xml b/media-libs/libextractor/metadata.xml
index bcc04da57cce..88d3c6282813 100644
--- a/media-libs/libextractor/metadata.xml
+++ b/media-libs/libextractor/metadata.xml
@@ -7,4 +7,7 @@
     <flag name="gsf">Enable OLE2 (MS Office) plug-in support using <pkg>gnome-extra/libgsf</pkg></flag>
     <flag name="midi">Enable MIDI support through <pkg>media-libs/libsmf</pkg></flag>
   </use>
+  <upstream>
+    <remote-id type="savannah">libextractor</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index 68bfda5b4b06..519b5d12dd63 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -3,4 +3,4 @@ DIST libglvnd-1.5.0.tar.bz2 565918 BLAKE2B b81bbd231ec66e045690aac877681f1a09ee3
 EBUILD libglvnd-1.4.0.ebuild 1437 BLAKE2B 772798de493e8afbb5b97b12aa776d86a100efafab9a4f944cad088d689f7cb262caf5074e625432377e2c1cea1f949634798e310e95eac9e22de14ab5e5628e SHA512 141e6413f34ce6febcee77a086cf137400a21f5b71465a6e97477e14fb8029d05bb6803d7b231f581664962bda92d548611bebfad9d4659ac15774e15c76d603
 EBUILD libglvnd-1.5.0.ebuild 1445 BLAKE2B 374172bbd2bb127694f05b17a8bc45f4848b3062d52444ca528699ee18d9672e18aaa6d5518c52c00e2865762a5294333afb7a2119380153aa746fa8a2b966b4 SHA512 284ab5787517368ddc6d9503934d624bebc49b04f1fa6e1c1c67e79616cefbc3eeac40de2da71cfe10318b87a5183882a7a9429a4a5cfbc74ed9f9e207580b38
 EBUILD libglvnd-9999.ebuild 1445 BLAKE2B 374172bbd2bb127694f05b17a8bc45f4848b3062d52444ca528699ee18d9672e18aaa6d5518c52c00e2865762a5294333afb7a2119380153aa746fa8a2b966b4 SHA512 284ab5787517368ddc6d9503934d624bebc49b04f1fa6e1c1c67e79616cefbc3eeac40de2da71cfe10318b87a5183882a7a9429a4a5cfbc74ed9f9e207580b38
-MISC metadata.xml 315 BLAKE2B 138fe0ad285ae16426c77740c19a0740a9b882a421fd6a0dc39489ce5bfcd21254e3de2fcd315386e4cf10f6caff39ccfa4c3df0491ed4165d5a6a768e5f454c SHA512 958019318d542e273a11b6ab57d4dad10b375f85bda613279ddb2b5cc834c1a023b1f1b3d14e9450d5b48ee579506a8a904ecc540276138c1d5350a27d34e14a
+MISC metadata.xml 336 BLAKE2B 4bf6bd6267610a40d3966ded2563015cc2cdf4100bb5b56f14311d8f2ab4796c6bdb08f7fd9922a83bd9738e47f2c603ccf35117c0ef4fabfb6858048f34f4fe SHA512 52454eacfef943242844a5c244372c902fff7d801dd73372a4105c998b209fd333057ec47acbb7036613e6cc656b9bda52023e2d1a202d993d8a42c8055378c5
diff --git a/media-libs/libglvnd/metadata.xml b/media-libs/libglvnd/metadata.xml
index 241dbeab6562..57a21f74c100 100644
--- a/media-libs/libglvnd/metadata.xml
+++ b/media-libs/libglvnd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">NVIDIA/libglvnd</remote-id>
-	</upstream>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">glvnd/libglvnd</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-libs/mesa-amber/Manifest b/media-libs/mesa-amber/Manifest
index d2cd5892dcbe..12a781cdf883 100644
--- a/media-libs/mesa-amber/Manifest
+++ b/media-libs/mesa-amber/Manifest
@@ -1,3 +1,3 @@
 DIST mesa-21.3.9.tar.xz 16607716 BLAKE2B 79669f9492c505b1729c526adf5a8261737b6088bdf01db654a0dca8ba22600ec985b574edfeee3a28c76e6e0f815782362973876e1d75b58f4417f45df70add SHA512 4cec6f4f50f444fcd327f7c40f8899c2f265e348e121455262b540b1f890a1468bbea59965af0876c548fa97aa0a05a1b23fa6ca7d308bd60328cfdeab757684
 EBUILD mesa-amber-21.3.9.ebuild 5057 BLAKE2B a13b6627f4a1a4844f8ed33c1b38f0e0287889120274e4759ae699e961b928682567a02e4ccd4f1cfc5a786b4c4973cc9e2dbb32de8ba070b4879f0fa7f0f432 SHA512 5830e9e38f032df9171c812e4c61f23f79e72f6c6d14964236148509698b2b19f763fc867e1bf5ebfd58ee824d07dcd06078265c7cef7022ee0195e7b29818cc
-MISC metadata.xml 624 BLAKE2B 61adb0ea9550acb3a03e848f502d414b66368a4ea56ebc49011f8c7d2fbe7012323bbb0942f28bd6c1f9b6a5062860474df7339f34945c7ff5bab2e7cb76544f SHA512 3d56a6da4bd12d686741b234c9a4ebc4507ee39b014a69fff8caaa46d111a03c1b4ad6353f3235a3ce5efa0d985739d99d556da0a75592948b4e8d1acfecb679
+MISC metadata.xml 656 BLAKE2B 8a726ee17f42aac678464a5461bde2b570c3c4852900baaf3813eba86735d5879e782ee400c4c278bfe97ce69b0f80fe641ebed1455e65b60d14cfbba9700e68 SHA512 2168c3e6eac6cacff4fa261e06893359ef9d30481c61db09ad804fc47eee0c664c24edaa154ae0deab325fc45b0cbbfe620086044aefffd1db726cca4677482c
diff --git a/media-libs/mesa-amber/metadata.xml b/media-libs/mesa-amber/metadata.xml
index fb38a620b707..4a8aba716794 100644
--- a/media-libs/mesa-amber/metadata.xml
+++ b/media-libs/mesa-amber/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-	<use>
-		<flag name="gles1">Enable GLESv1 support.</flag>
-		<flag name="gles2">Enable GLESv2 support.</flag>
-		<flag name="valgrind">Compile in valgrind memory hints</flag>
-		<flag name="wayland">Enable support for <pkg>dev-libs/wayland</pkg></flag>
-	</use>
-	<upstream>
-		<remote-id type="cpe">cpe:/a:mesa3d:mesa</remote-id>
-		<remote-id type="sourceforge">mesa3d</remote-id>
-	</upstream>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <use>
+    <flag name="gles1">Enable GLESv1 support.</flag>
+    <flag name="gles2">Enable GLESv2 support.</flag>
+    <flag name="valgrind">Compile in valgrind memory hints</flag>
+    <flag name="wayland">Enable support for <pkg>dev-libs/wayland</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:mesa3d:mesa</remote-id>
+    <remote-id type="freedesktop-gitlab">mesa/mesa</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index a4f672946f66..2821817ca03e 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -5,4 +5,4 @@ EBUILD mesa-22.1.7.ebuild 12037 BLAKE2B 36b57a2a4184e6788a4ccee1bab1b1281defbb1a
 EBUILD mesa-22.2.0.ebuild 12612 BLAKE2B 94d635a3ad35f3fa18cd8927a6bf89cc99de4e7722c71b211da8fb48dd802e0e5e49f329d7d2f19f1a692764088b35645a7606b09effff1b9f80cfa168ee8b59 SHA512 7077d6c34abc34d616ebc5d9f9551eb5ef6845a80de9c4ab9adca35a16e89f60f23ca75707fb19e0aa63e2609bcebab1873d6fc087cbf75d5b22873c6a9e5b6a
 EBUILD mesa-22.2.1.ebuild 12612 BLAKE2B 94d635a3ad35f3fa18cd8927a6bf89cc99de4e7722c71b211da8fb48dd802e0e5e49f329d7d2f19f1a692764088b35645a7606b09effff1b9f80cfa168ee8b59 SHA512 7077d6c34abc34d616ebc5d9f9551eb5ef6845a80de9c4ab9adca35a16e89f60f23ca75707fb19e0aa63e2609bcebab1873d6fc087cbf75d5b22873c6a9e5b6a
 EBUILD mesa-9999.ebuild 12247 BLAKE2B 3112d47228cad45b3be8f3a86775baebc878ab48f1223b6191105a76953155ce6a8d2dfdb24ea4d93e6c78fab7dfedcfd4e166457445eb558027113710a3e881 SHA512 1f04c0ac687ec099d9d38383156fa2b683178ccd5eb5465200109442ed45568f189c0915fd306d24fd78912c51e2d0db50540e19db121ed3e935c6bcc54aa7a3
-MISC metadata.xml 1649 BLAKE2B dbbaf2c16c29d6b75e272a403f59f943047fc6d19361b289d7a31bffeeed73d7ee6b16acb4a481b8e647b807fd3b4a7354092a52cc55edccb722180eae124370 SHA512 e0f05c43af12b12142eb4fa08b4e5a103bc160554836d614aaa56928b41d5f7160dd1e89e78d54df6ee6e3bb0e4d9d7667402af3dd2e7051e09b17506caf7985
+MISC metadata.xml 1705 BLAKE2B d00c5edf48d5fb9c7485958569d8be761b0a8a79b893d50347687d2fd1c4ffac1325bbc32254737f8249e8b2cef2e86ae7b06a3c6351f7a03844f48ce1df428d SHA512 5c67ebd046a486e5e45864f79233ce659e0fa1d4c30284e9f3908c73d2f3480af50dddcf0676b8ed0ffe60a991ed4b59ce199d7ea16d6520a191ad076c5a9ec0
diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index e343f929266f..6a07d73d1f50 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-	<use>
-		<flag name="d3d9">Enable Direct 3D9 API through Nine state tracker. Can be used together with patched wine.</flag>
-		<flag name="gles1">Enable GLESv1 support.</flag>
-		<flag name="gles2">Enable GLESv2 support.</flag>
-		<flag name="llvm">Enable LLVM backend for Gallium3D.</flag>
-		<flag name="lm-sensors">Enable Gallium HUD lm-sensors support.</flag>
-		<flag name="opencl">Enable the Clover Gallium OpenCL state tracker.</flag>
-		<flag name="osmesa">Build the Mesa library for off-screen rendering.</flag>
-		<flag name="proprietary-codecs">Enable codecs for patent-encumbered audio and video formats.</flag>
-		<flag name="valgrind">Compile in valgrind memory hints</flag>
-		<flag name="vdpau">Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag>
-		<flag name="vulkan">Enable Vulkan drivers</flag>
-		<flag name="vulkan-overlay">Build vulkan-overlay-layer which displays Frames Per Second and other statistics</flag>
-		<flag name="wayland">Enable support for <pkg>dev-libs/wayland</pkg></flag>
-		<flag name="xa">Enable the XA (X Acceleration) API for Gallium3D.</flag>
-		<flag name="xvmc">Enable the XvMC acceleration interface for the Gallium3D Video Layer.</flag>
-		<flag name="zink">Enable the Zink OpenGL-over-Vulkan Gallium driver</flag>
-	</use>
-	<upstream>
-		<remote-id type="cpe">cpe:/a:mesa3d:mesa</remote-id>
-		<remote-id type="sourceforge">mesa3d</remote-id>
-	</upstream>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <use>
+    <flag name="d3d9">Enable Direct 3D9 API through Nine state tracker. Can be used together with patched wine.</flag>
+    <flag name="gles1">Enable GLESv1 support.</flag>
+    <flag name="gles2">Enable GLESv2 support.</flag>
+    <flag name="llvm">Enable LLVM backend for Gallium3D.</flag>
+    <flag name="lm-sensors">Enable Gallium HUD lm-sensors support.</flag>
+    <flag name="opencl">Enable the Clover Gallium OpenCL state tracker.</flag>
+    <flag name="osmesa">Build the Mesa library for off-screen rendering.</flag>
+    <flag name="proprietary-codecs">Enable codecs for patent-encumbered audio and video formats.</flag>
+    <flag name="valgrind">Compile in valgrind memory hints</flag>
+    <flag name="vdpau">Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag>
+    <flag name="vulkan">Enable Vulkan drivers</flag>
+    <flag name="vulkan-overlay">Build vulkan-overlay-layer which displays Frames Per Second and other statistics</flag>
+    <flag name="wayland">Enable support for <pkg>dev-libs/wayland</pkg></flag>
+    <flag name="xa">Enable the XA (X Acceleration) API for Gallium3D.</flag>
+    <flag name="xvmc">Enable the XvMC acceleration interface for the Gallium3D Video Layer.</flag>
+    <flag name="zink">Enable the Zink OpenGL-over-Vulkan Gallium driver</flag>
+  </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:mesa3d:mesa</remote-id>
+    <remote-id type="freedesktop-gitlab">mesa/mesa</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index 2d2cd8a9bcc8..f060f3bae33b 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,4 +1,4 @@
 DIST waffle-v1.7.0.tar.bz2 302120 BLAKE2B 8ebfc78182ff86447d88d92edd6452dae28c1515de5f9639c402203bfb5a135bc493040941420161690a4812a202552266bceb89eee948d0c7aeae55d5b8d3d5 SHA512 ee7b8419e309387fa6d610174ba5dddda97525cef41c9600772b902eddfc4570e940437596d7fb50ee9dc2f5945e723236b61463975d2b9cc0faa150696d24c2
 EBUILD waffle-1.7.0-r2.ebuild 1606 BLAKE2B e986f97e87ca173d21babe3699a5d56e41aa78c4feb94d97fe7698af76bcdf6ac505f749a5d8c3084279f126d99af1facbdb5b32e19610bbbddd8bf9b21d1f2c SHA512 51caa025dc551ac3928158f477f1241b972b664edc90f5f9278ec67255a51857b347b3a4155cdfb35d72d4da3019d9b4b37b77ab6c0d2360d7572518ac4c1eb3
 EBUILD waffle-9999.ebuild 1609 BLAKE2B 75ed4e25c0946e27fe242c2780fad24798abee77a1a17d915dd39ee1ae427dbfef4b43a1cfea566a14175cb92c07e4583a373fdd40be949246bbe60031838598 SHA512 4342070b5f68bbb227f95a0d4ca6d23891a779255096a8e7150856c4a15e3a33e2bcc802ec741b0b88d937e6278131d920e6bf5fb05b480fdc94faf118b9c630
-MISC metadata.xml 417 BLAKE2B 93ea54a57c011a3488ec75dbb8b93bce0bd568dfc4438cf7c80b3c622513a9be4b3e809e9794646571f9f21afd1572d0b16915dbda35d7345d4ef6afcec4dca8 SHA512 1652ef53bd20fd9c526b77db60affc226920b007c1b1b2bbeb90c0606ae2d4e199cb352a3322e2953ae0b1472e671da516ea3c0fdfcc9aa26cc5a1c348590da6
+MISC metadata.xml 532 BLAKE2B c0c240a536c012ce3eb478dff1af25d8ddb0b9ce0d565df3a5a82941179c661552d3b6616c2851344a8c47c1a3b568b0f042e003e6133218be46313262f47d1f SHA512 d75a395ae334e6d3c364db676a654939560d591cae77c2ccc55d4c44474b168a9922b68c01349243a899feb0214d057c260f64a6a5029ee292cc86f6ade01906
diff --git a/media-libs/waffle/metadata.xml b/media-libs/waffle/metadata.xml
index 988e6ce979b3..7d510e7a6781 100644
--- a/media-libs/waffle/metadata.xml
+++ b/media-libs/waffle/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-<use>
-	<flag name="egl">Enable EGL support</flag>
-	<flag name="gbm">Enable support for the Generic Buffer Manager (gbm)</flag>
-	<flag name="wayland">Enable Wayland support</flag>
-</use>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <use>
+    <flag name="egl">Enable EGL support</flag>
+    <flag name="gbm">Enable support for the Generic Buffer Manager (gbm)</flag>
+    <flag name="wayland">Enable Wayland support</flag>
+  </use>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">mesa/waffle</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 9be773326cd4..195b71f32fb8 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/tlf/Manifest b/media-radio/tlf/Manifest
index f54b718c4e4a..da5057478c90 100644
--- a/media-radio/tlf/Manifest
+++ b/media-radio/tlf/Manifest
@@ -3,4 +3,4 @@ AUX tlf-1.4.1-zone_nr.patch 468 BLAKE2B b9dc26ba4f2775dbdf2f2aacb763a70acbe4c633
 DIST tlf-1.4.1.tar.gz 708105 BLAKE2B 18cd617a8780293bbfec87875491935d16022e104eed128ab69cbc3824aa5f8ab77dd07728d952e9b932ea74ee1c258522c26b5458b715320d452d58a65cfd3c SHA512 89076ba3b870f65b1469d64a223a9d35f1afd3edc6801446990d7ce197b04dacf141efc40382c69c78935a16f386385df0c7b48a040072cecc311cda56d479b5
 EBUILD tlf-1.4.1-r1.ebuild 974 BLAKE2B 5c125d6de3e936d895b56c34aaf397a7c9a3f39e150be3644c2fc3bf96eba3a2de7bb84559cd12b1fd21615b390325726921a98466a60f01ced1f3d75c9a5bab SHA512 722939d6c28b00315f52e0fd657214815ffacea835be263aa5213335afb70e4f532deaaaa116f5f7bbb1bfcaf3b71dbeb7c961eb25cc8d3696a9e6d99cee6460
 EBUILD tlf-1.4.1.ebuild 677 BLAKE2B 8f970b1886111ace7ca4d8ba2582b602a2239c60f64cf423ef1f9f54935bbd4e4bc994927d37615ef2d89a9cc2b97d0e55bef79cd7f99a1cfc6fc81fa073eaa8 SHA512 92662a2c44cb6bb7c74e76bb791bc4d1901e406b0fcb316c4eaf8e376bd7db96f979ceea0b94981170f3d844587999c0ce5a4450da80a23963f6460d8d7f8d59
-MISC metadata.xml 250 BLAKE2B 73afdd27824ddad49c748f845fb81e8b64d10b29a271175198b7c893096d6d5c64bf736446ec01c9679b7978925de4df8159761e1c3fdb83436468c882a72f85 SHA512 f5d1c70de88ecdf2edd6f5d68f44e26fd99705a91c52269b39c03240b06ab1d8299d03a2af5828c8f22198ec1188f14f957064c8459f27a8f2efea25398bdf4d
+MISC metadata.xml 337 BLAKE2B 2f3f8f39660529fa11669e0ddca2f772e0af91109dc85ddb89259845baf4629e336821cf2f5dc0a674bc687bb713837db7e5162f7c45e7eabd94970998f6b3d8 SHA512 d95b44e10c517790812328436cb6a1e7d4605a30dda33ba81d211eca643ea8d9330c5936cd80899875727df8e4fbf1d29ad9cce5d46b72b03ce2b6d2f3ebdc04
diff --git a/media-radio/tlf/metadata.xml b/media-radio/tlf/metadata.xml
index 001997549c54..b6361b77d36e 100644
--- a/media-radio/tlf/metadata.xml
+++ b/media-radio/tlf/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>tomjbe@gentoo.org</email>
-		<name>Thomas Beierlein</name>
-	</maintainer>
+  <maintainer type="person">
+    <email>tomjbe@gentoo.org</email>
+    <name>Thomas Beierlein</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah-nongnu">tlf</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index cc0cc3b561de..0e7b986dc133 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest
index d2d8d5f63e29..b95864d6d54f 100644
--- a/media-sound/denemo/Manifest
+++ b/media-sound/denemo/Manifest
@@ -2,4 +2,4 @@ DIST denemo-2.5.0.tar.gz 17454004 BLAKE2B 66e2b35fc73819f40c0376150c42d135840f57
 DIST denemo-2.6.0.tar.gz 17620623 BLAKE2B 55d142954834332a4bd5ca89125411181521d53f1a552b1397b16bbc51803cac3bc4eb0ffb309ababe2ad1b554e293d23102383aba95cde1cbb18cc96f9c6203 SHA512 9069c973624f05b53c62e5d8a9db5c2b4835ce3465402544d6a9f2a7d3bd617d79ac35c83940b37842a7a147bc2ee44ef33202bf7c107e739bfa303ffcf19738
 EBUILD denemo-2.5.0-r1.ebuild 3013 BLAKE2B 4b9ebe4683231ea9413273cd90b0d5d2e6bd83c0a64d1424105e5040a73edc0438222989e6efcebe2b5b91d876f24513129cadcb2e3885851ad82cba05b9a45f SHA512 83802cb91d236f0a2d032adff6dbd43f5602a3c0421f5284e5d3322cd0bb5c9daeae710bdaec8b20779aa490e433432d50c2981981d696a19d139cb65940dd13
 EBUILD denemo-2.6.0.ebuild 3162 BLAKE2B a2cedbf7c464bfa5fbb9f722f951100da86b25dd34742d52d999167e67e5a0ab89e3bc34ce0881d3c3d815c971411a2877b614e1e54f3206289c0c661a19dcd2 SHA512 766805257ffb5882fc40f03fd4a554226c87931ff1824d553f21b5f95207ca0073e2085bbc143e859288af86b2632c7dc612efe50b52642af69984a95489a63a
-MISC metadata.xml 1305 BLAKE2B b6e58a60c832879cfe3fa5d8fe3af73fdcc698b43b139e1063f20170d051023a00c076d7b618fbc04eb88b4ea113cab5ab97d68df39d6a56a2d81b5490ddfdcd SHA512 301c335b2abd0abadfec0c9ca4904fd3e56ab71b1abb84b632e81591485ad9cabf8c5abcb68f4e106ee4e9f2769737f0d1ab67d7fe0331e83f96897c08f840bd
+MISC metadata.xml 1466 BLAKE2B debc34b6d3690438874dbacedf84886bbb92e9b12f5cbea357c039123945fddfac7c68e8e8a021181db30deba7e87e32df38235a2b77047e03227d9482344799 SHA512 a910c7a4a7a14fc052f1ea9e53ea402a6d361e57da756e1262e9fe40542261a90a785739c9e43aa29f76613eb56e446eddd4101ade6d5a70ef1001f1e60c8724
diff --git a/media-sound/denemo/metadata.xml b/media-sound/denemo/metadata.xml
index 7745c0a737ea..ed8aec98d68c 100644
--- a/media-sound/denemo/metadata.xml
+++ b/media-sound/denemo/metadata.xml
@@ -1,43 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person" proxied="yes">
-	<email>waebbl-gentoo@posteo.net</email>
-	<name>Bernd Waibel</name>
-</maintainer>
-<maintainer type="project" proxied="proxy">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
-<longdescription>
-	Denemo is a music notation editor which uses
-	<pkg>media-sound/lilypond</pkg> to typeset music notation with LaTeX.
-</longdescription>
-<use>
-	<flag name="alsa">
-		Enable alsa support through <pkg>media-libs/alsa-lib</pkg>
-	</flag>
-	<flag name="aubio">
-		Enable <pkg>media-libs/aubio</pkg> support
-	</flag>
-	<flag name="fluidsynth">
-		Enable Fluidsynth MIDI software synthesis using
-		<pkg>media-sound/fluidsynth</pkg>
-	</flag>
-	<flag name="jack">
-		Enable jack support through <pkg>virtual/jack</pkg>
-	</flag>
-	<flag name="portaudio">
-		Enable support for <pkg>media-libs/portaudio</pkg>
-	</flag>
-	<flag name="portmidi">
-		Enable support for the <pkg>media-libs/portmidi</pkg> backend
-	</flag>
-	<flag name="rubberband">
-		Enable support for <pkg>media-libs/rubberband</pkg>
-	</flag>
-</use>
-<upstream>
-	<bugs-to>https://savannah.gnu.org/bugs/?group=denemo&amp;func=additem</bugs-to>
-</upstream>
+  <maintainer type="person" proxied="yes">
+    <email>waebbl-gentoo@posteo.net</email>
+    <name>Bernd Waibel</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription>
+  Denemo is a music notation editor which uses
+  <pkg>media-sound/lilypond</pkg> to typeset music notation with LaTeX.
+  </longdescription>
+  <use>
+    <flag name="alsa">
+      Enable alsa support through <pkg>media-libs/alsa-lib</pkg>
+    </flag>
+    <flag name="aubio">
+      Enable <pkg>media-libs/aubio</pkg> support
+    </flag>
+    <flag name="fluidsynth">
+      Enable Fluidsynth MIDI software synthesis using
+      <pkg>media-sound/fluidsynth</pkg>
+    </flag>
+    <flag name="jack">
+      Enable jack support through <pkg>virtual/jack</pkg>
+    </flag>
+    <flag name="portaudio">
+      Enable support for <pkg>media-libs/portaudio</pkg>
+    </flag>
+    <flag name="portmidi">
+      Enable support for the <pkg>media-libs/portmidi</pkg> backend
+    </flag>
+    <flag name="rubberband">
+      Enable support for <pkg>media-libs/rubberband</pkg>
+    </flag>
+  </use>
+  <upstream>
+    <bugs-to>https://savannah.gnu.org/bugs/?group=denemo&amp;func=additem</bugs-to>
+    <remote-id type="savannah">denemo</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-sound/lash/Manifest b/media-sound/lash/Manifest
index e2f455e48d6d..3962ea8c4402 100644
--- a/media-sound/lash/Manifest
+++ b/media-sound/lash/Manifest
@@ -5,4 +5,4 @@ AUX lash-0.5.4-swig_version_comparison.patch 1225 BLAKE2B 92f9fe4ae053dc454f8434
 AUX lash-0.5.4-underlinking.patch 660 BLAKE2B 6f3ca7580a588493610869ae8f2ff58f1c53b8e593e45c8613b1a15e7b97521f01372b493d3f627d878a8f0f6a349460da6fcc1eb48cb2b7e18e283acdc3a81b SHA512 118bccb0da55f0e7808424696143b00784afb18cdf982fdef837bdafa1dea6b55ed912762a964e210c2f0ba4a3bd1469249cad957428cca87da6bd0514751d66
 DIST lash-0.5.4.tar.gz 623469 BLAKE2B 463931a9fcacf806631746c69ccb2e2b795b8983e796835abce6036ed98571c41253fb8236a33c0a8bd1b5d3a910229d4e95f99257c1d82c64495201c64c6414 SHA512 93193dd585738b8c3432b3f75864d287f874b5618100a84f0a1b2bda2df15403203cfc66e7a0298adab7ef95bfdded81697614ca5ef8eaf5cebdde5860f47e3c
 EBUILD lash-0.5.4-r5.ebuild 2587 BLAKE2B e339534113e547c462a196e756be87ee4ddab21fbab94795cf792958d5453cff1671854c24785f475d0551ba3b6c66e42f25cfaecc7d26faf1d737fda43c26c3 SHA512 9dfbbb4eceeb95289bd756755399fed1bc93a08388256f2321dc301dd2787064e85bddf1f48758d7d43ef32ab6a5275f5d2da9aa2e5fa7ccc23d34d4397a7fdf
-MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
+MISC metadata.xml 348 BLAKE2B a5547f7cc6e5cae590b4d49c378f44c3591dd94d0b42a5ba666a2bc72875a1b54db17f8b4b7ad489d1b816d5fd45d82d62ae66916902d5c58007a465337c97c7 SHA512 49464d68db43ca854eeb3774a086d041e688ad0613b5cb4099d90498efb868003aba35afddbb92d2583982d9d8be28340cc26bcd33330a47948b44734e411639
diff --git a/media-sound/lash/metadata.xml b/media-sound/lash/metadata.xml
index 3fed8a8997c3..e7aa4c7f804b 100644
--- a/media-sound/lash/metadata.xml
+++ b/media-sound/lash/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>proaudio@gentoo.org</email>
-	<name>Gentoo ProAudio Project</name>
-</maintainer>
+  <maintainer type="project">
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah-nongnu">lash</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 1c6f163b6fba..9bbb02b8a30d 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/flvstreamer/Manifest b/media-video/flvstreamer/Manifest
index 83a16a5d9e2b..836461c71ab2 100644
--- a/media-video/flvstreamer/Manifest
+++ b/media-video/flvstreamer/Manifest
@@ -1,3 +1,3 @@
 DIST flvstreamer-2.1c.tar.gz 77308 BLAKE2B b5c1cfc6dbbf40c32b5d46d207b54f0cffb96aa260ce4e456385d79d2062d497bed2560adc067db18d5de292ede897f777c313f1c661da900ee2d4b278314521 SHA512 029f689f47a7ecbc71fef5194456bc1dd4039bd146bf738afc3e872c96655c54bfa60140576de94bd1d9da5777509876689e9e678e64cce2baf3a8eff53ccb3f
 EBUILD flvstreamer-2.1c.ebuild 817 BLAKE2B 9734c996d7a2666f8e341f8faf57df71d4605ef1c65c9a836110f0939adda48b57d6151a69080a064b4b8d6bcee0c3973e05406bae4e76534f56b0613cebb96b SHA512 002268347af7929ad949427b3ce16facc5a3c01d25fe5e77fcdd99cefecbe0363cfd76fad7f09c49d3e4add89d28e022b2a2106a6e0ae7279c38647c289f1a36
-MISC metadata.xml 386 BLAKE2B 716b0dc1cc0ee52c1a13bb7225590f998a7cd1be6df4e89436e710a9ea97eb1d2ebb41c0888e20977548a19eb29b1634398af6b888a0e124a30fe63f8051954e SHA512 ef82df8c81f134e5aeb961f2bf609aca17ba7e674c79895574803e297f869615ca52a66ac7e29d780167082c0cfeb4e1306ed314d13132c0e7fb900f132111db
+MISC metadata.xml 475 BLAKE2B 9b6924b7821c1c30dc62cfa8cd89ce90d85d17575723a555cfd8452c3316a78659d3eb30cf66110f8e528f17ffc8ccece36b51f2a90f3302df02e773c9cb8305 SHA512 b6eb0001b8558a3d008731c16d1d16512bfdf0063a58f3085a95b60b90b294d085512f0e4d7948cec260c294f281ef7a7e30417bcfd33bce728e7d3e26dc5bf8
diff --git a/media-video/flvstreamer/metadata.xml b/media-video/flvstreamer/metadata.xml
index 1d2c19f7dfd1..1252df8102f6 100644
--- a/media-video/flvstreamer/metadata.xml
+++ b/media-video/flvstreamer/metadata.xml
@@ -9,4 +9,7 @@
     <email>sound@gentoo.org</email>
     <name>Gentoo Sound project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="savannah-nongnu">flvstreamer</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-video/vcdimager/Manifest b/media-video/vcdimager/Manifest
index 5ef4067c1947..0d5662ef0329 100644
--- a/media-video/vcdimager/Manifest
+++ b/media-video/vcdimager/Manifest
@@ -1,4 +1,4 @@
 AUX vcdimager-2.0.1-pkg-config.patch 347 BLAKE2B 082ac47630ce7289967a3dfb17c601ba90c01d15e87bedb61a78a44573a38ac0c0d8790bf2acca540c2dbe91f6a099b57032644dbb32d202c05709dddc17ffbe SHA512 e43827527b656e8813c41266e30a9f9e86a3a7dd67ff01de08088d78a775481914d7a6f1d472b80d53e93f09573e0b922006652626415fd5d7f6a9c3ca534468
 DIST vcdimager-2.0.1.tar.gz 1115207 BLAKE2B edf70212e81a89924e64115cae9eab77619f7e639e5529b85cc6a80c6ef4f4028c8a207bec86c41283b9768f6a0f56ef56adfad18c7bba20c315b1e5554a83a9 SHA512 55a9d235149a35fe26576703c623a2c9a3f7deedd2e42e01271fdf1e1fdf14c51ee040ee3b5d15fe1b5860fbd4cbeb437362b1a1f40187c8d4d691b6b89a2230
 EBUILD vcdimager-2.0.1.ebuild 1358 BLAKE2B 475abb923285ac1b5a834a967d102485ebd48fe2620bd3079c5b4d0c0c83c5e93e7b730348196c742d3735853401da2d5ed550b4c229ac7a9e3c6adf2dc9da84 SHA512 6ffe7d5908ae54e927b91c6003361f09535858cd70d21d8370e460296eb1727d9f620a80964a51901497007d05648bf4064fa0a232e725610f6953d979484bf6
-MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8
+MISC metadata.xml 308 BLAKE2B be4600e2320c950b7fafee411800508a7bd2c5356663a6f8e7e6c0cb85eff65f73c822d405bcd105eb74918a20e5dca7f531c9a2dfa617c2f43cbac5117d8bb1 SHA512 22f120fa391fa30c71797a0803d90bf0bae6d784b9ff19ee1cf5df2e9779bf8ef4c75160384916f6bc84f3dd8cc796c6eab70d284d7901334e9304a2cad8ef27
diff --git a/media-video/vcdimager/metadata.xml b/media-video/vcdimager/metadata.xml
index c7e80df04d05..a21ef1baec6e 100644
--- a/media-video/vcdimager/metadata.xml
+++ b/media-video/vcdimager/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>media-video@gentoo.org</email>
-	</maintainer>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">vcdimager</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 5d5fa5db3c37..26aa425cc135 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 3c51513809ee..28475380d10b 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 18 Oct 2022 00:09:53 +0000
+Tue, 18 Oct 2022 06:10:01 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index ad0c60972a78..8823a39727a5 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 530688 BLAKE2B 1384754019a41108cd5a577394c6aafe7ddaa1600e86ddd30f667b8ffcd2a271d1d63c110dd32bcc5d2cdf57213dc2ed2ad65288c00d7dd764fc88a2a5ad121f SHA512 08bf73bc99a66d9fbe7dcf764826772bf00488ab216fa1e39298dffc1fef683f7a82d65031193ede26cf629f7bb21ac7a709099a37a9c6772e7b4eacbf503986
-TIMESTAMP 2022-10-18T00:09:57Z
+TIMESTAMP 2022-10-18T06:10:04Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNN7tVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNOQzxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCRqQ/+ILsAjx8DdC871IbMjnVLqvLOWvbIQnliK+N66SwyvYID86fH2FXmEmjh
-IPNqvmbBrTlCxhxSZ1hONrzUW5UzdHYZtp1F7oFEtfg/BTqZ1aIsvOig6juchMcm
-BmRXYuKiJs83IpiO0hwYrnlJ12DogF6NgUJcl6FGYaxHWEopPXSGpqiljt18fJ9E
-xMnqnmdYChD8fKdY8Viq4vDeh0uNngogqEcH1yMACL/JOds/EMzYELSRiBFF+c7B
-FOpHzwquujezXWJQsPA1TNgo9hRWnK8fSHLlAOPt4fWlqt9evfqoV+QGm8rWqCmD
-jtMY9HlsqvqU9FpOICDYFLU+vXKOvv0CDqJk7vyhFszKnPMmHWymQRo6BYoGuAKd
-7rNwdAfe82z+CSURhb2fFkLdiUF7/mOo9B6PCUBZnc3J/5OAgPXVbxOyWEnuv9Eo
-dRCmHbgmkQ56nWMSJDK+h9Q8A8d5YQQkmry2qazU95hXADHandSA8cQ7coBogftF
-kc2V6+FjU85t1bMvQ1rXbR19fi0E9AnVd0lIXbJCin6T+6jdMb2CVUFwOHcYe4Cz
-dD8TQHnbXDYUkQib/r9OwuUt9nDrut+LPchlwG3R4qqNyfpQuSUFtVD9sgFuqhSG
-tSb9GelAS41+qaxJ8WzDG7NYaGCSVr0tqbJE1WLmAplrPnEW8v4=
-=2+M/
+klB3dQ//ZRHxUCBD4DJhLHHHDVIaZQmwfPaE7IjagZWkx4GjfnpQfPZQoqch/j6S
+b91YpdIRZgM5EwTvJtJZVItK/P3eHRMt6JbJMGkBfd3sOB/etgkI9i9/xypkfTu8
+OeshbxE54kb79bocLE+VwfrLrw5M6qK85KvmpruEmASusF67rMZ4QWUCTK9RGJEC
+g1PXBEjFbrFsIWsWDTfk8zRj8zDxQlxJBl5QzwB4hM9RB+S9qiK32iMNyj2m2pUP
+ZTvJ8bhDdq6bifwlD/YCo+sXZ8DMwFxmiobnt9SdVA9svXL/lzo0KsoRiwtmWGBS
+MFq66PJqGx5Pz2jm7AtGwAmvZvhvjnFWbuu4SBlvq+iawS8EcnWgMPNqmxUBZFhd
+gu4+Py5MjQPvTFlqwFCYiciHfi607qbXq992iAZeZ1CZo72bOpNs7XJIn0mJXy2X
+yWPImzRowXLmAYgkLbpWHrnoLUsnqfnlaFdVDI3nZXS9QaZFSO+H4nNIkRZGZ49g
+jDbNk0rjPy/unceDVK9ZdEUnNfdR8ttK9hv4HTvcvYJb4oYlx+neHlzyOqcr7ivP
+fC4al8a3/NpDYaGHai+LbJBnKgeRDkF6Je2p7e7lVcR5BccU0KPK+MPgmrHLkY2o
++RT+Mx5fFKE/B44TCyGNwlJyxHuJcmaU8f8RnMAPLRh7JjQSvZA=
+=aMue
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 3c51513809ee..28475380d10b 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 18 Oct 2022 00:09:53 +0000
+Tue, 18 Oct 2022 06:10:01 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 171d809e21ed..af631220f40b 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 90b90ed7299f..ff942e0b6dce 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/consul-template-0.29.5 b/metadata/md5-cache/app-admin/consul-template-0.29.5
new file mode 100644
index 000000000000..0af32b959476
--- /dev/null
+++ b/metadata/md5-cache/app-admin/consul-template-0.29.5
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=acct-group/consul-template acct-user/consul-template
+DESCRIPTION=Generic template rendering and notifications with Consul
+EAPI=7
+HOMEPAGE=https://github.com/hashicorp/consul-template
+INHERIT=go-module systemd
+KEYWORDS=~amd64
+LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2
+RDEPEND=acct-group/consul-template acct-user/consul-template
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/consul-template/archive/refs/tags/v0.29.5.tar.gz -> consul-template-0.29.5.tar.gz https://dev.gentoo.org/~zmedico/dist/consul-template-0.29.4-deps.tar.xz
+_eclasses_=go-module	b088539f282ed242c23f38fa65472184	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=f30b4b2e22de6c0340cdf6a83183b3ac
diff --git a/metadata/md5-cache/app-admin/serf-0.10.1 b/metadata/md5-cache/app-admin/serf-0.10.1
new file mode 100644
index 000000000000..7e719a048701
--- /dev/null
+++ b/metadata/md5-cache/app-admin/serf-0.10.1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install prepare unpack
+DESCRIPTION=Service orchestration and management tool
+EAPI=7
+HOMEPAGE=https://www.serfdom.io/
+INHERIT=go-module systemd
+KEYWORDS=~amd64
+LICENSE=MPL-2.0 Apache-2.0 BSD MIT
+RDEPEND=acct-user/serf acct-group/serf
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/serf/archive/v0.10.1.tar.gz -> serf-0.10.1.tar.gz https://dev.gentoo.org/~zmedico/dist/serf-0.10.1-deps.tar.xz
+_eclasses_=go-module	b088539f282ed242c23f38fa65472184	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=1c8da28ac6c65e3fde56fa067b281416
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index da383ae87acd..4f6a5862b608 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r1 b/metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r2
index e3d4a2ee2d35..a732f7650943 100644
--- a/metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r1
+++ b/metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r2
@@ -12,4 +12,4 @@ RESTRICT=mirror strip
 SLOT=0
 SRC_URI=x86? ( https://spideroak.com/release/spideroak/deb_x86 -> spideroak-bin-7.5.0_x86.deb ) amd64? ( https://spideroak.com/release/spideroak/deb_x64 -> spideroak-bin-7.5.0_amd64.deb )
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063
-_md5_=c373e40fba43e0525588f9c0aeacd4b0
+_md5_=f72d5ae06cf9ef1820571ed7690b001f
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 39a670676d4a..bea87aea0b23 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/flannel-0.14.0 b/metadata/md5-cache/app-containers/flannel-0.14.0
deleted file mode 100644
index f1c57d332585..000000000000
--- a/metadata/md5-cache/app-containers/flannel-0.14.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare test unpack
-DESCRIPTION=An etcd backed network fabric for containers
-EAPI=7
-HOMEPAGE=https://github.com/coreos/flannel
-INHERIT=go-module systemd tmpfiles
-IUSE=hardened
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0 BSD ISC LGPL-3 MIT
-RDEPEND=virtual/tmpfiles
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/coreos/flannel/archive/v0.14.0.tar.gz -> flannel-0.14.0.tar.gz
-_eclasses_=go-module	b088539f282ed242c23f38fa65472184	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3c3a257954cb48801b6de87833a24b46
diff --git a/metadata/md5-cache/app-containers/flannel-0.16.0 b/metadata/md5-cache/app-containers/flannel-0.16.0
deleted file mode 100644
index 2534fdbdaca2..000000000000
--- a/metadata/md5-cache/app-containers/flannel-0.16.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare test unpack
-DESCRIPTION=An etcd backed network fabric for containers
-EAPI=7
-HOMEPAGE=https://github.com/coreos/flannel
-INHERIT=go-module systemd tmpfiles
-IUSE=hardened
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0 BSD ISC LGPL-3 MIT
-RDEPEND=virtual/tmpfiles
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/coreos/flannel/archive/v0.16.0.tar.gz -> flannel-0.16.0.tar.gz
-_eclasses_=go-module	b088539f282ed242c23f38fa65472184	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3c3a257954cb48801b6de87833a24b46
diff --git a/metadata/md5-cache/app-containers/flannel-0.16.1 b/metadata/md5-cache/app-containers/flannel-0.16.1
deleted file mode 100644
index db500751ca6a..000000000000
--- a/metadata/md5-cache/app-containers/flannel-0.16.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare test unpack
-DESCRIPTION=An etcd backed network fabric for containers
-EAPI=7
-HOMEPAGE=https://github.com/coreos/flannel
-INHERIT=go-module systemd tmpfiles
-IUSE=hardened
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0 BSD ISC LGPL-3 MIT
-RDEPEND=virtual/tmpfiles
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/coreos/flannel/archive/v0.16.1.tar.gz -> flannel-0.16.1.tar.gz
-_eclasses_=go-module	b088539f282ed242c23f38fa65472184	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=89c41473048871bfc72751fda2d56e8d
diff --git a/metadata/md5-cache/app-containers/flannel-0.16.3 b/metadata/md5-cache/app-containers/flannel-0.20.0
index b4927b1e131b..52485299c466 100644
--- a/metadata/md5-cache/app-containers/flannel-0.16.3
+++ b/metadata/md5-cache/app-containers/flannel-0.20.0
@@ -2,7 +2,7 @@ BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
 DEFINED_PHASES=compile install postinst prepare test unpack
 DESCRIPTION=An etcd backed network fabric for containers
 EAPI=7
-HOMEPAGE=https://github.com/coreos/flannel
+HOMEPAGE=https://github.com/flannel-io/flannel
 INHERIT=go-module systemd tmpfiles
 IUSE=hardened
 KEYWORDS=~amd64 ~arm64
@@ -10,6 +10,6 @@ LICENSE=Apache-2.0 BSD ISC LGPL-3 MIT
 RDEPEND=virtual/tmpfiles
 RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/coreos/flannel/archive/v0.16.3.tar.gz -> flannel-0.16.3.tar.gz
+SRC_URI=https://github.com/flannel-io/flannel/archive/refs/tags/v0.20.0.tar.gz -> flannel-0.20.0.tar.gz
 _eclasses_=go-module	b088539f282ed242c23f38fa65472184	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=89c41473048871bfc72751fda2d56e8d
+_md5_=f028856793212738e63ab42c5452c717
diff --git a/metadata/md5-cache/app-containers/snapd-2.57.4 b/metadata/md5-cache/app-containers/snapd-2.57.4
new file mode 100644
index 000000000000..db60d420cecd
--- /dev/null
+++ b/metadata/md5-cache/app-containers/snapd-2.57.4
@@ -0,0 +1,18 @@
+BDEPEND=>=dev-lang/go-1.9 dev-python/docutils sys-devel/gettext sys-fs/xfsprogs sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=sys-libs/libseccomp:= apparmor? ( sec-policy/apparmor-profiles sys-apps/apparmor:= ) dev-libs/glib virtual/libudev systemd? ( sys-apps/systemd ) sys-libs/libcap:= sys-fs/squashfs-tools[lzma]
+DESCRIPTION=Service and tools for management of snap packages
+EAPI=7
+HOMEPAGE=http://snapcraft.io/
+INHERIT=autotools bash-completion-r1 flag-o-matic go-module linux-info readme.gentoo-r1 systemd xdg-utils
+IUSE=apparmor +forced-devmode gtk kde systemd
+KEYWORDS=~amd64
+LICENSE=GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT
+PDEPEND=sys-auth/polkit[gtk?,kde?]
+RDEPEND=sys-libs/libseccomp:= apparmor? ( sec-policy/apparmor-profiles sys-apps/apparmor:= ) dev-libs/glib virtual/libudev systemd? ( sys-apps/systemd ) sys-libs/libcap:= sys-fs/squashfs-tools[lzma]
+REQUIRED_USE=!forced-devmode? ( apparmor ) systemd
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/snapcore/snapd/releases/download/2.57.4/snapd_2.57.4.vendor.tar.xz -> snapd-2.57.4.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	go-module	b088539f282ed242c23f38fa65472184	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=4890ef91805a8a226b2aab1d3054ea58
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 4809354f78d8..d0d8f3442feb 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/dasel-1.27.1 b/metadata/md5-cache/app-misc/dasel-1.27.1
new file mode 100644
index 000000000000..923ddcfbaab5
--- /dev/null
+++ b/metadata/md5-cache/app-misc/dasel-1.27.1
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Query, update and convert data structures from the command line
+EAPI=7
+HOMEPAGE=https://github.com/TomWright/dasel
+INHERIT=go-module
+KEYWORDS=~amd64
+LICENSE=MIT Apache-2.0 BSD BSD-2 ISC
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/TomWright/dasel/archive/v1.27.1.tar.gz -> dasel-1.27.1.tar.gz https://dev.gentoo.org/~zmedico/dist/dasel-1.24.3-deps.tar.xz
+_eclasses_=go-module	b088539f282ed242c23f38fa65472184
+_md5_=ce1600e259c6e673a4252b4c13bd1e25
diff --git a/metadata/md5-cache/app-misc/khal-0.10.5 b/metadata/md5-cache/app-misc/khal-0.10.5
new file mode 100644
index 000000000000..41c5055d4f9a
--- /dev/null
+++ b/metadata/md5-cache/app-misc/khal-0.10.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_10(-)?] dev-python/vdirsyncer[python_targets_python3_10(-)?] dev-python/freezegun[python_targets_python3_10(-)?] test? ( dev-python/click[python_targets_python3_10(-)?] dev-python/click-log[python_targets_python3_10(-)?] dev-python/icalendar[python_targets_python3_10(-)?] dev-python/urwid[python_targets_python3_10(-)?] dev-python/pyxdg[python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?] dev-python/configobj[python_targets_python3_10(-)?] dev-python/atomicwrites[python_targets_python3_10(-)?] dev-python/tzlocal[python_targets_python3_10(-)?] dev-python/setproctitle[python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A CalDAV based calendar
+EAPI=8
+HOMEPAGE=https://lostpackets.de/khal/ https://github.com/pimutils/khal
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=dev-python/click[python_targets_python3_10(-)?] dev-python/click-log[python_targets_python3_10(-)?] dev-python/icalendar[python_targets_python3_10(-)?] dev-python/urwid[python_targets_python3_10(-)?] dev-python/pyxdg[python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?] dev-python/configobj[python_targets_python3_10(-)?] dev-python/atomicwrites[python_targets_python3_10(-)?] dev-python/tzlocal[python_targets_python3_10(-)?] dev-python/setproctitle[python_targets_python3_10(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/k/khal/khal-0.10.5.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=3d7d3ee5a83b5c23acd488d1afef4b9c
diff --git a/metadata/md5-cache/app-misc/socnetv-2.2 b/metadata/md5-cache/app-misc/socnetv-2.2-r1
index 2e5be719beb4..e8da7845ba42 100644
--- a/metadata/md5-cache/app-misc/socnetv-2.2
+++ b/metadata/md5-cache/app-misc/socnetv-2.2-r1
@@ -11,4 +11,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:
 SLOT=0
 SRC_URI=mirror://sourceforge/socnetv/SocNetV-2.2.tar.gz
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=55426b4d01d90de04eece56d749517a5
+_md5_=63b6601f328d6a7b64dd450b16266c47
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 93311db0126a..5c036be39b77 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/layman-2.4.3 b/metadata/md5-cache/app-portage/layman-2.4.3
index 35077f2dacc6..6e24c0bae48f 100644
--- a/metadata/md5-cache/app-portage/layman-2.4.3
+++ b/metadata/md5-cache/app-portage/layman-2.4.3
@@ -1,6 +1,5 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[xml(+),sqlite?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+),sqlite?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+),sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+),sqlite?] )
+BDEPEND=test? ( dev-vcs/subversion ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[xml(+),sqlite?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+),sqlite?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+),sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+),sqlite?] )
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=test? ( dev-vcs/subversion )
 DESCRIPTION=Tool to manage Gentoo overlays
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Layman
@@ -14,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/layman/layman-2.4.3.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=03bc1294eaa28a7ac0f19644cac44817
+_md5_=741c52907f75d79d7953a16a46413610
diff --git a/metadata/md5-cache/app-portage/layman-9999 b/metadata/md5-cache/app-portage/layman-9999
index b13ab897c7af..17b882bb2dec 100644
--- a/metadata/md5-cache/app-portage/layman-9999
+++ b/metadata/md5-cache/app-portage/layman-9999
@@ -1,6 +1,5 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[xml(+),sqlite?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+),sqlite?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+),sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+),sqlite?] ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-vcs/subversion ) app-text/asciidoc python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[xml(+),sqlite?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+),sqlite?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+),sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+),sqlite?] ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=test? ( dev-vcs/subversion )
 DESCRIPTION=Tool to manage Gentoo overlays
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Layman
@@ -13,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=99710fb7b28253eb04e2be094fac3fea
+_md5_=1128a91000aa2890ef67fe8fd1ef1361
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 2a97ed1dcef9..878b8e8a3647 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
diff --git a/metadata/md5-cache/app-shells/nushell-0.69.1 b/metadata/md5-cache/app-shells/nushell-0.69.1
new file mode 100644
index 000000000000..3ebc267479c3
--- /dev/null
+++ b/metadata/md5-cache/app-shells/nushell-0.69.1
@@ -0,0 +1,16 @@
+BDEPEND=>=virtual/rust-1.60 virtual/pkgconfig >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-libs/libgit2-0.99:= dev-libs/oniguruma:= dev-libs/openssl:0= net-libs/libssh2:= net-libs/nghttp2:= net-misc/curl extra? ( dev-db/sqlite:3= x11-libs/libX11 x11-libs/libxcb )
+DESCRIPTION=A new type of shell, written in Rust
+EAPI=8
+HOMEPAGE=https://www.nushell.sh
+INHERIT=cargo
+IUSE=+extra debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv
+LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD Boost-1.0 CC0-1.0 ISC MIT MPL-2.0 Unlicense ZLIB
+RDEPEND=>=dev-libs/libgit2-0.99:= dev-libs/oniguruma:= dev-libs/openssl:0= net-libs/libssh2:= net-libs/nghttp2:= net-misc/curl extra? ( dev-db/sqlite:3= x11-libs/libX11 x11-libs/libxcb )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/nushell/nushell/archive/0.69.1.tar.gz -> nushell-0.69.1.tar.gz https://crates.io/api/v1/crates/Inflector/0.11.4/download -> Inflector-0.11.4.crate https://crates.io/api/v1/crates/addr2line/0.17.0/download -> addr2line-0.17.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/alloc-no-stdlib/2.0.3/download -> alloc-no-stdlib-2.0.3.crate https://crates.io/api/v1/crates/alloc-stdlib/0.2.1/download -> alloc-stdlib-0.2.1.crate https://crates.io/api/v1/crates/alphanumeric-sort/1.4.4/download -> alphanumeric-sort-1.4.4.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/ansi-str/0.3.0/download -> ansi-str-0.3.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/ansitok/0.1.0/download -> ansitok-0.1.0.crate https://crates.io/api/v1/crates/anyhow/1.0.58/download -> anyhow-1.0.58.crate https://crates.io/api/v1/crates/array-init-cursor/0.2.0/download -> array-init-cursor-0.2.0.crate https://crates.io/api/v1/crates/arrayvec/0.4.12/download -> arrayvec-0.4.12.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/arrayvec/0.7.2/download -> arrayvec-0.7.2.crate https://crates.io/api/v1/crates/arrow-format/0.7.0/download -> arrow-format-0.7.0.crate https://crates.io/api/v1/crates/arrow2/0.13.1/download -> arrow2-0.13.1.crate https://crates.io/api/v1/crates/assert_cmd/2.0.4/download -> assert_cmd-2.0.4.crate https://crates.io/api/v1/crates/async-stream/0.3.3/download -> async-stream-0.3.3.crate https://crates.io/api/v1/crates/async-stream-impl/0.3.3/download -> async-stream-impl-0.3.3.crate https://crates.io/api/v1/crates/async-trait/0.1.56/download -> async-trait-0.1.56.crate https://crates.io/api/v1/crates/atomic-polyfill/0.1.8/download -> atomic-polyfill-0.1.8.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/backtrace/0.3.66/download -> backtrace-0.3.66.crate https://crates.io/api/v1/crates/bare-metal/0.2.5/download -> bare-metal-0.2.5.crate https://crates.io/api/v1/crates/bare-metal/1.0.0/download -> bare-metal-1.0.0.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bincode/1.3.3/download -> bincode-1.3.3.crate https://crates.io/api/v1/crates/bindgen/0.59.2/download -> bindgen-0.59.2.crate https://crates.io/api/v1/crates/bit-set/0.5.3/download -> bit-set-0.5.3.crate https://crates.io/api/v1/crates/bit-vec/0.6.3/download -> bit-vec-0.6.3.crate https://crates.io/api/v1/crates/bit_field/0.10.1/download -> bit_field-0.10.1.crate https://crates.io/api/v1/crates/bitfield/0.13.2/download -> bitfield-0.13.2.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bitpacking/0.8.4/download -> bitpacking-0.8.4.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/block-buffer/0.10.2/download -> block-buffer-0.10.2.crate https://crates.io/api/v1/crates/brotli/3.3.4/download -> brotli-3.3.4.crate https://crates.io/api/v1/crates/brotli-decompressor/2.3.2/download -> brotli-decompressor-2.3.2.crate https://crates.io/api/v1/crates/brownstone/3.0.0/download -> brownstone-3.0.0.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/bumpalo/3.10.0/download -> bumpalo-3.10.0.crate https://crates.io/api/v1/crates/byte-order/0.3.0/download -> byte-order-0.3.0.crate https://crates.io/api/v1/crates/byte-slice-cast/1.2.1/download -> byte-slice-cast-1.2.1.crate https://crates.io/api/v1/crates/byte-unit/4.0.14/download -> byte-unit-4.0.14.crate https://crates.io/api/v1/crates/bytecount/0.6.3/download -> bytecount-0.6.3.crate https://crates.io/api/v1/crates/bytemuck/1.11.0/download -> bytemuck-1.11.0.crate https://crates.io/api/v1/crates/bytemuck_derive/1.1.1/download -> bytemuck_derive-1.1.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.2.0/download -> bytes-1.2.0.crate https://crates.io/api/v1/crates/bytesize/1.1.0/download -> bytesize-1.1.0.crate https://crates.io/api/v1/crates/calamine/0.18.0/download -> calamine-0.18.0.crate https://crates.io/api/v1/crates/cast/0.3.0/download -> cast-0.3.0.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cexpr/0.6.0/download -> cexpr-0.6.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.22/download -> chrono-0.4.22.crate https://crates.io/api/v1/crates/chrono-humanize/0.2.1/download -> chrono-humanize-0.2.1.crate https://crates.io/api/v1/crates/chrono-tz/0.6.3/download -> chrono-tz-0.6.3.crate https://crates.io/api/v1/crates/chrono-tz-build/0.0.3/download -> chrono-tz-build-0.0.3.crate https://crates.io/api/v1/crates/clang-sys/1.3.3/download -> clang-sys-1.3.3.crate https://crates.io/api/v1/crates/clap/2.34.0/download -> clap-2.34.0.crate https://crates.io/api/v1/crates/codepage/0.1.1/download -> codepage-0.1.1.crate https://crates.io/api/v1/crates/comfy-table/5.0.1/download -> comfy-table-5.0.1.crate https://crates.io/api/v1/crates/console/0.15.0/download -> console-0.15.0.crate https://crates.io/api/v1/crates/const_fn/0.4.9/download -> const_fn-0.4.9.crate https://crates.io/api/v1/crates/const_format/0.2.26/download -> const_format-0.2.26.crate https://crates.io/api/v1/crates/const_format_proc_macros/0.2.22/download -> const_format_proc_macros-0.2.22.crate https://crates.io/api/v1/crates/convert_case/0.4.0/download -> convert_case-0.4.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cortex-m/0.7.5/download -> cortex-m-0.7.5.crate https://crates.io/api/v1/crates/cpufeatures/0.2.5/download -> cpufeatures-0.2.5.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/criterion/0.3.6/download -> criterion-0.3.6.crate https://crates.io/api/v1/crates/criterion-plot/0.4.5/download -> criterion-plot-0.4.5.crate https://crates.io/api/v1/crates/critical-section/0.2.7/download -> critical-section-0.2.7.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.6/download -> crossbeam-channel-0.5.6.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.2/download -> crossbeam-deque-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.10/download -> crossbeam-epoch-0.9.10.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.11/download -> crossbeam-utils-0.8.11.crate https://crates.io/api/v1/crates/crossterm/0.23.2/download -> crossterm-0.23.2.crate https://crates.io/api/v1/crates/crossterm/0.24.0/download -> crossterm-0.24.0.crate https://crates.io/api/v1/crates/crossterm_winapi/0.9.0/download -> crossterm_winapi-0.9.0.crate https://crates.io/api/v1/crates/crunchy/0.2.2/download -> crunchy-0.2.2.crate https://crates.io/api/v1/crates/crypto-common/0.1.6/download -> crypto-common-0.1.6.crate https://crates.io/api/v1/crates/cssparser/0.27.2/download -> cssparser-0.27.2.crate https://crates.io/api/v1/crates/cssparser-macros/0.6.0/download -> cssparser-macros-0.6.0.crate https://crates.io/api/v1/crates/cstr_core/0.2.6/download -> cstr_core-0.2.6.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/ctor/0.1.22/download -> ctor-0.1.22.crate https://crates.io/api/v1/crates/ctrlc/3.2.2/download -> ctrlc-3.2.2.crate https://crates.io/api/v1/crates/cty/0.2.2/download -> cty-0.2.2.crate https://crates.io/api/v1/crates/derive_more/0.99.17/download -> derive_more-0.99.17.crate https://crates.io/api/v1/crates/dialoguer/0.9.0/download -> dialoguer-0.9.0.crate https://crates.io/api/v1/crates/diff/0.1.13/download -> diff-0.1.13.crate https://crates.io/api/v1/crates/difflib/0.4.0/download -> difflib-0.4.0.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/digest/0.10.3/download -> digest-0.10.3.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/dtoa/0.4.8/download -> dtoa-0.4.8.crate https://crates.io/api/v1/crates/dtoa-short/0.3.3/download -> dtoa-short-0.3.3.crate https://crates.io/api/v1/crates/dtparse/1.3.0/download -> dtparse-1.3.0.crate https://crates.io/api/v1/crates/dunce/1.0.2/download -> dunce-1.0.2.crate https://crates.io/api/v1/crates/dyn-clone/1.0.8/download -> dyn-clone-1.0.8.crate https://crates.io/api/v1/crates/ego-tree/0.6.2/download -> ego-tree-0.6.2.crate https://crates.io/api/v1/crates/either/1.7.0/download -> either-1.7.0.crate https://crates.io/api/v1/crates/embedded-hal/0.2.7/download -> embedded-hal-0.2.7.crate https://crates.io/api/v1/crates/eml-parser/0.1.3/download -> eml-parser-0.1.3.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding_rs/0.8.31/download -> encoding_rs-0.8.31.crate https://crates.io/api/v1/crates/env_logger/0.8.4/download -> env_logger-0.8.4.crate https://crates.io/api/v1/crates/erased-serde/0.3.21/download -> erased-serde-0.3.21.crate https://crates.io/api/v1/crates/errno/0.2.8/download -> errno-0.2.8.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/fallible-iterator/0.2.0/download -> fallible-iterator-0.2.0.crate https://crates.io/api/v1/crates/fallible-streaming-iterator/0.1.9/download -> fallible-streaming-iterator-0.1.9.crate https://crates.io/api/v1/crates/fancy-regex/0.10.0/download -> fancy-regex-0.10.0.crate https://crates.io/api/v1/crates/fastrand/1.8.0/download -> fastrand-1.8.0.crate https://crates.io/api/v1/crates/fd-lock/3.0.6/download -> fd-lock-3.0.6.crate https://crates.io/api/v1/crates/filesize/0.2.0/download -> filesize-0.2.0.crate https://crates.io/api/v1/crates/filetime/0.2.17/download -> filetime-0.2.17.crate https://crates.io/api/v1/crates/flate2/1.0.24/download -> flate2-1.0.24.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/foreign_vec/0.1.0/download -> foreign_vec-0.1.0.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/fs_extra/1.2.0/download -> fs_extra-1.2.0.crate https://crates.io/api/v1/crates/fsevent/0.4.0/download -> fsevent-0.4.0.crate https://crates.io/api/v1/crates/fsevent-sys/2.0.1/download -> fsevent-sys-2.0.1.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/futf/0.1.5/download -> futf-0.1.5.crate https://crates.io/api/v1/crates/futures/0.3.21/download -> futures-0.3.21.crate https://crates.io/api/v1/crates/futures-channel/0.3.21/download -> futures-channel-0.3.21.crate https://crates.io/api/v1/crates/futures-core/0.3.21/download -> futures-core-0.3.21.crate https://crates.io/api/v1/crates/futures-executor/0.3.21/download -> futures-executor-0.3.21.crate https://crates.io/api/v1/crates/futures-io/0.3.21/download -> futures-io-0.3.21.crate https://crates.io/api/v1/crates/futures-macro/0.3.21/download -> futures-macro-0.3.21.crate https://crates.io/api/v1/crates/futures-sink/0.3.21/download -> futures-sink-0.3.21.crate https://crates.io/api/v1/crates/futures-task/0.3.21/download -> futures-task-0.3.21.crate https://crates.io/api/v1/crates/futures-util/0.3.21/download -> futures-util-0.3.21.crate https://crates.io/api/v1/crates/fuzzy-matcher/0.3.7/download -> fuzzy-matcher-0.3.7.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/generic-array/0.14.5/download -> generic-array-0.14.5.crate https://crates.io/api/v1/crates/gethostname/0.2.3/download -> gethostname-0.2.3.crate https://crates.io/api/v1/crates/getopts/0.2.21/download -> getopts-0.2.21.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.7/download -> getrandom-0.2.7.crate https://crates.io/api/v1/crates/getset/0.1.2/download -> getset-0.1.2.crate https://crates.io/api/v1/crates/ghost/0.1.5/download -> ghost-0.1.5.crate https://crates.io/api/v1/crates/gimli/0.26.2/download -> gimli-0.26.2.crate https://crates.io/api/v1/crates/git2/0.15.0/download -> git2-0.15.0.crate https://crates.io/api/v1/crates/gjson/0.8.1/download -> gjson-0.8.1.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/h2/0.3.13/download -> h2-0.3.13.crate https://crates.io/api/v1/crates/half/1.8.2/download -> half-1.8.2.crate https://crates.io/api/v1/crates/hamcrest2/0.3.0/download -> hamcrest2-0.3.0.crate https://crates.io/api/v1/crates/hash32/0.2.1/download -> hash32-0.2.1.crate https://crates.io/api/v1/crates/hash_hasher/2.0.3/download -> hash_hasher-2.0.3.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/hashlink/0.8.0/download -> hashlink-0.8.0.crate https://crates.io/api/v1/crates/heapless/0.7.15/download -> heapless-0.7.15.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/html5ever/0.26.0/download -> html5ever-0.26.0.crate https://crates.io/api/v1/crates/htmlescape/0.3.1/download -> htmlescape-0.3.1.crate https://crates.io/api/v1/crates/http/0.2.8/download -> http-0.2.8.crate https://crates.io/api/v1/crates/http-body/0.4.5/download -> http-body-0.4.5.crate https://crates.io/api/v1/crates/httparse/1.7.1/download -> httparse-1.7.1.crate https://crates.io/api/v1/crates/httpdate/1.0.2/download -> httpdate-1.0.2.crate https://crates.io/api/v1/crates/hyper/0.14.20/download -> hyper-0.14.20.crate https://crates.io/api/v1/crates/hyper-tls/0.5.0/download -> hyper-tls-0.5.0.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.47/download -> iana-time-zone-0.1.47.crate https://crates.io/api/v1/crates/ical/0.7.0/download -> ical-0.7.0.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/indent_write/2.2.0/download -> indent_write-2.2.0.crate https://crates.io/api/v1/crates/indexmap/1.9.1/download -> indexmap-1.9.1.crate https://crates.io/api/v1/crates/inotify/0.7.1/download -> inotify-0.7.1.crate https://crates.io/api/v1/crates/inotify-sys/0.1.5/download -> inotify-sys-0.1.5.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/integer-encoding/3.0.4/download -> integer-encoding-3.0.4.crate https://crates.io/api/v1/crates/inventory/0.2.3/download -> inventory-0.2.3.crate https://crates.io/api/v1/crates/io-lifetimes/0.7.2/download -> io-lifetimes-0.7.2.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/ipnet/2.5.0/download -> ipnet-2.5.0.crate https://crates.io/api/v1/crates/is-root/0.1.2/download -> is-root-0.1.2.crate https://crates.io/api/v1/crates/is_ci/1.1.1/download -> is_ci-1.1.1.crate https://crates.io/api/v1/crates/is_debug/1.0.1/download -> is_debug-1.0.1.crate https://crates.io/api/v1/crates/is_executable/1.0.1/download -> is_executable-1.0.1.crate https://crates.io/api/v1/crates/itertools/0.10.3/download -> itertools-0.10.3.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/itoa/1.0.2/download -> itoa-1.0.2.crate https://crates.io/api/v1/crates/jobserver/0.1.24/download -> jobserver-0.1.24.crate https://crates.io/api/v1/crates/joinery/2.1.0/download -> joinery-2.1.0.crate https://crates.io/api/v1/crates/js-sys/0.3.59/download -> js-sys-0.3.59.crate https://crates.io/api/v1/crates/json-deserializer/0.3.1/download -> json-deserializer-0.3.1.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lexical/6.1.1/download -> lexical-6.1.1.crate https://crates.io/api/v1/crates/lexical-core/0.8.5/download -> lexical-core-0.8.5.crate https://crates.io/api/v1/crates/lexical-parse-float/0.8.5/download -> lexical-parse-float-0.8.5.crate https://crates.io/api/v1/crates/lexical-parse-integer/0.8.6/download -> lexical-parse-integer-0.8.6.crate https://crates.io/api/v1/crates/lexical-util/0.8.5/download -> lexical-util-0.8.5.crate https://crates.io/api/v1/crates/lexical-write-float/0.8.5/download -> lexical-write-float-0.8.5.crate https://crates.io/api/v1/crates/lexical-write-integer/0.8.5/download -> lexical-write-integer-0.8.5.crate https://crates.io/api/v1/crates/libc/0.2.126/download -> libc-0.2.126.crate https://crates.io/api/v1/crates/libgit2-sys/0.14.0+1.5.0/download -> libgit2-sys-0.14.0+1.5.0.crate https://crates.io/api/v1/crates/libloading/0.7.3/download -> libloading-0.7.3.crate https://crates.io/api/v1/crates/libm/0.2.2/download -> libm-0.2.2.crate https://crates.io/api/v1/crates/libproc/0.12.0/download -> libproc-0.12.0.crate https://crates.io/api/v1/crates/libsqlite3-sys/0.25.1/download -> libsqlite3-sys-0.25.1.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.23/download -> libssh2-sys-0.2.23.crate https://crates.io/api/v1/crates/libz-sys/1.1.8/download -> libz-sys-1.1.8.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.6/download -> linked-hash-map-0.5.6.crate https://crates.io/api/v1/crates/linux-raw-sys/0.0.46/download -> linux-raw-sys-0.0.46.crate https://crates.io/api/v1/crates/lock_api/0.4.7/download -> lock_api-0.4.7.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/lscolors/0.12.0/download -> lscolors-0.12.0.crate https://crates.io/api/v1/crates/lz4/1.23.3/download -> lz4-1.23.3.crate https://crates.io/api/v1/crates/lz4-sys/1.9.4/download -> lz4-sys-1.9.4.crate https://crates.io/api/v1/crates/mac/0.1.1/download -> mac-0.1.1.crate https://crates.io/api/v1/crates/mach2/0.4.1/download -> mach2-0.4.1.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/markup5ever/0.11.0/download -> markup5ever-0.11.0.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/md-5/0.10.1/download -> md-5-0.10.1.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memmap2/0.5.5/download -> memmap2-0.5.5.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/meval/0.2.0/download -> meval-0.2.0.crate https://crates.io/api/v1/crates/miette/4.7.1/download -> miette-4.7.1.crate https://crates.io/api/v1/crates/miette/5.1.1/download -> miette-5.1.1.crate https://crates.io/api/v1/crates/miette-derive/4.7.1/download -> miette-derive-4.7.1.crate https://crates.io/api/v1/crates/miette-derive/5.1.1/download -> miette-derive-5.1.1.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.5.3/download -> miniz_oxide-0.5.3.crate https://crates.io/api/v1/crates/mio/0.6.23/download -> mio-0.6.23.crate https://crates.io/api/v1/crates/mio/0.8.4/download -> mio-0.8.4.crate https://crates.io/api/v1/crates/mio-extras/2.0.6/download -> mio-extras-2.0.6.crate https://crates.io/api/v1/crates/miow/0.2.2/download -> miow-0.2.2.crate https://crates.io/api/v1/crates/multiversion/0.6.1/download -> multiversion-0.6.1.crate https://crates.io/api/v1/crates/multiversion-macros/0.6.1/download -> multiversion-macros-0.6.1.crate https://crates.io/api/v1/crates/native-tls/0.2.10/download -> native-tls-0.2.10.crate https://crates.io/api/v1/crates/nb/0.1.3/download -> nb-0.1.3.crate https://crates.io/api/v1/crates/nb/1.0.0/download -> nb-1.0.0.crate https://crates.io/api/v1/crates/net2/0.2.37/download -> net2-0.2.37.crate https://crates.io/api/v1/crates/new_debug_unreachable/1.0.4/download -> new_debug_unreachable-1.0.4.crate https://crates.io/api/v1/crates/nix/0.24.2/download -> nix-0.24.2.crate https://crates.io/api/v1/crates/nodrop/0.1.14/download -> nodrop-0.1.14.crate https://crates.io/api/v1/crates/nom/1.2.4/download -> nom-1.2.4.crate https://crates.io/api/v1/crates/nom/7.1.1/download -> nom-7.1.1.crate https://crates.io/api/v1/crates/nom-supreme/0.8.0/download -> nom-supreme-0.8.0.crate https://crates.io/api/v1/crates/notify/4.0.17/download -> notify-4.0.17.crate https://crates.io/api/v1/crates/ntapi/0.3.7/download -> ntapi-0.3.7.crate https://crates.io/api/v1/crates/nu-ansi-term/0.46.0/download -> nu-ansi-term-0.46.0.crate https://crates.io/api/v1/crates/num/0.2.1/download -> num-0.2.1.crate https://crates.io/api/v1/crates/num/0.4.0/download -> num-0.4.0.crate https://crates.io/api/v1/crates/num-bigint/0.2.6/download -> num-bigint-0.2.6.crate https://crates.io/api/v1/crates/num-bigint/0.4.3/download -> num-bigint-0.4.3.crate https://crates.io/api/v1/crates/num-complex/0.2.4/download -> num-complex-0.2.4.crate https://crates.io/api/v1/crates/num-complex/0.4.2/download -> num-complex-0.4.2.crate https://crates.io/api/v1/crates/num-format/0.4.0/download -> num-format-0.4.0.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-iter/0.1.43/download -> num-iter-0.1.43.crate https://crates.io/api/v1/crates/num-rational/0.2.4/download -> num-rational-0.2.4.crate https://crates.io/api/v1/crates/num-rational/0.4.1/download -> num-rational-0.4.1.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/num_threads/0.1.6/download -> num_threads-0.1.6.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/object/0.29.0/download -> object-0.29.0.crate https://crates.io/api/v1/crates/once_cell/1.13.1/download -> once_cell-1.13.1.crate https://crates.io/api/v1/crates/oorandom/11.1.3/download -> oorandom-11.1.3.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/openssl/0.10.41/download -> openssl-0.10.41.crate https://crates.io/api/v1/crates/openssl-macros/0.1.0/download -> openssl-macros-0.1.0.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-src/111.22.0+1.1.1q/download -> openssl-src-111.22.0+1.1.1q.crate https://crates.io/api/v1/crates/openssl-sys/0.9.75/download -> openssl-sys-0.9.75.crate https://crates.io/api/v1/crates/output_vt100/0.1.3/download -> output_vt100-0.1.3.crate https://crates.io/api/v1/crates/overload/0.1.1/download -> overload-0.1.1.crate https://crates.io/api/v1/crates/owo-colors/3.4.0/download -> owo-colors-3.4.0.crate https://crates.io/api/v1/crates/papergrid/0.5.1/download -> papergrid-0.5.1.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.3/download -> parking_lot_core-0.9.3.crate https://crates.io/api/v1/crates/parquet-format-async-temp/0.3.1/download -> parquet-format-async-temp-0.3.1.crate https://crates.io/api/v1/crates/parquet2/0.14.1/download -> parquet2-0.14.1.crate https://crates.io/api/v1/crates/parse-zoneinfo/0.3.0/download -> parse-zoneinfo-0.3.0.crate https://crates.io/api/v1/crates/paste/1.0.8/download -> paste-1.0.8.crate https://crates.io/api/v1/crates/pathdiff/0.2.1/download -> pathdiff-0.2.1.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/peresil/0.3.0/download -> peresil-0.3.0.crate https://crates.io/api/v1/crates/pest/2.1.3/download -> pest-2.1.3.crate https://crates.io/api/v1/crates/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf/0.10.1/download -> phf-0.10.1.crate https://crates.io/api/v1/crates/phf/0.11.0/download -> phf-0.11.0.crate https://crates.io/api/v1/crates/phf_codegen/0.8.0/download -> phf_codegen-0.8.0.crate https://crates.io/api/v1/crates/phf_codegen/0.10.0/download -> phf_codegen-0.10.0.crate https://crates.io/api/v1/crates/phf_codegen/0.11.0/download -> phf_codegen-0.11.0.crate https://crates.io/api/v1/crates/phf_generator/0.8.0/download -> phf_generator-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.10.0/download -> phf_generator-0.10.0.crate https://crates.io/api/v1/crates/phf_generator/0.11.0/download -> phf_generator-0.11.0.crate https://crates.io/api/v1/crates/phf_macros/0.8.0/download -> phf_macros-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.8.0/download -> phf_shared-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.10.0/download -> phf_shared-0.10.0.crate https://crates.io/api/v1/crates/phf_shared/0.11.0/download -> phf_shared-0.11.0.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.25/download -> pkg-config-0.3.25.crate https://crates.io/api/v1/crates/planus/0.3.1/download -> planus-0.3.1.crate https://crates.io/api/v1/crates/plotters/0.3.3/download -> plotters-0.3.3.crate https://crates.io/api/v1/crates/plotters-backend/0.3.4/download -> plotters-backend-0.3.4.crate https://crates.io/api/v1/crates/plotters-svg/0.3.3/download -> plotters-svg-0.3.3.crate https://crates.io/api/v1/crates/polars/0.23.2/download -> polars-0.23.2.crate https://crates.io/api/v1/crates/polars-arrow/0.23.2/download -> polars-arrow-0.23.2.crate https://crates.io/api/v1/crates/polars-core/0.23.2/download -> polars-core-0.23.2.crate https://crates.io/api/v1/crates/polars-io/0.23.2/download -> polars-io-0.23.2.crate https://crates.io/api/v1/crates/polars-lazy/0.23.2/download -> polars-lazy-0.23.2.crate https://crates.io/api/v1/crates/polars-ops/0.23.2/download -> polars-ops-0.23.2.crate https://crates.io/api/v1/crates/polars-time/0.23.2/download -> polars-time-0.23.2.crate https://crates.io/api/v1/crates/polars-utils/0.23.2/download -> polars-utils-0.23.2.crate https://crates.io/api/v1/crates/pori/0.0.0/download -> pori-0.0.0.crate https://crates.io/api/v1/crates/powierza-coefficient/1.0.1/download -> powierza-coefficient-1.0.1.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/precomputed-hash/0.1.1/download -> precomputed-hash-0.1.1.crate https://crates.io/api/v1/crates/predicates/2.1.1/download -> predicates-2.1.1.crate https://crates.io/api/v1/crates/predicates-core/1.0.3/download -> predicates-core-1.0.3.crate https://crates.io/api/v1/crates/predicates-tree/1.0.5/download -> predicates-tree-1.0.5.crate https://crates.io/api/v1/crates/pretty_assertions/1.2.1/download -> pretty_assertions-1.2.1.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.42/download -> proc-macro2-1.0.42.crate https://crates.io/api/v1/crates/procfs/0.14.0/download -> procfs-0.14.0.crate https://crates.io/api/v1/crates/proptest/1.0.0/download -> proptest-1.0.0.crate https://crates.io/api/v1/crates/pure-rust-locales/0.5.6/download -> pure-rust-locales-0.5.6.crate https://crates.io/api/v1/crates/pwd/1.4.0/download -> pwd-1.4.0.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quick-error/2.0.1/download -> quick-error-2.0.1.crate https://crates.io/api/v1/crates/quick-xml/0.19.0/download -> quick-xml-0.19.0.crate https://crates.io/api/v1/crates/quick-xml/0.23.0/download -> quick-xml-0.23.0.crate https://crates.io/api/v1/crates/quickcheck/1.0.3/download -> quickcheck-1.0.3.crate https://crates.io/api/v1/crates/quickcheck_macros/1.0.0/download -> quickcheck_macros-1.0.0.crate https://crates.io/api/v1/crates/quote/1.0.20/download -> quote-1.0.20.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_distr/0.4.3/download -> rand_distr-0.4.3.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/rand_xorshift/0.3.0/download -> rand_xorshift-0.3.0.crate https://crates.io/api/v1/crates/rayon/1.5.3/download -> rayon-1.5.3.crate https://crates.io/api/v1/crates/rayon-core/1.9.3/download -> rayon-core-1.9.3.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.15/download -> redox_syscall-0.2.15.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/reedline/0.12.0/download -> reedline-0.12.0.crate https://crates.io/api/v1/crates/regex/1.6.0/download -> regex-1.6.0.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.27/download -> regex-syntax-0.6.27.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/reqwest/0.11.11/download -> reqwest-0.11.11.crate https://crates.io/api/v1/crates/result/1.0.0/download -> result-1.0.0.crate https://crates.io/api/v1/crates/riscv/0.7.0/download -> riscv-0.7.0.crate https://crates.io/api/v1/crates/riscv-target/0.1.2/download -> riscv-target-0.1.2.crate https://crates.io/api/v1/crates/rmp/0.8.11/download -> rmp-0.8.11.crate https://crates.io/api/v1/crates/rmp-serde/1.1.0/download -> rmp-serde-1.1.0.crate https://crates.io/api/v1/crates/rmpv/1.0.0/download -> rmpv-1.0.0.crate https://crates.io/api/v1/crates/roxmltree/0.14.1/download -> roxmltree-0.14.1.crate https://crates.io/api/v1/crates/rstest/0.15.0/download -> rstest-0.15.0.crate https://crates.io/api/v1/crates/rstest_macros/0.14.0/download -> rstest_macros-0.14.0.crate https://crates.io/api/v1/crates/rusqlite/0.28.0/download -> rusqlite-0.28.0.crate https://crates.io/api/v1/crates/rust-embed/6.4.0/download -> rust-embed-6.4.0.crate https://crates.io/api/v1/crates/rust-embed-impl/6.2.0/download -> rust-embed-impl-6.2.0.crate https://crates.io/api/v1/crates/rust-embed-utils/7.2.0/download -> rust-embed-utils-7.2.0.crate https://crates.io/api/v1/crates/rust_decimal/1.25.0/download -> rust_decimal-1.25.0.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/rustix/0.35.7/download -> rustix-0.35.7.crate https://crates.io/api/v1/crates/rustversion/1.0.8/download -> rustversion-1.0.8.crate https://crates.io/api/v1/crates/rusty-fork/0.3.0/download -> rusty-fork-0.3.0.crate https://crates.io/api/v1/crates/ryu/1.0.10/download -> ryu-1.0.10.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.20/download -> schannel-0.1.20.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scraper/0.13.0/download -> scraper-0.13.0.crate https://crates.io/api/v1/crates/security-framework/2.6.1/download -> security-framework-2.6.1.crate https://crates.io/api/v1/crates/security-framework-sys/2.6.1/download -> security-framework-sys-2.6.1.crate https://crates.io/api/v1/crates/selectors/0.22.0/download -> selectors-0.22.0.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver/0.11.0/download -> semver-0.11.0.crate https://crates.io/api/v1/crates/semver/1.0.12/download -> semver-1.0.12.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/semver-parser/0.10.2/download -> semver-parser-0.10.2.crate https://crates.io/api/v1/crates/serde/1.0.144/download -> serde-1.0.144.crate https://crates.io/api/v1/crates/serde_cbor/0.11.2/download -> serde_cbor-0.11.2.crate https://crates.io/api/v1/crates/serde_derive/1.0.144/download -> serde_derive-1.0.144.crate https://crates.io/api/v1/crates/serde_ini/0.2.0/download -> serde_ini-0.2.0.crate https://crates.io/api/v1/crates/serde_json/1.0.82/download -> serde_json-1.0.82.crate https://crates.io/api/v1/crates/serde_urlencoded/0.7.1/download -> serde_urlencoded-0.7.1.crate https://crates.io/api/v1/crates/serde_yaml/0.9.4/download -> serde_yaml-0.9.4.crate https://crates.io/api/v1/crates/serial_test/0.8.0/download -> serial_test-0.8.0.crate https://crates.io/api/v1/crates/serial_test_derive/0.8.0/download -> serial_test_derive-0.8.0.crate https://crates.io/api/v1/crates/servo_arc/0.1.1/download -> servo_arc-0.1.1.crate https://crates.io/api/v1/crates/sha2/0.9.9/download -> sha2-0.9.9.crate https://crates.io/api/v1/crates/sha2/0.10.2/download -> sha2-0.10.2.crate https://crates.io/api/v1/crates/shadow-rs/0.16.1/download -> shadow-rs-0.16.1.crate https://crates.io/api/v1/crates/shlex/1.1.0/download -> shlex-1.1.0.crate https://crates.io/api/v1/crates/signal-hook/0.3.14/download -> signal-hook-0.3.14.crate https://crates.io/api/v1/crates/signal-hook-mio/0.2.3/download -> signal-hook-mio-0.2.3.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/simdutf8/0.1.4/download -> simdutf8-0.1.4.crate https://crates.io/api/v1/crates/simplelog/0.12.0/download -> simplelog-0.12.0.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/slab/0.4.7/download -> slab-0.4.7.crate https://crates.io/api/v1/crates/smallvec/1.9.0/download -> smallvec-1.9.0.crate https://crates.io/api/v1/crates/smartstring/1.0.1/download -> smartstring-1.0.1.crate https://crates.io/api/v1/crates/smawk/0.3.1/download -> smawk-0.3.1.crate https://crates.io/api/v1/crates/snap/1.0.5/download -> snap-1.0.5.crate https://crates.io/api/v1/crates/socket2/0.4.4/download -> socket2-0.4.4.crate https://crates.io/api/v1/crates/spin/0.9.4/download -> spin-0.9.4.crate https://crates.io/api/v1/crates/sqlparser/0.23.0/download -> sqlparser-0.23.0.crate https://crates.io/api/v1/crates/stable_deref_trait/1.2.0/download -> stable_deref_trait-1.2.0.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/streaming-decompression/0.1.0/download -> streaming-decompression-0.1.0.crate https://crates.io/api/v1/crates/streaming-iterator/0.1.6/download -> streaming-iterator-0.1.6.crate https://crates.io/api/v1/crates/strength_reduce/0.2.3/download -> strength_reduce-0.2.3.crate https://crates.io/api/v1/crates/string_cache/0.8.4/download -> string_cache-0.8.4.crate https://crates.io/api/v1/crates/string_cache_codegen/0.5.2/download -> string_cache_codegen-0.5.2.crate https://crates.io/api/v1/crates/strip-ansi-escapes/0.1.1/download -> strip-ansi-escapes-0.1.1.crate https://crates.io/api/v1/crates/strum/0.23.0/download -> strum-0.23.0.crate https://crates.io/api/v1/crates/strum/0.24.1/download -> strum-0.24.1.crate https://crates.io/api/v1/crates/strum_macros/0.23.1/download -> strum_macros-0.23.1.crate https://crates.io/api/v1/crates/strum_macros/0.24.2/download -> strum_macros-0.24.2.crate https://crates.io/api/v1/crates/supports-color/1.3.0/download -> supports-color-1.3.0.crate https://crates.io/api/v1/crates/supports-hyperlinks/1.2.0/download -> supports-hyperlinks-1.2.0.crate https://crates.io/api/v1/crates/supports-unicode/1.0.2/download -> supports-unicode-1.0.2.crate https://crates.io/api/v1/crates/sxd-document/0.3.2/download -> sxd-document-0.3.2.crate https://crates.io/api/v1/crates/sxd-xpath/0.4.2/download -> sxd-xpath-0.4.2.crate https://crates.io/api/v1/crates/syn/1.0.98/download -> syn-1.0.98.crate https://crates.io/api/v1/crates/sys-locale/0.2.1/download -> sys-locale-0.2.1.crate https://crates.io/api/v1/crates/sysinfo/0.26.2/download -> sysinfo-0.26.2.crate https://crates.io/api/v1/crates/tabled/0.8.0/download -> tabled-0.8.0.crate https://crates.io/api/v1/crates/tabled_derive/0.4.0/download -> tabled_derive-0.4.0.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/tendril/0.4.3/download -> tendril-0.4.3.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/terminal_size/0.1.17/download -> terminal_size-0.1.17.crate https://crates.io/api/v1/crates/terminal_size/0.2.1/download -> terminal_size-0.2.1.crate https://crates.io/api/v1/crates/termtree/0.2.4/download -> termtree-0.2.4.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/textwrap/0.15.0/download -> textwrap-0.15.0.crate https://crates.io/api/v1/crates/thin-slice/0.1.1/download -> thin-slice-0.1.1.crate https://crates.io/api/v1/crates/thiserror/1.0.31/download -> thiserror-1.0.31.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.31/download -> thiserror-impl-1.0.31.crate https://crates.io/api/v1/crates/thread_local/1.1.4/download -> thread_local-1.1.4.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/time/0.3.13/download -> time-0.3.13.crate https://crates.io/api/v1/crates/time-macros/0.2.4/download -> time-macros-0.2.4.crate https://crates.io/api/v1/crates/tinytemplate/1.2.1/download -> tinytemplate-1.2.1.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/titlecase/2.0.0/download -> titlecase-2.0.0.crate https://crates.io/api/v1/crates/tokio/1.20.1/download -> tokio-1.20.1.crate https://crates.io/api/v1/crates/tokio-native-tls/0.3.0/download -> tokio-native-tls-0.3.0.crate https://crates.io/api/v1/crates/tokio-util/0.7.3/download -> tokio-util-0.7.3.crate https://crates.io/api/v1/crates/toml/0.5.9/download -> toml-0.5.9.crate https://crates.io/api/v1/crates/tower-service/0.3.2/download -> tower-service-0.3.2.crate https://crates.io/api/v1/crates/tracing/0.1.35/download -> tracing-0.1.35.crate https://crates.io/api/v1/crates/tracing-core/0.1.28/download -> tracing-core-0.1.28.crate https://crates.io/api/v1/crates/trash/2.1.5/download -> trash-2.1.5.crate https://crates.io/api/v1/crates/try-lock/0.2.3/download -> try-lock-0.2.3.crate https://crates.io/api/v1/crates/typed-arena/1.7.0/download -> typed-arena-1.7.0.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/typetag/0.1.8/download -> typetag-0.1.8.crate https://crates.io/api/v1/crates/typetag-impl/0.1.8/download -> typetag-impl-0.1.8.crate https://crates.io/api/v1/crates/tz-rs/0.6.11/download -> tz-rs-0.6.11.crate https://crates.io/api/v1/crates/tzdb/0.3.1/download -> tzdb-0.3.1.crate https://crates.io/api/v1/crates/ucd-trie/0.1.4/download -> ucd-trie-0.1.4.crate https://crates.io/api/v1/crates/umask/2.0.0/download -> umask-2.0.0.crate https://crates.io/api/v1/crates/uncased/0.9.7/download -> uncased-0.9.7.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.8/download -> unicode-bidi-0.3.8.crate https://crates.io/api/v1/crates/unicode-ident/1.0.2/download -> unicode-ident-1.0.2.crate https://crates.io/api/v1/crates/unicode-linebreak/0.1.2/download -> unicode-linebreak-0.1.2.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.21/download -> unicode-normalization-0.1.21.crate https://crates.io/api/v1/crates/unicode-segmentation/1.9.0/download -> unicode-segmentation-1.9.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.2.3/download -> unicode-xid-0.2.3.crate https://crates.io/api/v1/crates/unsafe-libyaml/0.2.2/download -> unsafe-libyaml-0.2.2.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/users/0.10.0/download -> users-0.10.0.crate https://crates.io/api/v1/crates/users/0.11.0/download -> users-0.11.0.crate https://crates.io/api/v1/crates/utf-8/0.7.6/download -> utf-8-0.7.6.crate https://crates.io/api/v1/crates/utf8-width/0.1.6/download -> utf8-width-0.1.6.crate https://crates.io/api/v1/crates/utf8parse/0.2.0/download -> utf8parse-0.2.0.crate https://crates.io/api/v1/crates/uuid/1.1.2/download -> uuid-1.1.2.crate https://crates.io/api/v1/crates/vcell/0.1.3/download -> vcell-0.1.3.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/vec1/1.8.0/download -> vec1-1.8.0.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/volatile-register/0.2.1/download -> volatile-register-0.2.1.crate https://crates.io/api/v1/crates/vte/0.10.1/download -> vte-0.10.1.crate https://crates.io/api/v1/crates/vte_generate_state_changes/0.1.1/download -> vte_generate_state_changes-0.1.1.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/want/0.3.0/download -> want-0.3.0.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.82/download -> wasm-bindgen-0.2.82.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.82/download -> wasm-bindgen-backend-0.2.82.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.32/download -> wasm-bindgen-futures-0.4.32.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.82/download -> wasm-bindgen-macro-0.2.82.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.82/download -> wasm-bindgen-macro-support-0.2.82.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.82/download -> wasm-bindgen-shared-0.2.82.crate https://crates.io/api/v1/crates/wax/0.5.0/download -> wax-0.5.0.crate https://crates.io/api/v1/crates/web-sys/0.3.59/download -> web-sys-0.3.59.crate https://crates.io/api/v1/crates/which/4.3.0/download -> which-4.3.0.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows/0.37.0/download -> windows-0.37.0.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.37.0/download -> windows_aarch64_msvc-0.37.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.37.0/download -> windows_i686_gnu-0.37.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.37.0/download -> windows_i686_msvc-0.37.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.37.0/download -> windows_x86_64_gnu-0.37.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.37.0/download -> windows_x86_64_msvc-0.37.0.crate https://crates.io/api/v1/crates/winreg/0.10.1/download -> winreg-0.10.1.crate https://crates.io/api/v1/crates/winres/0.1.12/download -> winres-0.1.12.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/xmlparser/0.13.3/download -> xmlparser-0.13.3.crate https://crates.io/api/v1/crates/zeroize/1.5.7/download -> zeroize-1.5.7.crate https://crates.io/api/v1/crates/zip/0.5.13/download -> zip-0.5.13.crate https://crates.io/api/v1/crates/zstd/0.11.2+zstd.1.5.2/download -> zstd-0.11.2+zstd.1.5.2.crate https://crates.io/api/v1/crates/zstd-safe/5.0.2+zstd.1.5.2/download -> zstd-safe-5.0.2+zstd.1.5.2.crate https://crates.io/api/v1/crates/zstd-sys/2.0.1+zstd.1.5.2/download -> zstd-sys-2.0.1+zstd.1.5.2.crate
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=86dfbf2a236c5c5bed30e715ba2cef87
diff --git a/metadata/md5-cache/dev-go/Manifest.gz b/metadata/md5-cache/dev-go/Manifest.gz
index 7390dd0e739f..adec8f410c31 100644
--- a/metadata/md5-cache/dev-go/Manifest.gz
+++ b/metadata/md5-cache/dev-go/Manifest.gz
diff --git a/metadata/md5-cache/dev-go/gopls-0.9.1 b/metadata/md5-cache/dev-go/gopls-0.9.5
index 64f6935982ed..ab661dfacdb9 100644
--- a/metadata/md5-cache/dev-go/gopls-0.9.1
+++ b/metadata/md5-cache/dev-go/gopls-0.9.5
@@ -4,10 +4,10 @@ DESCRIPTION="Go please" is the official Go language server
 EAPI=7
 HOMEPAGE=https://github.com/golang/tools/blob/master/gopls/README.md
 INHERIT=go-module
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/golang/tools/archive/refs/tags/gopls/v0.9.1.tar.gz -> gopls-0.9.1.tar.gz https://dev.gentoo.org/~zmedico/dist/gopls-0.9.1-deps.tar.xz
+SRC_URI=https://github.com/golang/tools/archive/refs/tags/gopls/v0.9.5.tar.gz -> gopls-0.9.5.tar.gz https://dev.gentoo.org/~zmedico/dist/gopls-0.9.5-deps.tar.xz
 _eclasses_=go-module	b088539f282ed242c23f38fa65472184
-_md5_=4ad8b8ab21f758d93e24745e199f5480
+_md5_=fe5052a0be486fdc5907cc438f1e1134
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index ec478138bd14..778284d4d109 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/jackson-annotations-2.13.4 b/metadata/md5-cache/dev-java/jackson-annotations-2.13.4
index e1080bb45d65..097025b511fa 100644
--- a/metadata/md5-cache/dev-java/jackson-annotations-2.13.4
+++ b/metadata/md5-cache/dev-java/jackson-annotations-2.13.4
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/FasterXML/jackson-annotations
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-annotations/archive/jackson-annotations-2.13.4.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=6f994a3aa36ee3b75b447d72cac24eb2
+_md5_=872133a60dca6f066c23a13c935a0d8b
diff --git a/metadata/md5-cache/dev-java/jackson-core-2.13.4 b/metadata/md5-cache/dev-java/jackson-core-2.13.4
index f93c5d16400e..b45e17f9e9ac 100644
--- a/metadata/md5-cache/dev-java/jackson-core-2.13.4
+++ b/metadata/md5-cache/dev-java/jackson-core-2.13.4
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/FasterXML/jackson-core
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-core/archive/jackson-core-2.13.4.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=5e66484126f9890effe5b4c9a491322e
+_md5_=d2912d9a94a67eb70f8f1cacf26b67db
diff --git a/metadata/md5-cache/dev-java/jackson-databind-2.13.4.1 b/metadata/md5-cache/dev-java/jackson-databind-2.13.4.1
index c5a54f62c189..d09629489be9 100644
--- a/metadata/md5-cache/dev-java/jackson-databind-2.13.4.1
+++ b/metadata/md5-cache/dev-java/jackson-databind-2.13.4.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/FasterXML/jackson-databind
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.4:2 ~dev-java/jackson-core-2.13.4:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-databind/archive/jackson-databind-2.13.4.1.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=a9858fc1b5fe7f2eefb063b52e7e2015
+_md5_=324bbf9c07ff69ce651c343a36185ead
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.4-r1 b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.4-r1
index c57529ea44d5..ff26d879e23c 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.4-r1
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.4-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/FasterXML/jackson-dataformat-xml
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.4:2 ~dev-java/jackson-core-2.13.4:0 ~dev-java/jackson-databind-2.13.4.1:0 >=dev-java/stax2-api-4.2.1-r1:0 dev-java/woodstox-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-dataformat-xml/archive/jackson-dataformat-xml-2.13.4.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=31f14f9b102dc073230f502b15e5fe0c
+_md5_=8370be2f550e9543ab65692254be80ef
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.4-r1 b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.4-r1
index fb73307fd475..4faa8369e7c4 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.4-r1
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.4-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/FasterXML/jackson-dataformats-text
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-2.13.4.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=c9aa25a30411e354f161d60ba887ee7b
+_md5_=b443ff00791948dc0ac38c0709a64e5c
diff --git a/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.4-r1 b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.4-r1
index d3fcc0c53b6d..9ef01cd23c73 100644
--- a/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.4-r1
+++ b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.4-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/FasterXML/jackson-modules-base
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.4:2 ~dev-java/jackson-core-2.13.4:0 ~dev-java/jackson-databind-2.13.4.1:0 dev-java/jakarta-activation:1 dev-java/jaxb-api:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-2.13.4.tar.gz -> jackson-module-jakarta-xmlbind-2.13.4.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=0c2f73e848d8ffe8dd2e3e14283e248d
+_md5_=38ed9985e54cbc6f40bcb3d423b2ee88
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 9907b5c23fac..62013839c7d2 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/libksba-1.6.2 b/metadata/md5-cache/dev-libs/libksba-1.6.2
index e24a10ad956d..06996de63314 100644
--- a/metadata/md5-cache/dev-libs/libksba-1.6.2
+++ b/metadata/md5-cache/dev-libs/libksba-1.6.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.gnupg.org/related_software/libksba
 INHERIT=toolchain-funcs verify-sig
 IUSE=static-libs verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-3+ GPL-2+ GPL-3
 RDEPEND=>=dev-libs/libgpg-error-1.8
 SLOT=0
 SRC_URI=mirror://gnupg/libksba/libksba-1.6.2.tar.bz2 verify-sig? ( mirror://gnupg/libksba/libksba-1.6.2.tar.bz2.sig )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=d144042f171df677c066f9e0d7e81001
+_md5_=a1405eef00d4b93f1f27795156cc3bff
diff --git a/metadata/md5-cache/dev-libs/nspr-4.35 b/metadata/md5-cache/dev-libs/nspr-4.35
index 4f00253eb35e..9c155521c16b 100644
--- a/metadata/md5-cache/dev-libs/nspr-4.35
+++ b/metadata/md5-cache/dev-libs/nspr-4.35
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://www.mozilla.org/projects/nspr/
 INHERIT=autotools toolchain-funcs multilib-minimal
 IUSE=debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/nspr/releases/v4.35/src/nspr-4.35.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=14ff9869a85608da7c3346238615043d
+_md5_=f0132031db8894f974e92e8d2d010e9f
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 56fcbcf50d97..02e04ad6ea6f 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/git-review-2.3.1 b/metadata/md5-cache/dev-python/git-review-2.3.1-r1
index 8e0e53408a0a..dd0634831bb3 100644
--- a/metadata/md5-cache/dev-python/git-review-2.3.1
+++ b/metadata/md5-cache/dev-python/git-review-2.3.1-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/g/git-review/git-review-2.3.1.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=7d92227ac1b2b1ee92f19a9685bffbca
+_md5_=c5268627fdfc45f0fde0f09536f74cab
diff --git a/metadata/md5-cache/dev-python/git-review-9999 b/metadata/md5-cache/dev-python/git-review-9999
index 3cb07c0ed02e..d75e76520087 100644
--- a/metadata/md5-cache/dev-python/git-review-9999
+++ b/metadata/md5-cache/dev-python/git-review-9999
@@ -11,4 +11,4 @@ RDEPEND=>=dev-python/requests-1.1[python_targets_python3_8(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=e285a682f04e9c28b3f97c3e9d497d2d
+_md5_=13597fc561ab302d7ab4349177749653
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index edb42adda7a2..167c28d42113 100644
--- a/metadata/md5-cache/dev-scheme/Manifest.gz
+++ b/metadata/md5-cache/dev-scheme/Manifest.gz
diff --git a/metadata/md5-cache/dev-scheme/guile-2.2.6 b/metadata/md5-cache/dev-scheme/guile-2.2.6
deleted file mode 100644
index 55635b5b8b7f..000000000000
--- a/metadata/md5-cache/dev-scheme/guile-2.2.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/libtool sys-devel/gettext
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= dev-libs/libffi:= dev-libs/libltdl:= dev-libs/libunistring:0= sys-libs/ncurses:0= sys-libs/readline:0=
-DESCRIPTION=GNU Ubiquitous Intelligent Language for Extensions
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/guile/
-IUSE=debug debug-malloc +deprecated +networking +nls +regex +threads
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=LGPL-3+
-RDEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= dev-libs/libffi:= dev-libs/libltdl:= dev-libs/libunistring:0= sys-libs/ncurses:0= sys-libs/readline:0=
-REQUIRED_USE=regex
-RESTRICT=strip
-SLOT=12/2.2-1
-SRC_URI=mirror://gnu/guile/guile-2.2.6.tar.xz
-_md5_=96bbc6c8706fda09dfa6d7cb0fc86db6
diff --git a/metadata/md5-cache/dev-scheme/guile-3.0.7-r1 b/metadata/md5-cache/dev-scheme/guile-3.0.7-r1
deleted file mode 100644
index 7f6bc3c9046c..000000000000
--- a/metadata/md5-cache/dev-scheme/guile-3.0.7-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/libtool sys-devel/gettext sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= dev-libs/libffi:= dev-libs/libunistring:0= sys-libs/ncurses:0= sys-libs/readline:0= virtual/libcrypt:=
-DESCRIPTION=GNU Ubiquitous Intelligent Language for Extensions
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/guile/
-INHERIT=autotools
-IUSE=debug debug-malloc +deprecated +jit +networking +nls +regex +threads
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=LGPL-3+
-RDEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= dev-libs/libffi:= dev-libs/libunistring:0= sys-libs/ncurses:0= sys-libs/readline:0= virtual/libcrypt:=
-REQUIRED_USE=regex
-RESTRICT=strip
-SLOT=12/3.0-1
-SRC_URI=mirror://gnu/guile/guile-3.0.7.tar.xz https://dev.gentoo.org/~sam/distfiles/dev-scheme/guile/guile-3.0.7-gnulib-glibc-2.34.patch.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c3b6de1decb45cf3a0e7714ea3865391
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 3e6228b2d3c8..bd1b1d58c6ed 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/cproto-4.7u b/metadata/md5-cache/dev-util/cproto-4.7u
new file mode 100644
index 000000000000..5058fe3222dd
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cproto-4.7u
@@ -0,0 +1,14 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-thomasdickey ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=unpack
+DEPEND=sys-devel/flex virtual/yacc
+DESCRIPTION=Generate C function prototypes from C source code
+EAPI=8
+HOMEPAGE=https://invisible-island.net/cproto/
+INHERIT=verify-sig
+IUSE=verify-sig
+KEYWORDS=~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://invisible-island.net/archives/cproto/cproto-4.7u.tgz verify-sig? ( https://invisible-island.net/archives/cproto/cproto-4.7u.tgz.asc )
+_eclasses_=verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=555a22638ff3652e4084095d37bea042
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 80a25ded03ef..9a15d68bfcd5 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/fossil-2.19 b/metadata/md5-cache/dev-vcs/fossil-2.19
index 464dde1d8293..7c9f82c82ffd 100644
--- a/metadata/md5-cache/dev-vcs/fossil-2.19
+++ b/metadata/md5-cache/dev-vcs/fossil-2.19
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://www.fossil-scm.org/home
 INHERIT=toolchain-funcs
 IUSE=debug fusefs json system-sqlite +ssl static tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 arm ~ppc ~ppc64 ~riscv ~x86
 LICENSE=BSD-2
 RDEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite? ( >=dev-db/sqlite-3.38.0:3 ) ssl? ( dev-libs/openssl:0= ) tcl? ( dev-lang/tcl:0= )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://fossil-scm.org/home/tarball/1e131febd3fbb028d00cab6d020214e8fe36be95daaf93237523c29c542e9a5f/fossil-src-2.19.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c14ec0d065b2a7aa8567ab8c197fb428
+_md5_=3a5793f3234573cbd291e138d428f30c
diff --git a/metadata/md5-cache/dev-vcs/rcs-5.10.0 b/metadata/md5-cache/dev-vcs/rcs-5.10.0
deleted file mode 100644
index 67a65e97d183..000000000000
--- a/metadata/md5-cache/dev-vcs/rcs-5.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=sys-apps/diffutils sys-apps/ed
-DESCRIPTION=Revision Control System
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/rcs/
-INHERIT=flag-o-matic
-IUSE=doc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
-LICENSE=GPL-3
-RDEPEND=sys-apps/diffutils sys-apps/ed
-SLOT=0
-SRC_URI=mirror://gnu/rcs/rcs-5.10.0.tar.xz
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=dfce50c16b98b993f8b34bdc83344374
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index b17dee841f3a..8b47c09a00d0 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/librsvg-2.55.1 b/metadata/md5-cache/gnome-base/librsvg-2.55.1
index b41096da3179..021975a607c8 100644
--- a/metadata/md5-cache/gnome-base/librsvg-2.55.1
+++ b/metadata/md5-cache/gnome-base/librsvg-2.55.1
@@ -1,4 +1,4 @@
-BDEPEND=>=virtual/rust-1.58 x11-libs/gdk-pixbuf || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/docutils[python_targets_python3_8(-)] ) ) gtk-doc? ( dev-util/gi-docgen ) virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) ) dev-libs/gobject-introspection-common dev-libs/vala-common >=virtual/rust-1.53 >=app-portage/elt-patches-20170815 app-arch/xz-utils
+BDEPEND=>=virtual/rust-1.58[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/docutils[python_targets_python3_8(-)] ) ) gtk-doc? ( dev-util/gi-docgen ) virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) ) dev-libs/gobject-introspection-common dev-libs/vala-common >=virtual/rust-1.53 >=app-portage/elt-patches-20170815 app-arch/xz-utils
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
 DEPEND=>=x11-libs/cairo-1.16.0[glib,svg(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.9:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.20:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.50.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-2.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.48.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
 DESCRIPTION=Scalable Vector Graphics (SVG) rendering library
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/librsvg/2.55/librsvg-2.55.1.tar.xz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aho-corasick/0.7.19/download -> aho-corasick-0.7.19.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anyhow/1.0.64/download -> anyhow-1.0.64.crate https://crates.io/api/v1/crates/approx/0.5.1/download -> approx-0.5.1.crate https://crates.io/api/v1/crates/assert_cmd/2.0.4/download -> assert_cmd-2.0.4.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base-x/0.2.11/download -> base-x-0.2.11.crate https://crates.io/api/v1/crates/bit-set/0.5.3/download -> bit-set-0.5.3.crate https://crates.io/api/v1/crates/bit-vec/0.6.3/download -> bit-vec-0.6.3.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/bumpalo/3.11.0/download -> bumpalo-3.11.0.crate https://crates.io/api/v1/crates/bytemuck/1.12.1/download -> bytemuck-1.12.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cairo-rs/0.15.12/download -> cairo-rs-0.15.12.crate https://crates.io/api/v1/crates/cairo-sys-rs/0.15.1/download -> cairo-sys-rs-0.15.1.crate https://crates.io/api/v1/crates/cast/0.3.0/download -> cast-0.3.0.crate https://crates.io/api/v1/crates/cfg-expr/0.10.3/download -> cfg-expr-0.10.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.22/download -> chrono-0.4.22.crate https://crates.io/api/v1/crates/clap/2.34.0/download -> clap-2.34.0.crate https://crates.io/api/v1/crates/const-cstr/0.3.0/download -> const-cstr-0.3.0.crate https://crates.io/api/v1/crates/const_fn/0.4.9/download -> const_fn-0.4.9.crate https://crates.io/api/v1/crates/convert_case/0.4.0/download -> convert_case-0.4.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/criterion/0.3.6/download -> criterion-0.3.6.crate https://crates.io/api/v1/crates/criterion-plot/0.4.5/download -> criterion-plot-0.4.5.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.6/download -> crossbeam-channel-0.5.6.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.2/download -> crossbeam-deque-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.10/download -> crossbeam-epoch-0.9.10.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.11/download -> crossbeam-utils-0.8.11.crate https://crates.io/api/v1/crates/cssparser/0.28.1/download -> cssparser-0.28.1.crate https://crates.io/api/v1/crates/cssparser-macros/0.6.0/download -> cssparser-macros-0.6.0.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/data-url/0.1.1/download -> data-url-0.1.1.crate https://crates.io/api/v1/crates/derive_more/0.99.17/download -> derive_more-0.99.17.crate https://crates.io/api/v1/crates/difflib/0.4.0/download -> difflib-0.4.0.crate https://crates.io/api/v1/crates/discard/1.0.4/download -> discard-1.0.4.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/dtoa/0.4.8/download -> dtoa-0.4.8.crate https://crates.io/api/v1/crates/dtoa-short/0.3.3/download -> dtoa-short-0.3.3.crate https://crates.io/api/v1/crates/either/1.8.0/download -> either-1.8.0.crate https://crates.io/api/v1/crates/encoding/0.2.33/download -> encoding-0.2.33.crate https://crates.io/api/v1/crates/encoding-index-japanese/1.20141219.5/download -> encoding-index-japanese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-korean/1.20141219.5/download -> encoding-index-korean-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-simpchinese/1.20141219.5/download -> encoding-index-simpchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-singlebyte/1.20141219.5/download -> encoding-index-singlebyte-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-tradchinese/1.20141219.5/download -> encoding-index-tradchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding_index_tests/0.1.4/download -> encoding_index_tests-0.1.4.crate https://crates.io/api/v1/crates/fastrand/1.8.0/download -> fastrand-1.8.0.crate https://crates.io/api/v1/crates/flate2/1.0.24/download -> flate2-1.0.24.crate https://crates.io/api/v1/crates/float-cmp/0.9.0/download -> float-cmp-0.9.0.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/futf/0.1.5/download -> futf-0.1.5.crate https://crates.io/api/v1/crates/futures-channel/0.3.24/download -> futures-channel-0.3.24.crate https://crates.io/api/v1/crates/futures-core/0.3.24/download -> futures-core-0.3.24.crate https://crates.io/api/v1/crates/futures-executor/0.3.24/download -> futures-executor-0.3.24.crate https://crates.io/api/v1/crates/futures-io/0.3.24/download -> futures-io-0.3.24.crate https://crates.io/api/v1/crates/futures-task/0.3.24/download -> futures-task-0.3.24.crate https://crates.io/api/v1/crates/futures-util/0.3.24/download -> futures-util-0.3.24.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/gdk-pixbuf/0.15.11/download -> gdk-pixbuf-0.15.11.crate https://crates.io/api/v1/crates/gdk-pixbuf-sys/0.15.10/download -> gdk-pixbuf-sys-0.15.10.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.7/download -> getrandom-0.2.7.crate https://crates.io/api/v1/crates/gio/0.15.12/download -> gio-0.15.12.crate https://crates.io/api/v1/crates/gio-sys/0.15.10/download -> gio-sys-0.15.10.crate https://crates.io/api/v1/crates/glib/0.15.12/download -> glib-0.15.12.crate https://crates.io/api/v1/crates/glib-macros/0.15.11/download -> glib-macros-0.15.11.crate https://crates.io/api/v1/crates/glib-sys/0.15.10/download -> glib-sys-0.15.10.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/gobject-sys/0.15.10/download -> gobject-sys-0.15.10.crate https://crates.io/api/v1/crates/half/1.8.2/download -> half-1.8.2.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.47/download -> iana-time-zone-0.1.47.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itertools/0.10.3/download -> itertools-0.10.3.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/itoa/1.0.3/download -> itoa-1.0.3.crate https://crates.io/api/v1/crates/js-sys/0.3.59/download -> js-sys-0.3.59.crate https://crates.io/api/v1/crates/language-tags/0.3.2/download -> language-tags-0.3.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.132/download -> libc-0.2.132.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.6/download -> linked-hash-map-0.5.6.crate https://crates.io/api/v1/crates/locale_config/0.3.0/download -> locale_config-0.3.0.crate https://crates.io/api/v1/crates/lock_api/0.4.8/download -> lock_api-0.4.8.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/lopdf/0.26.0/download -> lopdf-0.26.0.crate https://crates.io/api/v1/crates/lzw/0.10.0/download -> lzw-0.10.0.crate https://crates.io/api/v1/crates/mac/0.1.1/download -> mac-0.1.1.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/markup5ever/0.10.1/download -> markup5ever-0.10.1.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/matrixmultiply/0.3.2/download -> matrixmultiply-0.3.2.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/miniz_oxide/0.5.4/download -> miniz_oxide-0.5.4.crate https://crates.io/api/v1/crates/nalgebra/0.29.0/download -> nalgebra-0.29.0.crate https://crates.io/api/v1/crates/nalgebra-macros/0.1.0/download -> nalgebra-macros-0.1.0.crate https://crates.io/api/v1/crates/new_debug_unreachable/1.0.4/download -> new_debug_unreachable-1.0.4.crate https://crates.io/api/v1/crates/nodrop/0.1.14/download -> nodrop-0.1.14.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/num-complex/0.4.2/download -> num-complex-0.4.2.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-rational/0.4.1/download -> num-rational-0.4.1.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/once_cell/1.14.0/download -> once_cell-1.14.0.crate https://crates.io/api/v1/crates/oorandom/11.1.3/download -> oorandom-11.1.3.crate https://crates.io/api/v1/crates/pango/0.15.10/download -> pango-0.15.10.crate https://crates.io/api/v1/crates/pango-sys/0.15.10/download -> pango-sys-0.15.10.crate https://crates.io/api/v1/crates/pangocairo/0.15.1/download -> pangocairo-0.15.1.crate https://crates.io/api/v1/crates/pangocairo-sys/0.15.1/download -> pangocairo-sys-0.15.1.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.3/download -> parking_lot_core-0.9.3.crate https://crates.io/api/v1/crates/paste/1.0.9/download -> paste-1.0.9.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf_codegen/0.8.0/download -> phf_codegen-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.8.0/download -> phf_generator-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.10.0/download -> phf_generator-0.10.0.crate https://crates.io/api/v1/crates/phf_macros/0.8.0/download -> phf_macros-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.8.0/download -> phf_shared-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.10.0/download -> phf_shared-0.10.0.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.25/download -> pkg-config-0.3.25.crate https://crates.io/api/v1/crates/plotters/0.3.3/download -> plotters-0.3.3.crate https://crates.io/api/v1/crates/plotters-backend/0.3.4/download -> plotters-backend-0.3.4.crate https://crates.io/api/v1/crates/plotters-svg/0.3.3/download -> plotters-svg-0.3.3.crate https://crates.io/api/v1/crates/png/0.17.6/download -> png-0.17.6.crate https://crates.io/api/v1/crates/pom/3.2.0/download -> pom-3.2.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/precomputed-hash/0.1.1/download -> precomputed-hash-0.1.1.crate https://crates.io/api/v1/crates/predicates/2.1.1/download -> predicates-2.1.1.crate https://crates.io/api/v1/crates/predicates-core/1.0.3/download -> predicates-core-1.0.3.crate https://crates.io/api/v1/crates/predicates-tree/1.0.5/download -> predicates-tree-1.0.5.crate https://crates.io/api/v1/crates/proc-macro-crate/1.2.1/download -> proc-macro-crate-1.2.1.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/0.4.30/download -> proc-macro2-0.4.30.crate https://crates.io/api/v1/crates/proc-macro2/1.0.43/download -> proc-macro2-1.0.43.crate https://crates.io/api/v1/crates/proptest/1.0.0/download -> proptest-1.0.0.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quick-error/2.0.1/download -> quick-error-2.0.1.crate https://crates.io/api/v1/crates/quote/0.6.13/download -> quote-0.6.13.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/rand_xorshift/0.3.0/download -> rand_xorshift-0.3.0.crate https://crates.io/api/v1/crates/rawpointer/0.2.1/download -> rawpointer-0.2.1.crate https://crates.io/api/v1/crates/rayon/1.5.3/download -> rayon-1.5.3.crate https://crates.io/api/v1/crates/rayon-core/1.9.3/download -> rayon-core-1.9.3.crate https://crates.io/api/v1/crates/rctree/0.4.0/download -> rctree-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/regex/1.6.0/download -> regex-1.6.0.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.27/download -> regex-syntax-0.6.27.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rgb/0.8.33/download -> rgb-0.8.33.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/rusty-fork/0.3.0/download -> rusty-fork-0.3.0.crate https://crates.io/api/v1/crates/ryu/1.0.11/download -> ryu-1.0.11.crate https://crates.io/api/v1/crates/safe_arch/0.6.0/download -> safe_arch-0.6.0.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/selectors/0.23.0/download -> selectors-0.23.0.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver/1.0.13/download -> semver-1.0.13.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.144/download -> serde-1.0.144.crate https://crates.io/api/v1/crates/serde_cbor/0.11.2/download -> serde_cbor-0.11.2.crate https://crates.io/api/v1/crates/serde_derive/1.0.144/download -> serde_derive-1.0.144.crate https://crates.io/api/v1/crates/serde_json/1.0.85/download -> serde_json-1.0.85.crate https://crates.io/api/v1/crates/servo_arc/0.1.1/download -> servo_arc-0.1.1.crate https://crates.io/api/v1/crates/sha1/0.6.1/download -> sha1-0.6.1.crate https://crates.io/api/v1/crates/sha1_smol/1.0.0/download -> sha1_smol-1.0.0.crate https://crates.io/api/v1/crates/simba/0.6.0/download -> simba-0.6.0.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/slab/0.4.7/download -> slab-0.4.7.crate https://crates.io/api/v1/crates/smallvec/1.9.0/download -> smallvec-1.9.0.crate https://crates.io/api/v1/crates/stable_deref_trait/1.2.0/download -> stable_deref_trait-1.2.0.crate https://crates.io/api/v1/crates/standback/0.2.17/download -> standback-0.2.17.crate https://crates.io/api/v1/crates/stdweb/0.4.20/download -> stdweb-0.4.20.crate https://crates.io/api/v1/crates/stdweb-derive/0.5.3/download -> stdweb-derive-0.5.3.crate https://crates.io/api/v1/crates/stdweb-internal-macros/0.2.9/download -> stdweb-internal-macros-0.2.9.crate https://crates.io/api/v1/crates/stdweb-internal-runtime/0.1.5/download -> stdweb-internal-runtime-0.1.5.crate https://crates.io/api/v1/crates/string_cache/0.8.4/download -> string_cache-0.8.4.crate https://crates.io/api/v1/crates/string_cache_codegen/0.5.2/download -> string_cache_codegen-0.5.2.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/0.15.44/download -> syn-0.15.44.crate https://crates.io/api/v1/crates/syn/1.0.99/download -> syn-1.0.99.crate https://crates.io/api/v1/crates/system-deps/6.0.2/download -> system-deps-6.0.2.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/tendril/0.4.3/download -> tendril-0.4.3.crate https://crates.io/api/v1/crates/termtree/0.2.4/download -> termtree-0.2.4.crate https://crates.io/api/v1/crates/test-generator/0.3.0/download -> test-generator-0.3.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.34/download -> thiserror-1.0.34.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.34/download -> thiserror-impl-1.0.34.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/time/0.2.27/download -> time-0.2.27.crate https://crates.io/api/v1/crates/time-macros/0.1.1/download -> time-macros-0.1.1.crate https://crates.io/api/v1/crates/time-macros-impl/0.1.2/download -> time-macros-impl-0.1.2.crate https://crates.io/api/v1/crates/tinytemplate/1.2.1/download -> tinytemplate-1.2.1.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.9/download -> toml-0.5.9.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.8/download -> unicode-bidi-0.3.8.crate https://crates.io/api/v1/crates/unicode-ident/1.0.3/download -> unicode-ident-1.0.3.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.21/download -> unicode-normalization-0.1.21.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/utf-8/0.7.6/download -> utf-8-0.7.6.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version-compare/0.1.0/download -> version-compare-0.1.0.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.82/download -> wasm-bindgen-0.2.82.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.82/download -> wasm-bindgen-backend-0.2.82.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.82/download -> wasm-bindgen-macro-0.2.82.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.82/download -> wasm-bindgen-macro-support-0.2.82.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.82/download -> wasm-bindgen-shared-0.2.82.crate https://crates.io/api/v1/crates/web-sys/0.3.59/download -> web-sys-0.3.59.crate https://crates.io/api/v1/crates/wide/0.7.4/download -> wide-0.7.4.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate https://crates.io/api/v1/crates/xml5ever/0.16.2/download -> xml5ever-0.16.2.crate https://crates.io/api/v1/crates/yeslogic-fontconfig-sys/2.11.2/download -> yeslogic-fontconfig-sys-2.11.2.crate
 _eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	rust-toolchain	9e3a9f96182f7084ca9c6e173d2f2f5c	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=86971130b01655430f1ab7020058aff0
+_md5_=133bb90288669ce34c16e4f72bb88be1
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 63c853d37f85..06963352edb3 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/libavif-0.10.1 b/metadata/md5-cache/media-libs/libavif-0.10.1
index 463364e8d486..8ed6d7c7a8a0 100644
--- a/metadata/md5-cache/media-libs/libavif-0.10.1
+++ b/metadata/md5-cache/media-libs/libavif-0.10.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/AOMediaCodec/libavif
 INHERIT=cmake-multilib gnome2-utils
 IUSE=+aom dav1d examples extras gdk-pixbuf rav1e svt-av1 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm ~arm64 ~loong ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=BSD-2
 RDEPEND=media-libs/libpng[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] aom? ( >=media-libs/libaom-3.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dav1d? ( >=media-libs/dav1d-1.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rav1e? ( >=media-video/rav1e-0.5.1[capi] ) svt-av1? ( >=media-libs/svt-av1-0.9.1 )
 REQUIRED_USE=|| ( aom dav1d )
 SLOT=0/0.10.1
 SRC_URI=https://github.com/AOMediaCodec/libavif/archive/v0.10.1.tar.gz -> libavif-0.10.1.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7b44dcd552ae2becd21d1b2d0157a5c3
+_md5_=3283a9d0cb1e4014e34d69bf199c65cf
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index c0c5366d3a3a..17db8b819b56 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/coredns-1.8.3 b/metadata/md5-cache/net-dns/coredns-1.10.0
index e25c55c929e1..ec6401546a67 100644
--- a/metadata/md5-cache/net-dns/coredns-1.8.3
+++ b/metadata/md5-cache/net-dns/coredns-1.10.0
@@ -10,6 +10,6 @@ LICENSE=Apache-2.0 MIT BSD ISC MPL-2.0 BSD-2
 RDEPEND=acct-user/coredns acct-group/coredns filecaps? ( sys-libs/libcap ) virtual/tmpfiles
 RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/coredns/coredns/archive/v1.8.3.tar.gz -> coredns-1.8.3.tar.gz https://dev.gentoo.org/~zmedico/dist/coredns-1.8.3-deps.tar.xz
+SRC_URI=https://github.com/coredns/coredns/archive/v1.10.0.tar.gz -> coredns-1.10.0.tar.gz https://dev.gentoo.org/~zmedico/dist/coredns-1.10.0-deps.tar.xz
 _eclasses_=fcaps	babe6282ea5c195981bd302af1adaf3a	go-module	b088539f282ed242c23f38fa65472184	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=ef28d7b35b80226af4ff72c10b537448
+_md5_=62da6f46c66ae016a070adb6bb36927a
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 351596ea55ca..dc4b61658653 100644
--- a/metadata/md5-cache/sys-block/Manifest.gz
+++ b/metadata/md5-cache/sys-block/Manifest.gz
diff --git a/metadata/md5-cache/sys-block/fio-3.27-r3 b/metadata/md5-cache/sys-block/fio-3.27-r4
index f4be1b199e5a..2963cddc8098 100644
--- a/metadata/md5-cache/sys-block/fio-3.27-r3
+++ b/metadata/md5-cache/sys-block/fio-3.27-r4
@@ -8,10 +8,10 @@ INHERIT=python-r1 toolchain-funcs
 IUSE=aio curl glusterfs gnuplot gtk io-uring numa python rbd rdma static tcmalloc test zbc zlib python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm ~arm64 ~ia64 ~ppc ppc64 ~riscv x86
 LICENSE=GPL-2
-RDEPEND=!static? ( aio? ( dev-libs/libaio ) curl? ( net-misc/curl:= dev-libs/openssl:0= ) glusterfs? ( sys-cluster/glusterfs ) gtk? ( dev-libs/glib:2 ) io-uring? ( sys-libs/liburing:= ) numa? ( sys-process/numactl ) rbd? ( sys-cluster/ceph ) rdma? ( sys-cluster/rdma-core ) tcmalloc? ( dev-util/google-perftools:= ) zbc? ( >=sys-block/libzbc-5 ) zlib? ( sys-libs/zlib ) ) gtk? ( x11-libs/gtk+:2 ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/pandas[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/pandas[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/pandas[python_targets_python3_8(-)] ) ) ) gnuplot? ( sci-visualization/gnuplot )
+RDEPEND=!static? ( aio? ( dev-libs/libaio ) curl? ( net-misc/curl:= dev-libs/openssl:0= ) glusterfs? ( sys-cluster/glusterfs ) gtk? ( dev-libs/glib:2 ) io-uring? ( sys-libs/liburing:= ) numa? ( sys-process/numactl ) rbd? ( sys-cluster/ceph ) rdma? ( sys-cluster/rdma-core ) tcmalloc? ( dev-util/google-perftools:= ) zbc? ( >=sys-block/libzbc-5 ) zlib? ( sys-libs/zlib ) ) gtk? ( x11-libs/gtk+:2 ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gnuplot? ( sci-visualization/gnuplot )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) gnuplot? ( python ) io-uring? ( aio )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://brick.kernel.dk/snaps/fio-3.27.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=53deb0d675ab450036e0ab8384dfb29a
+_md5_=7afcb95c4069012172e20d9c7b36c73d
diff --git a/metadata/md5-cache/sys-block/fio-3.30 b/metadata/md5-cache/sys-block/fio-3.30-r1
index fddba6c50d95..26e45ad4340b 100644
--- a/metadata/md5-cache/sys-block/fio-3.30
+++ b/metadata/md5-cache/sys-block/fio-3.30-r1
@@ -8,10 +8,10 @@ INHERIT=python-r1 toolchain-funcs
 IUSE=aio curl glusterfs gnuplot gtk io-uring nfs numa python rbd rdma static tcmalloc test zbc zlib python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
-RDEPEND=!static? ( aio? ( dev-libs/libaio ) curl? ( net-misc/curl:= dev-libs/openssl:0= ) nfs? ( net-fs/libnfs:= ) glusterfs? ( sys-cluster/glusterfs ) gtk? ( dev-libs/glib:2 ) io-uring? ( sys-libs/liburing:= ) numa? ( sys-process/numactl ) rbd? ( sys-cluster/ceph ) rdma? ( sys-cluster/rdma-core ) tcmalloc? ( dev-util/google-perftools:= ) zbc? ( >=sys-block/libzbc-5 ) zlib? ( sys-libs/zlib ) ) gtk? ( x11-libs/gtk+:2 ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/pandas[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/pandas[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/pandas[python_targets_python3_8(-)] ) ) ) gnuplot? ( sci-visualization/gnuplot )
+RDEPEND=!static? ( aio? ( dev-libs/libaio ) curl? ( net-misc/curl:= dev-libs/openssl:0= ) nfs? ( net-fs/libnfs:= ) glusterfs? ( sys-cluster/glusterfs ) gtk? ( dev-libs/glib:2 ) io-uring? ( sys-libs/liburing:= ) numa? ( sys-process/numactl ) rbd? ( sys-cluster/ceph ) rdma? ( sys-cluster/rdma-core ) tcmalloc? ( dev-util/google-perftools:= ) zbc? ( >=sys-block/libzbc-5 ) zlib? ( sys-libs/zlib ) ) gtk? ( x11-libs/gtk+:2 ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gnuplot? ( sci-visualization/gnuplot )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) gnuplot? ( python ) io-uring? ( aio )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://brick.kernel.dk/snaps/fio-3.30.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=f75388ac6188cda61d5baca856cd4d32
+_md5_=ede071b19ed552269fd8ef6b3ef46f53
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index c95401bf71c9..a4a90ff86afc 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/minikube-1.25.1 b/metadata/md5-cache/sys-cluster/minikube-1.25.1
deleted file mode 100644
index 642132fa2d31..000000000000
--- a/metadata/md5-cache/sys-cluster/minikube-1.25.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-go/go-bindata >=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile configure install postinst unpack
-DEPEND=libvirt? ( app-emulation/libvirt:=[qemu] )
-DESCRIPTION=Single Node Kubernetes Cluster
-EAPI=7
-HOMEPAGE=https://github.com/kubernetes/minikube https://kubernetes.io
-INHERIT=bash-completion-r1 go-module toolchain-funcs
-IUSE=hardened libvirt
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 CC0-1.0 GPL-2 ISC LGPL-3 MIT MPL-2.0 WTFPL-2 ZLIB || ( LGPL-3+ GPL-2 ) || ( Apache-2.0 LGPL-3+ ) || ( Apache-2.0 CC-BY-4.0 )
-RDEPEND=libvirt? ( app-emulation/libvirt:=[qemu] )
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/zmedico/minikube/archive/refs/tags/v1.25.1-vendor.tar.gz -> minikube-1.25.1-vendor.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	b088539f282ed242c23f38fa65472184	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=64ee7df86dffd4cbb3dd745b4df8056c
diff --git a/metadata/md5-cache/sys-cluster/minikube-1.25.2 b/metadata/md5-cache/sys-cluster/minikube-1.25.2
deleted file mode 100644
index 0ae19e34e3f8..000000000000
--- a/metadata/md5-cache/sys-cluster/minikube-1.25.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-go/go-bindata >=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile configure install postinst unpack
-DEPEND=libvirt? ( app-emulation/libvirt:=[qemu] )
-DESCRIPTION=Single Node Kubernetes Cluster
-EAPI=7
-HOMEPAGE=https://github.com/kubernetes/minikube https://kubernetes.io
-INHERIT=bash-completion-r1 go-module toolchain-funcs
-IUSE=hardened libvirt
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 CC0-1.0 GPL-2 ISC LGPL-3 MIT MPL-2.0 WTFPL-2 ZLIB || ( LGPL-3+ GPL-2 ) || ( Apache-2.0 LGPL-3+ ) || ( Apache-2.0 CC-BY-4.0 )
-RDEPEND=libvirt? ( app-emulation/libvirt:=[qemu] )
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/zmedico/minikube/archive/refs/tags/v1.25.2-vendor.tar.gz -> minikube-1.25.2-vendor.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	b088539f282ed242c23f38fa65472184	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1b0233022197ca5e740b495a54aef41c
diff --git a/metadata/md5-cache/sys-cluster/minikube-1.26.0 b/metadata/md5-cache/sys-cluster/minikube-1.27.1
index b859264819c1..d8d01d582478 100644
--- a/metadata/md5-cache/sys-cluster/minikube-1.26.0
+++ b/metadata/md5-cache/sys-cluster/minikube-1.27.1
@@ -11,6 +11,6 @@ LICENSE=Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 CC0-1.0 GPL-2 ISC LGPL-3 MIT
 RDEPEND=libvirt? ( app-emulation/libvirt:=[qemu] )
 RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/zmedico/minikube/archive/refs/tags/v1.26.0-vendor.tar.gz -> minikube-1.26.0-vendor.tar.gz
+SRC_URI=https://github.com/zmedico/minikube/archive/refs/tags/v1.27.1-vendor.tar.gz -> minikube-1.27.1-vendor.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	b088539f282ed242c23f38fa65472184	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=f498febab9e3b8593ecf223c82c94ad7
+_md5_=9b4d3e1e3e64aa3794f36c3b1dd56bea
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index e001e893e180..9a85833917cb 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/wordpress-6.0.2 b/metadata/md5-cache/www-apps/wordpress-6.0.3
index 98dcc3739566..41341dbe6a8f 100644
--- a/metadata/md5-cache/www-apps/wordpress-6.0.2
+++ b/metadata/md5-cache/www-apps/wordpress-6.0.3
@@ -8,7 +8,7 @@ IUSE=+akismet examples +themes vhosts vhosts
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=virtual/httpd-php || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) app-admin/webapp-config
-SLOT=6.0.2
-SRC_URI=https://wordpress.org/wordpress-6.0.2.tar.gz
+SLOT=6.0.3
+SRC_URI=https://wordpress.org/wordpress-6.0.3.tar.gz
 _eclasses_=webapp	67df5bab481d0b9428f9ab7b3de690e4
 _md5_=6b4149129331ab80a0a39a830bfcbb06
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 54d3db8c5896..32603c155b5d 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/libpciaccess-0.17 b/metadata/md5-cache/x11-libs/libpciaccess-0.17
new file mode 100644
index 000000000000..a73a20883be3
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libpciaccess-0.17
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=zlib? ( >=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Library providing generic access to the PCI bus and devices
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libpciaccess
+INHERIT=xorg-3 meson-multilib
+IUSE=zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=zlib? ( >=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-apps/hwdata
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libpciaccess-0.17.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	38a663574d97f06b6b729046865c8fb6
+_md5_=6a6b7c110e94280c6dc190b8cf7edd84
diff --git a/metadata/md5-cache/x11-libs/libxkbfile-1.1.1 b/metadata/md5-cache/x11-libs/libxkbfile-1.1.1
new file mode 100644
index 000000000000..e57634681423
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libxkbfile-1.1.1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto
+DESCRIPTION=X.Org xkbfile library
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libxkbfile
+INHERIT=xorg-3
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=MIT
+RDEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libxkbfile-1.1.1.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	38a663574d97f06b6b729046865c8fb6
+_md5_=d11c00ff4a8010a188a2ec0281237b0d
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index ce783d0d773e..579892ce7746 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-10-18T00:09:57Z
+TIMESTAMP 2022-10-18T06:10:04Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNN7tVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNOQzxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBU9xAArDpGWdpUXzCgs3fLMSp3kyeyUvLUIpSAA1qCiOHwFbN32RSqPxF0HA37
-Ay1SCHsPWXd3pu1TExIpcyGZvre+YVdtaPYxk3dnrkRrByglpWfUxdEV/o5bWX+e
-ZbBncDbI9lMUc96qS9NPVZkDXMMQGZ0c6UjYQ0dKScqBKjXyVOGncV0XZKj5T+41
-TX6mn8suMo2H8elFpgOzeX/b9EHnQoAYufcqsyDs2fNa/CfioVq8gEaiKoACuzBP
-GPyFXM6e0wUe0hUMOwSNRZLqUq8M0gxRpxOjA4kmR4+SarfqiTxsVX8FDw0CKZn7
-RLK+LEDZizkNPyJxnIPI47wSjD6kKLCJjijS24e+gBojhNwgWF7O5rWJOshIRLdk
-BqknS1R+vskZLd3XLOtTBjMKmh/H36tLKrnRlE3u8pAqH+vN3iVEpRMRMavJLXr8
-BIxZAlGy6O6P/wjx7lnKFbO2MGe4sL8rJ4os5n5ClyScbbF0dHZLZthabynqQjGB
-/cOgPU33nbeP2gF7vFnXA7bgRlyyuWurnh9VLng5xpCNmCRDu1j5byfrv72pSnEb
-x2q6rIqaF5QrUS2kqxvDg6Qfn/1R4AJf1h1rb6IvoNnOBU4ys+zCN3k3trCFQWSJ
-Qbv0Eg0jM1uIyml9ZKj88uvPzzlJJu7hIOSRF8uDDMODvFgKDE0=
-=0SIo
+klBNHRAAgPsmGIP3skmMtBYFpP1RhJ+G+LMdNDVHBPaHafy9hE4uFVxMGm3+iS8s
+agdePYwdsQ0+xxyo+ujUPFAOl/RdDd82cKU966qgL/9cqVSWPrdumOLbrinWYrpG
+pOv4AdYqllw2D0OVqkrBDS3O9JNNag/96EBgLoc1SCUogt3BD+nUbb/uOgQr3Mm0
+GFe8c6Epvop1Hwmu33YkAaiaXYw7cWayc84Q9vCGIGRY75nfszuiKo9Sodl4Vofd
+Ktz2+jlMOIUuXJhmphYviVp4zxs4hDeTNBFqC0MfFEi60aN922gSP2nQ1v/XeLtl
+P69tInE4oIy7eVZm4EQZACQVGSxfnyrX809cgrkenN1hvLtfkgvY943hT6AsWSjF
+pKN7uQycgZOIbzTysHwKFuHGHNT4eNL5xJ/CyB2krJKaS5X3rim2WRzSb880aRnB
+rdew548+i9mXWPkQyve5kcMH1XJP86jN1UE8eS/TBI2T/Wk5m+6lXyhbhSgHnf6z
+A65kZ32hAHBWktGVK5zFUYdANHcmO1+pjiSjXUsPBwjVxtP/O92zktBmB8FMjWQO
+EhyNeX94BebFyDH7QzSTechMzQ6OLLqfDjfyosajPCOehDOZ31EK8EY0KJSn6qMl
+s4vO0Tu7tMZDz2Qbagd2eiIC8XlrIfUctY05Oaw93TeRovxYbmI=
+=Zn80
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 3c51513809ee..28475380d10b 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 18 Oct 2022 00:09:53 +0000
+Tue, 18 Oct 2022 06:10:01 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index bd2eac3fc3e2..814c5c533653 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Oct 18 12:09:53 AM UTC 2022
+Tue Oct 18 06:10:01 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f3315745b731..bef31d555a3c 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 18 Oct 2022 00:15:01 +0000
+Tue, 18 Oct 2022 06:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 13a7565e86eb..82f8b375c236 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-094d13c500f3517ab9a6991c693d16e95b6c0306 1666050935 2022-10-17T23:55:35+00:00
+1b507f4b528fb2db82249c2446df745839beb384 1666072445 2022-10-18T05:54:05+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 7c8f0fa4466d..2011feec25ef 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1666051801 Tue 18 Oct 2022 12:10:01 AM UTC
+1666073401 Tue 18 Oct 2022 06:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 3c51513809ee..28475380d10b 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 18 Oct 2022 00:09:53 +0000
+Tue, 18 Oct 2022 06:10:01 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 713de67d2258..b37bb00d3824 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/alive/Manifest b/net-analyzer/alive/Manifest
index f4a334425570..0c5825999578 100644
--- a/net-analyzer/alive/Manifest
+++ b/net-analyzer/alive/Manifest
@@ -1,4 +1,4 @@
 AUX alive-2.0.2-ping-test.patch 378 BLAKE2B 1adb452bce76cd0dee69c52fc0432148ce7f3267d2ecb96f1f4199543fb61a11a20f9738175a8edd47c5aea75f925e12e5e38bf564e8915b978928c66bcaed25 SHA512 6479364f35345aad12fcabf4f11f84a601740771e0e602afc757a39f45eaabdd0d5d6b3d3d95a5307edaef2e84250e4ba784a9757fa75bad21363735c14cfd78
 DIST alive-2.0.5.tar.lz 186304 BLAKE2B 8528d7b86030ff0b54cd391a7cd7b42be974d5f605c66c6340468855959d2adf31940312d6693580839e9180813a3e96c2fe86a3842f3abd00af0e08b7f301ee SHA512 f760f9386019ddeac8690eec9119d557d4e288cc8698ce69adc8d9915eb0bc27fcf4015e9c4710411321d21c11731e61be754e9b827dceceab6463e531ed4240
 EBUILD alive-2.0.5.ebuild 543 BLAKE2B c298be79bcb87b5c0d69405f3ba16703c23ffe92a672da74be2171a1eea8795456ff539d1861babb4406af6ef2a66e7a055e2984aeb0db93fb70168c073faeda SHA512 f277993f32a201382c23da6ed6946ecc42acdc61488af622bb6fcfd0292de8f4617afad63fe78768c1ffbaa696d2b835c31bc21681e09b1b2064495cf53bdb90
-MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
+MISC metadata.xml 363 BLAKE2B 16714941687d013aed02e620a50bc9d3ff99d052c929dd6349570b8b6732a99e6c27c7847c9e9ce7fbc0029bb7b050434aeff6aa3701d6d2dbb9aa1b895fa53b SHA512 3ecc106e0267358a801c3d63a65aa20972c5cd481688aaf59b97b34343dd8366190dad0b3b1f41e0fcbdbe62f22792442b18f83e0a3bc5b28e394c3bd0e8c321
diff --git a/net-analyzer/alive/metadata.xml b/net-analyzer/alive/metadata.xml
index dce3f3be66c0..69f19320e112 100644
--- a/net-analyzer/alive/metadata.xml
+++ b/net-analyzer/alive/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>netmon@gentoo.org</email>
-	<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
+  <maintainer type="project">
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">alive</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 6c3d85d5e604..f27d0cbeda04 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/coredns/Manifest b/net-dns/coredns/Manifest
index b61afeba129e..ded3f0312759 100644
--- a/net-dns/coredns/Manifest
+++ b/net-dns/coredns/Manifest
@@ -4,10 +4,10 @@ AUX coredns.initd 779 BLAKE2B 355a1b90856f596a10fa4c0ba294cf2d888ff9a5f7b0b71ef4
 AUX coredns.logrotated 81 BLAKE2B 7fe70e32133a9470a60834dee5632151ed215e478a9de697dbca3ee553e5a8719bc941251c6a37723625b7c59f10f5050c79edb94ac8d4127561c12813ba6a27 SHA512 c697c08c3b1153ae224a1eeb3521f9ee594de4852bc6ef78d94dc7f6f680517659a653ab5c13ea03918deb79e6654ef11512ba4c90fe06ea4591fefbab876ece
 AUX coredns.service 452 BLAKE2B 835277ab1a76a6841d2f7f8cd7fa604351064d9ea88bcff2771f8526dd8e20f8b03604af234d1c7fade670f2b9c709b8567be7a0a06805ea539e7706ed103f2d SHA512 29bdeea1fe97f48a979581736115fd75d9fbcb544ca67064f2b07467549aff5c09760b0b172af812876094eb75d3352a075d68effb50be41b21f908dc774f4c8
 AUX coredns.tmpfiles 42 BLAKE2B 06e6b3be85cc66f5eb126639496dc962cbb3e9b77ca59da1acc4749208212ac24bbc53cd694ce63c579528ca040443a5cb3886ea05baf5b0cceb3f46fe94ff20 SHA512 b6aaf9b399a5c25efbbb4f23d9a0c97af0749adea7a58ae83af8b8220a167778ac8debc0359c75d3ac8b904176ee870523c9101f22e8352b61b2012c9002bab4
-DIST coredns-1.8.3-deps.tar.xz 160097444 BLAKE2B e7c59bc3b732b84211bb2142edf6953eec839adac239b92082eb86aebd6d3f31b7e736000ba789836acc0cd88c3beda30b6f208f1192a878889399c43328c1ef SHA512 9b519214762aee3c28071a21cc052ecfa32b001cca56b99f5fe675a0cc6c08aadb68bfe0bedf39ca87040d18c906b9e2c8829acd9741b3b1e333d6c27ae7fa74
-DIST coredns-1.8.3.tar.gz 553278 BLAKE2B 8dddf12686e498f937c057a2fd539ff455980deef1dc889f8e7f6891a712dedb4089528c0a228240332603a37040ab22f80e17af38998a73757f9d1c18d28064 SHA512 2cc2754e9e626d40a2101f17744e8c57bd6d469eacbb4cfee965c2bf485156ae91f4cc99f8e63b5641163e8716c9614b6f9481fb91acb96e62951044bdac1fa8
+DIST coredns-1.10.0-deps.tar.xz 216362488 BLAKE2B e94075f547b604cdb770bf5b5f116dd99710d3011e48e9c7da0f2f8cb51c9128c60a4873f5152180ccac90008d50979b993f67b00fa836bea55f67cb32101156 SHA512 8ba7d76d4840abcd6cdedb3c7754e2dc94610c7996f3dbd7d7e81f3b624c8fee0a903679ef63c91ca86c799c744582ac9fe4a6766939abe3fee8d7c45a0a787d
+DIST coredns-1.10.0.tar.gz 656927 BLAKE2B 25803e0e62e75122d951123d0e04c60a9bee14756decbff9d1c8b27bd996e97d863be83961f03decd118eddc9c06c80709aa881a902dbf42f4c408ee2c4647c6 SHA512 ddec7ee0139105f417249756133d0384d28cd7f6960183644dfb26d6dfba43a80d461da65040f160a8a7e38785bfdc9f458b2bab2fe8ce82635e8dd0dd42a467
 DIST coredns-1.9.3-deps.tar.xz 205913904 BLAKE2B d5a630d7afa14577e1d5b9aba48a43808b990bc6e550408d141b509253c611266e3d5b5acc33222582693d7542630c0efdad973535564a37434a50dc67289099 SHA512 d954e73c3f6c3d1c37d959420c92cd59aa61bb5b2f69fdbcf017cbba173a0b8e9e0d73ef85e9b7fa8657c9916afd4843df0886058815c7df854ec3ddc67eae1d
 DIST coredns-1.9.3.tar.gz 624914 BLAKE2B a27e73da8c67ff38d33757bf8fdae5938574b1b0f4db4a469e67e6063c1643b0dc60227646998b87bbd79d48bdf8c792be432ae253b54fca0d6afdec1138bad7 SHA512 d0c24c5d9f27883519e0d6edf917c6e0051b80627a320a20f6d5ee3e154f65790d1f66b5e0255aeed66874ff5826b2ab3d1237d6fd53452e7dfaf3b34b17fdfb
-EBUILD coredns-1.8.3.ebuild 2371 BLAKE2B d8bf7f46162a7a81e16a15f2cb6cdf09e88cfe45c1dc27f203f8906bee7ac18584e75fc443c0b2f3977b946a6d4209fbc8e7560f46f53de85ccdfab6e30f9791 SHA512 268542145c0e7e3516bc76b4c6334318329abdffc353042137fd7fa69f306284df7283a9c120d1d1b11ee735a013d1bafc75ad6a829b893b1bbe2bb1781a76aa
+EBUILD coredns-1.10.0.ebuild 2371 BLAKE2B f0f078a84ef256c1ad95ab8fe9f6ca0b78fa639945522b2ca7ec60ae26f09d4e8bf3d0c97f8b7e6ed2178935ca675bed80821922d17b7c9106c55de5cd65f33f SHA512 f276a0d085096e17533cd8bd0674f0b9a9a18deeb0ea10969655e707e2d66447e92450e4c2559bcc7fb1c9154d0ae1927af1e9579cae6632161e71b14d127afa
 EBUILD coredns-1.9.3.ebuild 2371 BLAKE2B 8da48252ca48873c2bacbfd8cce0fe26825f9e411abe079eb268c26088383eb355bf2d600adbbf5935ede707f737a400141b70bbc7733cf47cc0f383b696712d SHA512 718454d268cd629a575745b3e651bd2d65bfde05f1ffd41f9948b12d59cbeffa875e4d24276842f3dd820682f350b78a15422be231a47dc1cee35f708ed0816c
 MISC metadata.xml 783 BLAKE2B cf0d7a90c49810d0411c529a75de683c084dd6649a3b3095906e028e21fc4679491bbc8cd55117362bbf4a53befb9006fc14a5b1ce76b873070817029751482e SHA512 95183bd32f17ee75e6b285ac54e0f44359786f058157c95ce59aa8726c6509476ba6a7d049fe32aef43a681d9a9c7684aa5fef4fc46f722a82948318de0bb48b
diff --git a/net-dns/coredns/coredns-1.8.3.ebuild b/net-dns/coredns/coredns-1.10.0.ebuild
index 33cabfaed3a2..d502e872e48e 100644
--- a/net-dns/coredns/coredns-1.8.3.ebuild
+++ b/net-dns/coredns/coredns-1.10.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # Don't forget to update when bumping. Used in --version output
-EGIT_COMMIT="4293992bb83a5eac1d1e617a40638db6db046283"
+EGIT_COMMIT="596a9f9e67dd9b01e15bc04a999460422fe65166"
 
 inherit fcaps go-module systemd tmpfiles
 
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 98e21614d526..b779b01fee83 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/davfs2/Manifest b/net-fs/davfs2/Manifest
index aa792eb46d81..12172af57915 100644
--- a/net-fs/davfs2/Manifest
+++ b/net-fs/davfs2/Manifest
@@ -3,4 +3,4 @@ DIST davfs2-1.6.0.tar.gz 472511 BLAKE2B aed1ec060d5639fb90a58257038a75c25c2f77a7
 DIST davfs2-1.6.1.tar.gz 472426 BLAKE2B b24a3f17604838e763cbcf86f62719ee41b5569e58732441a621d210dd0c2e619d4f363d90e9b13d1616e84a3da940da941a15ad6eadfa2b339d14a6e26c75a2 SHA512 12f9eadd2049741b7cb61c5583be6c6982559e702e5cbd4767c655110187524d7afad0a6ff8ad00d457e194ad75b3ce391f5fe566fb4a0bbaed0a705caa3f163
 EBUILD davfs2-1.6.0.ebuild 1312 BLAKE2B 473edf342d36c14c816a881e9dfd324833f9146c3e5713b8a795fcf0a101526c0cae31e6189bd6b78567869d3ca578dd90307997c28815823be4c26ed2ad0c92 SHA512 cdb8bc88535a1cbdd56f4c16e07aa5df05fedd4e0ed1ce1d5bf1c24fc051cecd5e135a69f04bf600a4af9b4767741ffa0fe6138844ffec130f41ca97ffe770e1
 EBUILD davfs2-1.6.1.ebuild 1222 BLAKE2B f6c8e425c877c471b4ca5bcec1d1eed1d0493c9aae39a2aeb6fc632dc281ec0e35e331f5346cc230a9780a73483d3f9f6c3e7f30856249d572deba07076e90fd SHA512 0724bcfc45668e2d8b02f25d51cf0160ce849b1379302b6cb825bd49ed6e66c63238b0c5d08cd8f21ab3647ef40fba6072b33efeeb9f4f34b64d52005b20b9f3
-MISC metadata.xml 252 BLAKE2B 121cab92b026aabfa5b7c05a2df912ac7d860e2462ab2ffa30387fed601b61ee54326d63e2b15d813ae73f01c8a054b9a443f27eecd76c4316412463c33ccda2 SHA512 787d4eba8abc2fc701095db317f299837dac0e794cd4a5b2cab58005e01d3759049e39ff479ba818dd440a5fba46b033ef1ac358d027ae5105cced05b484c20e
+MISC metadata.xml 342 BLAKE2B 00339b6e849aa8ae26de58e48ece3d3df8d176fa6171756f297cabe81ec6037d3b82add01fcfb915c82fcfa74d4c7816882adc581c0f8a3ed4635fffa3c6727f SHA512 472d5f316a3b1c0b7f2f0f11bd567e9bd3b4b3f4e54c8018e38b179b293e2ac42a7452fae43994929b7f8647e866e612a499e322ef8719beba0d1fae32a1fbb8
diff --git a/net-fs/davfs2/metadata.xml b/net-fs/davfs2/metadata.xml
index b962fb282881..6fdc1414aeb9 100644
--- a/net-fs/davfs2/metadata.xml
+++ b/net-fs/davfs2/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gokturk@gentoo.org</email>
-		<name>Göktürk Yüksek</name>
-	</maintainer>
+  <maintainer type="person">
+    <email>gokturk@gentoo.org</email>
+    <name>Göktürk Yüksek</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah-nongnu">davfs2</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index ab5032d24ab2..b7d1943417fe 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/cmdftp/Manifest b/net-ftp/cmdftp/Manifest
index aa420fec38c9..18c684427cc0 100644
--- a/net-ftp/cmdftp/Manifest
+++ b/net-ftp/cmdftp/Manifest
@@ -1,3 +1,3 @@
 DIST cmdftp-0.9.8.tar.gz 145985 BLAKE2B cc5869cc8c43208161886020b2a3c4df9151d48053ab3c6d4e7d0759bb47a23a687c09eda2c202ac93167f26c33a6c4ac49568f356a9fe16ef09237d499f04c8 SHA512 8c8bb670988c439838493f1c6d31e47ae01e3fd6a1521602267dc8cb8dcc6ed18605277bdbf22a06b3af61e33a676ff3f188648f54af5d0839c7039eaab6b262
 EBUILD cmdftp-0.9.8.ebuild 432 BLAKE2B 2388cd9dbd1de899298e14e42bdc411d85dd1263ab8621839342e51306e4da2c8148eecd42ec4a8154ef0976a7339af4b63e2788ddd3f1c14d18b422832d316a SHA512 0c39f9ca2cdcc84084b1fcf9140b1747aa11c5627b614d0e210f8d51e01c57729a2916f2a7916ea39b3eeb1877aad2d7ac5b6e40add1d6b9ac25dd1d068303af
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 253 BLAKE2B c8588053ac59932f7669b233bf2d87f8bbad3c6b229f07544d283c3027e468a0799c2eb2b20bf587edc24bd49441d687145b8008e9163c27de8ad687029e0452 SHA512 e8757d9ea255fc2232fa3200df4c90eb3e5882be3721494177eb807319ac5f504a373c71f7993d4ee81935c9899c6d73acc61c087d3ac18b00838fb240178577
diff --git a/net-ftp/cmdftp/metadata.xml b/net-ftp/cmdftp/metadata.xml
index 85e4ed814fa2..0c9aa70b9331 100644
--- a/net-ftp/cmdftp/metadata.xml
+++ b/net-ftp/cmdftp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="savannah-nongnu">cmdftp</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 9c04829df121..b1b138de606b 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/dianara/Manifest b/net-im/dianara/Manifest
index 489629edd342..8c7bd5e8258b 100644
--- a/net-im/dianara/Manifest
+++ b/net-im/dianara/Manifest
@@ -1,3 +1,3 @@
 DIST dianara-v1.4.2.tar.gz 946414 BLAKE2B 418f9cc701d37d03a23a205a1854b9d7de1f6fbdf372bbc9030285f5a37bd4602d6eeb2c529a8ec1406385cc385ec9057f8c590a7c9e94ef741c3c0a922714bb SHA512 97b0b8b661f1d40ce419b5dc04275ddb9a514dfc6e993ecf45cb18fabed1e8ed73fbee24c9e0c643b3e552a61b38b49b440489278d17c44aa6cbfe51dc5f59c3
 EBUILD dianara-1.4.2.ebuild 844 BLAKE2B 3d7b3a7d23351a55e67461193978d3ece707e66e9a6c181e6e6c741de578188ac4daf389d290c06306826f8968e72a0bd8e163f6138ec6c14d72fb4b5405c0d0 SHA512 b2043ca705a4672e81741812cad22de666f4a953f4fa41962c5c572e26887b747311bdc860c7f028c514b985cbb38870aa9a3d86ae146eafdf36859337c4e28d
-MISC metadata.xml 262 BLAKE2B e5dc89c6c6b5c74f9cec3e89ad30e320b560ff5d815ce1ac67b17309d718d187733e09e7ab06aa6a4c05c032f1b802328d681ce1c2c77acaa561da13ead200df SHA512 9aef10f95021f7a776a01d5b136475bfdcbc5f5eed38a00237ef6b27da05c1f89b0ab65978e118f764366eab88b77f66d27d2c788f78cf2b1bee8fd941ceb372
+MISC metadata.xml 325 BLAKE2B 560ba35d50c761a125db7392ffe68c586682d0df1a3591b467f785f62f5efc71a3c4bf20c26a2c3c046c2bd766075f4c4255ebf59673306aba437ea90a7b0fb2 SHA512 9d22d836ddb6eeea7fc7fb419da722b5055debb0059058a188ca40658a49d9ba447d6a8259d5e0cde0f033cb3fb6c25ea1937de9c20e6ef8096cc9768704d2cc
diff --git a/net-im/dianara/metadata.xml b/net-im/dianara/metadata.xml
index 211f6fdfa6ba..87eb3c5383c3 100644
--- a/net-im/dianara/metadata.xml
+++ b/net-im/dianara/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<bugs-to>https://savannah.nongnu.org/bugs/?group=dianara</bugs-to>
-	</upstream>
+  <!-- maintainer-needed -->
+  <upstream>
+    <bugs-to>https://savannah.nongnu.org/bugs/?group=dianara</bugs-to>
+    <remote-id type="savannah-nongnu">dianara</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 68e97bce7e51..162011eccd30 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index f3109cf2d6ff..a40a5c7f1267 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -8,4 +8,4 @@ DIST mailutils-3.14.tar.xz 3215944 BLAKE2B 64965c177065eacab9f5545fbeacd53849299
 DIST mailutils-3.15.tar.xz 3112212 BLAKE2B 78101178c101897bc75897a1e134796150fafccd7e8f4b603c82698dd0cd27a98dd1ed7837a87be4760e8bdb39ec7275023a8e2847f832e683b8e97e5e95d75d SHA512 b6b90ad4f71c83e500a9b176694f5fb51a99baf26e52d567d222d6f037a23a0814ac84f88762cbfb4f22382c0e662191af89fb74a8a287134b8fffa58086bdd8
 EBUILD mailutils-3.14-r1.ebuild 3572 BLAKE2B 249fd9f589c1ded372d8c088727c40bc21b4fdaca6bb8091fb0ed5a4fe4c5d9b1c7abd82880249e9971fc86ae844693e37855c0357204498556964af8ef05241 SHA512 7f554d52466a5eb049860f9ead74820873ce4cd65c5b880d986d50e1bf3246d0b1e4eb5ee00f9f448c057b106b4cf3f094e263872386591f23f6da8de5c1c5dd
 EBUILD mailutils-3.15.ebuild 3586 BLAKE2B ef49706e5b5df6401ba71acdade9292b50224cf2abbd80d9dedef0b125bb5673e703647aec22e59e8324a6fd25d8bb303b43d02cd6251edcb3233af6d2acc409 SHA512 ea603f598be5a94e1c8f7ca8ff247a7c131a7be4835ce1baf41f80a87161f597e929cc53f883cca8491237166ba28be27226ad34af00bb6d13b6e9856994fb53
-MISC metadata.xml 603 BLAKE2B 1283fff637c3bc43fa0df8e17afe62bb83b38aa973337ad7082ef902f5c2d64e4b70db8775cad2a16610e07dea0b677769a810d7c9a730bfcca874b78b50da4e SHA512 a6eefadb824f089b2de3c61b30314fbbc82413c1c40be1cf243e82bc4fcaf9000c43fc00d73f19f2f7696cd06e71d72b0c6803ad329859574a0a6907a302f8c0
+MISC metadata.xml 696 BLAKE2B bb3b5a94573794ee2eb692533f32cba1dcf432166d9b2997cf60104d88e80f5eac7bb836479e4392700b06efe07c071930308183fb235c42be2cf1fdb8810ac0 SHA512 bb093e2aff71bb09a8f20fc64926f8a8d8c036ad3b3cd3ca61389975d623251841e8d93489f457a56a898db81cf71ecdc071190b9bc1990728b3fa0c9b4cfda1
diff --git a/net-mail/mailutils/metadata.xml b/net-mail/mailutils/metadata.xml
index 497f5d2f40d3..0587d6750bc5 100644
--- a/net-mail/mailutils/metadata.xml
+++ b/net-mail/mailutils/metadata.xml
@@ -4,11 +4,14 @@
   <maintainer type="person">
     <email>eras@gentoo.org</email>
     <name>Eray Aslan</name>
- </maintainer>
-<use>
-  <flag name="tokyocabinet">Enable Tokyo Cabinet database support</flag>
-  <flag name="kyotocabinet">Enable Kyoto Cabinet database support</flag>
-  <flag name="clients">Build client programs - frm maidag mail sieve messages readmsg dotlock movemail mimeview mh</flag>
-  <flag name="servers">Build server programs - imap4d pop3d comsatd</flag>
-</use>
+  </maintainer>
+  <use>
+    <flag name="tokyocabinet">Enable Tokyo Cabinet database support</flag>
+    <flag name="kyotocabinet">Enable Kyoto Cabinet database support</flag>
+    <flag name="clients">Build client programs - frm maidag mail sieve messages readmsg dotlock movemail mimeview mh</flag>
+    <flag name="servers">Build server programs - imap4d pop3d comsatd</flag>
+  </use>
+  <upstream>
+    <remote-id type="savannah">mailutils</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-mail/tpop3d/Manifest b/net-mail/tpop3d/Manifest
index 858cdada5de6..2c56b9c443a0 100644
--- a/net-mail/tpop3d/Manifest
+++ b/net-mail/tpop3d/Manifest
@@ -2,4 +2,4 @@ AUX tpop3d-1.5.4-gold.patch 730 BLAKE2B e3f30e0aae7ca80c3834dbe63216bff73de20981
 AUX tpop3d-1.5.4.init 607 BLAKE2B 8cc947bb35566f09236a5a6c06f6b1b8938d51f9dfe0ef3230507a5a6885bdee8eac11a3e90cdee52b24219cade824c45b15e5777a154a28b78167eaef6decce SHA512 004d2e5ca802ad7681c3f6392728602f54c13c6072d38b147be469e5f9ef09916f7c6c57af944c845e4b504f46fe4893323d5a125b7dc4bdfc2d479a5ee696e9
 DIST tpop3d-1.5.5.tar.gz 285027 BLAKE2B e8cc76040757a5c8931ee34b27a57c52889f3533b71a53c7a2fe589823129ce5972f2ddfa9ecdb46d7a04ac77e8d735c02b07cf7e8192135e4ebea6c392b38ab SHA512 918a057c62d7518613daa6335d8fd5a2553d278dc4d6adbcf5ba3caa3ba561587f1d9e18f564690383e91f3ee2e5120af919d2799b69e93bfe3a3b8ea4f5d7e6
 EBUILD tpop3d-1.5.5-r5.ebuild 2978 BLAKE2B 278e29cfacd913666926cd2e6333e17c7d5d69af44999b17f9a9006f96f1b6de4762a18198da0ff2682d9c669c26a59d4c1709976199f49d22923d14ceea9d17 SHA512 77cbafe8ed996e641d312b4472bc2457f514b7e6efe3c62713710b0ca7aaa0bc2e60396897a656c2d84d6a4441514d1cd135e300e36ba865e0a559e8b2c5c4fc
-MISC metadata.xml 561 BLAKE2B 9c3cdb3234509f5fed875b4810633182b2b17a3a6a4034a9e83cd39ed89da9befe4658d76d2ce27042dcbd56452a9acd98baea3f7f65c65605fe95e37bff070e SHA512 27d747cbbc50936743aa9c09b98185004b59ad11aca5cc58ba6faf664ebe765eafe706d6423f41fb10c96146ee8c42078a57ff144ecdbef4cd9013df44f63321
+MISC metadata.xml 645 BLAKE2B c61515bfeb3fa075ffb472b34350e29522d697ec4512b8bcdfa0aed03d1dfa761e17aa20d5cdcff18464bc3c5adf2be007dec551c7ea9636717c868900734484 SHA512 b5a1ba294aaa5384564913ffbf7e3facada177bddbb3d887c3291320d9b3ba2c78409b0bfd5f7d034ae230d06131a6e2bed0d9afb37fad2b7fed2692c2af33b0
diff --git a/net-mail/tpop3d/metadata.xml b/net-mail/tpop3d/metadata.xml
index b7c4f56479de..1f110778b3cf 100644
--- a/net-mail/tpop3d/metadata.xml
+++ b/net-mail/tpop3d/metadata.xml
@@ -9,4 +9,7 @@
     <flag name="sha1">Use OpenSSL for sha1 encrypted passwords.</flag>
     <flag name="shadow">Enable /etc/shadow authentication</flag>
   </use>
+  <upstream>
+    <remote-id type="savannah-nongnu">tpop3d</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index c8c7c26fbea1..f0e9efd5a0f0 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 6b03d10a8490..50e136eea418 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -3,4 +3,4 @@ AUX frr-openrc-v1 7078 BLAKE2B d5c0276540fa09318f6e92575dd7e03f3bc6ebfce186d062c
 AUX frr.pam 969 BLAKE2B 227dc91f51fab504229fa5489486fed1aa393d33c024849724ea3fb934e3fd78ee6c9147240133d458ec52021f13e8a27a2d8a0b4625415007c4595222b815ee SHA512 9a169d58232eba7481aee83d92b4e104b6c4ca95e5b31befe29117fbcebc187ad87c061f37ec7c571ff5702101a329ae0c113cf714e2d0dcd39ca4212734a9ed
 DIST frr-8.2.2.tar.gz 9439460 BLAKE2B 7ea4b44e3d167677e087ac8767c470b91c485e52f9e45513fb6da8498ff3c56e84dd90257eff3b0067c061e7596578968017cbec7de7ea951b6f80134332e1bf SHA512 52d8e82979823f61ec6f117db1eb41b23fd8ad3197ae3f9d2cfa3ad9d96636a3d2f0b36720b2041a9261c8b639ddd48e46a2351ce41cb596f7dc432cddf29256
 EBUILD frr-8.2.2.ebuild 3473 BLAKE2B 9f3639c7f9eb192cce91e0f7ed3ea0a310c66f64c33bb6c32e735698fb62be4e93eb31c8148492e44541be1ac63b358e1f5aa677988431967efe53cd02f7a381 SHA512 05a86b3c5166eee80145301923cefecdb4586d6dfb4a906cfe199f6dc31ba59fc0567e24e14ace48ab661becc6d46b0cdf9984ccc3bd2ffeaaf386d00a680aee
-MISC metadata.xml 767 BLAKE2B ce7920e238d443a1ede5f38b323c86dc2f4e24d5efeb6603a59e8ec9a0d083cdc8e6162d7d3e9463b29bf786b26e00aac19c549ddf943b16175897fb94265516 SHA512 29dd8aa5ad6706a53e00c14feea8e7a75d10ec453dec715a495a75a0390661c268d5a5fc10acdb26d050a0d804162930de79bf0e41a499b803a4762442b8a108
+MISC metadata.xml 845 BLAKE2B 5a563fb20d00884598122763e39d8ce4ef6f7a28b811517a4a01b892636c1ec7cfcf3b0e8bccf838882a8fac309bdbda8dd4fd093f7f58795bd0b711087aeff5 SHA512 1ba4423cf6be189aeec21a0f3a6623c48d61c39fca94dc7dc675fcfdd472c6063b3eefe3f11f5b0de385e759a5488f464a413b7ba1bfc8ae9913563bac6dd264
diff --git a/net-misc/frr/metadata.xml b/net-misc/frr/metadata.xml
index 69bd9b16f701..efe31dfdc825 100644
--- a/net-misc/frr/metadata.xml
+++ b/net-misc/frr/metadata.xml
@@ -17,4 +17,7 @@
 		<flag name="pam">Add support for PAM (via <pkg>sys-libs/pam</pkg>) to the Virtual Terminal Interface Shell (vtysh)</flag>
 		<flag name="ospfapi">Build OSPFAPI support</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">FRRouting/frr</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/jwhois/Manifest b/net-misc/jwhois/Manifest
index 0866e535b9c9..3ae806cfbeec 100644
--- a/net-misc/jwhois/Manifest
+++ b/net-misc/jwhois/Manifest
@@ -1,4 +1,4 @@
 AUX jwhois-4.0-connect-logic.patch 425 BLAKE2B d0896781a15e43a3b0e4e13bad2e9c2e9a6cddca5e8fa1c49b5fd79b73b39292638559a5bcfc7c63b4aa894a5c13dfeac56d006752d580d2532e1351a5d47296 SHA512 7cd437dabdc332cf5068b98a7d87380572f4e94c3fa6554b62377491018deb6aa94e36339069e5628b0965405446f8fcc41ec44c6e4f6ac8e087b06819533c83
 DIST jwhois-4.0.tar.gz 493007 BLAKE2B f578f2a57a95ce78829b859c3135c5ace8431b539bb3447e54633a262996a2d1d3c9802706171437acd325d99cc62773901d7473067307a322b4805d529b0292 SHA512 5d625c3f1031a8eb8ef766ef5d47a8c1a4396d1ad3344fc9449f80dd71ad84aadf21ba67f5c2f99348f732a4df998eefe699fcec4efcadf87f579b70302a44ae
 EBUILD jwhois-4.0-r1.ebuild 664 BLAKE2B 666303e775b637fef393fea99934c39b55ea91815bbd0913aa40cbb5575351753577798b9e2f0156d79bcd1db1fbeed1462a3ca06603cdf4e0c7238f3c3ea562 SHA512 d638232665d795b390bfc1b00c2cf7bee128c28419d7c5d9536b277ecd6b7ca8f1238d385da8e0f5622ed5219ab15cb4752c56b27be19ebbed75315e32b3d221
-MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
+MISC metadata.xml 341 BLAKE2B e9ac42933e764b2fd30fa1ec7fe4c7f8d819dae2fe2ce753c0ee95af1d2a877c4175ef959bb32610673a01f7e033a14ceb6f1555a579c2d71ede0fc416ccbb72 SHA512 93bcd21efdfc140768a169c78a6286a4d00b24f3cea0a1380c4b50607f4dcfe53fb1f0bec05f0ee457068c50cfbbd48557085466e31a262fcb06102e6f7895a8
diff --git a/net-misc/jwhois/metadata.xml b/net-misc/jwhois/metadata.xml
index 73dda144f9ac..05e015a7ce25 100644
--- a/net-misc/jwhois/metadata.xml
+++ b/net-misc/jwhois/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+  <maintainer type="project">
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">jwhois</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index d83bb403f3ba..62af5abc3be2 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/features/wd40/package.mask b/profiles/features/wd40/package.mask
index 2ed6186c95b2..5811b0b8e4df 100644
--- a/profiles/features/wd40/package.mask
+++ b/profiles/features/wd40/package.mask
@@ -72,6 +72,7 @@ media-libs/libavif
 media-video/rav1e
 >=net-irc/polari-3.37
 net-libs/quiche
+net-misc/electrum-ltc
 net-misc/gsutil
 net-news/newsboat
 net-p2p/deluge
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 9c2066a27a52..cb353552ab1c 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2977,7 +2977,6 @@ games-action/minetest:redis - Enable redis backend via dev-libs/hiredis
 games-action/minetest:server - Build Minetest server
 games-action/minetest:spatial - Enable SpatialIndex AreaStore backend
 games-action/polymc:lto - Enable link-time optimization
-games-action/polymc:qt6 - Build with Qt6 support instead of the default Qt5
 games-action/supermariowar:server - Compile and install Super Mario War server files
 games-action/supertuxkart:nettle - Use dev-libs/nettle crypto backend
 games-action/supertuxkart:recorder - Enable recording with media-libs/libopenglrecorder
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index cccfeb12469c..3994638a55e9 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/gnuastro/Manifest b/sci-astronomy/gnuastro/Manifest
index 8519fb494053..e072cd2cf252 100644
--- a/sci-astronomy/gnuastro/Manifest
+++ b/sci-astronomy/gnuastro/Manifest
@@ -1,3 +1,3 @@
 DIST gnuastro-0.16.tar.gz 6089988 BLAKE2B be85152e6638a3462cf00555748a6be8d8c9d30b7c43332f1a16140bd22af2d7e948e1e089045b51b22db1541645dc82668cf2cb8c73abf3b07418343f1c02d9 SHA512 8848528b1a117aaebed854db2e8e4586d3b3f860f25f07a1362b7cd1ffd4f0f7ef214fc0b91b3bfc4aaf1ba9c8bbeaf9dec82979665db1c6fe3703f39354a867
 EBUILD gnuastro-0.16.ebuild 971 BLAKE2B f794a4b527e64bcf8f7ec6d8abf4a25f9a52ac56e49f02f5ea98bfa07b20c0924d1a40115a9b7796037d1e64744312a815c2b31fd463eb86e2c7177c5d35c1f1 SHA512 8217f6e40c27cad7b1899c3f14951106867588fefbb597a4fcf4d4868972c672265a282ef8658693d7ddbf79edc702b72c70ad95fda8badbbe7f65f3789f2a2b
-MISC metadata.xml 989 BLAKE2B 83d339b77fe4307a2eafa2976c0524c15f1d234ed812d1a20eb1ee8f102248afc554126ea7d201360fe88e1191a15311505544058ea27522750e66981accd003 SHA512 b1162526b9c8e4d19d0c30f0ce7b3cfbb7cbf2888063416fedfc7d9335a364599557f02657491b135640e4cc10b43529e595cc7d18a8553cda8b212d491dedd6
+MISC metadata.xml 1068 BLAKE2B 05465c64bdaecc1182c827670d3febe318e60b111a72a90bb4545c4198b39ea809ff19dbab8680180acb16a09080d227a0f7e796cd95edcf15c6ed7cd1ef250e SHA512 4869cb804129bf828c011206b5763a713f74ffc81986233bd895936dbb0612f0ba502a2ec211d7461e015c4cc7cf8bfd056f78c560ca3db88d0795db411fa64f
diff --git a/sci-astronomy/gnuastro/metadata.xml b/sci-astronomy/gnuastro/metadata.xml
index 36be3693c687..b1db18c26a68 100644
--- a/sci-astronomy/gnuastro/metadata.xml
+++ b/sci-astronomy/gnuastro/metadata.xml
@@ -17,4 +17,7 @@
     installing and command-line user interaction that they have seen
     in all the other GNU software that they use.
   </longdescription>
+  <upstream>
+    <remote-id type="savannah">gnuastro</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 02f88970704c..06d4b083514d 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/datamash/Manifest b/sci-calculators/datamash/Manifest
index 399ebe56483d..24469bb9fbae 100644
--- a/sci-calculators/datamash/Manifest
+++ b/sci-calculators/datamash/Manifest
@@ -1,3 +1,3 @@
 DIST datamash-1.7.tar.gz 2183886 BLAKE2B 56ccb35a985caddd8403d5759c4723ca1309825adf3f34ce70ca16cb1d45378cfe3c9bf2d3f357b497cede403981a1746bccbde1003cdbe48b3d1769b9c68a30 SHA512 29d82d6a1ac25a6ceb901c14fdeacbcb575771f405d844a66df525f820f1515d84989480807e466ddaa0a1ebc5cf698191538391b0c64bddf0d80462f66a5992
 EBUILD datamash-1.7-r1.ebuild 625 BLAKE2B d82cd676edccaacd941b09ad10c337a0bad7867cef07c9f24d023678af3b8ea52d69a27e094ad256c5a4782a6fa06f11c25d9d2c637f341b252a7e95bb229efd SHA512 b8e6b9f0e79a4232a58c9f9794d40bd76b8dd874dd155a4b975815446829de7ef526d2cc8ebac8aba8e8805c19df7c40a92fdacdea33992a8747f1dc373500bc
-MISC metadata.xml 353 BLAKE2B 8da1becbf6b58246f418e51718449865ebacfc205cdb9131ed598a23bdeab32875222cb91684dface6e922bc04a21fd743f726961c9f2580c870ddeff516a175 SHA512 abb0976f19ed2a8f5aee3e411919610995172f1c8ae88445c11b3b023aa96306f1293d108865892b45fde232e5607e166f4c1d16379aed4b47a2921db4619844
+MISC metadata.xml 446 BLAKE2B 94ed0a88911b882d96513c92d61a8dd43e16c4257ec8dd7f8538527650c942564090265196f55ba965bd12ed688ede28de2e85a2bcbe4131b489ace58c7c0a69 SHA512 1f81c5d4793ead06cbe064501fd93597b95fe834d6cb0985b755c0456c59e36fda52ad65c0eefce351702fea47e1c6cb1c15b679a62247e44d3cd59f44617e0f
diff --git a/sci-calculators/datamash/metadata.xml b/sci-calculators/datamash/metadata.xml
index 219b3a2cf01e..fb9e3f6cf936 100644
--- a/sci-calculators/datamash/metadata.xml
+++ b/sci-calculators/datamash/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-<flag name="linux-crypto">Use Linux kernel cryptographic API</flag>
-<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for hash routines instead of internal gnulib</flag>
-</use>
+  <!-- maintainer-needed -->
+  <use>
+    <flag name="linux-crypto">Use Linux kernel cryptographic API</flag>
+    <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for hash routines instead of internal gnulib</flag>
+  </use>
+  <upstream>
+    <remote-id type="savannah">datamash</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index 3b6e025d0164..e2f36547befe 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -2,4 +2,4 @@ AUX units-2.17-network-sandbox.patch 469 BLAKE2B 800ffebb2bf096fac9ca94672caa457
 AUX units-2.20-readerror.patch 306 BLAKE2B 7007ed50539043f1b21a9676c8d1ff377d1d6e1d9e1d3e4bca9e4dcda520d77cddc28abe35333cd1cb4a5d451264d94f22bc6594a5f1fd15488d5d5e1d5bf12d SHA512 4d1acb3ca6e4bd2874854cfa27e8bc5418ef30d628589eace8011733556835feb30630a2b37bb1e5e975392fe75e684b48f31a9b2624b8703714dbb501f6f27d
 DIST units-2.21.tar.gz 1308533 BLAKE2B 0a02979eafa21af759128ec72b11e1f532640c9d0e88ae8f389a1beb52d5a400cbd6294042aa4c7d8786c06c8ac4106a77c302805b8c5e3bb84d4134805fd517 SHA512 34bacff606f12aa5b2e59170f6b2142277aa1121d79610a51b57f07f17ae2dbdfbbb0e60be34522f367679cc152408f77c1ebb551016224d23f81c21f4b3ba62
 EBUILD units-2.21.ebuild 1196 BLAKE2B 82474e1b2b54891cf7e4021ec1137b1e7721c6b0d5809530aff9cde1c18f114f8a30aa9ade3e01759f8a913e8190a2ab38ec1bebdd1b26a4582ec608dcf5fbe2 SHA512 1c2dd9233318b8058f24a3b7152e801afad1a54c09cf0a3693ebf04850cebe9c7ab69f5e8bce0abafc9821c895594b3465b705de3ac271f825e62eaaa7b3f80a
-MISC metadata.xml 270 BLAKE2B 7dee9687f98896d38a4c70f35424d66e1b4e5065cf948953d772a4a4e54de2f44cafc2d99b4ca62f0d0a025f868c9cd010a7da76e090d36d0a8083c45642bcc1 SHA512 6c8ad4908b0adbe2854527906adc067f0fece43a36cdb4149e50d4d4ebacfa29b5005db482442e63235e6aaca222862413cd5bfcdcd7425ec978fc24abad5c00
+MISC metadata.xml 356 BLAKE2B e29e63011490681ea66a493a573fef96d45c5cc045ee87534380ba64c4bb56e14231f64b87527105d6ec560326c52c61e72746f8d4e61b820e3bb87a7b92086c SHA512 36bab25faccb86cfc0f2d8f864788dbf1a561d9dd94c76dab878bd9e7b29f55f74ed115f1d374230bd9745038612b9f6343a9a1832bf025ca0e654d4074bdf7b
diff --git a/sci-calculators/units/metadata.xml b/sci-calculators/units/metadata.xml
index 895650dbdb7f..0f742b8f2221 100644
--- a/sci-calculators/units/metadata.xml
+++ b/sci-calculators/units/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-<flag name="units-cur">Install the units_cur python script that updates currencies</flag>
-</use>
+  <!-- maintainer-needed -->
+  <use>
+    <flag name="units-cur">Install the units_cur python script that updates currencies</flag>
+  </use>
+  <upstream>
+    <remote-id type="savannah">units</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 9b64868d30a7..cfb96ea38f40 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/electric/Manifest b/sci-electronics/electric/Manifest
index c59fe144370f..e319c0210392 100644
--- a/sci-electronics/electric/Manifest
+++ b/sci-electronics/electric/Manifest
@@ -1,3 +1,3 @@
 DIST electricBinary-9.03.jar 23591444 BLAKE2B f5185917821855eed90dbd39dc8f6a390c9b117c06d960a01ef7061ec7650d13b549950e53c43c4bd0864c0adebc32c1c2e5c68a32dd09f2f46d0111aa8a7fe0 SHA512 e4430c87e1c0d335341057950b887988f46bd222ab6c2d989312036592f16db0b51169f3affc01fe0dbd8077674ed934d4896de46a0f9ee00e71453b2a6b18f2
 EBUILD electric-9.03.ebuild 770 BLAKE2B 178c80f28275df4b0ce02d6b66df0f038d35fa1bae924783e46ae682943c8e32db715d7ce6e6caa6b87b469f0ba41e06c2f7fd0a501ee2ebb2df7a98e4c296a4 SHA512 db206a790fdd1e2384c03b700b93da9e5fc7418d24b62eb2cb4c1d319c8220fd74025c21a82b42b050863e9371ff30cd43e911594e47ea2ed567400f19e433a3
-MISC metadata.xml 640 BLAKE2B 3d643e9de90e44db830de8d83b9856ec3db382aa166b619f824a58c36e820a047dbddb8b67d03bac7f7e1a01dd1c94a416420504dcadf47c157b13395ab51001 SHA512 3868053cbc030ad0a8eb4d784fd9dfae32e1f3508605c360ef8918e94c2d15c234dbf0d0906f3ba87fad583ee1a1760b87418194f32812dac75b6f6886895947
+MISC metadata.xml 719 BLAKE2B 03b1a0fe9d30bc9ef16ddcc73f0f2bba6d219afec3b26fa46c5b1546fa5484b17c2e1ea2d03154512961be4aeddd70061f40a61d3b5b68258b4f532d9e955e40 SHA512 f56e1bd8817d112906ff30000854d274ac4b29c5dd3d8f4a007554752df7fef1aad00abc890079c72e6fc39cf9b0b85f7fd49f196616a1366e999f999ecf8bcc
diff --git a/sci-electronics/electric/metadata.xml b/sci-electronics/electric/metadata.xml
index d3b26ab4a5db..85cd3ca1d073 100644
--- a/sci-electronics/electric/metadata.xml
+++ b/sci-electronics/electric/metadata.xml
@@ -14,4 +14,7 @@
     * Programmable logic (FPGAs)
     * ...and much more.
   </longdescription>
+  <upstream>
+    <remote-id type="savannah">electric</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 0aedc9aa1177..02be60a06cc6 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index ff274b7bd20e..a6cfb52c838d 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -5,4 +5,4 @@ DIST gpsd-3.24.tar.xz 3596040 BLAKE2B 999963258aae883df4ae84b8011324971c25ebc84a
 EBUILD gpsd-3.23.1-r2.ebuild 6114 BLAKE2B b1e72fb8bf55687ec8888eea544f6df771822bb682cee848eb5b553eba1b859dc7d9b644487d68a21111b6d5fa2109c2e0b32c001f9110b3477886a4232d28e6 SHA512 c8a20019f213dc03d22457fca3d72970fc37bcfc23da3b5f554e2425d17cda4419992bb6bec1f948db75629c83ff8d315493d5d796e586f7152024b1116cb689
 EBUILD gpsd-3.24.ebuild 6313 BLAKE2B f7c3ab1d313bcfb03875f87baefad20c923dfab3ce5f48d6183898f039a27057b85f91ef143d258cc46e678ebee5e7e512ff15466e6a5c274d8c62dcd0ecadc7 SHA512 e89184aa452dbbda9ebec3783f8c390aa7defd57db61ba24277c51a5e9fb3e0ffd33e4c5f3d63f7952073931fad6196937442598d93f877a58ec00718949eb69
 EBUILD gpsd-9999.ebuild 6318 BLAKE2B 87119b0f4e423ef3281522f5c76e0086399df19ad0d249095bff1ae62f153745881eb359a91a391f922828918c8f277f81b4782ee925189c88ace4225719dde9 SHA512 ffc2fd658c2c8e9a937368fe6a0015dffd62e5a418618d4f3f6d8e1e02416f402a398e46747d97e3b89795a7329c4de4935f2797564f36bffab45a5ce516b0be
-MISC metadata.xml 951 BLAKE2B 81e95d95a4ecd4ea59dd5c8c187bdb53cf32f6334e628b77986fc300d3380c310d1c77cafb113de2b260796db735752d2c7012fd7753504804208f4cc29302d0 SHA512 4383074eaeb476dcc84f38f2c2e68afb956f54c9fc4e0837e09e2d498e02fe59fd31351a11bf886da875c8e08aa84bfb09b1252dbd68ccf171f3c57c5fe1c883
+MISC metadata.xml 1029 BLAKE2B a8bd09a148ce75d7e8a390353834e87f05d4a21e4ac31a1264565c37bef7801542eef52955dae03470f7a8d965d7b2ae446014ad5c7b3a251aa3a9ad0bef0e9c SHA512 cad79d8d94442ecfca1cbe03c137e771d02999db08a494801c524edba6a6648a7b948a00c9f3ebf539f99fa58794acd09923bc077cf19ae126a64bfb4d1ff397
diff --git a/sci-geosciences/gpsd/metadata.xml b/sci-geosciences/gpsd/metadata.xml
index c56212e9f7fc..f7825c1f5ebf 100644
--- a/sci-geosciences/gpsd/metadata.xml
+++ b/sci-geosciences/gpsd/metadata.xml
@@ -21,4 +21,7 @@
     <flag name="sockets">export gpsd over unix sockets</flag>
     <flag name="shm">export gpsd over shared memory</flag>
   </use>
+  <upstream>
+    <remote-id type="gitlab">gpsd/gpsd</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 04e732b63289..b83a2ee98d09 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index 376b788dbf6f..0d6d1464783e 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -1,4 +1,4 @@
 DIST gsl-2.7-cblas.patch.bz2 12073 BLAKE2B 71f2bdafdb1f42ca5c3515f8e39266242185218495705018d88e523be9bc776b39749156500cdc5746a16e481e9cfe2b79660e250eb1a70f3b18819d16fe11c5 SHA512 5b9b2a798079610d7d4981b83672cc978ed44b66aaf6e671794685f10bd4069764bb358870019dc0eec1e251639cde12aaa3598cae0e2fc050ea39c79435fe2f
 DIST gsl-2.7.1.tar.gz 7509209 BLAKE2B dd216c2fdb536e57b6e29613e46e1a05183fd18c47434039caac68fefffc0390cfe2f21eb117347d4bbdf9004de837ef2db02c17c01eaea4b615e3e45a4fd90f SHA512 3300a748b63b583374701d5ae2a9db7349d0de51061a9f98e7c145b2f7de9710b3ad58b3318d0be2a9a287ace4cc5735bb9348cdf48075b98c1f6cc1029df131
 EBUILD gsl-2.7.1-r1.ebuild 1323 BLAKE2B 52c5d89e0f6b514c2f4098ac3e28b59f28761a2982c0be0a3f0132f3546c5a6998c0fa6258704ee9b425de6960eafe5fed550108e2d29df02d3771b4dde22d27 SHA512 aa1cab10dcf2536ccec66607dead1c23175216c5a23b88393551c1be40fc847062f0ef4ae715fc767b8d5539e2d37038a050638e861e36dcf0757ce087310ba7
-MISC metadata.xml 1191 BLAKE2B 856a9a1b3195a76a6c1fffe65dbb94b90a135ce4290c33d772efca43be04f29db7efee5083ee997660c5831aa75773993423645a28e82072b3ceb877135d6810 SHA512 9cb110e5202df7ca123da18ffd0ac60d1d9d5577a29dacff001b24b0c0eae4f96851273d72956dd7b0b94c9fabd392ea13ae6aae54e801d118032d215ede59b2
+MISC metadata.xml 1265 BLAKE2B 88ea891b77a6121827d057bfaeebe86d0d44e556db9a080786838f098818d2f2a37dd19cb780c80f92f5c10735f63715e63e9ba8b4f17b1cd709baafb983ac15 SHA512 8fa958a6bd52cd001606f9010806d783a1b90260b23854eef4f0597cadfd7c06ead9f4f376082089b93fe9150efeff0a3bb13d3aa5f2f637535a0e76c85d4d44
diff --git a/sci-libs/gsl/metadata.xml b/sci-libs/gsl/metadata.xml
index bc6b9fcfdd1e..473598ecdcc7 100644
--- a/sci-libs/gsl/metadata.xml
+++ b/sci-libs/gsl/metadata.xml
@@ -23,4 +23,7 @@
     (<pkg>virtual/cblas</pkg>) instead of shipped internal version</flag>
     <flag name="deprecated">Enable deprecated functions</flag>
   </use>
+  <upstream>
+    <remote-id type="savannah">gsl</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index c89d5ca32e1e..f8bd58ec090f 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index 65f5c72cc775..69ed0bc2ed7c 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -2,4 +2,4 @@ AUX glpk-4.65-debundle-system-libs.patch 1930 BLAKE2B 0c265afe9338e75bb3d6536e9e
 AUX glpk-4.65-fix-mysql-include-prefix.patch 1837 BLAKE2B ecd90024e07f29e8ebb6af80b520c8f192cfea21c90d8c247001389f2ccfcf24ad487981a0cc719d1ca99e266dd2a9d66f6416d4f2d5e7c80bdf807b9bb7b74e SHA512 c74281bf3e03e136d183b562b8f682a3e1957019a36ec0c6a048049f0d5f55361107a62e36eaa9e3306a1f13df10adf55c2f54f096b6e353108856e05d9ce799
 DIST glpk-5.0.tar.gz 4132649 BLAKE2B f8204f66a97af950c13ee72ee9541f305745741d1231325670ede14663cb6c28ec6fbc44b3625973f1924ca078183d1d43f494ad43a7b48b45be131882b00001 SHA512 4e92195fa058c707146f2690f3a38b46c33add948c852f67659ca005a6aa980bbf97be96528b0f8391690facb880ac2126cd60198c6c175e7f3f06cca7e29f9d
 EBUILD glpk-5.0-r1.ebuild 2329 BLAKE2B 8ba11e77f24e3ab19a36cbfdb0cad6117cb9857e665b7661d41aa5d294787d2f80c044ae8741b510043184489c8014eda6e310d99a3f735e6bdfeb0a2c6caed8 SHA512 2d9c946c23ed5659efb073ea9a14720492be18c3a8d4d843572629e3f9ce7084cd01d8510662b18f08522ac847e73865da5acc08ca758c0ab50280b26300d0c0
-MISC metadata.xml 1029 BLAKE2B 90d95d7204513aabf981fc134f14b25b68e1f77bbf33e8d932897c8c20cdf872cc2c3aa5ac8f94b9541a79af088572d8639317f2ef3d138cd014fa3eb93e7767 SHA512 731469b967a5cc77e1266c5bd046cbd92f89eeb324433971b2a777232a85d2d52689c8f163daca1d28411f6a7a665e0e935abe2c9686373d19c4cd28b2b2d4f9
+MISC metadata.xml 1102 BLAKE2B 0433b0f52da528d9329e768351efa0c17ceb6c50f9c7326a24d3f141675b86a06aaf8b420c7996ed899ba46bb62673e930a1ba0a4feb611c8c4d0aedebd33391 SHA512 5c978983ea85c82eac3fd8cd47581aba7fcb4a812f3ca879e668de68df0388af9a7edd3fce64fcf6d26928580b318681fa3239c01750f5862a0c39307d02546a
diff --git a/sci-mathematics/glpk/metadata.xml b/sci-mathematics/glpk/metadata.xml
index 8161ed7c3b78..1019dad1d684 100644
--- a/sci-mathematics/glpk/metadata.xml
+++ b/sci-mathematics/glpk/metadata.xml
@@ -4,7 +4,7 @@
   <maintainer type="person">
     <email>robbat2@gentoo.org</email>
   </maintainer>
-    <maintainer type="person">
+  <maintainer type="person">
     <email>mjo@gentoo.org</email>
   </maintainer>
   <maintainer type="person" proxied="yes">
@@ -25,4 +25,7 @@
     (MIP), and other related problems. It is a set of routines written
     in ANSI C and organized in the form of a callable library.
 </longdescription>
+  <upstream>
+    <remote-id type="savannah">glpk</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index cf5930af005a..6f21e24d3bc4 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -11,4 +11,4 @@ EBUILD octave-5.2.0.ebuild 5403 BLAKE2B c84884673c5ae98b97e18f93763932b28c019459
 EBUILD octave-6.4.0-r3.ebuild 6044 BLAKE2B a5e0e0acda2c545beb02b59ba6b11356de65bf9384c736db3b1d44d4961a2272184e451fbb37b8530a0b7bce73d07db821b5519b776a43f600cde3564ae2887d SHA512 bd08da458ea2a6a3eb5aa745b25b3c47b3eb5ff34332fd0387863e480805ff984f9872b970b0e0770edbd8adb233b8a4ac2b541218cd87eb9dbba4e8c8fedc0e
 EBUILD octave-6.4.0-r4.ebuild 6031 BLAKE2B 30bbe11d7ac6fea759463681cfc49a5779cec4eb99aaf5917bf9d8955bc03d63ec6e7c45b8589a54e7ca79dfe302ee60f6f20ab8a667c3a2ebb2d5d9e5e6bc56 SHA512 dcf58e44d24a894d18b2478727f970ac39f81ccd38947147dabc3f88ba8e637b6d783b136073bc2a5d4155b065d387e3f183131bc838a98c1a52bb6274c6bad1
 EBUILD octave-7.2.0-r1.ebuild 5527 BLAKE2B 799a3175791ed82cc0f46bca34f6280a5b51b0e42381e627b748f195fa965a84fda6f562d8c6e6a20b3074a225d87a9b5ab1f8ba41b8978d3187d14df569ba0e SHA512 cfa3e263ce589e39b47b5c9240c63fe006a8751b81bf03850dc91848965fb46bc67db069550e86db5a4f3bc653ae7ab7744930753bbfbcfbcbde3efa91b4e5a0
-MISC metadata.xml 1262 BLAKE2B 39736c6913fb3241bed38c5dd9218190d570a3e914a01d1d06fff2cdd68c3c07296a19e2a35305a67aa776a12636445e523b3e349daeffbf67ab60b074a25fed SHA512 177539fd369e2eee0db21ef46d64f8e9f30b39eb4648c5224ff221465c55cd554ac142940f32171ec36b9561b68243761f4e3cbcfb6b06896d45986cbb568c82
+MISC metadata.xml 1362 BLAKE2B c81ec8cf01a65ebec3ae6138fb9003d409ae8ac0369e67abf6bd8f62522587d7092d6479b4dd08593857526778cbb4ef0c7c937a0aaef8d8f9e7c3d761514d78 SHA512 ff5ea648f9f473222d38590bebb030a1e4189650753f1654d39fe7f8dd396530ea32346a6d0033844b7621b41ced143d507c2bbea28204d445eb243cf4a374b6
diff --git a/sci-mathematics/octave/metadata.xml b/sci-mathematics/octave/metadata.xml
index 759ec5c83e0f..9058f2f3596f 100644
--- a/sci-mathematics/octave/metadata.xml
+++ b/sci-mathematics/octave/metadata.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>sci-mathematics@gentoo.org</email>
-		<name>Gentoo Mathematics Project</name>
-	</maintainer>
-	<longdescription lang="en">
-	Octave is a high-level language, primarily intended for numerical computations. It provides a convenient command line interface for solving linear and nonlinear problems numerically, and for performing other numerical experiments. It may also be used as a batch-oriented language.
-	</longdescription>
-	<use>
-		<flag name="glpk">Add support for <pkg>sci-mathematics/glpk</pkg> for linear programming</flag>
-		<flag name="json">Allow using jsonencode and jsondecode commands via <pkg>dev-libs/rapidjson</pkg></flag>
-		<flag name="qhull">Add support for <pkg>media-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag>
-		<flag name="qrupdate">Add support for <pkg>sci-libs/qrupdate</pkg>for QR and Cholesky update functions</flag>
-		<flag name="sparse">Add enhanced support for sparse matrix algebra with SuiteSparse</flag>
-		<flag name="sundials">Enable the ode15i and ode15s ODE solvers using <pkg>sci-libs/sundials</pkg></flag>
-	</use>
+  <maintainer type="project">
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  Octave is a high-level language, primarily intended for numerical computations. It provides a convenient command line interface for solving linear and nonlinear problems numerically, and for performing other numerical experiments. It may also be used as a batch-oriented language.
+  </longdescription>
+  <use>
+    <flag name="glpk">Add support for <pkg>sci-mathematics/glpk</pkg> for linear programming</flag>
+    <flag name="json">Allow using jsonencode and jsondecode commands via <pkg>dev-libs/rapidjson</pkg></flag>
+    <flag name="qhull">Add support for <pkg>media-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag>
+    <flag name="qrupdate">Add support for <pkg>sci-libs/qrupdate</pkg>for QR and Cholesky update functions</flag>
+    <flag name="sparse">Add enhanced support for sparse matrix algebra with SuiteSparse</flag>
+    <flag name="sundials">Enable the ode15i and ode15s ODE solvers using <pkg>sci-libs/sundials</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="savannah">octave</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-mathematics/pspp/Manifest b/sci-mathematics/pspp/Manifest
index 706ecaf7fd79..39363493eb37 100644
--- a/sci-mathematics/pspp/Manifest
+++ b/sci-mathematics/pspp/Manifest
@@ -2,4 +2,4 @@ DIST pspp-1.6.0.tar.gz 9553836 BLAKE2B 4c12003838d7f6c3613d76626d88b24f4dac4b6f5
 DIST pspp-1.6.2.tar.gz 9249366 BLAKE2B d1a4fb352615be8d5f3af3125d10760648ab16e8d2b42dbf0632de64a5bb5bbe87b9b56661c7f600ea09c6a359e477376d3efb821280023d1825d6eb7b0a299f SHA512 fd8b6b23ae4e4a1a560bf4d20c35e761d84dcde2e220648303303f11e9c17d56285a3d5b3c26e7dad44d52ecc82fdf93fdc51a3533ff907f2ca1f1474922e31f
 EBUILD pspp-1.6.0-r1.ebuild 1685 BLAKE2B 8da6d75b249e1592118e0b995b4235e84ee70f074c5ef7b4683bfb6a9550047d9d9e03106f0403e887919096cf1dea2760160e74e43c36b772b39cae92ff6525 SHA512 49c1243651c6d221d76e83369bb8e639897d6c1f606e936b71060c43a08c92075a9a185cb8467b82d36d6e7d7aa182cf620581e20fb4953e8b6753e7bfbaac85
 EBUILD pspp-1.6.2-r1.ebuild 1774 BLAKE2B b647821363614d8918a2d68eda437fe344a1b4d6a971ec9da6755336e556a7f2f9556cedd67d70595ae1332ee39f6bf84f3a7594c0a4a250c2acc047b7c517ee SHA512 177b9afe1a88c0e4d0cfb0e6ea387926b4ad005dcb8490249fc3a477e5b1516a0885e75ead8cd6c1097d505e89c61c5922e73a17a00fe60828895f163f3d806d
-MISC metadata.xml 712 BLAKE2B 63bb6ce6a7465796361c98191ff057fbc335d5f2494f279a52ed2ebbbafb765364cb5efafe82c5d687f4dba5a162fa9a12b42bd5fe1cd093e39554383564c556 SHA512 4aa1baf360b95156198a0bf18c10db0f5f5d78d7745f5ff29c71cb3871ec810d9f9da3fd3dc9279ff83620bd05afed9b57f18f8483a1b3860cd9e23d32a9e9be
+MISC metadata.xml 787 BLAKE2B a21db3f63278c06c2a0eff83ccf9098c55592be62933f9d605eac83bb9980c2fd404d1ccf9ff849a25f422a7524106d662a17337d8affcaa3859f27e0078168f SHA512 e39e40583b41e2451231feed84f65f414f684629a94156e75f6cf1526e5904d6738d665ced3bbe5d22bf6978c11882f30f520e95a9a4792437c1062ae759778d
diff --git a/sci-mathematics/pspp/metadata.xml b/sci-mathematics/pspp/metadata.xml
index 1e1e65d1a849..9d571017a7f6 100644
--- a/sci-mathematics/pspp/metadata.xml
+++ b/sci-mathematics/pspp/metadata.xml
@@ -13,4 +13,7 @@
   statistical procedure support is limited but growing.
   PSPP has both text-based and a GTK+ based graphical user interfaces.
 </longdescription>
+  <upstream>
+    <remote-id type="savannah">pspp</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index ec0847fcad5b..5f810ff2aef3 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 1249e219f531..4e43f50ebd35 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -3,4 +3,4 @@ AUX ppc-musl.patch 824 BLAKE2B b3476471c27a748a67f237d7f34ede06446417a310737d466
 DIST diffutils-3.8.tar.xz 1585120 BLAKE2B 573abbfba55c62ba30d2084ca68860e9681cfe92648407f7fb04e1aaed2e4719e2fb5a29cf25bd125d762f4dfd52f85ee91f2ec19b099365bada7fe27a0394af SHA512 279441270987e70d5ecfaf84b6285a4866929c43ec877e50f154a788858d548a8a316f2fc26ad62f7348c8d289cb29a09d06dfadce1806e3d8b4ea88c8b1aa7c
 DIST diffutils-3.8.tar.xz.sig 833 BLAKE2B 439d331d9839d8b434b7192c52628bc9e8e1c11cada28170f85c9390abc3e5e9ea86aee696a4f9260552133053194680ff54b960ed539fabec85fdff54dee3a2 SHA512 0464ac89209411993800666b45ff90243d22fbda53bf1d71c6870d565b39cc8d9c54c141b9d297a181ce74ad8fb5313953f416bced179ff7728a52a3e9a4f5a5
 EBUILD diffutils-3.8.ebuild 1673 BLAKE2B e1af83d87e166a3d60f87ed13870240f9216ff72ffb99508780c7020fa466da05b2e3b8eeaaf8dbf244ee873059a004273bfb2e2ab6ddb4cf4f0e16542497f3b SHA512 17925dde918dc25fde6a42891b45c7a8f242aa5a81bf67974b01d03785f16251496912fb5ccfe0927cde4908432cf36532341d7b11f16b2ae5033169f466018f
-MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
+MISC metadata.xml 344 BLAKE2B 366aa4428af6e10c8822a3369a382c8c17827c74a13bc074fb0500f057324d8e126daf20dd72073081e20057520c140b7efb6a0acfdd7be11fe381e091bdcba7 SHA512 ec9e5cc3ffa48b8e18e31fb7d277c336dcf49d127ee10a85046aa072338b4a687d424b4a714d85a6ec82032a22fc987a9b19d8083460417d46a27ae1a65f9575
diff --git a/sys-apps/diffutils/metadata.xml b/sys-apps/diffutils/metadata.xml
index 73dda144f9ac..b532b7342d14 100644
--- a/sys-apps/diffutils/metadata.xml
+++ b/sys-apps/diffutils/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+  <maintainer type="project">
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">diffutils</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index d83ca5d2a396..7e86ed542627 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,4 +1,4 @@
 DIST ed-1.18.tar.lz 66019 BLAKE2B 9f2b6f00e65dc8a13dd9eba4dfae5ad1e6e3c3ffe623c8b2cc2db78e221ba140595658fd710e4651165a2475a9ed673c9f230fab64f22a7a9488973b5e227198 SHA512 e5dac94697d63fb90cc17e3e653fa56309e9652cc25b2e98a0e21f1ed41e38c48bc33b5fc746275a59e702d1644d3af88f3d82598b482f7309f4e68aab783286
 DIST ed-1.18.tar.lz.sig 72 BLAKE2B 9b498f1604d625c6b32ded636e0841ef384bf59c10ff00722e03dcd890c5c1d1ccc5d99545a6c132a9ccc61b9f8da8f70a94f514db4a417d8c52128be720481a SHA512 f3df77755ac2b47825102b7c6d1774c8aee3f93e0824cebb6d7ea6cda50c1233673ed4c56c4ed135438e993399685cf45616c1fbeb85b2a8501059abe818908d
 EBUILD ed-1.18.ebuild 1183 BLAKE2B 23b5cb591455ad1c1dad946876f8b7b4297bc41ddc0cf7a909c83c8585a0f3144506f25495a043c0ade9f5e0501b4d2c7219b086917953059a92ae9f4f523110 SHA512 75bbec07b179c221e7399f709fca3e430a0c856f9acba11d65c5fe9c740c08526629ae85c3d302f2cedb285a071b54158341d7d63b2d6934fca3fe8bd820d5e2
-MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
+MISC metadata.xml 337 BLAKE2B 40506db26223e7d375b03972929e04e5684f0ee5d722248819d28d424daf9f2f4effd07a7491cdba9d77185712593fe8fd182c058bff2ff0ba4341aff383dc7d SHA512 5709e973094bd7fda825a3a223c04f8ce04ba9e2f609466c7cf56da4f62d4155562669bbfd808acd2f7db17434ca5871cdc50962a6bfdae3c4edeca1bb4736df
diff --git a/sys-apps/ed/metadata.xml b/sys-apps/ed/metadata.xml
index 73dda144f9ac..021ef4fa578f 100644
--- a/sys-apps/ed/metadata.xml
+++ b/sys-apps/ed/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+  <maintainer type="project">
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">ed</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 27b5d4987df4..d1c50b98f83a 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -4,4 +4,4 @@ DIST gawk-5.2.0.tar.xz 3385496 BLAKE2B c4df19fe59c67ca1de490febc218f7eebb7f9d99f
 DIST gawk-5.2.0.tar.xz.sig 488 BLAKE2B 541e06de12f720bfd890daae8f50263ec5eeebb1bff1e69510fcc004b0fd0b5c4b9e182557757e833ad10324ce51c4db47c0857b5feaf17002975dfd34be35ab SHA512 c9ae287fbb31e35384ed8814b4f51e7f7e214f499556b71eb4b8085b65c73d0e32f88eb17f83aed8dfc6880485e7a348887cdf9ae54f3b13265dbf653cf84665
 EBUILD gawk-5.1.1-r2.ebuild 2762 BLAKE2B dc12406f53b61c3a99cfd3dfbbe0a430b4746920a78be5fb611b8d6c61a8de5e82ff2002d3b8c3d90562d408d26453ada810f60ceb4bef961875b677c8079e64 SHA512 96941cc2cf82f799bca38f8707b9cdce9764a817e5fdd950fd91be3de00f5ae6fee2660a2fd77b7effd9d42263a33ce40927525f076c2140a83d84b3af7fb887
 EBUILD gawk-5.2.0.ebuild 2820 BLAKE2B 0ac76815994e4b32c9a7705155cac2976f3a63ca7ca17830b6a276d4038d5f09e55cbe9894776b822dc90e3e851d6078f3bd0c7eff8e6c0c69c37800467e64bf SHA512 4918cdec84e66e56b557daa5c55e367ec0f1f30f8ea3ece0ce76591bc645463bf7a41021a0c857c78b772dfb8b355b2dfb96da4e17efe39b21aa1fc5729cdbca
-MISC metadata.xml 560 BLAKE2B 1aed2e5d317f114ce878410b1d800deedb4d49bd0ba1594c8406ed9fbd6b248361bafdad22c945092a7a03acb8f5e08d8ca907fd5aa9e990fe9b9c3111e434d1 SHA512 2ad4ddbbe166a199a96412f7b0b3217c7b4659ad6bbc10df2dce3e8e55b800362d5abf6c8222dccc461893794b9bd9a1846bf9a266eb4ccfe8bcef79521ebeb5
+MISC metadata.xml 654 BLAKE2B e04183a376da2006e727296257a18431f2e4f29fdabcee48edebb1c9dbf099c846af6bfe90d9e551ec4536c2dd034a80b47e6a1b8e442a89c1228929bef7d956 SHA512 9bb5a19c4b9a8ff7669c7ae7320a88d64eb68b4897f06d2046f71efe562a4846cb8c611bcc03b0111dfde19b40275f3357a5cd6285d4d5f0b4464a9c8b3eacb2
diff --git a/sys-apps/gawk/metadata.xml b/sys-apps/gawk/metadata.xml
index 2a36db0a458e..66b0edfce4ae 100644
--- a/sys-apps/gawk/metadata.xml
+++ b/sys-apps/gawk/metadata.xml
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>base-system@gentoo.org</email>
-		<name>Gentoo Base System</name>
-	</maintainer>
-	<use>
-		<flag name="mpfr">
-			Use <pkg>dev-libs/mpfr</pkg> for high precision arithmetic (-M / --bignum)
-		</flag>
-		<flag name="pma">
-			Experimental Persistent Memory Allocator (PMA) support which allows persistence
-			of variables, arrays, and user-defined functions across runs.
-		</flag>
-	</use>
+  <maintainer type="project">
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
+  <use>
+    <flag name="mpfr">
+    Use <pkg>dev-libs/mpfr</pkg> for high precision arithmetic (-M / --bignum)
+    </flag>
+    <flag name="pma">
+    Experimental Persistent Memory Allocator (PMA) support which allows persistence
+    of variables, arrays, and user-defined functions across runs.
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="savannah">gawk</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index 217e71a17e73..8c31d21b670f 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -1,4 +1,4 @@
 AUX groff-1.19.2-man-unicode-dashes.patch 582 BLAKE2B 73e0868465b5372376e5bb5b382f2a4918fb9227208ad001f35ae041af93fda494a9be355e732697d264ec974d6e9528f9f91e0d26b2ecd82a41508222f1e439 SHA512 7d9f88c8bcc1b220c82c214f2f638601e8b44bd3933df03c74a2ef51b555773734c92044a3162bf5815932ddaae08158994a7c5106098de3e9f3bf202975de97
 DIST groff-1.22.4.tar.gz 4137480 BLAKE2B cdda8a7e8e42b8d8991656ecfbffe0cd0ed5d8932467cab2f3c1eecb3365f4a5c03321b6ed929d451c3dfb00a46046a781303a1c55c4aa65eb7d178fb36b1cbc SHA512 1c42d3cd71efaf067b5850945d9097fa1f0fadd5e2b6ba7446bd9d4f439fe1ad058e4ddb0d4e0f503682137dfc7c822944ce1e3e5cf981673f8ba197ea77126d
 EBUILD groff-1.22.4.ebuild 2795 BLAKE2B d386818667ff0389a6920b172ee42b1a00af2648a38b2616aba72da0102c3979d8c9e38b10ef8d87fb09e77bd3a91fe681f43f618029c65c72ef36d7127e304b SHA512 69188450b4d3a88154a03e7668220f09e330312dfceb87d6905c76a36f143ea2b4cb2fe07021beba4ea450ea8df6ec5119d4e35cfe2e2b04930d14d33d364292
-MISC metadata.xml 366 BLAKE2B 0f3b739bcbb532cb5b28776179b0bfc8ae66252a73b5eee91b602087c0c2ae789b9ef254a7f54f483b761401cc806b038bab5c06dae0f64f625d28f4822e1cfc SHA512 a2e17e7c48754f0a7fd7d9bd1d4251111983b4f6b556bfc84b846b3ff72f55da88c508fa0f3f20bd78456e5c18eca95e0facb495ddc86a18dbbd8706b6fe52a6
+MISC metadata.xml 459 BLAKE2B 36d7185ea9c76a123621ce2b059497de3877af22e3030ceb57b9b53a0711fa0f580960cce3659ff66033e4e807c8e559fc3ba2c219b6adf771c86d36f8093af0 SHA512 db5e1b7bfcf191a6f396bb77314a601b66128b16ec3e227c6ec40b3e628de27f998d4b3fbaf85d391e052a98e490879b7b2442f6de2694d3bc9f3ca1bbf74f9f
diff --git a/sys-apps/groff/metadata.xml b/sys-apps/groff/metadata.xml
index 02999fd09e28..f2d9c99e6422 100644
--- a/sys-apps/groff/metadata.xml
+++ b/sys-apps/groff/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<use>
-	<flag name="uchardet">Enable automatic encoding detection via <pkg>app-i18n/uchardet</pkg></flag>
-</use>
+  <maintainer type="project">
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
+  <use>
+    <flag name="uchardet">Enable automatic encoding detection via <pkg>app-i18n/uchardet</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="savannah">groff</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-apps/miscfiles/Manifest b/sys-apps/miscfiles/Manifest
index 5d61a5c631c5..9a06f2379a16 100644
--- a/sys-apps/miscfiles/Manifest
+++ b/sys-apps/miscfiles/Manifest
@@ -1,4 +1,4 @@
 DIST UnicodeData-10.0.0.txt.xz 158456 BLAKE2B 2f4442c4bb26639e748f6a2b799e128ec9ffee357e13524ee4fe54e8df37b2916b03a209c71681b5049aefe000a896898e23879b7fccc7066e42061b42515b2e SHA512 85e8c7b33d71025a5f6f109e28010a5d5167f1aeb86c88eedd2e5ea5cecae3d1be741e5b0113a78566f51e8e15812a180a8c43c6b887385fec157d744c7a4a9c
 DIST miscfiles-1.5.tar.gz 1585293 BLAKE2B 816197e72192e8b41839eb29d501a148f95496a7f3e7be469184e9396cc34fc95c161207edb60a5b7f8d43fe50c58202f0b16b2e4b1ce188527718e4f85e24bb SHA512 d7ab23a709539278cce59e0c32bfcb3a0f11dc52ef537e3823e72382962af7f4fedb8b957f39ff1da51a93a00e3c4f6ec29f7332d7879c77fd7f4ec0ee4f82aa
 EBUILD miscfiles-1.5-r4.ebuild 1695 BLAKE2B 98ad4d90a9d9841c883e76f8d6e39e20c343cbcc6a372227e4af928d1b56524ac17267849bf3cc2485459c40829d7893b12e0bca0c00ecbedbc8979ce0d5f5ee SHA512 ed83326799f853cbb69ebfa4295c20657c4781fa9ceba2ce412908a0fe5af133adbe8894c72fcdbb1c28856afa748d8522dee113fa300ba20bf3aaf4622340c0
-MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
+MISC metadata.xml 344 BLAKE2B e4fb8aaec980cf4288c9d8fd8e54261ebf8451e70cb252476d816bc36ff8c2abee7daccdf4fe6bfe8574c10aada6086c9c50c616a7ebb61440c494796bdebcfd SHA512 dacffbd549b5308e69ad45caad4b0804132e2238d18399d216a32da8ea1a81880bef5915fc2f4bca02eba9e24f3bca8e28a022c4e752a2dac63eb4757c1526a6
diff --git a/sys-apps/miscfiles/metadata.xml b/sys-apps/miscfiles/metadata.xml
index 73dda144f9ac..e45e00842733 100644
--- a/sys-apps/miscfiles/metadata.xml
+++ b/sys-apps/miscfiles/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+  <maintainer type="project">
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">miscfiles</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 092f323d318e..8099e28c4385 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index f5b66721a872..cf761ddcbdaa 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -2,6 +2,6 @@ AUX fio-2.2.13-libmtd.patch 238 BLAKE2B da7843b4cb2b0fda12c2e950d4b51df661f229eb
 AUX fio-3.27-drop-raw.patch 3315 BLAKE2B 93cfc730e2feceae2cc20c76b93a4e1da2a6b0c8a3b3ba3231208d0074612a9a4e5836108aedb9dff03db61977c354a2fe1b2bf35c4e975b6e302a0357b78852 SHA512 67589a42e65be3821aac5043b910d589f735abb98d8b107ca9fc020d9c10b4c20f82b2e3dc9622d1f8b8ead5b69cc459470136c2d942a5690c7fdefebf57ecee
 DIST fio-3.27.tar.bz2 960330 BLAKE2B 7e7e01a5c1d6af13a6f87139e7738646cbc8f45ebc370d0c45b9efe1f93778613d374daafc6df459f988f27f2be54ff636235e1e5a92a4a6ecf9a60ed573d170 SHA512 9c5f2ab0c9ac24ab78dbc74fb6c5acd60f8189fdc618f4280992141b6c0abe1c235c373fee18ad0c803e7fb25d480f45aec56dc3be2e0d26d181b3418b179f99
 DIST fio-3.30.tar.bz2 6001772 BLAKE2B a4941cd415e6444bb9871274580efdf82281a1e52dc3caaa235f63176e3564fb1dc08e1e4586c555f9c25975d7e6220fe53209ed7218da713b9cb9135de0fc05 SHA512 1fb2ae9c28028147edabceff734fc41bf07ce504af98afdb0951920b724b15d647f2b0852262c177279ad6b4dbbf24be458db7f939d1c80069e0f8e7bc8aa10d
-EBUILD fio-3.27-r3.ebuild 4318 BLAKE2B 0c5e47fe1cb9a9471233f057dceff0dcff8c6bf4826bee3756f2faa5273e36b8fcddf5525779a91f93492127a260dada548cc32992db0709bf10de8827830a15 SHA512 70b244f998c7d4aa0f0b55db5028f855cdeceb9e09467991a08e1e86d94c4f9b1916c44a9c0414b0b4486c719fa5f1b97097e35c0f88251aa7071a63483d5eb5
-EBUILD fio-3.30.ebuild 4411 BLAKE2B 297ccafb737510a4a47a0a19e5375feac491d748f232d5f2f62096f171d7e6c8b115a722b65e54294a22b31e71d5879746378ddd4076947b94661c067e3522ad SHA512 4fee8d102b438432a57b42ff937936966c6271dd577b6c76a4c4b114759c9558d0f20bf21980fcefb9764cd94cf98a2ddf3a149d71ab95a20ad04523b0f27498
+EBUILD fio-3.27-r4.ebuild 4218 BLAKE2B d945ef0dcb59185b8bc6353d309530805feca0b76e8058225b883a191fb1f310781bb9cf2bdf0ddf4548c294a21450ce65ad01de072181e25ff9348be8d94746 SHA512 d1bf8d47e7099aac4a3fceccaa17fb17269ae4e64fc5c6e00435d1e5048a0d66b732c3a895435c8ce2a556531e5e56aa3487b4194ce7386e310b1f56a6187dab
+EBUILD fio-3.30-r1.ebuild 4311 BLAKE2B c307dd7fa9b930c359c86c4fc3d77db4e5f85bc2841b973d90d402e1120a157f15628bb4bb8d0b28855e41f098037b13057ff421928e98a1a2962ca0f6cc8b49 SHA512 0ebe57edfa6237b0ea899d1fb44651112130377693950115f52ba425bcb4fcd7b559866a4f8fb51630ed2a1a295c8c5138aedb098735059d0ac128ad4118941e
 MISC metadata.xml 1293 BLAKE2B 609080b0f70ed898d1203afddf9e9dd850fdbd8111536ea9341a413fa6ca07a7314bd4088df05613d95b849f9fdcc2a1519a17d20e56dc46115e6d88bf07672e SHA512 76096ea48b59fc78624980a7b2721e1b43584eccaee4488a38a18d7ea4fa389423b684af0f015f2f0d73ae2989167a7caa4a02c9277e153f382f319780ab31e5
diff --git a/sys-block/fio/fio-3.27-r3.ebuild b/sys-block/fio/fio-3.27-r4.ebuild
index 7e2e9e4198ab..1a94d33a7c1a 100644
--- a/sys-block/fio/fio-3.27-r3.ebuild
+++ b/sys-block/fio/fio-3.27-r4.ebuild
@@ -48,7 +48,7 @@ DEPEND="${RDEPEND}
 RDEPEND+="
 	python? (
 		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]')
+		dev-python/pandas[${PYTHON_USEDEP}]
 	)
 	gnuplot? ( sci-visualization/gnuplot )"
 
@@ -60,10 +60,6 @@ PATCHES=(
 	"${FILESDIR}"/fio-3.27-drop-raw.patch
 )
 
-python_check_deps() {
-	has_version "dev-python/pandas[${PYTHON_USEDEP}]"
-}
-
 src_prepare() {
 	default
 
diff --git a/sys-block/fio/fio-3.30.ebuild b/sys-block/fio/fio-3.30-r1.ebuild
index c5fa566adf93..e132b2991d2d 100644
--- a/sys-block/fio/fio-3.30.ebuild
+++ b/sys-block/fio/fio-3.30-r1.ebuild
@@ -49,7 +49,7 @@ DEPEND="${RDEPEND}
 RDEPEND+="
 	python? (
 		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]')
+		dev-python/pandas[${PYTHON_USEDEP}]
 	)
 	gnuplot? ( sci-visualization/gnuplot )"
 
@@ -59,10 +59,6 @@ PATCHES=(
 	"${FILESDIR}"/fio-2.2.13-libmtd.patch
 )
 
-python_check_deps() {
-	has_version "dev-python/pandas[${PYTHON_USEDEP}]"
-}
-
 src_prepare() {
 	default
 
diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
index 77c520432fdf..1ba5b72153a7 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -4,4 +4,4 @@ AUX parted-3.4-posix-printf.patch 2872 BLAKE2B 55c1bef638a88f7d3b5b1f90ca28df1d0
 DIST parted-3.5.tar.xz 1871824 BLAKE2B 5a63987f4d2c0bfd28f36112c2354f8dce7f87e962f4772bb0db34c070dd773b280959c6c33128422e8d60efe454c825401551c3c88541839b9a859a3d207f55 SHA512 87fc69e947de5f0b670ee5373a7cdf86180cd782f6d7280f970f217f73f55ee1b1b018563f48954f3a54fdde5974b33e07eee68c9ccdf08e621d3dc0e3ce126a
 DIST parted-3.5.tar.xz.sig 488 BLAKE2B 001d01be154b3c2fd232c6436d7a5d21a2d006a5b894aef1caff5297f993cae53fd6590a0eb3f40e34be5b5fcfbb20cd53d6c8949b8521f848bb7c0bde7dff0e SHA512 2ea1209325595416aa9ee27a0e85ca38bce50ca885d3b52ab1c1fb1b68b78d7887386ea3120274648056d2f1d9dca00b77236991765d84ad226c1b1f5a3f5c62
 EBUILD parted-3.5.ebuild 1545 BLAKE2B 2df6917d4a9f87c8479b6c22f999459227f7983ad01c5259ab8c7ade1f9803b76c079a4f976c559240420a90170118e05e3f459b3868648a8b69087b9dd2dded SHA512 7cea637e7a1dae97e3eb37e14093d840ff9bad1534ddb7e854b7db5320a3eed865dbdc1de94499c40a14bf1bdb3b28c4d981927cf42f897a1528f54311610bd9
-MISC metadata.xml 887 BLAKE2B 04b4f255209a5d1c26fe4d84eb6a2d0fe7b87ff30fb2cb0425685c277eecbc498a7886ec328fdf2456bc02af4d787cd7eed16e2a9a02c5b8ef8f146d3c551d77 SHA512 6cacc6560766381699e0c46241a9446260e984a78eb9c8d39486e699d4880e2ae712b199b628a3fcdfe9cd98cfe18b47198675e8546cf84d89fbe464e2ab1997
+MISC metadata.xml 993 BLAKE2B bb9a50448ba4bd971b4b9d9482e473004ff1b9b54a7e2dbf838e4745436da6544927c2f7e343bb1a83f2adcdf413a30ac0519b6aef2a72e4fbdde49bd89c930c SHA512 315a27fdc2a333892dcc59c39efdc7383f4752a52783f893516d66f83993c911d231d6da806dee048d8b76c96c4bccb5b2cb408ec5b0b5ffad48f7ddecf1b592
diff --git a/sys-block/parted/metadata.xml b/sys-block/parted/metadata.xml
index 8a1f1a642638..03724f258581 100644
--- a/sys-block/parted/metadata.xml
+++ b/sys-block/parted/metadata.xml
@@ -1,26 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>base-system@gentoo.org</email>
-		<name>Base System Project</name>
-	</maintainer>
-	<use>
-		<flag name="device-mapper">
-			Enable device-mapper support from <pkg>sys-fs/lvm2</pkg>
-			in parted
-		</flag>
-		<flag name="debug">
-			Enable debugging as encouraged by upstream: [The default
-			configuration] includes --enable-debug (by default), which
-			contains many assertions.  Obviously, these "waste" space,
-			but in the past, they have caught potentially dangerous bugs
-			before they would have done damage, so we think it's worth
-			it.  Also, it means we get more bug reports ;)
-		</flag>
-	</use>
+  <maintainer type="person">
+    <email>mgorny@gentoo.org</email>
+    <name>Michał Górny</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>base-system@gentoo.org</email>
+    <name>Base System Project</name>
+  </maintainer>
+  <use>
+    <flag name="device-mapper">
+    Enable device-mapper support from <pkg>sys-fs/lvm2</pkg>
+    in parted
+    </flag>
+    <flag name="debug">
+    Enable debugging as encouraged by upstream: [The default
+    configuration] includes --enable-debug (by default), which
+    contains many assertions.  Obviously, these "waste" space,
+    but in the past, they have caught potentially dangerous bugs
+    before they would have done damage, so we think it's worth
+    it.  Also, it means we get more bug reports ;)
+   </flag>
+  </use>
+  <upstream>
+    <remote-id type="savannah">parted</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index a7e02d5c9876..f0d51a5e0bb3 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/minikube/Manifest b/sys-cluster/minikube/Manifest
index 6a28f303dc77..95198c583046 100644
--- a/sys-cluster/minikube/Manifest
+++ b/sys-cluster/minikube/Manifest
@@ -1,9 +1,5 @@
-DIST minikube-1.25.1-vendor.tar.gz 104698545 BLAKE2B 2402594f1a876e16f36f4341136b71a84a8848c90d61789c85b1b962848e029363ec1efa051b0a08a28d38e82ee5fd52ceb0f2836078102a22de0d9cff4cc041 SHA512 661cd0261535728a119d5a0fa5f15c535092ae870f094e85dd03cbb5449ccef89c64dacec02373a7097f0a81bf2c23a91254f2257c09db54cb48249a785d06a5
-DIST minikube-1.25.2-vendor.tar.gz 103616191 BLAKE2B 6707011b208bf96670649192aef0100bee5780bc3321b41eddc12a62b2d4acbc566a8cdf557dae4a84b501c67b31ac35c77effb808bbc3ca56d65e7727977141 SHA512 2e964be6f0708a41ae1aaf1d47eabad8acf13ffafc5ae56cfd66f81ef94673d9661654c807bf2c8790ce5336f95f9fce377b82905e229e4d3534ed5d2622b5da
-DIST minikube-1.26.0-vendor.tar.gz 104726099 BLAKE2B b8dce4c567e370219c568e9b8298dc7d9b9e3b53330d644e943876683c19a80dbb77a938e3428f8662ac55f2359c473920d081c6ac8573ea79e30989ea8dcfb2 SHA512 76b6bc5a004a29864de6a0574a6abed18de6b92fd8a963576a284c8245fde31edf57fc82636299f4acaed0e69ca2134ded2e5606ed64b1de8d1a247e8c83ffa3
 DIST minikube-1.26.1-vendor.tar.gz 104831112 BLAKE2B 532856492a6b7759d3aaccf9baf9dd603b81953d8691d4df5aef8a667cde13d4035728e31ba52d440fb18661be94cf406ff101eed1a9fe1e2b86fc845a9268c5 SHA512 d9efe06a4912df67543246aae92ccfae62d7e0e25480761bbf0705d2867481d8cd89ea2441bd318e5ce0d682deaf5b81ae3a40000c270a0d6884ba07f69909f3
-EBUILD minikube-1.25.1.ebuild 2297 BLAKE2B 0bc47384147196b879b400a72263c83397075442d2ce6c93da0931329473699b5d12af4c4c989ca74ef6b97d11b1949f2956334b34a1144ae6cdc5032e43f9fb SHA512 e596b9eaff277be0782a02de06bbaf4c56596294d37d68dd4bff6047bd99cb4cf06488a235f0dfdc5a78c887ec6018b8a79fd2a601acef0ca267a7f7923948e5
-EBUILD minikube-1.25.2.ebuild 2297 BLAKE2B a28cdbca5fcb3d6c5f26cc2cbee198e6f3da06b8897633c0000194e56d3deb283b014b819deeb5a4bf0ffa78d60dc61988b58cc3d31194505f1d1a7eb1469f84 SHA512 6766905da7fcdfc0468f949320fb04c68754aaec3583c37a6e6d61f6cf636df896fef49bad4889afd3f707d4e81c48815323fb705a5884e02bec3a3f9be46020
-EBUILD minikube-1.26.0.ebuild 2297 BLAKE2B 1d5328379eed8a9915c885a1fe3d4efe97c64fd2381632ac4c2f2dfccf5d9a589b2cef5e89fd1872d31c03085946135eebaab3a0cfa4846950cb33d07838e369 SHA512 6b1108d9c1a4b741189c68da4ac38e1e3291573da3f808650bf43305abd8b86d1a0e51ab54e4cd1632a850513428e92f70f0a91ac9c014bb623f7a12d07aaa75
+DIST minikube-1.27.1-vendor.tar.gz 105040688 BLAKE2B 7694ad7306b7bb9004f9fb766a6c1dea57970318433bc5c0886be9c261299cce5dd590188009ef2e19060badf9755f155f336e8224670040faa873802deffc02 SHA512 296ec071b9a906c17bbfd9c53a42d10106e20f71d5c16197b44fcb9ba8f4c544945e0eb21a06bc7bde9f6eeaad5a5a81be96055505acec9effb954df14ff5837
 EBUILD minikube-1.26.1.ebuild 2297 BLAKE2B f5f3f4b595803d92e0c7e3ddb38537a7d726793518a2463a6cb1b889221dc4103d65ed5d14a22196f76b939848be64930a09b4141274b7a6f2f66825a55f523e SHA512 c9ec7a8179a60ce1f24185457dd66c224520df0dd9e17e6999e394f26efa1970e7bad6d0dff368cc4ce420255c465b206f52ef680f8731f4b49adf83b28d0dde
+EBUILD minikube-1.27.1.ebuild 2297 BLAKE2B ce17f2f7add789348e408b725214237d2f2887b962043cf1e85f9baf37ab296a7df9431d724d4f57dbe8b3fb3a4a33a8317a4c6088ce16c2a61194cad352dd33 SHA512 04d7b25da5f213e32c839c4c58b37546d667d8c705fa6227dcb88223c2487d9afb3a87d81888ee69302ef20c1dc4a239562cfe4763d75952db445408967994c5
 MISC metadata.xml 394 BLAKE2B fafba25060bc4bb387492659132b39d8b4fd7fbc2136de870eaa87ab9ee3ecaea732093904a3c580b80150da5c47f445fe3b5f85716c343904684dd1fbda2b94 SHA512 da62983710576f02082e75cd84648e47e97d1aae6b25e862fc0c4379b07976ac2838684760b7aebc77e775ff631fc9a57fabfd7997831d2112b58ad010dcd31f
diff --git a/sys-cluster/minikube/minikube-1.25.1.ebuild b/sys-cluster/minikube/minikube-1.25.1.ebuild
deleted file mode 100644
index e51cece9f682..000000000000
--- a/sys-cluster/minikube/minikube-1.25.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module toolchain-funcs
-GIT_COMMIT=3e64b11ed75e56e4898ea85f96b2e4af0301f43d
-GIT_COMMIT_SHORT=${GIT_COMMIT:0:9}
-
-DESCRIPTION="Single Node Kubernetes Cluster"
-HOMEPAGE="https://github.com/kubernetes/minikube https://kubernetes.io"
-
-SRC_URI="https://github.com/zmedico/minikube/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 CC0-1.0 GPL-2 ISC LGPL-3 MIT MPL-2.0 WTFPL-2 ZLIB || ( LGPL-3+ GPL-2 ) || ( Apache-2.0 LGPL-3+ ) || ( Apache-2.0 CC-BY-4.0 )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="hardened libvirt"
-
-COMMON_DEPEND="libvirt? ( app-emulation/libvirt:=[qemu] )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="dev-go/go-bindata"
-
-RESTRICT+=" test"
-S=${WORKDIR}/${P}-vendor
-
-src_configure() {
-	case "${ARCH}" in
-		amd64|arm*)
-			minikube_arch="${ARCH}" ;;
-		ppc64)
-			# upstream does not support big-endian ppc64
-			minikube_arch="${ARCH}le" ;;
-		*)
-			die "${ARCH} is not supported" ;;
-	esac
-	minikube_target="out/minikube-linux-${minikube_arch}"
-}
-
-src_compile() {
-	# out/docker-machine-driver-kvm2 target is amd64 specific
-	# but libvirt useflag is masked on most arches.
-	COMMIT=${GIT_COMMIT} \
-	COMMIT_NO=${GIT_COMMIT} \
-	COMMIT_SHORT=${GIT_COMMIT_SHORT} \
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-	LDFLAGS="" \
-	emake \
-		$(usex libvirt "out/docker-machine-driver-kvm2" "") \
-		"${minikube_target}"
-}
-
-src_install() {
-	newbin "${minikube_target}" minikube
-	use libvirt && dobin out/docker-machine-driver-kvm2
-	dodoc -r site CHANGELOG.md README.md
-
-	if ! tc-is-cross-compiler; then
-		"${minikube_target}" completion bash > "${T}/bashcomp" || die
-		"${minikube_target}" completion fish > "${T}/fishcomp" || die
-		"${minikube_target}" completion zsh > "${T}/zshcomp" || die
-
-		newbashcomp "${T}/bashcomp" minikube
-		insinto /usr/share/fish/vendor_completions.d
-		newins "${T}/fishcomp" minikube.fish
-		insinto /usr/share/zsh/site-functions
-		newins "${T}/zshcomp" _minikube
-	fi
-}
-
-pkg_postinst() {
-	elog "You may want to install the following optional dependencies:"
-	elog "  app-emulation/virtualbox or app-emulation/virtualbox-bin"
-	elog "  sys-cluster/kubectl"
-}
diff --git a/sys-cluster/minikube/minikube-1.26.0.ebuild b/sys-cluster/minikube/minikube-1.26.0.ebuild
deleted file mode 100644
index e71ab0934cc9..000000000000
--- a/sys-cluster/minikube/minikube-1.26.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module toolchain-funcs
-GIT_COMMIT=f4b412861bb746be73053c9f6d2895f12cf78565
-GIT_COMMIT_SHORT=${GIT_COMMIT:0:9}
-
-DESCRIPTION="Single Node Kubernetes Cluster"
-HOMEPAGE="https://github.com/kubernetes/minikube https://kubernetes.io"
-
-SRC_URI="https://github.com/zmedico/minikube/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 CC0-1.0 GPL-2 ISC LGPL-3 MIT MPL-2.0 WTFPL-2 ZLIB || ( LGPL-3+ GPL-2 ) || ( Apache-2.0 LGPL-3+ ) || ( Apache-2.0 CC-BY-4.0 )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="hardened libvirt"
-
-COMMON_DEPEND="libvirt? ( app-emulation/libvirt:=[qemu] )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="dev-go/go-bindata"
-
-RESTRICT+=" test"
-S=${WORKDIR}/${P}-vendor
-
-src_configure() {
-	case "${ARCH}" in
-		amd64|arm*)
-			minikube_arch="${ARCH}" ;;
-		ppc64)
-			# upstream does not support big-endian ppc64
-			minikube_arch="${ARCH}le" ;;
-		*)
-			die "${ARCH} is not supported" ;;
-	esac
-	minikube_target="out/minikube-linux-${minikube_arch}"
-}
-
-src_compile() {
-	# out/docker-machine-driver-kvm2 target is amd64 specific
-	# but libvirt useflag is masked on most arches.
-	COMMIT=${GIT_COMMIT} \
-	COMMIT_NO=${GIT_COMMIT} \
-	COMMIT_SHORT=${GIT_COMMIT_SHORT} \
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-	LDFLAGS="" \
-	emake \
-		$(usex libvirt "out/docker-machine-driver-kvm2" "") \
-		"${minikube_target}"
-}
-
-src_install() {
-	newbin "${minikube_target}" minikube
-	use libvirt && dobin out/docker-machine-driver-kvm2
-	dodoc -r site CHANGELOG.md README.md
-
-	if ! tc-is-cross-compiler; then
-		"${minikube_target}" completion bash > "${T}/bashcomp" || die
-		"${minikube_target}" completion fish > "${T}/fishcomp" || die
-		"${minikube_target}" completion zsh > "${T}/zshcomp" || die
-
-		newbashcomp "${T}/bashcomp" minikube
-		insinto /usr/share/fish/vendor_completions.d
-		newins "${T}/fishcomp" minikube.fish
-		insinto /usr/share/zsh/site-functions
-		newins "${T}/zshcomp" _minikube
-	fi
-}
-
-pkg_postinst() {
-	elog "You may want to install the following optional dependencies:"
-	elog "  app-emulation/virtualbox or app-emulation/virtualbox-bin"
-	elog "  sys-cluster/kubectl"
-}
diff --git a/sys-cluster/minikube/minikube-1.25.2.ebuild b/sys-cluster/minikube/minikube-1.27.1.ebuild
index 317bc98d1b8e..bf5c38fc7857 100644
--- a/sys-cluster/minikube/minikube-1.25.2.ebuild
+++ b/sys-cluster/minikube/minikube-1.27.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 inherit bash-completion-r1 go-module toolchain-funcs
-GIT_COMMIT=362d5fdc0a3dbee389b3d3f1034e8023e72bd3a7
+GIT_COMMIT=fe869b5d4da11ba318eb84a3ac00f336411de7ba
 GIT_COMMIT_SHORT=${GIT_COMMIT:0:9}
 
 DESCRIPTION="Single Node Kubernetes Cluster"
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index acbc29bdc1d4..b1acb3a6b4c6 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 5b14d168766d..8a790567c1d7 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -26,4 +26,4 @@ EBUILD autoconf-2.69-r7.ebuild 1780 BLAKE2B 470eb76b486789c7f4b8d6b3402036b38cea
 EBUILD autoconf-2.71-r1.ebuild 2224 BLAKE2B 2196cf8224eaaa5ee2c6449c36d9690be996249a45fb65df8a0971404b6c56c07669f5388cdbe3bde4b35a2b711605e1fe6ec5b829e131eecdac9ce03d9de71b SHA512 f6ca241fa5c34c98d259b0c4d545cfebf0a3f934a40390eec6f81a0e8aca8998ea7ecf9a10fba1619f6279eaeb4e8f9e670d17ea7f1b978554a33f683e71a02b
 EBUILD autoconf-2.71-r4.ebuild 2401 BLAKE2B 06c1f0bd14ec8955942623c4bf903c579489091c6a4e755ea8ecd6be986f8545d96b5ed21abe0db83252060c9c453ce9e86b0e8405e81ddcdbca6a5951413863 SHA512 625fa2a93478cf93d01c5e93a0d7ddd60ddeffd9e3519569201b9f49504a3f996996489b18d477cceb1694072440e0bf034ebb7d7a257e446e0d342bbdbc2439
 EBUILD autoconf-9999.ebuild 1417 BLAKE2B 3e12f2c9b86fdca9fa2853149e42b92e2d23e4787153ca21031be8ded48cb23ad394b9e3a89cd93e56942ed2838d36021d4d4c7a8c3dbc46c3f8ed9279b7402b SHA512 eda5fb951fea1daa331ee1ebb6a76636a3bbe06db0780c87162ce3354fa5265c040fbe237d0c05e267c97b38d7e491331b770441babe6ab6fcf1c89e471246d8
-MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
+MISC metadata.xml 343 BLAKE2B e5fd0138606384a4d646b618c096693858ddc94d09e0bb4dd3ecc6ef064a1edf9586f62a5cc753f680d73b2a6c72ed00739b21e54d490dd8edc97aa32dd05309 SHA512 6b06b7e7a5e47a4de92b2032ba3af669916818038802309e4db26917aa536387d2227feb33c29976179fb3cbb10d4b2f975d1055308e6db81a734baf1e8c1e5e
diff --git a/sys-devel/autoconf/metadata.xml b/sys-devel/autoconf/metadata.xml
index 73dda144f9ac..4ff4a48125bc 100644
--- a/sys-devel/autoconf/metadata.xml
+++ b/sys-devel/autoconf/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+  <maintainer type="project">
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">autoconf</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-devel/autogen/Manifest b/sys-devel/autogen/Manifest
index ed3ea4942d15..ac64618dd816 100644
--- a/sys-devel/autogen/Manifest
+++ b/sys-devel/autogen/Manifest
@@ -6,4 +6,4 @@ AUX autogen-5.18.16-rpath.patch 2990 BLAKE2B 8374f788feee898f35f6baae40d0a42a042
 DIST autogen-5.18.16-gnulib-3b57ddee0acffd23cc51bc8910a15cf879f90619-lib-verify.h 11231 BLAKE2B 4f38f6ae84cf5cc4ba47d8a7da3b38b06f58e30ac8b70f2b10936cbb7a775179b67f22ca8e636588515c4ace7410f98835218e3222d4a793378cdafc4aa84d0f SHA512 b8ff80fd764a3f21040b0054e71a443e3d9ec18dd631843f2de999aa54776964b36366b35fd158dbbe5f2ece146fab12c6ff5008e18c52188b718c89972f867b
 DIST autogen-5.18.16.tar.xz 1046276 BLAKE2B 23f9e0948f24ada715fb2bcbbfecba768cf51d169ea3ff4724a97b18f598d2d7fb2ffa7e23919ec8dcc0e352f9d3280f3740dab279a0af1412919cf10c6cb0bf SHA512 5f12c982dbe27873f5649a96049bf019ff183c90cc0c8a9196556b0ca02e72940cd422f6d6601f68cc7d8763b1124f2765c3b1a6335fc92ba07f84b03d2a53a1
 EBUILD autogen-5.18.16-r1.ebuild 2179 BLAKE2B ff3c00f51e6987aadf1913a70161457438ddc7990bc88f01d13ad3a79ecb3f7b1af905a490b0e25016fa981670aa57522afecc975af000a7093e301c6ede5c6a SHA512 e02e57585d3b46675c01018aa00652a4632a7b80cbe24d2b1f94664f4a7bafcb53adaacd0a60cc38e36033139edcb9392d9974a7749bb3865f18a108b21d9f8f
-MISC metadata.xml 370 BLAKE2B 942f7f6c3c4a466667398a42eca7f4dd53f3333ec577c4b64cb35529b3dc35029f57cb395dde2e5ee4c54f97db6e1bba56d0e3bbf3971258d8d39ce7d57995d7 SHA512 4dc996362fde89d1692027f1a6e9d3fc1f4b38b57c9a3938c931d2173205be7065c442d7a6ec27a49306a39183f0927d2e8714c2a8fd01b4f655918466c8fff9
+MISC metadata.xml 465 BLAKE2B d749ac3e74b39a006006e3f8d09ca2e8dd392f05385ffaf4d4d4cc95af4571c48e6ff6383e5f582ed6158d3536c9d9447c8f9587a8dc8ad9bce3ea3d5f8b2b5a SHA512 da4398891bf5ddd30545e5ca15b1591da5126d0ae22d00a5d5851864351c43465e6eac9010a9e35a029eb3009727fcd3264cb4fa87fd1f6545639f90b9cf2a47
diff --git a/sys-devel/autogen/metadata.xml b/sys-devel/autogen/metadata.xml
index ab5727db0a55..8f3ef98f5bc0 100644
--- a/sys-devel/autogen/metadata.xml
+++ b/sys-devel/autogen/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
- <email>toolchain@gentoo.org</email>
- <name>Gentoo Toolchain Project</name>
-</maintainer>
-<use>
- <flag name="libopts">install the libopts tarball (a few packages want this for developing)</flag>
-</use>
+  <maintainer type="project">
+    <email>toolchain@gentoo.org</email>
+    <name>Gentoo Toolchain Project</name>
+  </maintainer>
+  <use>
+    <flag name="libopts">install the libopts tarball (a few packages want this for developing)</flag>
+  </use>
+  <upstream>
+    <remote-id type="savannah">autogen</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index a081bc12a7cf..16aa565337ce 100644
--- a/sys-devel/m4/Manifest
+++ b/sys-devel/m4/Manifest
@@ -4,4 +4,4 @@ DIST m4-1.4.19-test-198-sysval-r1.patch.gz 6292 BLAKE2B 62f52c8bb75e7b8f11e48790
 DIST m4-1.4.19.tar.xz 1654908 BLAKE2B 08694485a49c542761fa9a7db4d7609f4dfb08a5c6b785b57f2e14cf1f696c2a1c788bb5eb934e8159a632b63ff071dfe42511d0109d7b1828f46d33c8bf416a SHA512 47f595845c89709727bda0b3fc78e3188ef78ec818965b395532e7041cabe9e49677ee4aca3d042930095a7f8df81de3da1026b23b6897be471f6cf13ddd512b
 DIST m4-1.4.19.tar.xz.sig 488 BLAKE2B 99e89b1ed0bf158d29a652392fb122e23227e895c75a8c63057ebe33f11b433ab205ae99a991578a89df8c3e723fc00669d8cdb290fbc86eaa6c704b112e4370 SHA512 d6ac9c6a54c57e9b53fb3e34a60d49df2f46a6e494da0a0c9ae8246b984e68a853b5d8c42677c1a0485c3f36b0bce10a481d3775c0edc1dbdfb27b43545bc31e
 EBUILD m4-1.4.19.ebuild 2640 BLAKE2B ae589e2bb491aff271a9bb7b6fe6ad937de4bb3e079f215a987bb719ff6db7dac2c42e1d439c524876f991dfa4c41fc93cd08ce984942dabae6a20f9b7ac9eda SHA512 2e715bd882e41244821f4b04ab6675ff3b0ac20f1c604c1c4a86e17fb7640be42781a6d5f6a8f260d304cf1cc694c04a40522daadebd56043d7c7f901dbade46
-MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
+MISC metadata.xml 337 BLAKE2B dfc1567438a22dc64fbcd7c88e0840408e11b95e718134a839e1a9b526d6b618a40887c55097c8a36fd1757f9affe6acf07bd761efd59e372b95dd52110146b9 SHA512 066643eb5bc9f637200a19197c3c4825f3e032c568c0bb440b21c0b337a3ef30f69a1a1a4b38929b19ef22f9fd25d0f86079a11b33f7d1832165d216d269538d
diff --git a/sys-devel/m4/metadata.xml b/sys-devel/m4/metadata.xml
index 73dda144f9ac..dce0ffc83fe5 100644
--- a/sys-devel/m4/metadata.xml
+++ b/sys-devel/m4/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+  <maintainer type="project">
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">m4</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index cd0f88b41295..0afbf3ee0453 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/ddrescue/Manifest b/sys-fs/ddrescue/Manifest
index 546150074d0b..e786de3e5aca 100644
--- a/sys-fs/ddrescue/Manifest
+++ b/sys-fs/ddrescue/Manifest
@@ -1,3 +1,3 @@
 DIST ddrescue-1.26.tar.lz 91930 BLAKE2B c545499e380587729eb3fcc90a7baf66288348dc88027dfc14401ec72254cc786d8ab7be076a346964327668ff719048dada916c9f1514a765a255f02c5666c7 SHA512 bbe414563d459a1ad1c4e55848214d195e01f8bc455104eddbeff7046623f5bc21d961457d27ace2605d13dff68c7948182706b8afe6755e5c363e8cad86a1cc
 EBUILD ddrescue-1.26.ebuild 882 BLAKE2B 50103fcaaf576b03288821646cc18471c51239a28e8632c5c7aea8e9d07ae727317c14d81bf51839ed00fc4eb67f0887e69c44c354eec25d7c640306cc59699e SHA512 2c315ca5d457e99f4e180f697eaddf64544a51b7aef4acbc63a75611b489934dc19449d36da334f36789185f76648ab33bd65e8da66d2f5f4aae7fdadd5d3442
-MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
+MISC metadata.xml 331 BLAKE2B 3bc259d88e09ebe602e8a983da993ec81aa730a4926ad656ae296370f0dd4107d347120160f4de3a0ce1e049ec2e582697028df9b17e7250a3a183a47e79fff6 SHA512 2ea82a90930c6e48240abfa005e31e07a83357122dbe29189c4e3ab22c7c1c039673a9a072d94f19e2ceb32e6e183fb7bddb5808f8d9a2f6d8d85ceaf2344113
diff --git a/sys-fs/ddrescue/metadata.xml b/sys-fs/ddrescue/metadata.xml
index beac02a9af14..2bdb11292283 100644
--- a/sys-fs/ddrescue/metadata.xml
+++ b/sys-fs/ddrescue/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
+  <maintainer type="person">
+    <email>marecki@gentoo.org</email>
+    <name>Marek Szuba</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">ddrescue</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 68c76b6ea3ac..778bb25b03ff 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/freeipmi/Manifest b/sys-libs/freeipmi/Manifest
index dd7b7418eb99..ec417748923f 100644
--- a/sys-libs/freeipmi/Manifest
+++ b/sys-libs/freeipmi/Manifest
@@ -7,4 +7,4 @@ DIST freeipmi-1.6.10.tar.gz 3431062 BLAKE2B e217570d8fcf78ca9d04aad4d5bd46b4120b
 DIST freeipmi-1.6.9.tar.gz 3429566 BLAKE2B 68ee7bd27d459a25464e17d9c98370252d33961d10e69675505f046db26a95d780c114b4f90eeab43a39d0fca3d98b1f108c6d3ca9550fd9d3c455d2e9a79c6b SHA512 536add8dc01aa4d9df45e3499f8be1318185b19beb579c8f991a11ca973626d7e0aabe1d8760a9addadc418ea5c1e2b5432053e46ba94fd9078fb6dcabf48280
 EBUILD freeipmi-1.6.10.ebuild 2600 BLAKE2B ff5893435ab4ea77d407d608194cee08ae23d3eb478b9f43cdff67a342c9cf79b3fc37a5a6b8e059606e5a39409f83a2e997d9c9e6d360484022839f224afa19 SHA512 f7d4686b8ab6b8a770c2d90e315dfa52b67a9d0acdf9e73e95abee33f5e8f615dbfeb1778b47c512c08cb65a6750a993c1947bbafbdd8457b845f41d10cc23e2
 EBUILD freeipmi-1.6.9.ebuild 2455 BLAKE2B 925c3025b4b87099a9a1c0c3c66504e18adbdddddd828b9c96171f59169c074e6f748961fa961a59aab3285da14a7f6883ee71bc022747ab97e328274602f4d3 SHA512 6086561f0620730d2c09ab4bfe8867bd2dc552891d69abef519da2d5ac8fdb8bea505adbfa85e3f3a369ac3d21b2fb7ea4a0419bcfb9194f6401860bc08602ab
-MISC metadata.xml 491 BLAKE2B 68ef286925ae73be1785beb6a1f2f5727cea6e4ea68df81830c815a83dceb3c908cf1806641fe033c9e303f04be55344e3f057fde38195b2d6d6d247dad1ef60 SHA512 b0a60f96c4d33aa6655ab785d51abf2ace6f94bbb7c07766c6b9acf176efbd9008d4b8fbf02c7372f4b52eab1b09ece7c5469328003bcf353330b9e053dd5166
+MISC metadata.xml 569 BLAKE2B 80068547ab42d075842e19f6ca65c9aa4b7c25aeddffc01a179e02fd6364804eefe3b7aa26434756de638f22a19da815d8b930a7d5bc81048e228ee72c81cd3a SHA512 f910ad6c63c49a2f2ddadc82c202cc9cf414eda5babdbe675048c6a5c2df4f093663ff8cf99da69563d4c67fa8bc0c18bfb9a8b8a752f8ce63bd1de8feed52e1
diff --git a/sys-libs/freeipmi/metadata.xml b/sys-libs/freeipmi/metadata.xml
index 71d6d4eef727..afd59dfd46f3 100644
--- a/sys-libs/freeipmi/metadata.xml
+++ b/sys-libs/freeipmi/metadata.xml
@@ -5,7 +5,6 @@
     <email>sysadmin@gentoo.org</email>
     <name>Gentoo Sysadmin Project</name>
   </maintainer>
-
   <use>
     <flag name="nagios">
       Install a nagios plugin to check sensors' status.
@@ -14,4 +13,7 @@
       Configure whether or not to check for root access in ipmi tools.
     </flag>
   </use>
+  <upstream>
+    <remote-id type="savannah">freeipmi</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index 5a530c1c0a20..3141e2df64c1 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -1,4 +1,4 @@
 DIST gdbm-1.23.tar.gz 1115854 BLAKE2B a47746577cf2f3c9b62faea496c4d6a50a8f1b0a5af448cb2215e90057c99b5b630ba3f5357c85dfb7fd98ba4e90969e30a779120c29106ed1e8736721f9bec1 SHA512 918080cb0225b221c11eb7339634a95e00c526072395f7a3d46ccf42ef020dea7c4c5bec34aff2c4f16033e1fff6583252b7e978f68b8d7f8736b0e025838e10
 DIST gdbm-1.23.tar.gz.sig 181 BLAKE2B 34785e6fe8e02100084d61e989749ee388794b8af82fc59a417140807bf169c45c15935f8cf91d0ba116dfdee295e05b2b014f1539f1f128a57acfe59010d34d SHA512 6653751c04584f10aa3325bd1cb5b9f7970a786dd2a99602ea620c11a86a9ba5c342aa52627bd06c03da822e9e1600dc034d9a8f42856a287fd67f6b9f161c71
 EBUILD gdbm-1.23.ebuild 1544 BLAKE2B 25dcb8d847d5b47097f71f4d1cd497f82f7b0bcb952e399b7c44071b35919c48f24f9ddfe2c9ffac1859dcb1611392dcafd3f3d4a0845bb8ca9eab9947897660 SHA512 4dae3742e5dac3196fef3ab0fbf7d95c1262a79ce1f583c78f6eeb716608ae4f7bcf9c0322fca78e03a00dd75fbfe400850b63f1e1470784d166beb03569d2ec
-MISC metadata.xml 360 BLAKE2B 4133eee8e152f330b954a1bcc947747364b73301a0bbb5c26cc88f8d53fa816a8b16e34b06a79859a19975bf45761dbc8bd73b6b6a875587d63624ccd737600b SHA512 5f8de97ceb589c6db119d81ef7e662042b288d2fca0ab1d1f8fef714dcb2087cf5f87ade607f7a18790fba02579a9ec5a84edb0482c83b7181e7836d108eb9d3
+MISC metadata.xml 452 BLAKE2B 9688553eee24115f83128016ef5a5ea8536c34bcd18eb0ee444f897db05b38522a6b1332c970b906097178746bb075a839ca5e4a20871601f577204e8144be01 SHA512 f52ce70540b144b749baa59c87fb6d2582ddb86feb19938ca7d0a85d70e19bc85a6013885a9c2a2fa6dab706d5eddc6a6436d9bf879e04b2f3dfb9891c353a4c
diff --git a/sys-libs/gdbm/metadata.xml b/sys-libs/gdbm/metadata.xml
index 12136288f7bd..931542e3ee05 100644
--- a/sys-libs/gdbm/metadata.xml
+++ b/sys-libs/gdbm/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<use>
-	<flag name="berkdb">enable compatibility layer for UNIX-like dbm and ndbm interfaces</flag>
-</use>
+  <maintainer type="project">
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
+  <use>
+    <flag name="berkdb">enable compatibility layer for UNIX-like dbm and ndbm interfaces</flag>
+  </use>
+  <upstream>
+    <remote-id type="savannah">gdbm</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 63f8b01eec47..7118733504d0 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -18,4 +18,4 @@ EBUILD readline-8.1_p2-r1.ebuild 6493 BLAKE2B c1ee458f0da6071892662004573330e9ef
 EBUILD readline-8.1_p2.ebuild 6266 BLAKE2B df1a758c63118e9f8b23bbc6831cc2d3fb975e332fd4212d5b94cb6b43885d4d3713a664d4b11729d6a447b5c57808b07d40a426d1738b85874da7c7d7880006 SHA512 e8a21619d26dd11d4fa0b2d8accb9ba89405a9ae66f6ef7c73a3122bb25b769f013691ff1688583a560911da303c15bd85f2a7863b41ec802607ec5f7df444ae
 EBUILD readline-8.2_p1.ebuild 7140 BLAKE2B e7261c466ab1c6d5e3b065fd975fc43f7cfb6a23705f04495cb0f5c5703c46f88adb4da54c5a1914203759c8ef8511f9fb414e756a8ad00178775af825c0259d SHA512 f26d4f79a78cb5f674b2cd98aac61cc58c64a2789ebd3514e57dc1f976c422d1d1e95e4e0a3e8909ee38bb1990e2516084ccc780086393f85b0f24d78d3e89cd
 EBUILD readline-9999.ebuild 7140 BLAKE2B e7261c466ab1c6d5e3b065fd975fc43f7cfb6a23705f04495cb0f5c5703c46f88adb4da54c5a1914203759c8ef8511f9fb414e756a8ad00178775af825c0259d SHA512 f26d4f79a78cb5f674b2cd98aac61cc58c64a2789ebd3514e57dc1f976c422d1d1e95e4e0a3e8909ee38bb1990e2516084ccc780086393f85b0f24d78d3e89cd
-MISC metadata.xml 473 BLAKE2B 95401399d6edc2a1a28f9c0f42123b07568d5c517c49be38eff09e1f23a9b5df4d5b302495db8880c8ed65081ea2920f194e6b32402ab0d6049221e9ee6a4eed SHA512 e54e4ce57f3178aa8646acb6798f46074eb33173ab63d61f62bc9ab1d35ef823ce9ee3e173234f8866e2cb635519869c76a449f5073c3a5b7cfd29cd23c16462
+MISC metadata.xml 533 BLAKE2B 2324b38d79697509a98d761cb8f91e08934b419f71bfd65cf09149773e3f44e8ff153d173cb1af80ccc4c10c7c65103bba5ca797f3b18b96c13132ffd777049e SHA512 5d66a8a464db16ea8afebeca7102632629486ccd4d348821ef693abde571c8a70a6aa38e9b563ddcfe93950afc38f63d2cb4239c645d97e92138a0c1e5c67f00
diff --git a/sys-libs/readline/metadata.xml b/sys-libs/readline/metadata.xml
index c54508aa76cf..d1f832b0672f 100644
--- a/sys-libs/readline/metadata.xml
+++ b/sys-libs/readline/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<use>
-	<flag name="utils">Install rlfe (ReadLine Front-End) helper tool -- a wrapper program for making any stdin use readline</flag>
-</use>
-<upstream>
-	<remote-id type="cpe">cpe:/a:gnu:readline</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name="utils">Install rlfe (ReadLine Front-End) helper tool -- a wrapper program for making any stdin use readline</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gnu:readline</remote-id>
+		<remote-id type="savannah">readline</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 55dab0029210..4b22e0ba8c66 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/acct/Manifest b/sys-process/acct/Manifest
index 4d3fab489305..32a656e7722e 100644
--- a/sys-process/acct/Manifest
+++ b/sys-process/acct/Manifest
@@ -5,4 +5,4 @@ AUX acct.logrotate-r1 304 BLAKE2B 60ddfe6b5a8fdf75c82bdf43308ad6f2e1da0c533e5322
 AUX acct.service 382 BLAKE2B 7a777c0d9195676d897bf95087a3af2175587e365969956de0d458e842144b6fa97c3e7e1bac402467c8611ef19915c55b562466104b6cbc75279225870c25dc SHA512 8c2523526eb3185765eac62676761af6758d0090d68ba48aeacc59c7a45f0722c867fb97d02ff3ceaa8d77637d2b915938d545f7d782e4f7aa46861f25364bd3
 DIST acct-6.6.4.tar.bz2 671480 BLAKE2B a5745d89dc4972756cb136572e90eee853e09c0d888d929993f724459616b5cc36005b6529eba3f503e1d3401bb852321e9274591e02ce30d60e3da16d10fba2 SHA512 aa1e47186564771763a794cfa06e53cd73f2f3961bf31270f3a9e2cc93d6e20af55938ab5573d37908b05572cc7dc752c300b703c2080293e07153fed278fc55
 EBUILD acct-6.6.4-r3.ebuild 1145 BLAKE2B 42e033009e1f010fd1b0124d749faaba44d0197cfb95f0ffa2073ef4f5c17daa8d2bdc74976825fa2c756801ef65abed95dfa1c0bb37a449126b3177e915e3f8 SHA512 a1d77fa3b8dd555f3c28068d91930112b68af28ae8538ab345925ccad30c306601f8d9593853e794ec2fb195b713e804bb7d774e19462597a3debf838b799e89
-MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
+MISC metadata.xml 339 BLAKE2B 71c383849cd1dfbeb9f0330d4f5b2aade51931fc989f310962734fa2ae32566db5e7d702b3ac80dd3552ed04b0d6917eaed31b2a9733a6973469d5ac5f4c0900 SHA512 2de031ec151c48c284aeee18c1084b92f1d8939dd70315b67eef1dde7cf31e48cf32679ec857096f151efc3b8bd2155c64dd2b6d37c3a41471967fbd7f2038a3
diff --git a/sys-process/acct/metadata.xml b/sys-process/acct/metadata.xml
index 73dda144f9ac..0916c7c280b1 100644
--- a/sys-process/acct/metadata.xml
+++ b/sys-process/acct/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+  <maintainer type="project">
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">acct</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-process/time/Manifest b/sys-process/time/Manifest
index ba1d68f70331..c2e10648206b 100644
--- a/sys-process/time/Manifest
+++ b/sys-process/time/Manifest
@@ -2,4 +2,4 @@ AUX time-1.9-implicit-func-decl-clang.patch 745 BLAKE2B 1c57ebd35cec042680f9b8e2
 DIST time-1.9.tar.gz 596779 BLAKE2B b48c2def2f7aaa79ddb8838ed9e103dd7b1b573b6084d1481838cac86eb7930b3a231469936ad23d5096e576ea728e821defb27fc8b3f9187809e3f5c01b7c57 SHA512 5c6dabbbe71e9103a47b892b86bb914c1704122d4fe7dff1e2cbd28503297163118d295077d8e062b035d673a1f91c36f8a45c7383f374fd766942b32bde4406
 EBUILD time-1.9-r1.ebuild 520 BLAKE2B 46b4298a003a94a3f88ed9272f4543bc9ba1742dfa46d4ea2924b6c33221b4beec38ff59cff1cf3af52073b213db47e7638e29790b2215b62936c870aa5181f9 SHA512 c4a6847d262b10058fbfb07167890c108c38185abe1a014872deca3e60351e509b07477ed9a188e2b3b299b07b6a6063064115cc5dc8db1a6a28c2330f9bd16d
 EBUILD time-1.9.ebuild 443 BLAKE2B 5b0dd86e6a9d102788dc07aaa993aab1eb72e6ada84aaca2318969e81747bbae9976c4e712571f73bdc3e80150409a1fef86e34301e3f1ae4912b22e14ea09e5 SHA512 9b000d7bb73f3bf656ea243302aed03d36f199cae28779f19b28b180fbf00f730e80c8cf2450559b3473b9492ebdf109ff8147ea1c6c865991908b15423816e3
-MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
+MISC metadata.xml 339 BLAKE2B 1e7806e72f2f7d1e3b4ea9a6d20c2804b5dbfea18b7ba0f33d42b8ae14f44bc2da106f63d90c792b0767749f4b15ddae8fb1e5f8c2c9c5f774e1e863a6ae2947 SHA512 e8ab515fd87601ba77e7a48f0bcba15747c5e3059dfd3d58ceccd3d81d69aa28fc63dc9e0846194413c9e076ce951b063b83440d404193208c7ad2de0b150696
diff --git a/sys-process/time/metadata.xml b/sys-process/time/metadata.xml
index b0d83aa2e489..0909b8bf8c1d 100644
--- a/sys-process/time/metadata.xml
+++ b/sys-process/time/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>base-system@gentoo.org</email>
-		<name>Gentoo Base System</name>
-	</maintainer>
+  <maintainer type="project">
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">time</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 981100699152..52819bf112ce 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 15874682569c..f56bb7afaadc 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,5 +1,5 @@
 AUX postinstall-en.txt 1285 BLAKE2B 09a372660022bda4064f2b298e6409be4d8f8943fd06d672e15c6126029acf2551b2eb0447f378a7c9287f757a820787ab6e592556e5cf199b0d8c0dd8f98f18 SHA512 8fa41aa39a1dfead723c87e6b16f979839dd5c585b9f9bb14a8a1ef556b69f9dcab113622b56c24890d1414df045b055b6997be02364ab4d5c7c06db2e4c12b2
 AUX postupgrade-en.txt 963 BLAKE2B c08e2ecca3d462d544549c80fb11abde670251002257d75fa8dd41d890f1327b08f1796c54125663fd35aca999f63b89035b610bdeedc32396c35d9d9b92ce4d SHA512 dbc86a1cf3b5280137322794a344818be8cfc137153f0e634e7bbd856ccb7ac589199353f2ccd5c28a8aa7d35cc2e041137bfc5d812fc6267efc758a1113c2d4
-DIST wordpress-6.0.2.tar.gz 21172479 BLAKE2B e537f628a129bd848db425129d49738c977ff882c89bc16633ba04f9d3733a164bd6699aff3b7a804deb13f9ee42d74ac89fa3f4d50bfd7ba385859d8822d27d SHA512 4a7c9c64e154a804c3dd0a308c3b8d9ef62918656f7f324bc329fd7cf4b340abd2252495f15869aece4f0649d18bd0f43955e6b343a4b68ec2746d07b077a1d8
-EBUILD wordpress-6.0.2.ebuild 1368 BLAKE2B 68aa2c644a238675b3b6b7c1f04cfa44afd113e71f52b925543923c73dc0671bed50c7e1580fa75c7a677ac709e173f0ea265c47f5dc9e9af08e65aed8cf30ca SHA512 28abf3d321a795c5cc9f6ce51eb7f3b8571c9890f7c04ed062263d022188d8c8cf4a808b2c398aaf1bcf67746e9046f41da701a8ef23e5550cdce2811782a81d
+DIST wordpress-6.0.3.tar.gz 21172651 BLAKE2B a0c4e07f6aa625f203689d2183ea6fd4d7743affbd6596b4ebd16bf45c67b16a8c8aab0736b603f9e9e9ce94d10243d7a94e59fc50f844575c36bd65b20df9d5 SHA512 febe05152b6a184add4e41a79d6a8747393a1b8cb4f2b45b30be4001f4ea81a04a042e978dd3a89789ed0bfd90b7cbb1e2ef9f82969a25b300746d59d4cf8427
+EBUILD wordpress-6.0.3.ebuild 1368 BLAKE2B 68aa2c644a238675b3b6b7c1f04cfa44afd113e71f52b925543923c73dc0671bed50c7e1580fa75c7a677ac709e173f0ea265c47f5dc9e9af08e65aed8cf30ca SHA512 28abf3d321a795c5cc9f6ce51eb7f3b8571c9890f7c04ed062263d022188d8c8cf4a808b2c398aaf1bcf67746e9046f41da701a8ef23e5550cdce2811782a81d
 MISC metadata.xml 429 BLAKE2B ece54e1ebae950843d98b414ca862ebcbf410230587eab84031e4afa00a9e6f0305b025a79fd5f8ce3cb70b2528adb8c5eee05e6855f0b2f55aa4680fd9a4b83 SHA512 acc7151db82ee83a7ad9b6eff62918afdc44436cd18aa4f5fe0b562257ed34ac7ca28582cfb5196b1049cb9e0db0a94c51faa8cd7c3bb081a5a0a2333391388c
diff --git a/www-apps/wordpress/wordpress-6.0.2.ebuild b/www-apps/wordpress/wordpress-6.0.3.ebuild
index 6ea3e4bf16ad..6ea3e4bf16ad 100644
--- a/www-apps/wordpress/wordpress-6.0.2.ebuild
+++ b/www-apps/wordpress/wordpress-6.0.3.ebuild
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index c5061a01251a..cdf14507d53f 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/appres/Manifest b/x11-apps/appres/Manifest
index c99726a51090..0dfd6a1a0acf 100644
--- a/x11-apps/appres/Manifest
+++ b/x11-apps/appres/Manifest
@@ -1,3 +1,3 @@
 DIST appres-1.0.6.tar.xz 118972 BLAKE2B 13e72b26ea51c937e988929626810421f705b7142b3379488b50989114748f5fb2a0d515978dc92c0d0634afdd2fbda1ee4e8f09a1637fc0e70320492d5a61fc SHA512 6d14f6a2ad5c83a4d42d4c51ec9a9f32652dfe7624881f1f41c0b1f4946904e7e5ca81a2fd9f4f4824488ce1bd2a4047f92320626bf33b0f1afc5e6b89d3e2b9
 EBUILD appres-1.0.6.ebuild 445 BLAKE2B 1ca848bcda3d438f18185fea90c30890a779c74eec826dfc63d6d733e83583fc3d53a71edbdbf00a86242dd73998066e37b48e23c06aab2855c0dc786e5ac2e5 SHA512 4e60de62f9d8b76d5c68fbf6316c8f40d8b7ddf0fd3ccb3b13ca25364e4fb41d975d5339410f0a38a4ed0fd5d21bf0c5f77c36f9f51c3531fd20572d975eea56
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 337 BLAKE2B 1bb45e9e090935f946b1f928ebb47e6211689a902a1c07377648e8bd648fbf859f84894e4e2d61de37bc25c27707876b41b197e793abe346623c0804fb7ac416 SHA512 16233775fd4d5863afc3c6b68a3f8e94584ad63a8d7dc388bcd07ea16ae8f307e108e74311bf9629a0aa602c325722badd07552a82e43b8286d953ee592238f2
diff --git a/x11-apps/appres/metadata.xml b/x11-apps/appres/metadata.xml
index e17a5bccb78b..c4fff40cf5ad 100644
--- a/x11-apps/appres/metadata.xml
+++ b/x11-apps/appres/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/appres</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/bdftopcf/Manifest b/x11-apps/bdftopcf/Manifest
index 52616df0e558..4de4e156a1e8 100644
--- a/x11-apps/bdftopcf/Manifest
+++ b/x11-apps/bdftopcf/Manifest
@@ -2,4 +2,4 @@ DIST bdftopcf-1.1.1.tar.xz 142716 BLAKE2B bef730ac65c0234ce027965d18b9e6e2bcfb8e
 DIST bdftopcf-1.1.tar.bz2 150815 BLAKE2B 2251b6daf090d61b6418bb0b76666e9dba65230c7a568bca6d3211869466921d6cb411820afd18262fb42fbc8b9d7118b3fe61b465b5bb00f8c93a17a6779df4 SHA512 7b790e8d512ca2812ac889c156ef91c48798b4744a6857e5b17e0128764b5afa8c5426fe5de05a9819d64745116718db4221b3e657e3c2633465e87179c44bec
 EBUILD bdftopcf-1.1-r1.ebuild 396 BLAKE2B ce09228426902ecf0345999518ad885f67a17b858e080699f8f6f1202f210e14d6cf0d4de569db535f339ffaed13e7cb10be004b78435ba311accf264a38a1f7 SHA512 485a56998546fb42b9d905736f77fa53f19a5f3527fa0748fcc8eb7ac3f6255e9282e7a2f3e8e2ca0224c826dbb0b68ea6c7c9cbcf1b5c3a8a7ab10919927fbc
 EBUILD bdftopcf-1.1.1.ebuild 479 BLAKE2B 228c5d6e366d606eb0bd2deb6d330ff289748136368d7a1df6c8c039eb075540883cd73df364ba3f8bacd1feabbb8a11c56533bb1bdc14a2de1e69f78e78a13a SHA512 e254d371a1fa31ca8945df69d8589891811ed511cec42c1756f2c8daa648ededd26ae0e996f1e3d6ef5b2891ef208801f252c9efec1f52dd4695713df51eec1a
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 340 BLAKE2B 2e0a214bb6e8a4a625ab5222d9c8a2a8724dfc846447f0515657fc9a1f9548b4212b12f021a26e0eb1f4ac0abce71ed131ce697882c83ae8128ae9de8ec39287 SHA512 1dacbc8993cc6b005ce5f0d26f0a6d7d08bbb629f25a2358a80607c84c5368856f63949f068747415128d1a880199d22636bc00184fa11d6aafe711cc2e505b8
diff --git a/x11-apps/bdftopcf/metadata.xml b/x11-apps/bdftopcf/metadata.xml
index e17a5bccb78b..f1b388e06f8f 100644
--- a/x11-apps/bdftopcf/metadata.xml
+++ b/x11-apps/bdftopcf/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/util/bdftopcf</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/beforelight/Manifest b/x11-apps/beforelight/Manifest
index ac463f20df1f..7a50a9ab92c8 100644
--- a/x11-apps/beforelight/Manifest
+++ b/x11-apps/beforelight/Manifest
@@ -1,3 +1,3 @@
 DIST beforelight-1.0.5.tar.bz2 119358 BLAKE2B ff4a0e0a28d3cc668611eaea8b181696986f92eb7236b336218d0392484738788db9c16e0eb6d16a106ba3b30d094be082c12da22c058a5a0afeeb76fcddb76e SHA512 f6cc794159cda89ac060a43d190fa72419dbcf503a97093b4c0f05315389085ff804c2891e00da2843709e97633973010165f9d68ceb0dcc76eed150f9c75968
 EBUILD beforelight-1.0.5.ebuild 344 BLAKE2B 76b349c867e402b3298a25e0bc45d414b0231dc75a7a33972c8f53aa2f99cc729bb8b475d6350c609342d0cd7d619c5650773bf147e1a275060acfe008fdd3fb SHA512 ce01df57580ac39084522f3d8306f0306a7d8525f781295273fd0f2e252b0dc3828654611a87eeb76f996fc9ddf6f5f4611326d818055a1ca3854f3dafb00f42
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 342 BLAKE2B 966dfb531c687811c5b0ba8fcac966ec9865150c8196b3ea7e88608f5403904bdc1a444b1e40a5bbf4dc31ada5b063d92277c79833a6ab92767101b83897fa3f SHA512 fc1a692b8dfe2ec4fbfe95150b9de582904382ccb72d1cdda536e9611692a7777ba5afab81870e52628111c5d7b1cfa6b2280da44ab79639fa1b54d280211f9e
diff --git a/x11-apps/beforelight/metadata.xml b/x11-apps/beforelight/metadata.xml
index e17a5bccb78b..60dc982b4c0e 100644
--- a/x11-apps/beforelight/metadata.xml
+++ b/x11-apps/beforelight/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/beforelight</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/bitmap/Manifest b/x11-apps/bitmap/Manifest
index c4696ca17dd3..fdc79242b8b9 100644
--- a/x11-apps/bitmap/Manifest
+++ b/x11-apps/bitmap/Manifest
@@ -1,3 +1,3 @@
 DIST bitmap-1.1.0.tar.xz 163560 BLAKE2B 411ae6d34059cef35456d7a12fbd2fba6de65d0ad551ea884463f123c0e034e89142f103793a1aa6602649b468e4d9ffc33450a67b592b9355c5878c712a4654 SHA512 3d6c94675f10772daeb71598c3e0ddcb51569b1bfc4771159e9df89599bfeb8bf49f464c24fef54d30a8f737af32136f859f844be03e088d24ed962f88381193
 EBUILD bitmap-1.1.0.ebuild 415 BLAKE2B 69c84fb8d6cb07093ee6c55ac3fdafd9222f1872e86561f31d3efad5b64173f7ccb1995d966e1889bb6211610e5fe8059fb7297e12b1b634ccf0d5db8135823e SHA512 13e64e90798e0ac07ddf82e8469f9697251460a98cff77c6bb0de641064143d4772f775256382cd0b004d45be103b7012d1801ac17217eebc04f6ec761663c2e
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 337 BLAKE2B 933823ea79cc877f5d103b54df5b0abd0d27d6a638bda455d0751143cae0e5e005b743bbd0bea0ce3b5770f20338a8c717d7332c2a481fdc15fd7e4b45905134 SHA512 793a48e84128052732c092f990854ff50e0d08a61b1b79ca19860ab0ec0243e9d5c5f8abd5a1da6ea9db687476d19165200ce45ce8fc0235660d6944cce52b85
diff --git a/x11-apps/bitmap/metadata.xml b/x11-apps/bitmap/metadata.xml
index e17a5bccb78b..a43915df2321 100644
--- a/x11-apps/bitmap/metadata.xml
+++ b/x11-apps/bitmap/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/bitmap</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/editres/Manifest b/x11-apps/editres/Manifest
index cc04a1d8267e..f42b2ec61881 100644
--- a/x11-apps/editres/Manifest
+++ b/x11-apps/editres/Manifest
@@ -1,3 +1,3 @@
 DIST editres-1.0.8.tar.xz 158476 BLAKE2B d0b2ef786e68ed6cf37e06bc776f6d6a104a2da2f68dbe27457e31a11d642d3946cd86667bd3ca2ae952c4fcc7162b86a69064a7dcd00ed16bb3e1f1c29e3e54 SHA512 9a007ed7a02abf61af8b65a163a7289a1e960db390db401bdfad162aa642e0eb887ecf85be14093efd8567c68f5e01450bb8321403a203a00065fa21985c7922
 EBUILD editres-1.0.8.ebuild 401 BLAKE2B 7bf015239308fd681173031d09935f16dbfb46e1655aae6381321567aa5e3ea04d1c854ee944c72a5a84dfa60d1039a5734ef8dcb953e7ef7c21fa9bf2269e1f SHA512 30abec4f0a835fb1668f500ee8587828714e9c6811f316016e5d1dd024db72aa0312907d0b6d496264197421adb28ac76a856f4975475bd30dbb890290e77ec5
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 338 BLAKE2B 790fb5662456b8e20806af34c8f8c5ad85a62d9e1f3c231f7c805a937a715c0a84a8c4a00079c55912cb2d8f3243ea7f1e4224cc42f8ac4a85d12996bdd65075 SHA512 5e174b0be90b7187fe9875437b91f8c3143d2bfc71719380d5a964e50788cf03cefb3f228ce95c61afa7ba3caaa772434dbf19cfc980260d43621a6e2fdb5bbc
diff --git a/x11-apps/editres/metadata.xml b/x11-apps/editres/metadata.xml
index e17a5bccb78b..4be58c3b54f6 100644
--- a/x11-apps/editres/metadata.xml
+++ b/x11-apps/editres/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/editres</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/fonttosfnt/Manifest b/x11-apps/fonttosfnt/Manifest
index ad06fca74616..b1915e7c3d7d 100644
--- a/x11-apps/fonttosfnt/Manifest
+++ b/x11-apps/fonttosfnt/Manifest
@@ -1,3 +1,3 @@
 DIST fonttosfnt-1.2.2.tar.bz2 146855 BLAKE2B 167db11bd49675d411ec06f5581edd7a87d0518755aba05b330db8d24ec1b5f142228c3b3a0be6a740fee8835a25523cd9fc4d7b8e915cc9d51fb95786254770 SHA512 ceac6ccb064043d46f9f16f31fb89c6cbf7f026d049f7b5325d6af97e809b4cd068e6149413bb328c0af601a98b5070e21d469888a6853f6cabecd5b46f60240
 EBUILD fonttosfnt-1.2.2.ebuild 363 BLAKE2B 1cc400ca963a7c9f5af45cb7e350821b7f72d45c887c5a29b6b1357f94836e0b06235fb5c914d2776ac215ad8708989fc142fc03ac827bde7e7725ace019f743 SHA512 9011ffb60cd5369544a212f3f6e67d7bb4438ce27673d99b592deefb670c66140c52eeb1edd13aaac9bbb481d378c1ce3ce2ce1dcaeda77ba4eb0d1b85e34c26
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 341 BLAKE2B 72f5a44fa97402013b2d58177bce616f39333bb3686ce594d1978290c7f62540c6bb4f6f05c99d05eddc479643b0fff49c37b17129c87fd9424decf94f7db0b4 SHA512 f2c638bea975ac0612eeb978d036901c23ca28ff50b11a5d03a28c92b0041b1e5f278bcfd33bc8ad479244ec03e4276ad0a331d0cbcc69e1de6b530fc7dbd610
diff --git a/x11-apps/fonttosfnt/metadata.xml b/x11-apps/fonttosfnt/metadata.xml
index e17a5bccb78b..c78a18f11845 100644
--- a/x11-apps/fonttosfnt/metadata.xml
+++ b/x11-apps/fonttosfnt/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/fonttosfnt</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/fslsfonts/Manifest b/x11-apps/fslsfonts/Manifest
index e29c8dffe014..e4dd3d1d72ff 100644
--- a/x11-apps/fslsfonts/Manifest
+++ b/x11-apps/fslsfonts/Manifest
@@ -2,4 +2,4 @@ DIST fslsfonts-1.0.5.tar.bz2 125650 BLAKE2B df08689dc452d07e895a93d5e755b3820b21
 DIST fslsfonts-1.0.6.tar.xz 123484 BLAKE2B af894405cad7351574c546bd3055dad9483b091eb2d9296e69167c1939d235cb8e539abf96b5c36c05a988b88e3cb70a20191bbdb7d9eec95534bd7b2fb68d6a SHA512 1181a8e6cc820410d1deac98b3e5097506e4168c6515307b6b9aaf705cb57193a009cb331a51d46ce68e9548712f122b5c942d5a1bc1e01bdd191b7b1beab09e
 EBUILD fslsfonts-1.0.5-r1.ebuild 301 BLAKE2B c5b4fa40580a60c7ce374069f070925150fb9e9632f294c81bc6840b5d146037efdb3c035c74445930f77a460314e3533a55d1fa7646764081be137dc76c80ab SHA512 eac96bf8e6653d2bd932d88aefe5e356ce1767b1713c019246ee96bea1149c1d70c69cb51ac65db994f15424000e2667091c93ec030588778e318bee8a61e0a7
 EBUILD fslsfonts-1.0.6.ebuild 330 BLAKE2B 3d171cb26cada56476afb935f72faa86634b182c887a1f1f67561b92cbf1b5ea4a468a8b620424f67bb7732144bc5bf377040e0702eafbd4247c1e111396bf2f SHA512 2adb8533b2ba58f757e06176efc9486b11737b80668deebc953335107b6c66d3157258fbf79fee64f3d6e355caeafabe528697f565e0e5c513aa9c0498fe2fb8
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 340 BLAKE2B 458367aba4b0a63c95da034806307a960cdb987ab8772e4f7eff50344a2977bf83ffd9662d64aa1c43a2aadbfba51532dab1726468ee97ab26205ae6149b44f3 SHA512 a5c5fc1a50e0edfc9a0e56ceda4929fdaf9b938ae5a404b3f650370b359cc645193a667e26e926be0bc1de793d7ca4e2072f1e460641517a0aecf2fb181b8fa8
diff --git a/x11-apps/fslsfonts/metadata.xml b/x11-apps/fslsfonts/metadata.xml
index e17a5bccb78b..4e3f4941ba1a 100644
--- a/x11-apps/fslsfonts/metadata.xml
+++ b/x11-apps/fslsfonts/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/fslsfonts</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/fstobdf/Manifest b/x11-apps/fstobdf/Manifest
index 9cf74bd1b2a0..71aebdbdd8d5 100644
--- a/x11-apps/fstobdf/Manifest
+++ b/x11-apps/fstobdf/Manifest
@@ -2,4 +2,4 @@ DIST fstobdf-1.0.6.tar.bz2 127170 BLAKE2B 89ed63541386d9f46ef839fb78be1cbfae4b51
 DIST fstobdf-1.0.7.tar.xz 122432 BLAKE2B a7d736a16fb8e7992c46ca2d74ac1897c0e2171d18f56837812f903db7035da5b8aa811ef7be8845717ee5c558bc88434e5f74a848d2d31c91bba5fb507e4ce7 SHA512 b303cc2060e8ccaa139e855a7d377d28877158efa1087eeeebf9f30f7c9962764eceab5c4044b4b508890413cf38546da9b26756dd27a142b806dcd6fdb6ba59
 EBUILD fstobdf-1.0.6.ebuild 298 BLAKE2B 5ffbf7a947e8c8e6ce7aa3e7e1a72bc5b192ecca5681fc8d34859b6a10f978ab2206ac95225bf4168bd1f4c944c6cbfbda268327dd33da32fbce77fac7cf51df SHA512 4f3b43276bc32c423d119a4525c7445725f3a07355339e24f95c68f65e404d96e414b6e2c66ae1b30885799d38b760432b0f6afa494a97c4d043e41669a0b7b6
 EBUILD fstobdf-1.0.7.ebuild 349 BLAKE2B 230ba03d6c70a81a0f6e5971f52bab15417faa9aa6947dd15705122f527a4a3e9813e6f79cab69e405a0344a31da6befda45faa747a625ae00ec058f1653fed8 SHA512 159b768020d63ccf625baf15c4cbee93a149e881c1faa279134c9f6cb004eda49d39d147000ff709ef734de8b4685f4e8f912684f0acb8c552a98103b22ff441
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 338 BLAKE2B 35d24ced4c0ed7e1232e0fe4ebe8c8156c9e0bc9243e8e65c6e301a37c5d99b72bdcd9e7d743372af7c213bab42aa31e30a261d742fb86de9c17a17e9fdce527 SHA512 de461c750d88627357aaae23e3b1bee9dea65397c418f79d0e3256942945790584852c777a8056a544b00b760e42023f621e667168dd25409e9354e2e083a6ed
diff --git a/x11-apps/fstobdf/metadata.xml b/x11-apps/fstobdf/metadata.xml
index e17a5bccb78b..e2188f40e9e7 100644
--- a/x11-apps/fstobdf/metadata.xml
+++ b/x11-apps/fstobdf/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/fstobdf</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/iceauth/Manifest b/x11-apps/iceauth/Manifest
index 9c7fe4594e22..9f5506ecac74 100644
--- a/x11-apps/iceauth/Manifest
+++ b/x11-apps/iceauth/Manifest
@@ -1,3 +1,3 @@
 DIST iceauth-1.0.9.tar.xz 130724 BLAKE2B 39848a28a289f38b43184bc579d8263509dc71bf78ed0a0282e8c22a9f5f468606308ca7785481ce7ff1b683d7854b15cbbadc6ff7c9d0c4d9ff4beef9598211 SHA512 16b2f58008587cf1544037ca8b1c76dbb75eb043b3048b3064e66ba6b147962233f1453c2cf18bfb136dd6dd21d3e27b5219e17e1ab7b81dbe93fb6aff801a72
 EBUILD iceauth-1.0.9.ebuild 435 BLAKE2B ea8b492c1379e4b4d70602eb3c1eb7a1ce0cce8ce55cde7c3cc55cca5793e6595582b3db8ead9ae97ac5ab79d21585d368e01c252f7db75b632837df6fd584d6 SHA512 6a5b15846f4e4b4e6cbb135dcc9652f3e2485f3ae049739f1c47a465bea0bf533554e0d24d0261ca46b2f879f97c0c625b7ad4f8692b0f115cf23b5d815c9d63
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 338 BLAKE2B 6bfe419cd899575e462da14afe1b022e223f387e1698e9ff3e3ee7b4f7bd8cf5521a9ab470c65932733f3fd8c981e7e6f6a7d0639e3a79f633c5ce97d91adaa2 SHA512 31e0c085f971046bb97a5bb30d76e50f080d0c5f9ca83578b4218a5130c37fc2750108ef1a247d8692a74d448ee600df07546a3edeaac70bc1e4061f20177989
diff --git a/x11-apps/iceauth/metadata.xml b/x11-apps/iceauth/metadata.xml
index e17a5bccb78b..4e49c7b8cc04 100644
--- a/x11-apps/iceauth/metadata.xml
+++ b/x11-apps/iceauth/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/iceauth</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/ico/Manifest b/x11-apps/ico/Manifest
index 00097e9017d4..15562c9b4aad 100644
--- a/x11-apps/ico/Manifest
+++ b/x11-apps/ico/Manifest
@@ -2,4 +2,4 @@ DIST ico-1.0.5.tar.bz2 136727 BLAKE2B 6c6d0a3e9521d9dad9f17f20ca7e1ccb52da31b6a5
 DIST ico-1.0.6.tar.xz 130032 BLAKE2B 21ee058ee22493832499fdbac327e51a10c468e47eb6f9dd6f5a3ec26af1533295bc16c0d7b212af49e85ba079a42813acd4e3ba8864c9ead0e7a31c062af724 SHA512 0ada451b8026ea10d1a5633f847b7bf833292e4cd01e3f1079d82c91fd142c06c6c4005b7146900ee34ac7acc8fd981db37ada9052dff49c2cfce995b9146c8c
 EBUILD ico-1.0.5.ebuild 301 BLAKE2B f82eb2b8b3c0214a8287eeaae5b0f2e7d026254287395929a6ce6cfdf6599510d59ab6f4b69cc7651272fde31f1804df1d7ed9e5221c10152d52b903c503b5fd SHA512 9cd528c4ec19e012fea9e4fa61eef12494a73cfd8d75f8dc23c5f47da921cc26e471d0d1d1dec7f1cc16f84e6c0399ddaf1068e45aacf7d95aa3936f8de6e508
 EBUILD ico-1.0.6.ebuild 350 BLAKE2B a3d9b2680b2926dbb6962c55a9e65b2b5efd5dd0fc074f68ffcebf20ad217e731489917422a1332168f24df98a8426a70b426918b0a2cbb2f5cb9649d5da6d81 SHA512 a47cf49e6f936eed9e94d865e9e7fa147f2cbf4fa3ec2a5729d7fe0dbe847c5d44b677d9f86209299a1d5035bd78697b3168e459e9a05e157370f48242f49c33
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 334 BLAKE2B 5c7174321960a48b75488e5aea0d5efac55063be3e219c2006bd3a9489379beba8d49cca34531baf80f7a01703fe932f1ac86e2ad07b5897e4ae01deee4f20c2 SHA512 8b13420f7d36d24a9d34db6253534e5a3f26c2962182576507e48e88be6507545359638f649900e7db42b2beed94f2ca8506b051cf2ae472a82f38c28d1421b3
diff --git a/x11-apps/ico/metadata.xml b/x11-apps/ico/metadata.xml
index e17a5bccb78b..2beba0c82552 100644
--- a/x11-apps/ico/metadata.xml
+++ b/x11-apps/ico/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/ico</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/igt-gpu-tools/Manifest b/x11-apps/igt-gpu-tools/Manifest
index 5cddb62060fb..0384e4ba4297 100644
--- a/x11-apps/igt-gpu-tools/Manifest
+++ b/x11-apps/igt-gpu-tools/Manifest
@@ -2,4 +2,4 @@ AUX igt-gpu-tools-1.26-lib-meson-build-Fix-underscorify-call.patch 1215 BLAKE2B
 DIST igt-gpu-tools-1.26.tar.xz 1573468 BLAKE2B 31fa9cd61fd9a120c72e78cb5ecbc686477ae82572c702bdd6bbc11ba49dc052b7cf52fa486b93e51c87389d73f892577c1d22ebe71d6f50b1565f32355021d1 SHA512 6eb67f68da1c79fac61e5abd57433ef51dbeb2b6f0923dc84aefb81d7059fbc94378fadcd7321a8f059edd9bac640032bf53c3aa058cf570fe5c31924396af8f
 EBUILD igt-gpu-tools-1.26-r2.ebuild 2568 BLAKE2B f4015c9e3eda65cdd3a207217722885f128187e4cd5fb266c635ec86f5b291c4c92cb5879a56bf4f6cd4c8dfdb8fb491c8684f523692043c1348667119663679 SHA512 d0474ff326e39c7d38e2594463204280dc93a667bb090b973d79b5799705c3616a8c06a68bb6c0f0d6086bc9888cbd8a9fec0b5f1498b6837c96799393b5ef5a
 EBUILD igt-gpu-tools-9999.ebuild 2469 BLAKE2B d0429ed068366f81159c777caa968439f8ffa3d2e959972b78000e86824d00eb9d4874de6b3be362c12ac5080640bc90731c39d00d0cd16bb6528849e3886334 SHA512 f3d964179851f12b3c3d77bb06ecc38fed0f3a539937609e2e38980f701c18e685df70620e693c2155a30078d6826ff877496112ce20fc15ea84199f7bb86462
-MISC metadata.xml 672 BLAKE2B 00c8c12ec3f3edb3aa57947b00ffd68dcc3f13901e2fb090e217cc954557d1e13802f71dec233d07501ea88e24a5fa9c84e669b0bb5f5d36d4649ea99727991b SHA512 24f16d407f48f21d85cbf38337573fb711ded60283b6766de02923ebe5f4e86e6ff044629518bfaba64a9f66c87c6597233a7227145f7a827934c72754224fb8
+MISC metadata.xml 805 BLAKE2B aba787b25bee30e978d8af424f9f604f8220ec0541b184f0a11d122b28e52979a55709efdf34cc97e3ef9b7477951adf1e75e34372530720cb7aa88fe023a483 SHA512 d2cd65759e6239926ff053c1f677868fdd57c46655ffb9b4e67c7a2f0482ed8d6950efce3cc6270ee1fe9e4ba4d6105fec25b8c26f6478737ff3492ebac12ccd
diff --git a/x11-apps/igt-gpu-tools/metadata.xml b/x11-apps/igt-gpu-tools/metadata.xml
index 3b40c2a32ff8..788ed3ce8017 100644
--- a/x11-apps/igt-gpu-tools/metadata.xml
+++ b/x11-apps/igt-gpu-tools/metadata.xml
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
- <email>x11@gentoo.org</email>
- <name>X11</name>
-</maintainer>
-<use>
- <flag name="chamelium">Enables support for building Chamelium tests</flag>
- <flag name="overlay">Build the intel-gpu-overlay utility</flag>
- <flag name="runner">Build the test runner</flag>
- <flag name="tests">Build and install tests</flag>
- <flag name="valgrind">Support valgrind annotations</flag>
- <flag name="xv">Enable intel-gpu-overlay xv backend</flag>
- <flag name="X">Enable intel-gpu-overlay xlib/cairo backend</flag>
-</use>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <use>
+    <flag name="chamelium">Enables support for building Chamelium tests</flag>
+    <flag name="overlay">Build the intel-gpu-overlay utility</flag>
+    <flag name="runner">Build the test runner</flag>
+    <flag name="tests">Build and install tests</flag>
+    <flag name="valgrind">Support valgrind annotations</flag>
+    <flag name="xv">Enable intel-gpu-overlay xv backend</flag>
+    <flag name="X">Enable intel-gpu-overlay xlib/cairo backend</flag>
+  </use>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">drm/igt-gpu-tools</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/listres/Manifest b/x11-apps/listres/Manifest
index 13764e90af74..5f0f0ae48b28 100644
--- a/x11-apps/listres/Manifest
+++ b/x11-apps/listres/Manifest
@@ -1,3 +1,3 @@
 DIST listres-1.0.5.tar.xz 119596 BLAKE2B 849b41415eaf7d5251d8fb1cee061e8272e8abd4df986b28737d0a215953be692fe3b0c008a0bf7c831c5c6664ab1402c5034b2685cd3d799bae77a0296b0f8e SHA512 caa3626773031fbf6d8bcc1f697afe6add64fe4a8d1d766c42d5c2346050869dd23a26a1718411134ab05c75835facf0786cab5595721a16df423cdc54dd813d
 EBUILD listres-1.0.5.ebuild 371 BLAKE2B 829bd7e06c2f9bf7875b50f3bec21686df179004fef9dd934963af03e3f4405b0bf20fe2603d4330ae1763911f6079a6296886c1841dea8d34cc5bda405583cc SHA512 14543c8990bdf548f291348d7d5eb4869e50b0acf55dfaec72140d1054809f5d1ddabbea85e6fceed532ae990969219c7f5e78d6e7b9045b02b5aabc2d139d12
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 338 BLAKE2B c5bce0e906a66bfa78171070f032be885a574e8f6c534a031afe638af052f1c1f86d8afde76f07dc0d000743c8eaa165ba6254b0eb15431ee12ff531019eea2e SHA512 373b6685aba76fa03326178dfd4f27fccc24f9f2e995901e179c4eea15610f693b436ee9199221d8d1199a41f0d02ee3e5b601d35c080584be6334055d599c30
diff --git a/x11-apps/listres/metadata.xml b/x11-apps/listres/metadata.xml
index e17a5bccb78b..19a42b7830d7 100644
--- a/x11-apps/listres/metadata.xml
+++ b/x11-apps/listres/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/listres</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index e3878b3b1cf0..49c32bd9015a 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -3,4 +3,4 @@ AUX 9999-Disable-things-we-don-t-want.patch 5928 BLAKE2B bad40e19e7779ba38918924
 DIST mesa-demos-8.5.0.tar.bz2 10367517 BLAKE2B 60e9edfcfe6d28f73964b81ae4e016fdbeb45d9d6d91de71bf736c86fa6181749f2e12729c8c716f6e6f5d4e39075de131877d1f09c3e511a4338b0f44ddb6a6 SHA512 df6a7f09638ca389d6e8bc569e599dcc59c9aa280bcfb95976d83e5cd3edfe74bb3a31f0953956dc16faa540ee5b09990e3377e1341d836fc527e50ace6e60b8
 EBUILD mesa-progs-8.5.0.ebuild 1804 BLAKE2B c453575100a78f7b5599698e6eb13b538314e189e892cfef3670e10b9aa6f7de83995046131e7002352176cf1c10b6a05ddd44d5df01d5dc29171ef78ca99d56 SHA512 f388241bbabd38ec926cfa71d12ba8c5d4e494ca3aa33c7f38786df59c8fd870be198096e7e619353ae1e979b379a8a784d84573e8432738172afa7a45df096a
 EBUILD mesa-progs-9999.ebuild 1802 BLAKE2B e000a568251ea02ac0abdbdc8102f05b7eee49633699c07dde71d6783d29b656fbda85b80aa60456692dbdb262a077636cc2d95ac80457c14f5ddb60844ed4b4 SHA512 4ce30ae2375e523dcf5ce89340bbd6ed7dd440d590ea8608b4bf5692e2108bda2afbe2730edffebe2a7c33c9befa995d53294ddbf1e5268fbc2a42b131f59a03
-MISC metadata.xml 424 BLAKE2B f6ce8f7bf4047dcb6cfdaf4c9098ce2a7b8b6ac9341afaa91b839e0872ed6db91228a145ba0b26ad733d1c857e251f17e986cd0872fab48b53ef0c289d790d31 SHA512 a2cefaa9364f67641cf69209942c6803cda0019d59019fdb022908b87d16f33776bd40d4ac484a2913f6f48906863deeab7a067c9c6715b1a15124c2cf926629
+MISC metadata.xml 407 BLAKE2B a57974ad1e8692dcd29d18592373de51fa793d25760d395f8f67d99d10046f71642d998ea1c1ed8c2b07f2e8cac55c0c4d4b2b3d37ed560e2bf73c22873c24cc SHA512 773c8b796384d95273f0847a6e457d2d19c083f1d0b6a472a1672ff39a6e4cc462b5116cfcb7527a91eb6f398ceea1a0cd26006725e1d9f2f0fd9269f2b45ec3
diff --git a/x11-apps/mesa-progs/metadata.xml b/x11-apps/mesa-progs/metadata.xml
index 0fd718e741b6..4f7f34493419 100644
--- a/x11-apps/mesa-progs/metadata.xml
+++ b/x11-apps/mesa-progs/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="project">
-        <email>x11@gentoo.org</email>
-        <name>X11</name>
-    </maintainer>
-    <use>
-        <flag name="gles2">Build OpenGL ES 2 utilities</flag>
-    </use>
-    <upstream>
-        <remote-id type="sourceforge">mesa3d</remote-id>
-    </upstream>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <use>
+    <flag name="gles2">Build OpenGL ES 2 utilities</flag>
+  </use>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">mesa/demos</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/mkfontscale/Manifest b/x11-apps/mkfontscale/Manifest
index 05dac7b4d905..e76bbc986648 100644
--- a/x11-apps/mkfontscale/Manifest
+++ b/x11-apps/mkfontscale/Manifest
@@ -1,3 +1,3 @@
 DIST mkfontscale-1.2.2.tar.xz 143436 BLAKE2B 796c6b95f4eb0959db93ccfb1ebae9c73afc618645d85b7ba382559fe4e008ece16c9d86ab32c815923cda9928f030d75c47f2dd5ee6c9857b9e861f9bab0dc9 SHA512 4c846816325347c91008d76b3a5610c1e58a8414fd55117e7ccf51310db4b20b8397ecf6c9177ff77322e27ee088bf034fd175c9210465c50b094bab8dada4b3
 EBUILD mkfontscale-1.2.2.ebuild 568 BLAKE2B 4d389938770f797b98ae26a21b22e98d96cbcb6d46e1d44c7d3c2fb98ae4cd500f6ff51d3f4f2a96cee0d4e7fdfabea8095a4e588f99335e08a3fd3b71745885 SHA512 0c170d405791a5229ef82ea9d1aab556a2e54b2129fa8f1595be5f7b6c1c7d35f60162e3981d8b1133dfde7b063f08316f719928eb3ce896412ff028499265d4
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 342 BLAKE2B 5937f65d98e050b0d560044d2dead3165da6eb82f2865cb61c39ad19e707a5842f95342db2665ee787788d270af3ca4be919eda8f6d19c77c2fa34fa47b15bd6 SHA512 48963d11b414e4be679a173c42023101acbc716d437e279ca8c342376ffaaaaa6210b9dff8cc98aa05794b9a10213d123dcd7985ab4821d12486ce30a3a1f4e5
diff --git a/x11-apps/mkfontscale/metadata.xml b/x11-apps/mkfontscale/metadata.xml
index e17a5bccb78b..dd8e11d48743 100644
--- a/x11-apps/mkfontscale/metadata.xml
+++ b/x11-apps/mkfontscale/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/mkfontscale</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/oclock/Manifest b/x11-apps/oclock/Manifest
index a09fd78e1727..b48018588b12 100644
--- a/x11-apps/oclock/Manifest
+++ b/x11-apps/oclock/Manifest
@@ -2,4 +2,4 @@ DIST oclock-1.0.4.tar.bz2 132835 BLAKE2B 8547aeb06ac33917d44f318ffaa38bd899b7817
 DIST oclock-1.0.5.tar.xz 126404 BLAKE2B 50bb5e1db1b2d268f1937e4cf9452208c5c1c72d6deeb08ceb7a639b43f7754b643827f757c168c8d9c81a30576b44b11f571fe4f3ac37a99eda01ce1f07d5fb SHA512 a87e89afdb25a91c36077e030b05c3907ddc063c6bdc0715a01bfc16edef8730b3b5a0347399ef4c8b2a13e70e068cba9ec5fe8d411f08548c0aa790a1873aff
 EBUILD oclock-1.0.4.ebuild 369 BLAKE2B 5eb189f12b5c763910228b34a3d3b8889285575fbef9708d9257775bda35f289499c59d4ffd742505175c84a8e87fa9a8d1e4f698a92a7bcb41390c54e74ef49 SHA512 c0895a5212451aac1d3f408323033077edb3b02fd984a08ff54b7fa69ce4dce50ed37dbbe031bfd84a9ca56859661e14db8cbcaa1fb90c2b23c9594f1d48235b
 EBUILD oclock-1.0.5.ebuild 421 BLAKE2B 42837008b50bb35ff40f7d58ba53984d011897b85b2837865799b70978192e57ded67c8216980ad0abec0be1d2fe618fcfd89f051e3b426ae569ddd1e89fc6c8 SHA512 185ddf320a6728d45f233dc4380c25ee34cd3a1fd00931b4765ba51f6c5e03ee699f2e064e73eb9a488e3eea29d725df41aceb17c2aa08fbdc24eda9af388a8b
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 337 BLAKE2B 1100cd4cba6d169fed0fc11e972b52e8c4582cf92a6505cc3aca1a5f077be6f5aceb15b3f3bdae463b724bf9c96a4fec7ec8e73e3df7734ee55790e62258b351 SHA512 555191541442af37fb67f2c2454fc318d3b63bde0d957234262425debf1297040f4b252209b0cace3594812e6158d4a27a62d00c02714c56b5f3a234d7d01ec2
diff --git a/x11-apps/oclock/metadata.xml b/x11-apps/oclock/metadata.xml
index e17a5bccb78b..593410a4bec8 100644
--- a/x11-apps/oclock/metadata.xml
+++ b/x11-apps/oclock/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/oclock</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/rgb/Manifest b/x11-apps/rgb/Manifest
index ff2ae66e15b2..1b539b450e6e 100644
--- a/x11-apps/rgb/Manifest
+++ b/x11-apps/rgb/Manifest
@@ -1,3 +1,3 @@
 DIST rgb-1.0.6.tar.bz2 139225 BLAKE2B 25e20d0be23a46d869869e47169d86dd50a99bc65551bf83800119c7f9cd242f41d5ecdb611467eaf9aeba909cebbfab8f578e0a5dc63380482f324124064bb4 SHA512 92c8885a0e1482065a8b86f7be890859a5eab6b9d57ff219e916cbbd10cd185deec1c5db25dae8c405a343ab0e2ddaba3ddfe0b567d06534405f102e1845654e
 EBUILD rgb-1.0.6-r1.ebuild 448 BLAKE2B f93871844f4493cfb4566fcd3115f4ccf3b4c6767d8c1d6f997b5e390c758b319c316d4fd7bc347d99bdb982d0a762dbb38e438b7e0a302b6ea7e8c23a9b6d3b SHA512 dd5226c5aad6a665f2023c79488507c4f594eb494be0829cd6b960dfb37aa51254ed0ba367c660b5a733b7801600fab69aa42606d7bcca3c06242f6e6d1014db
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 334 BLAKE2B 68a0b63d285bd840a4e3e0c0f01705d8adda0e16a4920e6591e60628e57897185d7a5b57959d02bea0ea24f92ee92a4f9b20d4394c0a187799cbf23d25210d97 SHA512 b8de5eb177f9002f75e2843cb0cb99e24fcefd5705f32c9a365c9111cd6559572689627ff30a0e004a1c27077cc1b856f4b44f116134c815e9b747398467339b
diff --git a/x11-apps/rgb/metadata.xml b/x11-apps/rgb/metadata.xml
index e17a5bccb78b..cf4629ff57e8 100644
--- a/x11-apps/rgb/metadata.xml
+++ b/x11-apps/rgb/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/rgb</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/rstart/Manifest b/x11-apps/rstart/Manifest
index 0b493d388a17..d40c663da623 100644
--- a/x11-apps/rstart/Manifest
+++ b/x11-apps/rstart/Manifest
@@ -1,3 +1,3 @@
 DIST rstart-1.0.6.tar.xz 144888 BLAKE2B d8ea7d48af6bffcbcd5c2f4ed4c6e7678f2d0ef17b5e104731c0a84fcd36d9c877b3f856a5137d066e671d1405d9ad21497c79885f02ba332fa059c0af59c3f6 SHA512 8c0840f172c9efade4557e9a28de19e76e510bd17f1e964936a957dde5ada3d9ae8b2fa0502f61da15cdfc0c69d3308599253ee03571017086a45e4e83958e8f
 EBUILD rstart-1.0.6.ebuild 289 BLAKE2B f6329b7b9c6328606355985f8db700c03140917b8b271e93c9126c1f57e4d8e1a565d2685992acb2c461cd6569586385398cf36654eeb9592d95a1025c1b1963 SHA512 ced3918781a4e6be2b21c27c5aa872ad90d22d07ae64272842b2543b9211c43a5f641e68ce34ca31341a47953a4d7d3eb8cb9a31dcc65d21ebf2021a5a5aa1d8
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 337 BLAKE2B aaa00240efe2461a905f2c278cff69bb1ab21ac7d86b2cc64967cb4559e3db25c0e4a8b4f34c7dd4350f7d9a67edb3d6c09c715aeb777f7ae2f066f8684b4091 SHA512 b2047917ee39493ff4fb5de81dfce4f547a4ccd01e7b4da1e2d6e27e25834b5d296108f4b5de4879e3bdb48567845ce632d00b3fa5140350abf771c5c1625b8b
diff --git a/x11-apps/rstart/metadata.xml b/x11-apps/rstart/metadata.xml
index e17a5bccb78b..47cb7310852c 100644
--- a/x11-apps/rstart/metadata.xml
+++ b/x11-apps/rstart/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/rstart</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/scripts/Manifest b/x11-apps/scripts/Manifest
index 75f08f5b1491..165080ab013f 100644
--- a/x11-apps/scripts/Manifest
+++ b/x11-apps/scripts/Manifest
@@ -1,3 +1,3 @@
 DIST scripts-1.0.1.tar.bz2 72301 BLAKE2B 2765ea1be05fabbbbf874399bf2a32fd778e5c57a98ef6c5135206d125ce29b7a02f7622205638e5c3a35fadd12211d46ef60e6c60b970ec924ec0bf97769282 SHA512 dd058c5d5b34dfb7b996e28c78ce8169809d9e0b0233b1e0f4f5ec223c62affe1e6e561869d7cc47948efbb56bd4b67f69e01f27e2133a15206fd3013c284226
 EBUILD scripts-1.0.1-r1.ebuild 460 BLAKE2B 2e56fa9faf8b83c30fe62317d8a34ba5aa08653e8c2a92ca5bfac61df14e5fe6fb74255c543c2e1d5e59a649d0f57e7531b7bf94246acb4c06227680468e1591 SHA512 8757d87d747c0ae91ae95582a949e8fcb60f7b25266db1d18cf548cb5db7c0cafde07057c7a0c7f93fb632cd299ae7de67244e53d62a217aef4e08583abed67e
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 338 BLAKE2B 2e7a3a812c32e6fe4d138ad2e11835ca0d39c71bbec44df5e5ef98cec703ee79099d82e54507d1d68336a577df1e2f1a9323069c2c3c56d7d31d3132c35bdcd9 SHA512 8aa8d74af656a13409a70c388fecce6251d0d1a3c7b14fb38ce97bde603fc13d2e8970bd34b01c85f1e5b8b13c1867e702f112b3711f7549c363293e4a14998f
diff --git a/x11-apps/scripts/metadata.xml b/x11-apps/scripts/metadata.xml
index e17a5bccb78b..13d89d9d19cd 100644
--- a/x11-apps/scripts/metadata.xml
+++ b/x11-apps/scripts/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/scripts</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/sessreg/Manifest b/x11-apps/sessreg/Manifest
index acbc9387c994..83e22d9129c2 100644
--- a/x11-apps/sessreg/Manifest
+++ b/x11-apps/sessreg/Manifest
@@ -1,3 +1,3 @@
 DIST sessreg-1.1.2.tar.bz2 137612 BLAKE2B 0fe6484b83255bc2b917645ea841ad43b927131a8ef3fa9a47e7864984259140579c462c8d03645928ffd4667e7c46f36c5eb1aa35ce916ab65126c55f6bdde1 SHA512 7e3c2bdcadb7133aace463b58d8c6108d315ec95d2a42509073eeddc7f02644092a4b3168bd3b426c041736a016291092e0bf8368acd620dbeff96d53d12f98c
 EBUILD sessreg-1.1.2.ebuild 342 BLAKE2B 18dd410d61579aae559212f87da1df1eab6341a4ec58ef5dbeeecb156cd8b5c39e6cf47436572ddc14b45dabdecee230b51f829c90af05275899aa023ca7881a SHA512 adbb2682970e45f0051a0e0b1c4e1f79e6af1df46a14e023f9ae742e6fd80f8d8d7c334382ecf4b8e0fc77842a112eae12384ff03253e0c6e6fb865daf8209de
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 338 BLAKE2B e25dd0f7e3bbffd2051258e976e618fd2b23dac5617e5623cbf3dc65dea14e2c92691ec4e4b82e9edc9b4ecef097255a94cd9ab822f59b29249d5f01fa16b913 SHA512 662e6497348739394cff1b169d96c777a0a247d041f04eac5180fafb04c790fff97fa5f8f5a460b213e4f280665e9bc9d9a6bc38e2e80d08da26bbc8a2f9ea8d
diff --git a/x11-apps/sessreg/metadata.xml b/x11-apps/sessreg/metadata.xml
index e17a5bccb78b..d20b35e5c2de 100644
--- a/x11-apps/sessreg/metadata.xml
+++ b/x11-apps/sessreg/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/sessreg</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/setxkbmap/Manifest b/x11-apps/setxkbmap/Manifest
index 66e00bca4eae..fefd57ed927d 100644
--- a/x11-apps/setxkbmap/Manifest
+++ b/x11-apps/setxkbmap/Manifest
@@ -1,3 +1,3 @@
 DIST setxkbmap-1.3.3.tar.xz 130416 BLAKE2B 34ea39054a4e03e5d33778b993afbc0356f898ed45eb9d182fc589a75c92a63275f9c49abbf18b637d83acb9a2f9609794253f3f38f814dbbea741987ddc72ba SHA512 208f07a7f7bce47b573099d4cd8c941a3a4d74b456720bc3ca1cbba298381a2ab98c7500d6e6cd6d5dd61840b7c42cf6521da754ec395f266f8158102a55ad58
 EBUILD setxkbmap-1.3.3.ebuild 513 BLAKE2B 0db6457e2750c5eaeb3bf06d94cc502254bbf8037d8f58100ee9f869f91781d6272c958afdb5a948ec37b5827384514a5db68603cba507cf2596a80fbd3269f4 SHA512 6e982f0c9c1c71a2cf39ab230302427d9c3d56871cc8139d528fbba7d083cd8b9849c08c1b1a771e55460b1244a1096c045f00a2e8bf4e55a763aa00034e0079
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 340 BLAKE2B a0b23051157b80c935ced3f2e76a60a6fc52a3cf4a0cfd244b25d1ccd8e0f80ba0bd4b8a66034dd625318d5081600d6d2c2b77cbf33bea779b1354fe324e49d3 SHA512 8c138a5a71599baf6c2e5615dc1aaaaf1d28319b3d0ec4b834f7accb4a637d4c6af3b6d9da56215c4afc86112758aecbcd33d1f1ddd9bc13061da6f435032c64
diff --git a/x11-apps/setxkbmap/metadata.xml b/x11-apps/setxkbmap/metadata.xml
index e17a5bccb78b..f42f66465ea7 100644
--- a/x11-apps/setxkbmap/metadata.xml
+++ b/x11-apps/setxkbmap/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/setxkbmap</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/showfont/Manifest b/x11-apps/showfont/Manifest
index 75adfa6c11db..b9a619e11b12 100644
--- a/x11-apps/showfont/Manifest
+++ b/x11-apps/showfont/Manifest
@@ -2,4 +2,4 @@ DIST showfont-1.0.5.tar.bz2 125618 BLAKE2B dd3f97e3f2dff934f1cff4bfda0f8a06be3b8
 DIST showfont-1.0.6.tar.xz 121588 BLAKE2B 963040ca15db4e990aab19616a4b5cca5a9454ca9df57a7bf92f3adf44eed08e14182a98697f6a135b1ed509e6fa15826044af43541bbcbc9434fa25db0a363d SHA512 21a318519492f4ba46a8bcb3590097fc5f96fe01fdb557257ae56bae813671952a2aad6c0df8cd69659e06708571c398e6d97969224cf692e22c8a35c8e6c363
 EBUILD showfont-1.0.5.ebuild 273 BLAKE2B 9635b9757eabeec523ed1ed75e5078e23691024b1c1dc9b611d5a6d213166b88de625f6ec4f4e9601fa2b946bff9086e483dd5faef83eb7638f03966b0db287d SHA512 d153546ba7c0eafefd5fdaaebc79559e9612548e34db414aa1e0d657597b35ec1ee5f035752dde35d3671690ed90b9dffb75976941ff1bed020b33276810d6b1
 EBUILD showfont-1.0.6.ebuild 325 BLAKE2B 6b8b4c005265a9012c615c904a2af74921878592bf023e99e1f3ee003a135b80b6c0aac48cdfe5579f3219f759da898d908e9fa74c62df320593191fd5fb92a2 SHA512 174efe5953f8cd862a1d75faf28a617a2410e0aea7b959aa748db0e586604e21d7a60fe084a9b018dff70f0a3e8424bf6d22718d24b7b511d869f440943b2b5b
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 339 BLAKE2B ccdf2af178e2b17d9ec110e4aa32cf7c8da303266ba94b8443baaccf4fa18cda7a618c8658cbdf30cf26c4305a458cd7619786846105bc812890720dac91c837 SHA512 638081d732d89aa286cb6254d44c5b7d86b05e6f59c3b312f6fe8fc3900175bd035797e32e1b49052cd11e25e83ab8320f1cc2ce5f473cf24bd6b82d30010be7
diff --git a/x11-apps/showfont/metadata.xml b/x11-apps/showfont/metadata.xml
index e17a5bccb78b..6b625c76cde2 100644
--- a/x11-apps/showfont/metadata.xml
+++ b/x11-apps/showfont/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/showfont</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/smproxy/Manifest b/x11-apps/smproxy/Manifest
index 088d1ff09604..561eb60a16f8 100644
--- a/x11-apps/smproxy/Manifest
+++ b/x11-apps/smproxy/Manifest
@@ -2,4 +2,4 @@ DIST smproxy-1.0.6.tar.bz2 132046 BLAKE2B b1eeba52730da79ed9f374636631c0400df997
 DIST smproxy-1.0.7.tar.xz 129044 BLAKE2B dd1736d972d079487bd45f77272523c2772a7aad612ffe719aa9c190df112ec68a372e2b7e673263f246be57f199ec288f5077faad8b6a3936cbbf7fa5b9b433 SHA512 cd6a6933b74f76ae65fb16504e57871724bc1102eae1d02e801e99c3fe73fe44e27f87cef3fbf9f75f369d18197b53bb677d637d94cc8185b55acae0cbd44f21
 EBUILD smproxy-1.0.6-r1.ebuild 336 BLAKE2B ebd5110cb97ccef35627ba0b855cb2d906525608daa0a070b68aa521f00c8cf76eef6f6ff4635acdf89cea926e8dd0fcb7818673ded6798d9855995087f959a9 SHA512 de2ad44843f626b5998b53b1c77ef99683b29d74a2563c4e7a05d4699817d00160968d658dd5c8a89c7371f9800599266e6ca19c89c84f49c976a44737a97e91
 EBUILD smproxy-1.0.7.ebuild 400 BLAKE2B 05a233f59f9fa433e7ee7bcca09488de4c4a96c07611c3bed8c2a38e43671bc94d8f8a0a7d9a1ad418ed801a804acaef473120995e88081c3e880b1004f38301 SHA512 b4256836a7e4f7dec369c5703e92d7e1b8193aaffa16ef41035a703f16f802e64e96b5808f2a813d7195983e90f01d2689b2d2e51d98d60840b3197b1a044c0b
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 338 BLAKE2B 0745dbd18fe715122bbf07d279e42eff3928b296ac64e2977228ca4d1604e53e562e9417f4005f90461ef005fa8680b5dda2e8e58d77b8e9f56b292a358cbd3a SHA512 afa160655b2ac6bf64937275e35e9a6c4b289ab005c39871225e7e581826507ec3a5dbfbd7022e2062235193d336f1278139a749b75d4b64a9e11d5eede99ceb
diff --git a/x11-apps/smproxy/metadata.xml b/x11-apps/smproxy/metadata.xml
index e17a5bccb78b..75cf23039d9c 100644
--- a/x11-apps/smproxy/metadata.xml
+++ b/x11-apps/smproxy/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/smproxy</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/transset/Manifest b/x11-apps/transset/Manifest
index 0c5b7874b261..ca0618ae6c6b 100644
--- a/x11-apps/transset/Manifest
+++ b/x11-apps/transset/Manifest
@@ -1,3 +1,3 @@
 DIST transset-1.0.2.tar.bz2 127774 BLAKE2B fba4e8dc6eb3b3ea1285af9fccacc2d46cddbf17a086084c3db395bb5d78e6f13a348e2733c8b42efd2993dc053c01a4e6761c479506ba5d84a8715a956303c0 SHA512 f7a658cae70e211a0455420efbfacee0f3032821d94e7a80ec6db32ced716c1ce013f38713915505998071c312cedd1bad08575dbadfbbeb94361b048623f874
 EBUILD transset-1.0.2.ebuild 295 BLAKE2B 01e1b8316369030c86a8e9bacde8dfd7c2bc859a16ff14cef1d5a17796b756459f22fe6a2f737017dd86c8ac1864d579da18c2466dffbb30f4c858d011c355b9 SHA512 b77962e76e53f71fa95d381c525a97e4356f9464f009a733c4b21ee5b8f416b4f94db887f72f82abe3268545ddab04f23b475ea3b0fcb578455147e5b9507191
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 339 BLAKE2B 10f075dbbcf775e1dea29a057f50a47bdbf0f8ddfabf9292b0f34ac374ffa2bd4d8a26daaff8a24848f74af32c2b33e12445d53b35fe7dae3cd254053911cba9 SHA512 da157a05cea0e563b26efaebf9b23f3c1cd8eaffda048610e15229f1c231990b8c521933fd3948d3432452cf7d5fed7c4be81580ff64414d36724d92e6028655
diff --git a/x11-apps/transset/metadata.xml b/x11-apps/transset/metadata.xml
index e17a5bccb78b..5a1fd44d3617 100644
--- a/x11-apps/transset/metadata.xml
+++ b/x11-apps/transset/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/transset</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/viewres/Manifest b/x11-apps/viewres/Manifest
index fa3e5422f734..89f567f044ab 100644
--- a/x11-apps/viewres/Manifest
+++ b/x11-apps/viewres/Manifest
@@ -2,4 +2,4 @@ DIST viewres-1.0.6.tar.bz2 135200 BLAKE2B 96677c7c02e56be5da7f8f9d492f22cca5c6ea
 DIST viewres-1.0.7.tar.xz 128608 BLAKE2B 95a994cdbfa0943c76298df8c2d7e0fc2aab8cf7c1c31cc76538ab7a9f5a22ff1bb515c8f8c9ebfdfcc490600696bd5184029182edf52d3af311cf4a4825624d SHA512 75878faee001163891adf8472c79b31273f794e23dd775c80b33acdd1ce76df708eb27a49c20f79b7101ad676e1d50d9c857c2e2e0930c6209eeb7af8a11397c
 EBUILD viewres-1.0.6.ebuild 361 BLAKE2B 2c6ba35641dc4d54116cff5452c2dc845ca69920aeb23b0fa0e2bb39aec7d73b575037851b67dd9ef33216c350ad8451c0602d6f677e88aef08aadbe4c08a752 SHA512 42269351eac7360477b2ac320a4ea5f6aec999f6f4c82035b6e2e174f292c6905fb7e0dbc7e44fb707ac0decf7ca12c8dbbf71b46692412fc8b064b7e1da5fcf
 EBUILD viewres-1.0.7.ebuild 384 BLAKE2B 4f4412e7a374dd240c7c955d221550ec774dee154dd27bfe26f3de77ed5157200f122d6a039b9cae840d3dd726dfd6269b1d256a9e53e23301ac05d4dd34b853 SHA512 6f7ddad89713936db9790a6b5ab0e71c3391c192bece0dc77ec5364e8eb5a4a332e1d84b9a40f91b413bae64e6270120db6c844ee20b2a87a7dd81e8cf568eaf
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 338 BLAKE2B 48e179eff46c263194c44cb537af6b6df0331aaa617be04e5197a0031bdcd22df2f3959f46039990d7afcff2777a2a32def7079edf536e6bae5afa11e27c0fb3 SHA512 de9c770f9ad6e65d52c45c7a69693a7ffdd9d9f5264d32dd3cb98422c9478b710b91f17b074822fb918e4519122cd041606197b92723acef08ee444d9868e9d6
diff --git a/x11-apps/viewres/metadata.xml b/x11-apps/viewres/metadata.xml
index e17a5bccb78b..82d1419d0939 100644
--- a/x11-apps/viewres/metadata.xml
+++ b/x11-apps/viewres/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/viewres</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/x11perf/Manifest b/x11-apps/x11perf/Manifest
index 067835b28848..34e094974ed9 100644
--- a/x11-apps/x11perf/Manifest
+++ b/x11-apps/x11perf/Manifest
@@ -1,3 +1,3 @@
 DIST x11perf-1.6.1.tar.bz2 189446 BLAKE2B 2a36bea5e1c9a414d9a1ce798e4f0481aeab86522c5924fb7520c0bc917b832f3e4c63c70a5430cd3fd92cac4374691a64db4542180e0917a0617bae7f783a6f SHA512 b386151bfe3d7c04ab9953ae1882f3c5b627d6d1afb9a8cfe87c58236a88883fc11bbadb2226b9aa61df84b4fce625a1c9e3d146a124ac17e8d7d605b35d9c0b
 EBUILD x11perf-1.6.1.ebuild 420 BLAKE2B 95e84c67ff78ce3e8fd08d0b40aafbaf29e380e57298898000e2e1308040178ef993801ad9777fd7bc8cf9d324dce91e29513fbb0a47a2231dec46fc06e29f29 SHA512 e0a76ffc2c21e03e447cb0e27a3069d3ae4982afa32ec739cfba779f41ab08981d878c1ec72c96ca2fbed4e66e911b85d164a4eb23106e812fed9f8dc69107f7
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 338 BLAKE2B 62d4735813b8ae204a544bc5abb18554b0622568be416752d0c63800344c9afdc22aac562bcc9f5a3f174a93ace3773c972cd0a9980a478afaef60399d843f09 SHA512 557400e93681a240b176ff5ede69df4720d4845da0ec55b547e294ec3775b0bb33eb0a05007d1b528d41742cacfd2aee65d835b4a5484fd49041d211a3b40c39
diff --git a/x11-apps/x11perf/metadata.xml b/x11-apps/x11perf/metadata.xml
index e17a5bccb78b..025b0afb1abd 100644
--- a/x11-apps/x11perf/metadata.xml
+++ b/x11-apps/x11perf/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/x11perf</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xauth/Manifest b/x11-apps/xauth/Manifest
index 490b4bb075ee..180b8c8a9467 100644
--- a/x11-apps/xauth/Manifest
+++ b/x11-apps/xauth/Manifest
@@ -1,4 +1,4 @@
 DIST xauth-1.1.2.tar.xz 156960 BLAKE2B 2ba168229bdf0c1d0fdd4c352e434abfc6f527cbafce35abac8d403a0dea91f00fd858f91f177128d13a0e618d1d95061c71ef32a3e12ac91b72a257dcfcd12b SHA512 ac23fcd166b45abf7b030994ff3332c9906023dc1ddfa9b9d3000e6a914dc5e0213c4a2aa409cb3ddb93e1f9f4f6374376109241a95ef8c36af842de1f6f76e8
 EBUILD xauth-1.1.2.ebuild 591 BLAKE2B cd4513fcdf1e456ded9b3c4086dec2201eb0f0f5a5378bdd4cfa66c101dcadb84fec7f0abb8b6094963ff64d176cf062cd9076f846557a03ac7f9656566b8a45 SHA512 8e3e433884c6b766d18b1532081f72974d8fab4d1edfd5b145bb11824b3dba020ab32f1203adff333b16c7d76589badaab6a5723b457ecfdd6687388a1876ee3
 EBUILD xauth-9999.ebuild 599 BLAKE2B 757c7dc62ca39a50b64b5f2ffbf3bf5dcc123524d284457f62259a21fbfbd2db7eb854682cafbbb7ddf260c4254ad5c1836b2c7d9cc6eb2cbb47e626696f3d0f SHA512 8ccbfd002dd63a8d769d9d4a99e6c077bd9253e6dc8e35db34daa0dbe01350e749f12c3e46660ab9ec3b4e9db8379b5ffd238d07e3139690bb4ec640e8f8ccd7
-MISC metadata.xml 235 BLAKE2B 5ed3cd35ac32a5cdd6ac490bafdbc1cd03fc8c6bdbc8194ba7f4a34151a24c4ade7a80705d92348d6d13a9579d18b19ec40a353bf014dc02f98980bfa03d3574 SHA512 3fe78f6dd92b87b30ed02aef15ed72ec5cb62f4c6568dd9b98dcb2f11a4b9ce93955e34c62112a310b4c4a51f87e0e31e31ae5af140e1054c127d3cd344d7267
+MISC metadata.xml 336 BLAKE2B e7efb568e90d3de70da870d88a12988c62c876085291bd426de3a6b3123e3f989eea78d4dc36e2e47cdd68b2f62c2f7c912c1f0e9ed8e92f4eecc017c63676ea SHA512 f210a30ab5f02fc443a1ba611bf07e72815d3089015ba5509dff6b62ee177cc50b6729157eff68633fe6163b7cd5d0d4a0b1a75f739984a50724639d043a2d58
diff --git a/x11-apps/xauth/metadata.xml b/x11-apps/xauth/metadata.xml
index 6bbd73893d34..40d816d1e5b0 100644
--- a/x11-apps/xauth/metadata.xml
+++ b/x11-apps/xauth/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xauth</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xbacklight/Manifest b/x11-apps/xbacklight/Manifest
index 5d80136bae69..8809c7071a93 100644
--- a/x11-apps/xbacklight/Manifest
+++ b/x11-apps/xbacklight/Manifest
@@ -1,3 +1,3 @@
 DIST xbacklight-1.2.3.tar.bz2 124611 BLAKE2B 19355773b2b2bc491cb3682d9d02fed462d30ed21742dfb9f7398ec39e85bde4fdd1b60bc8b4ac2a2d32410016186c1f1e5d45904fb19358bcc16eee69242dbf SHA512 717c87ce24634892fc4ac54fc59dcc0a5bc8f206aaf1d13410f95f7e4fe6e3dbc7ff8d951bcd8ea8c5e955357a00fea6ceadd4559e60b1a632e40f71290e12c7
 EBUILD xbacklight-1.2.3.ebuild 371 BLAKE2B 3ec62380ccfad6813ab00c6a5d002927beab2fd602d50c2aa2bfb3f960ff8c36a9e4eecde6b1f36af54b252856d71a0e618b1dc4b5d0e7f54dd43eb580901331 SHA512 0901c814aef01bd1bc3edd78a1bdbb5ff148262f58b5b6285d5d36469b59fc1c84bb1e35cd752eb03399c2b0f3d8bccdca97e9e4b9819287700905c2829ea590
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 341 BLAKE2B 5fdf087fc2f573e735981e4af574304f6d0ec1815a0b7d961e8eab7697e37fdc8cb746b84b4a3f8d356f06704b62eb81e9b6dd83333a481efa0c7c590013906e SHA512 edc896038f569f3d2f9ed2a6a42e292de08f62e548c4a02128e1a4ea6b8b487af8849edda3dbd04b367c3ea880a5f72722c3622e33ea7fb3ade26d294e9074b6
diff --git a/x11-apps/xbacklight/metadata.xml b/x11-apps/xbacklight/metadata.xml
index e17a5bccb78b..42e9889864cb 100644
--- a/x11-apps/xbacklight/metadata.xml
+++ b/x11-apps/xbacklight/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xbacklight</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xbiff/Manifest b/x11-apps/xbiff/Manifest
index fc5f31206de2..e35dd8c059a9 100644
--- a/x11-apps/xbiff/Manifest
+++ b/x11-apps/xbiff/Manifest
@@ -1,3 +1,3 @@
 DIST xbiff-1.0.4.tar.bz2 133455 BLAKE2B ce79afefbd394b32fd543b64e966276cddc551bfacdf25e80a3463e65eb538469e252d105aeddb60a16227c30a5abfa996af89718d77e075f85b70d71e45710f SHA512 0fb920a08640ec59f23d8a8a47bd244565dfbaff7a21c38a8a2abe1edb5eacabc970b5dbdc409163fc444fde5b75a2dc4e0114312938efec5b77228f3bf785ac
 EBUILD xbiff-1.0.4.ebuild 369 BLAKE2B 6b4fe203f2ce4be76ec17737947e25462105a4a4b39450c44f25f4221748cdfe116d69991b95a61a3bdbae13ae109182ecbb6234ee19910a74daa6992bb9e90f SHA512 cfc0ea966caa68f5aa13cb44ba96bace03882365160cea4e798f2ac670f0ca44d9b4248fc3027ad3206cd446b6a8dcfb35ae3e98d63eb34944bc83683ac6c056
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 336 BLAKE2B 6214fdedf087c4537adcd59bc72de58fa628ff5ae2580b45912f7bffa3770485ee336df0052648d3f78f3ebbcd3c0032cdf1b90ce2bfc9202435c6fd42858c47 SHA512 32c19b29456eee46515477817bcf5c6a35d306b22f8c346fb1dc48f587d853aef3ac88f33b297994158dc5026b5b54914ae4db8d0f68bef8392f1a147b18bbe9
diff --git a/x11-apps/xbiff/metadata.xml b/x11-apps/xbiff/metadata.xml
index e17a5bccb78b..2606ec11c351 100644
--- a/x11-apps/xbiff/metadata.xml
+++ b/x11-apps/xbiff/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xbiff</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xcalc/Manifest b/x11-apps/xcalc/Manifest
index 7963980a0903..44ec685c4c60 100644
--- a/x11-apps/xcalc/Manifest
+++ b/x11-apps/xcalc/Manifest
@@ -1,3 +1,3 @@
 DIST xcalc-1.1.1.tar.xz 140204 BLAKE2B b747a658b03ded2a071f0b54047f8dd4a1aecf6093af14059f2311019e6f9d3790f1190159c278fd3f9d5bf5740bbb1bfb0996540a0985728ed2966239bb4902 SHA512 a261e9798d62727f40b9aff07e68e63ba40aa7f4f9b1811d8efd8c3e73cd5912d6178c55ca3c059968191051bd20b889b06b5e92b3df70c7b5d09bd013b9ebdb
 EBUILD xcalc-1.1.1.ebuild 423 BLAKE2B 850d2d18b404bbe64bc6b637fc0449f8ad9db47ba95d763502fb77f68cb1a21eb540e395e08146d8f71e4dc442568f548b5a159fd0e464f3aaf7ed4b595aef22 SHA512 558dbe40c146202bf107dad50f26d86880f4278def727da4b8bf2c14e91df32b1439c73c5d3550061ab5ec4aea91e005def3dbeb57be01509cc3963635253622
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 336 BLAKE2B 93d8fdc0c4e87e9d1b0bdd8ace117c9380f54985920fcd3c70ba0dc6031c7375e6376b9fe414efcc7b8a53f1e7b9975e4bb72a30a0c1583d635305b4bc0f0fd2 SHA512 e08ecb5fa61930cb91678476ac70df0471b6677c503045fe2011cca9f5424f0f71b5da701a92a1db7de7d55c4fbeea93c8b926efe6b1a48ac5ae6f6b321cf568
diff --git a/x11-apps/xcalc/metadata.xml b/x11-apps/xcalc/metadata.xml
index e17a5bccb78b..ba8b5811a3e9 100644
--- a/x11-apps/xcalc/metadata.xml
+++ b/x11-apps/xcalc/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xcalc</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xclipboard/Manifest b/x11-apps/xclipboard/Manifest
index 505bae30ceb7..cf159559bb07 100644
--- a/x11-apps/xclipboard/Manifest
+++ b/x11-apps/xclipboard/Manifest
@@ -1,3 +1,3 @@
 DIST xclipboard-1.1.4.tar.xz 128912 BLAKE2B f90906d3abb2de0915113d651d5bd4c4cf2a75c4b15c681a7609cd9aa46ce9d3157cdfa5f60ad76ce6a56396d51ae726645b1b43d53125161f362cc3520b6a66 SHA512 efa7800e0c4fb0242362c4263d80182d591bded07d1064a36b157b6202b15b0c82f083658ced2b82392eca905fb57c04a537d67e75c1237a1667ed2ce0cb09fe
 EBUILD xclipboard-1.1.4.ebuild 420 BLAKE2B 2923cf949a00269262dce0bc452e5b2bb9f30b948f24897a7b4bd3cc8d06a8803072169ab32ce42a0dec2acda7acaaad551f1e78543e222b61d098574866ef50 SHA512 308c804b5ac2332656b0b39e25b2f2a11f7271b719e3aa011969d61bb1ab83fc7d538aa9562ac7d53d3353195c42d1f0a420e0055cfe9d088e6ef3795249ce1a
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 341 BLAKE2B df505c0349b2df03ebabde765827919a0ea5a8d4c0f5e2519418aeaf820d22f00e7554f6aa8f403212ec9258e519da328a569825f7b29e0edd66e3b0961e49ca SHA512 91c8a0aa7130f3c54d5697a413df3d9643ff0e0684e06d51d7cfa0698933e3005669282d5c0cf24be8c1fb03211908351a9c757c95a13b67c8703a382075e022
diff --git a/x11-apps/xclipboard/metadata.xml b/x11-apps/xclipboard/metadata.xml
index e17a5bccb78b..4faf7e7fedf4 100644
--- a/x11-apps/xclipboard/metadata.xml
+++ b/x11-apps/xclipboard/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xclipboard</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xclock/Manifest b/x11-apps/xclock/Manifest
index 3f8858f9fefb..223765db989f 100644
--- a/x11-apps/xclock/Manifest
+++ b/x11-apps/xclock/Manifest
@@ -1,3 +1,3 @@
 DIST xclock-1.1.1.tar.xz 159556 BLAKE2B 5770cc0cf9065eb83b427c63190dae070635eade9410676a343505fc7a9d94098fd8d416384383f5311453a7ec80a0b72e8cb9a86be98eb8275dfd9cc92ba478 SHA512 059ea986bc7537c2796e8855676e8357bd8a7852fbac0839b3f8a9e3ffa088de41bc4e4961973353f0a7b7293366b81bc764d74f3dc4e90e361da06185d976e7
 EBUILD xclock-1.1.1.ebuild 507 BLAKE2B a713d405b4ed21c15a49041033e140aa69f9c8a7970fce4719e8d5733dcee0aa7a7d1b95ee1a1265cae1df5fe8f0820d7502debd764cda033d09818c1a1f2b4b SHA512 e479619651a8023ce2ec61fe475a719a101ca15dd4aff73f7d7b94328ba390ebf82952125840bdd9ac45175b89a4abaede732569e45d4b92debccfc67d631b26
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 337 BLAKE2B 56b67411b2dacc3206b5f3b2f313b8726645c709e114c4e8e611b7d9808356d864c89422e194ac90c1e57d6e0a3326069c86f73ee4264a5ff80cb8868cf93f34 SHA512 d3beb47939f9bdc573c1c6a1c21ebef32ce408c0600c8cf572b6366a73d744923c20bb8d4c4b1dc9ab80ee0bffe506fe84128db3748639cc48a255ac62e7b16e
diff --git a/x11-apps/xclock/metadata.xml b/x11-apps/xclock/metadata.xml
index e17a5bccb78b..0d2513b8fc46 100644
--- a/x11-apps/xclock/metadata.xml
+++ b/x11-apps/xclock/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xclock</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xcmsdb/Manifest b/x11-apps/xcmsdb/Manifest
index 2e8b96bdfdd9..0b6640f5fe97 100644
--- a/x11-apps/xcmsdb/Manifest
+++ b/x11-apps/xcmsdb/Manifest
@@ -1,3 +1,3 @@
 DIST xcmsdb-1.0.6.tar.xz 136708 BLAKE2B 847a29251d781cf616a7b74abb9130da08d2dd56d42db61923c9e82848bff12ff7c5f8ba3c9635b2a572116bb19ce0637432ea9c6fdaf5b76d7f7ae8e176be64 SHA512 e47d9498ce496effbc44a66e70af91d9fe65c344a17916fd4990a4c84fa8879aa09b6695aeb6ef595f475c16a13c7c31d4c48449234564de7de38d7436764fae
 EBUILD xcmsdb-1.0.6.ebuild 389 BLAKE2B 48c027e97c6ccfd76cc5d9c91d04a15ee5560c29dcd8922d6fe6fd0e74cd0c5481f15fbd47f1b289fc26f94e03e4e3d9dd9402caabf5e9e1a69158fc111f904f SHA512 12808cda2acb89e7415111694fee74ce6d5d435f53887e3632d2b454120bdfc8703c20132ebce67cc85eaac8db895b6f5fe96084530b27e4b3eb4d7b634e7b79
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 337 BLAKE2B 987271f58712effa3608bfa5fa5e4275fdbb31be4df43d55c119f253eec59f38677024d5d767dfa7d273056580e15c9b1ef6ca2b8d676a9bf56d1af36ba16c57 SHA512 1cf8f7f46c9561a995496d42c01ed5edd40e83d5a86174bf48768eb93bfd6fbdc9ee3abeb76ce15a6f9aef4432c2cb609f6ce23387b53af40ec61884512d7069
diff --git a/x11-apps/xcmsdb/metadata.xml b/x11-apps/xcmsdb/metadata.xml
index e17a5bccb78b..6c0e9c0669d6 100644
--- a/x11-apps/xcmsdb/metadata.xml
+++ b/x11-apps/xcmsdb/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xcmsdb</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xconsole/Manifest b/x11-apps/xconsole/Manifest
index c814060f304f..c346efb2e9d5 100644
--- a/x11-apps/xconsole/Manifest
+++ b/x11-apps/xconsole/Manifest
@@ -1,3 +1,3 @@
 DIST xconsole-1.0.8.tar.xz 129336 BLAKE2B 3c00072944594b02d5cbc88e8243198502a1a418e4f0c3e86badf659a62bada126323af1b21517368fd6a6204397714cb8769b7a1702fe9b8d884c057cc429ee SHA512 93fd8527abed4faaf0f6a3804ab08dbcb926b0aaf67fd814c003b6b1102e2f643be5362a020c7028ae928925ffd423df6eb456d4ed48cf30a4c5f00a7ce648fa
 EBUILD xconsole-1.0.8.ebuild 419 BLAKE2B fd63c1006a342cc8522cf0dba9b36c5dd0b8309e46f0d4b225b764385605bf3ee7f06520a2e70715240b122d25a6239175f9e647c030499970b26b74ad198894 SHA512 b0590750503fc57970966019ba65d8cef3d45697e1044dd7c6f09f47fc9a54cf9a6cc119e64f19953d4d3b80a3946080dddc78d5d88e48f922903fe15035d254
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 339 BLAKE2B 5b8a1e9ab2831e15172c695cf2f8d1769da23d2ef64cd3b893c660aff6cad9ab562867ea90b2e037e69e4f8fdc5a3c2696188f717dcba6406f105e3931f90b23 SHA512 c51a4c1be44028e27e091db12ff7f24d5f04b61c8af34e5a865fcbd7659730609830dd08e3b4ada803b9224ca0941e4bfd277f4865186775ed892776a6449078
diff --git a/x11-apps/xconsole/metadata.xml b/x11-apps/xconsole/metadata.xml
index e17a5bccb78b..00d7c0a3538b 100644
--- a/x11-apps/xconsole/metadata.xml
+++ b/x11-apps/xconsole/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xconsole</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xcursorgen/Manifest b/x11-apps/xcursorgen/Manifest
index 5f79bad81f85..9e632f41d305 100644
--- a/x11-apps/xcursorgen/Manifest
+++ b/x11-apps/xcursorgen/Manifest
@@ -1,3 +1,3 @@
 DIST xcursorgen-1.0.7.tar.bz2 128102 BLAKE2B d4e583e0183e23d1a127d367e520027bb36dad44306dc2848717f2d25ea3cb656a7cd95fd02a18522911a720319126eed07637e1809b868f1f85c74773a10c35 SHA512 bd13ad23691d3daa2d5dcdc5902cf62e3dcb97a0289aff362e6cd85866a1d8cafb64f98800a75bfb4cf1f3c76244ca20201847dff594543d136d0abaec7011d2
 EBUILD xcursorgen-1.0.7-r1.ebuild 397 BLAKE2B 8bd86ecad5e4b2869f65bbae0122afea48644a53217a27b3d4f10637703d7b30e97a2c7be2278cb191c055d66b62024bf8c3563e4684ca08fc4e9cc953751d4e SHA512 a54d1963376f38bc7f310e240db9b141e412589f135f5c0fc0f7fc86a4a989859809adad72a0b085745f4e1942a0d6641deef438abb1cafa408b20f283060864
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 341 BLAKE2B 3121e19c593df78f5e85922a49d6acc5b3d9cf4646ecf1292d772a8168bc27c4b99074164c34abee1359d7631ecb616e44bcb35e0bc5d433cec7b43dbdd0730c SHA512 d42083e3d3422c4728020a5b18b6b4b1c6e5bf16babcdff4511ca26258f9eb88533a556f3b3cb0db045e7ed9dda1400ca029d5c518dd67daa6596b838840233c
diff --git a/x11-apps/xcursorgen/metadata.xml b/x11-apps/xcursorgen/metadata.xml
index e17a5bccb78b..49dfcf1442fb 100644
--- a/x11-apps/xcursorgen/metadata.xml
+++ b/x11-apps/xcursorgen/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xcursorgen</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xdbedizzy/Manifest b/x11-apps/xdbedizzy/Manifest
index 46e489253c8a..de9f2c1f50e8 100644
--- a/x11-apps/xdbedizzy/Manifest
+++ b/x11-apps/xdbedizzy/Manifest
@@ -1,3 +1,3 @@
 DIST xdbedizzy-1.1.0.tar.bz2 110340 BLAKE2B 2245ee691441e72e22a71ce482d97f7a24c230fae23779f6a496f8f82f962e7a0875b136b2a2308ac3e4940835b129e7641bebc895be02e2d32fff890d42489f SHA512 58b9c88b09772008fe18921c0b63972a65ee5833f96edbbd2e1dc335e5f20ca9a241728b9a225e3b0f3eb392a7941cc1ab6e3c871b9463ff21bb23e38557e9fa
 EBUILD xdbedizzy-1.1.0.ebuild 316 BLAKE2B 8b5ce83ab07dbe8ac6f3d030754664a237d62390fb6d83eb59c1f7a982681f678f9c7dcabd414d0e8d5058a84e75c724b876419f3392a7b58162394125af70f5 SHA512 818e82f2a85014e2e6136e07fbb2c6e49dd7b5c616b700b053d0b90e73acdfaf12085ae920ac84f9d577aeab886d5be94be7fc672cd9c3d8788923c344843edf
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 340 BLAKE2B bea1148462f724c810dd34b2e8a5d3055fa49e4985d52d6750ea6724113bdc751e7cd54f6dbf3532796270346fcc1aeb7aa429ce3208dd1ae8d2ca3e97174c2a SHA512 c10d04f698c391eaff074551780c603841acd31dfb9df08f27f2a5b2a3788bcc22a074f36e2412bad98467a438424d6def84cfd2624d69da2b3e5567015529a1
diff --git a/x11-apps/xdbedizzy/metadata.xml b/x11-apps/xdbedizzy/metadata.xml
index e17a5bccb78b..d3ae46c21fc9 100644
--- a/x11-apps/xdbedizzy/metadata.xml
+++ b/x11-apps/xdbedizzy/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xdbedizzy</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xditview/Manifest b/x11-apps/xditview/Manifest
index 27fb6c21cfcf..e03bb32c1d67 100644
--- a/x11-apps/xditview/Manifest
+++ b/x11-apps/xditview/Manifest
@@ -2,4 +2,4 @@ DIST xditview-1.0.5.tar.bz2 151313 BLAKE2B 53d96b874230dde6f4f13a7a61420e1b9da86
 DIST xditview-1.0.6.tar.xz 143848 BLAKE2B bf832e17631a12f58ad194b1ddcf7a63a31e04f005ce883798f892284c8ad64ae40f15f5c1d781179333ce212e989de9b45cc53881079818e5c2f0b6087e3b5c SHA512 249769d27980e9a69ac8f056f329dfa514f3ab6267d6ed69814c5695f315d2a7021c560a0e26fdd2568290a071793d7f2eafdd92f9981ed556047deb244ebf5a
 EBUILD xditview-1.0.5.ebuild 330 BLAKE2B f5301dbaef435197d301b261e0150cb23d98bcc5b19317fc4479a96a5a125601a6bdc81cdab95e6cb6b44a3b1e1b29a30a1d9610db9cbfd7f68113bef9dde9e5 SHA512 a5b0490ae1bf34cded726c847e4ecb873cd17c696c26a3ee2e59bab40d9b7cbae53e50ac81433e071a9f1b5309638117a6a09420491ee2e1d98c7e71e794bb7d
 EBUILD xditview-1.0.6.ebuild 375 BLAKE2B db8f5c964ed403efac71a9460f650cff2a89b588328c5fbcc7a0181088c09111416c579c2c6ade2ce96a6f0a7ad0fa675cc47c8de17a710a09c1d11105912d1f SHA512 6b38d81bd42e808ac8edd435e9e23cb879098c05b3417b8a01f3e643ce50d590238a9efde28afa2bd08c08be05eff80ee8a3e93ac3aa34e0020b57d54c9cfb14
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 339 BLAKE2B 20bb995c62d6ae40b62505bdffd3c58cea8ee7ff77cab23fd8b17f05fc40fde108afe9c27218bfbfc214c2cbbabf9ec3f849082895ec6e6b60deaf0658930be3 SHA512 680956394474d91911730ddd716df4f3a4e005c689c9a75c0504faa77bb193bcdba492ea2ac3ea86c53de676bf40734f5787da0ebc5e710d62553edcc7220955
diff --git a/x11-apps/xditview/metadata.xml b/x11-apps/xditview/metadata.xml
index e17a5bccb78b..aa4ad81a036b 100644
--- a/x11-apps/xditview/metadata.xml
+++ b/x11-apps/xditview/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xditview</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index 17717d15613e..6741e120a6f4 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -2,4 +2,4 @@ AUX Xsession 1521 BLAKE2B cb2090c2f2c1626df08fe45e80ab668ec9ca43f8f647f9a16d09e7
 AUX xdm-1.1.12-make-xinerama-optional.patch 978 BLAKE2B feb81c4815c61c62ebd25acec572de03450c4ee5fd7a634cb0444e17d35566548c0bc8dab05562264533676012410839f61b2e5cb5bc98d83bf9a36daa1b59cc SHA512 efddf2cd662cc4e1ca5cea2a9efe49b4ef8e98276f37def047091088a9deaaadc61646deeefbd8668286d08edabd245a532db84ddf938a2853bdcc1865c221c9
 DIST xdm-1.1.13.tar.xz 418404 BLAKE2B b5e1df5e0fd284b227bac5b07114b7882c34adca8c8f7878350576f865ec0675fc7f8218b5eba24e0ca75895093f9412e838a997562ec99bc8196233354bd7eb SHA512 1c7ba51dc8c6989ff6ede3a3abd06e002903609d4ebd31f06ec39fbfee3a80a690c6180f85c3ab135a0de4623261d92a191d1ca5f733cdb3bd2e7e78977b98e5
 EBUILD xdm-1.1.13.ebuild 1866 BLAKE2B 128b28ef17de6f7b6cdf16b512d9f7f7e27e3516481e43928d921e957615d5285d4d11f51aac5164ac9485df5f64eb5d5ef9bff239dea49439397f6e04b8437a SHA512 d9d53faa7a148b69e70166fd635f6b184916f915a664d1ae055019b3a26c4140f58708a72a8f1bb6920c10e7609bebd7897ebf6c23c2c80c6295ccbb36ea0daa
-MISC metadata.xml 241 BLAKE2B 6fe56bd098998705ece21eed6d30e595c470dfde14e39c39e6413dfc3a7b5a207742d52f5c8cf7a582bdbdb651b0a8fd9729a334393386e3a1afb1587fad1531 SHA512 672a7690a5fc03c8758403450a5e320b891b58fc523fbfe258bef0b214fffee41e43df65cff1528379343a5d8b815d1bf9edb9001049748c1cf118b52450c412
+MISC metadata.xml 334 BLAKE2B bb9f203babfde01fc5cce539d89df522147c0a2e58fea1453f826749fa1399722e3dbaf301a2e23509c074c757ff25676bf67ef0b9f1c0ed958f909778ba1dbe SHA512 361b9416bd1b55df4466e419b407c2ce3d4eabefb301cab1c702c8fc961de78ab28894550cb1287418d3398b2611fa60ddfe370cd506be863eeddf2792f75b25
diff --git a/x11-apps/xdm/metadata.xml b/x11-apps/xdm/metadata.xml
index cb69d33c69a5..5860a1eb22be 100644
--- a/x11-apps/xdm/metadata.xml
+++ b/x11-apps/xdm/metadata.xml
@@ -5,4 +5,7 @@
     <email>x11@gentoo.org</email>
     <name>X11</name>
   </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xdm</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xdpyinfo/Manifest b/x11-apps/xdpyinfo/Manifest
index 24b821b64df3..9b5295850e2c 100644
--- a/x11-apps/xdpyinfo/Manifest
+++ b/x11-apps/xdpyinfo/Manifest
@@ -1,3 +1,3 @@
 DIST xdpyinfo-1.3.3.tar.xz 137088 BLAKE2B 8fdf49e65ac05ab27672ef2044044353f8bbfe0c8bf6135e71b9fbd45b3cb643f5794977802cbb7a44cfe9d20905b5e74b0cc41829c9fef837f32c81bb05ea2f SHA512 47fe0821bc64145876853712ebd7c0af80111c243813615b892429021cc9a53abd38c4684551ae300cb5a4eacdd3d26e2c93e789ed91a948b20e2c37cd2d2442
 EBUILD xdpyinfo-1.3.3.ebuild 839 BLAKE2B 3f2f7ea5acfe02edc9afbd02adc844801fb5a03968e901d10a84d857e288af982c1bce8ec74355443a733cbd0e11917e342105da805212fbea70a3f56d1b9ece SHA512 85106268c09a3244b8e28574c99b9275a856dc066d25e3d4436efd5b5fab58937b732d964393772dd4775f11841d4cbd85749e4132c5568dd744190007012ed4
-MISC metadata.xml 348 BLAKE2B c29f79a25abe32eee42ed83aae3760812638a6696c8f27392673c9e9bb178e086b8fcc344b3db42bb9fe02ae23757ea201c8f3b5d4e03f466c6a524368df4778 SHA512 5a9e3ec8b2303c5d61cbc08cddacfe978140f9db3c5b1a2b72b896c6a61c408e6f22bcdb0a0d4e7542d946397a11878d1ca38c2e9e6cf211ad3b45eb1a45f914
+MISC metadata.xml 461 BLAKE2B da9d11bb2cbb59a1d75ce08d1a8b37bf35a74bde1382014fa38561874d10c66e3a0be8dd5251431183780a7d9c69b1cb256b1e31b6f6e4cd6767037105573de6 SHA512 a9706f84bd7b8d3a9b417e81cc984d285e66d43a9f9b8a4c3d7605e1d014fe3c62be9d33790b95e22d17e5bd6c88e3374f46fb6188ab9edeb34a4540a750adf5
diff --git a/x11-apps/xdpyinfo/metadata.xml b/x11-apps/xdpyinfo/metadata.xml
index 63db29895610..dd140bb07e18 100644
--- a/x11-apps/xdpyinfo/metadata.xml
+++ b/x11-apps/xdpyinfo/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-<use>
-	<flag name="dmx">Builds support for Distributed Multiheaded X
-		<pkg>x11-base/xorg-server</pkg></flag>
-</use>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <use>
+    <flag name="dmx">Builds support for Distributed Multiheaded X <pkg>x11-base/xorg-server</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xdpyinfo</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xdriinfo/Manifest b/x11-apps/xdriinfo/Manifest
index fddf4ffe19bd..68f12583985e 100644
--- a/x11-apps/xdriinfo/Manifest
+++ b/x11-apps/xdriinfo/Manifest
@@ -1,3 +1,3 @@
 DIST xdriinfo-1.0.6.tar.bz2 123636 BLAKE2B 43e15c6833ad84760c89abff272864e13b777c01796ba119fbc7fa7165ab05cf5a090cf736f618a25385b5d5a8cf2d679fbe2cd55119842fcf9e16fdb46dd549 SHA512 7ddd9e19abaef93e4d85004293528ec3814ef84c470d496dbb8dc8313d804bb7520406de8d33d2bc2b3af942bd0a5d5032a109b2726438a966af63ea680a102f
 EBUILD xdriinfo-1.0.6-r1.ebuild 480 BLAKE2B 553b81501c2bf928a4837923adbc08c5f2a84dcef96f6f9a669f2926eb9faf6040e7f88fc44713b9822327a542436dddbfe98a116aa863f80bc56c2d0cf1c6fb SHA512 0b889ae57d58545eb64c5394d62bca794d1f0bcab2510e7383b0386ef6b00d261d9c39e9481d1a74d2313fa4d4dd3c092277e2a1f5bb443097c7c3b9ef6d48e5
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 339 BLAKE2B b50c8b4dbad6bdc10517bda65ceaedb3b7ec28211c3b5143179f3333c7978a7d8c4b7d96b32d94e8210f6bdfdb5b8048b370a84306cb01d115bb18fe341fa07e SHA512 f0ddfb4a422eb889c8acc20c574ce65d8fc67a3f81f263618f4c9423dd226198e8e354dd6cda4dce3b19ac410165290fb080d7b4206b56058a8dcda407534f04
diff --git a/x11-apps/xdriinfo/metadata.xml b/x11-apps/xdriinfo/metadata.xml
index e17a5bccb78b..fe480219f43a 100644
--- a/x11-apps/xdriinfo/metadata.xml
+++ b/x11-apps/xdriinfo/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xdriinfo</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xedit/Manifest b/x11-apps/xedit/Manifest
index d6215fe1c7f4..873291504bdd 100644
--- a/x11-apps/xedit/Manifest
+++ b/x11-apps/xedit/Manifest
@@ -1,3 +1,3 @@
 DIST xedit-1.2.3.tar.xz 480288 BLAKE2B 15dabc6952228246b2fcd67c33298ce75ebd3a943e930d3e5110c4b32a8c5b7340f5127b64d9bda9819fa3bcb4bebe870e4bcca0ecf5310f4b765f488d88c61d SHA512 1089c35ef961e53f74cc7d892960e1ee7f0da17529e3173e7f7764b0eb4ee94d1e068cb177d8502ca55c1dd6808962d4b1427e303adc7e6db80be8828557f45a
 EBUILD xedit-1.2.3.ebuild 370 BLAKE2B dd37f13a768cb2b032fdf919f7af51f6bf833c0185d4909e6c77d28f582f5fa6a61afaf20c75aa3f3d7b9abd078808fb18fe8c3a60fee32ae50c35bf0c8f6908 SHA512 692856b43b1073c8c0a0bcc6686e65b44209733e1fad743e950b04da5ea14111899a5ef892a7c75795cc38717486d42992e582017bbc3a37ac2a9241dd48e7a5
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 336 BLAKE2B 9cad19f575e3e57eba81059256a9edb85ffe4f1952ce0c8cf1fd9a44badf5b4a0d37a8725375aa5c1c846397007696e520fec3c8d1f90f2a448b24c887102938 SHA512 47723a7f09f2bdf07e9ad792034706a7b8226b4f8c7823069ca1aef7f9b8077269f43d8de8ced1cd51a3397fc95aa94dd192793470d5d6a0cb8d5acd9faac317
diff --git a/x11-apps/xedit/metadata.xml b/x11-apps/xedit/metadata.xml
index e17a5bccb78b..6628fe8974db 100644
--- a/x11-apps/xedit/metadata.xml
+++ b/x11-apps/xedit/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xedit</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xev/Manifest b/x11-apps/xev/Manifest
index 5e7944cde331..b6e6793fe150 100644
--- a/x11-apps/xev/Manifest
+++ b/x11-apps/xev/Manifest
@@ -1,3 +1,3 @@
 DIST xev-1.2.5.tar.xz 128848 BLAKE2B 468e8b21ffba9473bf04160f053a4300df61280083cdad0d94f2d309abeab96611031cb6d054ab011c4b18c01f63d2e5cd0ab24c5c42ba3e337999716e57851b SHA512 9fbfb78c9547974c2256a678948bf4a694a40b1c2bd5c5dec5f365a713e6d938c6039f055a9629f49de27f02f3d7cb912f07c035df129798a4b2ddc20febe66a
 EBUILD xev-1.2.5.ebuild 406 BLAKE2B 98d216ebb270ee35994ce686659311c1590529ecc32a59a626a3f81de42629a8a6ca85b2da736ab94a7aa4e2b0ec7dda92fceae970cf1b6f8d9645f80484ce78 SHA512 0fcc787ea1a598e64ad2b3a7ddd3e8f77789620cbc435fcfdc10c702283ac7aecfec17dbf6a44d3c67c5988ef4feac886a07f88f334d0174b14e354faca2de5a
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 334 BLAKE2B 6a294d6b99eae946447ad1c333b9d8b7ef7548ab866e4a26ec4b3d3c87ae88bbe62e472ca68ae973164946ab81de13089a87037a81d44541af65125f4711b61a SHA512 d8063e9638515be0afeb0d8920f1bbd29da9c156b84fe023d1e7ad72f8bf8f1aff59c9e0160b6e8943a9df50ff8a2f2f341a23d6b5dbd3c7b724f57dfd100b5d
diff --git a/x11-apps/xev/metadata.xml b/x11-apps/xev/metadata.xml
index e17a5bccb78b..e6fe40f6075a 100644
--- a/x11-apps/xev/metadata.xml
+++ b/x11-apps/xev/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xev</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xeyes/Manifest b/x11-apps/xeyes/Manifest
index f841f51afa5c..b782a075d2a6 100644
--- a/x11-apps/xeyes/Manifest
+++ b/x11-apps/xeyes/Manifest
@@ -1,3 +1,3 @@
 DIST xeyes-1.2.0.tar.bz2 139218 BLAKE2B 0869cff711a58e937ebaf0ca5095654657f0782e7acac3553ef48469cd780c0fd1707df3aa60ed047cae44009b524cbb86eea1836c08fbbc4a1cc31fb99cbda7 SHA512 2d1614614b3ba3d1ebaa0e9801a2e159389b94aaacafb962d326b7e6dc712c1eb2c12a50ceb10b3135cf0eee6ae86bbf84e73098deb08e73792f14a60616b4d8
 EBUILD xeyes-1.2.0.ebuild 539 BLAKE2B 6558dc9f08f59953a095286f9fb9c877ae88db40e6902c60756a2b46068196768257b0401d6dbf39219532d2030e8a0a11279e06eada06231abf85922adf5bed SHA512 33bd65edbb418f6ebf4693bb072d7637b1d2faacaff1ed25c024a7684d85c18703b732423cf457551939d924510404d55b76473cb76041aa96b03acc62c87f0a
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 336 BLAKE2B fc6958747f5ba57381bdf86b97a10614a002d2bb998e34972e88556cb992f25c9286ae1f05455ca02a52f644c1c263c3f8c91f71f0bf42ff78860aca55f51176 SHA512 104c502c70f21cfdd54b6efb59ca3104dc27fe622435faca936b0777c96013bfeee3961a09b8e97b7fbffcd5852ca1f9c73c04957938e83eb54093d1ffb1e7fa
diff --git a/x11-apps/xeyes/metadata.xml b/x11-apps/xeyes/metadata.xml
index e17a5bccb78b..b6f247ecaa63 100644
--- a/x11-apps/xeyes/metadata.xml
+++ b/x11-apps/xeyes/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xeyes</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xf86dga/Manifest b/x11-apps/xf86dga/Manifest
index 5e39b2fd60da..c13b8fbafec1 100644
--- a/x11-apps/xf86dga/Manifest
+++ b/x11-apps/xf86dga/Manifest
@@ -1,3 +1,3 @@
 DIST xf86dga-1.0.3.tar.bz2 104935 BLAKE2B ec294d1d1d49b57479d52e9bee834ad15eb15758d50da3d894c5236e9d94a37e2383258e2c2456ef6a6cf9f73d1332b594fc663a48dd0241cfc02be1b9157480 SHA512 18dbf9b5bbe1bb9c993c742e04e132ee22e376148a499ee159418435477221b00904f36c1a6b1063df788079a4ff5520b4d604abcafaad3b5fd391a3b2c1ec07
 EBUILD xf86dga-1.0.3-r1.ebuild 370 BLAKE2B 4a23ffd4906f98ad365863bbd6041ffdd921bf44710005a7c76533efa560eedc5883785ee71989fc0d0cf84b8be08920e8c8fa1b8ddb36cdae086004eab1b727 SHA512 7740aa48560d5111cc3bcf9b66bc71889d22876d8ed6e91ec2b1bb5d40d3a7d0f7f811b84ff7241d921c2ecc415b27f88413cb2eccd468dc777f2569e123e65d
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 338 BLAKE2B 84f15534982338b1e3a7352e8b95f49721467495149d2d552f4718a4b14c8d15694309eee7cee8cee022a1b7e2f95bda0d949c655a9273f86cf669380851b084 SHA512 962f744e812fa2f58c69b16e1be5f5a702a417f363a9a9fab1dbd6e0fa07f7dd971c22d1ae91c5a240c0cf512c8c43c7ed00e14d10716cb7a25930b8939e606f
diff --git a/x11-apps/xf86dga/metadata.xml b/x11-apps/xf86dga/metadata.xml
index e17a5bccb78b..75fd2070dc8a 100644
--- a/x11-apps/xf86dga/metadata.xml
+++ b/x11-apps/xf86dga/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xf86dga</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xfd/Manifest b/x11-apps/xfd/Manifest
index 00ff0e70b4e8..be5ccbe8b1b9 100644
--- a/x11-apps/xfd/Manifest
+++ b/x11-apps/xfd/Manifest
@@ -1,3 +1,3 @@
 DIST xfd-1.1.3.tar.bz2 141312 BLAKE2B 742b6a1fff10593252dc27aa352ac500d9a17952e0415de80ea265322cfff7ef2c4c2435005a82c12f1b50003920322cfa27dab3af30b60575d4ae7a1b20f787 SHA512 68e2d4ce5e24215353b6f3231191d69639c4dd90a703e03ccf152bbfe4012da071c387ba289f918fb0336a3be9ee49dc05cbec7273fa85f5e476ead7e10795f0
 EBUILD xfd-1.1.3.ebuild 444 BLAKE2B 4410050cec9a39a3c7d21c7dfa26add9bf9fb90c04149c1d8aeabafff1ae61eebe72dbecc886abe6d1ef2590bfc1a55c3a3e2ace4681f75717251639f830d560 SHA512 d24f5d64bd9ec9fe4d6f3d93e2d031d683e4ec69203d54716be674254cb9cfefc7efd76dc5fa0d31a7fd75b18e3dc28452176238184fcef2addbba466b455e99
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 334 BLAKE2B 0eb85d33bbe96687dc5b2ea040f4a6134ffa17d28fc67bffc4c17616105db850f8c4e949ae0f3dda70c9f491f7a194b394ead2576648939044cb5556b5bd7e18 SHA512 b984ee1e0e6b855884e9b9e15eadc24c953786fc6618f32f0a586777e623e2de9b56416c0b646eda11c05709affaecc19750b5c621749f597766abc0e1b72d5c
diff --git a/x11-apps/xfd/metadata.xml b/x11-apps/xfd/metadata.xml
index e17a5bccb78b..ac346395bc17 100644
--- a/x11-apps/xfd/metadata.xml
+++ b/x11-apps/xfd/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xfd</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xfontsel/Manifest b/x11-apps/xfontsel/Manifest
index a693c56142d8..93c61b9f10c0 100644
--- a/x11-apps/xfontsel/Manifest
+++ b/x11-apps/xfontsel/Manifest
@@ -1,3 +1,3 @@
 DIST xfontsel-1.1.0.tar.xz 139560 BLAKE2B e4cb8f25b64e1feb68cdf7ae7982c8e8e6086fb6ad31019b115986220cd9f347edbe738d8d43d0650fd783ef96d2e93a247e462611b0fb33a3aa0a6dc2d2529e SHA512 be67d223668431c9b5dd2ef74032d2f087be5f8f0ccc427bc7ee43e7ce42214edddb07d8c3d6d6de93ea35314392d384f1ab1ae5c48b2cfbce418610e3945a52
 EBUILD xfontsel-1.1.0.ebuild 447 BLAKE2B 2c6a91964a850f34f46ea2375f9955ab12de41d88664f39523cc583c958b42b3c194dcc887b41671561625999822d4246d5a5bf75f9608fa210087e2d72b79c5 SHA512 c09d5cb6d42750f582330a0deecfb80035be97d9212e210cc16f18b6a3119c465eb70850ac58f20635820b58cabc967db68edba14f09c864dd60f46e77b35377
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 339 BLAKE2B 8cb4ceebb923ea38c93be396a54a98cd71072dd8906e4b1df58d391c4424f75eec1e9c2451ad821807f32b94bd786e77f95c211298fabfdde3fecab9b87496ea SHA512 5df3e96ee12a08d1af76a65733049d45cd865386f24789fc47d503f53fe0af63948e9241f43f0ca55597eecf2602618260eb2ab9d7e0c439194f3fd9166b10e4
diff --git a/x11-apps/xfontsel/metadata.xml b/x11-apps/xfontsel/metadata.xml
index e17a5bccb78b..430ea5642cb6 100644
--- a/x11-apps/xfontsel/metadata.xml
+++ b/x11-apps/xfontsel/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xfontsel</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xgamma/Manifest b/x11-apps/xgamma/Manifest
index bbe2ee4549c2..1d8f3c96cafc 100644
--- a/x11-apps/xgamma/Manifest
+++ b/x11-apps/xgamma/Manifest
@@ -1,3 +1,3 @@
 DIST xgamma-1.0.6.tar.bz2 123105 BLAKE2B fbf5496e7c91f1e96d591721bfe7a1771659e7ef408be689e205e898191e0fd6beeff9466f4eff628054aefa640e83d7a8d69de028a6a6e5716a1eee50ef0abd SHA512 2d41798e15ac8c6f6731a2da29589207d936eaee1223ce6f3ca948e67d63c5c8b955d11c7db092dcd8c66a6209bd15c1de3dc1446dad4b4277134f010c6fc47a
 EBUILD xgamma-1.0.6-r1.ebuild 375 BLAKE2B 7c0337e205283bd405464080a1ac70ce0857e976582409fc4bcf9a5b8593140c285bc30956a5bfe92df826d580275dccf8b7e819fd1adb0399bded5f2d45e2f4 SHA512 9c31b873c317a27017a73f0e759de83d4c4516dfc593665b25dd90fdd7605f28623a0d2e0f2f352e826370042a515525bd1ec69d9cd7d09876f9a96935616022
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 337 BLAKE2B ef7de297d2f6dd9870fe1d33345d30c142710b56bee604f680f9ff92413acad4f8686553f505fa19f28a40fa9b0c781d0668391bfc7ed3f512a046a5c9691c90 SHA512 3c61b321abebcc2bd0e7358d939de1dbb69fd026426e368f3a6874473154860da551a251234a31962964dc6ee62afbf9c35e5ffd65af7b89b175fb594e32ffd3
diff --git a/x11-apps/xgamma/metadata.xml b/x11-apps/xgamma/metadata.xml
index e17a5bccb78b..7d4913f724ef 100644
--- a/x11-apps/xgamma/metadata.xml
+++ b/x11-apps/xgamma/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xgamma</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xgc/Manifest b/x11-apps/xgc/Manifest
index 379e8fccfbb5..f1b329c6d630 100644
--- a/x11-apps/xgc/Manifest
+++ b/x11-apps/xgc/Manifest
@@ -2,4 +2,4 @@ DIST xgc-1.0.5.tar.bz2 188307 BLAKE2B 8e3906ee07898c1382c692d3ccb7541de40be55dbc
 DIST xgc-1.0.6.tar.xz 177228 BLAKE2B 3277463250f472ac3dcecbd4a723d59a5485c7ddd8df585ec2c80dd94e63ac1c462644cd57a15065c398c725bf558e0e948796dc0ae44ff65dd49b750fb391be SHA512 f449b9b2d313aeba1fe9bf33fef90291776403f1fdf4afc507c4b973045c97fc8ded65ddec4f8c58727e7e4c7c4ad6a65ae79581eb4bdfe9c79a5f909dbc0a1f
 EBUILD xgc-1.0.5.ebuild 284 BLAKE2B 9900bb11a8031b0d264101b94c471a687ac80e2cfb076dfb2240282ff2e75683260a538850b208d13b4d5ec31abba3bc560bdb5b987c6ac811953441ed9ce2c5 SHA512 20480f920022099036d88aef0503348674dd3343958c1a0e6d843ef697a90d580b5cc0f7b0b898c3da34e9b4712bf56585f08ff87319da288a2b653bf45f3449
 EBUILD xgc-1.0.6.ebuild 335 BLAKE2B a7b0f8b63a724eb6017d6d367b04e601df91d428da0f7bb49f979def108b7819a07d60f9a0d955aece85739917eabab52379f606e6f27539c36cbd4386ce1d8f SHA512 e4d326e143453f2483dbeea0b7c9f6f92890f3c83b6b5dc18e6c912d5f287b6e56f0fd9321fd8675ee48c28fb5fa12b9d702651e2d66979459f65a803266eb64
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 334 BLAKE2B 8227ce2611baa3baf275bd4235d3201758bc24834511e3641845c692241630f69b3da64258030a25c67f124b683d49668f8595d9b53f4644e6f3610d8a0572f1 SHA512 a7016e57975ad009d45ad6de0edffa558f737f7ae3ba13a587f5e8fe569b8bafec874a9376339b0336906b6e6fdbfd7bf225c879749891cf57097742ff6f8eea
diff --git a/x11-apps/xgc/metadata.xml b/x11-apps/xgc/metadata.xml
index e17a5bccb78b..f3906d609965 100644
--- a/x11-apps/xgc/metadata.xml
+++ b/x11-apps/xgc/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xgc</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xhost/Manifest b/x11-apps/xhost/Manifest
index 6f4de6d7b6ab..20c17c767f41 100644
--- a/x11-apps/xhost/Manifest
+++ b/x11-apps/xhost/Manifest
@@ -1,3 +1,3 @@
 DIST xhost-1.0.8.tar.bz2 138539 BLAKE2B f05d58444537431d9dce5e6dccc27bc8116141d66b34b6edb356dbe823898dbb2927f8ad8dc133178efc7e5b399b7b6428883ea7c665577d4b1984300474eabe SHA512 55581f9bc45a70a73b13fe718ca83c4cb0a6116d26addc0f07659ebeb5bf7d2379e84cab5a1702ae77a298a66f42ae03f41ddc7d5acd61c6f18448e58ad7cb6b
 EBUILD xhost-1.0.8.ebuild 564 BLAKE2B 3d5c00b065db1103e278e6f2f7e0cb3628251ba3cb271e24d3a9612c4f447373ea2cf2a9830fd8ee54cd0c70fd448f87d30f1fc44ae71d55aedcdb5a13744a76 SHA512 97c6a33bc917a30f8057d76be064dccf13ca68a8a7d07db3f03a653b669466f6f7a85f5dedd17899f5355024c6dc1bb7878cd076f1a5920ca13aed35463be7a1
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 336 BLAKE2B 4ac510f48734a3d057912f12ab061568620275dfb05bb28f5226f2221fa91567d074047f6e45db79a5e788a0a7387c2a5cadf279ed59371a270aa3f1031d8e94 SHA512 462475533ea9306043d4631f3eab65fb1b333bf002705dfc7bd1cde51ffc3c3a4b6416703ae80980dd6304b3fc07172789a6e66a6c91679f69e0736bc6ac00bf
diff --git a/x11-apps/xhost/metadata.xml b/x11-apps/xhost/metadata.xml
index e17a5bccb78b..e59fd72796ee 100644
--- a/x11-apps/xhost/metadata.xml
+++ b/x11-apps/xhost/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xhost</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index cc33733c4fa0..0feac2d1cb5b 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -8,4 +8,4 @@ AUX xinit-1.4.1-move-serverauthfile-into-tmp.patch 745 BLAKE2B 6a964926b4f5eda56
 AUX xserverrc.2 143 BLAKE2B b33fac4b5ba731c79167d21a07840c46abfbb33e8fbb80aa1c3f23a8717f836819da3a947b72bd99c7a14516534e9771033bcd1e26d167f2f7083be20eae3b2f SHA512 61afea54f66b9f397860e467cf87a41e1d9f97d7194930bccc254e44dd4178bca7b402bff7aa2a1d6f44a91680f3f1ee10a5b57e527aaff80438623edc1b07c5
 DIST xinit-1.4.1.tar.bz2 176206 BLAKE2B 1c20f34db344eb967ac230a0cd61ad07d0089668aea32973e9b8b9749e5260ad5d93a7f6642a4f2c8d6b01870696e4e1e422790c2954320039aa85e6dba8870a SHA512 6cbc5d025a891c419f3f4493381b2fca57a67d78df866d2f16a83426f86bad6eca7f240fac12b25cbcc63df0fec41f625407184e044898602d66483715315340
 EBUILD xinit-1.4.1-r1.ebuild 2235 BLAKE2B edb03d0cd6d1388d5c68a7954c2badae58059e04871f19d24af1bd64c92524af3f61e356fba72d8b35e870fe04089afcf3748ca7bde8622aaf1cbf410efd4fad SHA512 c84b96f584fe2a960237e5874faabdd9b04262b37cf5a3dca900a4762b84e18c0e563fe65cf71b8a5b2a6e58370c74356a79f7a2c48d6c6f03ac744c5b95862f
-MISC metadata.xml 478 BLAKE2B 8d4b9cf42e324361c939511f2daddbbf96ea4bd29fa070a6fb31517ea8acadf1c138c1c933a36bae84b57a74417ca1e5c5b5bad8a69d8157137977ee9f5ad710 SHA512 98c8beb233f55b54787e2a52d8868016c785f3378e9b9abff51bb593944c14bdc63966f1ab5bdf9f98cd33cdb38bb6b42a58224423196ab39f46c26a0e42996e
+MISC metadata.xml 550 BLAKE2B 3c7e6936cc7db503b1f4e654e6cc42edfa82524403d8de329e058cb4a8e084075f1c7047e494952847ef137c0d411b4ab20e1f54e4264448040e4d62af0f1ee2 SHA512 d903eb4c148009926f925d6f20ee29316d98adf4ee3431fd47f098d907fc9e777bfa33d34d90163fdc69e6ac7c895f67852269cc938deb2c22102ccb1ca5393b
diff --git a/x11-apps/xinit/metadata.xml b/x11-apps/xinit/metadata.xml
index b653bb82630c..382f2def24ff 100644
--- a/x11-apps/xinit/metadata.xml
+++ b/x11-apps/xinit/metadata.xml
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-	<use>
-		<flag name="twm">
-			Control dependencies on legacy apps (xterm, twm, ...). Safe to
-			disable if you use a modern desktop environment.
-		</flag>
-	</use>
-	<upstream>
-		<remote-id type="cpe">cpe:/a:x.org:xinit</remote-id>
-	</upstream>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <use>
+    <flag name="twm">Control dependencies on legacy apps (xterm, twm, ...). Safe to disable if you use a modern desktop environment.</flag>
+  </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:x.org:xinit</remote-id>
+    <remote-id type="freedesktop-gitlab">xorg/app/xinit</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xinput/Manifest b/x11-apps/xinput/Manifest
index d5747fc4df00..e24fa5169c5a 100644
--- a/x11-apps/xinput/Manifest
+++ b/x11-apps/xinput/Manifest
@@ -1,3 +1,3 @@
 DIST xinput-1.6.3.tar.bz2 162556 BLAKE2B be5e16301c6a48999ccce5ec3062afb195eb1a6357f09aea41e88a4ea43c4497b8377a3da8d5c80b059afb9998370a7a53561a92c04ff8f56fa5749d577b0144 SHA512 cb2fef866ac5a71dbca3e23b4ecadaca38e65dc1b30f8bb024bad92486554fafc472706619a1af04c746a4f53ce6aea827d694b9f4f0c7d0d46bb1da81984076
 EBUILD xinput-1.6.3.ebuild 432 BLAKE2B 732aaec942520d03da102bc68d75b53a564d92eb58dc70ac794a2c89aae7fb2362fb031e1146bfdbbdf859925f91d490015de5f1bb6ec39326aa4e3a6bd5e66a SHA512 3c5eaa8f3f6de6a7f520c41afc28cb6041e4488261061a053bda52d11b1e65d880e1528d5740f4a6c78abcffcb8fa344929fa5d86ec9bdb10e0af92618816331
-MISC metadata.xml 316 BLAKE2B ae613167bb8b0e7d6bc2a6a92596b9e1386b9436a34b3c3439c434556f91758801e2a509328e1b16265b855149885b226be253c5d5c057eff11b6d1036531db5 SHA512 c6ecea9a5f3fdcd88610aace972ab2d84a412a19a33e65377f22d82c7d41daf8b80b7a56840197087a2526351f2d82d7f8b61366ae1d7b0c7655889781336a47
+MISC metadata.xml 395 BLAKE2B 6e2eb6c7efd29dc664eeaf42f90e810322c8ba21d2e5d1a5d9e996304a711b174ab432a923c01590324a0cb702a6f3c9e2cca141c6dfc4eb69b4d21312c12162 SHA512 1bb6aa872d22b9bec4e25ba78bddfde9fe64028e3313a293eb80566454ae1475470688ff82fc0f3e5fd6646355447351d7b3e55e64396f001021f0151ad8fc44
diff --git a/x11-apps/xinput/metadata.xml b/x11-apps/xinput/metadata.xml
index 10f0503c0f94..c5628bbf71bd 100644
--- a/x11-apps/xinput/metadata.xml
+++ b/x11-apps/xinput/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="cpe">cpe:/a:x.org:xinput</remote-id>
-	</upstream>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:x.org:xinput</remote-id>
+    <remote-id type="freedesktop-gitlab">xorg/app/xinput</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xinput_calibrator/Manifest b/x11-apps/xinput_calibrator/Manifest
index 29909c6bb446..c23dcc1e5732 100644
--- a/x11-apps/xinput_calibrator/Manifest
+++ b/x11-apps/xinput_calibrator/Manifest
@@ -1,3 +1,3 @@
 DIST xinput_calibrator-0.7.5.tar.gz 355313 BLAKE2B 72c6b2f1b2cf4d5baaba27827e870adb52c4a51004a9a3f51376c5e30560b26abe6e83a94ae2e308a01dca3204a1938d888d40cad793cce50c1d9acea9f507b3 SHA512 dc022f4de6d7b57912373a571ef0598c7b9d91cdbc3f63bb2b32c6149e43f67eaf820dc0289349d527314381d5195cf8891f6bcb9847110662dd75875f76b9de
 EBUILD xinput_calibrator-0.7.5-r2.ebuild 638 BLAKE2B fb71f6c2669d13d8d99bf53889d258da5a5df152ae6a44ea5db998ebe33331f3b7fdf9bd12986ad6d0499ca33761e74007e0da9e27219f81eaa68a31f244e316 SHA512 c80d656103dc1db39d04c04ebbfbcadde634a720c3f44db836f2cd592029521970e2c6864de96a292a3b5bba7922d2f436cf4bf6221861694a7e3788551e8d65
-MISC metadata.xml 235 BLAKE2B 5ed3cd35ac32a5cdd6ac490bafdbc1cd03fc8c6bdbc8194ba7f4a34151a24c4ade7a80705d92348d6d13a9579d18b19ec40a353bf014dc02f98980bfa03d3574 SHA512 3fe78f6dd92b87b30ed02aef15ed72ec5cb62f4c6568dd9b98dcb2f11a4b9ce93955e34c62112a310b4c4a51f87e0e31e31ae5af140e1054c127d3cd344d7267
+MISC metadata.xml 332 BLAKE2B 62e8b37431558d65d24de1bc3f1edb5374d2da9ab49bd5fda1afe15479823e1a40174f9e0c069b96406d92f9fa48c9b8dd3f12b7daced813d39a5f55a8cda27a SHA512 1e452e53d38363914aecbeae3cc4d9a0eca424790d646a09ff522947461f1f51a71daa1f8aa1da96d82843a7595bf7528f0a627b49740c03dca8ef8289c1c410
diff --git a/x11-apps/xinput_calibrator/metadata.xml b/x11-apps/xinput_calibrator/metadata.xml
index 6bbd73893d34..b182f5b77014 100644
--- a/x11-apps/xinput_calibrator/metadata.xml
+++ b/x11-apps/xinput_calibrator/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">tias/xinput_calibrator</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xisxwayland/Manifest b/x11-apps/xisxwayland/Manifest
index b6bb1e339aab..147fd4c558a3 100644
--- a/x11-apps/xisxwayland/Manifest
+++ b/x11-apps/xisxwayland/Manifest
@@ -3,4 +3,4 @@ DIST xisxwayland-2.tar.xz 5220 BLAKE2B 47bd626ad2cbeb5b0e114a4f603858c82f4f870f1
 EBUILD xisxwayland-1.ebuild 657 BLAKE2B 65944553932a15bf773973fabe34c678792a16e9a2fc34dc30bb2badedbbffb125ec608c64c25c276ad907187e324e609d328ae4bf7a46e99746450c6888d984 SHA512 0ee7a3b984ce49d10bb3c5c4df0a1f7c4f53f9aa9a38149f36d4684baefba0e96533b1158b05abf88939faab6b4011b71836298f88ffc223b01a00dac16055ba
 EBUILD xisxwayland-2.ebuild 662 BLAKE2B 635fcfe4558cb05792fc914001592ea832245db9e5d1edb540160ca07cdd6a31b282f04b92d42e0bb633112cdfccccecb78424ddd20fc1af21443a064a84abcd SHA512 59b4d65e59ac2476d165837473c1f467c94ac4ea30e142f788ec071c83240832a806e065b479d7a3ca79f0f1fd25a17988fd6f9695e36a478192a534f2385a7e
 EBUILD xisxwayland-9999.ebuild 662 BLAKE2B 635fcfe4558cb05792fc914001592ea832245db9e5d1edb540160ca07cdd6a31b282f04b92d42e0bb633112cdfccccecb78424ddd20fc1af21443a064a84abcd SHA512 59b4d65e59ac2476d165837473c1f467c94ac4ea30e142f788ec071c83240832a806e065b479d7a3ca79f0f1fd25a17988fd6f9695e36a478192a534f2385a7e
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 342 BLAKE2B 22542ce434659a09b234891625d25ab44fb54fb27fc81950a9682ae3250c9b2826c6387460111227f8295ebfe5207a8f7ccb60b80ad79e96c47bfe5ae132170f SHA512 401c20493181e036e7117caa4562c0cf8075b17e1ee384b5e5d6d22a301d6e901fd0936a2cd1f52b50b79e2932f80ceb1a9fd47fc6ede220ce37c9bb2d50aeec
diff --git a/x11-apps/xisxwayland/metadata.xml b/x11-apps/xisxwayland/metadata.xml
index e17a5bccb78b..d20dcf8c8ef9 100644
--- a/x11-apps/xisxwayland/metadata.xml
+++ b/x11-apps/xisxwayland/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xisxwayland</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xkbcomp/Manifest b/x11-apps/xkbcomp/Manifest
index 4e315645c748..31acc83c340e 100644
--- a/x11-apps/xkbcomp/Manifest
+++ b/x11-apps/xkbcomp/Manifest
@@ -1,3 +1,3 @@
 DIST xkbcomp-1.4.5.tar.bz2 251617 BLAKE2B 5005f35bcae6fc08e2386963c5f9aa0394e79178982ee742b7c13519fa35d118b6fe8318d76e2f4312e3fdb9bee23743a8faaf214078d207897bdf5cb8984946 SHA512 2e84f8d6b083e2e818cb95e5d2a184da00e50d71b280e92d1a71465a9a4348f922f4ddccb42cfeee6f76705bbfc8580ef67aedd0d958aaa1ae6bbcc66ccd8154
 EBUILD xkbcomp-1.4.5.ebuild 447 BLAKE2B fdbf600190f030413562f3429e8c3a0e6540b36c5abc06f51c3a8b7607166ab9eeb198e6dc733ace5fac8ff68007c776df72978dea11d1445e5fd3d56e22adeb SHA512 db99503b8a86451257b75b21029dbfbeb60d70641d55d3e3089aba8d8ac4accaa65f210effd277ab53c9e62e29edb021791c006c931e9c2df02eb46aeac7c68b
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 338 BLAKE2B 8610569f3536f5df1d6a844d74b3b70efdb0a15dc6f2bb1813dd65a05205f3a10eed4f6c59778d7d635bbc95762de82720213ce8a0b575d34536267358aacf57 SHA512 de4fae6cbd0e7ce80ec4df227f4a9c2b03f60c0a8edf05bce1c4e472f3147454ac55fff4505bfac6422b2991d683bdc19d0dab6756cff7b29fb564e4b6ffbf43
diff --git a/x11-apps/xkbcomp/metadata.xml b/x11-apps/xkbcomp/metadata.xml
index e17a5bccb78b..bdb485423c43 100644
--- a/x11-apps/xkbcomp/metadata.xml
+++ b/x11-apps/xkbcomp/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xkbcomp</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xkbevd/Manifest b/x11-apps/xkbevd/Manifest
index cce3e194a933..ea78d8ec82df 100644
--- a/x11-apps/xkbevd/Manifest
+++ b/x11-apps/xkbevd/Manifest
@@ -1,3 +1,3 @@
 DIST xkbevd-1.1.4.tar.bz2 151991 BLAKE2B 5f48968f4a45aeb5a851ba5c6c9cc6dd525d4385bda3475e1261a8419a3ea931fefff8e315309b6fcfba766ec9d95b4d64b93861f84798f5d730e2c5584c2cec SHA512 7628eddd0e1dc0c4df8e61eb3f6a6bf0e9d92a87e96bb2f5248ba5bd3d99d868885c36860b78e8ea2eaba3bb9a420067ef95c4d58c1254fa3d12fb25dd4e60e7
 EBUILD xkbevd-1.1.4-r1.ebuild 363 BLAKE2B 9e391c2120c7c13d92d434ba4072be5d39e9589820ca1fca715d60b575b3e84c34fe7fda61493d994c91b00abdcc250e297622e832e0136d7d848f7ac970080d SHA512 352602afb9c421023e0b531a3a3b9a287dcc549d8643b86184ab7d827a1077b883609004ff5a053dc24e50e36157dc6fc36456a3dbac085f5cde4e80e3ec8eac
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 337 BLAKE2B e2e0ec941bc363d8c1241b97ede649449311fa1c20f75e069310477c37db6eb04bd0d7a6c20a51ba55b01ef48774f22baf8aa4e96808cac0e36713a0ced257b7 SHA512 08b14d9cdec9b72f1e442d8831f83cace14311ba3a3a72d23f69946eecb827dfc1957ccd960a991238a82875c40875a1ca63d2d0603e98f82dc8db6ef36eea96
diff --git a/x11-apps/xkbevd/metadata.xml b/x11-apps/xkbevd/metadata.xml
index e17a5bccb78b..66f10f05f19b 100644
--- a/x11-apps/xkbevd/metadata.xml
+++ b/x11-apps/xkbevd/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xkbevd</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xkbprint/Manifest b/x11-apps/xkbprint/Manifest
index e2d40035fc64..c93a23e75532 100644
--- a/x11-apps/xkbprint/Manifest
+++ b/x11-apps/xkbprint/Manifest
@@ -2,4 +2,4 @@ DIST xkbprint-1.0.5.tar.bz2 166856 BLAKE2B 99d375e88a871ff440ebed587b01961a6e2fa
 DIST xkbprint-1.0.6.tar.xz 156920 BLAKE2B 88a62e3138e0d68df4cdd335f82734037649acbd951ef5997382216f7472560b2ad6e4cd0790e4260baba9864754b54b4a7cb9c42444f44caffef92aae392b40 SHA512 a1c2401b2a2ef4c6bd2efc18923ecb176adcf38b6c5dfdce25f22f1f5ab21e25f494b25dac25b1765fb9a0f6acc24d191cd41b9a098a9e3c6eaf9a9df490be29
 EBUILD xkbprint-1.0.5.ebuild 341 BLAKE2B d21d39d6cb05f4222f80473f010164e340487e80e9defe0f4dea30b20a2165aebdfc4ab19f44321b041f5f73b367bb0c2608848d0ada83763e767b28fd52d864 SHA512 6b40b3b2baf05a46f74c6920af5dfbe3d4e5346fe40e6294b9894812942d135e3e9b3b6e1a6b0c6d5b06b10ca0650c0875f07deec3cbfc5992e7bf3e7d691393
 EBUILD xkbprint-1.0.6.ebuild 365 BLAKE2B 8a44eb44f1580a675d2f0be2872c50f756c2b73cbb33508da696633b4ffde4a8b0365f166760ccd7952137441316c5fe57e6b07f91f55a46f6cfeda0c7c46264 SHA512 40f881555cfad02e669580cd6f146dd43fe86f2453659f72ca6e614eadbee2b2f8b0c9ed29bc068a777844c9c2bc7b57774f19a1db1e0ef8d9627363eb2994fd
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 339 BLAKE2B b4471ac13275ceb75150f72b824061f25431023c0b782e6390cc2e714c9d642cb5e758adab4efc23b650f165d606e39c4516945e8ac404d95c9e7487d67f931f SHA512 fea33866702190c4f038e6f46ad52e0ca07bf92d910204a2aa847c188e6a5aaebf8c73bb1ccde195382fd6d08852a103ef16027225faee81d48e8705a17d1e4a
diff --git a/x11-apps/xkbprint/metadata.xml b/x11-apps/xkbprint/metadata.xml
index e17a5bccb78b..ffbf6a66464c 100644
--- a/x11-apps/xkbprint/metadata.xml
+++ b/x11-apps/xkbprint/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xkbprint</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xkbutils/Manifest b/x11-apps/xkbutils/Manifest
index 3cfbc63fe442..3365215af0c9 100644
--- a/x11-apps/xkbutils/Manifest
+++ b/x11-apps/xkbutils/Manifest
@@ -1,3 +1,3 @@
 DIST xkbutils-1.0.5.tar.xz 129344 BLAKE2B ac2572b31638120dd5c5e92497f9cde4b43df7ab0f13882f5f1fbac71084dc112a1f9e34d10adf5a4eb83b1b1636ab2388ae8675be5ac1048a3913ac7b0d7f53 SHA512 0d8d460f5e015e9034292688437511068dab61216c2493f2981cfb63aaa012976ac9435c1586a22c0940fbfcb779b48dce9b85832303fe2b854aa945b814ac77
 EBUILD xkbutils-1.0.5.ebuild 384 BLAKE2B 44b1fa6c0cf58369132f2b25969977ab746a98e3e2e6e0a5efb3a4f1ac48aaeee184e5d75f3248fa94ae1408daff4408231c263b4d75074e146f6042f8bb9625 SHA512 46fe3a2533c28cfc699096c8229595794e64a63d0c08946727d23931878b92ed72226be7ce8afd66781814209487c6ff50ea7e322e82a3fa1642174242e51218
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 339 BLAKE2B 7b4be159854a72eeb269ac7349edb97862748cebb7d7b37d858dd2283f791890caeef442fa44cd804bd4a776c66666db4e327e3b8b5417d15007940702af2ac6 SHA512 bb940fa2dca293434d965d7fd443dae05b1b70dc34c2939389c367875c71a0e6c6e632dd95d2c75e0a85b682ecd6c0131030c069c50f2ada4d3782b9e238e95f
diff --git a/x11-apps/xkbutils/metadata.xml b/x11-apps/xkbutils/metadata.xml
index e17a5bccb78b..eebf1059f849 100644
--- a/x11-apps/xkbutils/metadata.xml
+++ b/x11-apps/xkbutils/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xkbutils</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xkill/Manifest b/x11-apps/xkill/Manifest
index c5104e72de62..21ce3013c151 100644
--- a/x11-apps/xkill/Manifest
+++ b/x11-apps/xkill/Manifest
@@ -1,3 +1,3 @@
 DIST xkill-1.0.5.tar.bz2 128146 BLAKE2B a01b954872eaad2aefe11335df2c85972abb8d36ae0c00fbca02b5af2d7df57934e3ddc47455f88927a90b0bff5ed707ca6dddbbf5478c89b193c98a86cc0562 SHA512 4603a1794f114f5cea2c885020c9d073c8421d1e785c99ff6b936ae97139c8dac8020a187b5bbd0fa6d56ed6fab879441b42ba900cc5f2f5a534dafdc86b9249
 EBUILD xkill-1.0.5-r1.ebuild 381 BLAKE2B fb94507520a6baf94e9506a64d2095ffe2811c6092a4529f06122caaabf46710c714d3d1a2102d14aba1fbde07f75d1489a8e4abe9a964b478995a56b70ec68c SHA512 21f97759c8559c2be430cb5ffc411eebe19eecdd4f364d760bc9c6a481b82e0ae8d33fe6799b8b036358f880a92f63bf2f646f968e42909834a7262e5643094c
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 336 BLAKE2B 5eb479c794559cbbca737a5c07ca77411b8d130b9c7f388e614b6dc3df652308d63b1cd5ffa8cd7b42849e1da074cf163cf82a4ab8e34abf54ef6278a7618cb0 SHA512 29f72da0e08df434ac10e91129d2737de7661635ac74341507a1ce315c1c2f2cb1472233cba88d9376352921413d4aa812279e774bcdd32d592638321c0cba40
diff --git a/x11-apps/xkill/metadata.xml b/x11-apps/xkill/metadata.xml
index e17a5bccb78b..7fda1cee4d94 100644
--- a/x11-apps/xkill/metadata.xml
+++ b/x11-apps/xkill/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xkill</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xload/Manifest b/x11-apps/xload/Manifest
index 2162f1a47fa6..221da5629b69 100644
--- a/x11-apps/xload/Manifest
+++ b/x11-apps/xload/Manifest
@@ -1,3 +1,3 @@
 DIST xload-1.1.4.tar.xz 133204 BLAKE2B 46002e9bb6156552c9dada2daf68723638b822df6b87433682dbdffa684bd8b344dba2d66c6d2a9bef60f148455fb64885d9a5e28b319367df3dfed267cc0841 SHA512 114babe4e5a60f4713f9e4627ee0a1bbb2f1f238cb46f24c38aecff67f25e6b0f58cbd554c71095ddc2b01398adbfa379550a34c23c413db52157648028554f2
 EBUILD xload-1.1.4.ebuild 437 BLAKE2B 7412a7fd9511d4381d0d7d72b2b0e41842c5f0a4d26408be04ee48ed2230d6ec2742aa404b87db5a5c1df4c5af8f811a617b6b548a8ec06ed45025b6aa1f9760 SHA512 93841106ad716c7b42d2aad11de4a779f7041a71cd479eef7cb3b3b46e7910ff660bf3e2a7ed50717de53ad5982b090045bcef1c2604603c5502c53497de694d
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 336 BLAKE2B 1340f045483ced6f38d06ce4f1c35a2fdff37c7d6a41b79980079699567ba96885690b873b37da4bc4150108937fa8d71faedc0e59c07bfd42d8ed56cfe47c36 SHA512 3bf0579bb8fd772a3e28c93dbfb34a183c13813d3dc2f7290ecc5bff42707a5c620bfdd82e8c90c62e15140242ac68e50597bb62643238cc67e77cf61045ff98
diff --git a/x11-apps/xload/metadata.xml b/x11-apps/xload/metadata.xml
index e17a5bccb78b..2ff28125f794 100644
--- a/x11-apps/xload/metadata.xml
+++ b/x11-apps/xload/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xload</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xlogo/Manifest b/x11-apps/xlogo/Manifest
index fe2c6f348cd8..de603a0f58d3 100644
--- a/x11-apps/xlogo/Manifest
+++ b/x11-apps/xlogo/Manifest
@@ -1,3 +1,3 @@
 DIST xlogo-1.0.5.tar.bz2 135608 BLAKE2B eeaa9dfdca57bd5b60035dc31981f3b3e390862b5e8f695422505059f657cfe727d491c757e8ef4dba4a913179c92827741f04e3fc6765b0257d63f1382fc69f SHA512 0d78e269b0be3c5de71de7f362b896bfd9934ecd9d0361b3302399b1269e029c4a9f35418d792121a1edc34405d753f9d69c996cc3a69ac717f2b0d1f736406b
 EBUILD xlogo-1.0.5.ebuild 463 BLAKE2B 343e265c09c977825f279f8c911b128061cee347c53e6f7b0b75e3c28d5a33ed6d9b739723d66ce518ae23501df47e9900e7d3e22fe2fadc1e1e31f1ee5841da SHA512 dd0f6c88a2462341fa3c3ba65014cb7231ff160976d5719ccf022eb1c1a663892d6b242d29c45d33149c1b66eaa8ad0230b6a2b229fe641ba3e554320df93b22
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 336 BLAKE2B 3d29f95f3977cd9af4c119b68ab2710cd730cdf2805a84f68ecd50e7c2ab77bb9d887ad6104fc2812064d87c4a5a733da802e3c564ff144dbc6af0dab945d52b SHA512 a57dced6e58758f839a9353e2d01e96566095640a39a1cf250f786c084775a1186242c444796504c1ced8893df4b0dadf418a9abc726f4f82b0dc05b97b4689d
diff --git a/x11-apps/xlogo/metadata.xml b/x11-apps/xlogo/metadata.xml
index e17a5bccb78b..6529917935f3 100644
--- a/x11-apps/xlogo/metadata.xml
+++ b/x11-apps/xlogo/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xlogo</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xlsatoms/Manifest b/x11-apps/xlsatoms/Manifest
index f41e36290fc0..0d7aaf85281b 100644
--- a/x11-apps/xlsatoms/Manifest
+++ b/x11-apps/xlsatoms/Manifest
@@ -1,3 +1,3 @@
 DIST xlsatoms-1.1.3.tar.bz2 126327 BLAKE2B 7a4ca35e6968432fc99dcf665b3f63ac84e5bda8a7b061fca9df7bb12e447e83feaf4c82d80a4e469e680042d7b856708821febe44897acf5cba7777e90073c4 SHA512 c267ccfdc5a83e834bfb5c3b144e22642badcadef4eb146eeec2df6fe6f85e9379500ae4219912c70fa2e535036a1a96cf496381f5d814e79af075e03c975f30
 EBUILD xlsatoms-1.1.3.ebuild 323 BLAKE2B 82d384e14148b78f098ecd85a676cbc8f486d4295cd985eb109c24c8fe4d6060aae4d5fd07f64168f40babe02bd563cf3d4296534b863e40298cb0dfbfd4962b SHA512 ed305a905cbef457bccd5e6d0f2f66bebf2813db4be4d726a00acf6f1952177ceba1fde97cffd7368257da1792a1b29a10a92e9b7cdbdb36c2866bc781e88368
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 339 BLAKE2B e5d46df006541797db873b5e85998500f43bdd6a349f1f97511cb08c321003dee3ab21959347cb06a832e0bb2da8e618dc638eec87f676ec1ae994023d65adac SHA512 c35cd2ea8ba3a621e0b99f98563c42c14ca627e295e81873d30f5ff68e841ae0316114e62db0d7a8ad8c9916013a7bc98effd41f39fb8c59e041fd3e881c7426
diff --git a/x11-apps/xlsatoms/metadata.xml b/x11-apps/xlsatoms/metadata.xml
index e17a5bccb78b..0e62b4351929 100644
--- a/x11-apps/xlsatoms/metadata.xml
+++ b/x11-apps/xlsatoms/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xlsatoms</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xlsclients/Manifest b/x11-apps/xlsclients/Manifest
index 35f874877670..eb4fde192e34 100644
--- a/x11-apps/xlsclients/Manifest
+++ b/x11-apps/xlsclients/Manifest
@@ -1,3 +1,3 @@
 DIST xlsclients-1.1.4.tar.bz2 130586 BLAKE2B 8e13bd29f10035a101cabe2a271fd665618dce12f7047f441bf943e8c4d2743e2385874b8e1cf42b69f6a19b7a3d5c16ec9ecff7e6cb62401888802d6946dd5e SHA512 42fd848d88d3cf31168a37fed63f9f5b60ddc4f36be2956b354e574c93129d75f29e005d6631784380bcef27860b54c64f419ca18ad77f092f4520dec47b10f4
 EBUILD xlsclients-1.1.4-r1.ebuild 361 BLAKE2B 185fcbb23f42d9c6a3c7085f5ba156eb559155496de8f1ca4195725288d4059f5a1003081785879fc7bb23267124a5bbead0f7ad1f60f253ce96c783d46547ae SHA512 6f0519b91a0dcda00d08d24f7bb8c7025401e924cf7f567d0102ed11c4176390e05b71b9381caeb256a89750142be511e8e8f21d46c4f1cb762dde73242f5a0a
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 341 BLAKE2B 2576945ff21e0459b731aac433ba1fcde7d160fa796f6ed8f3626a9c5be5afdfce81f832cf13f22b3af132fb0d3b8376b9f7aef6c35915c71d612e2d49e1b264 SHA512 bf2145c63650328764c399c4d00e6d23c6860fb4f970427f54621c13e84320a1a7f422d2acc2316690dcdb82f6b7dde9edb8ed221f383987f9b72a63f495e709
diff --git a/x11-apps/xlsclients/metadata.xml b/x11-apps/xlsclients/metadata.xml
index e17a5bccb78b..beb9b69bf993 100644
--- a/x11-apps/xlsclients/metadata.xml
+++ b/x11-apps/xlsclients/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xlsclients</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xlsfonts/Manifest b/x11-apps/xlsfonts/Manifest
index f83dcb1ca4ca..c7e6bb6ad70d 100644
--- a/x11-apps/xlsfonts/Manifest
+++ b/x11-apps/xlsfonts/Manifest
@@ -1,3 +1,3 @@
 DIST xlsfonts-1.0.7.tar.xz 126888 BLAKE2B 13f2e2007c38f7d1724e6ffd0c7fe9a3b887a150f50107b892327c3620e4ffdbd4ae1191a9764cc4000d6422fe0f331dcbef11c0b50013ff2d94b699c0cba1ee SHA512 ec82be0a97500a9e64fb5a6adbbec470b249b1267c3081c2bd44cd3e7148107517d1234c1da2f81b0405230ab03ad2943ea53756c3380f4d561665b38d0cedc0
 EBUILD xlsfonts-1.0.7.ebuild 395 BLAKE2B 128c635e9a1abc6dfc79b76eef548e1b23bcc49fc85c5b90eb6aaad6b8696e672086b10c9777a47cca1903a71d9ef7e80d88d40bc6b7540710d8636e72277b06 SHA512 dc0dbbaaf013ab4ea0329037d6e4ce3d12a090a9529cf64a46070b081ae3f5d5abfef98e10aef01457191239f94ee476c39e5a31b861b79458367d63c2b2ce33
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 339 BLAKE2B 74d5aa130fe25b67c3e40ff2701c5c73a65abf68021cde0cdda962614636e53a519109c21ba05df8282a10e1bcd05f0a03d1bf1722c5f107d8ecdac954b975ac SHA512 88d098e3081965ed422be6b64d4a96389c1461fdaa21d1180bf91f36e8da2fcaa6c37b23b884b887a5371decc40b225e8d9942e0aabb69e5f9ab42a7082ffa36
diff --git a/x11-apps/xlsfonts/metadata.xml b/x11-apps/xlsfonts/metadata.xml
index e17a5bccb78b..97f46d4b8635 100644
--- a/x11-apps/xlsfonts/metadata.xml
+++ b/x11-apps/xlsfonts/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xlsfonts</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xmag/Manifest b/x11-apps/xmag/Manifest
index 8f30ede91e1f..c27dc0513428 100644
--- a/x11-apps/xmag/Manifest
+++ b/x11-apps/xmag/Manifest
@@ -1,3 +1,3 @@
 DIST xmag-1.0.7.tar.xz 137660 BLAKE2B aa809a5e36d5e05524ab78d2382e15b2294439927ee7b441d246134120cef360fc2eb32b0611874a4bc4b45613a8e0fcc0e6cd595fea3fbd5a919aba593d90d9 SHA512 d35ac5d977b9f3bd03fb919bf178f68bdbc6ef2a57915b407d836fce0582f5cb78d0b79043bb6f8d015464ca113deb09469c3b724aed03901a4c3fc4a9982984
 EBUILD xmag-1.0.7.ebuild 371 BLAKE2B 85180d710e56b6558bf7a10d1a1b633bffd062869ad6646c57ab3cf1dbba186172da678519020d64a218dc9497a5526cf4129197b8ba93152309493decd60437 SHA512 182c6f1acd43374e5e6b79dea9b6085946eecdbffce4b07b7d66a42ecfd5453b3b9549f8944e2891ab3104b808dd784f09147aec44b1ca5e6c502c87984b3dec
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 335 BLAKE2B 1bac89edb946d2d8ee156bded212ce962bc9e9f386ffddcd772037848ff134743e1b86c0ac022d99f8c2ee5085aa3f2305765e26b3365f164b4ba93144354131 SHA512 cfacaaa4087daf725822a904fe947fad709dcc5f129510a9b8d9485e6f9c9f59ce883f0822fcd29fefc74d5b6efb5f3fd7b7b44ee0243dc1f11ff437313c1209
diff --git a/x11-apps/xmag/metadata.xml b/x11-apps/xmag/metadata.xml
index e17a5bccb78b..daa1b34c2940 100644
--- a/x11-apps/xmag/metadata.xml
+++ b/x11-apps/xmag/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xmag</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xman/Manifest b/x11-apps/xman/Manifest
index 2980bc0f027c..107d0927e234 100644
--- a/x11-apps/xman/Manifest
+++ b/x11-apps/xman/Manifest
@@ -1,3 +1,3 @@
 DIST xman-1.1.5.tar.bz2 193676 BLAKE2B b49e78b0127844e2ee8c0343392af940e592ee6958b4f1af217696da9ab1cd880331dec2af2f7eb5084cf44d40a041c730f571e5fb476e74924552e1316614ae SHA512 f6b2be424a79f298bf1a81edce4172572195c9efc9454e5b7b7046f344ed08154c77ccaa763ccdf3f1a30b64aa4802783bf813ee637437ccb1fba434fc5d4400
 EBUILD xman-1.1.5.ebuild 391 BLAKE2B bcc93eeca4549081e11c3b641b7115d28ec9b1151fe00bf35996953c8bb4708e1158d875f6ca73d0b361a729aab918223e443b4004533a31f0fa2e17b2d4331f SHA512 f9a6968db987a7eba097f7f03c0d5a92ced1d271c0c7d803de633939e0cc4ac7f1efc2b2ba078e9aaefc5fff3b10b96e2d00bc7d5972f05e3212a06beb129cf9
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 335 BLAKE2B 31aad180c6b511a638d8b0e1925ef7d6b3491c122c171fb3f75172e05c291d420483358f24a68876b28a17eff0f83fd6b0de8b365921226ae0e65c0254327017 SHA512 2c48b191d5b87a16a8f52ee9d16734493f0034bed2327703f991fac762c268bb016124a903dd80db096e1fd5aabe7f1b6e21b75f83e91a7ac677d8b684fab9e0
diff --git a/x11-apps/xman/metadata.xml b/x11-apps/xman/metadata.xml
index e17a5bccb78b..f0f5245878d2 100644
--- a/x11-apps/xman/metadata.xml
+++ b/x11-apps/xman/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xman</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xmessage/Manifest b/x11-apps/xmessage/Manifest
index bf3821e9ef9c..7dafbe020cce 100644
--- a/x11-apps/xmessage/Manifest
+++ b/x11-apps/xmessage/Manifest
@@ -1,3 +1,3 @@
 DIST xmessage-1.0.6.tar.xz 126324 BLAKE2B f818af4d7a17c2da6e00fbc00622606153b74bccb809ccc42226a0be3d6f19840c3a20278fe2d73f4af1e624b37a4c086c81650ab9262a1692e6d3ab5d5b1764 SHA512 89deb7a81bd047027f99cb92cd16a47f94479c61a6f9fbac4638e6d642037b3e9bbac2313db59ac8c5544175947c693f6a210537c6df2b88dc3de1c67498cba8
 EBUILD xmessage-1.0.6.ebuild 516 BLAKE2B fcc6ee13831cd1750d32ec60c4d12a3a825b471cdf14e2c0389402b01338480a87fc0dbb7f72ef41d65f39aa2fab8d4b25aa01aea5b087738b6d4a7ae60960d4 SHA512 cba9fd0c005eb501387a08a826f4c691af3110aa709bc0a108554e7d0e6e1b89b781230acaf9ced90f61c3cfd504100b1b92f06e053768ed372302c02cd7452b
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 339 BLAKE2B 63896c2f3ac09eadf5112fe191002b876eb75640b534356d349fbc40d17d2115e98d0a048fb250142efc681f0a81f713c60ddfd43dea60facaa3d0da4115fab1 SHA512 c60813721b6db5ce325afbc2405dd3da25526d80958052e962bd4f8c5082791b80d8b1b7f1cec6c4b60bb17f11ecb836961d1ac93d5322009065d450e025c232
diff --git a/x11-apps/xmessage/metadata.xml b/x11-apps/xmessage/metadata.xml
index e17a5bccb78b..588cb1793ac0 100644
--- a/x11-apps/xmessage/metadata.xml
+++ b/x11-apps/xmessage/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xmessage</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xmodmap/Manifest b/x11-apps/xmodmap/Manifest
index 6b32cc7e56e7..24a273c59080 100644
--- a/x11-apps/xmodmap/Manifest
+++ b/x11-apps/xmodmap/Manifest
@@ -1,3 +1,3 @@
 DIST xmodmap-1.0.11.tar.xz 139532 BLAKE2B d50611e762b665b18c370ea49d981d7820f16e2e10450bbb2ebc76c867a3a4e75d68e7dacfb9e610849770afa95f4d757863953217aac8e13509b386bdb8131d SHA512 a78f916f048d2017f079733becc99232c087c360ece61ec6c4fa4b5b130b96a1b10c4ce1b64a15bdcab7ea05de3c7f16035503d5be6f8ce1a7612ce71d558510
 EBUILD xmodmap-1.0.11.ebuild 457 BLAKE2B 12b5fee276a2105e56199ee04900cab1ce6721770dec0f8f91ab3b83be69fad63ac4153475a4c67dbe9a263ddc2994139202114b64930f4913033122f87e3df6 SHA512 f23b5aebafa9ad07d22aa64a0d8f8ce836ff9eafa808afc29dddac93a4ef6c82e8037401e5a940ece1932491b5a8c55f14e5a58551dfb46c4535cf770acff4c3
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 338 BLAKE2B 6f0ffecc9ecba923278c439444287ea541e56b8e890a7920281a2c86247a56df28487b961ebfb3c5fc7fd880800dccd27133539c459ce49c1474e17e60ae5ca2 SHA512 99340a528c206a567a4286eefe60c7899732775f8bdac8546f51a54438746f5910b7864247ea3ae7acc3be7a9bc8b03abf06f9ddeb1d9f61870cfec702d4dd82
diff --git a/x11-apps/xmodmap/metadata.xml b/x11-apps/xmodmap/metadata.xml
index e17a5bccb78b..aedd0f642cc7 100644
--- a/x11-apps/xmodmap/metadata.xml
+++ b/x11-apps/xmodmap/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xmodmap</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xmore/Manifest b/x11-apps/xmore/Manifest
index d65f77407b48..0c2ad44f7dbb 100644
--- a/x11-apps/xmore/Manifest
+++ b/x11-apps/xmore/Manifest
@@ -1,3 +1,3 @@
 DIST xmore-1.0.3.tar.bz2 127587 BLAKE2B f59c9b6b7a134694dc7df5540c75a4331785ef7da0c5b40618923a3d1d53a543f7a54b7b8383f2e816b4f478056f6c0b1c6a4ce212c50b4fca75a307057c3f54 SHA512 e3e44831cd87a54bb585f80ef0d87f69dc35f6c834a73241aad9f6e2b0999b53c51a0a3f915a94ae4d6dc9bdfb9f60b6576f0bdcec441443abd98efa6c51b1d3
 EBUILD xmore-1.0.3.ebuild 328 BLAKE2B 4712ab03e02fd0bd7fa1433d1f257f8e4f59f99cea6c22401f1d2054a9de8594228ce5a4256057f59829e17a8ea873ca85743217506449ee8dcca9a5daea97b1 SHA512 3810f2289d6acca3243356fccfa1d29b7fc740196cdcb96c9bb8661b268b9e039354bd5fc6c12d12728edca403bfac0ba6ebfdcf81676a768087df930e846f1f
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 336 BLAKE2B 4178e10841e67097644b7e0890a330b83500bed6a9a6bc8ee6238ea2b55410b7f704804756a594f7ea072bcdb727a1575f620dc8696c8ea56a90542c124c90e9 SHA512 597b4fe5622aa959b1ebd00f2e28139ae418ce0b1704a43b11951a6c95b6c7f541268a2208a0cd9ddafe062b4bb50009fd09cdf96712a539cdef832295adc6ba
diff --git a/x11-apps/xmore/metadata.xml b/x11-apps/xmore/metadata.xml
index e17a5bccb78b..1feacc0f68b6 100644
--- a/x11-apps/xmore/metadata.xml
+++ b/x11-apps/xmore/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xmore</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xpr/Manifest b/x11-apps/xpr/Manifest
index cc2529a15070..6cd0899d3c2f 100644
--- a/x11-apps/xpr/Manifest
+++ b/x11-apps/xpr/Manifest
@@ -1,3 +1,3 @@
 DIST xpr-1.1.0.tar.xz 140244 BLAKE2B b3525415b18615abe489466965fa414ee343d0ea2ebbad4e75e943a0e19fc29cb2a2cce4fde07c345d84f2c53eeb47c0162719d7322a93ddacfa80452153f45b SHA512 53eb896cf1844036a13b1018ffcecbc6a0a56eebe0d7cb6331dbe691207498d2c41f3791655b7fc081acfef2ed9904987f363b710bf0eeff6c8d33f819a951cb
 EBUILD xpr-1.1.0.ebuild 362 BLAKE2B 191f10bb12796814557f38b81520d51fbea17d2c1157ba5fd2b5ad2ad5ac7cd2bd1628254568586afc8e72703ce087c8898e702470abfbad9a7856b12647f392 SHA512 7e8594c5509c0efa18d00fae5d3b9612ee1155af409050234a6c292863dff03d4df20dfcbded5668454ad62c84880dcbc0635e1dc53daaa50424c18d65147f91
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 334 BLAKE2B 6b67a2e719ce4947ea13622a2d45b6756d000578b5f8bd7c014c879dd1b640b8980c550c087899d8cb6110eb36d3f30757aeb7f1d8520dff684a728d497c2360 SHA512 e7dd75839c0d92f251c7d9f954099cd4952ced0605cf7fe2b71a1566a005bc92b531c3023f6dbd8ed92d95bd290c0494abfea5c0a75d0c22d281eb05ecf9159e
diff --git a/x11-apps/xpr/metadata.xml b/x11-apps/xpr/metadata.xml
index e17a5bccb78b..ddd228e59952 100644
--- a/x11-apps/xpr/metadata.xml
+++ b/x11-apps/xpr/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xpr</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xprop/Manifest b/x11-apps/xprop/Manifest
index 41e587da1015..a7dec76174e7 100644
--- a/x11-apps/xprop/Manifest
+++ b/x11-apps/xprop/Manifest
@@ -1,3 +1,3 @@
 DIST xprop-1.2.5.tar.bz2 151216 BLAKE2B c676a1a733f4f897bc207cd1d7ec1a6022d48d2bb9615072e2ce19c1fec7737a8c9bc0444c97f4972d85a8ec8bc1e990f559a0815eb3656f2378915095c1f85c SHA512 93cfa621fa76ca6e8e780a252c508380b6dc9db39b67bfca16bb9800f0d39110f5d18189409a8577ef79e98bf5eece17f5e23f2218ca72ae8bb04ee7b429d559
 EBUILD xprop-1.2.5.ebuild 394 BLAKE2B 963adfa08a87e89567e481057d0df550c530f340361050c08a31d41fa2823f91b3a8e4aa664011f5a8d27408bcbdfd8f32ed65b586654f0b373a04a64a8a5cb3 SHA512 e7adc6d86cd29b865a91da335071c7d6270445103c68012dc20d218cc1190fc36dc69716a73b39735390ec19ceaf8b1113dd8f3c33da4fe52be26fda57ede58e
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 336 BLAKE2B 43e922180533782c772deff4b6f4fbb58db6e36b9858290005ecc72bda4beedc8bb9623c5b464d78c53ba7e79319a3df632aa1911043bef435a05ad5857077a6 SHA512 b656b5696ffd3472fb8bb12f8a3599fcb80148df7c338e4e778a0b0ad1aa6fd0314afe9fdc44d4f7f9946153c044907164a74e8e63e3f31153b0a452fb9b1394
diff --git a/x11-apps/xprop/metadata.xml b/x11-apps/xprop/metadata.xml
index e17a5bccb78b..66f49dc80262 100644
--- a/x11-apps/xprop/metadata.xml
+++ b/x11-apps/xprop/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xprop</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xrandr/Manifest b/x11-apps/xrandr/Manifest
index 0ad4f270d37b..6d0b55b29017 100644
--- a/x11-apps/xrandr/Manifest
+++ b/x11-apps/xrandr/Manifest
@@ -1,3 +1,3 @@
 DIST xrandr-1.5.1.tar.xz 171200 BLAKE2B 69cc080da24b8d00fcf60e9fb2d4c03d7b80b46d18888fa726ad4ba5847fcfcea4abeefa298fb833febe0549aec0636ed9087c8ef065f5166df6bd7f270dac1a SHA512 3d0d37e974b9dffb996276ee7fd676327fd0956e5f5f572dd142a651a35d3cdfa2f6dd415cf27bf87f306981957aba4cc014c12baebefcabaa5d66b78a114922
 EBUILD xrandr-1.5.1.ebuild 539 BLAKE2B 5773bca54f849c30697d2ce4095b54ddbba938163888399107d1655453be463558b251c203628570848442f5beded1103f8481b0b9aa2b542d6a80a9a181b3b1 SHA512 2f4403ba2d7f44f7c1c638874d7d58945aab39b5010059710c4a2d5784cff52577341b7a90ff01869aca6ec96de3967b362573aa2485b9e3835e6ca37297784e
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 337 BLAKE2B 3003fb3f334179c653f32ef2a864a609df08a585981e15adb49cb63209530479c22c0ed5c5e62e64d3647b25b57e28af7a41d948af012ed450ad1afd6be23374 SHA512 e51bf78854aaa4634a164f04408ccc202983e118f987cb90469feefefe51ee4671ba9b3a329b71ab6806022c0e6beb32ff27c7ee35682945a3bb8fd1a40636c2
diff --git a/x11-apps/xrandr/metadata.xml b/x11-apps/xrandr/metadata.xml
index e17a5bccb78b..3e57065b75e9 100644
--- a/x11-apps/xrandr/metadata.xml
+++ b/x11-apps/xrandr/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xrandr</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xrdb/Manifest b/x11-apps/xrdb/Manifest
index c7ae3a6d8393..a962923db5c5 100644
--- a/x11-apps/xrdb/Manifest
+++ b/x11-apps/xrdb/Manifest
@@ -1,3 +1,3 @@
 DIST xrdb-1.2.1.tar.bz2 143216 BLAKE2B eaec55ec825b324cc2a8a617554e5f41d40b8bfb081a66d54168ed1e3f31df11d554f734e77fe49618039ec895c10229f1ab23bef41cf5f2c39a6246946ec5f0 SHA512 d88135cdfea8536523dfb986249ee42761d5363c936352f12f55b4d0c849f21236f7d74d39869c5ec5b549019d6ed89d9096cde4b3c2b4816c2778a8e370b5c9
 EBUILD xrdb-1.2.1.ebuild 415 BLAKE2B 4058d75b7e665e9b4bb7ca25c180108eacd653915c956981f1df661601949d81aaefc2d27d7f6cda8c98cc8424157a6a701f665a1a32a62abe6e926debbf92cc SHA512 09a18c1b636e2b5f1ee26d14ae583e3e4fc15b468225015d890d58823193baefa1d34a3eed2739e5af9839f36dacdd2e575e38a0a0af842054e537dd9f88b7ab
-MISC metadata.xml 318 BLAKE2B 882fa76d73d73f50c201b2d062a2b24a292eee6f3d502ca8ad4cf11300bc8d21ecd2527155c20c946d0cad99ff82b2f03dd866018f6af6423acd45e7ab8cff13 SHA512 6f1da4a9a8ad494b67d4cf1c1fbf03316ef0f96415725b37c37cd57eb295917db360a62a3685ab1ddc8b18a16d917216e824ca2ed66843ce8af701b006259215
+MISC metadata.xml 399 BLAKE2B 7adcb220d4118dfcae5b1f63bfd8419c0e69f7d884f87aeba7300742a5755e5a58e20727714e6c628e7711b2eee894b1658df8d796a6c57d69e0cde7dda3f5ab SHA512 3442545076bb0ac270b4b057fb2fad534cc566ab7a79d301d6efeb8923914a06863ba47d2fc18bc486aa71e2b36ed4538e8bba445387d3f8a31e9fd1d6696a7a
diff --git a/x11-apps/xrdb/metadata.xml b/x11-apps/xrdb/metadata.xml
index cd229fbfb7d8..346fdf99e067 100644
--- a/x11-apps/xrdb/metadata.xml
+++ b/x11-apps/xrdb/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>x11@gentoo.org</email>
-  <name>X11</name>
-</maintainer>
-<upstream>
-  <remote-id type="cpe">cpe:/a:matthias_hopf:xrdb</remote-id>
-</upstream>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:matthias_hopf:xrdb</remote-id>
+    <remote-id type="freedesktop-gitlab">xorg/app/xrdb</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xrefresh/Manifest b/x11-apps/xrefresh/Manifest
index 95e60a73ead9..fad715f20e81 100644
--- a/x11-apps/xrefresh/Manifest
+++ b/x11-apps/xrefresh/Manifest
@@ -1,3 +1,3 @@
 DIST xrefresh-1.0.7.tar.xz 121820 BLAKE2B c60ffec9e03b1d07b25228b9066b05a437160a48c182988781890f59271b835079af0dd071ce77b56768fffeb0203bb092fbf80c286272c82e56af2c867ae3e0 SHA512 8fcbb01aa368944ca536f050ab194b21bbd6b2a56265a7ed5807882e5c2f9660105283cdba0ea35b3e4a17a015586aeb82906e081da030332dfc49169a191c31
 EBUILD xrefresh-1.0.7.ebuild 356 BLAKE2B 2d86ff64182344bee10ad3dd009585f70e0727b99961240e8bc817243af7fa7a79d010ed8af0d0e747f202a736aac0c915e17a17204cad5473c5eb35ad8f810f SHA512 c79598b8dca25b8c6499e92b9dfb4e4d252aa40bd93b372e431dcaafaccc372faa9dffd7e294626016edca735fc632dd430e1780666a418afdcd7ddabc863957
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 339 BLAKE2B ab1f2be22dd2411668c1183945f89abefc984f53cff6ae2474412ce202e301891ea12ae3ae7c3834a37c5988d5d09fe585cf272c8977d1324bed0ff7b00d5cb9 SHA512 dfe1182df0e4c4fb67d4b2e51a89ac8b6c26c3174fe587d5709be41d12d35c14b83e31688adf0d3f8b2c4b7496a325f9686905d230c3dd378760f8fcde0c63ed
diff --git a/x11-apps/xrefresh/metadata.xml b/x11-apps/xrefresh/metadata.xml
index e17a5bccb78b..fb7c5e426af3 100644
--- a/x11-apps/xrefresh/metadata.xml
+++ b/x11-apps/xrefresh/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xrefresh</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xrestop/Manifest b/x11-apps/xrestop/Manifest
index d17478646f71..85d56c699ccf 100644
--- a/x11-apps/xrestop/Manifest
+++ b/x11-apps/xrestop/Manifest
@@ -1,4 +1,4 @@
 AUX xrestop-0.4-tinfo.patch 291 BLAKE2B b96d892c87a8133987baa94e5cb4917bc5d743c24ec11a2ec67afafc7206654b88c17f54377f2d1bf0c9fb92df8de16c99e4d0f9a15ff80a9417da2de31bc6fa SHA512 21993ada033d4ec744b55faa71afd736a99423f12071a64e1445958de979631ce42a908e14ef194e819de98766c92a2c2470b2c88d172879ec5fc4c20212566f
 DIST xrestop-0.5.tar.bz2 135537 BLAKE2B cbb58870ff16148a34468231478c723fc41932c1e17156304a1885b52c17d870339c88bc4acde16d28cdd22cb227c2190b6b33bd472b047a82261924e681c889 SHA512 f50e1fcba2fdb6167f93b9edae721556bc411232a9d7cc1df853e588cd92608c9ca652bee1aaf5cfe3750d6c60db6c6cd1c6797e282841cc535051e78b2c4c1d
 EBUILD xrestop-0.5.ebuild 593 BLAKE2B f1a76d65b471b96a5f5884a72b593baced76cc4ccaa5f38824810b7565d4126a594ded9300d742649109aceb1393be50e3be25bfec0008bbf8722caccbcee533 SHA512 62d6f731fdaabcd41ecee86ce17927521d33cb340b21645139311f7f342b1ef6940a02970ecab5073de9f95c93939bc745b3ed8c20a26039fe63aba6bde1acb7
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 338 BLAKE2B 0ed6b9febb71b6ff1a5b8fd5ae50255db3cbfa0ea9ae95b1a8c30857d62f5a5a9fbcd80754075171c248eee5cccb9efb23881fba7ccbda6645c1e757c110b0a4 SHA512 2c677e4d4b4d14638499845dcc35a8673f4b4183f26d40b433e6806c16b89006f1c21c505c5fcdf1ea33bc290ff593c76e78170d943f588c170c9f2bbb0cf560
diff --git a/x11-apps/xrestop/metadata.xml b/x11-apps/xrestop/metadata.xml
index e17a5bccb78b..6955005f4103 100644
--- a/x11-apps/xrestop/metadata.xml
+++ b/x11-apps/xrestop/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xrestop</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xset/Manifest b/x11-apps/xset/Manifest
index 2080ca010925..039c4699e3b2 100644
--- a/x11-apps/xset/Manifest
+++ b/x11-apps/xset/Manifest
@@ -1,3 +1,3 @@
 DIST xset-1.2.4.tar.bz2 145546 BLAKE2B df4ae52046af7f632e2f60386bd3b8d90b27db3e53ceb68f1056c9c5df2ee9c6d83d109a444eb99ddc031e35b91db0249ee56eba3180bc9a8a002935db213605 SHA512 f24714c9a82081a09d3054bbad98553de9366992f22eaf3e2bcadbb58fad1d3dad2547fef6fa9898d8a9df064573c29df9d82a5c801fa92248604c95f65dc83d
 EBUILD xset-1.2.4-r1.ebuild 498 BLAKE2B dee38daaff7090a63edb987d7bbc021d8da1dce560e0b25dbffe2ae932aabd794e37801d7326c784af7670aa41a29ca9b01c3019f5277b0140eece6dd42724dc SHA512 c73867c040b67947dc07be89cb97dc5e07f3a80add6db92c7d5e1d8bdb359a31aa77b7678cde728d80d39e4f05441fda64c9c85060abe04bbbb5f09c5f29f33d
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 335 BLAKE2B 0357932e52392a9db9b83a4bf85461087dd73b63f05a382d473c52b4cefa20b0bae168d199518efa8aa09784a80842921b1159b28382ceb7214ee7fee2aeead2 SHA512 5a6e4a1ea4c8361c182e8be913921351f624930a50995ff82c1d101df72a2dee496a06494c3251faed6bab41c2af0e9d3a0e032f87ab4128746a0a52d0a4732d
diff --git a/x11-apps/xset/metadata.xml b/x11-apps/xset/metadata.xml
index e17a5bccb78b..4b5fd725447f 100644
--- a/x11-apps/xset/metadata.xml
+++ b/x11-apps/xset/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xset</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xsetroot/Manifest b/x11-apps/xsetroot/Manifest
index a0c967392154..8b0f3ae2c53b 100644
--- a/x11-apps/xsetroot/Manifest
+++ b/x11-apps/xsetroot/Manifest
@@ -1,3 +1,3 @@
 DIST xsetroot-1.1.2.tar.bz2 129091 BLAKE2B 0bd0615f64c636eaad7ed1b83d49208e9065edf7583bcd7e5d4c5d2f1a1eca4c7692209a540cab823c35497696176f4925afecaaf843610f6e9485cd3724f1cb SHA512 0b9df1b72305e5c24f1e1664578aa4411a5ffcdc5d318458117594e641f01c34700205b0d16c08abf4a8106d36128ccdbe1ea1f1035fce9018d6b52801a8b72b
 EBUILD xsetroot-1.1.2-r1.ebuild 420 BLAKE2B e0f7615fafa6b7a153fe6a94dd934ecce2249c67cc4271f34baaab721588aafdf1be1390b94f08ae5e645002ed8ef0e4196aed55c65b1cab3ab0b74b6067c2a9 SHA512 56c121de543e73c04717306607233a6a717970725cd6d62a9fd758528094b3b7bebe9a46e1f1491aae5dac3cacc840762cc4201a4fb1e664574527023f678d9a
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 339 BLAKE2B 56f6030268da9a408d503b75be7f6bec93ecacc5900cdc3effdfd456c2dcad9f6f5942830694c52aa82cb0e6784818d83ee067600b191cc37a7edac3786a92f3 SHA512 abf3560395a5de920a6dad35390023cdd5f98c63aa0efc3faad2322a63428c9c82623b50cff01b0f33b68ceed63816c894d7ef5a48a0c71191a9011354e91100
diff --git a/x11-apps/xsetroot/metadata.xml b/x11-apps/xsetroot/metadata.xml
index e17a5bccb78b..32ab22f11b34 100644
--- a/x11-apps/xsetroot/metadata.xml
+++ b/x11-apps/xsetroot/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xsetroot</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xsm/Manifest b/x11-apps/xsm/Manifest
index d100830f1d25..a9c5b5fe9565 100644
--- a/x11-apps/xsm/Manifest
+++ b/x11-apps/xsm/Manifest
@@ -1,3 +1,3 @@
 DIST xsm-1.0.5.tar.xz 159496 BLAKE2B 18531fd06970a244478cd674cac1d669d4fcecb4f680a656c5182927c76a111aa82b96fd96e5b887d6f8b44e7ab88292607812b7d6bbcac86d9f4448bbb4fed5 SHA512 df3777b3aab813ec8aa906f5a03f93b8ca645978970290cf7baf732e175c36c00ae19baeb45ea7404d35838c21e6f8fca28f0da3e2f398d17adac5f2acb7b351
 EBUILD xsm-1.0.5.ebuild 736 BLAKE2B 615d1ecd0ba4fdd756d119bb1753b4a6a83b296f8d1b705af11ae2da704098b01b2eb861ca0ea49de4b84f721b6c0b731f75f45599f645aeb1ef7682f7884403 SHA512 c32e4f0ed668dfe7081819e8687dd963f893c646f8903681a500e1922ac3f7cb51a3ca9a4618f7ac06cf78d9d51bc74cd73f5dbf74dea2a6f59d29792847a46f
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 334 BLAKE2B 431a610ae80c13afb0eee5da8a6934e84c7d5390783cc64d8b4e4c066dced398487207da72448923bbb35980113a85cbfe3d5f6ec9f632327638aaddb9b7690a SHA512 2e1aac60f3f9854eaa8b15f8a61728757efdf37e89294a43c66abb03aecd382b0b6f06a334347a15c795e3b179a7407f1add4ef1dfae37129e3fb3bb0cee745d
diff --git a/x11-apps/xsm/metadata.xml b/x11-apps/xsm/metadata.xml
index e17a5bccb78b..e71b17f1dccf 100644
--- a/x11-apps/xsm/metadata.xml
+++ b/x11-apps/xsm/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xsm</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xstdcmap/Manifest b/x11-apps/xstdcmap/Manifest
index 085939d7c2d5..3f30ea9fe958 100644
--- a/x11-apps/xstdcmap/Manifest
+++ b/x11-apps/xstdcmap/Manifest
@@ -1,3 +1,3 @@
 DIST xstdcmap-1.0.4.tar.bz2 126269 BLAKE2B 5c2fccbc374871738ae03d722a045cc3ffd6bc431774d76525653e70c5ddb9a4281b2372996ff492807f9d4aee414eac1016f2696ea4e1979407a5b7cf37e1b5 SHA512 2adbb0aec1766341e04090efa962241ff6c9e32c612851b7221cec0ee16852107d406a08ec5251070f39df882c13e3c8c9edcd88f278187a9f373e1727643a8f
 EBUILD xstdcmap-1.0.4.ebuild 302 BLAKE2B 15a03780278eb9af6b3a77193db49c20f048546bbea905be08122486ca8af141998855700750474d2382e84b5d4334ccb590e49816dd52824d51986e57891006 SHA512 039ba92d34171f7d8c269636e50d9ab3c26004c35a8ade26e286349af106bf27ee87c0d38f3ad06a6cb7f79bbb48e7430a3b331df6d12b696b6e86762c8823b9
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 339 BLAKE2B f26dc73fbaa175ceb478adcb596265c742db7b21996b4a7ca19ec6dea9a71c42de14574b7805c1f63e848208cf9afc4efda2ea0efb86db1356fbd742f5d06ffb SHA512 2dbdeaf1c60d66f0aafe578fd8b9c32aed6dfbb513c7312af0df5e23770ddf8041434023952b0df99c3f41dabf1dee82198d59473387bc70d1c0d13ae3851b27
diff --git a/x11-apps/xstdcmap/metadata.xml b/x11-apps/xstdcmap/metadata.xml
index e17a5bccb78b..fa4958ae5c41 100644
--- a/x11-apps/xstdcmap/metadata.xml
+++ b/x11-apps/xstdcmap/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xstdcmap</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xvidtune/Manifest b/x11-apps/xvidtune/Manifest
index 7b6162901eb0..5ba736fdf449 100644
--- a/x11-apps/xvidtune/Manifest
+++ b/x11-apps/xvidtune/Manifest
@@ -1,3 +1,3 @@
 DIST xvidtune-1.0.3.tar.bz2 128492 BLAKE2B 87271fa736f1c377f48f36fbb63a28ad0e6327ca612b681328aec44cafa839f5e1c04b239907e25f547b5a69e7dbd92bccd3500ed20760efcf18fb570078241b SHA512 0f8a4fca1b544ef8f9623246fb0ece75739a0889f2e729c040cd768c595f0bbbfa3a665576369032535c34c7d55784a29b62f0d51432bf2b75d2cec619db7352
 EBUILD xvidtune-1.0.3.ebuild 379 BLAKE2B e381912454278004a28d93865db1294f910bdf32d8c352cc578a9cfd9ee7e5f5d6dcddf09c9674707fa89b4a6560982973d562c8986ba27e6d10abfe0ae18cdf SHA512 cbd52a7ae5ad14bb5f096b92f8f0ffcf100e42953e9639ac5311e63cd1093464ecd321be5f4c06b8b4422eee57477eb141ab8166d83c8f9c422af2a9b9b12b1e
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 339 BLAKE2B 91660a2ed0a5e6c3d87d3576bb25f94d0b72eb7829bf7ad8e8ae78b58007ddbab064b5d58b3c3a48d6058ea35f52c223a657b475369960c9786d03302a496cfd SHA512 6942dc3d60991039fe66f6004afef10f6d4d314ed8cea9ac51177e4853719821deb6bd75bd3ba1282a87afc4aebfc339a430120ece67b84f5f27865accf4cb77
diff --git a/x11-apps/xvidtune/metadata.xml b/x11-apps/xvidtune/metadata.xml
index e17a5bccb78b..dc22c7c8d76d 100644
--- a/x11-apps/xvidtune/metadata.xml
+++ b/x11-apps/xvidtune/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xvidtune</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xvinfo/Manifest b/x11-apps/xvinfo/Manifest
index 653cac86bc5f..898e0da1c34a 100644
--- a/x11-apps/xvinfo/Manifest
+++ b/x11-apps/xvinfo/Manifest
@@ -1,3 +1,3 @@
 DIST xvinfo-1.1.4.tar.bz2 126503 BLAKE2B 54a1e08913cd51cfeaced1c704834e0348d02cfb2e606f2cbb103acfdf649595a77680364bfb5bbe684a15c743d2d18b6031e77150d0e9fb0d3405d474accc3c SHA512 85e1f936c5c826f0fdde3670bd77d5cde8641c6e8e7849e42142e91b5aa01d7e0e60d2b064eb6fef4f5666321813ca2dc9f9656756ccbe6dcda37b119ee8a63e
 EBUILD xvinfo-1.1.4.ebuild 348 BLAKE2B 460e39f0b110420a75d2660ed07a4fc7be890beeba8c503dbd3d63de9f874ad5cb9b2e164eb3f0b20af352529224ee2f78133e4fec5642ac7d3f343f1d69281e SHA512 c7940d5d1ee16283cb742392a3795dd76da876f766b889e0af0e17112d20fb5c1d75622b9544112b73abb6b84c216946a0ad93103546da241eac0b0aaea2c59e
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 337 BLAKE2B a8de915c2860cc9f715c08a44e4c8f969c5d2cc2f722faabc259e69b95048d61ebf6d08f6cd57f836ab65aa2ec2d5af3e7865d6396b1e225408d73f43543ef9c SHA512 76f875225a492741190e51f99d980c6fe7a4e3220b971ef0f46553e07c545778af94a45dd1fb86ab454d06b414b194e39ea852f6ffc6be519ad0917de2918ddb
diff --git a/x11-apps/xvinfo/metadata.xml b/x11-apps/xvinfo/metadata.xml
index e17a5bccb78b..8fabef94fd8d 100644
--- a/x11-apps/xvinfo/metadata.xml
+++ b/x11-apps/xvinfo/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xvinfo</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xwd/Manifest b/x11-apps/xwd/Manifest
index 759be3857d0c..4d5f9c4ad95c 100644
--- a/x11-apps/xwd/Manifest
+++ b/x11-apps/xwd/Manifest
@@ -1,3 +1,3 @@
 DIST xwd-1.0.8.tar.bz2 151153 BLAKE2B 9db972c3f484abde7f6925da6b9e567548e9ceab8f3484ca8f5649e1505ef72652d03f738b2e2edd3179a9561b9dca76bf13d26b025523d22f9f2d98ebf1b8c7 SHA512 d2aaf42c60d20c4b09f4947d3702058dbfad4633b2c5c8ea62e8897fc9ced1ab3417ce99255a223286d21a731f543019470737e3074f1bc68033b4eb47bc773e
 EBUILD xwd-1.0.8.ebuild 370 BLAKE2B fef8f05cc7be077eb6d83ac34fc47d9164bfb0f11248ab16d1494c6e3f19e3bf2b316f4940bc32b3e78b0cea851fa07851947d2125ef896a2237c3a003b5e392 SHA512 68d6018410f17c312874f2345629a27792e3cb1c1fb1667a61d45ef6650199afc014f4c76be69cfa81c3982c9e094a67bff0f118e2b3c7b97ecd6d7429ad9ae8
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 334 BLAKE2B 89ce3ac33d605b40ac491ded3e0108e37b1ce6500fa75a6fd21be9c3da8aecfc7edc1e389caf99350233eade2ae6eaefe2686493299a69b58da5f23466533632 SHA512 6de21327763609e6eb8ff88610feed843ddef9c68275ec21da51c227b2446db8dfa9cf76205d09745c00ab6aa2b9ad3b9a9cfc3997c29dbed9f2df65e7021405
diff --git a/x11-apps/xwd/metadata.xml b/x11-apps/xwd/metadata.xml
index e17a5bccb78b..c47efe537089 100644
--- a/x11-apps/xwd/metadata.xml
+++ b/x11-apps/xwd/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xwd</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xwininfo/Manifest b/x11-apps/xwininfo/Manifest
index bc127777aa7b..d0bcafe1c250 100644
--- a/x11-apps/xwininfo/Manifest
+++ b/x11-apps/xwininfo/Manifest
@@ -1,3 +1,3 @@
 DIST xwininfo-1.1.5.tar.bz2 172496 BLAKE2B ad657a96b74190981ecd2d946d1b81fcd0515a481f0d6d880d790b8e1eb4bf7e85bdd9a74b631acb88c2254839afde7f6ee79647af66c357c8ef4199aac51f02 SHA512 a3268bbeeeeafac94e589fdd47554a965910d40df7cc3d9c36c7c24fa4f5dd49615484d5916ccb41efca9cd4cf9d8981a4c60953b921220b3f4f57f9cce0e1a6
 EBUILD xwininfo-1.1.5.ebuild 429 BLAKE2B 4e5b679a1bcbb40e7c0711ec870e1cad2ad392da9d32dfdcfc90f30d33dd191a4f6390ffa2a1003e75c7022a937a09d25d2d02a9c0b24892149c36959edfd382 SHA512 ac7ad407f0ad6c8f8ada22a0971e1adfd438d46514d783de69830453a6de56d20618f6988688e79b09bd583649936ab1b00c196e366d4ca82caee373f60616f1
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 339 BLAKE2B 43b93c2c0772315059c28136add97d519c99b524e0ce0cbc77468a13a9fcf0512a1cfad7b23e60ff766bdd25f3aa1ff4d9448850ada5a4958cb7f8c46aacbb53 SHA512 50b18ec621e21541c1e4e0073d71c3a31cf763d333adf0afec2eea6becb38a7d72704616a5a2bfc5037527af4b08d8d71b48805e0145d8add9ce19d1941234df
diff --git a/x11-apps/xwininfo/metadata.xml b/x11-apps/xwininfo/metadata.xml
index e17a5bccb78b..e52da0dc62b3 100644
--- a/x11-apps/xwininfo/metadata.xml
+++ b/x11-apps/xwininfo/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xwininfo</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-apps/xwud/Manifest b/x11-apps/xwud/Manifest
index 91627ad80b12..7ad82a583c5d 100644
--- a/x11-apps/xwud/Manifest
+++ b/x11-apps/xwud/Manifest
@@ -1,3 +1,3 @@
 DIST xwud-1.0.6.tar.xz 126696 BLAKE2B cd272963c7edc71d4d4a0863dacf39a3432f1b344fe90e698d167df1394b7d5f00e3481eaa97fa47d9dd4e18778193b15879fec73746517a4a6ac69b098c1ec3 SHA512 a7b964d9ef13e4726b2ef84dcc1040cdf510c8031c3e6e1dc1c711e65d9e56f1fc5921a7af3dbbd898b861c79e9da6242da23c2e73816e39152ae719052293e9
 EBUILD xwud-1.0.6.ebuild 344 BLAKE2B e0eb7d0d2d0bf5f5bd0f8237d7ea9ea87b093f6fe71f2d4fa20b5fe8a6bf2940d1d40e1882810c31d7173f559fde2c190a292d9399338f1e13dc71855389aa50 SHA512 876f92170c347392db4046a7270fce99ca70c06e152c64a255b4da6ca96b556138c8f47f323e70eb471e122780e2ba5c87f97a4b94e5f2e3654138f20bd6cafe
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 335 BLAKE2B 8fbe115b4b149288c0705c62102fadba6589820937d876d0603f8406309eb4d920fda8493881b762b702a3e43d1fbbb515cbf2a4635d99f23137d07bad2ec84b SHA512 0322693007793b4f518f0bdf78688b90575cba15702e8d3223ca9fc89dc43493e08cb60d5888bcb8582dca6d710e1dd966bfcc0fdb386504bdba27fa4e1cfb5b
diff --git a/x11-apps/xwud/metadata.xml b/x11-apps/xwud/metadata.xml
index e17a5bccb78b..4366aef5b4ca 100644
--- a/x11-apps/xwud/metadata.xml
+++ b/x11-apps/xwud/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xwud</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index fee41e056969..aa809eafa539 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest
index 66e2fe9a4ef9..b6688aa1519e 100644
--- a/x11-base/xcb-proto/Manifest
+++ b/x11-base/xcb-proto/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-proto-1.15.2.tar.xz 148108 BLAKE2B 0d6cc87ea0d2de594ba11b11255779e90d3c7507f0002453b3d1b2ac73fb604e5ee52e516bbcf76bce2a89027f8c8de6289d21aa2bb23d7d3e2ee77211b54946 SHA512 9d0b2f0a4dbbf2d64e32ff4658d1663e13d7e5f1bffc1e8d45be7b9dd5bab46e29fc1c2f6e66a7a569e374ba6756faf3c39b0b5e5560df6d7f8b68beec97659d
 EBUILD xcb-proto-1.15.2.ebuild 1204 BLAKE2B f356a860a3afb4f50063e96ec0795d2172fd56dccb06ff388e9de9bb98f0a91db47c0538b60c1d058f7336fd568fda2a0f93bb2fb3458f420802e1883a9436b9 SHA512 5332c8529c85832e770745dcda2cffedba354e37423ff220f26b869bd17e89736f2f61efe753d9ac62e9e636849e42da355667f3e4d4307955ec8b9b452141b9
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 341 BLAKE2B 96e3b6613178261ab586ecc15cb98a7de1f752c081744d02ce3b9976a07e22056ff5c564b418839486d106964daa7327bb3d4d57b469593ac1b4968fbfc3bf67 SHA512 1374a7a6fb6254afa291f3ed7fbc0ff5aa1e478ad2b6df17dcf6969cfcce7681eeb2fb82caa6cbcab5109d2ffd128d3d18819013855a2a338bde5dd93992b6f1
diff --git a/x11-base/xcb-proto/metadata.xml b/x11-base/xcb-proto/metadata.xml
index e17a5bccb78b..161789742636 100644
--- a/x11-base/xcb-proto/metadata.xml
+++ b/x11-base/xcb-proto/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/proto/xcbproto</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest
index 1bd9c536c3d7..e11435bf2cba 100644
--- a/x11-base/xorg-proto/Manifest
+++ b/x11-base/xorg-proto/Manifest
@@ -3,4 +3,4 @@ DIST xorgproto-2022.2.tar.xz 757080 BLAKE2B 0fee7910fced83548780fd1c7bfd214c932c
 EBUILD xorg-proto-2022.1.ebuild 1185 BLAKE2B 7b495eaa17baf2c49837b6113a5a304549269e7a424e7878925831b982f4e092358e6524181ffa6058e80b5dced4624b3d7a084700ba48430def4ad01d6d719b SHA512 5a81ee8c4a7af16ddf9bf5b84247487f7b78a9eb31d97369c9b2640a1e5f3f572dee40cbc12fc92372be638106e517a2d57159120e21cb51bb96e5dd43aac907
 EBUILD xorg-proto-2022.2.ebuild 1193 BLAKE2B d6f6d82e25ab7d3280d651b367092d5120a5ec51c7c69978e0f9f9f66eeaa09eb43cc02af3d3ae5204d740774e429d82c9af6a1c5f7054a423730aca21defc5a SHA512 e27c556fd60dd53ac92275788bc15df0e90c0359fc244df437580d2c8e4f2f33a02f61d9107a50399ffa661ee4c71a8794b30b58e1d4aea31187afaf514388e2
 EBUILD xorg-proto-9999.ebuild 1204 BLAKE2B a0a87857280db4120afdbf323969ae6b1b62a8d2a351f785384e31cb7164b8893a7d69874893b685a04ec57facb35b040ba710796ade194032bf4bb72f785ce8 SHA512 de7d5b0e82334295d2be5fadbbc04311705ca6df160b3b3fc198e5e22f212d7eb3093b94b64ffe10943d441e5ce7892875f131e32413e4b70c235e28add37d76
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 342 BLAKE2B 86fa6d992d56d65a60c04ece61c97dcdd3cb0807dd7d895d907d83fe78427df05b15b5924d7b96a38164003e11a7de78470829c72238acfa35473d2f536b5363 SHA512 03783fc18d1dc17283ec540947907d98ecae2c6cb4350701d1976350aa39e1784d91e698fbb0d672d9be50c53ad9aa8e3d0e14ddc24d495654768709d8675826
diff --git a/x11-base/xorg-proto/metadata.xml b/x11-base/xorg-proto/metadata.xml
index e17a5bccb78b..403bdb59286e 100644
--- a/x11-base/xorg-proto/metadata.xml
+++ b/x11-base/xorg-proto/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/proto/xorgproto</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 63316bf653d5..cee860204999 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -4,4 +4,4 @@ AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d
 DIST xorg-server-21.1.4.tar.xz 4940176 BLAKE2B 8f68c7de102f7f8d0f56566a518025bb32c079184d5a5556dc8e651111b6a018669102b18ec2e9470d3ab91f51291618f9c49281915d885fc30446e1b54d2134 SHA512 eb5b8520d02908f72719e6ecfbf7a9bf139acb65ccae04d1db4223a8a2384cd3a94bd5afef10cce327b751b800cc2b79bfaa5ae35c95c3a217f775168082e68f
 EBUILD xorg-server-21.1.4.ebuild 4451 BLAKE2B 4e6e0a405e8c92ccf0e96bf582da830095e4503baccf57488067cc26fa7dab03e4232e1359a60006450a5afe252258ed8cd894457ba6efbac2cfeb18f234c1ff SHA512 1f362b0cf23ea22aa883086fa89aadd7356819740cc043a83c7ae4d5695a81ee6da849923c097f7f0f32af6cbdfc6a7a7dde7193dc2c666b52d6e4373ebb4a59
 EBUILD xorg-server-9999.ebuild 4459 BLAKE2B 07b51df2be6cb5939c6d3b23982df5b691453fb1a4b1c9afc37cded6823371a03bb09bcede9417304edc319861414571171f1c05e5e742edf333ec858239426e SHA512 8f2363b32a015c816b8169a6db437bd5fd3550f02f62d91fce850f63f9f4a043e8094959da670ff4b8daa67099cc3632c99e35b8898b80fd5c28ed5335638659
-MISC metadata.xml 773 BLAKE2B 6a1a9928078d1a473f542bd10c9d3768bb0ec46df2bee6573c858754477cbfeeca3e8b40c9050a986a0ac5496b9799b703f3bbd11f627679b59a87a894600f6d SHA512 fab80f13aef9ccbeebab328bb931b35f052842a66267399d6dbeb62dbff82e259ee2f19b6dc31f3796fc0bd1048bd6288fa493c160201a9da0aafd7c034511f2
+MISC metadata.xml 881 BLAKE2B e5b0384c9cc45cf1e12a3010abf31232e4a726c11aa46b7303cc22b582e31d6ece1dbed35aacee265ca5a54433a6821d964059709307e4d4e51bb5a22b74b31d SHA512 72d6c8a97e474464e222d8d0be1a5d16c123683bf1415a142204b26361fdefdfbf1b3493d7b33cb637c03a808d5068c10d18adeb7de2a4fd5ecfcd4fa40f2f90
diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml
index 1c9d6dba3ff6..b88ab959a211 100644
--- a/x11-base/xorg-server/metadata.xml
+++ b/x11-base/xorg-server/metadata.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-<use>
-	<flag name="elogind">Use elogind to get control over framebuffer when running as regular user</flag>
-	<flag name="unwind">Enable libunwind usage for backtraces</flag>
-	<flag name="xcsecurity">Build Security extension</flag>
-	<flag name="xephyr">Build the Xephyr server</flag>
-	<flag name="xnest">Build the Xnest server</flag>
-	<flag name="xorg">Build the Xorg X server (HIGHLY RECOMMENDED)</flag>
-	<flag name="xvfb">Build the Xvfb server</flag>
-</use>
-<upstream>
-	<remote-id type="cpe">cpe:/a:x.org:xorg-server</remote-id>
-</upstream>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <use>
+    <flag name="elogind">Use elogind to get control over framebuffer when running as regular user</flag>
+    <flag name="unwind">Enable libunwind usage for backtraces</flag>
+    <flag name="xcsecurity">Build Security extension</flag>
+    <flag name="xephyr">Build the Xephyr server</flag>
+    <flag name="xnest">Build the Xnest server</flag>
+    <flag name="xorg">Build the Xorg X server (HIGHLY RECOMMENDED)</flag>
+    <flag name="xvfb">Build the Xvfb server</flag>
+  </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:x.org:xorg-server</remote-id>
+    <remote-id type="freedesktop-gitlab">xorg/xserver</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-base/xorg-sgml-doctools/Manifest b/x11-base/xorg-sgml-doctools/Manifest
index 587006a75824..e33f6dd1995e 100644
--- a/x11-base/xorg-sgml-doctools/Manifest
+++ b/x11-base/xorg-sgml-doctools/Manifest
@@ -1,3 +1,3 @@
 DIST xorg-sgml-doctools-1.12.tar.bz2 131356 BLAKE2B 555faf50f2e83b689566c7033669bd6e2e93294b9b6895d07110497392387f60b821fe570063e34d8089dc1a9f273eefb5ea0d0556d5965bf893756279e8688f SHA512 5c4f8506992abcc3d98b99d33b60ac770f039c3ffa11ad49005942bc9b7497367842a57967cee51b0e8e9095a660879af9a243abddf6b1af88741dbb882b3a4a
 EBUILD xorg-sgml-doctools-1.12.ebuild 411 BLAKE2B 64bc330961fc85110336ae852aefc9dbf55def2f60e3ebaa59e7d21241ff098826ab9a22a70b13548fa7f55bd5c6ad6ab1ad292809c09b5685327f335f4c1ca0 SHA512 bc88ec4fdc74fef2329a17462f2ba665fc5832bf502b1991311421ebf61847e01a0137a0e4cc397f776ba02e9ddb9326f737660f3106c83b02a3bbf4d3559748
-MISC metadata.xml 235 BLAKE2B 5ed3cd35ac32a5cdd6ac490bafdbc1cd03fc8c6bdbc8194ba7f4a34151a24c4ade7a80705d92348d6d13a9579d18b19ec40a353bf014dc02f98980bfa03d3574 SHA512 3fe78f6dd92b87b30ed02aef15ed72ec5cb62f4c6568dd9b98dcb2f11a4b9ce93955e34c62112a310b4c4a51f87e0e31e31ae5af140e1054c127d3cd344d7267
+MISC metadata.xml 349 BLAKE2B e0eb6df07ea6a377cc049e39bb481b8e3545f55f975c2579503162c8fa47ae1b5dd53b02f8d7d44d97ac564c3034f44328b1648a8ece8286d442e379e30a2928 SHA512 23b7488c53a0450f35b854e9e369d11064cd3bfd085c5cac8e1bf67c7385af7d543269dc3a70e9e3de96afeab8cbaa3d0358ed05c59846b55affba63523ac558
diff --git a/x11-base/xorg-sgml-doctools/metadata.xml b/x11-base/xorg-sgml-doctools/metadata.xml
index 6bbd73893d34..6e09f0a3025a 100644
--- a/x11-base/xorg-sgml-doctools/metadata.xml
+++ b/x11-base/xorg-sgml-doctools/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/doc/xorg-sgml-doctools</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index dcd01babbabf..fb4082f57278 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -3,4 +3,4 @@ AUX xwayland-drop-redundantly-installed-files_v2.patch 745 BLAKE2B eb9a61b2746c7
 DIST xwayland-22.1.3.tar.xz 1272440 BLAKE2B 5f35d6675ee90d910ed39921b4590e7a5325f941238c69b09d6b7063bcded992d1e4425327ae4626e8e9cead7dc17b4d892642a1a3bdb3a4de797f8f733202c4 SHA512 be15cb398f9a8aad70352d09b0745c827d4766d5996e817b92c828b5ede27b10186c7ee319901abdc5e141da97170a3ace039269146461d4e2ceb5002a7c35b4
 EBUILD xwayland-22.1.3.ebuild 2148 BLAKE2B 7be8706e2e0d4694506c7de67c914f75be631f17964feab9b05bd72d7d4e1a4e583f04ab753c0e5d732ef435dce5a0a28d3758304bb820bc9e184a9ef6948401 SHA512 731fdcb1bcba4612381c1b97ae2d7e7fea20b86530ea2a8820ba755f830093377f76d1c6f353df1468e45a02554d22afb3ad76c06633296961165daffa3b1839
 EBUILD xwayland-9999.ebuild 2221 BLAKE2B 79ebcf371891bcf3000095f61b53459279b78e1461e6ce361532452f6d20a5f5a204d1c366fe5cdd36093d40237932866d08a62edfca2aa7b82960285d1360f2 SHA512 67fad119e1bef87751bdb1ebff8d349e122875a9940bd2557d93ce2db99209d663e9f3c74486775d6cb9258d692642bc9472344e5bf4063d34ceb8ea6fe9456a
-MISC metadata.xml 450 BLAKE2B 9bddecffad64304a7d32a52c921ca817db03bb90315ebdb64710def6dfd5a17362e319de94fe26ccb5def82996917005bc3a77b4f673cf19a4f4be19d6d2ffe8 SHA512 13fef8a30ada7880d900603b361337757f93eaeb1d61d97d1119ab11633c1128926ca61c8249d00fa4fe2756191f5f01c974036c9d7ecee0457c0629d8f0da11
+MISC metadata.xml 543 BLAKE2B 6d9eaf03b02d3db1a546ca6443bc0e4964be085031c18ba0b5e58e615ef48090f181894fc9aec4abe358a8b59131423135b3bb25f0fe3a3cbb628e8d0f52c273 SHA512 075a7e2f5b39b537472c2ce242d9c7dde98be8230c6b48ec4a4115bd740011d1792a9d8188b44326276c91b7ddb56f01d1e548199786885b0f766854eab047b6
diff --git a/x11-base/xwayland/metadata.xml b/x11-base/xwayland/metadata.xml
index b3e3a39a9a3a..2df659c4c950 100644
--- a/x11-base/xwayland/metadata.xml
+++ b/x11-base/xwayland/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-<use>
-	<flag name="unwind">Enable libunwind usage for backtraces</flag>
-	<flag name="xcsecurity">Build Security extension</flag>
-</use>
-<upstream>
-	<remote-id type="cpe">cpe:/a:x.org:xorg-server</remote-id>
-</upstream>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <use>
+    <flag name="unwind">Enable libunwind usage for backtraces</flag>
+    <flag name="xcsecurity">Build Security extension</flag>
+  </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:x.org:xorg-server</remote-id>
+    <remote-id type="freedesktop-gitlab">xorg/xserver</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index b6d8e2df9d1c..b4a69b32564b 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/xf86-input-elographics/Manifest b/x11-drivers/xf86-input-elographics/Manifest
index 1a933170eb36..6700832c60dd 100644
--- a/x11-drivers/xf86-input-elographics/Manifest
+++ b/x11-drivers/xf86-input-elographics/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-input-elographics-1.4.2.tar.bz2 306167 BLAKE2B 1bd32ece8e1b3465542af539e5a83c75e23023125b8a21018a4e59b5eb9585e349371b346aa042f2ffcf4ce92d7a8616fa5d2a50224298f928e72a726df6ce22 SHA512 90e9eb3441a78288fbfbb2b108f212b8cfa3d5aaf25a0e88a5e40783cd36bc2d60e02ba390a5f0071eaa37f77e61f0d7ce6d9dbde4f6db21a86ca3294decff97
 EBUILD xf86-input-elographics-1.4.2.ebuild 250 BLAKE2B b2f5ef09470309dc083935a8a239bab88da665eb8dd0b0ad7dee9867b35bc5fab9f2171a164c67f38e43393c379350b4c59ecb121887ee5350cb69afcbe0eda3 SHA512 f97643d45e6b403d61bea819681c4170df185a75bb30fc9d54ecbfa0779fcacc80ed3ccbb5d9621321ccf9c14a7f74f54ea14e819de5333ad5c4de6c2cf89fcc
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 356 BLAKE2B 4abc357f727222f4241ccea330e678b2fcf6c08a13cb8e0e753c2f3073f38702be7b42754b5dbf73890cacba1f58288e832ed8c70d5d89914b850320daab488d SHA512 3a576f8ba94856cee1a76a88ff2a09d309ba7c7825151097ee91d6acbe0d8397f52d15a30ab5f1fb7c537be8fee0e40dd3cfe9c29fa461e0feecb9cdaf2d32bd
diff --git a/x11-drivers/xf86-input-elographics/metadata.xml b/x11-drivers/xf86-input-elographics/metadata.xml
index e17a5bccb78b..c0723f6ff508 100644
--- a/x11-drivers/xf86-input-elographics/metadata.xml
+++ b/x11-drivers/xf86-input-elographics/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/driver/xf86-input-elographics</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-input-evdev/Manifest b/x11-drivers/xf86-input-evdev/Manifest
index 009fb4b18984..d5d2d74efa33 100644
--- a/x11-drivers/xf86-input-evdev/Manifest
+++ b/x11-drivers/xf86-input-evdev/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-input-evdev-2.10.6.tar.bz2 408138 BLAKE2B 2b5815e6ee71971e5023392e893d0b8bdba315ff73b34926b9facd95141ff541de052b84a569fe7bbd4b98810afb4d643a3bcaa97fe5a4e23c37e1ce410a9e12 SHA512 560b0a6491d50a46913a5890a35c0367e59f550670993493bd9712d712a9747ddaa6fe5086daabf2fcafa24b0159383787eb273da4a2a60c089bfc0a77ad2ad1
 EBUILD xf86-input-evdev-2.10.6.ebuild 550 BLAKE2B 996b36c759098f8158d88ece6696ca98838f854975913fb4f3f10404b34a826eef8ae9ced5e6d28e8316c61afbffcf25788192947592b5b845a863802f1fb02e SHA512 0bf4875797f3f20afb4cfa3bb4927e5a8434228554fbac498229b63d87db19919f861af4fb9dcac5f2ae0b59b37515c928807e9bb0dda75c79e46d5e85ed0444
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 350 BLAKE2B 991f319a6584ffdc6572c67632e1bdb4318ee753b15db50c851ac0ef7dd9543220fabd478e0808e3ef8b3faaf460a87e60f3c0fb72f553a3e0070683dbf7597d SHA512 a9c3f2e5dcd4d7809f0e58c7e9711a92fed8692053cc4b49bc002e53b1032184c60bb1b3fa07044e5014f5bf973dc8e47b14545451487c543445f24270d1805c
diff --git a/x11-drivers/xf86-input-evdev/metadata.xml b/x11-drivers/xf86-input-evdev/metadata.xml
index e17a5bccb78b..b0a6f012a30a 100644
--- a/x11-drivers/xf86-input-evdev/metadata.xml
+++ b/x11-drivers/xf86-input-evdev/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/driver/xf86-input-evdev</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-input-joystick/Manifest b/x11-drivers/xf86-input-joystick/Manifest
index f716e72cfa79..32a543a9e17a 100644
--- a/x11-drivers/xf86-input-joystick/Manifest
+++ b/x11-drivers/xf86-input-joystick/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-input-joystick-1.6.3.tar.bz2 351846 BLAKE2B 3cbba17066cce241d6ed1a04ae26d4a875b994b47eb2d1078704d9dd109c9477ca367aebfec15b3358a7c857b91a8e751a83c2c4bab28f26b7aa6c02119463d8 SHA512 541c993bd37dd74d96d90060407d9fb9ebd3fbca352189a08c6b0c899c84609a1b5a3c1ea3febb4ceb5e2b881b54e45c75b8f9b2e475e16d7cffbbe42a3221e5
 EBUILD xf86-input-joystick-1.6.3.ebuild 448 BLAKE2B 54308d38df6ef67aa82943512a99765e70cac0b773a3a7881d86cc8b1b6261365d8660b2210f3f77ea28daecfb3ddef1ddbfc44ef4dfe77389ce15e1f18314ba SHA512 06936669517ae3806329248627a98925f9d0020a5390485a758932516206c5979b126be0fd8ba9a87615f08daaece88f71f3d8aab345cd95e8ec6b012ebe46db
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 353 BLAKE2B 416df8494ec3f313842dd90a2de2f4e0cea9e920ecc7eb4901c92f1eb6b0830855b540ea6386c91fc929074a9865219a3671b71eb08d5e28325e7ef51e6f0afd SHA512 817cce01f2a3bb803c72b3eff54f781c013704a0ef517c79cece9992a90237f9537a8350f8382925791afdd62248f9ada79479a9fd80aa95c0e4214f3cd14000
diff --git a/x11-drivers/xf86-input-joystick/metadata.xml b/x11-drivers/xf86-input-joystick/metadata.xml
index e17a5bccb78b..6de3f245fe13 100644
--- a/x11-drivers/xf86-input-joystick/metadata.xml
+++ b/x11-drivers/xf86-input-joystick/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/driver/xf86-input-joystick</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-input-libinput/Manifest b/x11-drivers/xf86-input-libinput/Manifest
index d7a28bea1724..20e5ae228ca5 100644
--- a/x11-drivers/xf86-input-libinput/Manifest
+++ b/x11-drivers/xf86-input-libinput/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-input-libinput-1.2.1.tar.xz 312324 BLAKE2B 2ce0419b19306f38cd8adb4159270b3943893032480325243066800cb1256dc1e497756da004f42510a6f6c78b1a3b73a41feccc66d5ce9c7cf40595008abebc SHA512 3decf694861d1aa3c02d090e66c5ed5513818cb18e9863f1790e0c8122a972230fb903705062b8291e1709db9098623f1205c63ccfb68e552e104813414589c7
 EBUILD xf86-input-libinput-1.2.1.ebuild 492 BLAKE2B 2e2792d154805523609216aabddbab15bcd44410f3d07935ca3fd4838d342a7a3ec7c991d7ca0317daa8c0ca0c768019a86510131e6586a71dabeacbe43b1623 SHA512 f0580375a6989eaf1987c47ece9b303176748e2e945853ea8bff31eab67f8785c4506eea11685a7b66d094e93a32d98f604547e3968053c310e636c442891192
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 353 BLAKE2B 9790292864502624cc387d0287d377bb6a071503c58a9f7125bd710de7899376aa571950794990eac13569c5d4af6d9023419496cffd1b2b3324f5f35447bea7 SHA512 772506e8c790596eef1dfca9bf35f9eec5df4aae388bcec0390fbb9f8c96b7b3a95d286c3379e71628d0b0b3847a33635facef3528b2978ef0b8dd4b93e84f2e
diff --git a/x11-drivers/xf86-input-libinput/metadata.xml b/x11-drivers/xf86-input-libinput/metadata.xml
index e17a5bccb78b..6dae9b34cde4 100644
--- a/x11-drivers/xf86-input-libinput/metadata.xml
+++ b/x11-drivers/xf86-input-libinput/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/driver/xf86-input-libinput</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-input-synaptics/Manifest b/x11-drivers/xf86-input-synaptics/Manifest
index 221707838ffb..780c9aa11399 100644
--- a/x11-drivers/xf86-input-synaptics/Manifest
+++ b/x11-drivers/xf86-input-synaptics/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-input-synaptics-1.9.2.tar.xz 432380 BLAKE2B 7ba94565f454fff8ddaf33695a7a16526810bf2677ef01e9ae740fd00a95810b4d42fb0077fe93120ac72398ca18ade48c7b389ecbc37f2438beaa97a6a21db5 SHA512 6fd46505f22bba79f612fbd48dddd4818f7d874cc29caac71840744de27f1d224c68861e3a18d2a866b78178924d2f093f5260e27b221aa1fb17dbc09d66b649
 EBUILD xf86-input-synaptics-1.9.2.ebuild 900 BLAKE2B 3f3d18be01af3fe6ebdf91c39a1de29879f29f1f7d00d1ff85f8d135a79e928a1ec7fab7b45861e7c661b19a6b50615042282373d4dad0ad9d57a8be8a14a9ce SHA512 832909388377e1c103ee48411e3fb644264f6448cfd9bce7b5d1260c97adbbe8df47d03cd9af595845680c0f8e94cb3345c36bf67ee8445e612cecd58d48e74a
-MISC metadata.xml 235 BLAKE2B 5ed3cd35ac32a5cdd6ac490bafdbc1cd03fc8c6bdbc8194ba7f4a34151a24c4ade7a80705d92348d6d13a9579d18b19ec40a353bf014dc02f98980bfa03d3574 SHA512 3fe78f6dd92b87b30ed02aef15ed72ec5cb62f4c6568dd9b98dcb2f11a4b9ce93955e34c62112a310b4c4a51f87e0e31e31ae5af140e1054c127d3cd344d7267
+MISC metadata.xml 354 BLAKE2B 487f08320b365f0d85375b6873b8ab5784f4b4becef6b4fcc59a0572bbe269a5bad1eb930dd279e74673f6c621d8f34f4e1c36a1db4b4469bf0e4d48119673bc SHA512 021f99f7487532343a8df7d09ed9c359a197df146d953548a7c6c1ca764096add54975e56fa5f9c93e12640aa0d79d520e1ebaa1f4b138bae6d19812b67755ca
diff --git a/x11-drivers/xf86-input-synaptics/metadata.xml b/x11-drivers/xf86-input-synaptics/metadata.xml
index 6bbd73893d34..fd24d530ce03 100644
--- a/x11-drivers/xf86-input-synaptics/metadata.xml
+++ b/x11-drivers/xf86-input-synaptics/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/driver/xf86-input-synaptics</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-input-vmmouse/Manifest b/x11-drivers/xf86-input-vmmouse/Manifest
index c262eecf45ed..dd4c7b99c9ec 100644
--- a/x11-drivers/xf86-input-vmmouse/Manifest
+++ b/x11-drivers/xf86-input-vmmouse/Manifest
@@ -3,4 +3,4 @@ DIST xf86-input-vmmouse-13.2.0.tar.xz 284684 BLAKE2B a63caa3959b47ee4b43dd4e90e7
 EBUILD xf86-input-vmmouse-13.1.0-r1.ebuild 567 BLAKE2B 452739edaf39b5794a4d4eb301d09b033f1dea53b0d2ff6068d6be063983df7dd94d570ff1ea9308024c3694ea356824c94d7c03c7d6a6156e2ae46e56b72a6f SHA512 dc8f159983ef6ae0ba06152a52fedb5ee53608d80b42d48f26edfecc1e1aa6f20edd68702538080c4d309f7a6bdaa399944b86c40aa099ee98315639b628ae61
 EBUILD xf86-input-vmmouse-13.2.0.ebuild 593 BLAKE2B 64a02d4e9db97de1e8f7d819f36ca27bf14aa0a0bfbff291c533d8063dbcd62fe85a86617dab20ab1e1964fc01dc4fa039543261695d144327515cd4654352c2 SHA512 0a028ecb0fa7f3863a46d98fea5dd19fd9728c66dadeb7803e3bb0b2ef50a39d08563fad23fd7ac189c85ac8bdac58ef6b556688ee002a7d98de991528422f5c
 EBUILD xf86-input-vmmouse-9999.ebuild 569 BLAKE2B d10e2679e2991969744610ddce72d11b667496c4c6416e42ffe238d33f3b8f5f8a44f3005f309a78dfd20cab89bddaefd82c8fd8d24d5a69585463905f050fc9 SHA512 d636fae99cfa1e4c2015215bee24188d0f4043a865fe037b7cd416290650fc150a765bc551691bdec98e900d4ea221e4acd57c326123e8ab50ab1695fad0a856
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 352 BLAKE2B 4d53cab0dd8b53840a59e6f6d2ecfbc56d7759346c3daec4d0c4b1c3ff36d2442aa2e08b9e051a356142e2cffc1acc5bd70264a96223699d0080496f64b70405 SHA512 917fa2af528fc5c6081bb63e8c142cbc907c210e9bef41a48c3152604e6ed8aeb4cf9f3b6cbe416cccdb73dcb660e70444f93d7784594d9024d3752a512a1ee7
diff --git a/x11-drivers/xf86-input-vmmouse/metadata.xml b/x11-drivers/xf86-input-vmmouse/metadata.xml
index e17a5bccb78b..7b32bf248b79 100644
--- a/x11-drivers/xf86-input-vmmouse/metadata.xml
+++ b/x11-drivers/xf86-input-vmmouse/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/driver/xf86-input-vmmouse</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-input-void/Manifest b/x11-drivers/xf86-input-void/Manifest
index 651c487fb510..a25eb19dfd09 100644
--- a/x11-drivers/xf86-input-void/Manifest
+++ b/x11-drivers/xf86-input-void/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-input-void-1.4.1.tar.bz2 271597 BLAKE2B c78d829dfc9aed788fc2e527f796c697546dfa9687189f5f36043fb017515307303d1bc419458e909107fdb30f6f534e9086e86708d4b8bf2447ed941d223011 SHA512 3cbcba9510635fc4a3b610fb940584417d4b3fcace88670b1289906a7da15614e9a286590cecd1840af4bb3bd0c62f246522b1203700067ec384c3cc11b7e94a
 EBUILD xf86-input-void-1.4.1.ebuild 324 BLAKE2B b9c5f0ada2c4fbdc5a3db207b5b35d966b2c5fcda697a44650890bff87ff0c67a45c5af2f0ad0e1303da31881ddc156053463170fb6dacd60f121bcd13123eac SHA512 32bb6adad975b983b0c953f14b515b6e7d9644f08a5127cfbb28f276b2a04766aa3cf69b745ea705814c8ad78c5beb5a7764f9f80e936d03e1f5b3ac5dd0f8de
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 349 BLAKE2B dc72b7a2d45385cafd33536becbd94b8b46e74a3d3120a9041c771552c79e02cfc33ac511faff1915750470ffa13225fe886805e8dc17c92990b426e74f1639c SHA512 b58b32e319f3e1c523cffd920398c5effbdac8dc115d04f62d3ffbab2eca90adbcccecdaf6011c2ef325397a92cfc4547868a3f8a7aa81404b8129f9f1e44f48
diff --git a/x11-drivers/xf86-input-void/metadata.xml b/x11-drivers/xf86-input-void/metadata.xml
index e17a5bccb78b..70485df2efb1 100644
--- a/x11-drivers/xf86-input-void/metadata.xml
+++ b/x11-drivers/xf86-input-void/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/driver/xf86-input-void</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-amdgpu/Manifest b/x11-drivers/xf86-video-amdgpu/Manifest
index d3f5a3e84be6..5ad1322c4417 100644
--- a/x11-drivers/xf86-video-amdgpu/Manifest
+++ b/x11-drivers/xf86-video-amdgpu/Manifest
@@ -1,4 +1,4 @@
 DIST xf86-video-amdgpu-22.0.0.tar.xz 376956 BLAKE2B 30936b45cce499791272e9194d5180c208e5159d1b3643ce6f261b2e92a30127a55096cdb07391cb4e91b9b47bbc9a4c5673ee66bdca5cd6f86fc74c7e3d6077 SHA512 95c64e3fef7729ced6e7adc5e81c60cc218f6d8b6604f7b290e86ff52c917426b5102decbf8be8a66c9181ccde6e5dff7083dca8cc0c493a39e82625b5c7cb2a
 EBUILD xf86-video-amdgpu-22.0.0.ebuild 593 BLAKE2B 881696e3cf2213c0a9712b9d03a92ef9da03f15bb2610a308a662c3bec991f44650367b2012e63f6b338ceed39a88aebd60f6b9cc7e84b7083da1bc5a2e497ca SHA512 febfb8903f9d5ecdac50496425944c09d3288430c80b58e673bce337ab0a9e903554d070bfb26fcf36dce92d364ad9c8e6214edb8c9040ae60d12e8a987b23e7
 EBUILD xf86-video-amdgpu-9999.ebuild 596 BLAKE2B 754c17bf2bf12fa8989d256f4741ed245e144c4dda78c06fc400a68fbdf6b3ed600540e506456dc3951cd55d7e27ba04780869737cf2e73c48c4fcadd670e4de SHA512 5827e02eaca03d267131979a3abfe0542fb92af35b0e32a26835f287226af38c5393bd0eee835def73a355fa77de7cc4b97759cc266dafd4f951bd5140928058
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 351 BLAKE2B 033ff5bc10c9e94cac69c1861cc07491b59a8d9693b3978ca11d4f7666e6e7655470fbcb73a92558483e07e3595ed6db70b79c95c0b54228af62c5e71413c531 SHA512 c2288ab36d82c2e2db95c4e8ec5c39630ad93d9ca5b06f3413f1c6d87a93a5785b04e1a3bdad07ae43ca821a1df7351221edf5942e8d65117c154ee106a8465b
diff --git a/x11-drivers/xf86-video-amdgpu/metadata.xml b/x11-drivers/xf86-video-amdgpu/metadata.xml
index e17a5bccb78b..f4010b392067 100644
--- a/x11-drivers/xf86-video-amdgpu/metadata.xml
+++ b/x11-drivers/xf86-video-amdgpu/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/driver/xf86-video-amdgpu</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-ast/Manifest b/x11-drivers/xf86-video-ast/Manifest
index 297827e1f77e..7d435b672726 100644
--- a/x11-drivers/xf86-video-ast/Manifest
+++ b/x11-drivers/xf86-video-ast/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-ast-1.1.5.tar.bz2 339848 BLAKE2B 48ebb8f54307a467eb952ff57dce4cc9da11b627354c54e11426133dee029765390c8c61f0b724bfc66c2f86aa5938ddad49707847b50648d875dccf5c4be9fd SHA512 067c2ce3e74c83fe1531213308753cb80482d177c93009c99dc49e95bfa6ff058d81cc716d6c343b9ca1e0eb7aedf3b84beb12ad08b8cd4d9f43e11f9e192e8e
 EBUILD xf86-video-ast-1.1.5.ebuild 224 BLAKE2B 62b99a679af9ceff70e9070bd14b1bd393a48cb364c3e433315a0ea7c399852cc826d01b23f302af18898f632927186465194085a4be9bb40f1aab77c63d7595 SHA512 165b209858242f141c873e14506f0e786cf30bced24a415787ef75d8f48051aae349c54f9a8038e7b29093df8760dbccf32b862fb5260d01b07a6d6d3e956ac0
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 348 BLAKE2B e67cfb03d00b751461ff7a3ce0ca0e57a330d38ea09b74ffcb4374b3010ef894018b9545c99cdb2c464dc7bcfe603a05de13432d9a8ffd021ad7a9b02bfd1100 SHA512 1c20a321be93ff558e7289e46d1a78619de8afb3c90af074303ed52433a40a81d55d37591e13a4b48649b8a2ec648efa13748ed9ac83afaf26b5020c666b623f
diff --git a/x11-drivers/xf86-video-ast/metadata.xml b/x11-drivers/xf86-video-ast/metadata.xml
index e17a5bccb78b..ed382e9816da 100644
--- a/x11-drivers/xf86-video-ast/metadata.xml
+++ b/x11-drivers/xf86-video-ast/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/driver/xf86-video-ast</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index 07ca87103645..d75a949d666e 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -3,4 +3,4 @@ AUX xf86-video-ati-19.1.0-xserver-21-build-fixes.patch 14203 BLAKE2B 20cbd16568b
 DIST xf86-video-ati-19.1.0.tar.bz2 904558 BLAKE2B 424e8b3c6fa14fa4f0bc00940bdf1008400f25ce7103b13ecefdbda9e629239c5ab011952d19c305251e9c0008650da3db0eb91055d5585e2b1c3dd108a74d86 SHA512 73a81f6c492daf2e89067fb52b3033dc0fe6841f109627ddca1aee54a45a738c8c134443753a2a2aaa2c131e1d560057ebc76351ff2304c16407df3ff568fcd6
 EBUILD xf86-video-ati-19.1.0-r1.ebuild 1039 BLAKE2B fa50fa1a2fe61fb66ea2314f70acf4e7337f022ac9fec2e71b86ead582dea83c53e5ebb0e52b1fc68102d30052da54d048f7b15f35a11162aa92b66414d7991c SHA512 2809e55c9c496dc616a8cbc74d621b3e4675129a56b17a95e22d4b45491c83b9410634d6ad41d29c33bc43951ff47778b982bdec3560ec8d74c87d6cb0e5ee58
 EBUILD xf86-video-ati-9999.ebuild 920 BLAKE2B c06cc4ea53386909fb56a78c0fda7d395fb8b47bb98e490b176691cac9a8bb1f45e3de06668ca4fa671194c22082d7ce979f67a91bba4e8dba0a8b2b68c08616 SHA512 681a6e97265ec898beadd1e2d059dcda7b51d05bb826ef87202d8ac54bf24ad10b3ba69da5adbfbb5db89c0808a5c3ce78e15fd6522df467571cae89679dbbae
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 348 BLAKE2B 0ed12610bdc3e8f9c2e7003dd1bf16205d93eadd4cfc351372d4de3c171f73aed35f6c4414dec5b7b4b74f6e76dce856db29444ec87c0107e93f6b371e80b318 SHA512 e7855c0f6284d91f98075c9d33eeb7b783f2a9d94cc1cd4b3218f95ea1202585c5a40cac212f33b927815a90ef29f4ec36cf186529db50da7d076f305effba81
diff --git a/x11-drivers/xf86-video-ati/metadata.xml b/x11-drivers/xf86-video-ati/metadata.xml
index e17a5bccb78b..eca12a61f2e4 100644
--- a/x11-drivers/xf86-video-ati/metadata.xml
+++ b/x11-drivers/xf86-video-ati/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/driver/xf86-video-ati</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-dummy/Manifest b/x11-drivers/xf86-video-dummy/Manifest
index bf113df7e0fa..f1cdfa77a958 100644
--- a/x11-drivers/xf86-video-dummy/Manifest
+++ b/x11-drivers/xf86-video-dummy/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-dummy-0.4.0.tar.xz 258452 BLAKE2B 8364a705bac5bc0bf2767be30b23a67753cb9232a58819c5b3ea3fa91769049e38cb04a5504b34e4aa5978f45a17617b999541333e3a1ee66d30892f281d7cc8 SHA512 1150a84c4f17215b9c579d8ce9399d547a01970bf7b5396653f14beb13a62deefe3008bf3ad6a2c5c0f46da4cbc0b840c18a7dff339e3b882d108183fa1d30d9
 EBUILD xf86-video-dummy-0.4.0.ebuild 353 BLAKE2B 593760020e7b31e7c9f314c86d1ed70d51c9f81f16e6c83b6b051c8b6ea85ab6fea68500ab7824a84b4d52e59e5dde9104c143b63752c7c9fe18de26ad56cc6f SHA512 dc5e4bb32114cc12ab37a6b4a883f64edd02051e764a79d6ddc24e62aac956623496bdf6b7114ba2316edc61bbf3fcc26ef42c3119986289042bc8177a4e42f5
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 350 BLAKE2B 6e7491587fe71ad22e66f26a3e0b8b37efac4ef09a4fb29945b165b690ab6ae23458433c8b8ba6909d614a7b343dbf817b0fcae9b32712c3b6a8f1770ae052ca SHA512 fb031e2d52510f1c690a0caceb0b81ac5ab0cbc443d456261b802a96694e34411012272becd765bc2291b42ec036372cb5e4c6ed11c548e922c0002b269e49ba
diff --git a/x11-drivers/xf86-video-dummy/metadata.xml b/x11-drivers/xf86-video-dummy/metadata.xml
index e17a5bccb78b..c609a39ea60b 100644
--- a/x11-drivers/xf86-video-dummy/metadata.xml
+++ b/x11-drivers/xf86-video-dummy/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/driver/xf86-video-dummy</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-fbdev/Manifest b/x11-drivers/xf86-video-fbdev/Manifest
index d975a7a39243..062495faed70 100644
--- a/x11-drivers/xf86-video-fbdev/Manifest
+++ b/x11-drivers/xf86-video-fbdev/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-fbdev-0.5.0.tar.bz2 295102 BLAKE2B f3696662e782f35eeae66a755761b8f5d6f1304321976ef7e17758576da014091c0dce9046c4fde6b0ec4cfa1dce998b4b9130e646911d4d1dad983bd530d06b SHA512 c1217b943bbe3301b3c2a8649ed1004c3c67b02607bd56bbc14f6dfa05e7f0184332c81a6a19595514745501ed88526aee932e555779b7c3a8233646b0979448
 EBUILD xf86-video-fbdev-0.5.0-r1.ebuild 344 BLAKE2B 4de808c2ead3f2f20cbeb07031f3ba019fb165b2dd352436088cf3652829b70b4d79f9d3ccd7934ffe6b4c8afac2843c71a782a2af906a1c2afadfaa50f94c62 SHA512 629760bebfae4947bc6d44b56f0f1dce22b87b22f97ce2986e6fb0624ac07361094afdd7ecff14948f21c69469fd51a8cd0452285d169605002989de97a56cea
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 350 BLAKE2B 0723f22c31d0736837fb5b4c1dbda098cd53073f230a629bb061be352a9af9f158dd5dfc3c3ccd44c5dba0ffa9e28da34770a4537b9c6e6e0c2c3ed801b118c1 SHA512 177a51b070b8adb687502f50e9a54481c09df159f241adcdaae423ba222ddd8c7451ba07d86272c130a2ce3e0d292d7fee30a6c1295b942997ceefb243a6058d
diff --git a/x11-drivers/xf86-video-fbdev/metadata.xml b/x11-drivers/xf86-video-fbdev/metadata.xml
index e17a5bccb78b..6d160a460d35 100644
--- a/x11-drivers/xf86-video-fbdev/metadata.xml
+++ b/x11-drivers/xf86-video-fbdev/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/driver/xf86-video-fbdev</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-geode/Manifest b/x11-drivers/xf86-video-geode/Manifest
index c315365b0979..4bc349fea813 100644
--- a/x11-drivers/xf86-video-geode/Manifest
+++ b/x11-drivers/xf86-video-geode/Manifest
@@ -1,4 +1,4 @@
 AUX xf86-video-geode-2.11.20-fix-multiple-definition-of-linker-error.patch 2211 BLAKE2B ad3228a6c1d88f985949cd04940da5b3f45f2c284443c0bb538a44f75f8d479be1d64e8ed19a8953942c2ccb7996a55d6a490c1a1ab0f7f96bade79562dd16a5 SHA512 69d25f08a11c7897c7d870ae7f16977a55b7b678b0b3240d1626fe98638c7f76cfbb3f4d091436d4a984aeb3098e1635131c97be2025345bd18a90b82e3fb934
 DIST xf86-video-geode-2.11.20.tar.bz2 699973 BLAKE2B ed5c96a4ac41bb908239d89a49ef833a56fdeab62e441ddf36e32be1704a0850a2466a5538aafad87c83d3850339b0bdf0610851a17e3f4ace5eefab20c82296 SHA512 a67376ec174c544256aef693590d515742199c2acf1a54117207f599e1d9f70a3fb70c9c811ebc3f907dfa795e0e662a1c1f18673774660f0d5f3c757e848f0d
 EBUILD xf86-video-geode-2.11.20.ebuild 451 BLAKE2B 0674b9fb9d56a57b003e54d23e3e27e341b5ec2dab7456da826c9dcedb1c06e4e9045ba400d5012f38634270991bb189666f03bc7f2a10a5f735c47181f5126d SHA512 28573ca325743a0552c19fc6ab3aa7d7b81a20bc70febf6f518e0b9d9aa0aeb150fa4e86356f7913274785c9334d9facb563f6f41ca5bf4a2206b300b9c68866
-MISC metadata.xml 374 BLAKE2B c47d706ef2c4076297cb5c25890e9d87e642d6392c04699a0c2e2ebdde8fee5164212f45271fc56fd6f11a9b462f832034e98efaaca4f55a412fc2ec2306f07e SHA512 2dcb40246613cee9b4d4c498d2ed634b77cd607a0e741cb4beae14fad8f8204dd550a4757089b339d5a1be1be3d366d3be0ae7e68061e3c0164437f6a26cb5a5
+MISC metadata.xml 511 BLAKE2B 194193137efc8f608a9fd5be7d991b34c46c46f54e9c01fc1e2cb19e607f3784442095724cdd3aaa1914da2c8ceae55ad8e78b8549f32fbd9ff1588b75bedc3e SHA512 a7c3f53f29d7a8f89b79c748d84a6d69bc3f4ea58827d6b708d8dec29e02055792eb096d10bb236c5072e16e4f961a88a998845123486ffee96f0817af2bfb63
diff --git a/x11-drivers/xf86-video-geode/metadata.xml b/x11-drivers/xf86-video-geode/metadata.xml
index 83e251aed5e1..d432f6a0339f 100644
--- a/x11-drivers/xf86-video-geode/metadata.xml
+++ b/x11-drivers/xf86-video-geode/metadata.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>leio@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-<email>x11@gentoo.org</email>
-<name>X11</name>
-</maintainer>
-<use>
-<flag name="ztv">Enable building the V4L2 ZTV driver</flag>
-</use>
+  <maintainer type="person">
+    <email>leio@gentoo.org</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <use>
+    <flag name="ztv">Enable building the V4L2 ZTV driver</flag>
+  </use>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/driver/xf86-video-geode</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index eb4deb451cc9..8f73faf34994 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1,4 +1,4 @@
 DIST xf86-video-intel-2.99.917_p20201215.tar.bz2 1250622 BLAKE2B ddcbd84ee125528fe82f0a369f8e768d218eb0d9c4fc00cbe4a921d6267a846eccc001e3dd765f8cdaf7a38c461357831cd9675acfdfd3cc6ac282ec4b6f4b67 SHA512 29526fe191a95c2df5a3e168150b8c7f759dfdc9a4912e28887ec51be05304a9f552d21c990a37a90d6299e64df4bb1fba051c1d0ad25606dc52f801cd30b60d
 EBUILD xf86-video-intel-2.99.917_p20201215.ebuild 2028 BLAKE2B 85d72fc92f7f1ccf2769b1fda93a6de553f3b172b00e116bdfac20ac3afba823a4bc247d243a9f15111f8bf96245574a6aed074f0464857c517b515e77da4e17 SHA512 8ec6a8b5a588bf34a1c309811bd9c3e845739bf18136e0a292d16979186d7566baced46c3da7ebe712dd09bfc74fe5c8f207785abc21957e7d7c6ef45529f298
 EBUILD xf86-video-intel-9999.ebuild 1990 BLAKE2B 29f2738249bb4b10db97f81567ab4e7921014fa1000c8cc53d5bdde02b9905f05a7be12bcee32583c1277e47e3fb1e962399c95ccc71681d131c28c37f4ff5d5 SHA512 5c7c28933fc38ca76374972f3cd4285a48e6ea292c4367356458e67e43045228c252626369f124058c7210ed40bf15c77e656f6ac1ebd428bea60a09cd90f1f6
-MISC metadata.xml 559 BLAKE2B fe8c1aeb0b8f05050a6285c54f5a7aaa5847352fa54463e05c8eb289512d9f5ff887ffed2ed5e3ec7cb091ab8d2b77cb380676ba631f661acc86dae36bfe530b SHA512 1243d1134477cf095c24d1054c7efcd3a7c0d5f37e7b4f7d1ab853814e97885a3e69ac058f5d493be4ab7cf56f5bddff5d057eb4cc3f454b0aed18410a4ff10c
+MISC metadata.xml 684 BLAKE2B 38aa4bdc4d0cef985f16a1580083839a7866b6a423ca0046f12142f187ac32009ce4163bf86f0688e6c9566f5822c9e8dd801224ba06a1ea39f08ebfce97f077 SHA512 fa9a5cf8cfa205f89019c298a6064efc2800b265a60f55c461d7e34faa0129978404507e4ce96ac629a6ea20a9e9b6eb29103b565f9758ce7b0f9e7656794fba
diff --git a/x11-drivers/xf86-video-intel/metadata.xml b/x11-drivers/xf86-video-intel/metadata.xml
index 818438765cb7..0863636ae973 100644
--- a/x11-drivers/xf86-video-intel/metadata.xml
+++ b/x11-drivers/xf86-video-intel/metadata.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-	<use>
-		<flag name="sna">Enable SandyBridge's New Acceleration (useful on all chipsets, not just SandyBridge)</flag>
-		<flag name="tools">Build the intel-virtual-output tool</flag>
-		<flag name="uxa">Enable UMA Acceleration Architecture</flag>
-		<flag name="xvmc">Enables X-Video Motion Compensation support</flag>
-	</use>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <use>
+    <flag name="sna">Enable SandyBridge's New Acceleration (useful on all chipsets, not just SandyBridge)</flag>
+    <flag name="tools">Build the intel-virtual-output tool</flag>
+    <flag name="uxa">Enable UMA Acceleration Architecture</flag>
+    <flag name="xvmc">Enables X-Video Motion Compensation support</flag>
+  </use>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/driver/xf86-video-intel</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-mga/Manifest b/x11-drivers/xf86-video-mga/Manifest
index a4a39d6b4f81..c7c81e388b3d 100644
--- a/x11-drivers/xf86-video-mga/Manifest
+++ b/x11-drivers/xf86-video-mga/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-mga-2.0.1.tar.xz 403212 BLAKE2B 2d7f4422defb0b57fc7f9bb3c27274f51185eac45445f83f1c9bdba1bff3066f05728e9996f13f8cd2d8a7275602dfc5cef7435b54498700a8ce6efae568631c SHA512 d9a0abedb71f3354788c2f91b770bc00c4118cfa2c99072dea82c28f025bc87bb88ebaf969962a8f0e97e1ff7938aebd9c682b730b0e07d5174dd9e8dc2cdfb6
 EBUILD xf86-video-mga-2.0.1.ebuild 364 BLAKE2B 47b979fa83fe43a9733bd2cb66ff5af0b0b678c6196bdf01e9cc2f0eeab59d0bcbd6c3f52d1e04945d172dc0711fb44518c096e3134a00ab0cb9d1ff96b7e5c5 SHA512 dddbcd601236f2054a91beaa6261c414c289b4e38d77de2f339b2e4dd7b19bebd9dffdc1b944e517611f93b2ee56ea0211139415de42786a436259b96b59fc75
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 348 BLAKE2B 43dd2bb5ece3cba33898631b8afdd4f64ea0f3dcb2db46d42e6fde4921e35ad26e62b78aac754bb0aa588a44cc2c03bac9957dcdfe0de43492c22bca19c23a4f SHA512 1cc0d33db44ebadc558f6e0ee4d07d314401c0c9b76793100373b1f833d704bfbb8393191b77190c1b400999ccce5cd72cc411822ba63658ca651c1dd325064c
diff --git a/x11-drivers/xf86-video-mga/metadata.xml b/x11-drivers/xf86-video-mga/metadata.xml
index e17a5bccb78b..6c1926f53aa2 100644
--- a/x11-drivers/xf86-video-mga/metadata.xml
+++ b/x11-drivers/xf86-video-mga/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/driver/xf86-video-mga</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-nouveau/Manifest b/x11-drivers/xf86-video-nouveau/Manifest
index 502c884a0245..475dffd22492 100644
--- a/x11-drivers/xf86-video-nouveau/Manifest
+++ b/x11-drivers/xf86-video-nouveau/Manifest
@@ -1,4 +1,4 @@
 AUX xf86-video-nouveau-1.0.17-xorg-server-API-rename.patch 1590 BLAKE2B 930c5b4a5d22f45c3a64bf3332bab683e176917adb6634517e1b1f00e2faef428ce52e48a45481e2f0f3277cef8dca327ddf7915f1b41bbd58cc1ab0b25e68ad SHA512 c2c221b9defe175290a5f76bea6aacc671deefd1d292888e7ce1bc8dbdd598e37191e775d9b4b044183f8eb62219ec86a09144df79989e2a714f26ea825c422a
 DIST xf86-video-nouveau-1.0.17.tar.bz2 632535 BLAKE2B 8f4a3e749dbf46f6723f65b7bdffdf32e40fb194a18cb9951af297d7c3bcc34cc4ee6eed4687c42a385c259f37d1438ca7c9eda7594a3426704b358e1cda36fb SHA512 adba58ba5298d1a5b3f9f8540f9ef2cb2e10e47bba8e374103ec2e1f92e915f5f4393ed0021168cd649646e12315135a1efcdf77e8fb1648e1295914d87279b2
 EBUILD xf86-video-nouveau-1.0.17.ebuild 688 BLAKE2B f4c718299b11bcfe71fbcbae492b91d01daa53f309238ce883d0da2f33c51ec2eda8d3dfc68f95617b8c23a57f631d6f47aa44bbb4772132ea0d4266b97544e5 SHA512 22ab9bb61efe2c3531cd53dbfa6a833b3a5cd1e7b4e0b23baf3546c546197cc003c952b68a23482dbdf861162c086d7b7f3af471ec4092902789c64a626a5ddb
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 352 BLAKE2B 40fb89959e9c8a7030127ea11ae878819d4655b53a7d0350d9761cb0d28c01574f8f1463bb926fc2c65cb6cef2eefd53c51649792fe84f97a05bbc75fd3cc0ad SHA512 2ba11887f02b1f29892a1c75e8a4973e15732dddce52460e6644b138a5f50b78d24c3c62347ac646974f0722eee37383375e5e3e2ce32ee504a0d8d58a63a091
diff --git a/x11-drivers/xf86-video-nouveau/metadata.xml b/x11-drivers/xf86-video-nouveau/metadata.xml
index e17a5bccb78b..d14af14a7cc2 100644
--- a/x11-drivers/xf86-video-nouveau/metadata.xml
+++ b/x11-drivers/xf86-video-nouveau/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/driver/xf86-video-nouveau</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-nv/Manifest b/x11-drivers/xf86-video-nv/Manifest
index ab3a30d49715..745bf7cfdc06 100644
--- a/x11-drivers/xf86-video-nv/Manifest
+++ b/x11-drivers/xf86-video-nv/Manifest
@@ -2,4 +2,4 @@ DIST xf86-video-nv-2.1.21.tar.bz2 424091 BLAKE2B 3ef69d23672c0d65d1117ec1c4906a4
 DIST xf86-video-nv-2.1.22.tar.xz 354708 BLAKE2B e2e54ea3f025a77f268d584345a12ad3547d60f8f23a393d5af0cf69c2a14c6851c8c074ecc4975f5dc2d94018ea51ac36241a86b2ad532672cd09ae2a5dba7d SHA512 a54767e9060404cafbb028ea36e582e8cfb7431a746cfc1d698c435fa73e41c4dfc12f84e50d002a582ac61e2d4c377f4defdf407250ee9e8656e5ff989b3cda
 EBUILD xf86-video-nv-2.1.21.ebuild 309 BLAKE2B 1a7413289d391ee02653a1650889ccf34f44bf542b37e5a09fbf1d43bda7bc73fbababa7e3aa1288c0b86b4f07ff42ff9be6e535967af228026fe90cfefaf019 SHA512 082e4052ea85f45a13faa38adcbf8a1c466d05e24359dbdcb39c83bdc3c97eae4fc0ba13b160064b0a5ce53a0296cdcdf53e9bf01325386a37682426cc2b1157
 EBUILD xf86-video-nv-2.1.22.ebuild 252 BLAKE2B 7b1c731907e284e534e2c50765ba89a0c9bb07bc366d7d915aec164bb6c099da9fb0ea046015cfb9e2518a6adb77934463e41c695242adced481fecc2a3e8aee SHA512 06219d5c6e82b5d01fd843eba313c88499a81d2cdfe067a057333e5c507be1b6501667c9289b2b777bdffd7b56cfa27ec7a84fec998175f2dbe005c8fccbdff3
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 347 BLAKE2B e3fd6aa534de71b505fbd701a26f325d686501fa9a19b96f6da8a2702a83a2d5d8489a236c8fe2b215b1527def80e93e9a6694abaf616ebb484de9dee32f2720 SHA512 a6f44b4b862eb190334b265651b925638ee991cb57afd44e56f0c132fac32b4d8952a3db6715c1a3bacb2ebee6e302a2db611256ce1eab67773c7df24e9b4e7a
diff --git a/x11-drivers/xf86-video-nv/metadata.xml b/x11-drivers/xf86-video-nv/metadata.xml
index e17a5bccb78b..b948bfa1ac27 100644
--- a/x11-drivers/xf86-video-nv/metadata.xml
+++ b/x11-drivers/xf86-video-nv/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/driver/xf86-video-nv</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-omap/Manifest b/x11-drivers/xf86-video-omap/Manifest
index 1ba9891a7d8d..9424fa3dae08 100644
--- a/x11-drivers/xf86-video-omap/Manifest
+++ b/x11-drivers/xf86-video-omap/Manifest
@@ -1,4 +1,4 @@
 AUX xf86-video-omap-0.4.5-null-dereference.patch 362 BLAKE2B e4ddeaedbf3ba964796529dc3638b9303e20324cc18e3ecc47022ce389f8020aa6a1abe1e9e29e45ab4f8454dd7faf9df74b4f76987ce81dacb1d3e7bba796df SHA512 092dcd4d19653d59d2409ca89bd2528de5e220cd9a88ff8e4080c4dd62adcf3e264ce5a3719571f1055cda59b7a0b6357d32916041c29b0c1c5725bf7565b42d
 DIST xf86-video-omap-0.4.5.tar.bz2 316765 BLAKE2B 981322d7e140c4948f3cc5ceb9a649f252c431b6755a0e201bde32c92a00bb2d0c0513fbd2638320100855c78e8c4897c5cbcff8527ef0ff045350a9e9ce505a SHA512 c8a21bf00d9ead73b5f66310f802d6071454132b69e20230d3b95635d8fb8351febf5c881640907eb36dd7aeec2d0823e45fb9955b1a9a32e3838ee717964ca2
 EBUILD xf86-video-omap-0.4.5.ebuild 359 BLAKE2B b065d49dba469e6d17653edcbab4f3053a7b5fc5bca0d79ab34305f5c8429cf9df8b4f25257a57be65e1a28648dd1fc0d97267277c9c872b9d0d802c54d4ddcd SHA512 3ed6f0b8864378cdcbb6ef86404970eb6a2bbcf09dfe33e4702e720f97db01d6ab0068c1436597c63d78e9f33af6038aec675abf1a87202c39bc7ea2797d936e
-MISC metadata.xml 340 BLAKE2B eefdeb8e3b57676ef4050044220e01c45c7bf0c3955d8e09e8a7ec244c1fb41b16f5d1067575925e240dcfcf8e49d7c1d53bd7b282015e8013c83372777dd8a2 SHA512 cbde190c886d77040a478f88a4fd0a525ff7ee6c418d49f74ef088071fec56df34e14b9cbe5fd31614adca87b965c25e211746727054d7819a477f5c772e3895
+MISC metadata.xml 468 BLAKE2B f002707f2a6d01932fd3567d79646417c525d411191ad16549af75fc537d75c2ce164573134fd88bc58a51f367c2eaf0b4008202b2cb6a9d23715615a9f063d9 SHA512 4a82075c568b4af2f084fab56b8984e33bae801420b42d735f419b10e110574c8756fb8554a45fef51d4ff7f6fd1079989a0c5ffb53e0c2949c3c098f5ac91bb
diff --git a/x11-drivers/xf86-video-omap/metadata.xml b/x11-drivers/xf86-video-omap/metadata.xml
index 1932ccf5b377..13f5622254c8 100644
--- a/x11-drivers/xf86-video-omap/metadata.xml
+++ b/x11-drivers/xf86-video-omap/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-<maintainer type="project">
-	<email>arm@gentoo.org</email>
-	<name>ARM architecture team</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>arm@gentoo.org</email>
+    <name>ARM architecture team</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/driver/xf86-video-omap</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-qxl/Manifest b/x11-drivers/xf86-video-qxl/Manifest
index a8d061a2b92f..a2f4f0ce5c54 100644
--- a/x11-drivers/xf86-video-qxl/Manifest
+++ b/x11-drivers/xf86-video-qxl/Manifest
@@ -2,4 +2,4 @@ AUX xf86-video-qxl-0.1.5_p20200205-xorg-21.0-build-bool.patch 339 BLAKE2B eb34df
 AUX xf86-video-qxl-0.1.5_p20200205-xorg-21.0-build.patch 3197 BLAKE2B b2a03a9af5b0ab733288e1c484d057bedd065332c2ac05349b6ae4aeb439f8d8cee8ca1ff4a3de413b53ff2bcb1f989a91d8b373721209c452226b3a8ca7bcf8 SHA512 35bd57e0876d5ab18e629a8d24598b05f59424c842e6902d127a377cb76ed92f9af923b0e32f49044b67223a7b3f44dd4b3afbf971471509f50e4d31ee5fab2e
 DIST xf86-video-qxl-0.1.5_p20200205.tar.xz 137452 BLAKE2B 1639a393dadcba251a8fe761d52112d51c29e70960524785343379ec088e69c5e2cbd1a9710d72c749dc8b7303b3eceb545fbaec82d5d22613f8ebb0a4e7aca8 SHA512 9a2ba4aa7ef61d3ea0043ff1e3a8f312b7fe00f707045bcb4e4fc1189786b9aba2b6e44696f47e7c215485044f6c953f831ed4da48d4098cd7b62555c74a79f8
 EBUILD xf86-video-qxl-0.1.5_p20200205-r1.ebuild 1052 BLAKE2B ba88989993a4fb127f9df01e8ec7b1329fa1001ea623cf3439f08aaa1c55877e2faff484e45e9915e2e3d5b5aef55b6efec9b925b2e2a56dbf6a1caee8d48124 SHA512 8b19efa6862d31de106a8ad29abc93b459571a982651cfffc3b802a06391b04afe7462edfb90586ea3bc64f9fc707b4d28621955965507646365333f0e7d1b33
-MISC metadata.xml 353 BLAKE2B 069be65314e1a998fd531c1f26b09f78282983ed7e2bac3e0349b506cbce9293e7d80514a935ca1e4e74219656d0471ae329b694510a2fd30dd54508769ce6b3 SHA512 caf03baa6cf42a11adc3649fe17a0eab7b1eab66f2b0f44131de40d19f50e32202f245f767910b062ad7825a0263563922f8ec07f7584225839557f6d0668c2e
+MISC metadata.xml 460 BLAKE2B 395d82f906854991a084f443448f523b0c5ad2353890ca2c47d6b28277f6e998746aa6f6b4eae38321dbd6356d33b7a43e81d2aa9f895f17ea22e48d8b99b628 SHA512 47338f8d0334783b5f5e7d582347b7b41b72d9ce2256d83bc4b7a1913139a1dadd65b34304501326cf99e7d8cf642cfbdf09ddf6b9d537589b7cedb6704239f7
diff --git a/x11-drivers/xf86-video-qxl/metadata.xml b/x11-drivers/xf86-video-qxl/metadata.xml
index a398333a3179..d2dd1204f63a 100644
--- a/x11-drivers/xf86-video-qxl/metadata.xml
+++ b/x11-drivers/xf86-video-qxl/metadata.xml
@@ -8,4 +8,7 @@
   <use>
     <flag name="xspice">Include Xspice, a standard X server that is also a Spice server</flag>
   </use>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/driver/xf86-video-qxl</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-r128/Manifest b/x11-drivers/xf86-video-r128/Manifest
index 7c42b142402b..9cf1d66505c7 100644
--- a/x11-drivers/xf86-video-r128/Manifest
+++ b/x11-drivers/xf86-video-r128/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-r128-6.12.0.tar.bz2 483999 BLAKE2B f3433ce0289a7c356b69871ad4acb9ce9b0a947c1bf6ee9bf436a5d27ad1324fc81bb2d3c9be16ddf588f286ae092091dafd161c39ce8bc1bf20b6cb36ffdb72 SHA512 0e667e2cfa8a87a00846361d86528c93754c403c812b66798953fa4c857b2143b2c4c44885da467e7f910d8cb910b69492cdcb6f25e2197bae6617364d152e38
 EBUILD xf86-video-r128-6.12.0.ebuild 499 BLAKE2B 76151d12babe623c6fa063df6e4b015f7d92ed8a138868976ecd80f7f8e04e6ab0c792739b09360949d8a25362253387c93a202fb1784713a41ca34bd055c883 SHA512 0b8f0c855d6106f5f5456e2a13e3390190fca5b30405d71f2a4b6f65b1861867d77c27a52541a318351686da7a4dedc96588b78c2c9befd4a0c2fbefb24cf7f8
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 349 BLAKE2B 0bc524edd9993bb3de0c9d3b0b4258377ade6b90cfdc93f805db2851a794819311dd0124199462c388a6d89efb9d6b391dd658772cd79adb19c96ddb998e1937 SHA512 a46e1ca2522c62720e1cd47f5af88ed8b5ea9a259ee5b02b86e83c7297e8ec32a71aacbabbfeee470a4f01f0c60d4e2fa902c9ea5d7eac5ce789a100de2ac558
diff --git a/x11-drivers/xf86-video-r128/metadata.xml b/x11-drivers/xf86-video-r128/metadata.xml
index e17a5bccb78b..9371edd62dda 100644
--- a/x11-drivers/xf86-video-r128/metadata.xml
+++ b/x11-drivers/xf86-video-r128/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/driver/xf86-video-r128</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-siliconmotion/Manifest b/x11-drivers/xf86-video-siliconmotion/Manifest
index 53fa93b73e7e..7889afb0b7b7 100644
--- a/x11-drivers/xf86-video-siliconmotion/Manifest
+++ b/x11-drivers/xf86-video-siliconmotion/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-siliconmotion-1.7.9.tar.bz2 416351 BLAKE2B 8832c4de662871b373fdd2a1ac395454bbcf3ab3ac81416aab23c9a282a18cf46be5d98aaaa15213f394d0d7ac8b407c39aa0b9e3692495e36ef800077ec3f19 SHA512 13085945ca496f83521c28b25c394077e010031dbdc2374347a932a52650ada02f525269a81d0b0bb20b48e371d5435a7a73cb7555a07dc5a784e77152608c63
 EBUILD xf86-video-siliconmotion-1.7.9.ebuild 251 BLAKE2B 0d70653297b3adf446a69a6b25fb58cdb9d397c3527dcea77359221e003615641e8f165e48b19c95746aad7861bab4b91ba0afacc222382343b727b470b999d6 SHA512 8def3850299ae7d4f06ff46620e610a11564ed70e40c5580f05317a85a43e7e35471da2f777868b64638141053ca3d2886b608301c71b53baae239df2cd7af84
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 358 BLAKE2B 193da1cdb72369fc0cac604a5bd344251da78f8ae87a545426ee792bf2e36d7fc29b69184e7f33fd03a4f248da2c9c79ddf91754ff23f533b72c18c380af7d79 SHA512 8718e348d0ecdbb4f4541f1e1188cd6c7e04df64ec91189be8226b652c7c53f92efd5d97e32b414f1264477cb1ea7a2792ba59629744550c74597bcc3cb45716
diff --git a/x11-drivers/xf86-video-siliconmotion/metadata.xml b/x11-drivers/xf86-video-siliconmotion/metadata.xml
index e17a5bccb78b..c829f0f0db36 100644
--- a/x11-drivers/xf86-video-siliconmotion/metadata.xml
+++ b/x11-drivers/xf86-video-siliconmotion/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/driver/xf86-video-siliconmotion</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-vboxvideo/Manifest b/x11-drivers/xf86-video-vboxvideo/Manifest
index abaafda659b4..7c81cdc4bc2b 100644
--- a/x11-drivers/xf86-video-vboxvideo/Manifest
+++ b/x11-drivers/xf86-video-vboxvideo/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-vboxvideo-1.0.0.tar.bz2 353342 BLAKE2B 8088e150c8e91dd4872218773c2d57a052935926fe08c18d9f5165b112d6213bf79c80d85fd4d10c1b12bd2ac222983b3dbf241cb97c1cb087f4137314a95ead SHA512 1a9856a966495a3a291592ee3113ed5ee83e3ef530bf37d91605206a62f641726511ad48ca79b8a3e94f601f8cf15341255b0c7d14f5c8acf985b84f965d8dfc
 EBUILD xf86-video-vboxvideo-1.0.0.ebuild 407 BLAKE2B 9f9d2637526583e8d896dbee2da602501e5f7f20e56ce476d73726e791f02dc560c80aae01bba847810218a8043caf6963127d256963cd49118270779e2f7a7e SHA512 8439415c8accea11eeb4170eb20a834cc526b11912381cf8e1e51cab2e5223c2ad1546d619a3bfd4eaecc9faadcea6bb3bb2e15be42d98f1f36dc56a71179fd3
-MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
+MISC metadata.xml 277 BLAKE2B 14ee4994b659b3cc6bf68a02dc42924170acf9e9bf631ed6512967b3129645266681ff0141177edb46260d93702a9d98e3a8fae840249fc2421a0970b7dea5ae SHA512 3ae8ba5d02b5e32e36d82533fb6daa6a5d6c53095f9be52d76879a672f5a740c97be8a5185d960901d685460af99d24091358e3b201d5665264473fb2bbe061d
diff --git a/x11-drivers/xf86-video-vboxvideo/metadata.xml b/x11-drivers/xf86-video-vboxvideo/metadata.xml
index bef24d2c2337..9026d7bf16ba 100644
--- a/x11-drivers/xf86-video-vboxvideo/metadata.xml
+++ b/x11-drivers/xf86-video-vboxvideo/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/driver/xf86-video-vbox</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-vesa/Manifest b/x11-drivers/xf86-video-vesa/Manifest
index 9b9549d75f30..35e29050a988 100644
--- a/x11-drivers/xf86-video-vesa/Manifest
+++ b/x11-drivers/xf86-video-vesa/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-vesa-2.5.0.tar.bz2 304322 BLAKE2B aee8b59d769a72fb2890bbadde7fb87e2f527fb58eaf8b2ef515b0a1b7dc591c6afaf1d8692caaaefb741f475ed77bc0ed069be43a752103260bc85314a7a830 SHA512 36fd921f54f33eb25966b5f9ea1e1b3e9009965c012c8b9c676686b472111719921b80cf62dafc746058878253e21f0ef341a2ff2d650df22ca1e35e81716a8b
 EBUILD xf86-video-vesa-2.5.0.ebuild 623 BLAKE2B ab3420635068980df0be30496073d4b2917f89c67323a25af6356b56de3a0f75e535ccd9fb67518256b465d9706950d3e50d44b74733507084986232e9d98350 SHA512 ba18775c51b0c19c5cf368d11736543cac6cfecf1ea8176446d1cd2d791223ff8e62456b8bdb8535fc8756f92389e39087f6d58cc42af67cc9facf3c6fad3de3
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 349 BLAKE2B 0f62438da7f64ce6d8b6d7bdcaf97ad3065d2c7203f9e486e0862002a36c02f7cb07560848d20d6a7e349ff74ace198679affae82b4510dd464ed7027d23cbfb SHA512 f36c8c310d053c5246f313e89378ed38082683152cc56874fbf8863521de6f7eb4e3fdd0683c6d96cba726cc2789b5d69ad8712ec058dd10982e37e6f540f566
diff --git a/x11-drivers/xf86-video-vesa/metadata.xml b/x11-drivers/xf86-video-vesa/metadata.xml
index e17a5bccb78b..020b692776e9 100644
--- a/x11-drivers/xf86-video-vesa/metadata.xml
+++ b/x11-drivers/xf86-video-vesa/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/driver/xf86-video-vesa</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-vmware/Manifest b/x11-drivers/xf86-video-vmware/Manifest
index 91062a8242c5..8cfe6e0e8da2 100644
--- a/x11-drivers/xf86-video-vmware/Manifest
+++ b/x11-drivers/xf86-video-vmware/Manifest
@@ -1,4 +1,4 @@
 AUX xf86-video-vmware-13.3.0-fix-include-order-bool.patch 1420 BLAKE2B cd031748a1f87897e91925c7466925bf63f1255182d26b65745e0e210c6340a6e2cb7b15c7403ff46c816aea1a3f63f71d68f6ffe6482b9caabd5adebaa56970 SHA512 fd9719b5468bf38343a2c4010b559d30bba7e41c54315e9ebc50d36918216176566659f95636d54b63c3b4ca3e1e39aabe7c4afccdd558e502f5e5413f0795c7
 DIST xf86-video-vmware-13.3.0.tar.bz2 473527 BLAKE2B 8916c5d95d4347ff3e874d4131a32660777c0e3ab6808b537cbe668c30cf775ebfd2fb7900aa43f6a34d0578ceac4545614024498f6f0143e9b07035f6e99c3c SHA512 c318de893cae7b2b11e11c1b389ee47478b7c8d1f52c27099dbe453efec28f3e9da449217307a8c2251999eada66312f766996be1a6ead413b8b6dedc42c68ca
 EBUILD xf86-video-vmware-13.3.0-r1.ebuild 380 BLAKE2B f0f25c56efc842d3f2a05b903a509b1630247bb7e787fb2ac6ac4dbcabdc4065a5e461e7d929a31b69489e41d951e76887bf4e8e143c6976568b08cf5f9dad4a SHA512 2b079254fc3dcffb8ff63ec870286c2911ab6b32b97526e34507d31c6bd9cef9845f5e54457f35259517ccef9a354ba1891c34e8a8f543e61608f498e3e42e33
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 351 BLAKE2B cb92a40858fe3738597c7d60c3f9a1f1f6598d95886d15f731cf801f682555519b57b60b2b96b41627ae0942e5787c45aa45d7c3b846234cb4700afdf7f4febc SHA512 775eef1e84c0f07edaf87902e283a1f9fe526e2f21ddcefdd54960019422ac76c34e503d14e8a6ad3dd0f90cdf1a8de215016355e0dacbd8ab03f5a1cc60297f
diff --git a/x11-drivers/xf86-video-vmware/metadata.xml b/x11-drivers/xf86-video-vmware/metadata.xml
index e17a5bccb78b..7dc75f03e8b5 100644
--- a/x11-drivers/xf86-video-vmware/metadata.xml
+++ b/x11-drivers/xf86-video-vmware/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/driver/xf86-video-vmware</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index de02c2d1868f..23c186a2040c 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 29af98520022..f099e1a7d9bf 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -10,4 +10,4 @@ DIST cairo-1.17.6.tar.bz2 43700076 BLAKE2B 05ac766d33e9bdfc5df0347e9a80611554d64
 EBUILD cairo-1.16.0-r6.ebuild 3919 BLAKE2B 4d35c54d4e93fa37dbf726f524b01bc44a0eee6179b1772823f6a08bc75085688bf3d1dff318f71599e8ccc8a46e5fa51c48f13ec0dd7553ad205bed5fbcde4e SHA512 65a715633863be2a29f97786b7db63e2b160f0fe342438d4df6c4eb9ca83ace1cbc6315da229258286f7547490414339b270ad2aa047955c9be5658a694be4c3
 EBUILD cairo-1.17.6.ebuild 2843 BLAKE2B a123d14d1e6cfbe5828662026ce2da1fd2a63a9e545f6abb05038d4b078e934706cb645851595fdd793542615155f74190d32864b0acbd498e86e3023eb04ceb SHA512 455855ba076c41cc60b819c76e77faea4a35b00a91f36ce2b8531f0acdc821f0d0def76fd79edfe6b9ade345744c9786786081295be2fd1d307bd07376f693c7
 EBUILD cairo-9999.ebuild 2843 BLAKE2B a123d14d1e6cfbe5828662026ce2da1fd2a63a9e545f6abb05038d4b078e934706cb645851595fdd793542615155f74190d32864b0acbd498e86e3023eb04ceb SHA512 455855ba076c41cc60b819c76e77faea4a35b00a91f36ce2b8531f0acdc821f0d0def76fd79edfe6b9ade345744c9786786081295be2fd1d307bd07376f693c7
-MISC metadata.xml 843 BLAKE2B 699529d72773e1de0e83551581919bb7a54b7783b2103abc3f900a75f4b96fd899d55b4a996b73e9d091dc4303c2c67b76a258667d81d3cd0032b1ca2c133f69 SHA512 bc3b9ad654865cdb5907860247ccb826f4f665690ff9ef472e6c250ed1e17eb3746923cc78dcd3c594048b690859e0355aa177c60969c73e0f06456df59d57b1
+MISC metadata.xml 935 BLAKE2B d435dd01dd10a8b95567ef6c5ebbe41a48affea6c583895e2be8d1767658ff91b4c4cad409dbcf5391585f03ef283364abab450a183076fdfbfc926608fb58d8 SHA512 70e88efc9758f49ea62c79cba5c010c3acbfbd319eb6e760912036a345606dc574284943b19b4683444ceea65209727b1c21747567df4cfe00dcec6d770dc2da
diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml
index d4c30a5b0bff..605713de435c 100644
--- a/x11-libs/cairo/metadata.xml
+++ b/x11-libs/cairo/metadata.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-	<use>
-		<flag name="opengl" restrict="&gt;=x11-libs/cairo-1.10.0">Build the OpenGL backend</flag>
-		<flag name="gles2-only">Build the OpenGL ES 2 backend</flag>
-		<flag name="gles3" restrict=">=x11-libs/cairo-1.17">Use OpenGL ES 3.0 features (instead of ES 2.0; requires USE=gles2-only)</flag>
-		<flag name="glib">Compile with GLib Object System support</flag>
-		<flag name="utils">Build support for Cairo script and trace utilities</flag>
-		<flag name="valgrind">Built-in support to mark memory regions</flag>
-	</use>
-	<upstream>
-		<remote-id type="cpe">cpe:/a:cairographics:cairo</remote-id>
-	</upstream>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <use>
+    <flag name="opengl" restrict="&gt;=x11-libs/cairo-1.10.0">Build the OpenGL backend</flag>
+    <flag name="gles2-only">Build the OpenGL ES 2 backend</flag>
+    <flag name="gles3" restrict="&gt;=x11-libs/cairo-1.17">Use OpenGL ES 3.0 features (instead of ES 2.0; requires USE=gles2-only)</flag>
+    <flag name="glib">Compile with GLib Object System support</flag>
+    <flag name="utils">Build support for Cairo script and trace utilities</flag>
+    <flag name="valgrind">Built-in support to mark memory regions</flag>
+  </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:cairographics:cairo</remote-id>
+    <remote-id type="freedesktop-gitlab">cairo/cairo</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libFS/Manifest b/x11-libs/libFS/Manifest
index b40f4b62295d..22a4705f028e 100644
--- a/x11-libs/libFS/Manifest
+++ b/x11-libs/libFS/Manifest
@@ -2,4 +2,4 @@ DIST libFS-1.0.8.tar.bz2 347880 BLAKE2B 74f9079f4ac98ad8cc83e73a162f4e308c49b643
 DIST libFS-1.0.9.tar.xz 287416 BLAKE2B b4425ab4ce1c9e4e0c283419231e2966f462a6c9225ff8bd056b5ec41c7a6a96e35bd2edd47ce6bfad87040c6042f19619f32f8f045262da5609af5c55b03fe4 SHA512 7d012e62736c6d567931bad982eec221199d296f0fe41e1e7fde5575b8b928e9a8c644aa8746242bdfe72393635320b58774d9a519285765bd26d633588092b8
 EBUILD libFS-1.0.8.ebuild 393 BLAKE2B c626c506df5346d77d67f4f86644e9b3e98cfac0bae7721e1156f38ce9e84fca65a707760ef6f69d2c8192baa9bb5acd70119879f139acf26b15d40fa2d73018 SHA512 809f22b13acc18d2a296b2462b9530e64979dcb19639740df7343abf5963b472a344927b860a2ccdcd74d86c259b388737ca25f20ec882e9d21b60c02d0dcb08
 EBUILD libFS-1.0.9.ebuild 407 BLAKE2B a2c7b7443ef656e8bad301326f94155b4b49132042b6426d4ac7050d88845a0329da5386325360bb63c8127f5ec842bf8de23923d78a2da28240a9e2e48665fa SHA512 61ff34501bfa7c15f311dda2d819a9aa346527f41b5d23054c28bdd610cc37518453e3be4dc56ac8408804b914d5cc91476c488171b670a82cca8a63c46db29e
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 336 BLAKE2B 63758b2250f1678012f938bfb7826c03e447991e3aba5c233e16df68dbaae033b1f14d77833c85238efe0eedd90314f5e8b2e1cfcac824bd5a034e7e575f244f SHA512 f2b85263c274822c779720160b79a4c243896f7169c9aa88181ed805c3f5808cd48aec07eeb0e2faedfb1b3ef467846243e2cfec925e8eeafb58f6d228a3aac1
diff --git a/x11-libs/libFS/metadata.xml b/x11-libs/libFS/metadata.xml
index e17a5bccb78b..e43902c7757b 100644
--- a/x11-libs/libFS/metadata.xml
+++ b/x11-libs/libFS/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libFS</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libGLw/Manifest b/x11-libs/libGLw/Manifest
index 87afce79a923..710bd0242fa3 100644
--- a/x11-libs/libGLw/Manifest
+++ b/x11-libs/libGLw/Manifest
@@ -1,4 +1,4 @@
 AUX libGLw-8.0.0-gcc10-fno-common.patch 558 BLAKE2B 901d7fc3b61eb6b50f09c2318d0dcefb3a3551d85f2c0d239f3d69c8e15a7360a4e1628370d13c0810ce380c1f8da9d5887917a131d0055956b0286018488e35 SHA512 d44de8dd3ed9648122fc5661137d6990772595213cdf5fccba6c191eeca20234fb05b97b86c8249208f3c5a978ab677c18d01b4d39da94333d8cd36ef21340da
 DIST glw-8.0.0.tar.bz2 221136 BLAKE2B fcbd1fa99da4fa5d45b0ec14af1a9798c53ad13adfa6e2fb46b45a214397b7a7d11186f2efa2f64cddd589fba9c24280825bca11163eba8fd4149fbfefd822e9 SHA512 09e1352edb16a9a34b9031996c2a1545d69dc690d7eda10a1aad6a7ad9ef0576d0af8a1b7740dba47f9647b7c957c1d7a078b38747d2d2c28ea39314a0e53587
 EBUILD libGLw-8.0.0-r1.ebuild 729 BLAKE2B a5fd5b4b47816d1b51de4c4ad390d47fd142c8ccdb0760946ac863c3134322421fdc3ac19516b3fbca3236cc5c8dd79ad39fadacaab9e9aaaa60ed2fdd0d49c1 SHA512 018636a3b405792ea4e3c8a19d2e860a44f40c7e1ee4fd1d4d4907cc7ce6714e96530c26c99a89b37656ab9bb08dfe7b6ad8a973e6d79e8a4dde2d2c1f3b6e87
-MISC metadata.xml 311 BLAKE2B 83a967254ff568930e0e80664138cf0741311021c41e609a81def7a751af0d824cd034902bff550c9ec3805a66f62a636b437182a7bd8d05cc9ad152d96bf6bf SHA512 883850643e126ad7c9ff8875d8cb0d9cbb9a46026ecd9c49b22266d3d0ae9cb2d421f3b615849ff6e1dbfe92dfc04a4c841c344f0d9261487bb6338dcca7b261
+MISC metadata.xml 330 BLAKE2B aba92ba86091cb29d46eb6d85b8ac79d13725102fdc9e5ebf0941e8a62003e21240e7f61fcf0b28505d3f056349ad7f3bc50c251f077266f3e9fa3137d862962 SHA512 1f0f0b29bc05717243bf956617549cb5f73458d6b52c5c729f1a4e23af9d8ed603d6d2ad06cbdeb9593c33e10c3287e241ef2a6d24915c5d17fa05a5aa8e4688
diff --git a/x11-libs/libGLw/metadata.xml b/x11-libs/libGLw/metadata.xml
index 0ca5c0a34ca4..229348827fdc 100644
--- a/x11-libs/libGLw/metadata.xml
+++ b/x11-libs/libGLw/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">mesa3d</remote-id>
-	</upstream>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">mesa/glw</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest
index d490645c77df..e86faa936ea1 100644
--- a/x11-libs/libICE/Manifest
+++ b/x11-libs/libICE/Manifest
@@ -1,3 +1,3 @@
 DIST libICE-1.0.10.tar.bz2 393116 BLAKE2B 2089cbddab679f8565f0b7bf0313616b71f33cd403aea2cb84032a247c1e1d01de343058c31be73214bd6dea7fc167fa6a0f81704c960bc279d904bdf4bf804f SHA512 2f1ef2c32c833c71894a08fa7e7ed53f301f6c7bd22485d71c12884d8e8b36b99f362ec886349dcc84d08edc81c8b2cea035320831d64974edeba021b433c468
 EBUILD libICE-1.0.10-r1.ebuild 705 BLAKE2B ec84151d3792e185d97aee46735e9702f5396623b1ecb184b6efd125f534e2420686570e7e7153f1f52cebd90f45ee7551b749107ca5f9980995d6f9fe3d5d37 SHA512 5400d1d21ac457b08b33c0b78104fe2e1d4563465803853c119b412c33b7dabd8010f68a2f30ea2e0b532e8a82f8472bbad9cd7d0164d9e89fe37b5c44da11d0
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 337 BLAKE2B c895594110c07848bd58cf4a28df82dbdc5f26671689386a667afd32f3925d4b401887d992282416213be51536ee4d24fd00c0f85d52c98eb71d66854209055b SHA512 2718c47a51ba70e9622bd3bf5e6d987fa2f57d122e25aa972f71585ddf3dbdb8bf34eaa0492846e6230d951f8d557948e1d7e3f54ee27765b63e8f9f2e6fe604
diff --git a/x11-libs/libICE/metadata.xml b/x11-libs/libICE/metadata.xml
index e17a5bccb78b..7e59014eba4f 100644
--- a/x11-libs/libICE/metadata.xml
+++ b/x11-libs/libICE/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libICE</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libSM/Manifest b/x11-libs/libSM/Manifest
index a37fa9879054..07c3a7990a20 100644
--- a/x11-libs/libSM/Manifest
+++ b/x11-libs/libSM/Manifest
@@ -1,3 +1,3 @@
 DIST libSM-1.2.3.tar.bz2 362595 BLAKE2B 20b7327cd16e066bd2a81eae60f52cab7499dd92d65786d0e5726faa64c2055376749562ff2158777f83711e1517b90b2dc94670892b787889b3950c0a975b68 SHA512 74c42e27029db78475e62025b4711dbac5e22d2f8e8a24be98a1c31b03c0fc4afe859928f851800ea0b76854f12147900dc4f27bbfd3d8ea45daaaf24b70a903
 EBUILD libSM-1.2.3-r1.ebuild 1734 BLAKE2B dda743ea00a43c47cc31f5ab8906f61c55253a7d80ce8063e62151e29994ca7fafeb8fc9d45ca2bed10def369422498e4a3a70f0d3d334fcf03a63b37d104e64 SHA512 fa213a1b1d6ca0e18c6396348c4828d877f5c821fa090025c7bd0fbde28d80b7d1cb0d7fd6b391afd230914021968ac74a303200d9a574a753dd204cbf71962b
-MISC metadata.xml 349 BLAKE2B 3155baed4056db371fb64fec4eaa13ead1455914541b5cfef35d7cd5e6faa478667a188e12528ecdea8d7e05970e357da79510bfc9b4ebd5252e958485d7ba0e SHA512 d827c454124f3bda52f37bbf507dd51a9430dff3d41f5c4cedfd4bade125e666678b0af0b52a3830792fbc142096aac7501d88de7750983d1421297f5bb50104
+MISC metadata.xml 457 BLAKE2B 895411214399309db731cd3f1c5c49ec5a505aa4a7a03e9fc39e7027b1956aeae7b0ffebe1d6f4500eaba907c0aa2ce7332f56de0b53ebc26dd000835a29c9ce SHA512 9e810808a715e91e939d710c5633675d4a7d74b2a18d8054d1932f6022bf186ae981b1ffffd81893bb1959923ddf541908a24656e7c308589994178dbab9ff60
diff --git a/x11-libs/libSM/metadata.xml b/x11-libs/libSM/metadata.xml
index eda7589872ef..6de6174551fa 100644
--- a/x11-libs/libSM/metadata.xml
+++ b/x11-libs/libSM/metadata.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-<use>
-	<flag name="uuid">Use UUID for session identification instead of IP address
-		and system time.
-	</flag>
-</use>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <use>
+    <flag name="uuid">Use UUID for session identification instead of IP address and system time.</flag>
+  </use>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libSM</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 57282dc6262f..95f879ddd7d6 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -2,4 +2,4 @@ DIST libX11-1.7.5.tar.xz 1853152 BLAKE2B 95ceccbfd37d8a749a533bdc03feba94236a471
 DIST libX11-1.8.1.tar.xz 1818460 BLAKE2B 7602b4d8c65ea3160f81096b4e022b5462e49d96b36dee70fe06e972329dc9d70bbd462e2079da03ba5647d7a72bf03e29aab23c60bcc206c95d770655622226 SHA512 2e36d2c47519e0cb2697f588c0ccdf73fbe75c2163f0855c78f7052dc9e920bca081f9d5e39c707a14067f101faef74fc758c8862eeba675b1535b43119d533a
 EBUILD libX11-1.7.5.ebuild 938 BLAKE2B 6559a7c7633d55efa6774d3b0d100a289e060a32c53cff2fb1c7dcaeffa2119058eeb8aeb1b0ff1d13dfca02fe07086c9d42071233388ede0a5b5f9a74b5bff9 SHA512 340786682d8218feb524815a1813af189f21d5a4b100e3fb61c399afff7897298a34aff2bbe8f6efe96ca9899b89f1e5acc2515f21e9277aad7c423b319f2d32
 EBUILD libX11-1.8.1.ebuild 966 BLAKE2B 4ad188c9d7030b656da151da82ecb7cd776deae774c5809e79a7a3f3fbd34ef0d7b54c822b4f7d748fc881293366b1c5e89817ce19e00c701e1d8186c9d40982 SHA512 5f361d9291ad4c0f04d6449efe244196c612bfbb3ba6342ca2da45dab3c169e306302e0e200ecd60d9a1bcc0e94cf9781807d9bf60f6573012b444d0d258800b
-MISC metadata.xml 312 BLAKE2B 297d68d5585ee7fe053a0b9d1e4758d1c8538fbfa6037cddfefa84f5b757c1c768d4ab072f6198e19c1b9bf4d21120440db61e5a9690cc6cfd387ee9d2add736 SHA512 4b5fc7ba8a7c24241e7ab5dd68677ccba15f5e89a76482679f18139faea4ff1555759066041afbf51c65d1870ec0d999a772c340f1e934a6aba0135b8da28d18
+MISC metadata.xml 395 BLAKE2B 7912fcccfd8d8a4c9c1e5601783a0668679506638511ee719bf7bb95f99415fe95a417343060cf5ca3fe918ab1f9847f74861af36d3c712afa321272cd13cf66 SHA512 c2956ef519fe59d0f713732059224568b9d7c34579654b71993b02227a512c1ac3057dc7f81c6bc93834fd4fee212f1ae26f4055ea92f3eb7524da7d9e690f8f
diff --git a/x11-libs/libX11/metadata.xml b/x11-libs/libX11/metadata.xml
index 63a0c8ad1f14..2e0798c98274 100644
--- a/x11-libs/libX11/metadata.xml
+++ b/x11-libs/libX11/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>x11@gentoo.org</email>
-  <name>X11</name>
-</maintainer>
-<upstream>
-  <remote-id type="cpe">cpe:/a:x.org:libx11</remote-id>
-</upstream>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:x.org:libx11</remote-id>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libX11</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest
index aaa9fbf87433..c241f0fa2087 100644
--- a/x11-libs/libXScrnSaver/Manifest
+++ b/x11-libs/libXScrnSaver/Manifest
@@ -1,3 +1,3 @@
 DIST libXScrnSaver-1.2.3.tar.bz2 291465 BLAKE2B 03864811a3bb34521d9e27ec2ce363cb015ee3484a27cce6fed4e6b16499b441dc7336229cc926da7bbbb8366e03780f9f4eba0e725083b8f362ef45c43e8633 SHA512 7ea628324a11b25ee82c7b11c6bf98f37de219354de51c1e29467b5de422669ba1ab121f3b9dc674093c8f3960e93c5d5428122f5539092f79bc8451c768354a
 EBUILD libXScrnSaver-1.2.3.ebuild 505 BLAKE2B 1cf5c8e85118fff5b523b2ededaf33c90b54d2570bf47734d7b65cb8eae0b23570714f6d731cd997cbfde6850fb984db536abeee9daf4da11440756a3cb52d8c SHA512 2f72ec0d033e2ac812fada24512eea8aa40646a22d03438684666545b8d0d607359c7d899da87497f151fbd24dd8209ac4c279bfe7a8e367c2f17dd3b3eb7617
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 344 BLAKE2B 38592243cc511ed03e89684471df8496b65fd4e0c1dfee85cfff8eed5254cc1cd0eeab3da541ee094064dafcf1c69f2d05c4cc458f27e84e77871eca47bce075 SHA512 8fe30e64a2916afb8fc6b37454d5bcd10aa515d80f8af32b2a92faba055650d96e7385b48d503259cea360a503a240bc1eda2694d4e3020e7c4e5f36ac0d4e74
diff --git a/x11-libs/libXScrnSaver/metadata.xml b/x11-libs/libXScrnSaver/metadata.xml
index e17a5bccb78b..e10fbd95bbef 100644
--- a/x11-libs/libXScrnSaver/metadata.xml
+++ b/x11-libs/libXScrnSaver/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libXScrnSaver</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libXau/Manifest b/x11-libs/libXau/Manifest
index e366a690b418..dfc85a1a4511 100644
--- a/x11-libs/libXau/Manifest
+++ b/x11-libs/libXau/Manifest
@@ -2,4 +2,4 @@ DIST libXau-1.0.10.tar.xz 271724 BLAKE2B 391296f1a59ab6cf93323bbd6e297c88ace6bc7
 DIST libXau-1.0.9.tar.bz2 322650 BLAKE2B 0bc9eb01b99f13a8f978edd7ff63d76f89071ac27f1cd946f9ebc96165a892e7ba7cdcdc52f73e8ed6d5b3d672f8a29a24582195fe14d1d24730a797a592cdd3 SHA512 3ca454ba466a807ea28b0f715066d73dc76ad312697b121d43e4d5766215052e9b7ffb8fe3ed3e496fa3f2a13f164ac692ff85cc428e26731b679f0f06a1d562
 EBUILD libXau-1.0.10.ebuild 492 BLAKE2B f8ab9bb344705d9ed10a28d53497c4832dac6972ea7fc48dcf69dafc31b7083d08470059fd14d2a6a67d80e3dd34d6f11e8652250363f59727ed884cc3cfcf9e SHA512 dab53e3922722dbfbd422256711ac0b74670df93b63453692deabe6fd33e90f963f7a541adb10b5d5e49bf1d549c06f616b0e9f1b94de0bb1ef4fe16bb149789
 EBUILD libXau-1.0.9-r1.ebuild 459 BLAKE2B 93aee0f1328b9bf949277e691222d056b04de66629524356f708b7fbaf1de0ab4e43b0cce11598a9eae63bb38292c192c1b6c32360ffb0299ad35cebf4bc7f5b SHA512 0a517b4aaeb3336b921efcb2e87d0d25384e2f81cd38e84b6a03833aff32cbb4786593a016aebed6987a86fbdd4beb79c2a23d98b12c1805018fe3e133221330
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 337 BLAKE2B bccad5dd3ea84c6ca278438b94fbfc3e94b65b1808a5004c71c10023c774528084e5afd9e17bc852d2e0b8cc966539d02985ba4485e05e92c7b404277250e50c SHA512 8c81a02a3f99267055e0d044a99b3add40e6737236718e1d5cca35b21b417295a4eae9405c6becd7b42792bb1e387c44bf9c3c31f163f8414da265ff21f41904
diff --git a/x11-libs/libXau/metadata.xml b/x11-libs/libXau/metadata.xml
index e17a5bccb78b..560505c18fb1 100644
--- a/x11-libs/libXau/metadata.xml
+++ b/x11-libs/libXau/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libXau</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libXaw/Manifest b/x11-libs/libXaw/Manifest
index adca8a1e463b..386be641410e 100644
--- a/x11-libs/libXaw/Manifest
+++ b/x11-libs/libXaw/Manifest
@@ -1,3 +1,3 @@
 DIST libXaw-1.0.14.tar.bz2 690994 BLAKE2B 9beaf5ad47b300b3bd57c85ce4c54996db824cb10377472bab8b4ec446458ce162b21e19c4e3ed8d48f10d0bddb695509e73d3274326bdd59916dfbb3c63120e SHA512 29d1c151369523ae6cb418e636b0b7b39ccccc35462a0b394dbeb46d5b6d780badd2eb872a55d9fbba1ee1af034e76c0463f40f8d8a7be2c336d08b3b1bf81d4
 EBUILD libXaw-1.0.14.ebuild 884 BLAKE2B 376a003a6262cb0d01b0d0640c398f57198166f96e85edebd16636c2527bb66d26f65a5a884884c06ce48f7b65ab14f546a808bf7cf45d5c47b66155ddbe6e66 SHA512 f5c48e4791a5d413691f377cb15d5d6a52cb1c39e8580ce0ce9cda12967b943cb6ebfbe4d35fb1964c497dbfaa54f18aa752d27ff55c2cb77503bbc58344dde4
-MISC metadata.xml 309 BLAKE2B ba69d8d8545fa5fa3816eb6696801f0f18fc9f4cc8c3822ee3a4394ad4f14b625ba1dd36ae1cad6b93df5da7d42d08497c199c8f4873524be79cb92da1232b2a SHA512 0833d0c3d4e0e30041c3265a9df0b90a33829ce1c179a60f54db38a3ab32231d82f0f16bf0d1b0496876493feece3f981c602445f3497f1595d6afe64eb14eca
+MISC metadata.xml 422 BLAKE2B b5d0b66e0f4638f8e8969f8fe1c02f4d83195f11529b266e2f79f18b71f2407102545a4e55b318c4a0957cbf00570586626a9a8ce3cda99bc463c0246ed7bcce SHA512 56d9ac54daf5febd8fc3df76ce86974b6ab37130bdb80d84ad07b59d985d6d1337afff0b36bafadad9ba464e7cbd45a7d6f71f697be3b66f9db907b317d9c2a8
diff --git a/x11-libs/libXaw/metadata.xml b/x11-libs/libXaw/metadata.xml
index 2aba58ad3ed7..a13415bbc470 100644
--- a/x11-libs/libXaw/metadata.xml
+++ b/x11-libs/libXaw/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-<use>
-	<flag name="deprecated">Install deprecated Xaw6 library.</flag>
-</use>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <use>
+    <flag name="deprecated">Install deprecated Xaw6 library.</flag>
+  </use>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libXaw</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libXaw3d/Manifest b/x11-libs/libXaw3d/Manifest
index 19399fc148c1..581689ef1d8a 100644
--- a/x11-libs/libXaw3d/Manifest
+++ b/x11-libs/libXaw3d/Manifest
@@ -2,4 +2,4 @@ DIST libXaw3d-1.6.3.tar.bz2 561594 BLAKE2B 85f3fb6d39a9a0ccb7d2c529eff84a4a9e85b
 DIST libXaw3d-1.6.4.tar.xz 482168 BLAKE2B a1e2e66ef4c5d102523080beae903b21b9b6bd0a5e4bd1e685bbfc4e1eaa3dc594f65f357d027f93808fd34d7e05ed8631fe33b6849760fc1fcc919c8b85d526 SHA512 388e905871a823d0f87fbc29e9ea2de95ac13ccaf50e031a01602d8d388d61bcf1823b4ded8c1a06bdce382e8ddcbc1b0182ccef00cde8064b09176163283dba
 EBUILD libXaw3d-1.6.3.ebuild 750 BLAKE2B 7a8d9a02b2c52b10569a52feba27dfe5588e926909ba33eef4731c42ff56022a21c032eba453206265e1c775657e16b37806b1d577d37289a9c709a73a44ed6f SHA512 521184b4bd534dafd548ca5685a3db71b582d7b0f02c9598dd037d1c9350f8c66bf876f30b8566184d5e9235816d2e6dcb79b1a00caea51717cbe80b5024aeeb
 EBUILD libXaw3d-1.6.4.ebuild 761 BLAKE2B 9559cf39b715ed7d6385f88c915e7a6764c815da5fdac0d867094b47ab4657fbc877fd025ac60d77900dc4137805cd66fc6adaa3fc239bff99cf0a6317204f4f SHA512 2b0ea3e0b7886f752f16be142a58987fc0fa34f1777acf96fc5b3cd5fa982b80a7d460706f2356fd4acebe9b317b7b9bc9ed5b3a652432bb87c310712457cefe
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 339 BLAKE2B 60635a05848869d4aba7783f45cb02a672045a8a9b1bed933f1587ecd0ab81aa32ecc63e8a6742b4eee50a14c3e32b17b6bf14b3797e5f11e0dd74a8b582b4bf SHA512 1ed17cca85445b70786acfd900c7a75eb765001e7218e576356ef76d3e9e6399df3a45413f4650e555d2404d0c9e5f0f20f814c1bc1d08e1e8138aedbacfe50d
diff --git a/x11-libs/libXaw3d/metadata.xml b/x11-libs/libXaw3d/metadata.xml
index e17a5bccb78b..2d02310791b8 100644
--- a/x11-libs/libXaw3d/metadata.xml
+++ b/x11-libs/libXaw3d/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libXaw3d</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libXcomposite/Manifest b/x11-libs/libXcomposite/Manifest
index 66db1f6134df..edcf101c3081 100644
--- a/x11-libs/libXcomposite/Manifest
+++ b/x11-libs/libXcomposite/Manifest
@@ -1,3 +1,3 @@
 DIST libXcomposite-0.4.5.tar.bz2 316993 BLAKE2B 4dc01b4c3fd85bdaad1ab9d9da0668caa162957056284fe864dacfcad302ddacf32a3ca233efe191592121a42783e04d5844277ef8ede21951e890114120ba22 SHA512 502fd51fd9097bb3ca72174ac5b25b9d3b1ff240d32c4765199df03d89337d94b4ddea49e90b177b370862430089d966ce9c38988337156352cfeae911c2d3d5
 EBUILD libXcomposite-0.4.5.ebuild 632 BLAKE2B 314d563f9a89d1a14f527be94ad863ea5f5210ace187239fcf6a002ac7633cdc295259df95effe240ca34a20dc52a8b4160c808b1b430d0e81bc4e8d1900d56b SHA512 85d469c84a100b901f372df3e7cc442a238afb0917814189cd6c6f762d8963dbc642c1513d35736c45b6ad133e12ef2e4d482367d38263d2b16df6343ada1f20
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 344 BLAKE2B 4e9d885da27e4236caf1cc43695d87d4fb87181c60b1f4ee8d732f8d0cc090d9350ae9f48f0e9bca95fc64232327729c845bebbca0e2f54d31f78a1c075b1ae6 SHA512 8bb10302971adf52c2e2cb3cff8266e533b0913527f551dc1d73595d72a3e214a22eaa41ea85f35345b3e0a0020f3b0ff0eee6bf68542c275a39e48e6b706ff0
diff --git a/x11-libs/libXcomposite/metadata.xml b/x11-libs/libXcomposite/metadata.xml
index e17a5bccb78b..cf1b7e277bb4 100644
--- a/x11-libs/libXcomposite/metadata.xml
+++ b/x11-libs/libXcomposite/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libXcomposite</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest
index 699f40797fa0..b611c6adafdc 100644
--- a/x11-libs/libXcursor/Manifest
+++ b/x11-libs/libXcursor/Manifest
@@ -1,3 +1,3 @@
 DIST libXcursor-1.2.1.tar.xz 280352 BLAKE2B 5c59a43d9cdaaab887ef7ffbe836534508e3542959dd5011c08e46db1d5e4de6e7ee47b1574eb1bd2aebc8baa8fe401e5195fa73bb2ab47b779dbd03af4bbf4a SHA512 ebb42a39855aab86d0c11fe6ad33d011cf56a6dc5c309bef643460319c03df239b7e09fe88777bb25c0e9ff8aceac6bf66e51cc04a2d5ee463b3bc3bbf1674e3
 EBUILD libXcursor-1.2.1.ebuild 938 BLAKE2B f1c19a8c8b0dbf8e9e84e0c81a8494398cfaa3877eb81cad39c5b63dd0f00765ebe720f67b80c1f83cb79aff318c9f60956e56cfb330ba2ad5e5dc79b4370a9b SHA512 a6eca0db489a7913b7380d5b902c09d7c299fca00084bd2af504db5c1b0e9319083956f2d2e57569bacafc2ed01c7a2b6bc8bbd12757b8d117b879082b9130e2
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 341 BLAKE2B c8efd915b38a2d39c542bcbab6fc55b5d6e9859e3c81064f666bacc342f3eee63c2cc1e4f9e6ce095d28242c2e7d04021eb0c34b3088da601fa9c8c78ad28bff SHA512 e11bbb32b278b773e6a393a574c80ab35b84e8eddb542a85df8c288005476de58c326605de76ba7a37504100a20a71ef1bbd61f3402af3f79a81a28d60ac4d90
diff --git a/x11-libs/libXcursor/metadata.xml b/x11-libs/libXcursor/metadata.xml
index e17a5bccb78b..62a3ce952cd3 100644
--- a/x11-libs/libXcursor/metadata.xml
+++ b/x11-libs/libXcursor/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libXcursor</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libXdamage/Manifest b/x11-libs/libXdamage/Manifest
index 816eb0a5b1b0..19f405b351eb 100644
--- a/x11-libs/libXdamage/Manifest
+++ b/x11-libs/libXdamage/Manifest
@@ -1,3 +1,3 @@
 DIST libXdamage-1.1.5.tar.bz2 303750 BLAKE2B 78cb593365cc842cbc6fcb4dec94aa28293c385ad7ecfef032117d19e98c7b3f252c53b79559096b1c0b259d24a59220e9af7fb60d55c55f4474a33d117958de SHA512 a3ca6cc33b1727f717a3e2aa5593f660508a81a47918a0aa949e9e8fba105e303fe5071983b48caac92feea0fe6e8e01620805e4d19b41f21f20d837b191c124
 EBUILD libXdamage-1.1.5.ebuild 516 BLAKE2B 52bd82b984cb5786c2632e8331d597a98e9b7195d2a2090775af7ca2a8ebaf01ab7bb378fb26aaa9f6b6862eed48fad700d4e08a8bf5fa8da1d9cc550d2a2245 SHA512 3163f4ddf0a08a53fd8a8d7fbe959c109f5f465ae5e1c319f44287737a082f6837be78e864cad43d25c4b223b5c4fa99c689cba46fcb65a4318f73e8a414d073
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 341 BLAKE2B b0dba30641b99c64904acd6ce23f90ac0618c3274fef812ac975f25a441ccbe75621f4f586666d6ed51a939f61165dd36381dc650b4ae39b7cc32c35940b20d8 SHA512 63d404d9b62a3b5f82511a4f472059e890f55a006b29a6f5de2b63d57e34c9619d31af94842f81effd35a664bbca4508e28d3db57dd05518a0e9db89511b2313
diff --git a/x11-libs/libXdamage/metadata.xml b/x11-libs/libXdamage/metadata.xml
index e17a5bccb78b..ecad519bc329 100644
--- a/x11-libs/libXdamage/metadata.xml
+++ b/x11-libs/libXdamage/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libXdamage</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libXdmcp/Manifest b/x11-libs/libXdmcp/Manifest
index 3de36c4c6f0f..86a8f128212b 100644
--- a/x11-libs/libXdmcp/Manifest
+++ b/x11-libs/libXdmcp/Manifest
@@ -1,3 +1,3 @@
 DIST libXdmcp-1.1.3.tar.bz2 332795 BLAKE2B 0c9df30450857dd2703c4bf54972d5a26c1b6f8e216b4f3173491def650cc32742554eee04c883670e783eb5f476df94ed2c0c52274a51e2bc54d45e5dcb8c77 SHA512 cb1d4650f97d66e73acd2465ec7d757b9b797cce2f85e301860a44997a461837eea845ec9bd5b639ec5ca34c804f8bdd870697a5ce3f4e270b687c9ef74f25ec
 EBUILD libXdmcp-1.1.3-r1.ebuild 696 BLAKE2B 6943d863478b2d1e4cfba163e8973fc4796e64408c2dab29f41529482f94de12fbf62743caaed4e2e6ebe69f087aab91d3ddd1239a23ac7e52c83b935e2de2a8 SHA512 a5dae45dc67bd0aef5ae538862732226a47e9a03b72c660347fe2cf0662eaeb8e1ff0c0041ac53bd2fa3147501c977f5f44728193a948920f238f59e5d567221
-MISC metadata.xml 311 BLAKE2B 21ffdd3bae13784b216398e0dafd6d9dab3b46647ff72d248d559dbd768c7b640a368f49af1d84148321172815bfb961660192f5ae2adf87f2d801afd3d830f0 SHA512 b3961e5c23283feb98fccc70e0a69ca8c4813a76ee029633731a6a651266673378c5e1fc95c1a079c9983da98dc41f574b41c808b52a63db325b00b5171f21cf
+MISC metadata.xml 399 BLAKE2B cc623f4c1293d011af9a0afaac1d5cdd0635f4db48b55c3f59070ee8ab14e96967afa925160680e8253b36654ff04d171db430ad90e5f13c72497d83fcd9408e SHA512 c5b696febaefea9d236c5f0a13502547350c87a410e57474574d3d2e463c9f07bbdad9a9c0994801dc96f25d2711702a8710f3112e96eb302ac46bc2602f7e96
diff --git a/x11-libs/libXdmcp/metadata.xml b/x11-libs/libXdmcp/metadata.xml
index 16fbeb63887c..b0ec49a2dafd 100644
--- a/x11-libs/libXdmcp/metadata.xml
+++ b/x11-libs/libXdmcp/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-<upstream>
-	<remote-id type="cpe">cpe:/a:x.org:libxdmcp</remote-id>
-</upstream>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:x.org:libxdmcp</remote-id>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libXdmcp</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest
index 2302cc202678..12e6da49a5ec 100644
--- a/x11-libs/libXext/Manifest
+++ b/x11-libs/libXext/Manifest
@@ -1,3 +1,3 @@
 DIST libXext-1.3.4.tar.bz2 389114 BLAKE2B 941ebf63583a05f40063ec0d2350a40ccc656c6463e58a347489f7dcd8dc5ae5c3b24b561d74a0af2661c2e3c941bd4ffd90295273c248f22e52f23e8d7c0ec9 SHA512 09146397d95f80c04701be1cc0a9c580ab5a085842ac31d17dfb6d4c2e42b4253b89cba695e54444e520be359883a76ffd02f42484c9e2ba2c33a5a40c29df4a
 EBUILD libXext-1.3.4.ebuild 660 BLAKE2B c2baba213eb3773be896f83953b9d05b24509c83fda354732da0cbf3e7a3deea73038f2e65e948ed4b9a506918ba715d84f4fe78c9acefef5b611165ed6e0922 SHA512 94d9f6e467e971741d8eaae4ad2987cf559e9db0977076fc98f07c9d30bb23602dbec3f552d3ac47054d10a8e25d55353be5eadaf7e3a9aaaa26c2a5a0cacf92
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 338 BLAKE2B e957bc4dbc63892fdac35dbe1488c4e18f696adb7710ca4b0892f29043219dc12270fee2cd9a40e409ecc4ad9b5d6b738292a194a28e2a9b4c92cf8a4c3b32e1 SHA512 9b7112ebcf1981913c9596c1a5e05a4623833f2f4f2cd936b9ff0c277cddeec49aec35c4a44cb2aed4d737213d7ea0b363f64a8ffe44feae2623500def047ccc
diff --git a/x11-libs/libXext/metadata.xml b/x11-libs/libXext/metadata.xml
index e17a5bccb78b..d9597c7b7443 100644
--- a/x11-libs/libXext/metadata.xml
+++ b/x11-libs/libXext/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libXext</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libXfixes/Manifest b/x11-libs/libXfixes/Manifest
index c466cd8d5437..a27bb00b3fcf 100644
--- a/x11-libs/libXfixes/Manifest
+++ b/x11-libs/libXfixes/Manifest
@@ -1,3 +1,3 @@
 DIST libXfixes-6.0.0.tar.bz2 297270 BLAKE2B 082f321bb10b02f34c439adf45ed5f9cf3c3045d68673144261aae739bad063b02f235fd80398acd2632e10816f09382c4ea661c5db4cd868d24ae1b3486b83b SHA512 1985ef156f382e9a7e1cc7e044e0f626de1e4c82557a511cbcf6431994c0ac25b1f8b3a0293bd3089331593db8ce01d3a71ddec68f19b5fe6029d5082fb6885d
 EBUILD libXfixes-6.0.0.ebuild 515 BLAKE2B 55f1d9949be8d8a7b543d9484862fd83155db06ca63996b7ab19e139d581e08d9d51ed47f4086a3254ac05eb786152d1fa87c1c23f48e8378269d2d8623f0764 SHA512 37f62066d27a8e995f0c01b1843f4bbc376a83a75de145a2666430311f493eba3e201406771d3aebdd22607d81d14e3e05f5d93af0dc17b66e521f425598ec29
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 340 BLAKE2B 254fe323e52c152162cb9e892abfc10405d4692c1ff3d50e1190f37ccba6bcf2d696a14aa5ec2f87c54da017afb954854a6ea862baf82f22e1aa3976873a6a30 SHA512 382967cfbefa032f23e25f9c336ffcb245775f85aa3def7b846ded15d068c9eafa8b393a530eb4e9f3e2fdd624798031b6d89c96bc43abc75a0e28e16c648267
diff --git a/x11-libs/libXfixes/metadata.xml b/x11-libs/libXfixes/metadata.xml
index e17a5bccb78b..b9264e8801c4 100644
--- a/x11-libs/libXfixes/metadata.xml
+++ b/x11-libs/libXfixes/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libXfixes</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libXfont2/Manifest b/x11-libs/libXfont2/Manifest
index 5359f6b23408..7fca94cdfc51 100644
--- a/x11-libs/libXfont2/Manifest
+++ b/x11-libs/libXfont2/Manifest
@@ -2,4 +2,4 @@ DIST libXfont2-2.0.5.tar.bz2 524868 BLAKE2B 0b26d4c93452bcb3f5c740ac8984b9873a82
 DIST libXfont2-2.0.6.tar.xz 446848 BLAKE2B 77e1fd0af5dae4f7d7cec5b9cbd20414df2c66699270ae46f81f6d21f6725b56bb0df9cea504a7a930084a4a759d7dcc3e204ab6c94dfcf0ff0006289f09a68d SHA512 24d6baeef8dc2ca2730925c6b790a97f4a3f46ea7b4d908555e7df29cee6e27b63d638b50c88dd30c853cecff7d9b079402cb617f4498f96410c5770b8815cbd
 EBUILD libXfont2-2.0.5.ebuild 826 BLAKE2B adba9366e26d8dc9746e31fe2a19dc9792df1acfa39b413e70bd1f5defecde31458243242efb16d60942d38344d1c039fa76ac1de40fd53fa8270c591b787449 SHA512 43c63a4f5fa23892a214393a97164729e8e07c62a1203ccd191073e2b36121180464869d84488ac7a21648f23f85fee6f58087d21faeb09dfa198588e2a1dace
 EBUILD libXfont2-2.0.6.ebuild 849 BLAKE2B 9e4a5882041f42ae1f459db1b174d3fd3abbb82af93e14fa905c8072776b82eaadfa3d9434d15dc2cd15eb3db0f8a1569d3fdf04fb61681d29c084765693502f SHA512 cf83eb0badf726cb522892057f9e97a10d2eaa54588ac8e8e27e1acca42117a4e0d169be85735163901f81eb8aa8b24299193b1392258bd8fd3efa88f6a9e1a6
-MISC metadata.xml 487 BLAKE2B 162a1f0b89fc165cabbb23e84ce56c12c43a279bc45c684710537325191002ae504c436677eef606bab68782854e54503cc91c8cfda2d2b0ed3cc3f7325622da SHA512 c448f05cfa0417682a1db66001b182e45d98585256cb9f25ac7c4afd498fd68e8b16cfe844fc37c626a52e30b8f2e9415be1abf9cacaf11b9196f9ee32943163
+MISC metadata.xml 574 BLAKE2B 7dd74ab652b5e72d852ab5e826d9025c8a81d1eb475d7b936e87f5baf9a726275475cf1e016816165c4a12b124b3fa238b84093c29115b98fcfd196181a4ed11 SHA512 788a597733e4defd54b0a4667b9b83a04991b3519442d2cb180ca1eb775c76c3936be572820d84b1c8db568b59d1288cc03e362a68ccd1e544042acc8b7af550
diff --git a/x11-libs/libXfont2/metadata.xml b/x11-libs/libXfont2/metadata.xml
index c6a21b7135c4..3048bbd52bf5 100644
--- a/x11-libs/libXfont2/metadata.xml
+++ b/x11-libs/libXfont2/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-	<use>
-		<flag name="bzip2">Support bzip2 compressed PCF fonts.</flag>
-		<flag name="truetype">Use <pkg>media-libs/freetype</pkg> for font rasterization.</flag>
-	</use>
-	<upstream>
-		<remote-id type="cpe">cpe:/a:x.org:libxfont</remote-id>
-	</upstream>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <use>
+    <flag name="bzip2">Support bzip2 compressed PCF fonts.</flag>
+    <flag name="truetype">Use <pkg>media-libs/freetype</pkg> for font rasterization.</flag>
+  </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:x.org:libxfont</remote-id>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libXfont</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest
index 7452b2c236fc..c94a8baa5d53 100644
--- a/x11-libs/libXft/Manifest
+++ b/x11-libs/libXft/Manifest
@@ -2,4 +2,4 @@ DIST libXft-2.3.4.tar.bz2 359088 BLAKE2B 37f8522ad744e99ae8372f4292017eed1f2c2a8
 DIST libXft-2.3.6.tar.xz 304252 BLAKE2B 8a27bbbc2c8e8c89789ff5694da180dddc3c0dfb344fd5da33e311d093f1b3eee74caa357a48cbe81cf40c5acc1e42f6e91aadb6868e42782c288bf97e1bda33 SHA512 732f8c635fcac6010012ba8c10c23d2dd6ec79b0f096d6bcc9b7e36d2ca0817387faa7ee5bb6f43cff02adc68e4234c1b8f95021ebc548f61c492e0b76836d90
 EBUILD libXft-2.3.4.ebuild 718 BLAKE2B 043ca86642ccd0914675ea0a01a8976c4e872987192fdf126a5f0ef2673385befe419cea7ad344f7dcdb208aec8a809c3cd18366fb50417788e215ca85a01090 SHA512 6dc48a7c440655f0e383a92f758b12615aa953ed8b169c648eb377bb96cb7c747ce668832dd97c38c668af53045c0804989196f7bd350a032924844df26f2c8f
 EBUILD libXft-2.3.6.ebuild 750 BLAKE2B e80f73e35ccd88c3c3ae4bc9611de1c6df7cc62590ca4933ab6462cf35f27f390e3cb92203608d3cff44f1f3389502f98e95469f22d184c85657ee4d933c6143 SHA512 3a630afedaa6dfa3786a98e35b4ca3aee2b181290b0c380f1b01a318bcc0daee7f0328bd257ebb79383c3c74d518eb56c0f349f6745e5bf5d8083352dad08556
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 337 BLAKE2B fdbaff607a3822084f5c65042d10c95df36c061790f13afef59f55a6a5d324f9781ea39e2d0510292eabdd8e1c1088e4f0b960bcd68c5debab2b6b0df5303528 SHA512 aae7659a8f73d6e6722fff3ad19f61ad545e5a3b0c1512823812e0e0bef046ed7d7aad39446c9fb08d0de4d9570922ef4c4cd9b8ea474de3c3ac04d62a3d1db3
diff --git a/x11-libs/libXft/metadata.xml b/x11-libs/libXft/metadata.xml
index e17a5bccb78b..c6226ac4ee0c 100644
--- a/x11-libs/libXft/metadata.xml
+++ b/x11-libs/libXft/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libXft</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
index f7316032b584..ee06b999259f 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1,3 +1,3 @@
 DIST libXi-1.8.tar.bz2 494579 BLAKE2B 6804aa5c666ff489180c7d468e666fd3c986c7e24396f80f69164cc351c4aff5ab3c8e22ded61f03b96e37bceb5fd86d707220479100c5ec44a2a05fe5345d60 SHA512 4b2c667a8466eb389f253d77285c3f506c4a2b6c75054c722974a864565d565cc0c5701f8ea773eb929ceb94adfeb737ecd7a0bfc2c240157416a5f343c07aba
 EBUILD libXi-1.8.ebuild 780 BLAKE2B f37d19f49033a7ec4ede4adad621ce767d133d790510e35e48b03c525d90419c0e48a2de9c45232e03ea8f30ad250afa0a41c9e81d5afb1cc7332eb8ead0c4fe SHA512 27bf5819e23c2e715d8bf6f56799ae2a8bec700b654f3be2710ca30a59a68a438dfe98d52e87eaaa11c90122f98778b9a2089729db72bab1fa86a11dfa1fe32c
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 336 BLAKE2B de8e8eec3344188d1f30e43f5b12ca4d257b352ed6f5ce92206c4479aaed9a4ff968d9be7d2bb0362eae1003ce350c4ebcbf394632d378c7da7c58a8fe65b2e7 SHA512 be9103f1d61f65e13558c3b5820e5af8b296419638f0b1b9685bfb293d45e408e2bb6667b9af5df0e60dbd922fec5af63ec1b287b68eedb7fabb9594c0a7a50e
diff --git a/x11-libs/libXi/metadata.xml b/x11-libs/libXi/metadata.xml
index e17a5bccb78b..98ba0f6f63cd 100644
--- a/x11-libs/libXi/metadata.xml
+++ b/x11-libs/libXi/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libXi</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libXinerama/Manifest b/x11-libs/libXinerama/Manifest
index 6f236cadc6de..0cbc085adeb6 100644
--- a/x11-libs/libXinerama/Manifest
+++ b/x11-libs/libXinerama/Manifest
@@ -1,3 +1,3 @@
 DIST libXinerama-1.1.4.tar.bz2 287162 BLAKE2B 9e27f9776eb200a430875e4ea3a9a559f205822b5dcea59e4207a58889e8c7b67b2014e9ceed5b3cedd311c47fa023b4a8f1a17faa511fb0041382c7467527d9 SHA512 cff777ad942614fbf6bc6d8529f399e62debf3ecbf6cc0694a94e38c022bf929ffd5636fb59f55533c394d89b23af3ea51fa5128927f12a85787e16239330f14
 EBUILD libXinerama-1.1.4-r1.ebuild 514 BLAKE2B d56e83a301b856fdffd5fa24116e3da2905e20738eff786f8111bc87a904081812b6064183b0d252702617d5df8320b1a6d42969ab0fcc4acd3ab079f8408bdc SHA512 2803c88a66a8879dd349bbe8983377ab490145298339b4d89d360bfc2aa7bdb250760b90bfab692022cdd86a384fc59226422594ca94ce8c5fa658f339486440
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 342 BLAKE2B 6c24aaa27568e06b0d2a5a8ad74449acf8f858010376f684a670a4fa183b9ad55bafe99f68930f9431e689719299437f5d725f116d32d2dabc85c7614bf63405 SHA512 7e4811d37aa49ed0bc020f677e73a292e43ad0db7efd2027cde9839bc6ca77eba21b1a80575accdc0938dc85fd779f22a7dc15ad5c059f36ee10c273ff88a559
diff --git a/x11-libs/libXinerama/metadata.xml b/x11-libs/libXinerama/metadata.xml
index e17a5bccb78b..07d37bcf2814 100644
--- a/x11-libs/libXinerama/metadata.xml
+++ b/x11-libs/libXinerama/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libXinerama</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest
index 38d1e3d6cf6b..fe4536023c1d 100644
--- a/x11-libs/libXmu/Manifest
+++ b/x11-libs/libXmu/Manifest
@@ -2,4 +2,4 @@ DIST libXmu-1.1.3.tar.bz2 394330 BLAKE2B 5bbc4345f32588a8b1e196fef39a636b9a765a2
 DIST libXmu-1.1.4.tar.xz 349264 BLAKE2B fe78cd3f529402394c19842b31b2451da2b16dc768b5aac1d157feea0af06b04dbe2be879d17c7ccff08630c0bdab0abbb853bc5672340f55da0cd1412db9df6 SHA512 3cf90cb3ff380aafefbb39297bdd95b9e1e6d6618cecb53ff09faf38f9b9c54599d28367f07a9ec77a20214c6c3e661b8d0a12b38082556790a79a59942039c1
 EBUILD libXmu-1.1.3.ebuild 770 BLAKE2B b5ac9331167dfd10ed20674cec210b87bbf603ab6048baf9f47635a581b545137fed0f7183d1057e13b9d33230c0787fb7d2ac2f3b2a6e80b37f12ef891c49a2 SHA512 a1c7a3b8583c3b9a4bcb57642990cc355c881a84fce80eda0bebe9e5801c5d39da0bdcd2928f2c20c6dd9ee1807cee065e3857f1dbc3f22d4b21d9687c629a94
 EBUILD libXmu-1.1.4.ebuild 770 BLAKE2B 4bba6afe39cbccc58af54c51fcbc23ab783528bd6be7da248834bb06cb0a896a68b1a795f396fa5ab3da4e56f4cd4cc627337a048d0ba3034e42b1135cf7b713 SHA512 d11b739f8ca65d5b727fb4e08980be412780b9cfdf09be987f76bf0c4b90dc9bfe6cb022b214d20c38de86dcd9339081b82ea5968ad89560434ac47d242e744d
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 337 BLAKE2B b3db98afa249caf8d23a610701683c053a774b136ba51d685c87c3630710500bf1926bc93b7c793cf57e0041aee5219f25ec0ce8d0cef5e1387000853c62d272 SHA512 ffccc841608e1f4aaebb2a4bf72fae9f6893268b2497686f0b3037c2cea6b8e11555d6576cb3684d44735ef117e80bb1fcb32d758471e0d92df8257fd3dbc705
diff --git a/x11-libs/libXmu/metadata.xml b/x11-libs/libXmu/metadata.xml
index e17a5bccb78b..c8246dced2f6 100644
--- a/x11-libs/libXmu/metadata.xml
+++ b/x11-libs/libXmu/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libXmu</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libXpm/Manifest b/x11-libs/libXpm/Manifest
index a571de4403a0..67ec06e74c93 100644
--- a/x11-libs/libXpm/Manifest
+++ b/x11-libs/libXpm/Manifest
@@ -1,3 +1,3 @@
 DIST libXpm-3.5.13.tar.bz2 463251 BLAKE2B eb8a390802f13ffdd8199e21f5f18d4d17141783d7259c6b558dbaddd2dce05f7cb27306dd5cb73e27d01cffa62f5e4808c143b72974dae443e958069e70cd17 SHA512 3b8f6e926272f39b1d95135c2274c00f5aaee1f9fb2ef79f71628df5edeb7ba20158819ef6a778101cc4092493a3b5b613c53634fdccadcc0fc85f0605e5e9a5
 EBUILD libXpm-3.5.13.ebuild 616 BLAKE2B 38331190a6b74b60a66829fd810ae323c600f82b18a885eeb5c67e1606b77f3ccb87b527910f4fc98c67bfee75cd4a4562c55bb582d34383de63a9b5be5037b5 SHA512 9286860357481eee773f22115f574f9bce679731328b41c0d0b46e4e8c2754480dca848c0cb858800b1c812e8522fe14bec1472d873a53a7847cf8fea1799a8c
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 337 BLAKE2B f05884685bbe654022c1126464b03338198dcb0dea05679ec4ba2ee478ffeeb410f5445457956bb9309340616d66bce3bb1656c636669743fc962571a1bae32e SHA512 1a53eb6b24624c18dd13492dc76dcca255e7bcc88646a257cdb3b72ba6a1b347cbc9f3e2e8098bca25ae78060a68196bbce8861919250302c75a76db541236d7
diff --git a/x11-libs/libXpm/metadata.xml b/x11-libs/libXpm/metadata.xml
index e17a5bccb78b..78dbe4c45154 100644
--- a/x11-libs/libXpm/metadata.xml
+++ b/x11-libs/libXpm/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libXpm</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libXpresent/Manifest b/x11-libs/libXpresent/Manifest
index fb3300778b7a..8fffb75c5e6f 100644
--- a/x11-libs/libXpresent/Manifest
+++ b/x11-libs/libXpresent/Manifest
@@ -3,4 +3,4 @@ DIST libXpresent-1.0.0.tar.bz2 263461 BLAKE2B bc35477c5f0d8bb3403c00650f94a66259
 DIST libXpresent-1.0.1.tar.xz 257136 BLAKE2B 22c66f595f8f42ed8a7bcf60c4ae5689e590e443d9e99785fc8747dabe7aa20031f303c72950c8fdd64b347776f84d17156d539cb83900d60a11dae3b6c21df8 SHA512 a4551f49a68f4487eb70dc5b50b7f745fbc8b6842cfa60422afe3834af41c504a37bcfddb4e7e9ee084b250df256034290776c8eb7d8838e392eb626fff55d25
 EBUILD libXpresent-1.0.0-r1.ebuild 613 BLAKE2B b5bd0e821c72f5ef6a08e4e20f623dbe3e3e6f15a6f5cc388fe198c1baef04a83c7360c62c46b3d5175521989f127de0a3bbde4662d080f579a175d6bfd92ece SHA512 2c83556a69460223df78b019a9002e60edf3050b023c2e90fb16708e392db9efb81459e9f3d08e83884a873024d435ee3e63e643d12af85186ac258797f4581e
 EBUILD libXpresent-1.0.1.ebuild 581 BLAKE2B f3466888f20a39fb6e81097825d344a9fd8378268792a42d234658d8eb454b2dafed830725bb54144c63718d4184f64d7b36dc7341f093743ee654e990db7b0c SHA512 fd83d2407e2a5e1a032316999450d74333c66f1c6c6f2b9f55b519ed6843b6190b1110ba3e222441455ff754af9197184a9200d2ff6ce1af93f14799fec9118d
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 342 BLAKE2B af23e78e091dbf21e4c15d30aefa5af059e6ad211e296efd62d3718c8dc4131fa64a9175a9c915b860ade14d1a42cf4ab13f23cb3125980b5003ec1d4f4eb4a7 SHA512 03f60a6bdd8101b5b89c4784a654aff54be725d9479e9cf25426e0ddd67ea7d3b564d5893cfa9bfd80a8d561ce348247759284db197bc50d6a6e9da771466bc7
diff --git a/x11-libs/libXpresent/metadata.xml b/x11-libs/libXpresent/metadata.xml
index e17a5bccb78b..19117efd1fea 100644
--- a/x11-libs/libXpresent/metadata.xml
+++ b/x11-libs/libXpresent/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libXpresent</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libXrandr/Manifest b/x11-libs/libXrandr/Manifest
index 92b72a19140d..890dc3f1a9ac 100644
--- a/x11-libs/libXrandr/Manifest
+++ b/x11-libs/libXrandr/Manifest
@@ -1,3 +1,3 @@
 DIST libXrandr-1.5.2.tar.bz2 330726 BLAKE2B 2d91e4cd2d7af6b79ee952a0d51b0c61d64251c61f862677b47065f2eda811650a5e3bb3185d09a6401291b5a8bb30e8d29cf7aaf1699ac3f49b838ef7b1208d SHA512 fcd005f9839e7ef980607128a5d76d7b671cc2f5755949e03c569c500d7e987cb3f6932750ab8bf6e2c1086ec69dde09d5831f0c2098b9f9ad46be4f56db0d87
 EBUILD libXrandr-1.5.2.ebuild 599 BLAKE2B 42c1ce2f0a05e7cf640c98fcab43dbeeb2f1aa77921530ed6fb237093b155c968890364651e3ed28aba8d0feb8bfbe2d4db7139e2a185507f568a84e4eb27cfc SHA512 118db2a354b1c6a9e57ffde795a0279c958406a1d83134508b1d0d4f58d85a170f821e239f98f0782a2c92e52065acb244d53c41d2c78e0ddd5d5d7b56bb56d7
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 340 BLAKE2B 8256af7fc43fb196ed97a295a7f5a4f40dcef2833d715e5d6c247123e072336b09957fb1a08b337d72283fe4bc6d5c2288d74c88473b1c12c914d2e84a442ee0 SHA512 963039a140a9888c0ab1f1cc334ba764024b32fbc7ca152c39f82e6d62484ae99ff8c98f5bfa6c0ada201d15898072d0e5fa188247986f0a0110d4b04789182c
diff --git a/x11-libs/libXrandr/metadata.xml b/x11-libs/libXrandr/metadata.xml
index e17a5bccb78b..6a73169216a8 100644
--- a/x11-libs/libXrandr/metadata.xml
+++ b/x11-libs/libXrandr/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libXrandr</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libXrender/Manifest b/x11-libs/libXrender/Manifest
index e541775cd1fa..eec679950b99 100644
--- a/x11-libs/libXrender/Manifest
+++ b/x11-libs/libXrender/Manifest
@@ -1,3 +1,3 @@
 DIST libXrender-0.9.10.tar.bz2 308318 BLAKE2B c9e250e16118a4878e7439fdb37549596abfd6a17f50e4e88242579fc285d0ef5b0c8d5d0fb592c7dbcd6e77c5fb284e6644e4edf9b12118cbfc0f179e274313 SHA512 16ea0cf638b32d7df54b270457ef8c9d9a80da27fa845b105b560cb31027b4c7fe799cf23d6b6bac492be5961264e96d7845d316a9af4de9ff38bf40885ea6fe
 EBUILD libXrender-0.9.10-r2.ebuild 492 BLAKE2B 4d6168dbe0f0b42c8648c54dc17a984f11bd73681f03f84086def1cbbfafd86f548883a1b82a82432d04cb71dde7dc5a54948c70f9df6365a42aee12afd3998e SHA512 b320b7b5eaacc83ad59224f088e0d1aca8249adef7927baf169cfe3931482ae4b8c3af2504245b228477aa2647166e4aad57456e04806ff16fe2d1a2b46e6774
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 341 BLAKE2B 02c79694315c5ca33c90a8854cbf506addc7b69a68fe066f99a45c3fbe7764ebc69c03808215e056c2bd0f7b0261ec173d02a623e8c91c3a090b9ae77a1c83a8 SHA512 158a1a560ef016f8fd5c85a6dc65fae5ce9e960f65be43913a58a4218b2f24ef4cd925a490140f8463b206fb50d5c18243c9dc0ea56b0639f5ad9e5fbc0cb31c
diff --git a/x11-libs/libXrender/metadata.xml b/x11-libs/libXrender/metadata.xml
index e17a5bccb78b..d758ae51b5c8 100644
--- a/x11-libs/libXrender/metadata.xml
+++ b/x11-libs/libXrender/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libXrender</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libXres/Manifest b/x11-libs/libXres/Manifest
index 9ee09df811d0..b7085bcd2c10 100644
--- a/x11-libs/libXres/Manifest
+++ b/x11-libs/libXres/Manifest
@@ -1,3 +1,3 @@
 DIST libXres-1.2.1.tar.bz2 311025 BLAKE2B f1ecc2397547cd6bcd37dc94968bacc378ab67d004fc31f02890b26bf169057bda61f6a08559ec23eb70bee5910f200e9d1016add3ca816fc4dd49115e718256 SHA512 c17d28406e17e305dc4976f095e88059735f5bd8c600adf2e556523c9e0dd7fa01dcbf7a9d28a642e77e49a5b30f54bb9b2fc34bfbedce467ee2a020bba5cdf1
 EBUILD libXres-1.2.1.ebuild 430 BLAKE2B 3e80451b5d0eb47d0c4b4432169c96063dd7e8a4d61169c1e6afea701220367f38d744fd9e1af2fb0902f8de597673d94403d4ab82fbd7e45c1895820df0c6ff SHA512 f320c5cf0b7bf3dd13a69b4d246ee176b3c9393a430f29969d0a3487edc63ad79f0f1857273582d2e6c4b1dc632f9bcd1b76f15ffafa28fd81a4b6b9f565fef1
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 338 BLAKE2B 8feab0e80e774feb4ee7a995224044633f0b686abe7a51f758d322d5107ee35847a8db2b568656ad50c8a720ce55d62d36f21165fa9d5067add7128e6eb07c0d SHA512 c6da27d02dd04dd7b98ec500496bf12c49a72865a34e8bfe236cb40f4243df5cc6b7c5052d780c213090e9fc413245419bd1fffb2c78865584ec1a2db2e7021a
diff --git a/x11-libs/libXres/metadata.xml b/x11-libs/libXres/metadata.xml
index e17a5bccb78b..1edcea235fde 100644
--- a/x11-libs/libXres/metadata.xml
+++ b/x11-libs/libXres/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libXres</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest
index eefaf2cf6771..35896f8b19ce 100644
--- a/x11-libs/libXt/Manifest
+++ b/x11-libs/libXt/Manifest
@@ -1,3 +1,3 @@
 DIST libXt-1.2.1.tar.bz2 784610 BLAKE2B 69a1446a22acb50e625ab4a7b24b5db634d47a540d4543a3f58459dbb380d61aa4bbbde50328c76b2c31eaae3662a1c71cdbcf9bd3a0c915ae4e587f63fbee7a SHA512 6877af61ba91eeed6b6f80471b84f354ad0ec0827249c7ee0a00c13508063fe8d2696dd400a4bdbc6ca2ff67cbe1317ad5ac24522fd96099dc56535e33ca052c
 EBUILD libXt-1.2.1.ebuild 887 BLAKE2B e02f6eb93eb829133807f01734cf666f62e0ae59bd5ff48857454c4e5ba7a7b1ce9eed3a9156e7b78b2b38e75038b96e74c0cbc3a405785a7643ae04ba46bb41 SHA512 4cd64255595ecf5db9659f696c1a8609fae80c7d98d5eb86019df48c40dc9c29f4cd57c558a7016e1035b6d214daac01d74fb619302d243c466df42c2627426a
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 336 BLAKE2B f3ceaf37a1b9096462f9c82a317f29ef6d144aff5051be6a92235ebb2155fd7f01efa71466c59c2de4fdda58f84b2c3d790a15010fb16c6836e37fa6f2485170 SHA512 bca56314490246cde70c6b3104a7458cb72d9995d7a833817a91add87ce89dabe08b542de9d80f493ad849a73aacc3b8556acda29fe683eaa6d8c34882bcd054
diff --git a/x11-libs/libXt/metadata.xml b/x11-libs/libXt/metadata.xml
index e17a5bccb78b..938f41e6afae 100644
--- a/x11-libs/libXt/metadata.xml
+++ b/x11-libs/libXt/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libXt</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libXtst/Manifest b/x11-libs/libXtst/Manifest
index 4497c648419a..509433fefbc0 100644
--- a/x11-libs/libXtst/Manifest
+++ b/x11-libs/libXtst/Manifest
@@ -2,4 +2,4 @@ DIST libXtst-1.2.3.tar.bz2 321819 BLAKE2B 92a75d6ea9000fa7736093ce479d275c57a4a5
 DIST libXtst-1.2.4.tar.xz 287636 BLAKE2B 6c3e6154f221530158b8275ee638934c633f2e812333df0093a01663c416ded0b6be509578cca78d51c6b540ab17379e1e0503bf296abe3112f1afeda12e4af9 SHA512 f2f4e01239b892b8e26284cede90feb4fe7738beb243bca0f6adb349029f8bf87b5a482911edcd2401733c92ef78eec07fcd455b92e5b8c4828374769e60098d
 EBUILD libXtst-1.2.3-r2.ebuild 627 BLAKE2B e353486f424db1cb32ee99f072cf715d093a675d462d90e4052ecad45c8ff03e2ef34a4836f1c38c957b281cdda22621cd7fda1b988e98bf63742c969ce6af66 SHA512 5a1a8ba0b1f0fbf1bdea9d50c4c2ac4dadacfa90d60307aa6de383954aa5ae5a067b58e7c8d6107eaa97dc94dc89a762bb67fbc2942831a208b2a0fdfce8474a
 EBUILD libXtst-1.2.4.ebuild 659 BLAKE2B 16068f46dae3963727b2c244257117a7aa325771b0aa3fc4141ff1d074ee882cb2cbaac33caa8314e4ca40abce7891794da133d2e537dcfc3a07b027a3a01828 SHA512 fa999aaa7ddbc87a8ca528f2477a2e90b50e7ed652635d50f6ef704d02691a9469355af48832079c30cdee7b27a61c4efad22e5305e613ad1b50785f82aa8858
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 338 BLAKE2B 87a7a857c72d92a698c6ca2b9d6274b3a03edda1e5b4b84cb66f6c581f1ac428a7ad912c7c63ecc2554bda3c84fcaeeff108504237562499452934ef6ae4cf49 SHA512 6957dbdc6e6fe3186ff4ef7979cbf1f237ee942c1c6b3534b2833db2a799e765c244f1d6531f20d97011cb8901939dffc43e34d8f22ce4d977730fcff51f3e23
diff --git a/x11-libs/libXtst/metadata.xml b/x11-libs/libXtst/metadata.xml
index e17a5bccb78b..70920d078425 100644
--- a/x11-libs/libXtst/metadata.xml
+++ b/x11-libs/libXtst/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libXtst</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libXv/Manifest b/x11-libs/libXv/Manifest
index 78482b4ae3f6..a8920f267fa9 100644
--- a/x11-libs/libXv/Manifest
+++ b/x11-libs/libXv/Manifest
@@ -1,3 +1,3 @@
 DIST libXv-1.0.11.tar.bz2 317921 BLAKE2B 3c656e1f5cd02c936813b3e10a359d23e7a8643a45ade42ddd584084ba04d09cafbefcc68ab9356b78c1a716a050637062e956c7f50a03a522d28ff7aa31c3b0 SHA512 97cb3ab06cedc87799d06e1affd5cee32ed0e551903fa5c915f79e7ed92eded867e3220b4a663822f7ebd86fdc71b09943b7077d98f1200019992e8d24144e58
 EBUILD libXv-1.0.11-r2.ebuild 518 BLAKE2B eda59103dbad717a8b6195f6db8eca948db87c46c216c146b8c4f45f59bcdf4bca39288ee69328f238d2e3931220ed13c44b6bfbdd13234a7f49e6be725725c5 SHA512 8327eb7ba4a86c8ec152f9cf1b06b2d88f6342aae7f3774b623b7272a0cd74f6e69ce017b6a087b1010c6d25c04b7ae41475878d8971df93558a010e31dcc1b5
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 336 BLAKE2B df53f0c032a8ae8449fcb3a321b35be1981e1044461aa6356d1e47126ba671cf398614e88525d9fd9be633513556636f6813948e9bec593f2997bf48c47e2928 SHA512 9c32d9805677aa96736b66019dbd73055de44e2aa7581d123884b0a691b5cdcb3dbd1a8efd5d06e82ce7a987bca93f2127dfaa12cbde48d3e9162a7b7b9f599b
diff --git a/x11-libs/libXv/metadata.xml b/x11-libs/libXv/metadata.xml
index e17a5bccb78b..f6b405aca6a8 100644
--- a/x11-libs/libXv/metadata.xml
+++ b/x11-libs/libXv/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libXv</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libXvMC/Manifest b/x11-libs/libXvMC/Manifest
index 9fcaf43ec0c8..873930487a10 100644
--- a/x11-libs/libXvMC/Manifest
+++ b/x11-libs/libXvMC/Manifest
@@ -1,3 +1,3 @@
 DIST libXvMC-1.0.13.tar.xz 274180 BLAKE2B 51e7a08b0a1c76c9ed3bf53dc9656d7cea836ce7f5c17175b0700f73f2a8c4c0a9a91a6c3bc3b3919c4fbfaecc8e305d344ebf4654662d297735bf53d9a55579 SHA512 c9d0f73884a586efb9ea4f77fc8555f60d940077d7dff8eaa765b86345c8b4e3d80b860f68191d2830c272b9e464c08450fbb51bb64819753a6f4228c71861ac
 EBUILD libXvMC-1.0.13.ebuild 712 BLAKE2B 31436bd0b4a60b2ea420fb41488b43863be6578525564e5b4f42c7a985b97d7e1b02c9e95994380dad6e35614233d19ee71c6b2d0d588f7fa417b937432966f7 SHA512 03a81ca400ef552469191fa733692ec2342ea7345cbd82b55f0493e02b6fee7c4f3be3d23cb833cf35cfdc9b9555012b8d9e811cb5ec2f70ab21331335aa0047
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 338 BLAKE2B 345dd31a1d8dd4b1d57c8ccab105d13f36a0c9f11cba9c53001df748af01402e2f5c26a8f68983c0b654ceb70ef3b06cb9d3c729d9e34a603f5b21d02e072fbd SHA512 fc19a18db1421eda4230bcea8c16feba56aa50ef6b5691802f73f7dbf7279faa5730df9c79f48d3fe2a1772ce4920466ec7569cebe2b1a507df793cd081fddce
diff --git a/x11-libs/libXvMC/metadata.xml b/x11-libs/libXvMC/metadata.xml
index e17a5bccb78b..f27bc93b06b1 100644
--- a/x11-libs/libXvMC/metadata.xml
+++ b/x11-libs/libXvMC/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libXvMC</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libXxf86dga/Manifest b/x11-libs/libXxf86dga/Manifest
index 7f3d5d79898e..d8fceaf8eef1 100644
--- a/x11-libs/libXxf86dga/Manifest
+++ b/x11-libs/libXxf86dga/Manifest
@@ -1,3 +1,3 @@
 DIST libXxf86dga-1.1.5.tar.bz2 301685 BLAKE2B 8c70299e52cd2f34b4dbfa0d56707df20f7b368ab92321cf9e8c0fe15402a3b4e1b8eb62d0e53fd3321e95521bb4f35479493e412710a74779ac98ffaef966bd SHA512 0e77c4003aeba737b10c17d55aeefa935fc57c4ba9e8f79a834f3f8c690d6a1d98f69ad707eded784346c1cf40c41829719d257283b5eae3207147fb4c79ed89
 EBUILD libXxf86dga-1.1.5.ebuild 482 BLAKE2B 350d2c74f4b0039859dd340e75705e395fbba2d7d3e05be80fa1496486aab83a59c5cd2c2e3197db7504024c46551fe4b3b3b28973039f72a9dfac6a10e525d5 SHA512 89fb3ca03cc5459ea50148b1b90831a00e5d1453b46b345c8dbdd6b0705b290b02fc1dec4471d613faf6597fee3100d61cf259a51da143229d2deac47fadd92f
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 342 BLAKE2B 2ddc40ae69f107abe54da5f36aedbc968115393409f0c4bf99f970cd03f6e43931d00131a2939ac54fda86a09699f62d27652c398bee31d8c7a96a351bf7d57d SHA512 b0c044574aa4c72d60352dc275a542f9c3fcdb9107bdab0bf48ecf221abe256f299d827f94f6fd96ddb580f3637f56aab65bd36968538bac48686e53861d604b
diff --git a/x11-libs/libXxf86dga/metadata.xml b/x11-libs/libXxf86dga/metadata.xml
index e17a5bccb78b..7a351d94894f 100644
--- a/x11-libs/libXxf86dga/metadata.xml
+++ b/x11-libs/libXxf86dga/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libXxf86dga</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libXxf86vm/Manifest b/x11-libs/libXxf86vm/Manifest
index 8c0cbab1ef1b..9bcb4d6ccc54 100644
--- a/x11-libs/libXxf86vm/Manifest
+++ b/x11-libs/libXxf86vm/Manifest
@@ -2,4 +2,4 @@ DIST libXxf86vm-1.1.4.tar.bz2 295346 BLAKE2B 22698db5beb0ac06663e9163e13f8afd995
 DIST libXxf86vm-1.1.5.tar.xz 265384 BLAKE2B 4e94267ad815cf47ec558959ca122d89b5f8b54ead2b2cb93dc3ef7f9bc694b515978a0b2301bb8e48d32bc768595b50cd8cb71e7a65c65a752699b80c2c079b SHA512 68226fcb9773a583ea417ab413146203dd7db6ff8a4d388285da972353355e11e179861a77c9fa284aefac025bb3bbf5a9537fa0bf246c782e0116a667c9d9b6
 EBUILD libXxf86vm-1.1.4-r2.ebuild 523 BLAKE2B 882d2297b0583b91984abec38afb1bdc324b3297d8efb9880558a83dcf97e4081d94e1b1f06339e41ff87345be06cc4b8edcc60aea85e86bc62bcc5f074496ac SHA512 b868dd8bcc9aa94298572190eb6bf6d9e4d3623fdb661a96d15da81381b88172c35f31e8b7e81c9dea6f6eaa0e5dbbb4a4a9031c94602a9736357689436667d9
 EBUILD libXxf86vm-1.1.5.ebuild 558 BLAKE2B 2366234ca4725b0e302fc08583c202247a4b508ee4ec54e7737b244c93e4236dcbbb785181c32c0e6ae0592390de9ff47baba508b7f4717f820aad75c4963e46 SHA512 86c9651ddb00cfdc4705dd9b313122f182fd8dd76b6ca50c241f54f57a1185c8d1b62be7a9a3dcca57ae0590687fb4289a99103b0d873c6c98c67d4f9822f8df
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 341 BLAKE2B 0fde03018f6bd9fe5ab8a01f13387fce7e15707acbb3bc7fec3c9f444f0b374a4b388f786f5b0b1bf8cc84a5cbbd4655a4980a716a7d47db7ee9bf3347e9898a SHA512 34043e9c37357b1a6a1ac66f2c159e3393ed6c4ac0e3ffabf5ccbe48c85d7ee62e98c7d6a022685bf6b2f30a8886e386f402f4fbbdafca7343c828ca316bdc12
diff --git a/x11-libs/libXxf86vm/metadata.xml b/x11-libs/libXxf86vm/metadata.xml
index e17a5bccb78b..01301f064958 100644
--- a/x11-libs/libXxf86vm/metadata.xml
+++ b/x11-libs/libXxf86vm/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libXxf86vm</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libdmx/Manifest b/x11-libs/libdmx/Manifest
index f308ec41867f..73ed8840a16c 100644
--- a/x11-libs/libdmx/Manifest
+++ b/x11-libs/libdmx/Manifest
@@ -1,3 +1,3 @@
 DIST libdmx-1.1.4.tar.bz2 316517 BLAKE2B bede1dcf554fba15257277419c1a458125ab962365a4ae679b22a98d6a1e31584087fe09fc1a2e5a7e9b212c0fd332438cdf5c56c8a9d32b6ea755091026b6b0 SHA512 77aba6cadfd17db0cc7e1bc26f14d908223a0fdb135d46f86c3be34e3bc7e2f843f08d4d0ef773357e83b17122bffe56a0442d12908378c05a22177b10ae10e9
 EBUILD libdmx-1.1.4.ebuild 341 BLAKE2B b24d159442a65c919df0ad2cd1d79e99d62e5f0ae3babba2069591ec6d19ab4c0a825dbafad3f335dc915835c9913adb636c0240ef3c2c766041be534c97dafa SHA512 a123d9ed2c4b5ca2091479263c10102482a051d59992de5e8879d59897dff77fa1cd3e8c841076ebae4a8fd1e1b2b4c5265585fbe57e5f708704a2ccf36963a4
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 337 BLAKE2B 6c8050807b6714769b4eab4d1fcc01f1638013cf423649c666ba1e6a389036344bd3601d033944df276014111124a9eff7d20c63e296cbca0bfe38e7dd1a9f10 SHA512 0867b8808e33e09a0c747fc9ebd68bd7c11cc75e888446e59ea93663939bc83a918c7258970db2ff6d76e9ab315f99bb707014307744e6df21d13a3e5a2b3ae4
diff --git a/x11-libs/libdmx/metadata.xml b/x11-libs/libdmx/metadata.xml
index e17a5bccb78b..17329a8ba1b1 100644
--- a/x11-libs/libdmx/metadata.xml
+++ b/x11-libs/libdmx/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libdmx</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index ceca69743045..e87a9ff827db 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -3,4 +3,4 @@ DIST libdrm-2.4.113.tar.xz 457064 BLAKE2B 30dab032f047a4bd3646b53c64c118d02855ee
 EBUILD libdrm-2.4.112.ebuild 1946 BLAKE2B 331f6d44600bdeb4a397e6f7fe630d481eb02658279e391cb237e2e1bb5856c7ff87e4910ce65d9e6281abe76c402c0bc24c84dc22d53f7ac092f269d1d12d9f SHA512 f1e10b879303377ec4060565865a8b3cd342a26b49c4aabf28dacca835ae8baaa818783b40d5f6bce1db9afc7cf495484bf7e9c36d41990eebac70a2a7dbdc3d
 EBUILD libdrm-2.4.113.ebuild 2043 BLAKE2B cfdef7c119fc261d57730dc157fcf05aedb81e36cf98ba78ddfe368ae74aec136da38dd910b321955fefd7bfd6dd7bc18e5d6b732ad1583370fad2d35efb3fbd SHA512 caf7a1667a174ef2fa6855cc174dd3c4e4627c9c024239e2a7130bea5aeae84a90cffdaad19438898e5e58a3413613c3261b3bdb901aecb576fb0fa1b505967f
 EBUILD libdrm-9999.ebuild 2043 BLAKE2B cfdef7c119fc261d57730dc157fcf05aedb81e36cf98ba78ddfe368ae74aec136da38dd910b321955fefd7bfd6dd7bc18e5d6b732ad1583370fad2d35efb3fbd SHA512 caf7a1667a174ef2fa6855cc174dd3c4e4627c9c024239e2a7130bea5aeae84a90cffdaad19438898e5e58a3413613c3261b3bdb901aecb576fb0fa1b505967f
-MISC metadata.xml 304 BLAKE2B e47f11b45b5c90804d5dfd27dbe2f2156099661ac7546152fb4e62046fd030838a0944d7dea35efd2f7b527eb88992c5049a40282dea58097b991c6bcd843693 SHA512 b798cffebaf330272494b6ef84c9c587a920e27ac0ae26336ff256de21768274cfcbe8feb61b7f63bff52294e460f945ada9ab9ddaeaea91d17bc1d6d41360da
+MISC metadata.xml 413 BLAKE2B ffe1394ed3fb669c1ee0c1c0ebee429a80aac7dd3a3086316703784f991ef3a6e663c3c29a828bc75f53e9a35abd8bf84421dcde0765cb6f9ef7c473c4f2a7b5 SHA512 e5e802e47f115161f521ddaf0fda3196a43454f8d741de176676a1adce61dbf7db001491d79a466ab8b9e67f4b61e3803f0ce1a2c5f14ab84d51f746bee3e6ee
diff --git a/x11-libs/libdrm/metadata.xml b/x11-libs/libdrm/metadata.xml
index 73e3db5cabfe..e018c0e75c76 100644
--- a/x11-libs/libdrm/metadata.xml
+++ b/x11-libs/libdrm/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>x11@gentoo.org</email>
-<name>X11</name>
-</maintainer>
-<use>
-<flag name="valgrind">Compile in valgrind memory hints</flag>
-</use>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <use>
+    <flag name="valgrind">Compile in valgrind memory hints</flag>
+  </use>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">mesa/drm</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libfontenc/Manifest b/x11-libs/libfontenc/Manifest
index fb6c872ba4b6..b056b324bc26 100644
--- a/x11-libs/libfontenc/Manifest
+++ b/x11-libs/libfontenc/Manifest
@@ -2,4 +2,4 @@ DIST libfontenc-1.1.4.tar.bz2 320492 BLAKE2B 34da17e220789f5078e870329390c0e3ee6
 DIST libfontenc-1.1.6.tar.xz 272520 BLAKE2B ccfe4f9524655862e2e5ceed8edccd7da8ec1872b3a8166803540b69fe4f42f1b5b6f2128a00b702368f9009e1bb1edcec5d28c36815abd6d591dc9fc46cd291 SHA512 524247caf035e5d69280575c79ec5a3259c4cd0a4afa375b01985fedf800b42ecd75102e38f85cdce5591d020d361ffa9390adcb7906e939df289e5131088683
 EBUILD libfontenc-1.1.4.ebuild 523 BLAKE2B 0407b0dc7bf0cf4296158378e6fff9d632e25b9b99f4fd4ecf6217701288877547d47c7339980443a9c35de76161dc51088707124def05da1ccc5d0cdfcd27db SHA512 9dce3b3f5d9f717a6ea73537cb27e516b6266af937ec8e468cd046b60631068fec4501277872b9d9e63c340c7551987c4641c68c3ee2fddeaf13f598d4f81164
 EBUILD libfontenc-1.1.6.ebuild 548 BLAKE2B 7ed2de204110ef7705ded7be9ba576f8ef5c6d6e7da2dd0dec8e39d8528a89fe58b36b9541d090d72d0afe29b94e13b3a8f6d865e650fb467a7f8ad0c0454ea1 SHA512 db6537efbf86ae23378077e24c346aeeb0cdbb35489757a2c7de75b723bd5984a3a416c439b06d41e73d768ca958bf07f3987242999a8fe88163da24ac056059
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 341 BLAKE2B 8eef39a5f51bea7f961c5605b9bf18c25ecc2a3937f3610275212ef0d6e99903102e7f9cd16c632b7bc22f4968cb259f63470e1e4594eec09752d3985538a3ec SHA512 4c3d24add9b54f986acaa2aceb12df8e59571d0df7370a4fba731d89618d4bfe443fb766f3305f45d46164fe7d465ec65bfe7b617b22e5151f075f8b133a04dc
diff --git a/x11-libs/libfontenc/metadata.xml b/x11-libs/libfontenc/metadata.xml
index e17a5bccb78b..d7741fb1ad0e 100644
--- a/x11-libs/libfontenc/metadata.xml
+++ b/x11-libs/libfontenc/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libfontenc</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest
index f6ec811d5dd8..f41006fa9ad6 100644
--- a/x11-libs/libpciaccess/Manifest
+++ b/x11-libs/libpciaccess/Manifest
@@ -1,3 +1,5 @@
 DIST libpciaccess-0.16.tar.bz2 366603 BLAKE2B aab7d49887f7f21e0a6abf1e2aedc50159a47c7aef67eb8605a30e246463a14f9a9993db9cbd2705ef59c93d1ff41080668f8f3723557a927ab4d1edb5dfa4ad SHA512 2f250048a270dfc0823d4bdd613aa272c58a80eaafd922850f56c4b6f7a45a263ed4cf521b52b49f04484ea44ebefb7407d079aa058318a5751ffb181e38fed1
+DIST libpciaccess-0.17.tar.xz 331768 BLAKE2B 41539b3d6385fe7c42b562c7602f87b07730bbbeea7d65d3cc8e5af974ed5f9985b0779d51891493dd241a36bb171a3744e3b1f3fd30bee8a19bb5bd785f4c5f SHA512 8484605c66ef18c8d8a3e029a6d33e26fcaa450c1263790d89ac8b0a160ffb2dfceaa6140ac9ad7d8087283ecbec8ac801f757e44890d547c3cbecd2c922ca47
 EBUILD libpciaccess-0.16-r1.ebuild 806 BLAKE2B d04d81707315e16c5b2e5d6fa03b58ee943df4c5b1fdb83e52daac51eab9ad8db6d9920e170a6cf209cf64f3e9411ce07579e1a24c3c078332b26154e17a1126 SHA512 c9c8a66de9c2d3b3bb7156573ab86f54d54603361e1da0ed8dad188c9e582a10bc7d2ec19f172c3ef30a05b5af6e710f3857f34e3d440a3d28d80201c13cfeef
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+EBUILD libpciaccess-0.17.ebuild 717 BLAKE2B 7a046a393c8b024568b7d41125ea8a5e90ba871135973fece0499a8cad5c1022b94b8bcdb5603a5419e21b660d35e1270898a6e3f1a87563b1eb520a108a3e6a SHA512 70ed1248add04250e3446ec737d365c5e011aa8dec62ea2a88e672d69b3e01f0f818e41cbf6a322296ad4f7b4e07a773ee4120bb15e02aaf51b71e6345e170dd
+MISC metadata.xml 343 BLAKE2B 841587af1693a1a28bc87d7785e79805abf10ea86b5b2bc117b786f005eb18c2d4369a6b7668c7ae6d41de19f2820d2957007b3c5417706713b26ffb5e67ece5 SHA512 89fe0feea88e2fca82867d6ef538a88576626681d6cc1e14c96784d0f0ff7ac9f09434440e8aec295a4fc5e4b07a3b681592129c26777e6182d3369e0720b035
diff --git a/x11-libs/libpciaccess/libpciaccess-0.17.ebuild b/x11-libs/libpciaccess/libpciaccess-0.17.ebuild
new file mode 100644
index 000000000000..456c91654080
--- /dev/null
+++ b/x11-libs/libpciaccess/libpciaccess-0.17.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_MULTILIB=yes
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3 meson-multilib
+
+DESCRIPTION="Library providing generic access to the PCI bus and devices"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="zlib"
+
+DEPEND="
+	zlib? (	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	sys-apps/hwdata"
+
+src_prepare() {
+	default
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dpci-ids="${EPREFIX}"/usr/share/hwdata
+		$(meson_feature zlib)
+	)
+	meson_src_configure
+}
diff --git a/x11-libs/libpciaccess/metadata.xml b/x11-libs/libpciaccess/metadata.xml
index e17a5bccb78b..769fcea0c3c1 100644
--- a/x11-libs/libpciaccess/metadata.xml
+++ b/x11-libs/libpciaccess/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libpciaccess</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index 0433e684cf86..6e5fa2c6206f 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,3 +1,3 @@
 DIST libxcb-1.15.tar.xz 446492 BLAKE2B d50146ee9b822dfd0c24513110e1706cda05ce588f276005167a911d3097275f36be1ce755c42c2b2970e750f10b2b943f3e373b6e55865fba986e29811a3545 SHA512 f6c7d766b7cf9cab6abe948ee424cbae6951dbfe2f76fa58a109cdc05b0f0919dcc4e38176a22ff4b95fc1e38596115317e32ba33b24cae0035a4e30dbcbdad9
 EBUILD libxcb-1.15-r1.ebuild 1410 BLAKE2B 3621a58ae286a9966404e238d9503f3f666ee27220865cbf1b7db7d343dfd4647fc1a15e0e34b55f3342766033d9eb74859df884be37e84e367aa9ff63f337ec SHA512 b5228b34a0f3422043521b4f23a989835c145a097719d00d1a7142796d6b304896df8b6df42884f4d382da2fee6d086c5a119828bd064fd9afcd4771afa2eef1
-MISC metadata.xml 401 BLAKE2B 67d85ae2c4ac6eecb10245666173d96f896ec9eddc36c8d0890092cbd19c7dd685f327332235937afbb119fa6e69860920fc1e385fdc750d89c85b67a9fbaa20 SHA512 72981a4b87a9219573847178c3d50f9a182c0b0a82917d3d472be062a5bb5e21422bc1776a8988b0ff0a5248a6f5eabe3dee3aa51612b31a7da283fd870b58ab
+MISC metadata.xml 470 BLAKE2B 9f530dabef12ece5a3ccaade8000872e1a89cfef4833ca4d6a4c5e157510516fec18f18e7dbe4ae88ac4059acff9fd099832c3614d12d9742af03167def25f16 SHA512 884ca6cde9de9394a67493b5ec40475873e363ad2530470ebbc0e080f55594bf02787b02960ad172ba05e736c80a6b9c33aa9c2ceaf1b47005f6f47b0895c1a3
diff --git a/x11-libs/libxcb/metadata.xml b/x11-libs/libxcb/metadata.xml
index 3fae52d39796..9a732f52e92c 100644
--- a/x11-libs/libxcb/metadata.xml
+++ b/x11-libs/libxcb/metadata.xml
@@ -10,5 +10,6 @@
   </use>
   <upstream>
     <remote-id type="cpe">cpe:/a:x:libxcb</remote-id>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libxcb</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libxcvt/Manifest b/x11-libs/libxcvt/Manifest
index 102e72265167..7a48e18400f5 100644
--- a/x11-libs/libxcvt/Manifest
+++ b/x11-libs/libxcvt/Manifest
@@ -1,4 +1,4 @@
 DIST libxcvt-0.1.2.tar.xz 9648 BLAKE2B 8a4803eb6790fd0ea1520fd31e335f7a363c3606e74837a959453be8819ce0d450af7bb651887a891aa657a5eeac3e4983041060fa5c87b1238c83354e425de7 SHA512 3f6b2baca712a4608780686932f8881255c07bb74b1a788f9b07d4e22975c038d75111cd6b452257882a0b2bad57eebb2002f80a3e435d2e2d16936597f039b0
 EBUILD libxcvt-0.1.2.ebuild 447 BLAKE2B cab186971614c8f5d4d8c05cd5cf2bbc300beec95b4db64a48296a54e813a2385a2ccc9c659c049072d913e2cd0e5c00e252396b020843e6bf8259e5aa8ec6a6 SHA512 d62d09422c1591409978aee7f281c4ecb23bf5b9d723140b08964bbd805bef7978c150bc6a9cd0cacee312456b89ef61dce6c41c62cad76d98b073d9c202896b
 EBUILD libxcvt-9999.ebuild 455 BLAKE2B 914a44404e7dd3eff5efaf2e0ad19f3a55b6f411b55adce6656c21b9af6973a3b2ae37f392d6d6ee4ccd74ecf630da95a291f7cd558c7c4ffecfc34c662b52a7 SHA512 79d158e1d12b275ba7a2d9e98544e7976b28ddb84da256cd393930c665a197501e2b2fbc61c9d365de07c3537463cfba98e801f4d895e2c45ad1e6ab672bec4e
-MISC metadata.xml 235 BLAKE2B 5ed3cd35ac32a5cdd6ac490bafdbc1cd03fc8c6bdbc8194ba7f4a34151a24c4ade7a80705d92348d6d13a9579d18b19ec40a353bf014dc02f98980bfa03d3574 SHA512 3fe78f6dd92b87b30ed02aef15ed72ec5cb62f4c6568dd9b98dcb2f11a4b9ce93955e34c62112a310b4c4a51f87e0e31e31ae5af140e1054c127d3cd344d7267
+MISC metadata.xml 338 BLAKE2B a2ddb5adc6ae17e449baf87adb1731b6eba290736a5e9b0bdbc2fc46da8fc81fe1248c9f28d16ba1798ba215d6140c4f94a99defded313ff5cf977d2b80d6707 SHA512 2d6191c894e6466f9f37b0c658e914faaaa5c1d4899ef23911fc78417cae347c6292693df307b6bc1ac546845d2246263acd0e6d2638e36598a7f6325a30e771
diff --git a/x11-libs/libxcvt/metadata.xml b/x11-libs/libxcvt/metadata.xml
index 6bbd73893d34..fac786631338 100644
--- a/x11-libs/libxcvt/metadata.xml
+++ b/x11-libs/libxcvt/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libxcvt</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index 540d975a7c04..e80c4870cb76 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,3 +1,3 @@
 DIST libxkbcommon-1.4.1.tar.xz 471824 BLAKE2B a784f3612bb52abb79bf1a2ddd3e7709fa52eddce5cabcf8520ed7df8ec8ea557e51205e1e9d116a0b31eb27b1f3bca33144318c5f01be7312cbb3e48f687fbe SHA512 757b340aeab6d187917807a88015b5113475ab2172aaaa8e530b40ea60619b3fbdfa668fd62707d66ed8fb763e68fee19394fcbd519af7c01d8975c59fdf0d89
 EBUILD libxkbcommon-1.4.1.ebuild 1545 BLAKE2B 7b0af3e3b664290fc834f621ccc0c740bdfb31c4e342380fc9847857f8172c4d68b486822547fcee5bf37cc13d4faaf460a9a9930a546d33f4c54266bea5dcba SHA512 ffc63c15e96bcef0ba4c7a28b12ffff1e7a72888f467a9b6f3ee5466330dd7bc98473fedbf0e271b1dd0da48fe829177ec56a3a4b5314ed20bdb3fef5e3f3a4c
-MISC metadata.xml 392 BLAKE2B 387cc216299e7c312552b0fa7abdd744203daff7bc5a51ef5b7d2bcfd39b83904308c8bb2b66f2459f77f593e18fc8ade017491fa45e698e8e6bfce03a819df8 SHA512 0ab9850b467605c1050d70ca526d2a4c2957e3ec9f56113fcabeb9d4a79cb8636ab077f66e17c7e05b79aad6948a7e89a83e5d8c48197ab016a7f5b2f2886f42
+MISC metadata.xml 482 BLAKE2B ab0da50f2f6fa4c4afd8b242e2015b75e5dc101e8846a587768f46041350b54bc8af9d1e8ac7651739d1d6c86b4dc57d4b5f29837f1b48eec433fe9b13c64ff3 SHA512 17d555622c7535d581db415d696e75f440bd4360beef21cb2e2852eb9ab700fd20d3a23a2fbfcd052b64167086adf6f69beacbab96f080d626c10f28d268d968
diff --git a/x11-libs/libxkbcommon/metadata.xml b/x11-libs/libxkbcommon/metadata.xml
index 045195581cc6..887150f5375a 100644
--- a/x11-libs/libxkbcommon/metadata.xml
+++ b/x11-libs/libxkbcommon/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-	<use>
-		<flag name="tools">Build the xkbcli tools</flag>
-	</use>
-	<upstream>
-		<remote-id type="cpe">cpe:/a:xkbcommon:libxkbcommon</remote-id>
-	</upstream>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <use>
+    <flag name="tools">Build the xkbcli tools</flag>
+  </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:xkbcommon:libxkbcommon</remote-id>
+    <remote-id type="freedesktop-gitlab">xkbcommon/libxkbcommon</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libxkbfile/Manifest b/x11-libs/libxkbfile/Manifest
index f6550a5c8a0d..5404dcd0712d 100644
--- a/x11-libs/libxkbfile/Manifest
+++ b/x11-libs/libxkbfile/Manifest
@@ -1,3 +1,5 @@
 DIST libxkbfile-1.1.0.tar.bz2 364678 BLAKE2B 577da1c43e6ce681630676f3f52f40b1f31d01862a891d4c1bd853056d90b03d9993299714c5e63a903b243165a1e299e1e014cd94614eacb50aeef363be8990 SHA512 1c6a57564e916ccdc3df3c49b9f3589f701df0cec55112c12ddc35ac3ed556608c28fe98e5ba0ac1962e9a65ed1e90eb7e6169b564951bf55a7cf3499b745826
+DIST libxkbfile-1.1.1.tar.xz 308832 BLAKE2B cc3042a05dc4859edf96235b8ce95b7da33878e9c9b8b7f82f83280f84cbb215f5d3bc32c7f77d8667f0dad7a9500abc68695c8e784dcc7e83e4b30196bc0257 SHA512 2902d21860e27a27159123a19f7d4e0cf9cf8933685f1d2477e69ec647f0f8629b58bbfc391ed45e8b51a10033f18a9d0f16f7f519da9923cd7ed3bd497cf1a2
 EBUILD libxkbfile-1.1.0.ebuild 491 BLAKE2B 9c30eb17f71629266a92ed9a8b626f179543f7395417e98913e9cce1ce9777b66d49d6f57cbd29ff6bde2ae6ec564415c631e0a3fd5f1787e391855a8d67ae34 SHA512 6544ec1c2c28581a28729b78fe8f314935601e8f6ba940c418e9fc5a6a57c2e2f93de58f64aca5d828ff534719484c8d21e7080ad3a369a6962183d65f8d4fc2
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+EBUILD libxkbfile-1.1.1.ebuild 516 BLAKE2B 78252e8737d5a18438db001162da4ea86d17a5c731c974423fde60c96d84151f6f087a6a710656bd399e280b77e208a0fc10b939b6371dd7c0f35dde38da07c9 SHA512 56d33a38db2c79849812339525b3737717968cdba793ddb21d5aae6dc557788c6162da7d9da5e4e6d732d6396429c668d8f7c66e2f333557500db35d8159764c
+MISC metadata.xml 341 BLAKE2B 6bdfd118881a6eae282b380680ff6484fe69747cb1b1d0cabb00607d1cf06535de084ed07bb8664bc5027db274f263ed34175881cefb7464124891a9eb38e117 SHA512 436ec0aaca5f4a4392dfca223787672744e65354de323e5a6222e6a3eda53cfdbee00dcdacd375e587eb8a9277a0fb8da1c0f84723e577d8764ff884f37ccba9
diff --git a/x11-libs/libxkbfile/libxkbfile-1.1.1.ebuild b/x11-libs/libxkbfile/libxkbfile-1.1.1.ebuild
new file mode 100644
index 000000000000..b358799d6f2e
--- /dev/null
+++ b/x11-libs/libxkbfile/libxkbfile-1.1.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+XORG_MULTILIB=yes
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="X.Org xkbfile library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+
+RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-libs/libxkbfile/metadata.xml b/x11-libs/libxkbfile/metadata.xml
index e17a5bccb78b..bb8e604f2d16 100644
--- a/x11-libs/libxkbfile/metadata.xml
+++ b/x11-libs/libxkbfile/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libxkbfile</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libxshmfence/Manifest b/x11-libs/libxshmfence/Manifest
index 3ea2b1ef2cd5..61b60c84c93d 100644
--- a/x11-libs/libxshmfence/Manifest
+++ b/x11-libs/libxshmfence/Manifest
@@ -1,3 +1,3 @@
 DIST libxshmfence-1.3.tar.bz2 308644 BLAKE2B 6e1e75fbe9d113cb258eb8f6a5106ea565f6749efd79bd3aa21222514063aadf8499d82d2a14bfcd0a69f7d4c4dce49a5efeb38d54d2019eb0c93345f0ba8a37 SHA512 c446e055f8fac62b9aa266132289a4cfc030282147974c45ce96d1768a98d1afb997470e58e4a68513174c404cbf373bdde2f0cd4b34abdbce1d89dd0b6fe2b7
 EBUILD libxshmfence-1.3-r2.ebuild 389 BLAKE2B aeb95497e2e636a6613f5802575a947f6a384b6398ecf14340094350b69848411b73b16a3a29d4d8ffc162486f65e86a276a194b2199bf755abeeaae893c7361 SHA512 d54e306ca2145961fd7c6cb00f7af8f954636e51dc113cc98b81c686b569d99a93a86cd523c4c8a5da3e0b1580ac5e485a676ac4f389740766c703d8c2cd982e
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 343 BLAKE2B 4b6c3bd00d5e71b96c4cb0c1eebd1606f5a7e219882a4310251f7b68b0230b4cb76ce1d5ea7f3911fe57a33c07c08ee5bd2ca6ac9d1fe690713a2ed39b0e199e SHA512 f58bff9c90477bd61d09f59b3e92b9d899d0329a1be77a76b3ac74c89e4a20a8b88daa37f4c64a06e5367fd25a40bc9709e98d141be271652185e4f2a3c350aa
diff --git a/x11-libs/libxshmfence/metadata.xml b/x11-libs/libxshmfence/metadata.xml
index e17a5bccb78b..397dc28abeb2 100644
--- a/x11-libs/libxshmfence/metadata.xml
+++ b/x11-libs/libxshmfence/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libxshmfence</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index c89734926aaf..3ba6c8cd77ac 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,4 +1,4 @@
 DIST pixman-0.40.0.tar.xz 634752 BLAKE2B 29b71f5eb6c3df0318c7a6153c6abbce29748b0b578697916414a869a029635fe5e0bab06b8f701a764c95e475c115ed12eb4f93c751d234b5868f4c4196d7db SHA512 8a60edb113d68791b41bd90b761ff7b3934260cb3dada3234c9351416f61394e4157353bc4d61b8f6c2c619de470f6feefffb4935bfcf79d291ece6285de7270
 EBUILD pixman-0.40.0.ebuild 2005 BLAKE2B 443ba3024143ba6106054358c3ecd28e4e3951f378d15740fed4141fa65908fe99b3ba074914b6860f03b5c30c855bfd84bad78d2fcbe6a9241ca452d93491f4 SHA512 1bdf7a0d33ef2b3bf03fa5d2e91b6d71e58336ad9b602869a54a5cf27c2303c4303916223740d1f5d79dae5280c92a12d3717950c5f8071bb2f90d45c0c9cfa0
 EBUILD pixman-9999.ebuild 2013 BLAKE2B aecf684907839c8ae0fcbfab97d226ba9638b4b192c4fd9cc20ec8b96aa0b661a38aa9e7eee71e3d204f56b6618cfc4e1862f9a93016f6ccca13f2dd3976b76c SHA512 5938e49282080d1be36df40014b922a8ff5fe71bb435a8146a81e5dfb9ee89e0c8b05c07732b8f74a68369897c62d019a4912109b33695f520f2d7de293ec13d
-MISC metadata.xml 392 BLAKE2B 5ad5ba991fefef08fe1fa364ce726a90a338c6840947cd6fb9ac57b7e4cdff0389d9a6fac955164529a51ee5ec92cd2e478e4d330484593fcfdfc8d5325ca21b SHA512 ae68e9a2a492e899bff3ea5c70c88f054fde927c18e9d4a3c08030c8b2f5b6f2977bf9590b4d4776bb1151a3cd9de72bc18460c0ebdc2f506c8ff51b99a5b3c5
+MISC metadata.xml 483 BLAKE2B 4302fc025e7ce3dfb1b2f099371f0b3263942203ffd50730c40afe491feb003d2ec17cbf8ddd4ad3c1c0d752c46b87dd944e907b6c31a6ffdcaab7b518c247fb SHA512 f4777b9c1ae7527be4f354836c51142b095ab27dd56b173a6e0b7146ad68257136f326ff7c0fa564706dcc53aebe9171d8f844bab026c139cab717c559bf2a5e
diff --git a/x11-libs/pixman/metadata.xml b/x11-libs/pixman/metadata.xml
index b6b501a3b833..9eeb5bbef528 100644
--- a/x11-libs/pixman/metadata.xml
+++ b/x11-libs/pixman/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-<use>
-	<flag name="loongson2f">Enable Loongson2f MMI optimizations.</flag>
-</use>
-<upstream>
-	<remote-id type="cpe">cpe:/a:pixman:pixman</remote-id>
-</upstream>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <use>
+    <flag name="loongson2f">Enable Loongson2f MMI optimizations.</flag>
+  </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:pixman:pixman</remote-id>
+    <remote-id type="freedesktop-gitlab">pixman/pixman</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/xcb-util-cursor/Manifest b/x11-libs/xcb-util-cursor/Manifest
index b540f178bc8c..678c61f91c16 100644
--- a/x11-libs/xcb-util-cursor/Manifest
+++ b/x11-libs/xcb-util-cursor/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-cursor-0.1.3.tar.bz2 295224 BLAKE2B 7a1a89c0f326f4ac0768110c4aa5a7818ddace1f231f6a0dcfacaf8b157a2d6aae53f5278a02cb945822d83eccb8a01ebb14ab98e8828d8f1d506e42f51431ba SHA512 be5eee7b268b18f356d6aae04820a7e1c51397dac9020d876df379e833200255b5194269541c245a9b4ac286edad4cfe44dae8e4fcfd16a4726dd7553c104c21
 EBUILD xcb-util-cursor-0.1.3-r4.ebuild 1025 BLAKE2B e1cee4ee659ea5ecdf9c3d315e1c7fa0ee4c2593353524a7de929031fc629b3030a1ce2f9998e9d6dfcf1335e9adf9b7cb6db28aa8e01e20bf45263933237a3a SHA512 7c2ba922ab6841a56c63ae67003bc962cf0b3ccdb76896f76b269c7d2c89464da6d2a6c1c183bf0828a706c884eb46f99af6e8deb1080a775559d62580fe673b
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 344 BLAKE2B 7350bdaa3994406d2c539c1e580759e17729eba1b935c15802e0fcdcb5194ffc2655148bc0a5b1c40329b887e9c41fb26964286e8fc5a29cfae2ce721cb00f01 SHA512 38736ab0f5b649781a67f911269e622c22b8ff75963818552aa772ef460691285260c057581226e00b2ebb9a7ff94c3bca863351ec1d916bd9e0a50537a8caa9
diff --git a/x11-libs/xcb-util-cursor/metadata.xml b/x11-libs/xcb-util-cursor/metadata.xml
index e17a5bccb78b..a332e74fc227 100644
--- a/x11-libs/xcb-util-cursor/metadata.xml
+++ b/x11-libs/xcb-util-cursor/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libxcb-cursor</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/xcb-util-image/Manifest b/x11-libs/xcb-util-image/Manifest
index 750de5bd0ee4..f4fdf8d3a3f0 100644
--- a/x11-libs/xcb-util-image/Manifest
+++ b/x11-libs/xcb-util-image/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-image-0.4.0.tar.bz2 327891 BLAKE2B 022536e7b7410ba1ed129f9efc2ad48fda26d9a69e79e54fe6fd4510df38d1e957289d249dc1a5beb4385116b0808f3282ad496b3f2a246bc6f5762bbe8c7e36 SHA512 9b7202c054e1160f9ca97a86be1210d9fb47f2119f89ca85f15f20909cca884bfe0cb88e3e71c75b65e1a0a72b980066ccac810e41a91db895c74dde77440d4f
 EBUILD xcb-util-image-0.4.0-r2.ebuild 608 BLAKE2B 4123fca7764fbaaff2b1baddf56c96112fcaddf502019f8fe081ec7330a47ab0745509b8f50e4279903130599b6b8e6d59821f963155bb59ca901f2f5f2e4e47 SHA512 7aa88b81b2ed0b2f18277e997e8d4799a7912da98b3edf9a0284ecc2fe20a04991811dd3c0f81be5d5bcd2a892e12b12fdba046f2595a82d43ed0a171e214c6b
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 343 BLAKE2B f43656c79094ea2102119fdfae5e8a9fd2bef2ede1e4536f637d9041fb46cff927e8207fa25a65437cd5ddccbaea4afd3f2555b7b31eb9db9bbe68c557b0e35c SHA512 a39c03ef5043b4576a7ab27203268f6bebfdc06b1888f819560ea052d66ad49775a6787163fc47db1fa96b81fa8a19b3729b6af4f6391c448f53360e48dea6cb
diff --git a/x11-libs/xcb-util-image/metadata.xml b/x11-libs/xcb-util-image/metadata.xml
index e17a5bccb78b..c8a814d0cc52 100644
--- a/x11-libs/xcb-util-image/metadata.xml
+++ b/x11-libs/xcb-util-image/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libxcb-image</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/xcb-util-keysyms/Manifest b/x11-libs/xcb-util-keysyms/Manifest
index 71de5eaf9311..077194eb5ba9 100644
--- a/x11-libs/xcb-util-keysyms/Manifest
+++ b/x11-libs/xcb-util-keysyms/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-keysyms-0.4.0.tar.bz2 289880 BLAKE2B 5f55706fc74ed5c096ca0e8a8411ba392a023ab7f3c8185088c31570e5873345e16d72b693596b0983011350ecdb7cb30ae5fca118f4758710ee2fc2441883ca SHA512 b14b3100c3ae2379f9df799c0780a1ee39267101e58e4c1c6f390f039348ca2b370bb1df203b9bc68a170d664188d9c73e3553a7ba24d98abea3ed353e8dc0c4
 EBUILD xcb-util-keysyms-0.4.0-r2.ebuild 553 BLAKE2B 005d0de891f6e413ea14a9a3fade43ba68d4f366b16c92df22e36e558948c0ec622b2e041dba4b7c42fa93906d69dec92c2fcdccbbf391ff1c887a2d0409331e SHA512 40a39f29c48278f655ac46c51aad955fa8f8245ba5afe1357f6910dad2f47ce5cfc36cc679293945f8c4a1ed9069d1b8146d4011727850fffaeb6efc05da17c5
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 345 BLAKE2B 95d38918c502f2397c09c9f07ba88f9059889f51b6339656a48437f149c946b79c8868abb2715bcf78c1d5890ac75d22a1a7e58ab61fdd73a680b351a09fe298 SHA512 467331b043b4dc8aa2a97d6a73fc51aadaaf550f31c0c4095e06315b4d6909cf1cfbeaa6bd14d933b57522143b678a0cbcd7da3320ad22501ea3153e90a6fde8
diff --git a/x11-libs/xcb-util-keysyms/metadata.xml b/x11-libs/xcb-util-keysyms/metadata.xml
index e17a5bccb78b..04e11fd9dabd 100644
--- a/x11-libs/xcb-util-keysyms/metadata.xml
+++ b/x11-libs/xcb-util-keysyms/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libxcb-keysyms</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/xcb-util-renderutil/Manifest b/x11-libs/xcb-util-renderutil/Manifest
index da4a9fe2f641..c75cb546d7fd 100644
--- a/x11-libs/xcb-util-renderutil/Manifest
+++ b/x11-libs/xcb-util-renderutil/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-renderutil-0.3.9.tar.bz2 292898 BLAKE2B 8de259f918f1ffcd82d054bd751baf3f0fe3514da86bc736b68c74ca1f285fb41dca364ca49153e1464691c10fb65f16a53eec0ec8102c1abade9ad7c80629e4 SHA512 24b567992ecde7e69a406efd0ffb62266610d73b4dc0e5c71093221090fa134c14b850680d1d28dc1f8f4a6f497b4118491e1894ec7c73d2c6ce959d106771cc
 EBUILD xcb-util-renderutil-0.3.9-r3.ebuild 565 BLAKE2B 42a83b2be25357c84b670c19a4e1c6abf8936cfd5276eb47e42b0e00b965a9c691ec58f55f778fdd82742e2b5bd0c50c04a37110e1fd9221854232e1b9f5e918 SHA512 ad2172bf30d196a7fc8c4fa176a5f5249a3cf65e5dcc2b6ab3d2681af70dc6cdd304e0b78b8fc886df6cab5f6c1b95af219fe9bd806634bbc1c1e4a6290a267a
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 349 BLAKE2B 49f5b4e390ba8e82461e662b0ab228113caa86ba25683d6cea931936c4002627a4eca860fdf6fe77eb3209aeaa24a0d25b4e132d943267912a158d14a628dc66 SHA512 9f5ad281542dcca4ffae5d5f4c5659f47f83a340effe36eea06031721fffee77340bdd63905d47ad82b72f035aa906f6dc37a9188847406a2460726241c93462
diff --git a/x11-libs/xcb-util-renderutil/metadata.xml b/x11-libs/xcb-util-renderutil/metadata.xml
index e17a5bccb78b..05de8ed16cbd 100644
--- a/x11-libs/xcb-util-renderutil/metadata.xml
+++ b/x11-libs/xcb-util-renderutil/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libxcb-render-util</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/xcb-util-wm/Manifest b/x11-libs/xcb-util-wm/Manifest
index 4bcffccecb29..dddb6a5133da 100644
--- a/x11-libs/xcb-util-wm/Manifest
+++ b/x11-libs/xcb-util-wm/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-wm-0.4.1.tar.bz2 321855 BLAKE2B 095d1f39e4b42e85790830b46c1faeeb8ac3bd7b792c3db8dca15a998a0ce835fd4fa148e8ed896c81d82e2113d1b9650e35de7741e9629883908d3b81b927f3 SHA512 cd1b3bcf9fcfc52e329ddc42b370d50dcf7d473c8e94f01cf7ea7fdbe0dc9176790890214eecb2a8ac43405f4938c121e38d282ae988cd8e90a6610d214ef326
 EBUILD xcb-util-wm-0.4.1-r3.ebuild 556 BLAKE2B 56a680e11eb5055f49cb7a66add8672bef850fbc61dbb93f5502693177db94fe78309636aff0f8e61951a692cb5c2de5e86a11a996266af9349b82c950f872db SHA512 0ba1838703bb1f13f73b3fbb623712edf8bae3907196194621fc73b0eee8f7c57fd14b9797478511fb2098e8c269f1245ca248f95fa17eaa995c53432d5b8557
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 340 BLAKE2B 73178674ca632e4da2c664fadb411eef0375dc8d9f3be935eaca1696dbe83af995dc5158403808f6377ff857191d15a606816acf5c569e87b95b26d1d2eaa2db SHA512 7ef425868fd0f352e8f88fb415427a5d98ec6cf5332f75af969d1a74a99f6bc2c1c6c9f3c649d7dcde72971e2171b45cacc6a08b0e1bf634cbd1bdb6248ca21a
diff --git a/x11-libs/xcb-util-wm/metadata.xml b/x11-libs/xcb-util-wm/metadata.xml
index e17a5bccb78b..808c3a272e7b 100644
--- a/x11-libs/xcb-util-wm/metadata.xml
+++ b/x11-libs/xcb-util-wm/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libxcb-wm</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/xcb-util/Manifest b/x11-libs/xcb-util/Manifest
index ed12ad8419ec..d413dcb60ec9 100644
--- a/x11-libs/xcb-util/Manifest
+++ b/x11-libs/xcb-util/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-0.4.0.tar.bz2 297412 BLAKE2B 55970cddd8d4bfb313f5d6e4ea82a169a90311c1c0bb5ebf796ac1ceb1d1e1baea4268dc37bd8adf557514a752eec9f957ad3e3e0747384f2cf6e1985f26247f SHA512 e60aaa6f582eacd05896c5fd7c8417938318a1288146f3a5b339f77eed24e211c6099963f8813daa621c94173d2934228936b491c0ed79b09a8a67d835867d0e
 EBUILD xcb-util-0.4.0-r2.ebuild 851 BLAKE2B bb797aa63665ef5911e14116ee9315719dd56670dddb0b2866eaf0c069678e71fa9511888b739cddd908bbaa20297902bbaef0648cd6a3b688d19256e9786d7d SHA512 12be3d9b1b0b9a5ccee329d69c5a1d34964ccd39208992be8a7a7d4b8ed897b02a2cb9b29ab7507bbcab29aa18fdf87f87631b987b11f9939386a2e12e96bcab
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 342 BLAKE2B 8b63c0c5e0e032812e3fc213bf7d260736517921d7af89de1e73e8224a36f56e50e2cc8a3252731f44b843e6623c0ea8f503b20fa4066f80461830986f10623f SHA512 a178db0e3ebcf2ded489273330063bd5630c721a4909673eefe7c23e2efa6ccc392b92986f07ade3c9100e02551e17cb94d80574eaa8d777e0d2e9f9cb4eed33
diff --git a/x11-libs/xcb-util/metadata.xml b/x11-libs/xcb-util/metadata.xml
index e17a5bccb78b..43dcf8588bb3 100644
--- a/x11-libs/xcb-util/metadata.xml
+++ b/x11-libs/xcb-util/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libxcb-util</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/xtrans/Manifest b/x11-libs/xtrans/Manifest
index 63391b7f8110..1fffb770ad37 100644
--- a/x11-libs/xtrans/Manifest
+++ b/x11-libs/xtrans/Manifest
@@ -1,3 +1,3 @@
 DIST xtrans-1.4.0.tar.bz2 185371 BLAKE2B 15e5ff810f8df94fa6a050dab00158646003ecc7b200e199eb713d8bd6e7ca8df1769490ebc3d8b8920915bb5f2ede698f01a1a120ca09acfc85f225c4d618f8 SHA512 4fea89a3455c0e13321cbefa43340016dbb59bdd0dbdb5b796c1a6d2a6b1fd63cf1327b769ab426286b9c54b32ec764a50cd2b46228e4e43b841bda6b94de214
 EBUILD xtrans-1.4.0.ebuild 626 BLAKE2B f57470c2ccda331ac6662920245048d373378261106b25e38d2fb5bbd3fbfacfd699ebce523249c0818176fa74b69a030851c22e4f52228491b7fda51e653c62 SHA512 4ba925e507c0ae3100cf80c07e3eaa7994f69611472d6b150b0825ce281ac7244fd0a5c2f0f40472f38d49e40b4f38689feb936402883ee868fbb23afce69119
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 340 BLAKE2B a338aaec9199c9b8d4d7104867c9beab0c1363cf8ae64b4c13366ba1d506a8849c9ace547c8ba8f737e5f0cb6f69a9acc11e4a7ed719bad81da5fb44214d33c4 SHA512 1a1504c0e5788a839e01bb8fa84ac557664af8057690b7dca4528253abbc6355bad2899c492a847ff1c4c938ffb2652c6d34a0b6f6efc2a783080a606ad8323e
diff --git a/x11-libs/xtrans/metadata.xml b/x11-libs/xtrans/metadata.xml
index e17a5bccb78b..19a21bde1111 100644
--- a/x11-libs/xtrans/metadata.xml
+++ b/x11-libs/xtrans/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libxtrans</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 1830d7fcba20..661d07034f1d 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index 0383c088c236..7b4f3e46420a 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1,3 +1,3 @@
 DIST libX11-1.8.1.tar.xz 1818460 BLAKE2B 7602b4d8c65ea3160f81096b4e022b5462e49d96b36dee70fe06e972329dc9d70bbd462e2079da03ba5647d7a72bf03e29aab23c60bcc206c95d770655622226 SHA512 2e36d2c47519e0cb2697f588c0ccdf73fbe75c2163f0855c78f7052dc9e920bca081f9d5e39c707a14067f101faef74fc758c8862eeba675b1535b43119d533a
 EBUILD compose-tables-1.8.1.ebuild 950 BLAKE2B d39d76e922dff015b083428ebc78d9201df0aeb3201e3c23c9341f3e4506aefec860bc89a0c08c211868058cd43360f1243f3800c8394d6d3708d82ee37a77fd SHA512 d64b4c63a117b55f4f7e7b026122fe64feb0bb30edaa0f7f2399343745da05899f19bc2f7561454c98bde2b30cfdd54d3a58c2689f12785d7cdda352c761d2e2
-MISC metadata.xml 312 BLAKE2B 297d68d5585ee7fe053a0b9d1e4758d1c8538fbfa6037cddfefa84f5b757c1c768d4ab072f6198e19c1b9bf4d21120440db61e5a9690cc6cfd387ee9d2add736 SHA512 4b5fc7ba8a7c24241e7ab5dd68677ccba15f5e89a76482679f18139faea4ff1555759066041afbf51c65d1870ec0d999a772c340f1e934a6aba0135b8da28d18
+MISC metadata.xml 395 BLAKE2B 7912fcccfd8d8a4c9c1e5601783a0668679506638511ee719bf7bb95f99415fe95a417343060cf5ca3fe918ab1f9847f74861af36d3c712afa321272cd13cf66 SHA512 c2956ef519fe59d0f713732059224568b9d7c34579654b71993b02227a512c1ac3057dc7f81c6bc93834fd4fee212f1ae26f4055ea92f3eb7524da7d9e690f8f
diff --git a/x11-misc/compose-tables/metadata.xml b/x11-misc/compose-tables/metadata.xml
index 63a0c8ad1f14..2e0798c98274 100644
--- a/x11-misc/compose-tables/metadata.xml
+++ b/x11-misc/compose-tables/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>x11@gentoo.org</email>
-  <name>X11</name>
-</maintainer>
-<upstream>
-  <remote-id type="cpe">cpe:/a:x.org:libx11</remote-id>
-</upstream>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:x.org:libx11</remote-id>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libX11</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/gccmakedep/Manifest b/x11-misc/gccmakedep/Manifest
index 319f27552b70..c827a08814ac 100644
--- a/x11-misc/gccmakedep/Manifest
+++ b/x11-misc/gccmakedep/Manifest
@@ -1,4 +1,4 @@
 DIST gccmakedep-1.0.3.tar.bz2 104766 BLAKE2B 4da8c3d4423f55fa110b1be748e9488b713a36b575f065f58d68c24eb4fdfc337aa9c715b82dfaac6eaaf8cb2037ab4d0355297a61c39f7e7672f136bb1395d8 SHA512 563b2897770a4df2792ea3eae8183a1f9e78192b7efc9c8296ee68d1cba6e72fa962a88e3251bb780df776e2aa7e80d74d5096675c61526c232aefa4f9e6a5fc
 EBUILD gccmakedep-1.0.3-r1.ebuild 968 BLAKE2B 04b4dc94835b6efa6335cc10b9eb41cdbe5477208b102626c6eab4b5ea78a25029eefc78e0d56480d172ea8290d501848fface0db6175a3ff4301b28f681f975 SHA512 eaf38671b5f6cc997dd17c1e8471928fb3c77cfa25ae2ada7ad7bd83ade36a52ac4bc80aa6acb93647522baa347ba0620656617a348ba0e87ddcfbfd3325190b
 EBUILD gccmakedep-9999.ebuild 975 BLAKE2B 6be79c4fe954b518982837821e7737ff17183ad9825eeb201374a4df33655cb06bc588ae0c849f1a457ae24ac0aa4219c16212557ca6c19e3d511131c644beb7 SHA512 2ea4c1331c8067a60d60be36e7c6cac62bc3fef147affd48c4c42f65732e3516e3b2a9dea212dbce3d5a5d0f47a192fe6bdac97693bd17326f1c445efb99c566
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 342 BLAKE2B 8a918dbed8adc0ca2dd4fb47840a2a13199f26ea3cacc46391974a9b797006bd710f5d4fcbc265361f3e23cb5cb8f7f9358d27549f7ff21ef0381a11f5fe2346 SHA512 ccb760eec62a031973b2e5d9a553833430d7dd51b71a91943b30ff58352a9838fa303e146150cb9e460e0121c61c3d293a1588fac5b5c610aabb5e3f091a18c5
diff --git a/x11-misc/gccmakedep/metadata.xml b/x11-misc/gccmakedep/metadata.xml
index e17a5bccb78b..956fda190a14 100644
--- a/x11-misc/gccmakedep/metadata.xml
+++ b/x11-misc/gccmakedep/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/util/gccmakedep</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/gxmessage/Manifest b/x11-misc/gxmessage/Manifest
index 720c8e2b7b77..b208be3cc05c 100644
--- a/x11-misc/gxmessage/Manifest
+++ b/x11-misc/gxmessage/Manifest
@@ -1,3 +1,3 @@
 DIST gxmessage-3.4.3.tar.gz 275354 BLAKE2B 2801944c3a6542d250f91388a90736ba781013e5c370e42783db620387a07b315b176bac60e30af6e623d4f664291fdf567786e66a1f9e8c383dc772a64547e6 SHA512 4e3c455595db723e2d78060c4913f1a87b8f0c5cb6017427d48cd02652655592bf8aa1001adfbfecd5598cc0c613c78a74d71a59a7f1f0787acc29774328e93a
 EBUILD gxmessage-3.4.3.ebuild 735 BLAKE2B f67b1db25b3b31b6765c6cfca132d82805adeb8732585901d20aef0f688658a8af0c63eecbba911679828a6e66edeb387c6c3d88dd71975f7f141d9fb2b5f881 SHA512 ee6565a2b88a5fdcecd0d6138b15462bfc360615998d2cc2c85b7fceb88eb798eaaf2b0b7b2b7570ba63e160b569164a3413009ddd7e53ab9d42f6c058ea3160
-MISC metadata.xml 277 BLAKE2B ebaa8353413cfc5519fce99f8627c71cf765fc6d42b42651e232274de315487c156d45dcb23a401dffb8f112600b0dadd56f93d2283ff86b4293dc5490ad4059 SHA512 c8ef9069153b124118a6be64375c6954ccc6f518a13805e4ff1c33c9cec136170132a580c4a9781930b709c93678c94d6448291625de34d18fea41bfd17f685d
+MISC metadata.xml 363 BLAKE2B 76ec83aa62e15484562b6b43e575f9861bda8c38b46184bb62ec6271a7a3a102d1b24f8069905df904c439ae2564ea09cc2af125791e59db0d43f8d9e0d0be3f SHA512 b1f871ef0dc528bb6847e33ec3bc1df9308c2a8b5eb976a2e4385f5bab45cbc6366f91dcb7163ce663c8f4df1fcf6d4b3849d67b3217a1e14d0531dfce9bbe89
diff --git a/x11-misc/gxmessage/metadata.xml b/x11-misc/gxmessage/metadata.xml
index 410408b3d171..eb26924f8f45 100644
--- a/x11-misc/gxmessage/metadata.xml
+++ b/x11-misc/gxmessage/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
-	</maintainer>
+  <maintainer type="project">
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">gxmessage</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index d0644bb0882b..a9a33ace9c7b 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -4,4 +4,4 @@ AUX imake-1.0.8-respect-LD.patch 379 BLAKE2B 1b031fc8cbc884cd975b338f57ef9de554a
 AUX imake-1.0.8-xmkmf-pass-cc-ld.patch 461 BLAKE2B 643264da121725cd2424e3e6d3dc7af05d9068ada3a53ca5b92f6af7beb17caf7eb7de5bc4187a7ebdfed508f242d13bcba9876533d2d7cc52dbd0f9c80ab701 SHA512 c73feb329adcda1f08051965a0ce0ba6031a8b8aceef19d10d11e475a603337da661ff4af72620924e1efb76ed9347fc0535b31ac3e98707aee298a36e715bdf
 DIST imake-1.0.8.tar.bz2 159398 BLAKE2B 2ea03a06daab883a35ac4ef5c5598db89c84b2bbc41105902f64ffaf66a2e5cebaa28bef0ee7d258eb7279eaa95671b8798701423cafffe87d8feced5bc1b63d SHA512 5352b0148664506c8eb7ba80f95fced146d150398673547ba0b2c7c966a382bc21de43dfb8e0d74e38a0a563f16ddbec48bf8c8e6daa1a0899a95403579d7728
 EBUILD imake-1.0.8-r1.ebuild 676 BLAKE2B 9b48c875622fcb42052cc9b24e2b83f9ca52ba51013388b49666bf96cdce506417bff63b7254750e2815ce40c3e71f184ccf05b904db508b5eeba76c617abeeb SHA512 97a9f6a495354e3a32ecad68b7b3a6004e847d9152255a495bdcaaff42d18c98e4ea1ab27a3f68a359c177464f2f60184518d27b6413d94a04823c866ac9be7d
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 337 BLAKE2B 33b94ed7ed8c8068a9fa1e2e3a49b51760e5e19003102a8ff5b76a0f449cc77fbf2aacaa8351a39caf2ab538645eca7862a383e7e4413a59efa69dabf8950c32 SHA512 9e59ae6ff8bef63e98e08ce8eff2d35a1ed3b815b60140523f07f85ea62a3bad952deea65a822393628db1605f2a8ac5ba35c3bb277e85a3cb64dba74936f470
diff --git a/x11-misc/imake/metadata.xml b/x11-misc/imake/metadata.xml
index e17a5bccb78b..10f1cbc5c6a0 100644
--- a/x11-misc/imake/metadata.xml
+++ b/x11-misc/imake/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/util/imake</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/lndir/Manifest b/x11-misc/lndir/Manifest
index 781255230f99..e9e19e4de5a0 100644
--- a/x11-misc/lndir/Manifest
+++ b/x11-misc/lndir/Manifest
@@ -1,4 +1,4 @@
 DIST lndir-1.0.3.tar.bz2 114392 BLAKE2B 2e9feb3057f1508a118c4dd6212305e626ba25dd32296d35a553b5c42cb441e494d386d4c9afe15f150a9a8da2b7fac0ae7a128948544c4545ea740d7e7e21a6 SHA512 c9f03c825c627935abe399bf8292bbf69304cb9e9d65a4c860b49e32e2ed4dde25bf658a5ab2116cd215381d0a52f464a8a53469c27adddbd9fa2bfd135a7289
 EBUILD lndir-1.0.3-r2.ebuild 910 BLAKE2B 906a5caa398da8f4292fe88dacd9bb00ddad281bf61574feb42413e583aa9404615c92634ebf74a8d1eb0b0314953593e45a5657249db16be0d23f4c2bcf10a4 SHA512 33ad53cf1cdaef8960bae040863d01eb1f05ca5122f08feeb81059d3f1eb3cabcb611c0fda9117b58936cb21350d6c723d638cb02c54ea4db9bcd610329e7ea8
 EBUILD lndir-9999.ebuild 915 BLAKE2B 5d39545b53476c04a51537deae25f6447bbc7988adfc0b06346dcf767bc699203063eef4030aa2bb6c7a4015fcf69fe4631a6f7bbfc5897998a14c0b71e1086f SHA512 c909db16fba15ac836c801a7d383169fc7c45bf49a8202ac668b8bd3c05fac7565eab7d22a1def4b858d8c3e4c1af9641a728b72613bf9ffad36185fda9e61d2
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 337 BLAKE2B 1385412391438bffb9150bb67b5d5f3c5dd67c820e57ea859ad0dae6e2bb0a61df54469d0b44534b9248010ac7244c350116f7f2f22c484a43d97f269c2708c0 SHA512 b882f390c8dec906f76c2e05f89639d1afa89b3a03475631911d25b46c1df6fbb3df8a35ac341c0845fcfd690668a211f3cbf2e3fd72238c25242bd1347b764c
diff --git a/x11-misc/lndir/metadata.xml b/x11-misc/lndir/metadata.xml
index e17a5bccb78b..c115b9d12d7e 100644
--- a/x11-misc/lndir/metadata.xml
+++ b/x11-misc/lndir/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/util/lndir</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/makedepend/Manifest b/x11-misc/makedepend/Manifest
index cbb168d62967..7304d6cc4fb3 100644
--- a/x11-misc/makedepend/Manifest
+++ b/x11-misc/makedepend/Manifest
@@ -1,3 +1,3 @@
 DIST makedepend-1.0.6.tar.bz2 147616 BLAKE2B 6e9538e435d602ab3bcfb35a5398d6f11a23e4c9fa19bb2e3f651967d3fb1945557af2a5d84fae3e46112aae9ec411894cf8605e4856a46b120b660ff4b95ea4 SHA512 eb0e8ee8ab7515806d7d98a060cdcd392ec38e4225e5e05db26daa6651f185d0b764aab403edeea904d4d23211b1f7db20daeee6eafce8abe65225784ed0aa42
 EBUILD makedepend-1.0.6.ebuild 403 BLAKE2B 74a1bbc478bd21b67b23cd250d6537aff7be94916f1249fe8da5f37afa5a6e66858a0d60ec4b122affa349ee66e13ff78619ee42ce658593d8ea8ca6110b6afb SHA512 6486ab09ad4a850802bbe4f3dc61ebdd92c462098e43d6cb67a2a830d42a11cf23b3f01794a0900450479da210bc96cd18920abbd609cf8e406a06c3c7a3816f
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 342 BLAKE2B a49c408048104b512588271539321c424bfc08a8f54bb82437429662bf85b3f5a09e3a93e0eb1c3a980d571cb08c1fbce58ab5f97f160923ff253c0608206056 SHA512 d2bab9cef77003c68547c0ccf1a454953d0d55edea087963d67f7b6e8ecfc78b811f8f740aa1a7d6374d5a417c66963427b9fe2b1fc1b88d2d1d669eae583d3a
diff --git a/x11-misc/makedepend/metadata.xml b/x11-misc/makedepend/metadata.xml
index e17a5bccb78b..2ddc5a9641c7 100644
--- a/x11-misc/makedepend/metadata.xml
+++ b/x11-misc/makedepend/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/util/makedepend</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/rendercheck/Manifest b/x11-misc/rendercheck/Manifest
index 54495e0f109c..e9d23de3e894 100644
--- a/x11-misc/rendercheck/Manifest
+++ b/x11-misc/rendercheck/Manifest
@@ -1,3 +1,3 @@
 DIST rendercheck-1.5.tar.bz2 143656 BLAKE2B 50de34193aeb4751f967fbc04b54e75909672dc7bbac29a1fbf6ac0e648ac032c877bc215586feb44c89cb7625fc2ac2317d03ff30dcab83625290d85aad6cda SHA512 ffa1abf317f85a8bcef3544e3f810b34567553524ac0a784d2a67470e0811854d7983af8600a04aadecf42871ccb83ad5c0e9e25179142fda2a8f5853a07f616
 EBUILD rendercheck-1.5-r1.ebuild 602 BLAKE2B 44306492c63d8692eda628ab313b40fff6c66716ffbdbba98b681f879a21f2730f80be735b7304d3a25224a55f86c7b81beaa63e04cc69ea2ed815975fd242cc SHA512 1e85f99580ae9c40e9a97311c76b8e567ef40de04d6f2bd1c3ce6c7bfe1d5dee5d8882b2c52c6e66e3f4825a76e8eb7ecf83230600945648c64edd65d480fb9c
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 343 BLAKE2B 5711a00b6084d146b6f8631927d2d3ea9c2764b3d63b6ecfe890d0fb3a25e95573d3237c8113559e0743b0c602af9d8861fdf66c41156908ab405910baa858cf SHA512 e9637d2eb5c421d3ea06f97a45e731d7717c1ee731ee325a138f1fec885addaf86405de1d212f7edbac59ab2e56fd4dc473a4cd4f6062d591f702eb0bdc9ff3f
diff --git a/x11-misc/rendercheck/metadata.xml b/x11-misc/rendercheck/metadata.xml
index e17a5bccb78b..60df35fd321e 100644
--- a/x11-misc/rendercheck/metadata.xml
+++ b/x11-misc/rendercheck/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/test/rendercheck</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest
index cd03a5fbbbc4..5e0b00dd3b6d 100644
--- a/x11-misc/util-macros/Manifest
+++ b/x11-misc/util-macros/Manifest
@@ -1,3 +1,3 @@
 DIST util-macros-1.19.3.tar.bz2 84690 BLAKE2B 95f6bd6cca47111f973eef60915ab0b0a1c6a6b15facb08da138df100c27caacce28866c5ac05aae79116fe3bafa15f454ea6cb9997069f0b5fab7968777d383 SHA512 b9c7398a912c688a782eab5b1e0f6da2df11a430775c5c98fc3269f73a665de6eeb60d300a849e38d345714a6e51f74e9334cb6039767304cca4b93d823a53a2
 EBUILD util-macros-1.19.3.ebuild 710 BLAKE2B 76fe57383e1f5eb715092ac442c54b38dd038037adcb8a2c2c67be1f53c07deb66341352e56c4b670e9e1ce974d0c883ad8b0e1088a4a99801587155fba43e48 SHA512 52484762335a47dae0561001f8745a6cee5205b348eab602af51acfeb57e4ed8458222eea1853a6ea6651191e8b1282759d8649f3f89f988c160f4c0a8a6739f
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 338 BLAKE2B dcc620ca4e58f9d0464530f7915fb50e995dcae1b334b7d0fb3044cbaee39592ba7d86ed925d9ff3e72f1236ef378887deb41e9102a4c3d543f43aebeaa2e105 SHA512 d3be3477539efb8765b1249e87ed842f7c1db9b10799a9569c68d6ec1bd0386ddd192556265a43eb401aeee30f52c8906c05871877814de9d9cf7c9ef5187c36
diff --git a/x11-misc/util-macros/metadata.xml b/x11-misc/util-macros/metadata.xml
index e17a5bccb78b..926332c2bb66 100644
--- a/x11-misc/util-macros/metadata.xml
+++ b/x11-misc/util-macros/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/util/macros</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/xcompmgr/Manifest b/x11-misc/xcompmgr/Manifest
index 42b834a56e07..ee7e1e10bd81 100644
--- a/x11-misc/xcompmgr/Manifest
+++ b/x11-misc/xcompmgr/Manifest
@@ -1,3 +1,3 @@
 DIST xcompmgr-1.1.8.tar.bz2 138806 BLAKE2B 85a7cd04c97c3594ab9acf7888aa0024b60027654dc8fa609c8f2fb801b5cd58105aa50c2afe9c322a02657eeea6e57da3f35720ac63c191a81c62fbf9ee4468 SHA512 ccf29426ffb0797a53653d1ce152de5eee0cec284811fed4b8e634ea0d948180531e4619d96f47e4f9594432c57322624fe0fdaee2c9200efac427fc0904953d
 EBUILD xcompmgr-1.1.8.ebuild 400 BLAKE2B 4ff21b5b16df1d453d1946e2da5c9ba5a613ab2abace82df49d08963a044aee77ad004f1ea532628a30709f15d0acb531024d19d4e7a6b74af0edf285575e4a5 SHA512 a1cc7045810da283b5755bcc7bd1985c6a473dd2b58fa8fcd21801bf677b896194d3ecb08ac1847b10dd2380ab137d96193c0195fc206d2b7f18b5fa026f835f
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 339 BLAKE2B 344267991a80cdfd83e7f2b4dc747eff82e4ec48ca3a90bb38114c290793c5987ec5ebff932b2473fddaf6ae3cbbe20e4323566dc9fc81ab09599aee7b9ff515 SHA512 f808390c96e49240f17fd38ca76503560ea8e80bf3dbb96d9c213c6a5a818513a171572234160053912cddafecff1b45920b023d48a1acc3c541194d3ded340c
diff --git a/x11-misc/xcompmgr/metadata.xml b/x11-misc/xcompmgr/metadata.xml
index e17a5bccb78b..f399c98ad452 100644
--- a/x11-misc/xcompmgr/metadata.xml
+++ b/x11-misc/xcompmgr/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/xcompmgr</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 466f737ef188..ad46c6cc21f3 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -3,4 +3,4 @@ DIST xkeyboard-config-2.37.tar.xz 879744 BLAKE2B 58cc62d48a857b0935bfe7415b4a289
 EBUILD xkeyboard-config-2.36.ebuild 1030 BLAKE2B a0bcd6d3b409bfeeb9b987d57e7edd9dbc131ff7cd78cd2741def7c6a70581ea5fbafca2954d85779ece93731573e00dd259d46332b6b8def5f58d424696a6a5 SHA512 77b303d931dca500ae748271ebef479a793392d85da59c9fd5b565d74ce59a2d798ddf1a16d5ecd0e3c6678604b1b1760f91dd1c82a9f1b4ea5fcc57c4e65945
 EBUILD xkeyboard-config-2.37.ebuild 1038 BLAKE2B 8ddae88b4c7009cb60dec8707cbe239054a49bd713079aaf28b1c10b31f8458b9dea63415dcf197008f3827a203ca9489117d474c9dc7e48061584ae0f2415b7 SHA512 38ff78bfc51cd3f8bfe2a0cfb6262f2f46a12f17868ac5b3cb6fb0cabe44e6b0ac562ea7cb39a208f743f24f5a7da67f43b98fb822020eb6371c0682e2373eaa
 EBUILD xkeyboard-config-9999.ebuild 1038 BLAKE2B 8ddae88b4c7009cb60dec8707cbe239054a49bd713079aaf28b1c10b31f8458b9dea63415dcf197008f3827a203ca9489117d474c9dc7e48061584ae0f2415b7 SHA512 38ff78bfc51cd3f8bfe2a0cfb6262f2f46a12f17868ac5b3cb6fb0cabe44e6b0ac562ea7cb39a208f743f24f5a7da67f43b98fb822020eb6371c0682e2373eaa
-MISC metadata.xml 338 BLAKE2B 0abfc9e29fc629961ecbcc525a18185afd4b08cee4b68d35d1e2f863b898b1881b68e53f26079d1dfacbcd1f6961433dddf316435f421ec9f8b7a2e669c89eab SHA512 d1df4e20e9260892555393fddfeac0c9190c13cbf2a654ece211faab0c180ecdf592939992d5abf20a432a68a1ac0400e9e65241a9d3c7a04093c11b13123d75
+MISC metadata.xml 442 BLAKE2B 3e7e6564b3aa17ef958ae6aed94b6d28156d743ad2782b0c2c08429adff128a7a7ea549e2f5fcece91cdc0f498d341790d0694b193dae16b60a63966bbb581b8 SHA512 0c32c580abc07b3141fa3b9137eba130654e0701b4c9e49be10a801c5c068d67881a74dc0e5d45dc34e8964364e0516bbc5e1b854ae0d7d8ff12bf1ec1ec2986
diff --git a/x11-misc/xkeyboard-config/metadata.xml b/x11-misc/xkeyboard-config/metadata.xml
index 58256883cb22..386b7d63b889 100644
--- a/x11-misc/xkeyboard-config/metadata.xml
+++ b/x11-misc/xkeyboard-config/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-<upstream>
-	<remote-id type="cpe">cpe:/a:xkeyboard_config_project:xkeyboard-config</remote-id>
-</upstream>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:xkeyboard_config_project:xkeyboard-config</remote-id>
+    <remote-id type="freedesktop-gitlab">xkeyboard-config/xkeyboard-config</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/xnee/Manifest b/x11-misc/xnee/Manifest
index 42d30550b882..070abaa0e3c9 100644
--- a/x11-misc/xnee/Manifest
+++ b/x11-misc/xnee/Manifest
@@ -3,4 +3,4 @@ AUX xnee-3.19-libgnomeui-only-for-applets.patch 3491 BLAKE2B e11ab2405e5321b30c1
 AUX xnee-3.19-slibtool.patch 719 BLAKE2B b7373f0c67b7a5b233c3ac9098e91b5c38a0efbb22f4cd04cabd232ab759827fcefd450f0f2400ad138b5b86c4dd024e54cc29739010cf6733bcee4afaf7c139 SHA512 b6d4133355f1d810ba27c82e4709e5c0353c0f098e17255ff10cf6aa42fcd2e80322010778c00663d3aa43508207357ce6e35f048d34ce5250ba2b648db07963
 DIST xnee-3.19.tar.gz 1893109 BLAKE2B 17f416d06dac092c79d4c9838e0f69219e617d695d7c56bee8c84cdf6a5de7e3f02eb1dc9f9f278e78ebf4090893557ede30b2cd5039acafcd743cff11e5602b SHA512 a4a82839a4597b0d7f5b65ad76092f03eb5c665d36298505a320475daacbf66f30b022c04284ce8795360e4481fdfb1d9138f0b8b173b66d23b7f1542d0acbe8
 EBUILD xnee-3.19-r2.ebuild 1582 BLAKE2B c08ef7ed260972a382829cb87353d178736f96cfa24eea2368dfc34900031a2306f65c377c52b225bfd0167e21942d57832cd555ad655f5f7efdafd75f05a722 SHA512 58bcf485a79c8e1b42760f2cd0b0da978817998f08bca8750fda0c3fa0b42a1ec968485b7f95fa83aec8c947e5edcb0b5f0aa4b86bb38ef5fd3d42e141fb6af3
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 244 BLAKE2B 45c25f4d1234d37d1c8b3f049efb80df083da4b2c6fca30407401ddcbed1f0ff9bdcdffe0145ce9798d08fd8ae63b42d6c7b5115935c8ff37d19b948a9468c60 SHA512 04a2cc98e7256bf72da8968838a7512b8ef24709e64da19a7aee3cb7e8f95334e5d257633f1fb32cb15c00226100e465ac21cd71bfb92cd724697d4117441448
diff --git a/x11-misc/xnee/metadata.xml b/x11-misc/xnee/metadata.xml
index 85e4ed814fa2..c255d501aaf1 100644
--- a/x11-misc/xnee/metadata.xml
+++ b/x11-misc/xnee/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="savannah">xnee</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index d65977cbd5c4..3f1b10bc7cb0 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -2,4 +2,4 @@ AUX xorg-cf-files-1.0.7-linux-riscv.patch 1936 BLAKE2B 5c518c78519552a2cdbfb067b
 DIST xorg-cf-files-1.0.6-solaris-prefix.patch.bz2 4364 BLAKE2B 219911bf7fb6907762b70062c43842f116bb0c8ff033569d3a033918b004d89514eda43d1f478c7f0dc1b18adb17f5792990cc8d15cb9770b57e555c0b362f10 SHA512 159d55da274decdac934cded63f33164f5866dc81e853b1a205abdbe56fba4099ab4278e2fb5ff855c0b76784ba2b3fa89e6db2b4fdc9647111698e2c77da4a3
 DIST xorg-cf-files-1.0.7.tar.bz2 345575 BLAKE2B 62ca33673b65cccb4c33c9bc138fac768862d3fd2a8e35d875b4a7af7938df3a2d1437bcb9661c8b84c69a73f60e5ae4a2bf58a003987dcd9293a3a948c97531 SHA512 0dd73b9db9fc16bddc94ef23f11434be6ea2f8e0c7bc5ef3c3bfe6749e13843f88d397eed9f980bbbe9e74147172326bd3c3ccb7adedc9150302756e4b07191e
 EBUILD xorg-cf-files-1.0.7-r1.ebuild 2004 BLAKE2B 1a0f5259763e1ccc38882b12924b8142fe007479f6bc46def7c7394096893740ce23a32a4cbfd891f06eb12c34dcc743a154dae2853b21e632b69be72488b7c6 SHA512 f350610b4819fce39c94ade96e140406fde15467bfd80afaa73dc5fb27f7efd9d767050741a3eda0557f7bbddaa45f39dd6e638e2db875db151de47db389ea74
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 334 BLAKE2B bfeac5f26d8a7b4b290924b5fcc1e4e2c7663978d74891fdfed46698b5940a42a12b7aaa03bb66d990313754aec756c67185005916bd44a802689ebc4b9452e5 SHA512 e2d7b04dda68d9435374c1726a10cf23ce02a400c71156ac84d544b908c69d40a232b0fef925f205292b74b56a84f0fd2d64b4a6e76e718546dd2a169838633a
diff --git a/x11-misc/xorg-cf-files/metadata.xml b/x11-misc/xorg-cf-files/metadata.xml
index e17a5bccb78b..dc313ef53879 100644
--- a/x11-misc/xorg-cf-files/metadata.xml
+++ b/x11-misc/xorg-cf-files/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/util/cf</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/xtermcontrol/Manifest b/x11-misc/xtermcontrol/Manifest
index 0f3601929197..5dafab02ac73 100644
--- a/x11-misc/xtermcontrol/Manifest
+++ b/x11-misc/xtermcontrol/Manifest
@@ -1,3 +1,3 @@
 DIST xtermcontrol-3.8.tar.gz 181399 BLAKE2B b65acd8ecdf6e0293fcd856cd05f7a3c2eaf868f6f7e0ea34829fbfece4e2a17c2085042e6eeb50a20504200db754badde8ffba0305358547d5f65cf18df564c SHA512 9dacddc57c31705d00f52753f906cd83ae4b7ae34ff2e712869becc452535dbce9fb3e0e9aaf689b55edd34889d9e37553e3702c26ccbd136f544016fcfedbf1
 EBUILD xtermcontrol-3.8.ebuild 364 BLAKE2B 2e8e28e4f851bb874b77844cd922755ed5937da5e0c52c8ac84da10e751469f2e3e18804596a57dd1818afdf407fe51de888e34c25ce20fdc78094ab4d779378 SHA512 b19b36dace868b3baa7f80cd5d9638581095c4746dc357ae5523c8cf884778974d402a840bd5f6387c39d7fb0022440d68c4d05191e2a88548931414032b6a7b
-MISC metadata.xml 690 BLAKE2B c5d48f2ab9175ed95b621c0413397c88ff61ce2aa47c9a04320bd146c095ba42dbb13bab20c87da59585883603cfb2c382d84143bced98f6b69952d1eb0ef271 SHA512 c023cef48d6ee59a17a6cffb3a27eaf30c345b86fa24d034c3dc2469ac2c50b0d019eff0199b4fbd3d666d1979e3fcfc580032bb3ad2b0f1a87935fc12ee6359
+MISC metadata.xml 796 BLAKE2B 4a0bb13d7eb6e5bcc8239652898619a318a7337094bb8c72576d86ab39ab9e039ad760f408dcfcb8561a48dd0235a31b5d4b98b91e47c90e08cd76077b263479 SHA512 204122a2092e2c090a7af4314e759d1bfcc3789653f5fd6a98cec6f5a47940309b211d103bb1b0a6f438f58c1e2cb51b455e452eefe5b7f1129db9e8875dd6f7
diff --git a/x11-misc/xtermcontrol/metadata.xml b/x11-misc/xtermcontrol/metadata.xml
index 0f96e73da2a1..cdc230e693c9 100644
--- a/x11-misc/xtermcontrol/metadata.xml
+++ b/x11-misc/xtermcontrol/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-<longdescription>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <longdescription>
 xtermcontrol enables dynamic control of xterm properties.
 It makes it easy to change colors, title, font and geometry of a running xterm,
 as well as to report the current settings of the aforementioned properties.
@@ -13,4 +13,7 @@ Window manipulations de-/iconify, raise/lower, maximize/restore and reset are al
 To complete the feature set; xtermcontrol lets advanced users issue any xterm control
 sequence of their choosing.
 </longdescription>
+  <upstream>
+    <remote-id type="github">JessThrysoee/xtermcontrol</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 4167cb536a4c..2730b9320dd6 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/twm/Manifest b/x11-wm/twm/Manifest
index 0e6614905c38..17ba9c4ac8c5 100644
--- a/x11-wm/twm/Manifest
+++ b/x11-wm/twm/Manifest
@@ -1,3 +1,3 @@
 DIST twm-1.0.12.tar.xz 262624 BLAKE2B 4bca3572dc51af6d1724aefc42f85f04cf0dcbf5514d098628b7950b59a05bd1f1f6fe51aed492777fad5b169a0d97d0c1f0567aca3e7f33c7de0037c7dbe49f SHA512 f3d68df7e06516f6b74f19181efcfd9db2479c8ea0c72c3a6ed0dc1b222405b40d81a2dea17b662955e0c1783e87d0d3eb067c3b6e7c6eed8c0d38d03d362260
 EBUILD twm-1.0.12.ebuild 568 BLAKE2B 5ec681257bda1fb9b0edaac06f41fa11cad6f91baa362c7476fef16b966a2bba00e8eeae327fa38dee288a59aec6d2737f2930c7b360caad17f40aa292756858 SHA512 90e66923fb95dca08ef6a66e8992c0dab75911c423ceffaa714db37af3a931c83c75ec0583125033630f30ea8320c78ea386bcb320a0c6257c02aa57d45de802
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 334 BLAKE2B faf8f80fe08fd298ce3e83bf79d42386a1fcc7c3f39b96fd023421cbfe9b217853d08a429b5bb4dffbd9bf5f18544680722561321c155dee9150520201ce16f6 SHA512 57538809af528b541e14533c9ef5a9b3d09cdb8b90f09e859784a5ea56910b6fee3f2251b6e7201f4c2117b9e3ba0eedd3aa47b418f5f473266a842e7be2848a
diff --git a/x11-wm/twm/metadata.xml b/x11-wm/twm/metadata.xml
index e17a5bccb78b..51374d24beb3 100644
--- a/x11-wm/twm/metadata.xml
+++ b/x11-wm/twm/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/app/twm</remote-id>
+  </upstream>
 </pkgmetadata>
author	V3n3RiX <venerix@koprulu.sector>	2022-10-18 07:56:02 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-10-18 07:56:02 +0100
commit	eb17cef883968037fcc6177549d44a030f08b69c (patch)
tree	50c47314ceabb3efe7efeb72edeecca54b2aa905
parent	5fa0e0c7e62842b1491426c8c6e506f51b6c78e1 (diff)