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 /x11-apps
parent: 5fa0e0c7e62842b1491426c8c6e506f51b6c78e1 (diff)
165 files changed, 673 insertions, 440 deletions
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>
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 /x11-apps
parent	5fa0e0c7e62842b1491426c8c6e506f51b6c78e1 (diff)