21 files changed, 103 insertions, 108 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 7c7657992e6f..7f6759eb04af 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 833fe48168d4..9c09c0de5422 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -11,7 +11,7 @@ DIST curl-7.85.0.tar.xz.asc 488 BLAKE2B 8fb84955ee458af7f2cecef4b48c5375db2e8179
 DIST curl-7.86.0.tar.xz 2518356 BLAKE2B a1de7feb229de42bf1deeb5017f97df3b1c10c75fac99bcd0cd21a5dc69b6d8b62520744106d6a113c7a86bd6731dba536a263aabfa22be50d520c43e894acce SHA512 18e03a3c00f22125e07bddb18becbf5acdca22baeb7b29f45ef189a5c56f95b2d51247813f7a9a90f04eb051739e9aa7d3a1c5be397bae75d763a2b918d1b656
 DIST curl-7.86.0.tar.xz.asc 488 BLAKE2B a9abe2f3af801b3a48be7db09cb82b6bb83bd26a9d5caf51c0d5a4a2e6881fb478f1768a6b71efbd9283563e2c7e2badbc5a6d6df265013e14eee2ec7e9be148 SHA512 9e97d5f44b3c856f401fe30ba713e1ca1f74edfc693dc42f1ce8e43f9f6dd4bf6998c579bc9c5d0f749f475a7d67d232e92ab6f89b95141acdb53e149f2312f0
 EBUILD curl-7.84.0.ebuild 8365 BLAKE2B 60758e9c23ab94612542434e0adb6602602128e455aff50c8f9da2cbdb58e27fa396bfd0011a3c461ac519e6faa25712ec80351bad3b45a7faf758aefdcbade6 SHA512 9d53b069da866f1acf875ee8615a11c8e0d5f8a88011f85ab7c8ec6e301de0d693df09d265670f0ae758aac5b923bd02a79ee0beffe5bc1454830ac876d1a652
-EBUILD curl-7.85.0-r2.ebuild 8205 BLAKE2B 7ba5638b3299615bfc94e6d0cbf15a632060756dad1aba138996187aa2ea15c84e386ff72258c2f0b19454c355cdad3611f31ff700937b68b1b7018bd20c0249 SHA512 5351432f73e144a4f99204d7f5e129725bb52a85033b14b1304376db9f77fb083acf103cac6ec1c942193e8cfe8832fe6c1a670a6b3b17b887e4bc6d4b0d6081
+EBUILD curl-7.85.0-r2.ebuild 8204 BLAKE2B ca20481a8128774d80ec96082c8d6c2ec4f469d871952643819e85db0ed1fdbfaf63d5a2b162697e97a9a77e0662da1e7635a3cf831c1ee76efedddbf9650a40 SHA512 ab0805b4f80d6b58b4c8f1faad3a958da334c69e49e1a3c855a3adabd23d0e45fa274ac0c770e05a77334b4d37d36410b30c64abaff35992ce95b93d24106eb1
 EBUILD curl-7.86.0-r1.ebuild 8358 BLAKE2B 3818cbdb66bfceb2be6eee8561f26d63fe4db9ce9efdde451f7d743a7fcc503eb7df8b7ed1829cd0a74d1182e16f6a036a8673e0350aa8d138d32c0a0d219af9 SHA512 98df2ea708001294c9b034259079465e2c1be9c9a3318d2f75d4b4cfeee5d6b0b152a3cb48929d07e30b2b0a2b0080501d6ba22d3e3e8ae97a99fba23ff8a8e4
 EBUILD curl-7.86.0.ebuild 8253 BLAKE2B da0ca8206baead3da48b2a63ba6311933fa5fd8710a54cc4448a221596cdab57b86f1bfd67368c5357e06053de591b21575b7fe655fec6f7569375d569ff639b SHA512 a70e80311df4cd5eee6eaa0960390df71982c3d5465e6392c7e1068abbe97aacef1dddb1a3b1572063f0c7daf383a3bf31e8ea8f96b2c3291829a1bd9944dd3b
 MISC metadata.xml 2103 BLAKE2B beb97305069a47f8eee68278dca5c0f10467d374c9fdab2ea27808b79a68cd921e2ab60bbb2455cbce2cdcada72e8c68290b40ec87ba31dad6ea580820f5c800 SHA512 27c15624622b074926307369bb41ad6cf532300154a70573618a072418358f5fc543eb56873e9836703073e8b42134a0387f3077e741377827a685cbf69faaab
