23 files changed, 77 insertions, 51 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 6cdb6e5f091a..501b64ae7a5c 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/clhpp/Manifest b/dev-libs/clhpp/Manifest
index 266f31ea5836..bbb306d84c5e 100644
--- a/dev-libs/clhpp/Manifest
+++ b/dev-libs/clhpp/Manifest
@@ -2,4 +2,4 @@ DIST clhpp-2.0.15.tar.gz 99826 BLAKE2B de5f6cab05d21199ffea37bbbcc5d312a4b812b60
 DIST clhpp-2.0.19.tar.gz 106871 BLAKE2B e8c94f3e242d272a7eedbb13f7ead89cacaffdeca8b837fab29eb023e60efc7eb730b3966702474168071e7c884801fa24f0eedad95f6ea866f27dddb3af4a4e SHA512 f2d37eaee7a46b505844ddf45ae94f5f94241dea0b8f03f6bf4ba7524d7556c9ed19cc2f702cdd9becc469816ffa3d8371ae3561aebff5486cae9b623a10f58b
 EBUILD clhpp-2.0.15.ebuild 582 BLAKE2B 136db303f1a442c414151dda935ef39401f9e25608336af16bf94600777d4b8da2de0686070b7f2cd04b7ff0932e8ab51f1c36d57b601f90a3de8fdfd9b75d44 SHA512 c3d4bfdceb1250ff9ad1b5b7d1539cbc584ccb461de72178dc3eb721c0cd0d807a16f3907b697b5109f7b681eb707081725de72b69637e343a3e63b8bca3bb8a
 EBUILD clhpp-2.0.19.ebuild 1200 BLAKE2B 5e7a50dc98a9c51da8edbeddc10d4cd613fff1634fed87f1c7e364fbcbd554de371c7b240bbf33f1722417e59d6579a5066c5e5c48e511c4fc6d293dbc2c9819 SHA512 23ce6fc6392ee19f12ceb278ff7b3c092c2da94b4ad6ceaecae16e0592e9614230e5225d7b28838eaf22a9d53d4c195a8fdb222bf4d1f1a70da516ac0e8881c2
-MISC metadata.xml 333 BLAKE2B 3cc0969695eaaef765ef2fcf3b7a529324f4e73e80e51c120a18f21f1a3fa4ad41329d61e89a1eea6a1e175f23441d615a341034edc7d924262e1b0b1ccde29d SHA512 8a62b0bd67dcc8bc40ed01b590863e748e56abf19f4a4ea2b44c0747cb017c111246f6e5b30255304ee57dd9446e61e9a193138acdc776d4d615223dc2ccfc0d
+MISC metadata.xml 447 BLAKE2B d5c2cc2fc3bc07611a83a0cd9457b0c84f6639eac864fec190df2c5d078ce719fca55b3af1925867bf6f114858f9e91ab750a041f4a28c729acbc58f743e271f SHA512 fa79dbc0965cfdb94d995476a09dd414743cae0c90bb1038b4126e476133e81cee54130a0a6a10c53a83142f990b38a409834b90688b410dfa5339f90d3072cb
diff --git a/dev-libs/clhpp/metadata.xml b/dev-libs/clhpp/metadata.xml
index db7a35b58748..cab832e30350 100644
--- a/dev-libs/clhpp/metadata.xml
+++ b/dev-libs/clhpp/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-<maintainer type="person">
-	<email>marecki@gentoo.org</email>
-	<name>Marek Szuba</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>marecki@gentoo.org</email>
+    <name>Marek Szuba</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">KhronosGroup/OpenCL-CLHPP</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index 9cd52d0a5195..70da5490db1f 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -1,4 +1,4 @@
 AUX libcdio-2.1.0-ncurses_pkgconfig.patch 923 BLAKE2B 848a76241ca173c452cf7b04142c249ca6c33b7d0514f03353bb7b1f43635d1bec36cf9f3e3ce61ab51d6cb42ab123f620fe6fe1706b71148ec2ab9592c0bc02 SHA512 98c16eebd1cd6bf57e85dd3abafba22a4a1f2f88e0d5f1c9ee98d7409c360c6e3dda43233823de97429a54be66969cec1eb8df4bbb7d0341a54c6a1ae475dd7b
 DIST libcdio-2.1.0.tar.bz2 1759040 BLAKE2B 4859fc545cf81246279b7b0434c02916e874681b40d00f8253fd7837941a34c5a717a81b1c3b1714153ad343e03c28668984f6fd5647662ec4e6759752326cb0 SHA512 c290821da55fd9ae366670a58857aa6efcebc9f25b7caea063cf12f9cbda84fe770c5f59f972227fda50517ca58c5f39c0137daa0f93179e3daa45303d8b610f
 EBUILD libcdio-2.1.0-r1.ebuild 1804 BLAKE2B f573289277702791fcf1d6cf3156820306bd523e087ee98af0b66810a48f04d97559a3befe0fac13f58fb06d0a7e993aa6dab51835dafe2420f31ad0120dbe58 SHA512 ed841a3e8801138e2108ff87de988797de65c4cf0a0f9c1cd5ac74e047bad022ca4bed96d76c8a8f048675c92773c0330a61b801f8a3d581432115b1d94b0acb