diff --git a/net-misc/curl/curl-7.85.0-r2.ebuild b/net-misc/curl/curl-7.85.0-r2.ebuild
index e3072f28ea27..b8f31a3a6d3f 100644
--- a/net-misc/curl/curl-7.85.0-r2.ebuild
+++ b/net-misc/curl/curl-7.85.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz
 
 LICENSE="curl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp zstd"
 IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl"
 IUSE+=" nghttp3 quiche"
diff --git a/net-misc/dleyna-server/Manifest b/net-misc/dleyna-server/Manifest
index 3158463f6d6d..807e113aa858 100644
--- a/net-misc/dleyna-server/Manifest
+++ b/net-misc/dleyna-server/Manifest
@@ -1,3 +1,3 @@
 DIST dleyna-server-0.7.2.tar.gz 105415 BLAKE2B 3a38b97f45c04be1e48f87a1653d5ca4776eaa4763d8ce8639f77f5f0512c2331ccbbfe09a5493152c35655989652de071ba9658735af8ab137d77b0b28ec054 SHA512 c6a4dc66c2ae745a3c5d7eb70d7fc97adecc73b80ad5fb4ada710c0aa6f8bd5d3a1abb14acfe0a77d3e148e2159868acf1250599c43379c3d1c1337581de1536
 EBUILD dleyna-server-0.7.2.ebuild 684 BLAKE2B f3114236d54f0f28d53ea2b6d9063f74fc00d135f56e8346e9ce1043a061e3b361ac6d3ba7a443077fd21b5d97c4067cdc91373e12a780a92cbc199b1abe28f7 SHA512 89b3e2a19ab4b5087b61e86e7701e7a4811b0fdfaf8415ab9b7086a6f4986d405602d7f7114c2b67074760ac82f957942f225890dad0bb09fb3e95364f4e270a
-MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
+MISC metadata.xml 348 BLAKE2B 0e1b03a72e4199c7abe57658d4c0068ea4b74dfe4f115f1d5754fa9e004fd48c95ca22dd8d73737d035a20a4ae32e0509367e647e38102df431dbe994ff8de5a SHA512 6f4837aeb7bcddf6653f4fc280035f9b6b766f0ab370f2a7e3945b0d5f7f09118a35b154a0010acb17258ad8190c18d2223739da1c5c980abffbdb81318d1832
diff --git a/net-misc/dleyna-server/metadata.xml b/net-misc/dleyna-server/metadata.xml
index f453528b934f..f5c82f790bf7 100644
--- a/net-misc/dleyna-server/metadata.xml
+++ b/net-misc/dleyna-server/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">phako/dleyna-server</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/gnome-connections/Manifest b/net-misc/gnome-connections/Manifest
index f1508a16ae3c..6faa94b877ad 100644
--- a/net-misc/gnome-connections/Manifest
+++ b/net-misc/gnome-connections/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-connections-43.0.tar.xz 3992760 BLAKE2B 16ff3cc5d587a6169fdf749ae6e743cd0fbec2b6e127c684ec42ba17da6e73d1d66ef4ef621d01452d21230dc8c99bc27678ec0364b9522b5685cec4b9c69445 SHA512 cd9d53f2e4b8e679992c5a65aa89554d1b840174ecf0f75f103265ebc2f07f63f210da4ef7e3c36af8b5fe761ec9ae4711eb92f5f40ae00225fcd9f2f8a9157b
 EBUILD gnome-connections-43.0.ebuild 1153 BLAKE2B a65807ebe4e22aed298cbb462ec364653a7f96e8972844c60de02a0253036adb3bee094504f17c538e285ff8c00e30566b730095f50155ca5351fbe706cc4bc4 SHA512 1f6aceb83dd2f57252f81599115fcf810905ce511834472b485e9af6c8de12978baa6de1494a91bbd613fab4fdbf49f55f9275d7b76d3bfe6316f9629bdef8ab
-MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
+MISC metadata.xml 352 BLAKE2B e843ede0d59f837f8339c438264676285772ba6190b63048b122ede90592706decb25c49ac2023dd3fd386a1919b17175bb0e894ec094ed3c730e7ec41fd578f SHA512 154d829657ed75e1f906809a3ea5811094c4e47aaac68023c43c437284093419184663e6028d35deeaa882dbe0a6a333dc50f796482e21e493ea67ba4d8f3d02
diff --git a/net-misc/gnome-connections/metadata.xml b/net-misc/gnome-connections/metadata.xml
index f453528b934f..ca87166729c7 100644
--- a/net-misc/gnome-connections/metadata.xml
+++ b/net-misc/gnome-connections/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/connections</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/gnome-online-miners/Manifest b/net-misc/gnome-online-miners/Manifest
index 163fb4c50ccf..637533dfc3c8 100644
--- a/net-misc/gnome-online-miners/Manifest
+++ b/net-misc/gnome-online-miners/Manifest
@@ -1,4 +1,4 @@
 DIST gnome-online-miners-3.34.0-tracker3.patch 61820 BLAKE2B 0f9f6f09ffb90a5087d227b9eee6f8016cd83cf2459d10a727448dd2a7263e5e1d0ad8b58932e3e7cb86dd32aafc3ead700f7db46d7f9a099ed000acc472aa2d SHA512 11d29fcb91175e6df20dcfdab8ae758a45d2ab03430c1b09284739ad5071b3c3a6297626dd4fa0584021c26d306dced4c0deb109e7488bf48627ee3bc32d443d
 DIST gnome-online-miners-3.34.0.tar.xz 272324 BLAKE2B 3718b649cd08a03a7e974607975992f4779926c08cbdeb724c314aa431f161599f6d74c2114dc1bd6fa0896781bf07df024f4a53a3f2fadaf1e9d849f8054e5a SHA512 bfcdd7f11607663eda491314c34a9b50f2885f6fb39e7c9e68a77927bbcc326979fb8900ab5dfac1494ac575dbf0e3f3b7459ec3f38cb1eb8961158e3fe44464
 EBUILD gnome-online-miners-3.34.0-r2.ebuild 1237 BLAKE2B 2f61c893bcd1ce0c94c561fc9fc74740a6b23c51a7286243202536ed9cd91c214e692a4212cc586ad24c281a394c81f1cc3892cb67fdd0cc5754c1efc9b0d953 SHA512 b01ace998509f7befbb2c196ceeaa52115c4d868989e1589f3192cf19ae5cdd5c6d3eb064b0019f61eeb422e82a8d775781cd50dbefa810eb9e3d2c0c4af2bc9
-MISC metadata.xml 313 BLAKE2B 14b8dc0d350cff3ce60111be31eaab9f7097a90bf3140bbd79e64fd91319819bcf63d50ac77ee4b5d65ec9fbc4df4b5fd73d2de2f242e02e6140aae39e3cf732 SHA512 2f69d70da13321905317bc066afa7c041d154eb4dbc3b86c912a971ad36c07a9d4d56b1bfc18651bcd84058cfeab254269670bdffe04366220132dba3d6ae0e9
+MISC metadata.xml 432 BLAKE2B e04cb45c54124043963e814bc668e6d77b3c8a3063a1b2678bfd9477860fa97a1189ffc3314215ffe06cb36c7724007481758554a02532a3bd5a702147b86517 SHA512 35357dc1e0c13d7c20a7ec4d69434f1e9a019ee92a4020b3dd5f9e77cd78e839c3df8333f244367d6f2ef18e7b2d6bda3e9c2a49df65f8e71f0c07d1b6b888c5
diff --git a/net-misc/gnome-online-miners/metadata.xml b/net-misc/gnome-online-miners/metadata.xml
index 70b5901d6ce5..f3596b32d252 100644
--- a/net-misc/gnome-online-miners/metadata.xml
+++ b/net-misc/gnome-online-miners/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
-	<flag name="flickr">Enable Flickr support</flag>
-</use>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="flickr">Enable Flickr support</flag>
+  </use>
+  <upstream>
+    <remote-id type="gnome-gitlab">Archive/gnome-online-miners</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/gnome-remote-desktop/Manifest b/net-misc/gnome-remote-desktop/Manifest
index 1c789cf39bda..cb03de8033aa 100644
--- a/net-misc/gnome-remote-desktop/Manifest
+++ b/net-misc/gnome-remote-desktop/Manifest
@@ -2,4 +2,4 @@ DIST gnome-remote-desktop-43.0.tar.xz 195212 BLAKE2B ccfb43075ce6e36de4bcf3f9226
 DIST gnome-remote-desktop-43.1.tar.xz 195740 BLAKE2B b73f0e72f72c45169deb1018dd19cbac779effc2bafc53b8db21cb72c48f5871ef64e3a085509aa859550b4fb54713506e2b6410e211eba7ee8850649af7c39f SHA512 5e0164092da0fdb4877c8a1b40f1df609315390468522efaaad8f30f5c8e29111b021c1a7f3b8ce25627dfbe7937a4876d6673a816d81fdc191d30d4553a0596
 EBUILD gnome-remote-desktop-43.0.ebuild 1362 BLAKE2B 8e0b92def7905f3e36e56664eb7c192de4acfaa8da21af45ad3dec7b563c52715baddae6cb68a0ce2405a484b347e286d7f7f4b8ec9bbc3bebd2c3af4d9008a5 SHA512 6d21560f9d01cbfef4d36c3d361c2803df0812b5a1c0c522b02dd4085e3b642270a9c4827bd57389e1cb9fa0fb8b9f17015a882996184a110b7eff0a9e3b310f
 EBUILD gnome-remote-desktop-43.1.ebuild 1368 BLAKE2B b579aab040bebf357e960ba6f65813026023a63dc5023f4079dc5b7b3fe38d71fe7c1dd549ea541d90bb5f23c017e89900c56987eefbaf96e5868e152efefd33 SHA512 68ec11a3b414a8847900f9900af4beeacd9a6e45b0958afda0e4fa5351a539ba2caede34e0a6bb9649d56d4a113bd1e20e7fc55cabf8da2e0240d65d70846651