-MISC metadata.xml 529 BLAKE2B 904a44230f894763ce7100a7816ec624427963881db42af35739fb3b31c811df8142eed82fd20946bc4fbede978bc3f561fbbcb85fe949f21cbf2e72bf6a1169 SHA512 76dc080e917f5d0bb5238eab5af3d890b6e2023866ddd1aec938f12044347269bff733278a4bdfa7655759baa20056ef565aebbcd4eacf78a772ac40e64386a8
+MISC metadata.xml 607 BLAKE2B f3850b573e21dbfa2c9bb30265db3bb9db41408685f7aa6234b77f2cf73d8e304ebe8b2a4ff3f6bcb67a9291f38138c18f2740ac166a96cb45a94e5c1981a27d SHA512 b07c8e25ac87bb07ce32e4b92704f1c5bb0f52fb06ab77267655449e005b159589eefef1bf7bb2318ef98f83fe34ec2f224c29ce0aec41b665161fc1e5d123e8
diff --git a/dev-libs/libcdio/metadata.xml b/dev-libs/libcdio/metadata.xml
index bc4c2d22d578..af69d3a4320d 100644
--- a/dev-libs/libcdio/metadata.xml
+++ b/dev-libs/libcdio/metadata.xml
@@ -12,4 +12,7 @@
     none of the command-line utilities are built, nor is the CDDA library.
   </flag>
   </use>