-MISC metadata.xml 377 BLAKE2B c80586f2728c8cb251627cbccf05a537496b97f46557b7c9030ed133332e9cef58ca45bc3c892f9a372b3e6014a9cbf76ec09fa7a9a5fed75dc47d145544b066 SHA512 8a3bb117450d2922322c1ea09c3388758909041eceda4e97738b5c67e27be037447cc2d33b7fecf37f0faec51d617d160977bf688f651e860cb7f5ce30c11083
+MISC metadata.xml 488 BLAKE2B 14e2e29779ea62269e8c473a877b3da316a60b6b970ac784e6cd853610ac81a981ed9dd4104a99d5e7c48f4146f74efdbab9f71d81c405baf24f3cb3e9a1702c SHA512 7d9b8b371cc0f609e77baa3a3eff701a5a68922e5405995d5c3f70bc92af0308ca409bc05e28480ab8f008b879e417cd679bb0ec5494f17d3abb8a7b52248a06
diff --git a/net-misc/gnome-remote-desktop/metadata.xml b/net-misc/gnome-remote-desktop/metadata.xml
index aa52c31abcc2..a1a029905dfd 100644
--- a/net-misc/gnome-remote-desktop/metadata.xml
+++ b/net-misc/gnome-remote-desktop/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<use>
-		<flag name="aac">Use <pkg>media-libs/fdk-aac</pkg> for audio output redirection of the RDP backend</flag>
-	</use>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="aac">Use <pkg>media-libs/fdk-aac</pkg> for audio output redirection of the RDP backend</flag>
+  </use>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/gnome-remote-desktop</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/gupnp-tools/Manifest b/net-misc/gupnp-tools/Manifest
index 0534ef92de8d..4a08b46b0ee5 100644
--- a/net-misc/gupnp-tools/Manifest
+++ b/net-misc/gupnp-tools/Manifest
@@ -2,4 +2,4 @@ DIST gupnp-tools-0.10.3.tar.xz 180596 BLAKE2B 26140962cc24cda867465a4f94d251a268
 DIST gupnp-tools-0.12.0.tar.xz 181736 BLAKE2B aa33ab97ece72f9baebda4db20a0f72d995017ff45abf0e2da0ae4644d6ede6309b7aa2172c75607a4caf4fbcc65b5e88d1766a8819af96ffe054c83ef87ec77 SHA512 e9c4882f910adee6021433904b78bad89abf4a0d978e24b61cc1c07736e27f0d7e79592e18bbbae8fa13a65f86e72cb8bd7783d74140c6f5d3c65fea4f57da30
 EBUILD gupnp-tools-0.10.3.ebuild 695 BLAKE2B 8029775879538d43e563b6383f894f692e99ac01f7879a6e959cb697e2c3211da46810fa728219a4f8a2eaa6f9a156da1f7ddc156bd6e228f1aa0284c54274c0 SHA512 7725ac9160633f59ca27b08cc062882088734f75e7176a769e102b3ba10697c952991a82d798217a7230c6252cf43575210d077e5e51377ffd271934a7425eef
 EBUILD gupnp-tools-0.12.0.ebuild 696 BLAKE2B 5b340a2361fed527efeadf019b344291e62a9e90fb48ff40a13b7cdd0e05a9a0ead436d0195568473db0b616a1d1a13de88a0c3ea897379b191aa17fbf8992fa SHA512 adde1a63e80cebe5f3dcdd2bc73bd459c37296d7284042a27a858a058b8d3f1cbe22971d51c9e0dd1df3cf2d8b3cea513aaa1bd28ccad860e6231fae91742a0a
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 352 BLAKE2B 0847258ecdc48f7f07000a47067e9437fbd7082a8ffff8d8cd3bc7a3ade5a52d9f082dec3cf04ece3835be9904c294b9d523e595e6d7fa9477796dbf1230f234 SHA512 65fda0d85f721fbfcb890f15b8f12ccdc7931017585675716bc0020f81ab37249b5f890b334318c9dc1c5fc0f9a4ba69171312899e3f4714ecce0602cc7f095a
diff --git a/net-misc/gupnp-tools/metadata.xml b/net-misc/gupnp-tools/metadata.xml
index 7b343b06be8a..28d3dca7e75b 100644
--- a/net-misc/gupnp-tools/metadata.xml
+++ b/net-misc/gupnp-tools/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/gupnp-tools</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest
index 6a3415a546be..3704928af9c1 100644
--- a/net-misc/mobile-broadband-provider-info/Manifest
+++ b/net-misc/mobile-broadband-provider-info/Manifest
@@ -1,3 +1,3 @@
 DIST mobile-broadband-provider-info-20220725.tar.xz 85184 BLAKE2B 1b36b2cf8f0a66755a7cd10090531efd2c5094e5d611247af748f0923fd76b5e1ce20c31ce16be2b0bad5bd64e44e72eeeec7123435366186e31c7da9e66343a SHA512 335b3a5598144f4b11eab2d924b4671055c414664c783507fb8aa0ee20769dca640d03e559e7f55741b38652590812e777b663264d6dcafd24407cfaeb5bc24d
 EBUILD mobile-broadband-provider-info-20220725.ebuild 507 BLAKE2B 8db65fc32a0ac10bf81b6b56c2af9363af57ddefc158c90a54c35be6b410d2851a39231c5f2e0f0382338905b2e54983005d67a6bd565dc6a53ffaed9201cb7c SHA512 f0af591423af0a89248c6aa972e2043067abb407710180f3f7b89cdd242d0a06b21b2042d0d17770b633d062acb8aab494ce15f1ef7b36999500836fef45ac49
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 371 BLAKE2B 0bebc02fecc2a73323bb775ef52ccad19b856e70beb7202a588d128d3abc8fd77fa0937cc3ae897596c29dca0d3ce0e0d2ef88b3528ac90a07db4de1e0b97a46 SHA512 3b3eb4caef7124cb52d7a42d4abffcafc7b0f480546a57fd568b7ac98e22b217105f0699c4ab0c9ee3d004e6e392ad1da4213bfb61f0d04440058c717b75917f
diff --git a/net-misc/mobile-broadband-provider-info/metadata.xml b/net-misc/mobile-broadband-provider-info/metadata.xml
index 7b343b06be8a..76b28729d844 100644
--- a/net-misc/mobile-broadband-provider-info/metadata.xml
+++ b/net-misc/mobile-broadband-provider-info/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/mobile-broadband-provider-info</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 47ff5771d47b..bd9a704c9463 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -4,4 +4,4 @@ DIST ModemManager-1.18.10.tar.xz 2611480 BLAKE2B ca6c690f2365917b5c879c1bd80ec27
 DIST ModemManager-1.18.12.tar.xz 2589020 BLAKE2B e82db0a62d29753e22b9f9c09e60d8f5dca070cbac27b6df54ff8cd166cbb837dca3b162ac06afea0e75abdc8d407253a28cee58dacd739d4b485fa9f5485acb SHA512 7ee3b091ca2350a1d52f1ff0c0657c9f279594ffbff5ea57be59ca024331cafbac34901ca9ed4ef2b71e8c51b594526f921d3aeee6e8748cd0532a16218c5d6c
 EBUILD modemmanager-1.18.10-r1.ebuild 4126 BLAKE2B dd2403ed41d414cdb23b4797a60b916e585acadaddda8e2cf9ca77f041d87852d65dbd21764465ef8a454d93d732528a181536c4fce1aa72917abd2b92c3e536 SHA512 01e8fb11dd7bbc598cea707c50ff7c947204b60322a8fe39d618f3abba4947ebb4f7b691efe0f3010288c380c94dd39f889cad2ed03d0d0f86839b1596cfb5e1
 EBUILD modemmanager-1.18.12.ebuild 4132 BLAKE2B 996b7614698580027fa98c1edb4d86784caa33853fcd99b9194b586b988eb3dc4a680b97e3aba69b7ff3caea3711731e076521087544ab669eee5e22fd874f6c SHA512 65c4aa830049d752e3d3a4cb0a2b772fc9bdbe90972361fe3a964417da90742f99563d669d2c26eb47e213e0f596c697d8214464e70f0ee2a34d61669bb949aa
-MISC metadata.xml 522 BLAKE2B 9a2c3612abbf39e1518eac9eb5d1be220a11c81c0612c876779caced0a00c282a5a571cf19a1ab174accd2c22c071e69b16336cc0e93e45c1b3903a4013ac242 SHA512 2539c9975be03c6b365bdf32353529469dc3fece4f4df7d31784d8e5299126d813bb6a310c4fefba5e81d2db5aa073446ef4697c059a2eac7efe1502a6671a4f
+MISC metadata.xml 644 BLAKE2B 7805fa5c0d2371193d85e2129cf717315654a8c965f3cbef44985a56ada40e2f15752fd1818c7d03cc20ae6c34e3fd0d998c5e2637205e43e662f9352351e5fe SHA512 8c93bfeb1ac6b1c73039d89355f061fcf04491195149efe06f3655a663c03fbd5be3465509d80d8270642565abba9c1fa408276210a05a3093d95c93ed1352b6
diff --git a/net-misc/modemmanager/metadata.xml b/net-misc/modemmanager/metadata.xml
index 97718f935bb7..9d7421218e6c 100644
--- a/net-misc/modemmanager/metadata.xml
+++ b/net-misc/modemmanager/metadata.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<use>
-		<flag name="mbim">Enable MBIM modem protocol</flag>
-		<flag name="qmi">Enable support for the QMI modem protocol used by
-			devices with Qualcomm chipsets</flag>
-		<flag name="qrtr">Enable support for the QMI over IPC Router bus (QRTR) protocol</flag>
-	</use>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="mbim">Enable MBIM modem protocol</flag>
+    <flag name="qmi">Enable support for the QMI modem protocol used by devices with Qualcomm chipsets</flag>
+    <flag name="qrtr">Enable support for the QMI over IPC Router bus (QRTR) protocol</flag>
+  </use>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">mobile-broadband/ModemManager</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 64b9a3d23654..309956d70c56 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -8,4 +8,4 @@ DIST NetworkManager-1.40.2.tar.xz 6585760 BLAKE2B 12bd809e0d5140ecb1f52f61680fbd
 EBUILD networkmanager-1.38.4.ebuild 12537 BLAKE2B 8af417bbd3f64c646ed02434062d19a589cd689af48f1859a27e7779bf015ee53379a7282c0169d9e92b8e7ac6cde236f124ec458933d28161651bec161aeb77 SHA512 916840e7a60a301e1c15f191254fcd5c981707d6baffc4aef85956d93dd1268a1e009384c0581c96548a9aaede52bf22d3b71e58e86e6ae9fc0a6d25e9bda77b
 EBUILD networkmanager-1.40.0.ebuild 12497 BLAKE2B 244a43b0f6fc4aadf989fef6174f150ccfc59ee4c6566895537183269b263054cb36d9aeb15b1e96f15e13a812792cd62f2d585dba792658c212ab1c54db2750 SHA512 3de86bd3b2d9469c35290cda0a6170cfd01d9a4fbb933da7653259f02bf67700e40375ac32cd9cf3eed6b7d03f5e1a6c1148a71edd8ec82ce56e54b54c97d63a
 EBUILD networkmanager-1.40.2.ebuild 12497 BLAKE2B 244a43b0f6fc4aadf989fef6174f150ccfc59ee4c6566895537183269b263054cb36d9aeb15b1e96f15e13a812792cd62f2d585dba792658c212ab1c54db2750 SHA512 3de86bd3b2d9469c35290cda0a6170cfd01d9a4fbb933da7653259f02bf67700e40375ac32cd9cf3eed6b7d03f5e1a6c1148a71edd8ec82ce56e54b54c97d63a