+  <upstream>
+    <remote-id type="savannah">libcdio</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 9a5bbacb6348..ae77577e3651 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -3,4 +3,4 @@ DIST libevdev-1.13.0.tar.xz 451328 BLAKE2B 07b15bf46ca3b01d9a93da8d93fd60b2f1eb9
 EBUILD libevdev-1.12.1.ebuild 1124 BLAKE2B b39700425b4711359fb8e0f05f5473420ce3ad87eacd8cbeaf40c605c2c8a5853df8b60f137dbed41db5f9c401b2336835bf78af074676891c97f2461434e563 SHA512 f86f50f39388d35606ead66f16594f2bcf3c4de27649cc956b11f59bb61636b593f44aede81c4cda16b854c9d128874071df69e4afa573e87679c7bd450e9ab9
 EBUILD libevdev-1.13.0.ebuild 1132 BLAKE2B 908d612d293cb14f7e68258fea049c671be7c76a649eb675b533d20ad5d697a55c5d6d3d2978bfa1ee921fe1994dc0b051308fdfcb6833c040cbbd4b7a875cee SHA512 3b400c6ea2bd48837767f2f00698f61b41cdf6857ec47bb46d671c956e188d64a902290d6b8dae1fbcd8db54fda6c45d02f2cb65a082837122557cb3c3f3d9b1
 EBUILD libevdev-9999.ebuild 1119 BLAKE2B dde6bf4c9c7fd7ff688237ec8a793d9d2303a0e78178cb79839ec0332e7a1ad3a3e139ca285b92bf55e7aef054953d58e4c8b360b99adf7af04cf36783019281 SHA512 26c9e626570a80ba6e0ba5b59932830fd4cc7817f0f2dc0f7bd6c8635c71dd1fd9f923623b4bf9d39e3f64d882187fceb4fbe4be46468589c2f85e80b857bf8c
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 339 BLAKE2B 17485a5a6202c366cf975f0c34aeb9521d5190f2ada003bdcae8c3e561740b3b43809b177baa2cab87de46e2f234b48df5bfa6c8df5dc2674f95e6206f0e4398 SHA512 26ff955c224a24cd58bf4eed14d99a0b7cf1b078e0d93bbd115a9193656180f112cb0f27bc6d35b2ff2e062a58775fc4b4310d6ffeee322b39963143f079b3b8
diff --git a/dev-libs/libevdev/metadata.xml b/dev-libs/libevdev/metadata.xml
index e17a5bccb78b..86a8c5281be0 100644
--- a/dev-libs/libevdev/metadata.xml
+++ b/dev-libs/libevdev/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">libevdev/libevdev</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
index a7bff0e68e21..72a5fde72e5f 100644
--- a/dev-libs/libiconv/Manifest
+++ b/dev-libs/libiconv/Manifest
@@ -7,4 +7,4 @@ DIST libiconv-1.17.tar.gz 5413283 BLAKE2B 1d317dd0655c680a2082c38561cdff51ac1a91
 EBUILD libiconv-1.15.ebuild 1661 BLAKE2B 71536b7702adf5254b7018586b1013bdffa69f012ed63debf67d6928436b78e1cb40d423cac2d364632e87e3a24e6910bbc20a99bb29a1e733ccd417e3505df9 SHA512 b6073de175b3f5ebde9fe78b92017190344f8f9c98f76a33b9624be25fa1742ee57d43e5c1a163d5168d8ff27b445966db1deb5456dad201040d6a0b451535e5
 EBUILD libiconv-1.16.ebuild 1509 BLAKE2B 2ed27646d9ade07f36d40d8cc169f79f24916891355168a4872e09a8294811a9136eeca7b2b61357fb7589e6f6ae86f89b0315f7ff0f41196d2f82e0d08ffa7e SHA512 c8aeb2cba82f35c60d4364feda8cfe88da5ffd2d49a183dcc5de5a46a2398d2d8493d3faf1d9274573acbba999abaee121e146fe39593d8973d0fca5a9dfb667
 EBUILD libiconv-1.17.ebuild 1448 BLAKE2B ab9b62762e91b21e7ad3caa3e4405e54c8717ea8f5029e07f2a095e6147977e96b9e59c9912680df4786f75084a0870dc266ebc2ec90d6e3c73b1b7997c74eb7 SHA512 5b28395bbf30c90877cc222bb8ec27cdc14a3a546706a64e9238144aa6ef22c32b027546693deb1cbed0d475c8a962bbf2941db6b6a8d0c7731472cdf2071a19
-MISC metadata.xml 466 BLAKE2B 6393ff7a79bc98751c816e1c753f86224a305e5cf242028d29559ce27f4439f76cae30f735298efb69ad2d1059d636d8c753e21c4f12000c8e024afea9f0df5d SHA512 71547717b83a866737aa75d79a488a6c1ac1003bd44fac367df845a2bca95d986b7e90c0d85e807212f66ef7ca23ccc622c239ff1ebea4e8d331bc013ea97d55
+MISC metadata.xml 557 BLAKE2B 30e8bc0ada9814b38e935d1e9fbaad110e6bccd6843487e6daa050437d642013d7f9d5165aa68f4339c28b6bab3385f49f4ce9d01dfdcfb477ac8f6fc1ccd64a SHA512 51cbd596e7d53f0ac754d86ef8bb038509f38d64b81d2558a6837efee6fa5a047e169934fbe5268f18dc165b99040eebb77eeec84269796b9fe880f7ad4db461
diff --git a/dev-libs/libiconv/metadata.xml b/dev-libs/libiconv/metadata.xml
index 0e76a9f8c44f..09f59a60671f 100644
--- a/dev-libs/libiconv/metadata.xml
+++ b/dev-libs/libiconv/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>prefix@gentoo.org</email>
-	<name>Prefix Project</name>
-</maintainer>
-<longdescription lang="en">
+  <maintainer type="project">
+    <email>prefix@gentoo.org</email>
+    <name>Prefix Project</name>
+  </maintainer>
+  <longdescription lang="en">
 libiconv is a standalone package which implements the iconv() related
 functions as glibc already embed. Libraries and applications needs it
 when built in a non-glibc system.
 </longdescription>