-MISC metadata.xml 2377 BLAKE2B e665210ad074426373296d0164654cd793c0fad1eb71ba68ede73ecbcbb17c1636722a7676bc5ccde93d0a8b7c75c170a3cc0bfe1f06305984dc630e8c0e0b2b SHA512 e43a86d9af9ff0dbc2d701b59f29ffca279f9a3adaf3fd3473f170827c15e77a454e6f5df554028c300e13dd536fdee0528acab62eb706f7061a3600b2e9dad3
+MISC metadata.xml 2430 BLAKE2B 564983bc42e2b87533286f90ad5e3988356169cf65436ec853a63183ae1086e5672afd7552c9a06fd17018158bab09acaedf015998eb4d10a9c11db1897b49a4 SHA512 39ae015637e571dc8268c750a6cf56c185a0716113670f58e4d33848c7d6c33b8decba6201a0600ab689d2bcc7d44a123003bcfc8696fd8b46eea376b498d6e2
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
index b13ea61c9d14..cc9b634fb71d 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/metadata.xml
@@ -1,61 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<use>
-		<flag name="concheck">Enable connectivity checking support</flag>
-		<flag name="connection-sharing">
-			Support connection sharing (uses <pkg>net-dns/dnsmasq</pkg>)
-		</flag>
-		<flag name="dhclient">
-			Use dhclient from <pkg>net-misc/dhcp</pkg> for getting an IP via DHCP
-		</flag>
-		<flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting an IP</flag>
-		<flag name="elogind">
-			Use <pkg>sys-auth/elogind</pkg> for session tracking
-		</flag>
-		<flag name="iptables">
-			Use <pkg>net-firewall/iptables</pkg> for connection sharing
-		</flag>
-		<flag name="iwd">
-			Use <pkg>net-wireless/iwd</pkg> instead of
-			<pkg>net-wireless/wpa_supplicant</pkg> for wifi support by default
-		</flag>
-		<flag name="psl">
-			Use public suffix list via <pkg>net-libs/libpsl</pkg>
-		</flag>
-		<flag name="lto">Build using Link Time Optimizations (LTO)</flag>
-		<flag name="modemmanager">
-			Enable support for mobile broadband devices using
-			<pkg>net-misc/modemmanager</pkg>
-		</flag>
-		<flag name="nftables">
-			Use <pkg>net-firewall/nftables</pkg> for connection sharing
-		</flag>
-		<flag name="nss">Use <pkg>dev-libs/nss</pkg> for cryptography</flag>
-		<flag name="ofono">Use <pkg>net-misc/ofono</pkg> for telephony support.</flag>
-		<flag name="ovs">Enable OpenVSwitch support</flag>
-		<flag name="ppp">
-			Enable support for mobile broadband and PPPoE connections using
-			<pkg>net-dialup/ppp</pkg>
-		</flag>
-		<flag name="resolvconf">
-			Use <pkg>net-dns/openresolv</pkg> for managing DNS information in
-			/etc/resolv.conf. Generally, a symlink to /run/NetworkManager/resolv.conf
-			is simpler. On systems running systemd-resolved, disable this flag and
-			create a symlink to /run/systemd/resolve/stub-resolv.conf.
-		</flag>
-		<flag name="teamd">Enable Teamd control support</flag>
-		<flag name="tools">
-			Build cli tools such as nmcli, nmtui and nm_cloud_setup
-		</flag>
-		<flag name="wifi">Enable support for wifi and 802.1x security</flag>
-		<flag name="wext">
-			Enable support for the deprecated Wext (Wireless Extensions) API; needed
-			for some older drivers (e.g. ipw2200, ndiswrapper)
-		</flag>
-	</use>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="concheck">Enable connectivity checking support</flag>
+    <flag name="connection-sharing">Support connection sharing (uses <pkg>net-dns/dnsmasq</pkg>)</flag>
+    <flag name="dhclient">Use dhclient from <pkg>net-misc/dhcp</pkg> for getting an IP via DHCP</flag>
+    <flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting an IP</flag>
+    <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag>
+    <flag name="iptables">Use <pkg>net-firewall/iptables</pkg> for connection sharing</flag>
+    <flag name="iwd">Use <pkg>net-wireless/iwd</pkg> instead of <pkg>net-wireless/wpa_supplicant</pkg> for wifi support by default</flag>
+    <flag name="psl">Use public suffix list via <pkg>net-libs/libpsl</pkg></flag>
+    <flag name="lto">Build using Link Time Optimizations (LTO)</flag>
+    <flag name="modemmanager">Enable support for mobile broadband devices using <pkg>net-misc/modemmanager</pkg></flag>
+    <flag name="nftables">Use <pkg>net-firewall/nftables</pkg> for connection sharing</flag>
+    <flag name="nss">Use <pkg>dev-libs/nss</pkg> for cryptography</flag>
+    <flag name="ofono">Use <pkg>net-misc/ofono</pkg> for telephony support.</flag>
+    <flag name="ovs">Enable OpenVSwitch support</flag>
+    <flag name="ppp">Enable support for mobile broadband and PPPoE connections using <pkg>net-dialup/ppp</pkg></flag>
+    <flag name="resolvconf">Use <pkg>net-dns/openresolv</pkg> for managing DNS information in /etc/resolv.conf. Generally, a symlink to /run/NetworkManager/resolv.conf is simpler. On systems running systemd-resolved, disable this flag and create a symlink to /run/systemd/resolve/stub-resolv.conf.</flag>
+    <flag name="teamd">Enable Teamd control support</flag>
+    <flag name="tools">Build cli tools such as nmcli, nmtui and nm_cloud_setup</flag>
+    <flag name="wifi">Enable support for wifi and 802.1x security</flag>
+    <flag name="wext">Enable support for the deprecated Wext (Wireless Extensions) API; needed for some older drivers (e.g. ipw2200, ndiswrapper)</flag>
+  </use>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">NetworkManager/NetworkManager</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest
index 3f274211cc1c..697f1a0bc5bb 100644
--- a/net-misc/rygel/Manifest
+++ b/net-misc/rygel/Manifest
@@ -2,4 +2,4 @@ DIST rygel-0.40.4.tar.xz 1696492 BLAKE2B 9e22390b379b2e09abb2685b0c2a00bc03ae366
 DIST rygel-0.42.0.tar.xz 1699676 BLAKE2B d3a324baba0b649c0b215e897a23cc963575c2c8b71f7f993fa4a544435a38c921115a5cc3c5ad1db45769d27db6d901a196210cbff540684b55b19aeb53aab1 SHA512 78dd253ad5f4e3dd5ac8db38f5f160a84878c868c445795e676b20e1cba2dd08e6b757f6473d6db5175dca4e9de4d7bb5143acc467cda2a5691e18c654c17dfa
 EBUILD rygel-0.40.4.ebuild 2194 BLAKE2B 858fc3d94a4c726820bfdbdc89f5275788938b10ec289d96dc80effeac1dd5df75b90ecbd921659325b71640e2af848dff3c8cadd1aa77242a55405cf7333b84 SHA512 cd6497f442f1b41a8a17790557c00269f2112ff64bb075bf3404cce6a60e029371936f879a87723c91a1b97a89edd25b845509ab87f6d508a680545b1ae8e6af
 EBUILD rygel-0.42.0.ebuild 2261 BLAKE2B 6cd63841d85cc527521c8ee4f6535cb9b83ac6033904afa89a0dd2e19e43ad9d970b512cf218642cf3bc00eab1f517878b933054b59a4ea4cb29b3909c4e815c SHA512 044d55504e46719b7861d22e8e958ff4a60f4224d2f436d0b5eeba85577b7e9b832294fc11bc1a4affa45930f26f549fb319d0cb84e4004913b666255c887f4d