+  <upstream>
+    <remote-id type="savannah">libiconv</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 7bc17b5e94a4..b783f11faaae 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,3 +1,3 @@
 DIST libinput-1.21.0.tar.gz 988650 BLAKE2B 54c63beeff8dee93a52774220b45321d8a94261687b463319fbae9246331b532be7995a5b32c30425b9d0708b2ba69d4b4e83e8dc7ecebe6fb1237b723a266b6 SHA512 510273d68f2d4cfa61564a706b1f334f6bfca0d1c8faf0bb8aa656cf3fbd5e38d79d6fbaa01a20d38bc15777c9afc341e4ed08d35ef367ef3803ce788cbc4a0e
 EBUILD libinput-1.21.0-r1.ebuild 2289 BLAKE2B c89e242476aef8f5eda9db495a361a9118dfa385d42cc620cbef880436f61b773e9962effe4443a0915342a196c497721da5b1b5651e969299ad225024d5898d SHA512 8dc50c92765e5877c1d1d0bff8fe002f190b835b02d8f90d6d18c14a4a1602197e7f5854ab284f47c198c1c73e83f05c85bae56b105bb29026560141429275a4
-MISC metadata.xml 341 BLAKE2B e1cb7769e8f3063d1245baab1d245aba45bdb7a999b7e5aa14d8fd5c1c22b536c06ec9ef05fd7d80cbe6ffba5e1098e92ec8e171ca4ed60738f5133756f56298 SHA512 67fccf3af813aff702fb1e0daef3cb76e394f706741ac823beff0148b2da9f922a5ca5747dc44df28c08ec7dd255a09c7b48735fc0f42ed4adcf82cdc623e396
+MISC metadata.xml 459 BLAKE2B cfe953562cf380cbfb152378fecb5a927c2b54ec26c53cca6aadc8835ec9e0c07620ac3cda810683c236ec3ec2b867ceb0efdb169d8fbbb1fe51616a7bd1ff69 SHA512 603f3e481424fc4bb631b7207682cb36144a15db143bae8df3b8fea4a10ac1863e03ff9e8106f3638f0aa41487adad7dbd7c2e74e01a7231254829b7f0b699d4
diff --git a/dev-libs/libinput/metadata.xml b/dev-libs/libinput/metadata.xml
index 5d5a1389f157..33243afbabf3 100644
--- a/dev-libs/libinput/metadata.xml
+++ b/dev-libs/libinput/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">libinput/libinput</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index 275129e8cf99..7e995f1a9c60 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -6,5 +6,5 @@ DIST libksba-1.6.2.tar.bz2 667846 BLAKE2B 93abe745fe951ead0d1c05a1006e8ec20ab68f
 DIST libksba-1.6.2.tar.bz2.sig 119 BLAKE2B 5ce2bd1065996ecb2a6e687eaf96ce52ba807f5ae487612c43a8da8da78a91985f37257396f1d179a4a38a8d1efb8cae8c7a57f5f1b4eb92c33d70559e3c2186 SHA512 e84f653ee64a6769145df3e4b8e36f9c19983771d63c14e1a27a7f27b8cbed00af44f46db69a47ab9b282c405c21a9445569630b7b7f7ee7cb91b4d836524fc4
 EBUILD libksba-1.6.0-r1.ebuild 1129 BLAKE2B 02bc3e3ca7d5ff452f0adabbde65371df3eee9ad17fa8972b7440637dcfcc1caf9830b1b70645fd6bc95c49de6a9dd0f8d0f90009bf169af9f4e64bc2e1d06fb SHA512 211797f35a8f267e511fafc946fab54a4aaf8bcd52c6df6ea1d46c6c7f58d952adb92f175f940c49dd2b58443ce985b196256e2e39a247f94334aae54967c1df
 EBUILD libksba-1.6.1.ebuild 1337 BLAKE2B a04dabece502895887e9593bd75adab5351036018922feca1819ccad22435bfd575178d43f21eda1ce00f98c48301156c3dfa2bd63356a5cf75825a0b789134f SHA512 89f5cabc2341a8bc2de8a60d3f4f11e2bd8d2dca34ee8291d45e763ad98839b451b956383b86dac5d6b42d0b3681d1f0c1fa3d2e2547621cb1494f2e559c2028
-EBUILD libksba-1.6.2.ebuild 1624 BLAKE2B 5b2c3463ceb046ecaa1e442f58136f96f0faee0bd6c19b2e9cbf483db6f7b195a5d75c1bbd7b4b412b7dff5dce2cd12b7434f8ff52a31697c0207f2604eb548c SHA512 0d6eeb5f65506a87c42f23e44a6ee000aa312b2f93ddd475ee669c29c0a187b2a6288cf4a61ae879742d49fca451102e99b8fbc97f659f24194225c9867087d8
+EBUILD libksba-1.6.2.ebuild 1623 BLAKE2B 1dbd7a84eedf553cefa52d8111fa43f5509380c4b205792a1dabfe858100e881f522ce9b4bd358992a89341e490b868d123d0f63adb834298c5a68dbca8481ba SHA512 12af95770b634da20c46b3070cf07080632782d88edbc9e44fccde45b6d8472315e1fed49f715ad4b7dcf8b8f51237ed213c9b732c1e3789e4f4e813b61d34bd
 MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
diff --git a/dev-libs/libksba/libksba-1.6.2.ebuild b/dev-libs/libksba/libksba-1.6.2.ebuild
index da8db458d8cf..92984d1ad4c2 100644
--- a/dev-libs/libksba/libksba-1.6.2.ebuild
+++ b/dev-libs/libksba/libksba-1.6.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="LGPL-3+ GPL-2+ GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libpthread-stubs/Manifest b/dev-libs/libpthread-stubs/Manifest
index 8f6f08b4213c..0e8e02b0baa0 100644
--- a/dev-libs/libpthread-stubs/Manifest
+++ b/dev-libs/libpthread-stubs/Manifest
@@ -1,3 +1,3 @@
 DIST libpthread-stubs-0.4.tar.bz2 57565 BLAKE2B 0c59ba509aa24ce0d255790363d78d670be0bae5fd9556798f276466ecaf70c4d93064b531dd9870da8f934da6660fba71a7f0b402bb6ba5420fd6ee5ca546df SHA512 0fec563f3833b84311b32cb13a4fd9832aeb0204c65b1541bf453d5d35693b2267c3cee656e00a4b8533b07a8f6320ca5c3672dcf8ab047cdac8628154c08954
 EBUILD libpthread-stubs-0.4-r1.ebuild 820 BLAKE2B ef6c6220e61b83233ef808f460ca37f6c1729cd19b5100653a2ecd704c217dc9704cc06a7247bbf45d7dc80a9bc5d90b088ac578f932cc61c6ac857118f39679 SHA512 8ed1cc22a46222c858883ea627989e398488ee54c313aa14b4a8ec4caeaa458956cac3c406598319d59d2cd31e734bdeacbc9e5140d2dbcbf5080f5d021cdd44
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 344 BLAKE2B 61a2b63e7c3a20da59dc96307404a597cee8323050a68c00ef76c58c44f264eca2d0f85a6ce207b28834a99fadbbd3f40795c16394f01231f6678f0c8ef80fc4 SHA512 9579ba7722bcda8f2aa1fd22fef12828860b70405c4df60f830aa1a517d31667ea61375c2479f430c00c45c9c6013376ba67c9298ab7cd0ea3ee119c96febc8b
diff --git a/dev-libs/libpthread-stubs/metadata.xml b/dev-libs/libpthread-stubs/metadata.xml
index e17a5bccb78b..0330abcd09df 100644
--- a/dev-libs/libpthread-stubs/metadata.xml
+++ b/dev-libs/libpthread-stubs/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/pthread-stubs</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/libunistring/Manifest b/dev-libs/libunistring/Manifest
index e48957674815..4e67de642f6a 100644
--- a/dev-libs/libunistring/Manifest
+++ b/dev-libs/libunistring/Manifest
@@ -6,4 +6,4 @@ DIST libunistring-1.1.tar.xz 2397676 BLAKE2B 721adc90884006480055b95d0fa06cd8624
 EBUILD libunistring-0.9.10-r1.ebuild 1034 BLAKE2B 12a4f6cdb696d052166e1475a536be7b5e689fdbcca82b8a683c640f5921795777c0bbdfadf0814909cdd5b73b4f790a651b0a8b4b8228710aef6e828a25d678 SHA512 792b02dd7025bfdde692437f558305a4281e77f11622cbe9c707eb7139b98032bf1416754e3a145c1f5d22052143cfe67817f8cafae84e91d27ac3bb5d85545f
 EBUILD libunistring-1.0.ebuild 1015 BLAKE2B 7f2bc1d6fd0d579ecd7ec814ee6b35f5592e6862fda2e1f82e8d4f0048d3c2b6312fc52fda35064ab6e3f2131876fc78304cfdad8fa464feb011755ec8277336 SHA512 e01ec195a1b7c8359b532fb590155d5f03c9a1605c5d9755df637f71dda0a3203bbcc147a87bfc1ff7e0f3d0bdf5f2c79f62a68749d3da3d10cfe985b7103a20
 EBUILD libunistring-1.1-r1.ebuild 1055 BLAKE2B 9e1e1e26fda43ef5d393272bcf9c173fe0b3994424257a11c4aba3cc5d1506acb009c1af2c9b57ddcc3185aa0c4c43b9a5a6b84c505443ea3c8566f583b19d39 SHA512 d4cd86e1a4f7aacf59317edcbd68a502bed073514b9d30939b5a52b5151ae074cfc5b24ea9193281a65401b00ba97591ffb5d31a7c5245d3908c78928b3284a7