-MISC metadata.xml 432 BLAKE2B efa83d6c3c964e076185ee541b7b25c59a7f46dd53f96900cc9a9b617133b476ec21747f6b70392fb3903075032774252b1580d90e512c0123d2dfc779d7591e SHA512 b8cf12e9798b778551cdf099ab7a87aa606e6c68697db1b1eb37e673cd2368781c80c9cbc41c5b492997ad4b39eed9f68075f7c4be8ec21ad021470757b72d1b
+MISC metadata.xml 518 BLAKE2B 789b1e692571138dfd93f177e22ae1f86ed20a96652c31d5012b4e691b101408eb6162e401be9661f23b8239a304e854044485a8de6f2e1db7b8ecd1e801dabc SHA512 7f956f2a41c6de314dbfc2f3b17de68857474fcbfb4fc43f3019cc713d899ebbb17fcddc613bae43e441242f6e730ddb188cf09a40bd22080e665e6f32212a63
diff --git a/net-misc/rygel/metadata.xml b/net-misc/rygel/metadata.xml
index 3d82248dda85..3afa17b2d8a8 100644
--- a/net-misc/rygel/metadata.xml
+++ b/net-misc/rygel/metadata.xml
@@ -9,4 +9,7 @@
     <flag name="tracker">Install dependencies for the tracker plugin</flag>
     <flag name="transcode">Install dependencies for transcoding support</flag>
   </use>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/rygel</remote-id>
+  </upstream>
 </pkgmetadata>