-MISC metadata.xml 974 BLAKE2B 367ac9d8c34135ea5c1b1a7fafb89254ad3c25deaa183a82f40ab4289c76a311eff909e4d1a2cbb361104706786471f24bfd0f9a1da20e1eb20bec3178c43b5c SHA512 89ea5c6b84a94c713ef72b9c3b921fddb3a87b8d0ea72eb924d379eb7d46974cc9b60e350007752aabf802bcc0fcb5fe6437d11e15d1b74d1efd0a537a474bcf
+MISC metadata.xml 1056 BLAKE2B 17cc1b06c1e58f1ba1de00a6fb7cca12f921bfc855084c7293310b6d846b6e81454451e2e8477ceda4bc8bff38df120e9f12e5b121ace4bc4222d101356582ab SHA512 47a9477e2f9bc530fa79f288d003a679919aba6a32dc18b2025d3406ca5e3ad97d73f96549d0b0cc951b7c0f8ba3a7755907334958cd085c98d876dd3a06567b
diff --git a/dev-libs/libunistring/metadata.xml b/dev-libs/libunistring/metadata.xml
index f757bba21c45..8981d9fb495d 100644
--- a/dev-libs/libunistring/metadata.xml
+++ b/dev-libs/libunistring/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
   <maintainer type="project">
     <email>scheme@gentoo.org</email>
@@ -17,4 +16,7 @@
     This library provides functions for manipulating Unicode strings and for
     manipulating C strings according to the Unicode standard.
   </longdescription>
+  <upstream>
+    <remote-id type="savannah">libunistring</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 1093a2903985..b718dbdb82d9 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -9,5 +9,5 @@ AUX nspr-4.9.5_nspr_config.patch 251 BLAKE2B 65ae8b981e758e2955b7a3358f24b7b17dc
 DIST nspr-4.34.1.tar.gz 1096874 BLAKE2B be12bda63a72d25a60542c5cdadaa7dc59ad2d40d41affc0af5eab07659129ff235a62227a78285e4c00bc72a365b49691658aee7818ffc4c5d014aa0c2b0df7 SHA512 b77226c3fbba6fc9acc90deb8496370dba1384de72ce564524c03bc239846fd17c27d7e1fd7ce99161faafdd8c92413ee58ce1a74a41c786759210bbab478991
 DIST nspr-4.35.tar.gz 1096974 BLAKE2B c80402d7be9e69ab6d1e768a18d271a8d28900f4cae7df2709d1ab26e100d908f508762bb771d4042aa7152934ce83d495e2102e894c56574187be8040d65629 SHA512 502815833116e25f79ddf71d1526484908aa92fbc55f8a892729cb404a4daafcc0470a89854cd080d2d20299fdb7d9662507c5362c7ae661cbacf308ac56ef7f
 EBUILD nspr-4.34.1.ebuild 4860 BLAKE2B 9cc8a8f045aa6f69987d7285927566dcc4578c1a9d16ae52de238462936565459e5f4a5dec655c4fa70dcb95dcdae461464422b10bf54feacaa2676825743520 SHA512 9e3f5aa90aea50e0c3b5e350d841f5c18a1dd41afa5aa80807454f18c339aa3d95b3e717b77fd1747de5c46f0cf118d1f7efe1ea496259d7a053f76e3a19d60c
-EBUILD nspr-4.35.ebuild 4825 BLAKE2B 68f0b9cb6f5c16e95f058dcf15e51cd84efa63b3064b7bc1448f098bdb2cdea9c1d6b878a4fc140f1590a7bb74cc39c02ebb40bf9d156be5f0e14dadf71cf529 SHA512 1f2014764123a7ae05fa31a562566e993f7e1eff343111461245b6712a0f4da6cb33d2a1e41aaf4bd0f69ccd8c625f0f600b3cc22075676147cf886a0fceffdb
+EBUILD nspr-4.35.ebuild 4824 BLAKE2B 68fd8dfae42623328fbe27f0d8cb9cbe6435ca8d58ba4d84317763f35545d49e1f269288124c430da0588784320e5e6791c86719a5fd3032c043ad5fdea1fb15 SHA512 a430ae92d0ec4136a0675cad03574decb545c79a1bd3cb846d6fa7d69ed69824ace830d00010aa99440c5a064c997fec62b2400118ec3e55950e71c11d0f5e37
 MISC metadata.xml 350 BLAKE2B 0f4d7850a3ca725af4e01a47e4db4219d2465b6d4db8c44e12b8f57d2064fd3c6ddbeec16888a316627f96e1f9415777f3fedecbd7065e4d13516bbed473a6f6 SHA512 2cc7f3e6eefcb5ba16c4b2127e751c47ea7a6822eb71080c96c6850ef741acff8d424c520eb60288ca32ccdbe825568d7aced9f57148e304dddd0afb7f4a8883
diff --git a/dev-libs/nspr/nspr-4.35.ebuild b/dev-libs/nspr/nspr-4.35.ebuild
index 5a491d16187d..0ad77dafdeda 100644
--- a/dev-libs/nspr/nspr-4.35.ebuild
+++ b/dev-libs/nspr/nspr-4.35.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index 80bef5a61530..52fcb57e2c9e 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -3,4 +3,4 @@ DIST wayland-protocols-1.27.tar.xz 82604 BLAKE2B ae1c19dffcf255c88e6d646f321ec19
 EBUILD wayland-protocols-1.26.ebuild 755 BLAKE2B 3fc5c050521210e255e4f84757d8db55799f8f1f24a29cb80212e7961f73c16e043a64f76dfa3185aa56ed20a3e0759247f87cc41ff9f1adde61b147a276d2f4 SHA512 9ba008e0875dbcc8b3c597eb49073bce8afc3d94c0bf6837a684ef692e202b85eeb162640229199965922625763107080e4bf76388fc31b30d3eac2c758e08b6
 EBUILD wayland-protocols-1.27.ebuild 793 BLAKE2B 3988e887ac66b0b91eab437d03c0ef24ba50d88d96241bd9e8d746c67a71ab49a65f63bf36be45b8f94d49e92d122cf9dbc7eb941b630ddc4afbf4ac8e3081de SHA512 c4c856228ccdb277168dae9d53a24928ce6515a20e7a4a7849b895125393bef4f0c188843fe992d08e70a8d7f27ea5a3a9d6d6150e78a4ea07f22a3f5a68dda3
 EBUILD wayland-protocols-9999.ebuild 793 BLAKE2B 3988e887ac66b0b91eab437d03c0ef24ba50d88d96241bd9e8d746c67a71ab49a65f63bf36be45b8f94d49e92d122cf9dbc7eb941b630ddc4afbf4ac8e3081de SHA512 c4c856228ccdb277168dae9d53a24928ce6515a20e7a4a7849b895125393bef4f0c188843fe992d08e70a8d7f27ea5a3a9d6d6150e78a4ea07f22a3f5a68dda3
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 347 BLAKE2B e4265a94e0261094355613ac8617c362f90dc7207188658bf37d7d3d0ea87f598d0a5367d44c95cd3688cd68aeaad6be95ca1707430d06ad8b34bfaed9395f29 SHA512 4db809b42f57946d21f5c0ece2ccba39684da283ddfb72ed2bd6c1ace305c18381904dafa2abce56950cfb2bd1ead0839124c59302b1bb71c0fd8fc8f4a52846
diff --git a/dev-libs/wayland-protocols/metadata.xml b/dev-libs/wayland-protocols/metadata.xml
index e17a5bccb78b..a6216ff614d7 100644
--- a/dev-libs/wayland-protocols/metadata.xml
+++ b/dev-libs/wayland-protocols/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">wayland/wayland-protocols</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index 7e4030b8f135..17ad0ab88e71 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,4 +1,4 @@
 DIST wayland-1.21.0.tar.xz 225936 BLAKE2B 2b43eb1517d476bb2b4daed1083373655b57d047968fdb93dbbbbe4235af12e25557627e30b5c3d2575bac4beaf1e0a0b8ef10a3c673538d9097501f33c05836 SHA512 5575216d30fdf5c63caa6bcad071e15f2a4f3acb12df776806073f65db37a50b5b5b3cc7957c5497636f4ac01893e2eaab26e453ded44b287acde01762f5fdc3
 EBUILD wayland-1.21.0.ebuild 1478 BLAKE2B 0884da89055eb938e9dd782c9ad0e50358205e4752ed4600f8f216f08081f34252c9f1122edffd1123be6f3693d0fe4ddbfd3ad4d2a908e2410ba911d18e44ad SHA512 f6a4e29a0bd5c0bf567a378dd3a715ba3b1f37731777766591467707b426fa845c33e5726e69028093cd5debb300368a73d41190bcbc2e5132479ba0d1397fe4
 EBUILD wayland-9999.ebuild 1485 BLAKE2B 8e82cc08d4efab01be9e60daa08f568c9c2760cd5247f66ac2aac0886ec0dcb3b9d5cc262ed7612e08c77f97c08371b454a35f2af693eb6a8cc88a19c23575d0 SHA512 fbb427c35c1e5df874e99391438babcca5c943b548dfc8c4380e694979833045a94be367d920d696c9e5b332171351e2ff298214e7e82c0c4bbc42a669ca9f12
-MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
+MISC metadata.xml 337 BLAKE2B af249efc25c3eadde73d0b49cba0e6c8a021fb4b7c9a0b96f27a4e71185c76f8ac7ff0b9efdfeadf2df324cfa578db3a73fc7bee8c249cba35d41e2145017e16 SHA512 771b226f8e16d8c570bc2ea89ee3c5176e1d0f2209afb3b2af5a9d19fbdc2037a411b84d546bea054449c8074fb0fb3c3726fb2692d084521c64cda60600c0b8
diff --git a/dev-libs/wayland/metadata.xml b/dev-libs/wayland/metadata.xml
index e17a5bccb78b..8cceb6f871ee 100644
--- a/dev-libs/wayland/metadata.xml
+++ b/dev-libs/wayland/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">wayland/wayland</remote-id>
+  </upstream>
 </pkgmetadata>