gentoo auto-resync : 01:11:2022 - 03:06:31

232 files changed, 1907 insertions, 948 deletions

diff --git a/Manifest b/Manifest
index cc4a905e65fa..97484044ee38 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29588 BLAKE2B c64a8c65dba7059ab757d0153d1aed6a649b12cf31b0548625631032b32d088293f1d9d5a2620e9a97232c2c7be952e73cea5d375ad49c8557cc24fe6fb97d06 SHA512 239c17bcd63acf4285fe7dd69df49e044af181090df34da472028c2eacae0ba3b710526f2bcec83a2626e0dc7f37b6b61148e1c4495f9a4b8eb9d4f84aad255c
-TIMESTAMP 2022-10-31T20:09:42Z
+MANIFEST Manifest.files.gz 29604 BLAKE2B 0e0ae60d088630b1c0def924ec514661e2342c162acf9b2851f04596ae2bea5729f3d9dad0be8401f766121d8d44ccbabc4bafd9a1a9a0fecb24bcb4482d0dc1 SHA512 fae7347ed9c3b05edb23a398d38c874c4c7482b8a5cf422b3f8e9489cc84e60121e600359a8d139b174fbed1bf526b5fe7eaefe891cfb57ab74720d8c2263d62
+TIMESTAMP 2022-11-01T02:11:38Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNgK4ZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNggFpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCYbxAArimWdfLCPxvT6oX2LdFLpNZM4+bemLjKlqrSDbSESu67P7GDrrqRa6HL
-MrMfW8IvHDm7YD2Uwp8+4kqWIbU6E8LnmOHjEHw9f8rcp2HNY8zGsym/q6REN6Hr
-OKViGOFW8p4prUx/LbsmFAdkbhUKiWMr1hfeJhVGuGiQ6xZTVwEIu5sjoKpCltvV
-uyyjluQyEQXGAjOZH9KxZbY6zMHSvcx3P5rm7jCz0fYtz0DOKPltBhqOw5rCMxr/
-JOHhx/KUIt+DhzKb6yswmeeuEj2snNomRJRPQv0EEGYH2hpkb8GdIeZMQOWxq3rI
-zReVVLmBCgHfGx1ARgzOgVk7bolr2QnTmhtDqeKyOvRQaR6IHziGhxD4+HifIpSg
-nBQb8hxYIdwZCI1v2ARkbWGtEFG6r+a98BSE+ri55VXlea9l5ACH42+kkEtN8lFu
-UG0ZLrNQKgjuaZ2dwpZHksWj2nPDbAT3c4Lj59XiVuWfNfgKmvTRMTHW3CwyqLsJ
-XKLxBbS5ph88+h5hze9eO6hPiycJJkLwNxP9D9H6H/uc55ntb+r6Ab/dXkWSZYrl
-yUGtZAKDL4UUsuQnDKlfepL0DaP15gG2kXBhtYO6tjM2OR+rcrCFepbKJLRrwp+Y
-Nl0Lp3TTLkkE8sIhIwJxFsvgUM+i1f3b2jIeS8qR2y+sj5gTbPE=
-=vCae
+klCBAQ//R0rn4/qKcb8i/z4enzPHT51qVLdYCWNskAgb2uA/NjkTt1CQGUFFiA0A
+mCkXkAkVuPFlppxtrnk5YouK4Pa623Mx1a9/6tf47JS7OHUzhm/lrEPMBSOSOiTq
+k4drxIw17unMbVttPcpbTErzx/oajZSAPLekYNo0ewSzF1GvoCP1mdncd0m6eBoa
+6N7+Lc0QXDaOWolTRvaRXphx36GenvMIB2YtPJs3v3b0RqYhzH9UmwhXaMpxZ3Sh
+nIv6aGtLsi0urDlyMxkga+Xz5mT7/2mVM1C+ayTRvIDKAT9nTUItD5gNAS5jdEt1
+ZTmdWWFIScbzlM306su278ec8eqq2pW4JjBHAk0JCnUswmTBVv30h9PO9mX79K/l
+k+v7rXLPW2x/K58w8xK6Je0PNPtjxjyREPlN1NFEjKBm/uVvYHouhfJ1vAwSK85V
+0aYLY6YqjtlF04GQJ6wNSD8czNBS9exTtKKpsXAuElg3kK5wxJLHbYZV/3x/nxQ0
+CjpkTRYx6YJQAm9DYltMYGq4Y/JMUGUeyMTbhW0FbkXXeEkWb5xrdXM9X9Wq6pej
+oVPntYbk3WD8+N3kX2SqV0WvNf2RTaphS+24QOm41yes6ILEXf2CEvuxvstp40O+
+FdqHZIhyPGZUb+mn5VHI2XS/DnEiht9Dk0EDOM6Ndd3+lzMgtSc=
+=lum5
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index ae0427793e25..e6b436b3e6ef 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index b168ef6a99ac..28d4206307e7 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index da0d6f6cfe30..a4520bda9ef2 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -7,4 +7,4 @@ EBUILD keepassxc-2.7.1-r1.ebuild 2368 BLAKE2B e1d3f23456beb2057c29f4040e9244ca2f
 EBUILD keepassxc-2.7.3.ebuild 2528 BLAKE2B 36e886583566784815abf90873c09c1e5698d67b6f68945df44aac762e95b3d9866926a2e7592bbe2ad52074d048bdf725daa15674c7caace351a28e70e0ef7f SHA512 fb853fd1a83b2d83bc33b145535f703282e4a726da1f81df6e60186e45ed6d6b26bba0086922fa71ef9cc6f1308c75a5ea3d1c6620a82b7a9646bf3b3277abca
 EBUILD keepassxc-2.7.4.ebuild 2528 BLAKE2B 36e886583566784815abf90873c09c1e5698d67b6f68945df44aac762e95b3d9866926a2e7592bbe2ad52074d048bdf725daa15674c7caace351a28e70e0ef7f SHA512 fb853fd1a83b2d83bc33b145535f703282e4a726da1f81df6e60186e45ed6d6b26bba0086922fa71ef9cc6f1308c75a5ea3d1c6620a82b7a9646bf3b3277abca
 EBUILD keepassxc-9999.ebuild 2484 BLAKE2B e01ba45106ef10b452c746cb31b82359aebc7e0149574c39202ac34ceeb28a0f5dfcdaec363f07af580e89bafb6fd2000d20a37f835050538c26bc84eb3b774b SHA512 bca31898fdf2b92c2728f2c4023702268d797993acee7ed7517b051b43f22a3c6e46d1775b2fa5ff2835f4906a16868cfb7977eaa3247ddbaa27263df592793e
-MISC metadata.xml 1028 BLAKE2B bc89e683ead8dfcedd9c1794c35df27ca535b69ce0036641d71c7df8a2db70060adc0d34a007c9da69765dea4fbfe5df5349d880197e2cbdb7f6c5347baed78f SHA512 abe1527cdd2c26b8f64d6b7e8651325146ffbbd53dc9cf273599901e9e9ac31bd43f2c85d8aad1067ccf807cbcad3d921d76df3666b8983eafe69589c7bd0647
+MISC metadata.xml 1077 BLAKE2B 410793b2f278ccbddceb10a72e4a010f4b2d6fc81bd8a472b867e1230d43a0e6f461ff6459095d334536d462e2297c4978dbb247e3a5ccb82c36fd70c6f44b51 SHA512 d338787a7ea319d752c19314ee53ee1306293ae2dddeedd22bd010e990a1680fdd1b96c5173c653b4dbbe336d713a07f9fc1a771951fca8636b3973361787f20
diff --git a/app-admin/keepassxc/metadata.xml b/app-admin/keepassxc/metadata.xml
index a608739dade1..dc74e3197e66 100644
--- a/app-admin/keepassxc/metadata.xml
+++ b/app-admin/keepassxc/metadata.xml
@@ -14,7 +14,7 @@
 		<flag name="browser">Enables browser plugin support</flag>
 		<flag name="keeshare">Enable KeeShare sharing integration</flag>
 		<flag name="network">Enable network support</flag>
-		<flag name="yubikey">Enable database unlocking via YubiKey.</flag>
+		<flag name="yubikey">Enable database unlocking via hardware keys supporting YubiKey-style HMAC-SHA1 protocol</flag>
 	</use>
 	<longdescription>
 		KeePassXC provides a safe location for your passwords and similar
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index bc1e99f2b006..cfcff4aa2b74 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/upx-bin/Manifest b/app-arch/upx-bin/Manifest
index 3100bb7fe1e9..c18ea105f607 100644
--- a/app-arch/upx-bin/Manifest
+++ b/app-arch/upx-bin/Manifest
@@ -1,9 +1,9 @@
-DIST upx-3.96-amd64_linux.tar.xz 462784 BLAKE2B bac24742528b241c15bb49cfd6f006c485c28c051606deefc9b3c64d045658d029fe8dd1110120b6c21c03c30c0220ff8638d7e254a0376037b0d0ab013e9f3d SHA512 b4e7ad9ca58e07a0a59bcc1959d7901b1960a0975e4030b16c6aebfccd2f5f9163318f8f5b4a08bfd513138fe4c0fa3e3683f9141f221faa7bdfb8eaba4d0782
-DIST upx-3.96-arm64_linux.tar.xz 462376 BLAKE2B 202e888def2d60dab9d119548ac85ac6dcd0bff7e0c442fccd9a81961dc10ad96e7fe19b4a7a250c65d0bf9dd49ced8cdc7fdfb08cc7b75953a02afbff682865 SHA512 f1f6556068df27747dd40cdce3f3dfeb5c9a8723bfa76772715db69473267dd11242bf026c5a45e869b0f343559ede232d9a0067f4e4adce555cef1f26013f65
-DIST upx-3.96-armeb_linux.tar.xz 418060 BLAKE2B bb987a0a1466b3e5f4f2797888bf28c844f42eab3800dae00106cf4078c7196d6737ce9a3b9d1792d1ad1a190da8e90f2d29272127a20e4b2a9f5551511659ff SHA512 1bb570926a44c5471e00e3e2797728fa8122bc4035884f8fe8d7f4f3100e7dbddb84c80ad13c02d1a7454b1df504f96b8c0543913b1963c434ee2191d748e486
-DIST upx-3.96-i386_linux.tar.xz 485836 BLAKE2B 1bbcbde3d510eec9a38876958bb127eebe46c1f18146a62e5697fcfac0aa34bc910f3908e1783541466e46b305cdfd353902682c97301df38cd0550ca0302c34 SHA512 c679ddaf447735378d116cbff48276e13f9703f19a11364cad411915a153e2d7a6377f2ae8ce0f0383557ec889f44bb9860fd0b65bafce9935c6f381d485b13d
-DIST upx-3.96-mipsel_linux.tar.xz 483832 BLAKE2B c7f79ecc0e9f0b3f4ae9beaf0dc06e43e4cd747fde5bbd8d24505a008171f55c14ef411927cd112dd7fb170923679266170975e89cbeab43b17d842c20e29ff0 SHA512 252f64bb2d44d687daca645b1e0cd91665a562e86e1ce8fa95b57709134f74810f29f5792f7b8a1fe6c0517728632613a202a209465f1bd56ccbb383d9eea1ae
-DIST upx-3.96-powerpc64le_linux.tar.xz 505260 BLAKE2B 9e92e5e72436a3309c788a96a03c98bfd53bf51d3a22e85c6e58669b8c5536e107949fa860b25e1abc759b229aef76607819e62db353983f6f87f04d59395599 SHA512 8b577444366288427d6b114793b3f8fb42bf223b82bb78a391e5233c3cb3fe6906722ff7430aeaa764ef3feb77f052da469eab9d0dee90182929beefc5b1f17c
-DIST upx-3.96-powerpc_linux.tar.xz 479488 BLAKE2B 2d07dd57b742dd5a3ddcc86298618a939bd46a4af6f9bed41a3e0f12456bffb0ba7d76c866076489cb03130a9b9d84493f5401db5e76571cda4d7e9d65bef691 SHA512 a8f38f2467bc31d8cff2dc0fed191d1451aed766ab49336c7c99fe1b1a48455b08d9d45b14c78d655bc3c811c5fa2466701e1a990a5c954b0ce84499458024cb
-EBUILD upx-bin-3.96.ebuild 1297 BLAKE2B d7b5e92863099b0b34266b9e1b6ca0eb3e9b5d6cc9f774e01330ef229d820eccaa9b1f7212606f2bf23df85456122b4105eb369023955d67732f82f176fe9773 SHA512 b8ed79d48bd3e279c975f616b859bc733c0243e5266990301de28ddf150ff31684ed36ff0cc4190e86f840b7d1410445ef364022c0eb4022bab0ddcec38b2049
+DIST upx-4.0.0-amd64_linux.tar.xz 509584 BLAKE2B 18ec4cb6ddd04abaa2493164938e65c868e457d9554a0a93f1526cc46effee8f70130d0351fb49399bb31e62b04b344905c69f0c337ca608c4cf1fb1e62ae190 SHA512 48e9e4c78fc7a7358fcb66996870eb9ae39945e99b68c87b196d33a95d7b8bfd7d9e904eb3dce8a8bdbde68c0d2c8dbec4e55014aae330c7faed324f000c9950
+DIST upx-4.0.0-arm64_linux.tar.xz 494992 BLAKE2B 53e029a4e7b9ec44f60eaaf2255860a30d2b27e288e60dbad223936f1cc5a61011b52341f89a1b62636adea28c27361fbe774917d2c7f0bc5a781e5f5bd067b9 SHA512 c35d8f96acbc35d3cf05236a811917c671b01c52fadf792379dc867b3b5bf1c0edb7f5a1255577622dec218e9cfa8808c37725810d16245c2d0b4c0764ca3451
+DIST upx-4.0.0-armeb_linux.tar.xz 571268 BLAKE2B f3921ac4dcf3aa30309e3f766b5ba5c2aca3f29832f99964ce6339bb2d432c20f70dc8f10ef56433cbe702b6eefca9b3fecf8592e5f3303c7f7313dac0a8d539 SHA512 0c9f73746bc7af8e21c9ae5ed30f0466141c35a21bcefc3d49b2e7056c1238bb17b996a4b264c73739c2c3334376e4eb9dbbd6c1ea59d4bdfb0f10b2059027e0
+DIST upx-4.0.0-i386_linux.tar.xz 540496 BLAKE2B 2e284c59f5330ce64d1bf99e2dae65dbd76ab2713be47ac36d03f263cf136343847d1e6554e318959c10f10f491fff739d92ad2785513ea39a039875d3d8b90a SHA512 34e83ad5f7509981291919d251a386a26c4eb6b0e4c2f6ad4d8c3023fd86c953f1e55f2aa8a93bf64134731f18f71236068a01c78e5e61340ec2875dd84c2176
+DIST upx-4.0.0-mipsel_linux.tar.xz 552492 BLAKE2B eeb3bf051d5770cd4cc3a776ff3bd824408fec284adb30aacd592d7b1705778cedad37ced0f7b4a9568f234209c69d3e73f8553d8ec638e6e064775332f88df5 SHA512 c29dd06e64a7c79a0e157e4eb135dd9540b40e58611c0b77c3cfab9c1ebac174c2dae512a3f2427b6f4a5c8f94d52e0574845056331067fe3954c616e8115427
+DIST upx-4.0.0-powerpc64le_linux.tar.xz 560504 BLAKE2B c34d3259af01990f934b643dd59fef89dcb7d7471aa5012b231e584c80eb7b763b331c9433813ea573e9b638077ab701d1cf02e387418e601eba08de5efe7497 SHA512 46319b4737e6d8f6dd4f6b72ddcfe3a2e6755b87a58ec789017a598f3ddc44706770f5fe3e820de6df8348fc6ad42baced240aad77275c867f55d6d4e13b7ab0
+DIST upx-4.0.0-powerpc_linux.tar.xz 552572 BLAKE2B 2569b29618d828c8a7ff08cb2e302c6201b8422f0ba8eaa78b483c770839795121d12165dd8448812524f63dce115a9d0cfbe07ffde4465ddde7aad0bace136d SHA512 6b9135d482704a81e14d99b223c7f623f79933f09901f94c31a605da3ae0118af513785c9efec6c66d1395d27ce56fe2e25b2830b34652264c8298bae975b882
+EBUILD upx-bin-4.0.0.ebuild 1317 BLAKE2B 533d34c253e36a66405fdd5ead3166d5a0e53961d3cd7d8fd4eebf05166b6ed90839371bfb2030c389bbc5feedfd646bdae7c358f71318ee115ed46fffa8ccec SHA512 a060f5843e23b785910fd9bf22d6611cb6128939e58a06d2d7de753744f880002fecfc126455009335819ab2b954db6865752564977e4ddddcb3ba1d6f75fe89
 MISC metadata.xml 479 BLAKE2B fafbeeb827ba16ec14c3682982e7cbb1ef9264b637086d58aca32a632b1f273f1cc7ede069d61439a498f04e09368e4095829de7dd95b17afafc80f7ceb15695 SHA512 956e31235fec93e773f9bdbe62de739e3994d92b3a56ea97f65db5b20f182f4fbeed62370a28bf98447fddfa89efec4b8b4d63daf9020210810bd8bb201534e4
diff --git a/app-arch/upx-bin/upx-bin-3.96.ebuild b/app-arch/upx-bin/upx-bin-4.0.0.ebuild
index be332492449e..a6902194c16d 100644
--- a/app-arch/upx-bin/upx-bin-3.96.ebuild
+++ b/app-arch/upx-bin/upx-bin-4.0.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit pax-utils
 
@@ -17,9 +17,9 @@ SRC_URI="x86? ( https://github.com/upx/upx/releases/download/v${PV}/${MY_P}-i386
 	ppc? ( https://github.com/upx/upx/releases/download/v${PV}/${MY_P}-powerpc_linux.tar.xz )
 	ppc64? ( https://github.com/upx/upx/releases/download/v${PV}/${MY_P}-powerpc64le_linux.tar.xz )"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ UPX-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
 RESTRICT="strip"
 
 RDEPEND="!app-arch/upx"
@@ -35,5 +35,5 @@ src_install() {
 	dobin upx
 	pax-mark -m "${ED}"/opt/bin/upx
 	doman upx.1
-	dodoc upx.doc BUGS NEWS README* THANKS upx.html
+	dodoc NEWS README THANKS upx-doc.html upx-doc.txt
 }
diff --git a/app-arch/upx/Manifest b/app-arch/upx/Manifest
index 53a3935bac19..084b6db76174 100644
--- a/app-arch/upx/Manifest
+++ b/app-arch/upx/Manifest
@@ -1,5 +1,3 @@
-AUX upx-3.96_CVE-2020-24119.patch 1371 BLAKE2B 54209c114c4a8cab51e7e7ec13cfee055a5f940df4dcbe40b7a35664378a20effdbedfef7b34e4a98510272f221540f87bf47bb439db96a68cc19177e6be71ff SHA512 9b887882e7344d77635091cd01d3c7aa9f45156f43896155988e3e1b7726d76642b4bc9b6c2db06af14710aaa9bfda16e97bc0d1127b77190b72e683d394beff
-AUX upx-3.96_CVE-2021-20285.patch 4481 BLAKE2B 345bce505a045c53b48dad3102f52588ceb7f2736cdbeab31ed5f65a5cf5a5344cb9ca700cfc3d7fac2569a91f454a652a676c83aafb1be884b0fae229d3afae SHA512 f596f13634eb2173f4c549d41387bdb6785501afb7d3a68d70f90dcdbadc615e95de024e1810af2b3663137692a7322d32a290357e0f7a96ca2acf51228b0abc
-DIST upx-3.96-src.tar.xz 792524 BLAKE2B 21af85dbcfdd1bf0151a653c865db13c9f30b9de0b9b4b94557ddd55736c7053dd829c5d72b9a7e5aa94a71ecc0151145dd66d7d98ded178c50ff7357d0ba442 SHA512 2d4d1be21d274d9bfdee9b9815396f5e5ff0bcdfb781b7be5fafa4d1e224028e412ec5f5ba607c482671aae27ccf9069abb2db0fb58f78f3a102a51897df2b11
-EBUILD upx-3.96-r2.ebuild 950 BLAKE2B 8d82f08655dbebcee420bb234e846a607ba5927eed16cfede97b62a4a34e7d67633e5f4721081709f621d6b1b16a81b3a9677a8d09f3deef8cb2b80a6671f09e SHA512 72816d4a1f956032cde555d93e4dacd18393f808bc1ad662c2f3fb3c43d3354bf11afb719859654ab59dac25e171c31cb6de3a20a91604f8cbadc62809987ccf
+DIST upx-4.0.0-src.tar.xz 1159308 BLAKE2B d2626a63b626f9b4e913b822e699fa93b7080d322b19555d44d7cf4ce17b37f0d50ec1381d07d0e4f8827e8edcd29d525d497fa79acd18d520ac58e176fb2b72 SHA512 fe3e8c594e845a91338b1e11fe3cb6371430af40a567187d63835e27da8b2abf993a104b0693063f4db984234bada7b2bd16ad79e3ad90861a1f495d99de7de6
+EBUILD upx-4.0.0.ebuild 575 BLAKE2B 65e6b039add2d11a9c84ff1e37cf611e8fe0f9231c65e178ebb85c2e7f2081884e0eca0bb0382a8e245683bb67d5acb04880b99087f6a9fccdd3773176ba784a SHA512 9b058ba2aaca4fef07c60d5e804546f4339ad5b0cf6273f7b33461805b28cdeb64f8a26798ef7988afcdb690bd9fef33533a268a40331f219dfed810812b58fe
 MISC metadata.xml 479 BLAKE2B fafbeeb827ba16ec14c3682982e7cbb1ef9264b637086d58aca32a632b1f273f1cc7ede069d61439a498f04e09368e4095829de7dd95b17afafc80f7ceb15695 SHA512 956e31235fec93e773f9bdbe62de739e3994d92b3a56ea97f65db5b20f182f4fbeed62370a28bf98447fddfa89efec4b8b4d63daf9020210810bd8bb201534e4
diff --git a/app-arch/upx/files/upx-3.96_CVE-2020-24119.patch b/app-arch/upx/files/upx-3.96_CVE-2020-24119.patch
deleted file mode 100644
index 7e6de04948bd..000000000000
--- a/app-arch/upx/files/upx-3.96_CVE-2020-24119.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 87b73e5cfdc12da94c251b2cd83bb01c7d9f616c Mon Sep 17 00:00:00 2001
-From: John Reiser <jreiser@BitWagon.com>
-Date: Wed, 22 Jul 2020 19:34:27 -0700
-Subject: [PATCH] Unpack: Phdrs must be within expansion of first compressed
- block
-
-https://github.com/upx/upx/issues/388
-	modified:   p_lx_elf.cpp
----
- src/p_lx_elf.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp
-index cd9e4ec97..453d5c457 100644
---- a/src/p_lx_elf.cpp
-+++ b/src/p_lx_elf.cpp
-@@ -4550,7 +4550,7 @@ void PackLinuxElf64::unpack(OutputFile *fo)
-     unsigned c_adler = upx_adler32(NULL, 0);
-     unsigned u_adler = upx_adler32(NULL, 0);
- #define MAX_ELF_HDR 1024
--    if ((MAX_ELF_HDR - sizeof(Elf64_Ehdr))/sizeof(Elf64_Phdr) < u_phnum) {
-+    if ((umin64(MAX_ELF_HDR, ph.u_len) - sizeof(Elf64_Ehdr))/sizeof(Elf64_Phdr) < u_phnum) {
-         throwCantUnpack("bad compressed e_phnum");
-     }
- #undef MAX_ELF_HDR
-@@ -5617,7 +5617,7 @@ void PackLinuxElf32::unpack(OutputFile *fo)
-     unsigned c_adler = upx_adler32(NULL, 0);
-     unsigned u_adler = upx_adler32(NULL, 0);
- #define MAX_ELF_HDR 512
--    if ((MAX_ELF_HDR - sizeof(Elf32_Ehdr))/sizeof(Elf32_Phdr) < u_phnum) {
-+    if ((umin(MAX_ELF_HDR, ph.u_len) - sizeof(Elf32_Ehdr))/sizeof(Elf32_Phdr) < u_phnum) {
-         throwCantUnpack("bad compressed e_phnum");
-     }
- #undef MAX_ELF_HDR
diff --git a/app-arch/upx/files/upx-3.96_CVE-2021-20285.patch b/app-arch/upx/files/upx-3.96_CVE-2021-20285.patch
deleted file mode 100644
index 1d47b2a8bb67..000000000000
--- a/app-arch/upx/files/upx-3.96_CVE-2021-20285.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 3781df9da23840e596d5e9e8493f22666802fe6c Mon Sep 17 00:00:00 2001
-From: John Reiser <jreiser@BitWagon.com>
-Date: Fri, 11 Dec 2020 13:38:18 -0800
-Subject: [PATCH] Check DT_REL/DT_RELA, DT_RELSZ/DT_RELASZ
-
-https://github.com/upx/upx/issues/421
-	modified:   p_lx_elf.cpp
----
- src/p_lx_elf.cpp | 34 +++++++++++++++++++++++++++++-----
- 1 file changed, 29 insertions(+), 5 deletions(-)
-
-diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp
-index 182db192..3a4101cf 100644
---- a/src/p_lx_elf.cpp
-+++ b/src/p_lx_elf.cpp
-@@ -2222,8 +2222,20 @@ bool PackLinuxElf32::canPack()
-                         int z_rsz = dt_table[Elf32_Dyn::DT_RELSZ];
-                         if (z_rel && z_rsz) {
-                             unsigned rel_off = get_te32(&dynseg[-1+ z_rel].d_val);
-+                            if ((unsigned)file_size <= rel_off) {
-+                                char msg[70]; snprintf(msg, sizeof(msg),
-+                                     "bad Elf32_Dynamic[DT_REL] %#x\n",
-+                                     rel_off);
-+                                throwCantPack(msg);
-+                            }
-                             Elf32_Rel *rp = (Elf32_Rel *)&file_image[rel_off];
-                             unsigned relsz   = get_te32(&dynseg[-1+ z_rsz].d_val);
-+                            if ((unsigned)file_size <= relsz) {
-+                                char msg[70]; snprintf(msg, sizeof(msg),
-+                                     "bad Elf32_Dynamic[DT_RELSZ] %#x\n",
-+                                     relsz);
-+                                throwCantPack(msg);
-+                            }
-                             Elf32_Rel *last = (Elf32_Rel *)(relsz + (char *)rp);
-                             for (; rp < last; ++rp) {
-                                 unsigned r_va = get_te32(&rp->r_offset);
-@@ -2562,14 +2574,26 @@ PackLinuxElf64::canPack()
-                         int z_rel = dt_table[Elf64_Dyn::DT_RELA];
-                         int z_rsz = dt_table[Elf64_Dyn::DT_RELASZ];
-                         if (z_rel && z_rsz) {
--                            unsigned rel_off = get_te64(&dynseg[-1+ z_rel].d_val);
-+                            upx_uint64_t rel_off = get_te64(&dynseg[-1+ z_rel].d_val);
-+                            if ((u64_t)file_size <= rel_off) {
-+                                char msg[70]; snprintf(msg, sizeof(msg),
-+                                     "bad Elf64_Dynamic[DT_RELA] %#llx\n",
-+                                     rel_off);
-+                                throwCantPack(msg);
-+                            }
-                             Elf64_Rela *rp = (Elf64_Rela *)&file_image[rel_off];
--                            unsigned relsz   = get_te64(&dynseg[-1+ z_rsz].d_val);
-+                            upx_uint64_t relsz   = get_te64(&dynseg[-1+ z_rsz].d_val);
-+                            if ((u64_t)file_size <= relsz) {
-+                                char msg[70]; snprintf(msg, sizeof(msg),
-+                                     "bad Elf64_Dynamic[DT_RELASZ] %#llx\n",
-+                                     relsz);
-+                                throwCantPack(msg);
-+                            }
-                             Elf64_Rela *last = (Elf64_Rela *)(relsz + (char *)rp);
-                             for (; rp < last; ++rp) {
--                                unsigned r_va = get_te64(&rp->r_offset);
-+                                upx_uint64_t r_va = get_te64(&rp->r_offset);
-                                 if (r_va == user_init_ava) { // found the Elf64_Rela
--                                    unsigned r_info = get_te64(&rp->r_info);
-+                                    upx_uint64_t r_info = get_te64(&rp->r_info);
-                                     unsigned r_type = ELF64_R_TYPE(r_info);
-                                     if (Elf64_Ehdr::EM_AARCH64 == e_machine
-                                     &&  R_AARCH64_RELATIVE == r_type) {
-@@ -2581,7 +2605,7 @@ PackLinuxElf64::canPack()
-                                     }
-                                     else {
-                                         char msg[50]; snprintf(msg, sizeof(msg),
--                                            "bad relocation %#x DT_INIT_ARRAY[0]",
-+                                            "bad relocation %#llx DT_INIT_ARRAY[0]",
-                                             r_info);
-                                         throwCantPack(msg);
-                                     }
diff --git a/app-arch/upx/upx-3.96-r2.ebuild b/app-arch/upx/upx-3.96-r2.ebuild
deleted file mode 100644
index 14c355bb6351..000000000000
--- a/app-arch/upx/upx-3.96-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Ultimate Packer for eXecutables (free version using UCL compression and not NRV)"
-HOMEPAGE="https://upx.github.io/"
-SRC_URI="https://github.com/upx/upx/releases/download/v${PV}/${P}-src.tar.xz"
-
-LICENSE="GPL-2+ UPX-exception" # Read the exception before applying any patches
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/ucl-1.03
-	sys-libs/zlib"
-RDEPEND="${RDEPEND}
-	!app-arch/upx-bin"
-BDEPEND="
-	app-arch/xz-utils[extra-filters]
-	dev-lang/perl"
-
-S="${WORKDIR}/${P}-src"
-
-PATCHES=(
-	"${FILESDIR}/${P}_CVE-2020-24119.patch"
-	"${FILESDIR}/${P}_CVE-2021-20285.patch"
-)
-
-src_compile() {
-	tc-export CXX
-	emake CXXFLAGS_WERROR="" all
-}
-
-src_install() {
-	newbin src/upx.out upx
-	dodoc BUGS NEWS PROJECTS README* THANKS doc/*.txt doc/upx.html
-	doman doc/upx.1
-}
diff --git a/app-arch/upx/upx-4.0.0.ebuild b/app-arch/upx/upx-4.0.0.ebuild
new file mode 100644
index 000000000000..dcfcfaccee67
--- /dev/null
+++ b/app-arch/upx/upx-4.0.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Ultimate Packer for eXecutables (free version using UCL compression and not NRV)"
+HOMEPAGE="https://upx.github.io/"
+SRC_URI="https://github.com/upx/upx/releases/download/v${PV}/${P}-src.tar.xz"
+S="${WORKDIR}/${P}-src"
+
+LICENSE="GPL-2+ UPX-exception" # Read the exception before applying any patches
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="!app-arch/upx-bin"
+BDEPEND="app-arch/xz-utils[extra-filters]"
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 23817949cbe5..f1e82dea9760 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 518730df2a69..9af554dae034 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,10 +1,8 @@
 AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0524e6e2a60631702eb10243da79b8051504e33476e6f8d61a3d9a172302b9859a01afb0d640a502cc95f69e45024a8fdb5ebc53 SHA512 1604d425f4c3267a41449f5d05675634f365d0be0630b49812e87d13ebc4ee78e01259f2371afbf2150b5b1203676e20c50c1613be24e0fa39df635d229f80bc
 AUX borgmatic-1.5.16-systemd_service_bin_path.patch 556 BLAKE2B f90b66d3d46ea972ed67bff74365b72e5e7df16199b439e5ad785b731eaa9a3eff5cfa6c9084c1b212b2359e9b8a14b1d0952ec6a560746acfbe594a2267e0ac SHA512 b23d899754762e29221b537c303e65a3b84e4a580d502f96870e8927ab2ef79b557f2c5638cfc4557ea5dfb6bea82b9776c6a67e65fda8a02138d3c57dfc00e6
 AUX borgmatic-1.7.3-systemd_service_bin_path.patch 604 BLAKE2B 9b1c613ce2667d2b8846e1bdf7e7bd838529fb9029af2ca572dcbafc5a8c9b64c79cab820be3b750c5fcb060da72cdf1c449cbe50efefe63ef1eb6a884e26e14 SHA512 6ca6c351697db1ae26de2b00ad543fc8f1cea1b0f4ef84f82f9578d9e56da58b4437ed48839c5aaf7d5ea66fcb79620d0cc12b8a2b30862b488fae07ad182638
-DIST borgmatic-1.6.6.tar.gz 323601 BLAKE2B b40d8f00e3b7bbd343336cf4c6992e34d8289de451c184717827e8e43519b84d4bb9b8cff6a835a7cc502d2e93045f0196d744e4b6ad800de1276e11c3189cec SHA512 f1a6dfa344ebee89e88f1aa6b43d8493c80815c637d8e0f7f6314462fd511b576e62246d957023ab2f9a68875d2818e2b8ef00cbf3339dc35a93d6ebad0bed19
 DIST borgmatic-1.7.2.tar.gz 333772 BLAKE2B fd628e9c77547686d4edf5d1066d3c171575f4d923ebc5205c5eb64f3a960e94c121282e9f4fb02b1291a81011a18dc393c6d13a07f215585459e7a5b55f8107 SHA512 6ec12ec25ae4d0210bb9114795c1ea292d8236f9e68c9425e24ee7b580796504e4c317a3fcf778806a33bbd3db68669beb4ef7a88ec538c1bd432db9a2845b3e
 DIST borgmatic-1.7.4.tar.gz 337521 BLAKE2B cbdf22c7428d2bd098a8bec0608c9d2fe41ab945aca4921cf78f72a5b73e2ea562a1e9e37705ada615f830b2655977179beca0f9a9bfa2937cc1cde0c292caed SHA512 bd320cbbb108fa20f7acc9a50fd4404166556a74df0a3631a2beca61de0e50c29e1e102345e6c3759538420040f359ff2f0cefe89b49c2c19250a4c7a27acd54
-EBUILD borgmatic-1.6.6.ebuild 1904 BLAKE2B b03ba369e333dc898f8b7901ee651470ccd83d05c37becedbc2f6ddea0b5d29515eb5331015645b1b5f17b921dc180907d1a02edf96a6a1546db4d444f01b415 SHA512 dc5208c3fbed40f6617effc59539e1fcf1cc166ce4083f8a0475b22b0f1a8e70e4f0dcaf35c3acecd6ee6c08b1dd32961d59284b2baba565ea4c558f0bfcebab
 EBUILD borgmatic-1.7.2.ebuild 2132 BLAKE2B f1fbbcda7472bb4b2d4faa8d7470fa23570498fe1299af1fbe01e710c209d467da1c72be978bf9ebf6668661ac7a6dd7b48c9969758f0f3f6fde0c3b92faaad1 SHA512 10962b09f1d1a20aa1937f99274aedcc1da7f97ce5116d2721502d284f1cf0cd4ee06d90d612c775c7a9ef451688e76c88a56cb00a0407b5911d79a0c867fa6b
 EBUILD borgmatic-1.7.4.ebuild 1696 BLAKE2B 60856bcf3b73f9ee31f2b49665637cbd9856f843f6dd62c8ec3cf4a058a3493dd9e7f241450a3644b478b0ed6f8435f374ece20f4863a0a8f929b516b798bf87 SHA512 f957bc2ae30f663388f87623836e0ab19168ccb0ed9c0970a2990f7c2c4861534d9a71fc0376b94ab9b5e01450eca225bac16b298a50b911af11b35dfab11a09
 MISC metadata.xml 380 BLAKE2B bd4f6eb451caa6b36d51dff099c7885ad2c30f2f9f5397e12049a28214601d67853f0dc604e6e42a566b8bf57acf0d9e39c685af8743cce72ec3b5b07adea72e SHA512 1d2c0a22d3b844b58ed35f3fae261a1d6906e5e1b0e69bbe364e0409f335b44f04089ea1d0e6144e2ddfcf066cc8ad85d14c0b22a28ddd22d235c48e1401569f
diff --git a/app-backup/borgmatic/borgmatic-1.6.6.ebuild b/app-backup/borgmatic/borgmatic-1.6.6.ebuild
deleted file mode 100644
index 575babca8947..000000000000
--- a/app-backup/borgmatic/borgmatic-1.6.6.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
-HOMEPAGE="https://torsion.org/borgmatic/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv"
-
-# borg is called as an external tool, hence no pythonic stuff
-RDEPEND="app-backup/borgbackup
-	$(python_gen_cond_dep '
-		<dev-python/colorama-0.5[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		<dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}]
-		')
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
-	"${FILESDIR}"/${PN}-1.5.16-systemd_service_bin_path.patch
-)
-
-# test_borgmatic_version_matches_news_version tries to run the 'borgmatic'
-# executable so making it work would require passing --install
-# to distutils_enable_tests. Given that this is the only test requiring
-# this and that all it does is make sure the NEWS file has been updated
-# for the current version, just skip it.
-EPYTEST_DESELECT=(
-	tests/integration/commands/test_borgmatic.py::test_borgmatic_version_matches_news_version
-)
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-	systemd_dounit sample/systemd/borgmatic.{service,timer}
-	keepdir /etc/borgmatic
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "To generate a sample configuration file, run:"
-		elog "    generate-borgmatic-config"
-	fi
-	elog
-	elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
-}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index f5c09ec14043..7636e03c6089 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 4bff2195c86d..a46d06357ea8 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,12 +1,15 @@
 AUX wine-vanilla-7.0-noexecstack.patch 223 BLAKE2B dff1867e2977bd14fcfab9dfa2c2f1d3288f7edca75ddd7c9f02bfd06e9f63fac37bd59ea8aa891e13ab77bac35b369825d5490a9175ed9a7736e523b61d8944 SHA512 4ba3677042b693e513fc7a133c76a509f63d0ca20633d1e8d448bca9534c0d1a0fc58e77fa9b28fd8d936393605e97ee6e3bb5fac00872d6ac5808b7712586e3
 AUX wine-vanilla-7.0-unwind.patch 1694 BLAKE2B 017c7b761d692f8e8d23f52e51529880f95bddf5fee4309ab97bee951527bd427924dbb335e4bf57a27405e3d2440666f774c6859b81933d3007247e1cbf4898 SHA512 5d20960a8eda2d80097d6db81287c9d05ed4ea50df974c93391a427b743383a6806f24bc552c18a9336e7aea0ceb801972865ff470bde8ea7fd9423f57eb09ae
+AUX wine-vanilla-7.20-unwind.patch 1450 BLAKE2B 3f90cc131104ad72a11ae30c582b79b3e4d8c0278d51c0a193fb9e460cf088b315503bd08bd904e8d28f72f40ab3df90f83f2542b991888a2f504cc7d2adad4d SHA512 a6c4672a44c1220d5b1efabeca535a4a3510fe92aac73c38f65a09bfbd271af8b8b1bfe2c408ba5356806cb71252a6956b8130fcd06a475037b9e51d28c2a156
 DIST wine-7.0.tar.xz 27120912 BLAKE2B 84bfeb28d56f0f40bb93b1b5bf8954c8be2fd90fde5a61608e7c35f48addcce7a4d660e63c3caa3ca2c365d1e83b55a1c3485872b2d6bfa8941e2bce44c4aca6 SHA512 eec17b046ed5447eb540f421c9b2748d9419ce087496c2743a9914fd27bbe5ff9da0cfe47d3cd76fa97323bd1188a1d82b1eef4968d86ed1957dc1a95e28529c
 DIST wine-7.17.tar.xz 28379876 BLAKE2B 536af8f1ac9c4dd8bae2d16cba226c99c45cd64f0a9a2569022baefee61556801d3ee15f480fd18445baecb6c78dd7950f98542dc88a3282ee5d457d0e4ddfb1 SHA512 fd8017e6174db0047a3957db3045b2ad9024e07b1e2f81800521f0b7e7f7660add6a08e09bc60e3d140816cec70aae8324fe15643bd05e541f22f66ffda52508
 DIST wine-7.18.tar.xz 28412876 BLAKE2B 1f25c8669a2afbead142923a39913b3f21df641e446a6136e7ecd282f6c31bc70578036e83f3dd28d22516d987ddca179198f76effb5c9aca089f4755ffa873e SHA512 e651b18cef73b4619e953b746d0c207c0220279003560aaf195c2569a22308af129e1460651a246e6a87dcfbcfcff08f52f970734035eb55ab45d8970fd56a02
 DIST wine-7.19.tar.xz 28502612 BLAKE2B b7b270656955c7a1e1d84e8bbc7e3e8abff5aedadb5e8a458f0b1109d746875a359f3d2f53b1c9c6caae65d17fd1d205466cd3a884034a8bad6afe9456f13b5d SHA512 f76dbda97cccad4c0f249b5dd4e8d48afa832134f1704ae228650bb73ee82823e628b23bd53a3f8729e06a8933597ff2fffa5551f156fc9c9181b67c066747d5
+DIST wine-7.20.tar.xz 28534920 BLAKE2B 2e0cd49a7820f0c885a2a6dbcded6ebbdb5e1ea5576b03dedb7ee066f74f8c675193450cdd45bf5e0224bd588a890138e47a15f513edbfde1eabf1b65c9abe31 SHA512 6e2e65fba2336985df93165050f0f46b752d6aa94fc1581451c58969e2003748378be4b9e16b647ca2922fbdff77920311b12a17bda630a7bccfc7ee8f03b453
 EBUILD wine-vanilla-7.0-r3.ebuild 10250 BLAKE2B ff1189fb02247aef5ac1f2dcc3410f1f57ac4d4a1603290fbcceeff765c77a8c4e9d81ebfc78a850640ead9fb9a4460c508efab048e19f999cd577313864c9e5 SHA512 a33a496cd3e51e216d976354e86e6215988bb9586c20a836d6af328dec7f0e958a8093083ce6b8bd4f292da87e2be6a71be539f19ed6245a03a730feccc05bd7
 EBUILD wine-vanilla-7.17.ebuild 10167 BLAKE2B 6a438475a38c89cf48e9da7d2fa7a968d834fb61dc773aff62400341ba52955468768368ce6296de9fc901666f58771f5da2ed312f2dd43a3ca025b5a2924cd4 SHA512 a588ed61fcb00e657f7b7cea5d4e47cd6a20e53a952b876cd5b913f281526b58a4541a4d034507f19678bd3676eb56f551b8a52f9c4e2784727a27c8796faf5a
 EBUILD wine-vanilla-7.18.ebuild 10167 BLAKE2B 6a438475a38c89cf48e9da7d2fa7a968d834fb61dc773aff62400341ba52955468768368ce6296de9fc901666f58771f5da2ed312f2dd43a3ca025b5a2924cd4 SHA512 a588ed61fcb00e657f7b7cea5d4e47cd6a20e53a952b876cd5b913f281526b58a4541a4d034507f19678bd3676eb56f551b8a52f9c4e2784727a27c8796faf5a
 EBUILD wine-vanilla-7.19.ebuild 10167 BLAKE2B 6a438475a38c89cf48e9da7d2fa7a968d834fb61dc773aff62400341ba52955468768368ce6296de9fc901666f58771f5da2ed312f2dd43a3ca025b5a2924cd4 SHA512 a588ed61fcb00e657f7b7cea5d4e47cd6a20e53a952b876cd5b913f281526b58a4541a4d034507f19678bd3676eb56f551b8a52f9c4e2784727a27c8796faf5a
-EBUILD wine-vanilla-9999.ebuild 10167 BLAKE2B 4bbca19ee8843c2a63dd73fffccadd6da58d88d4d8d8632bf7768925fb3ce53e5fa79ba3f2558c55cb5db7ce23e691dc1679336f49fde63de062404e2eb163a8 SHA512 5c0f021061ffd1a3e658ba6964518095674085f960fc12fd121771d02189eb92d81642ac31673c213cb799ef2d17de60e8de90a02dd0e80fe3dac58331512c08
+EBUILD wine-vanilla-7.20.ebuild 10168 BLAKE2B 44868f3c02cb2f367856d3e9dac77f9b758dd953e1f20ef10fbe5955abdfd46075205b487dc03f13c7ac0a39faa435d101c254e9e2cc086e901035da9882938e SHA512 57454707aae05d8ae8264469f9510a36805d4c85de3304b4eb0c814f416f1df08f9c8bad799de3a3ee47e6add230f22ea2dee7e65197faff7fe24ce7755b4bd0
+EBUILD wine-vanilla-9999.ebuild 10168 BLAKE2B 44868f3c02cb2f367856d3e9dac77f9b758dd953e1f20ef10fbe5955abdfd46075205b487dc03f13c7ac0a39faa435d101c254e9e2cc086e901035da9882938e SHA512 57454707aae05d8ae8264469f9510a36805d4c85de3304b4eb0c814f416f1df08f9c8bad799de3a3ee47e6add230f22ea2dee7e65197faff7fe24ce7755b4bd0
 MISC metadata.xml 2376 BLAKE2B c37d5b769ce6ea0fd6ac0cde1084a332e34c13d31633d5c60970f89a932f621c0332b97b0667bbc42098a01c979919ac9d8d30487f2ad6691259270641b85485 SHA512 2968f0df88d5d95c0c649ae15cbc9088061c915046b2014448dad782a4abfa8cb173b6ec8ac15575329e5ce882342dfd1f5076a0ea8a2e89800fdc9628dc05f9
diff --git a/app-emulation/wine-vanilla/files/wine-vanilla-7.20-unwind.patch b/app-emulation/wine-vanilla/files/wine-vanilla-7.20-unwind.patch
new file mode 100644
index 000000000000..63f9a06a5de8
--- /dev/null
+++ b/app-emulation/wine-vanilla/files/wine-vanilla-7.20-unwind.patch
@@ -0,0 +1,36 @@
+Fix build with llvm-libunwind, and also fix for non-llvm libunwind
+when using clang+bfd given clang doesn't have _Unwind_Find_FDE in
+its rtlib and expects it from llvm-libunwind.
+
+The _CONFIG_H_ check is for <llvm-libunwind-15 (adds _VERSION).
+--- a/dlls/ntdll/unix/dwarf.h
++++ b/dlls/ntdll/unix/dwarf.h
+@@ -255,5 +255,7 @@
+ };
+ 
++#if defined(_LIBUNWIND_VERSION) || defined(____LIBUNWIND_CONFIG_H__) || !defined(__clang__)
+ extern const struct dwarf_fde *_Unwind_Find_FDE (void *, struct dwarf_eh_bases *);
++#endif
+ 
+ static unsigned char dwarf_get_u1( const unsigned char **p )
+--- a/dlls/ntdll/unix/signal_x86_64.c
++++ b/dlls/ntdll/unix/signal_x86_64.c
+@@ -623,5 +623,5 @@
+     int rc;
+ 
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(_LIBUNWIND_VERSION) || defined(____LIBUNWIND_CONFIG_H__)
+     rc = unw_getcontext( &unw_context );
+     if (rc == UNW_ESUCCESS)
+@@ -746,4 +746,5 @@
+ {
+     struct dwarf_eh_bases bases;
++#if defined(_LIBUNWIND_VERSION) || defined(____LIBUNWIND_CONFIG_H__) || !defined(__clang__)
+     const struct dwarf_fde *fde = _Unwind_Find_FDE( (void *)(context->Rip - 1), &bases );
+ 
+@@ -751,4 +752,5 @@
+         return dwarf_virtual_unwind( context->Rip, &dispatch->EstablisherFrame, context, fde,
+                                      &bases, &dispatch->LanguageHandler, &dispatch->HandlerData );
++#endif
+ #ifdef HAVE_LIBUNWIND
+     return libunwind_virtual_unwind( context->Rip, &dispatch->EstablisherFrame, context,
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild
new file mode 100644
index 000000000000..ddfe07cbf57d
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild
@@ -0,0 +1,320 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
+
+WINE_GECKO=2.47.3
+WINE_MONO=7.4.0
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
+else
+	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
+	SRC_URI="https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz"
+	S="${WORKDIR}/wine-${PV}"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
+HOMEPAGE="https://www.winehq.org/"
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
+	llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
+	+gstreamer kerberos ldap +mingw +mono netapi nls odbc openal
+	opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl
+	selinux +ssl +truetype udev udisks +unwind usb v4l +vulkan
+	+xcomposite xinerama"
+REQUIRED_USE="
+	X? ( truetype )
+	crossdev-mingw? ( mingw )" # bug #551124 for truetype
+
+# tests are non-trivial to run, can hang easily, don't play well with
+# sandbox, and several need real opengl/vulkan or network access
+RESTRICT="test"
+
+# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
+WINE_DLOPEN_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXrender[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+		opengl? (
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+			osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+		)
+		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
+WINE_COMMON_DEPEND="
+	${WINE_DLOPEN_DEPEND}
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+	)
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	unwind? (
+		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
+	)
+	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )"
+RDEPEND="
+	${WINE_COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	dos? ( games-emulation/dosbox )
+	gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] )
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
+	mono? ( app-emulation/wine-mono:${WINE_MONO} )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-LibXML
+	)
+	samba? ( net-fs/samba[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="
+	${WINE_COMMON_DEPEND}
+	sys-kernel/linux-headers
+	X? ( x11-base/xorg-proto )"
+BDEPEND="
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )
+	nls? ( sys-devel/gettext )"
+IDEPEND="app-eselect/eselect-wine"
+
+QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0-noexecstack.patch
+	"${FILESDIR}"/${PN}-7.20-unwind.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
+		local mingw=-w64-mingw32
+		for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev abi_x86_32 i686${mingw}); do
+			if ! type -P ${mingw}-gcc >/dev/null; then
+				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
+				eerror "yourself by installing sys-devel/crossdev then running:"
+				eerror
+				eerror "    crossdev --target ${mingw}"
+				eerror
+				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
+				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	# sanity check, bumping these has a history of oversights
+	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
+		dlls/appwiz.cpl/addons.c || die)
+	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
+		local gmfatal=
+		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
+		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
+	fi
+
+	default
+
+	# ensure .desktop calls this variant + slot
+	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
+
+	# always update for patches (including user's wrt #432348)
+	eautoreconf
+	tools/make_requests || die # perl
+}
+
+src_configure() {
+	WINE_PREFIX=/usr/lib/${P}
+	WINE_DATADIR=/usr/share/${P}
+
+	local conf=(
+		--prefix="${EPREFIX}"${WINE_PREFIX}
+		--datadir="${EPREFIX}"${WINE_DATADIR}
+		--includedir="${EPREFIX}"/usr/include/${P}
+		--libdir="${EPREFIX}"${WINE_PREFIX}
+		--mandir="${EPREFIX}"${WINE_DATADIR}/man
+		$(use_enable gecko mshtml)
+		$(use_enable mono mscoree)
+		--disable-tests
+		$(use_with X x)
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with cups)
+		$(use_with fontconfig)
+		$(use_with gphoto2 gphoto)
+		$(use_with gstreamer)
+		$(use_with kerberos gssapi)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		$(use_with mingw)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		--without-oss # media-sound/oss is not packaged (OSSv4)
+		$(use_with pcap)
+		$(use_with pulseaudio pulse)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_with ssl gnutls)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with udisks dbus) # dbus is only used for udisks
+		$(use_with unwind)
+		$(use_with usb)
+		$(use_with v4l v4l2)
+		$(use_with vulkan)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(usev !odbc ac_cv_lib_soname_odbc=)
+	)
+
+	tc-ld-force-bfd #867097
+	use custom-cflags || strip-flags # can break in obscure ways, also no lto
+	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
+
+	# build using upstream's way (--with-wine64)
+	# order matters: configure+compile 64->32, install 32->64
+	local -i bits
+	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
+	(
+		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
+
+		mkdir ../build${bits} || die
+		cd ../build${bits} || die
+
+		# CROSSCC_amd64/x86 are unused by Wine, but recognized here for users
+		if (( bits == 64 )); then
+			: "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}"
+			conf+=( --enable-win64 )
+		elif use amd64; then
+			conf+=(
+				$(usev abi_x86_64 --with-wine64=../build64)
+				TARGETFLAGS=-m32 # for widl
+			)
+			# _setup is optional, but use over Wine's auto-detect (+#472038)
+			multilib_toolchain_setup x86
+		fi
+		: "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}"
+
+		# use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu)
+		if use mingw; then
+			: "${CROSSCFLAGS:=$(
+				filter-flags '-fstack-clash-protection' #758914
+				filter-flags '-fstack-protector*' #870136
+				filter-flags '-mfunction-return=thunk*' #878849
+				CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
+			: "${CROSSLDFLAGS:=$(
+				filter-flags '-fuse-ld=*'
+				CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}"
+			export CROSS{CC,{C,LD}FLAGS}
+		fi
+
+		ECONF_SOURCE=${S} econf "${conf[@]}"
+	)
+	done
+}
+
+src_compile() {
+	use abi_x86_64 && emake -C ../build64 # do first
+	use abi_x86_32 && emake -C ../build32
+}
+
+src_install() {
+	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
+	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
+
+	# symlink for plain 'wine' and install its man pages if 64bit-only #404331
+	if use abi_x86_64 && use !abi_x86_32; then
+		dosym wine64 ${WINE_PREFIX}/bin/wine
+		dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
+		local man
+		for man in ../build64/loader/wine.*man; do
+			: "${man##*/wine}"
+			: "${_%.*}"
+			insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
+			newins ${man} wine.1
+		done
+	fi
+
+	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
+		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
+
+	# create variant wrappers for eselect-wine
+	local bin
+	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
+		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
+	done
+
+	# don't let portage try to strip PE files with the wrong
+	# strip executable and instead handle it here (saves ~120MB)
+	if use mingw; then
+		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
+		use debug ||
+			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
+				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} + || die
+	fi
+
+	dodoc ANNOUNCE AUTHORS README* documentation/README*
+}
+
+wine-eselect() {
+	ebegin "${1^}ing ${P} using eselect-wine"
+	eselect wine ${1} ${P} &&
+		eselect wine ${1} --${PN#wine-} ${P} &&
+		eselect wine update --if-unset &&
+		eselect wine update --${PN#wine-} --if-unset
+	eend ${?} || die -n "eselect failed, may need to manually handle ${P}"
+}
+
+pkg_postinst() {
+	wine-eselect register
+}
+
+pkg_prerm() {
+	nonfatal wine-eselect deregister
+}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index abf112c22c23..ddfe07cbf57d 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -123,7 +123,7 @@ QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-7.0-noexecstack.patch
-	"${FILESDIR}"/${PN}-7.0-unwind.patch
+	"${FILESDIR}"/${PN}-7.20-unwind.patch
 )
 
 pkg_pretend() {
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 2e56980e9872..6c4410cfb8f6 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/tree/Manifest b/app-text/tree/Manifest
index de43a42db739..e13ddc92ce23 100644
--- a/app-text/tree/Manifest
+++ b/app-text/tree/Manifest
@@ -2,7 +2,9 @@ AUX tree.bashcomp 847 BLAKE2B de05dacd7b54426e89e4afbbb6fba74376212a8f02995ff9ba
 DIST tree-1.8.0.tgz 50286 BLAKE2B 51a27500b89a46add6e792d446b465696d2b34339bbd06f03baff9ce589131b5d82c414849f891dbb79a3f3cfb23b89336e783ad23b84c1fb5415a13fb9488cd SHA512 3f657a6278ec5eab2fccab39dfd69bf9376811189a368b5e3213dc900b90a4e7a4961fc58eb80ad2efd5b40d2fbd0146ec59f30fe0bba576f93519214f240695
 DIST tree-2.0.1.tgz 57213 BLAKE2B 977f3bd606881f92f7e39fb167205b468f77408a2fa3ff14c20eeab0e6f194115d2d41a3919751c9c9d103ae185dc231710a464f0c57ea244e8a410782503d6f SHA512 11a45136d62ee7b4acdb599025ddddc250f3b95c46c94cea132bdc226357561bbae3ed874a99e554d2e01a93eaac639fb89d8a2539964ce788540ac3537f0e4c
 DIST tree-2.0.2.tgz 57960 BLAKE2B 3038b4a0f904ba4854ab40d52448fd0859380346d1a355c16fa97dfcae7b650ba4406e970555c79b5c5d5dca31677f5ae2b83cab0178e5580d342956167ba80b SHA512 5b9612ada9e3b1414d06daf5d7589f18480f232ba6ea29a004ceb7ff5b46c57610766bdb2babe9c20047dfea39cb233a6d92a60fcf2c38beccbebc94fb1eb20f
+DIST unix-tree-2.0.4.tar.gz 59497 BLAKE2B c55f8f64f2dfc6364ce3ab5ec26e59860f958eacbf681d1d53848172d474605f71864c1eb7db27be15f3df2fc2979787685e80de76ff817c5cdfafb9c52af203 SHA512 59f391de5792ce9990153c2de06bc545813f9e7aea635c574ef21f1603203146cdad4dbed821266715d716241d7153276aa220626ce8354446dd85df47e75fa6
 EBUILD tree-1.8.0.ebuild 1030 BLAKE2B dda6d49d3582067f9504129acb79111f7696f6d04bc5f15099c86a6775ea8075c7eb6dc016de73810657ffe051d875a3115742342b5640da06d90ed85f3c5a87 SHA512 0836995a09b56e93f1f3fbc87cd443115d401512c19682f745f9152d1212372129707b6a21db6ce73b23b2fafd9d48b6b996011f852fe284a17236f7b89a8951
 EBUILD tree-2.0.1.ebuild 1005 BLAKE2B 7b6112f723b32ef0bc5876eb714b793d1474132c91c15db242e2d56d9b3a4397abd60b5ad7385301ab47e1078f37203f923200f1779fcdf9dedff18c1bf77809 SHA512 6017a985c9ac85b35299b25ad39657e5528c2f1fc7b8add414bd7d85c0d48a330ba70cb0263371a5769b3f8c928b3a935de569a2226d56c6570b4f123a6c9556
 EBUILD tree-2.0.2.ebuild 1013 BLAKE2B 82708437b1c83306b8742ce5023391e0c8009375719ceb9e5d5bd6343991a3b76615f718dbeb792dfa90203c6be432a5b55fbd139ee6728328d7f921284838d2 SHA512 6d8bb2fd0c7249a566b940af7041a62003822225340cfa202e6b35192bde1f3d0116e193a30a14fe2e27927d64b8273b4c0796499d821f975c2346ee584d8324
-MISC metadata.xml 711 BLAKE2B cd01b9d427b665655e8188fc97732646f1e8d5ea149ba8c44efcd6a741d28f2c591800e500884dbe98d485612ec22e0b836f4b638a944409920760e310f604c8 SHA512 e69a2cf69ab9c414467686feba6c4e1f27c23b19a74b53a24835ed90b479597d817823227842c7f4de8132250efd2557684732a4858caecdc1a0a7fd71c04758
+EBUILD tree-2.0.4.ebuild 1074 BLAKE2B f611ebd2f3931fb3beafa8167961d6dcb1e8a0954b21095b92876fb4ff460e87fab1a3ef7ab7537230425a655bda85ad196c0e2b4b043ceb8f60e7b43ae4d449 SHA512 0e8d7382eaeeb4d4a99dd504149191de82bb4fcb9c67f3f5831b312d2b2737b8844db001d74da5aac7654869a87990b76ccb22f46d27f1de410b9df2bf3b5bcc
+MISC metadata.xml 726 BLAKE2B d4e2e3176f82eb4577dbac312756eaee7e50da883c80b0e22a2cf86e75493eb4791ffdef9387a48d5a486cf968526aa483e05b213dc172839f04c528701be69f SHA512 ff609ba8c9839744088c1d77159d039ff46aae920f570842d4dbda9b4b4b4a6956f49815571d5e2d837deac2128bf71fb42316d5520c5a0dfe74f9bec798b56c
diff --git a/app-text/tree/metadata.xml b/app-text/tree/metadata.xml
index 074c45a5cb82..df2247ec43bd 100644
--- a/app-text/tree/metadata.xml
+++ b/app-text/tree/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Jonas Stein</name>
 	</maintainer>
 	<upstream>
-		<changelog>http://mama.indstate.edu/users/ice/tree/changes.html</changelog>
+		<changelog>https://gitlab.com/OldManProgrammer/unix-tree/-/blob/master/CHANGES</changelog>
 		<remote-id type="gitlab">OldManProgrammer/unix-tree</remote-id>
 		<remote-id type="github">Old-Man-Programmer/tree</remote-id>
 	</upstream>
diff --git a/app-text/tree/tree-2.0.4.ebuild b/app-text/tree/tree-2.0.4.ebuild
new file mode 100644
index 000000000000..cea1e23ce933
--- /dev/null
+++ b/app-text/tree/tree-2.0.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit toolchain-funcs flag-o-matic bash-completion-r1
+
+DESCRIPTION="Lists directories recursively, and produces an indented listing of files"
+HOMEPAGE="https://mama.indstate.edu/users/ice/tree/ https://gitlab.com/OldManProgrammer/unix-tree"
+SRC_URI="https://gitlab.com/OldManProgrammer/unix-${PN}/-/archive/${PV}/unix-${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+S=${WORKDIR}/unix-${P}
+
+RDEPEND=""
+DEPEND=""
+
+src_prepare() {
+	if use !elibc_glibc ; then
+		# 433972, also previously done only for elibc_uclibc
+		sed -i -e '/^OBJS=/s/$/ strverscmp.o/' Makefile || die
+	fi
+	default
+}
+
+src_compile() {
+	append-lfs-flags
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin tree
+	doman doc/tree*.1
+	einstalldocs
+	newbashcomp "${FILESDIR}"/${PN}.bashcomp ${PN}
+}
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index 9ce82a22f856..8746253a386a 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -1,3 +1,5 @@
 DIST yelp-tools-42.0.tar.xz 38788 BLAKE2B 9dc34f4b32c9e705f427bccad5ff3c2cd222a1391a780dde145ea894e1065fc873fd4ef020d1b7809b653c8237fbedb7f0b07d684d8d906b7af7a0fd8ebf79e4 SHA512 ff6168a33b2dedd12f7fb5d5aa6394a554b7ad8956cc7121e5f1a520f9fb20bd4cad93e22b5e8b2f8aa82ca5a1711a0634d8619c731e46730084e28f29725786
+DIST yelp-tools-42.1.tar.xz 38936 BLAKE2B 9c068fb6c41fc6a9f22b1ffd632eeb648685b7bd09cad498910ddfa56696218ebaf643c17a6951756c88978bdae82c0622068c43e4f57ff57a96fa6d6b86a95f SHA512 e05a61d18179a9816ec38d1a2335091a3846cf74bb1ecec5374c9a13cc8962d14416208e04eec92f4ee43ec90e1992cc4a263bc4c267caac5d154a15f10d3006
 EBUILD yelp-tools-42.0.ebuild 942 BLAKE2B 278d2168f61a266497df7502b5d243f9ed5ae8d59a581c247a91124e370301aff7b28f826b5c7b78fbefa73d4af1cd100eeda2b7d05eb75f0bdde72d6a2b65ec SHA512 391128b9c1aa1a597ebd30852339f2c0b10feebab5f21dd0b00629dabb44046fb56c93696422fdf3ba02d5ac7b4cdd8e364b9d1f50f18b9a60579d769799936d
+EBUILD yelp-tools-42.1.ebuild 949 BLAKE2B 4618132283ab706836f579c095f7ffbb9006b9a504ebabaf6077b3ef2d0ac7cf4f0ba452d62de8eb187a3e6e341ed3222ac47d156615717e2ee69ec41431d362 SHA512 b0f77070be6f939ba6fad4af3953f8717ececa191c8e09f3dcdc2a2ce1bc1280be8d0e933e29cc9ca718db0ee0c8ec72c9786e2e80434577bf9b74b27c65d34d
 MISC metadata.xml 351 BLAKE2B 855082b254e97a1ffe3ea35ce22c13e7ce4f48439a13d4bf247b838e80b58b784fdfb7974428d61c8ecf2289a73fd53414ffbf695ce7f78601cb3aaf83e6a162 SHA512 4ed64fb35de4e069dd55c0b4affd587507bbb47560b1e632d425c660fb3edc79d89a36003039558aba832344584e1467bd734c4079197322be282cb77957d880
diff --git a/app-text/yelp-tools/yelp-tools-42.1.ebuild b/app-text/yelp-tools/yelp-tools-42.1.ebuild
new file mode 100644
index 000000000000..3406989d1bcd
--- /dev/null
+++ b/app-text/yelp-tools/yelp-tools-42.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+inherit gnome2 meson python-single-r1
+
+DESCRIPTION="Collection of tools for building and converting documentation"
+HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
+
+LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+	>=dev-libs/libxml2-2.6.12
+	>=dev-libs/libxslt-1.1.8
+	dev-util/itstool
+	>=gnome-extra/yelp-xsl-3.38
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/yelp-{build,check,new}
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index b817f99fe17f..8dd3134a399d 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest
index c0df0909e1ac..95adb8f9726b 100644
--- a/dev-libs/libutf8proc/Manifest
+++ b/dev-libs/libutf8proc/Manifest
@@ -2,4 +2,4 @@ DIST libutf8proc-2.7.0.tar.gz 187906 BLAKE2B b2b3dc86ffa38f1d75293455cca22d3c0a0
 DIST libutf8proc-EastAsianWidth-14.0.0.xz 70420 BLAKE2B c2fa8ec34ae3cccb532d8ba82dc7ef40d82da2ed2f4bf187ef0df28cecd2e91320e25287e7bc6e7f22ffa6730af7b910b73d69172664235f3236c16a5ffe990f SHA512 5bd11dc8c30d12692d3cbca932c1bda5e19d9b5e99fc9f1a3ff8864e4f0e577769c4e1f91338cad10a468c38b904cf16b99ba44f44b80695cac23fe436f1e24a
 EBUILD libutf8proc-2.7.0-r1.ebuild 1484 BLAKE2B d4bcf35c2896de29170f2f6e772f633aae44e881ec39a0b26e6f8af4725f689dfa700bdbb7e565d0b2b7e44383f610dad7c5840f6febf46ec4c2774c4390b8fe SHA512 1c8391a5747aa714c55a3a609330a117af0be1d0dfc4cc68aab1a7d2a1efd6bddcdc0ed2d49fcf5709fba4e5acf3af1798b1e2854db62a6691c1373bc124510e
 EBUILD libutf8proc-2.7.0.ebuild 1456 BLAKE2B ef13c6975061df3b1f76f3900ce4a3dfcbb7ba42b83104414fbd7645452106e64dcd3f2fbeacd6458593c53d2f6d91329a8e936ce0124732c00881e5352214ad SHA512 92c99005775c5d2029ad9a7864bd10ba03d52f6c8cb678075132221d167e7d17a144c771368d62ad4f6bccc1d455a2b53fef2a423a279927d950ee8773bf6c06
-MISC metadata.xml 249 BLAKE2B a37da98d387308dab889eab2665b67e4176707f3c115a7a69cb7f4b19f9864b96bc2fe70efa105e627c4b57a7d626f6b23dc2709a225a9debada3356f3cf32a0 SHA512 a5095fb01e05f24583a962e36131b2f02cf2d1dd7a97051200e465ad97db014721de7c1857f5eb736cb0290682e8de833cb4c735f7de8d98cdfae1aed6d3d549
+MISC metadata.xml 335 BLAKE2B ff350963fd5107b123b5d00bbd247a04b1339fff79e264540fe73b2365055b33f0da742de01d3b7b8dce0811dbcd2cbc329a5985c6c5953587cedfc43e9bb3ac SHA512 ce032d933cbfe1254988d065206fc4940840484a2b6b044d7a0e8130d5ea5df61cab7f3a73b47c56d2f82bc975e7adfad43e0f248f4939589aa9975083b72eb8
diff --git a/dev-libs/libutf8proc/metadata.xml b/dev-libs/libutf8proc/metadata.xml
index 987ce1bc2ed6..78d1f13937f3 100644
--- a/dev-libs/libutf8proc/metadata.xml
+++ b/dev-libs/libutf8proc/metadata.xml
@@ -5,4 +5,7 @@
 		<email>hattya@gentoo.org</email>
 		<name>Akinori Hattori</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">JuliaStrings/utf8proc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 06063b458b54..cf75b9e61496 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/readline/Manifest b/dev-lua/readline/Manifest
index e41f1c82aa9e..c6ead72c8523 100644
--- a/dev-lua/readline/Manifest
+++ b/dev-lua/readline/Manifest
@@ -1,5 +1,3 @@
-DIST lua-readline-3.1.tar.gz 16114 BLAKE2B 372bc61573b20c8ebf66bb684624dde9d5ce7868543294450ef3d47bba5a042c5d7f4262366f2de2db8d3d92bbf7fb4895d29577af34307d7b145e6f913ec957 SHA512 d3bee61b6c876e96d2c1097e29862a3f16d1e666b1087e58899f59a3115f9af31793492edfcc3f3802565f98f276960d382a89c0b6cfb1d54acfd37ad006b74b
 DIST lua-readline-3.2.tar.gz 16215 BLAKE2B 889db8cfefc37008fac9f92b6ef071147763d00f01ca42b31646594e812ab936187e65e8959e723be409d21c3e3cc2d93fe52eafac79e37b7d0cec2216d8accf SHA512 d605b99f2fa06920e67125b462f257f8cd263912b6ffba173bee77425c77f6b08b463ec4c0851c81dfc23e736698c9fbbb40e8a935cada2329b6a8e02a6cdaad
-EBUILD readline-3.1.ebuild 1618 BLAKE2B b027dd645f14d7d36ef7eb4c903b1e6ffb112c506789b4880efe3d84329180d6553c2fdf449cc13fddb538de0a6430a30eb5ce890b5200e9b5c7bc74724e55d3 SHA512 5618f10cf58f52750252aba977b57a3ca993feb244eb9789d9740442a106448d593a7d3b3c932a8c41c8ff885e5a67afcbd4e202f9930e9a0fb8c8e07afa7739
-EBUILD readline-3.2.ebuild 1620 BLAKE2B c010b63f5c37b7864b60870170bca89d3ef52290ac9f21c2874642da0e563d2898dc2eec5253692be0b2c116f97e8a1d64940b003c61c93c274f9c20e590d7c9 SHA512 d6f18c32943bf9828d604d941648d08b7b22f865948a055350008f96e275bf69292ba34c592f5fae969d4882d223a0c2830fd70830a3226dc0feca47ad03c364
+EBUILD readline-3.2.ebuild 1618 BLAKE2B b027dd645f14d7d36ef7eb4c903b1e6ffb112c506789b4880efe3d84329180d6553c2fdf449cc13fddb538de0a6430a30eb5ce890b5200e9b5c7bc74724e55d3 SHA512 5618f10cf58f52750252aba977b57a3ca993feb244eb9789d9740442a106448d593a7d3b3c932a8c41c8ff885e5a67afcbd4e202f9930e9a0fb8c8e07afa7739
 MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/dev-lua/readline/readline-3.1.ebuild b/dev-lua/readline/readline-3.1.ebuild
deleted file mode 100644
index 7d1172e9d37d..000000000000
--- a/dev-lua/readline/readline-3.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit lua toolchain-funcs
-
-DESCRIPTION="A simple interface to the readline and history libraries"
-HOMEPAGE="https://pjb.com.au/comp/lua/readline.html"
-SRC_URI="https://pjb.com.au/comp/lua/${P}.tar.gz -> lua-${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-# Tests are interactive
-RESTRICT="test"
-
-RDEPEND="
-	dev-lua/luaposix
-	sys-libs/readline:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	lua_copy_sources
-}
-
-lua_src_compile() {
-	pushd "${BUILD_DIR}" || die
-
-	local compiler=(
-		"$(tc-getCC)"
-		"${CFLAGS}"
-		"-fPIC"
-		"$(lua_get_CFLAGS)"
-		"-c C-readline.c"
-		"-o C-readline.o"
-	)
-	einfo "${compiler[@]}"
-	${compiler[@]} || die
-
-	local linker=(
-		"$(tc-getCC)"
-		"-shared"
-		"${LDFLAGS}"
-		"$($(tc-getPKG_CONFIG) --libs readline)"
-		"-o C-readline.so"
-		"C-readline.o"
-	)
-	einfo "${linker[@]}"
-	${linker[@]} || die
-
-	popd
-}
-
-src_compile() {
-	lua_foreach_impl lua_src_compile
-}
-
-lua_src_test() {
-	pushd "${BUILD_DIR}" || die
-	LUA_CPATH="./?.so;${ESYSROOT}/usr/$(get_libdir)/lua/$(ver_cut 1-2 $(lua_get_version))/?.so" ${ELUA} test/test_rl.lua || die
-	popd || die
-}
-
-src_test() {
-	lua_foreach_impl lua_src_test
-}
-
-lua_src_install() {
-	pushd "${BUILD_DIR}" || die
-
-	insinto "$(lua_get_cmod_dir)"
-	doins C-readline.so
-
-	insinto "$(lua_get_lmod_dir)"
-	doins readline.lua
-
-	popd || die
-}
-
-src_install() {
-	lua_foreach_impl lua_src_install
-
-	docinto html
-	dodoc doc/readline.html
-}
diff --git a/dev-lua/readline/readline-3.2.ebuild b/dev-lua/readline/readline-3.2.ebuild
index 813f6f10ba3e..7d1172e9d37d 100644
--- a/dev-lua/readline/readline-3.2.ebuild
+++ b/dev-lua/readline/readline-3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://pjb.com.au/comp/lua/${P}.tar.gz -> lua-${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 # Tests are interactive
diff --git a/dev-perl/HTTP-Daemon-SSL/HTTP-Daemon-SSL-1.04.ebuild b/dev-perl/HTTP-Daemon-SSL/HTTP-Daemon-SSL-1.04-r1.ebuild
index 5f0fe2300222..ac62955b98a1 100644
--- a/dev-perl/HTTP-Daemon-SSL/HTTP-Daemon-SSL-1.04.ebuild
+++ b/dev-perl/HTTP-Daemon-SSL/HTTP-Daemon-SSL-1.04-r1.ebuild
@@ -11,6 +11,8 @@ DESCRIPTION="A simple http server class with SSL support"
 
 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"
+IUSE="test"
+RESTRICT="test"
 
 RDEPEND="
 	dev-perl/IO-Socket-INET6
@@ -18,4 +20,7 @@ RDEPEND="
 "
 
 DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-perl/HTTP-Daemon )
+"
diff --git a/dev-perl/HTTP-Daemon-SSL/Manifest b/dev-perl/HTTP-Daemon-SSL/Manifest
index 21922521949f..2f576f1bc00e 100644
--- a/dev-perl/HTTP-Daemon-SSL/Manifest
+++ b/dev-perl/HTTP-Daemon-SSL/Manifest
@@ -1,3 +1,3 @@
 DIST HTTP-Daemon-SSL-1.04.tar.gz 9237 BLAKE2B 17eba9f46fa78e4bc8c8c56e445f578aca9965d134a2fbd2c19dd6806c4bae956421e9767598a40d4075c68ed9e1744b09ecb09de74185af172f12940fa930c5 SHA512 ff7b1350c376e1c1c743db6becde4c1633ac0dd8da4261d0134a6cad26586b7b296d09f89afa31d529adfe3fc14fad5551ba3c5bba6005f60699fe6b47046c3b
-EBUILD HTTP-Daemon-SSL-1.04.ebuild 550 BLAKE2B 03632dc87693ccfd5a727aef16076648132a84474fedb9d128517aea6dbe6b2b81e36222eb3c9dc0bea7b908d6ca5337076557f92f479a5c1728f7565f1020d9 SHA512 10250699fca6545ff8dd62c76665f2430bd0f4dfc9de8e674ae312bc15d98c680c0135977a9cbed284b518b2db441a9ed29b1c7c9378238941612f32af2cf5b1
+EBUILD HTTP-Daemon-SSL-1.04-r1.ebuild 613 BLAKE2B 8c65f67a30d6567104092f153e4f9539bbea0718a74f61f3db778d39172e78084719d32d302db8d1e66df2636674d0639021d79b9282e7e5700a96bb250ae7f4 SHA512 d017b224f547174e62d5bcedfe3196e53a7b545fbd8ff01aba1d54b8b087ca88ac3e5c8e8c532b3cd862d88ba0d6cd1ea8102fc62ba3aa385262e2acfb9ca1c4
 MISC metadata.xml 460 BLAKE2B 1ac68d1d1003cbc74a61358fbe4d7616cd35cf6580d0633bc0bbde8701d298e45a6cd7a64595ed3460394f6b2f1496690e3edc95cc08616f2727f7e03ca89894 SHA512 5de6dec3b2b3b5c0978ea02940527f17871bf0ead5b93f8a1b7aa9928bfbf55ec6c340916b2f8cc88eec3d4b33213aae9197c6b81f78f20a49273074f4ebff1b
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 9c8abf216d5a..13d841e07514 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index f0a85ad8c548..8894cf6ba7d2 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index a314d98a48d9..45732226a8e4 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 31 Oct 2022 20:09:37 +0000
+Tue, 01 Nov 2022 02:11:34 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 3468dca39d38..e56b845cfa25 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 534819 BLAKE2B d1b75b8595407c89720bffe60de9ef926b1b2fa554d41f72384a1ef574e8143c7b19376a3a952ce0891748b7e20ae130a308a1d484c5608ff67945bce9aced54 SHA512 8fa7a0539dd3497dd7b1179e79b7856ac1a8e5187769d1e550a5b52ec09f9738f6c5c6939fee08ddc950dc6d06c0e39438349fd56e7d1579e8b40ebbdc3f0f26
-TIMESTAMP 2022-10-31T20:09:41Z
+MANIFEST Manifest.files.gz 535926 BLAKE2B 7e9b114515adc37e042d0429c05c612bcd37904f6b0e36bb719022725a4c1368a02f1c681914401ccbd4e7d79b897cc0a5bc5cba7a40b3414033dc0ad825e3ad SHA512 9eb1f214127edcde3efe4a83f3f692a941753cc1403b9d080cffc6f566f30dbc3f8933ceb8f23653cbe17e6341f056577f75cf8eb955ad5c636486da9f629092
+TIMESTAMP 2022-11-01T02:11:37Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNgK4VfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNggFlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD4IBAAjTq9SIDEgJXwRFYJyv8ml6Ww45gXq39gLz0ZsFNTAkFmqDnAt//URujz
-ONSK4M6yY1WZc+WcmLWHs5qSHBG/ed6l10AAvxV02+GlpC4QpfedZeQUjm8e2pfL
-5IWzPDzp+IzhVwDPheUmT5VS0AqGpx+stWLj7P2hkK7N5lExDtcN2BV73cV8IOVz
-DXfop0Psbp25/hmpoawqG6jOYX8fexEa0BHufRKCdQmtroPW3hWhzssl6ZM9hesJ
-Vtqr7gqtXIe0/jRKZqCGnuBgLx6+Exa0JeD2nRdUWSNpR/3a6rpMI8P23p0Lt6Vs
-8VKmPwnmg1iROnvMEQZcyVMoqjde1UTSDTzVTZ8AvbKf9FcqUqoBGMbvriXfKdl9
-3SiO7eaaTHla7EwyIGQc7C/RyvAY+E1wzrPrX3QRHDVDLfihdF6hojfDWlCVI4LQ
-7mLySE/vNcKpae071WcW9t3cT4rqAsnl3WzCdRRc826bmzaQEoVMUFIG3bic2+OJ
-5/3p4V55yoW6IkbPgmI8x5VBaTVljhQzNEGnvJyr12jKSMhOCquL2SRPhT4N2tkz
-koFIrS1djAFPCzq8pQgJr292fbjdaLoC/ATsFaA/2tOKEayZ1nCxxL2UMwc0aLs8
-xp7Q/wec31w/56bVn/WuwAx0RNfYxrkev7rAGLg0d1zNQhkK0Q0=
-=ra8K
+klCMyhAAquA5bUgbpLXNPHVDWec0qs0r3NOq+I/y77XTbyEbjmyR5qehaosbUgCh
+j5YhCU3gb3/D1dX/yOrZGkHynxqEe5z2glzLMqOKzqW/qM2YTMMhqvkGl7YfIFQ2
+0JQbL/mcKNLklqxdMTQxLxWkxFJP4Yo0EqawLMz4R/jE0VOrWA2ITHFA6jKfHzVo
+LfagACiliZtuQXBwqk7o50+fYBqcfG++C95WhLmQ7tzhS3hMvF3ohztyvb55ipnP
+dKQ1FDU1eFW1fZpgPk5mBZmnC0oIeenamgX5eDMylcMv2Jq42C/4KsxF6RlQsL9m
+W9r0ds8var3uweSWt/YFjBVwmTsqh83zcX7xAsWOxyCVOsYtbKY0K/u03rchqUi4
+q+B/+HuRQXS5HBTu8Wl3WvAfGbfWIKX3uyIBT4sIaWINQBPZ26NSoefdeZ8f5Vnp
+nBpxurBU4nJVKnT57DzXCzmkBcgqJLR9SHkw9mA0FRnZQHpWg8pmYFpOAzzZ0I7l
+xSuCSGef+ZT7XnGBleut+kqEUTSnGYTeXntahYNTGnvGlSrRYqBLoDbKCY9GvKK6
+XQH7u6/7pPw2dPXMHCk9cBm4I07IIqC6A2J3Z0vzwJ6ysUJJEe2AdcF0i4yse5DU
+Y9LUGfHwabKi2CoBla7tTyvgtdP36BxBKQ7qGnPA+bhQOgC/jt4=
+=OQEG
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index 8e591d03ea6d..5dae7a8bf4e8 100644
--- a/metadata/glsa/Manifest.files.gz
+++ b/metadata/glsa/Manifest.files.gz
diff --git a/metadata/glsa/glsa-202210-36.xml b/metadata/glsa/glsa-202210-36.xml
new file mode 100644
index 000000000000..04ac36eb67fd
--- /dev/null
+++ b/metadata/glsa/glsa-202210-36.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202210-36">
+    <title>libjxl: Denial of Service</title>
+    <synopsis>A vulnerability has been found in libjxl which could result in denial of service.</synopsis>
+    <product type="ebuild">libjxl</product>
+    <announced>2022-10-31</announced>
+    <revised count="1">2022-10-31</revised>
+    <bug>856037</bug>
+    <access>remote</access>
+    <affected>
+        <package name="media-libs/libjxl" auto="yes" arch="*">
+            <unaffected range="ge">0.7.0_pre20220825</unaffected>
+            <vulnerable range="lt">0.7.0_pre20220825</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>libjxl is the JPEG XL image format reference implementation.</p>
+    </background>
+    <description>
+        <p>libjxl contains an unecessary assertion in jxl::LowMemoryRenderPipeline::Init.</p>
+    </description>
+    <impact type="low">
+        <p>An attacker can cause a denial of service of the libjxl process via a crafted input file.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=media-libs/libjxl-0.7.0_pre20220825"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-34000">CVE-2022-34000</uri>
+    </references>
+    <metadata tag="requester" timestamp="2022-10-31T20:21:23.265436Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2022-10-31T20:21:23.274675Z">ajak</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/glsa-202210-37.xml b/metadata/glsa/glsa-202210-37.xml
new file mode 100644
index 000000000000..2d82af3c3df0
--- /dev/null
+++ b/metadata/glsa/glsa-202210-37.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202210-37">
+    <title>PJSIP: Multiple Vulnerabilities</title>
+    <synopsis>Multiple vulnerabilities have been found in PJSIP, the worst of which could result in arbitrary code execution.</synopsis>
+    <product type="ebuild">pjproject</product>
+    <announced>2022-10-31</announced>
+    <revised count="1">2022-10-31</revised>
+    <bug>803614</bug>
+    <bug>829894</bug>
+    <bug>875863</bug>
+    <access>remote</access>
+    <affected>
+        <package name="net-libs/pjproject" auto="yes" arch="*">
+            <unaffected range="ge">2.12.1</unaffected>
+            <vulnerable range="lt">2.12.1</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>PJSIP is a free and open source multimedia communication library written in C language implementing standard based protocols such as SIP, SDP, RTP, STUN, TURN, and ICE.</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in PJSIP. Please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="normal">
+        <p>Please review the referenced CVE identifiers for details.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All PJSIP users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=net-libs/pjproject-2.12.1"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-32686">CVE-2021-32686</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-37706">CVE-2021-37706</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-41141">CVE-2021-41141</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-43804">CVE-2021-43804</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-43845">CVE-2021-43845</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-21722">CVE-2022-21722</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-21723">CVE-2022-21723</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-23608">CVE-2022-23608</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-24754">CVE-2022-24754</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-24763">CVE-2022-24763</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-24764">CVE-2022-24764</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-24786">CVE-2022-24786</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-24792">CVE-2022-24792</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-24793">CVE-2022-24793</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-31031">CVE-2022-31031</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-39244">CVE-2022-39244</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-39269">CVE-2022-39269</uri>
+    </references>
+    <metadata tag="requester" timestamp="2022-10-31T20:22:18.091924Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2022-10-31T20:22:18.099528Z">ajak</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/glsa-202210-38.xml b/metadata/glsa/glsa-202210-38.xml
new file mode 100644
index 000000000000..82ab94939724
--- /dev/null
+++ b/metadata/glsa/glsa-202210-38.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202210-38">
+    <title>Expat: Denial of Service</title>
+    <synopsis>A vulnerability has been found in Expat which could result in denial of service.</synopsis>
+    <product type="ebuild">expat</product>
+    <announced>2022-10-31</announced>
+    <revised count="1">2022-10-31</revised>
+    <bug>878271</bug>
+    <access>remote</access>
+    <affected>
+        <package name="dev-libs/expat" auto="yes" arch="*">
+            <unaffected range="ge">2.5.0</unaffected>
+            <vulnerable range="lt">2.5.0</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>Expat is a set of XML parsing libraries.</p>
+    </background>
+    <description>
+        <p>In certain out-of-memory situations, Expat may free memory before it should, leading to a use-after-free.</p>
+    </description>
+    <impact type="low">
+        <p>A use-after-free can result in denial of service.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All Expat users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=dev-libs/expat-2.5.0"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-43680">CVE-2022-43680</uri>
+    </references>
+    <metadata tag="requester" timestamp="2022-10-31T20:22:43.385930Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2022-10-31T20:22:43.392589Z">ajak</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/glsa-202210-39.xml b/metadata/glsa/glsa-202210-39.xml
new file mode 100644
index 000000000000..ef2d7e2ae394
--- /dev/null
+++ b/metadata/glsa/glsa-202210-39.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202210-39">
+    <title>libxml2: Multiple Vulnerabilities</title>
+    <synopsis>Multiple vulnerabilities have been found in libxml2, the worst of which could result in arbitrary code execution.</synopsis>
+    <product type="ebuild">libxml2</product>
+    <announced>2022-10-31</announced>
+    <revised count="1">2022-10-31</revised>
+    <bug>877149</bug>
+    <access>remote</access>
+    <affected>
+        <package name="dev-libs/libxml2" auto="yes" arch="*">
+            <unaffected range="ge">2.10.3</unaffected>
+            <vulnerable range="lt">2.10.3</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>libxml2 is the XML C parser and toolkit developed for the GNOME project.</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in libxml2. Please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="high">
+        <p>Please review the referenced CVE identifiers for details.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All libxml2 users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=dev-libs/libxml2-2.10.3"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-40303">CVE-2022-40303</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-40304">CVE-2022-40304</uri>
+    </references>
+    <metadata tag="requester" timestamp="2022-10-31T20:24:32.137926Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2022-10-31T20:24:32.143989Z">ajak</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/glsa-202210-40.xml b/metadata/glsa/glsa-202210-40.xml
new file mode 100644
index 000000000000..6f4199b2230c
--- /dev/null
+++ b/metadata/glsa/glsa-202210-40.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202210-40">
+    <title>SQLite: Multiple Vulnerabilities</title>
+    <synopsis>Multiple vulnerabilities have been found in SQLite, the worst of which could result in arbitrary code execution.</synopsis>
+    <product type="ebuild">sqlite</product>
+    <announced>2022-10-31</announced>
+    <revised count="1">2022-10-31</revised>
+    <bug>777990</bug>
+    <bug>863431</bug>
+    <access>remote</access>
+    <affected>
+        <package name="dev-db/sqlite" auto="yes" arch="*">
+            <unaffected range="ge">3.39.2</unaffected>
+            <vulnerable range="lt">3.39.2</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>SQLite is a C library that implements an SQL database engine.</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in SQLite. Please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="high">
+        <p>Please review the referenced CVE identifiers for details.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All SQLite users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=dev-db/sqlite-3.39.2"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-20227">CVE-2021-20227</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-35737">CVE-2022-35737</uri>
+    </references>
+    <metadata tag="requester" timestamp="2022-10-31T20:24:49.875919Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2022-10-31T20:24:49.881750Z">ajak</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/glsa-202210-41.xml b/metadata/glsa/glsa-202210-41.xml
new file mode 100644
index 000000000000..ef96ac8f4e1b
--- /dev/null
+++ b/metadata/glsa/glsa-202210-41.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202210-41">
+    <title>android-tools: Multiple Vulnerabilities</title>
+    <synopsis>Multiple vulnerabilities have been found in android-tools, the worst of which could result in arbitrary code execution.</synopsis>
+    <product type="ebuild">android-tools</product>
+    <announced>2022-10-31</announced>
+    <revised count="1">2022-10-31</revised>
+    <bug>878281</bug>
+    <access>remote</access>
+    <affected>
+        <package name="dev-util/android-tools" auto="yes" arch="*">
+            <unaffected range="ge">33.0.3</unaffected>
+            <vulnerable range="lt">33.0.3</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>android-tools contains Android platform tools (adb, fastboot, and mkbootimg).</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in android-tools. Please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="normal">
+        <p>Please review the referenced CVE identifiers for details.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All android-tools users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=dev-util/android-tools-33.0.3"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-3168">CVE-2022-3168</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-20128">CVE-2022-20128</uri>
+    </references>
+    <metadata tag="requester" timestamp="2022-10-31T20:25:11.012259Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2022-10-31T20:25:11.018064Z">ajak</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/glsa-202210-42.xml b/metadata/glsa/glsa-202210-42.xml
new file mode 100644
index 000000000000..608226a9c77f
--- /dev/null
+++ b/metadata/glsa/glsa-202210-42.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202210-42">
+    <title>zlib: Multiple vulnerabilities</title>
+    <synopsis>A buffer overflow in zlib might allow an attacker to cause remote code execution.</synopsis>
+    <product type="ebuild">zlib</product>
+    <announced>2022-10-31</announced>
+    <revised count="1">2022-10-31</revised>
+    <bug>863851</bug>
+    <bug>835958</bug>
+    <access>remote</access>
+    <affected>
+        <package name="sys-libs/zlib" auto="yes" arch="*">
+            <unaffected range="ge">1.2.12-r3</unaffected>
+            <vulnerable range="lt">1.2.12-r3</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>zlib is a widely used free and patent unencumbered data compression library.</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in zlib. Please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="normal">
+        <p>Maliciously crafted input handled by zlib may result in remote code execution.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All zlib users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=sys-libs/zlib-1.2.12-r3"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-25032">CVE-2018-25032</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-37434">CVE-2022-37434</uri>
+    </references>
+    <metadata tag="requester" timestamp="2022-10-31T20:36:54.413772Z">sam</metadata>
+    <metadata tag="submitter" timestamp="2022-10-31T20:36:54.421673Z">ajak</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 334485abf617..45732226a8e4 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 31 Oct 2022 20:09:38 +0000
+Tue, 01 Nov 2022 02:11:34 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index 7d73b3116d6b..1ed7e2bb76fb 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-794e005ddee1af19fec133f96c714f4b8786a377 1667246504 2022-10-31T20:01:44+00:00
+19befd853907b89ff1a5ea81ae63b19dbb1d7655 1667248658 2022-10-31T20:37:38+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 86bc416482e8..dc63d5eb50bc 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 7c387beeaff8..f0715f0182a3 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/upx-3.96-r2 b/metadata/md5-cache/app-arch/upx-3.96-r2
deleted file mode 100644
index 99e7e2a85b28..000000000000
--- a/metadata/md5-cache/app-arch/upx-3.96-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/xz-utils[extra-filters] dev-lang/perl
-DEFINED_PHASES=compile install
-DEPEND=>=dev-libs/ucl-1.03 sys-libs/zlib
-DESCRIPTION=Ultimate Packer for eXecutables (free version using UCL compression and not NRV)
-EAPI=7
-HOMEPAGE=https://upx.github.io/
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2+ UPX-exception
-RDEPEND=!app-arch/upx-bin
-SLOT=0
-SRC_URI=https://github.com/upx/upx/releases/download/v3.96/upx-3.96-src.tar.xz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=ed8c79217d0a194be6850a98491fd2fd
diff --git a/metadata/md5-cache/app-arch/upx-4.0.0 b/metadata/md5-cache/app-arch/upx-4.0.0
new file mode 100644
index 000000000000..37d8249f767f
--- /dev/null
+++ b/metadata/md5-cache/app-arch/upx-4.0.0
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/xz-utils[extra-filters] >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Ultimate Packer for eXecutables (free version using UCL compression and not NRV)
+EAPI=8
+HOMEPAGE=https://upx.github.io/
+INHERIT=cmake
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+ UPX-exception
+RDEPEND=!app-arch/upx-bin
+SLOT=0
+SRC_URI=https://github.com/upx/upx/releases/download/v4.0.0/upx-4.0.0-src.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=3a2fe5b1e9688c47fc56f6a87363a399
diff --git a/metadata/md5-cache/app-arch/upx-bin-3.96 b/metadata/md5-cache/app-arch/upx-bin-3.96
deleted file mode 100644
index ef3febc536c5..000000000000
--- a/metadata/md5-cache/app-arch/upx-bin-3.96
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/xz-utils[extra-filters]
-DEFINED_PHASES=install
-DESCRIPTION=Ultimate Packer for eXecutables, binary version with proprietary NRV compression
-EAPI=7
-HOMEPAGE=https://upx.github.io/
-INHERIT=pax-utils
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!app-arch/upx
-RESTRICT=strip
-SLOT=0
-SRC_URI=x86? ( https://github.com/upx/upx/releases/download/v3.96/upx-3.96-i386_linux.tar.xz ) amd64? ( https://github.com/upx/upx/releases/download/v3.96/upx-3.96-amd64_linux.tar.xz ) arm64? ( https://github.com/upx/upx/releases/download/v3.96/upx-3.96-arm64_linux.tar.xz ) arm? ( https://github.com/upx/upx/releases/download/v3.96/upx-3.96-armeb_linux.tar.xz ) mips? ( https://github.com/upx/upx/releases/download/v3.96/upx-3.96-mipsel_linux.tar.xz ) ppc? ( https://github.com/upx/upx/releases/download/v3.96/upx-3.96-powerpc_linux.tar.xz ) ppc64? ( https://github.com/upx/upx/releases/download/v3.96/upx-3.96-powerpc64le_linux.tar.xz )
-_eclasses_=pax-utils	91d47e5d20627c717aa878b9167c62a8
-_md5_=f306c2e6c723a4d0b6c31dd30aed5129
diff --git a/metadata/md5-cache/app-arch/upx-bin-4.0.0 b/metadata/md5-cache/app-arch/upx-bin-4.0.0
new file mode 100644
index 000000000000..35fa2b3af7aa
--- /dev/null
+++ b/metadata/md5-cache/app-arch/upx-bin-4.0.0
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/xz-utils[extra-filters]
+DEFINED_PHASES=install
+DESCRIPTION=Ultimate Packer for eXecutables, binary version with proprietary NRV compression
+EAPI=8
+HOMEPAGE=https://upx.github.io/
+INHERIT=pax-utils
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+ UPX-exception
+RDEPEND=!app-arch/upx
+RESTRICT=strip
+SLOT=0
+SRC_URI=x86? ( https://github.com/upx/upx/releases/download/v4.0.0/upx-4.0.0-i386_linux.tar.xz ) amd64? ( https://github.com/upx/upx/releases/download/v4.0.0/upx-4.0.0-amd64_linux.tar.xz ) arm64? ( https://github.com/upx/upx/releases/download/v4.0.0/upx-4.0.0-arm64_linux.tar.xz ) arm? ( https://github.com/upx/upx/releases/download/v4.0.0/upx-4.0.0-armeb_linux.tar.xz ) mips? ( https://github.com/upx/upx/releases/download/v4.0.0/upx-4.0.0-mipsel_linux.tar.xz ) ppc? ( https://github.com/upx/upx/releases/download/v4.0.0/upx-4.0.0-powerpc_linux.tar.xz ) ppc64? ( https://github.com/upx/upx/releases/download/v4.0.0/upx-4.0.0-powerpc64le_linux.tar.xz )
+_eclasses_=pax-utils	91d47e5d20627c717aa878b9167c62a8
+_md5_=f9fe90785533fa8db575d4ad475055c0
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 434bc67a3956..5acc72b3f578 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/borgmatic-1.6.6 b/metadata/md5-cache/app-backup/borgmatic-1.6.6
deleted file mode 100644
index 7531e0e684db..000000000000
--- a/metadata/md5-cache/app-backup/borgmatic-1.6.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_single_target_python3_8? ( >=dev-python/flexmock-0.10.10[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/flexmock-0.10.10[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/flexmock-0.10.10[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/flexmock-0.10.10[python_targets_python3_11(-)] ) ) test? ( app-backup/borgbackup python_single_target_python3_8? ( <dev-python/colorama-0.5[python_targets_python3_8(-)] dev-python/jsonschema[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_8(-)] dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/colorama-0.5[python_targets_python3_9(-)] dev-python/jsonschema[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_9(-)] dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( <dev-python/colorama-0.5[python_targets_python3_10(-)] dev-python/jsonschema[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_10(-)] dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( <dev-python/colorama-0.5[python_targets_python3_11(-)] dev-python/jsonschema[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_11(-)] dev-python/setuptools[python_targets_python3_11(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.1.3[python_targets_python3_11(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) python_single_target_python3_8? ( >=dev-python/gpep517-9[python_targets_python3_8(-)] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-9[python_targets_python3_9(-)] >=dev-python/setuptools-65.3.0[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-9[python_targets_python3_10(-)] >=dev-python/setuptools-65.3.0[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-9[python_targets_python3_11(-)] >=dev-python/setuptools-65.3.0[python_targets_python3_11(-)] dev-python/wheel[python_targets_python3_11(-)] ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DESCRIPTION=Automatically create, prune and verify backups with borgbackup
-EAPI=8
-HOMEPAGE=https://torsion.org/borgmatic/
-INHERIT=distutils-r1 systemd
-IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~riscv
-LICENSE=GPL-3
-RDEPEND=app-backup/borgbackup python_single_target_python3_8? ( <dev-python/colorama-0.5[python_targets_python3_8(-)] dev-python/jsonschema[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_8(-)] dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/colorama-0.5[python_targets_python3_9(-)] dev-python/jsonschema[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_9(-)] dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( <dev-python/colorama-0.5[python_targets_python3_10(-)] dev-python/jsonschema[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_10(-)] dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( <dev-python/colorama-0.5[python_targets_python3_11(-)] dev-python/jsonschema[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_11(-)] dev-python/setuptools[python_targets_python3_11(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/borgmatic/borgmatic-1.6.6.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=0f40915647cac1a4a5a41f5d6d8c113b
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 5b04dd47f546..a59eb3b2faf8 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-7.20 b/metadata/md5-cache/app-emulation/wine-vanilla-7.20
new file mode 100644
index 000000000000..8c51905bb361
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-7.20
@@ -0,0 +1,18 @@
+BDEPEND=dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst prepare prerm pretend
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?] ) openal? ( media-libs/openal[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers X? ( x11-base/xorg-proto )
+DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
+EAPI=8
+HOMEPAGE=https://www.winehq.org/
+IDEPEND=app-eselect/eselect-wine
+INHERIT=autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
+IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos ldap +mingw +mono netapi nls odbc openal opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl +truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama abi_x86_32 abi_x86_64
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?] ) openal? ( media-libs/openal[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) app-emulation/wine-desktop-common dos? ( games-emulation/dosbox ) gecko? ( app-emulation/wine-gecko:2.47.3[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) mono? ( app-emulation/wine-mono:7.4.0 ) perl? ( dev-lang/perl dev-perl/XML-LibXML ) samba? ( net-fs/samba[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=X? ( truetype ) crossdev-mingw? ( mingw ) || ( abi_x86_32 abi_x86_64 )
+RESTRICT=test
+SLOT=7.20
+SRC_URI=https://dl.winehq.org/wine/source/7.x/wine-7.20.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=fed8a9fd2cdd0da2e5c28cde543276b4
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-9999 b/metadata/md5-cache/app-emulation/wine-vanilla-9999
index bcb4f4156c91..2879b063d316 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-9999
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=X? ( truetype ) crossdev-mingw? ( mingw ) || ( abi_x86_32 abi_x86_6
 RESTRICT=test
 SLOT=9999
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=848f2ee5316d7233ea54c77141677270
+_md5_=fed8a9fd2cdd0da2e5c28cde543276b4
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 3c9959b7223f..4220eafe2c80 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/tree-2.0.4 b/metadata/md5-cache/app-text/tree-2.0.4
new file mode 100644
index 000000000000..5da6e1ed1e5f
--- /dev/null
+++ b/metadata/md5-cache/app-text/tree-2.0.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Lists directories recursively, and produces an indented listing of files
+EAPI=8
+HOMEPAGE=https://mama.indstate.edu/users/ice/tree/ https://gitlab.com/OldManProgrammer/unix-tree
+INHERIT=toolchain-funcs flag-o-matic bash-completion-r1
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://gitlab.com/OldManProgrammer/unix-tree/-/archive/2.0.4/unix-tree-2.0.4.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=a4b40f78b9e72ac1d0495abfbed8ae84
diff --git a/metadata/md5-cache/app-text/yelp-tools-42.1 b/metadata/md5-cache/app-text/yelp-tools-42.1
new file mode 100644
index 000000000000..181d62bde8f3
--- /dev/null
+++ b/metadata/md5-cache/app-text/yelp-tools-42.1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lxml[python_targets_python3_11(-)] ) >=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool >=gnome-extra/yelp-xsl-3.38
+DESCRIPTION=Collection of tools for building and converting documentation
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Yelp/Tools
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome2 meson python-single-r1
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-2+ freedist ) GPL-2+
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lxml[python_targets_python3_11(-)] ) >=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool >=gnome-extra/yelp-xsl-3.38
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/yelp-tools/42/yelp-tools-42.1.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=bbdaa30c4f90678671097eb4ffe38669
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index 967b29d53b6a..43620f45ca5f 100644
--- a/metadata/md5-cache/dev-lua/Manifest.gz
+++ b/metadata/md5-cache/dev-lua/Manifest.gz
diff --git a/metadata/md5-cache/dev-lua/readline-3.1 b/metadata/md5-cache/dev-lua/readline-3.1
deleted file mode 100644
index bea365d77340..000000000000
--- a/metadata/md5-cache/dev-lua/readline-3.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-lua/luaposix sys-libs/readline:=
-DESCRIPTION=A simple interface to the readline and history libraries
-EAPI=8
-HOMEPAGE=https://pjb.com.au/comp/lua/readline.html
-INHERIT=lua toolchain-funcs
-IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=MIT
-RDEPEND=dev-lua/luaposix sys-libs/readline:=
-REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pjb.com.au/comp/lua/readline-3.1.tar.gz -> lua-readline-3.1.tar.gz
-_eclasses_=lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=566b069c8ab9c7351450dd91dadfdc5e
diff --git a/metadata/md5-cache/dev-lua/readline-3.2 b/metadata/md5-cache/dev-lua/readline-3.2
index b455d547aea9..011c5a905589 100644
--- a/metadata/md5-cache/dev-lua/readline-3.2
+++ b/metadata/md5-cache/dev-lua/readline-3.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pjb.com.au/comp/lua/readline.html
 INHERIT=lua toolchain-funcs
 IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT
 RDEPEND=dev-lua/luaposix sys-libs/readline:=
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://pjb.com.au/comp/lua/readline-3.2.tar.gz -> lua-readline-3.2.tar.gz
 _eclasses_=lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=a341b95a32a81aaaa5a5a90478d876a2
+_md5_=566b069c8ab9c7351450dd91dadfdc5e
diff --git a/metadata/md5-cache/dev-perl/HTTP-Daemon-SSL-1.04 b/metadata/md5-cache/dev-perl/HTTP-Daemon-SSL-1.04-r1
index 7b23965e0fb9..f6727b042ec7 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Daemon-SSL-1.04
+++ b/metadata/md5-cache/dev-perl/HTTP-Daemon-SSL-1.04-r1
@@ -1,16 +1,16 @@
-BDEPEND=dev-perl/IO-Socket-INET6 dev-perl/IO-Socket-SSL dev-lang/perl test? ( virtual/perl-Test-Simple )
+BDEPEND=dev-perl/IO-Socket-INET6 dev-perl/IO-Socket-SSL test? ( dev-perl/HTTP-Daemon ) dev-lang/perl test? ( virtual/perl-Test-Simple )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-perl/IO-Socket-INET6 dev-perl/IO-Socket-SSL dev-lang/perl
 DESCRIPTION=A simple http server class with SSL support
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/HTTP-Daemon-SSL
 INHERIT=perl-module
-IUSE=test
+IUSE=test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/IO-Socket-INET6 dev-perl/IO-Socket-SSL dev-lang/perl:=
-RESTRICT=!test? ( test )
+RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AU/AUFFLICK/HTTP-Daemon-SSL-1.04.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=73aa419e6748dcbff7c78f90a10c9b30
+_md5_=d383d761c796db64b9624c262e78754a
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 70fe2c7ac3b5..d119a087221f 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 61da826951d0..addd335552b0 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/suricata-6.0.8 b/metadata/md5-cache/net-analyzer/suricata-6.0.8
index ec1b2bfdf241..75ec0d96f7fc 100644
--- a/metadata/md5-cache/net-analyzer/suricata-6.0.8
+++ b/metadata/md5-cache/net-analyzer/suricata-6.0.8
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://www.openinfosecfoundation.org/download/suricata-6.0.8.tar.gz verify-sig? ( https://www.openinfosecfoundation.org/download/suricata-6.0.8.tar.gz.sig )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=9260980a4f5c12da0643c9c406d05cdd
+_md5_=69cccef2a334b53dfa3cc6dca6c91f76
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 504df669dc6f..594530f113d1 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/ddclient-3.10.0_rc2 b/metadata/md5-cache/net-dns/ddclient-3.10.0_rc2-r1
index f0807dba5e9b..1ced110b3c65 100644
--- a/metadata/md5-cache/net-dns/ddclient-3.10.0_rc2
+++ b/metadata/md5-cache/net-dns/ddclient-3.10.0_rc2-r1
@@ -1,15 +1,15 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+BDEPEND=test? ( dev-perl/HTTP-Daemon dev-perl/HTTP-Daemon-SSL dev-perl/Plack dev-perl/Test-MockModule dev-perl/Test-Warnings ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=install postinst prepare
 DESCRIPTION=Perl client used to update dynamic DNS entries
 EAPI=8
 HOMEPAGE=https://ddclient.net/
 INHERIT=autotools optfeature systemd tmpfiles
-IUSE=examples selinux
+IUSE=examples selinux test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=acct-group/ddclient acct-user/ddclient dev-lang/perl dev-perl/Digest-SHA1 dev-perl/IO-Socket-INET6 dev-perl/IO-Socket-SSL virtual/perl-Digest-SHA virtual/perl-JSON-PP selinux? ( sec-policy/selinux-ddclient ) virtual/tmpfiles
-RESTRICT=test
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ddclient/ddclient/archive/refs/tags/v3.10.0_2.tar.gz -> ddclient-3.10.0_rc2.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3dba6603bb47e252079b434e229488ff
+_md5_=0346ddf3f92735f14f11fe5e32739188
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 830598f876ec..e3e7e48b8ba0 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/irssi-1.4.1 b/metadata/md5-cache/net-irc/irssi-1.4.3
index 722e2f40756f..521ca3b9d6dc 100644
--- a/metadata/md5-cache/net-irc/irssi-1.4.1
+++ b/metadata/md5-cache/net-irc/irssi-1.4.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://irssi.org/
 INHERIT=perl-module meson
 IUSE=otr +perl selinux +proxy
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.6.0 dev-libs/openssl:= sys-libs/ncurses:= otr? ( >=dev-libs/libgcrypt-1.2.0:= >=net-libs/libotr-4.1.0 ) perl? ( dev-lang/perl:= ) selinux? ( sec-policy/selinux-irc )
 SLOT=0
-SRC_URI=https://github.com/irssi/irssi/releases/download/1.4.1/irssi-1.4.1.tar.xz
+SRC_URI=https://github.com/irssi/irssi/releases/download/1.4.3/irssi-1.4.3.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=52dcdb7114607a0eef210be517501376
+_md5_=b718edb740480b4a2826b256491a164a
diff --git a/metadata/md5-cache/net-irc/irssi-9999 b/metadata/md5-cache/net-irc/irssi-9999
index 9a385d5af092..c78c560c0b6d 100644
--- a/metadata/md5-cache/net-irc/irssi-9999
+++ b/metadata/md5-cache/net-irc/irssi-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/glib-2.6.0 dev-libs/openssl:= sys-libs/ncurses:= otr? ( >=dev-libs/libgcrypt-1.2.0:= >=net-libs/libotr-4.1.0 ) perl? ( dev-lang/perl:= ) selinux? ( sec-policy/selinux-irc )
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=12971c58237094a6f1e776857c4d2008
+_md5_=b718edb740480b4a2826b256491a164a
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index ba30d68947fb..504580528d9a 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/cpuid-20220812 b/metadata/md5-cache/sys-apps/cpuid-20220812
deleted file mode 100644
index 05a666c89d86..000000000000
--- a/metadata/md5-cache/sys-apps/cpuid-20220812
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/gzip dev-lang/perl
-DEFINED_PHASES=install prepare
-DESCRIPTION=Linux tool to dump x86 CPUID information about the CPUs
-EAPI=8
-HOMEPAGE=http://www.etallen.com/cpuid.html
-INHERIT=toolchain-funcs
-KEYWORDS=-* amd64 x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=http://www.etallen.com/cpuid/cpuid-20220812.src.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=aca7668a39aa7ee7e71677316c2dfec4
diff --git a/metadata/md5-cache/sys-apps/cpuid-20220927 b/metadata/md5-cache/sys-apps/cpuid-20220927
deleted file mode 100644
index 3f54dec16631..000000000000
--- a/metadata/md5-cache/sys-apps/cpuid-20220927
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/gzip dev-lang/perl
-DEFINED_PHASES=install prepare
-DESCRIPTION=Linux tool to dump x86 CPUID information about the CPUs
-EAPI=8
-HOMEPAGE=http://www.etallen.com/cpuid.html
-INHERIT=toolchain-funcs
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=http://www.etallen.com/cpuid/cpuid-20220927.src.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=82a4f090e6b1326092ee1eb773f9d6e9
diff --git a/metadata/md5-cache/sys-apps/cpuid-20221003 b/metadata/md5-cache/sys-apps/cpuid-20221003
index 66beabbc1c56..444f78fdeedd 100644
--- a/metadata/md5-cache/sys-apps/cpuid-20221003
+++ b/metadata/md5-cache/sys-apps/cpuid-20221003
@@ -4,9 +4,9 @@ DESCRIPTION=Linux tool to dump x86 CPUID information about the CPUs
 EAPI=8
 HOMEPAGE=http://www.etallen.com/cpuid.html
 INHERIT=toolchain-funcs
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=http://www.etallen.com/cpuid/cpuid-20221003.src.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=82a4f090e6b1326092ee1eb773f9d6e9
+_md5_=aca7668a39aa7ee7e71677316c2dfec4
diff --git a/metadata/md5-cache/sys-apps/irqbalance-1.9.2 b/metadata/md5-cache/sys-apps/irqbalance-1.9.2
new file mode 100644
index 000000000000..74600689eb49
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/irqbalance-1.9.2
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare setup
+DEPEND=dev-libs/glib:2 dev-libs/libnl:3 caps? ( sys-libs/libcap-ng ) numa? ( sys-process/numactl ) systemd? ( sys-apps/systemd:= ) tui? ( sys-libs/ncurses:=[unicode(+)] )
+DESCRIPTION=Distribute hardware interrupts across processors on a multiprocessor system
+EAPI=8
+HOMEPAGE=https://github.com/Irqbalance/irqbalance
+INHERIT=autotools systemd linux-info
+IUSE=caps +numa systemd selinux tui
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-libs/libnl:3 caps? ( sys-libs/libcap-ng ) numa? ( sys-process/numactl ) systemd? ( sys-apps/systemd:= ) tui? ( sys-libs/ncurses:=[unicode(+)] ) selinux? ( sec-policy/selinux-irqbalance )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/Irqbalance/irqbalance/archive/v1.9.2.tar.gz -> irqbalance-1.9.2.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=6df357aeaad112d5ca92574225fbcafc
diff --git a/metadata/md5-cache/sys-apps/systemd-252_rc3 b/metadata/md5-cache/sys-apps/systemd-252
index 8740f751faed..9cdd98ccf779 100644
--- a/metadata/md5-cache/sys-apps/systemd-252_rc3
+++ b/metadata/md5-cache/sys-apps/systemd-252
@@ -6,12 +6,13 @@ EAPI=7
 HOMEPAGE=http://systemd.io/
 INHERIT=bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
 IUSE=acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2 LGPL-2.1 MIT public-domain
 PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
 RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iptables? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=acct-group/adm-0-r1 >=acct-group/wheel-0-r1 >=acct-group/kmem-0-r1 >=acct-group/tty-0-r1 >=acct-group/utmp-0-r1 >=acct-group/audio-0-r1 >=acct-group/cdrom-0-r1 >=acct-group/dialout-0-r1 >=acct-group/disk-0-r1 >=acct-group/input-0-r1 >=acct-group/kvm-0-r1 >=acct-group/lp-0-r1 >=acct-group/render-0-r1 acct-group/sgx >=acct-group/tape-0-r1 acct-group/users >=acct-group/video-0-r1 >=acct-group/systemd-journal-0-r1 >=acct-user/root-0-r1 acct-user/nobody >=acct-user/systemd-journal-remote-0-r1 >=acct-user/systemd-coredump-0-r1 >=acct-user/systemd-network-0-r1 acct-user/systemd-oom >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] sec-policy/selinux-ntp ) sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
 REQUIRED_USE=dns-over-tls? ( || ( gnutls openssl ) ) homed? ( cryptsetup pam openssl ) importd? ( curl lzma || ( gcrypt openssl ) ) pwquality? ( homed )
 RESTRICT=!test? ( test )
 SLOT=0/2
-SRC_URI=https://github.com/systemd/systemd/archive/v252-rc3/systemd-252-rc3.tar.gz
+SRC_URI=https://github.com/systemd/systemd/archive/v252/systemd-252.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0e289c36798f3a6c74237c7ae801435f
+_md5_=998175ddfa9aa0271b0bc1e2fd1fad06
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 55a60e4cae94..2f8dddbc6c72 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20221008 b/metadata/md5-cache/sys-devel/gcc-12.2.1_p20221008
index a863ab46f142..44e693872436 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20221008
+++ b/metadata/md5-cache/sys-devel/gcc-12.2.1_p20221008
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gcc.gnu.org/
 INHERIT=toolchain
 IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-2.3
 RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=12
 SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/12-20221008/gcc-12-20221008.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-musl-patches-1.tar.xz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	10e9276df53714742535b4cd5ccf7b75	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=8175684f436e1482e2dd9319c8598615
+_md5_=a003c9112081e4f62fe73cf45c2d202d
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index f5f694c957f9..8e014b6878de 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/libxcrypt-4.4.29 b/metadata/md5-cache/sys-libs/libxcrypt-4.4.29
new file mode 100644
index 000000000000..19b4301d21e9
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libxcrypt-4.4.29
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/perl test? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/passlib[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/passlib[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/passlib[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/passlib[python_targets_python3_8(-)] ) ) )
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=system? ( elibc_glibc? ( sys-libs/glibc[-crypt(+)] !sys-libs/glibc[crypt(+)] ) elibc_musl? ( !sys-libs/musl[crypt(+)] ) )
+DESCRIPTION=Extended crypt library for descrypt, md5crypt, bcrypt, and others
+EAPI=7
+HOMEPAGE=https://github.com/besser82/libxcrypt
+INHERIT=eapi8-dosym multibuild multilib python-any-r1 flag-o-matic toolchain-funcs multilib-minimal
+IUSE=+compat split-usr static-libs system test headers-only abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1+ public-domain BSD BSD-2
+RDEPEND=system? ( elibc_glibc? ( sys-libs/glibc[-crypt(+)] !sys-libs/glibc[crypt(+)] ) elibc_musl? ( !sys-libs/musl[crypt(+)] ) )
+REQUIRED_USE=split-usr? ( system )
+RESTRICT=!test? ( test )
+SLOT=0/1
+SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-libs/libxcrypt/libxcrypt-4.4.29-autotools.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=bee0501a7b7a182639412ae008d8384d
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 7682a130079a..62eb40f8c9f9 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-10-31T20:09:41Z
+TIMESTAMP 2022-11-01T02:11:37Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNgK4VfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNggFlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD41Q/9FBsC0I73TFX9LRh1FoiD8WPlnSq8ogxQukKN81svG0I4BiHfjFqeaHDu
-XmgbBRw/l2qWb1jxW8PjsGDlIfuRVuz6ssAT+vWusUAPjuWfJYdBP0xmODsq3IiB
-cbh5Cq2VoNsfkloXPrmmiRSu+qJEwUZVjtdrxo8nR8TzJwKH8u7rY+g8g6jZtLFm
-vdghc7wO/XTOdqdfE8Bmx+xOSYiiotG1bjMzufoOp0t3F8wb6vY9Ef58zc/w6iOM
-JfoV+Z/EpLWOukxAAx/vRT+eX5KWYyJ2iOBpdhjBTO4C349TfSTvG97rsDbCsqBB
-eZesTjvB5toJlWG2ODyyU9qMO95ThXgjSu5SISSLTYu5iiwuKz8uPkX6VEL2hn5X
-wB9kggsUiAhkNmBMokpBJJhIVm1d21jOtZ7JRb15cKQAPCBV4N6YJIXWsCdTV98t
-9vJIKbuWy26PWgynYSDuluA0chS8tv4xrSfQIHUTuHHT0qCR4N8bixmU24gaGw5J
-B33EOH9iAk8z1DFpEiAUmE6nt6ESJjLUKKI5FdlGw81f+qKY/sx7/KWaPTFNNZ+X
-sNSu3t0ZWtPHnyzoIulwKcyOHDjf5cTSKjxzMto4IfECTZY/HSi3b97LaFH9GSA9
-tKeKUn4fCANjS8COL77AYCdagf8Z+ZCXdUmQhPpZlytlBulnQkM=
-=sJ3c
+klDhIQ//Rev8UjwiM/9NfeOXGCNnhZSPe0MohFDVUVP9o/chsdHaneS8XoLt6eP3
+cWUj87GmH6AfnMNY7i0xoXBwe7iaCAcIdui+d03QnOipWD9wnLoK2m3P74ZPKKob
+f/3wGPtcDJqdhqohNxV2TgcZhbuFPMNxvjYNj/4xJ0yxDQoSHOn2L8u+5YhqB27T
+392KSIc349GXKWV3gEk3vmyFch+9NeQt8NzmXYufMam+DFD5yNw8tZydIysmW0wY
+JcNqUsG69Vq7E3fFDxbDNfxcFOSRKWuvJPBpF+ntW3x4sAlL3ymSBxrnsLrXIw+9
+2Waws+NdIqrGySNSyuPlOqFwBWwuw7c57kIbMOmJ0FeLe4lPpulIcsRdy5uOq+ye
+UZMkbTf1xkTe7gY5a7kXLWO9KNk4UdbubkeXU0rhTf1EYfrT6qsnGOEVWqGoqqjE
+77rd4FJ1BFuyked4kXGai53fGqn3qE21yx5DUMSWGgBpeI5wGDzFes/Wom90usb9
+RnyiKp13Egb1VPITqgYq2Jdi5dptQSQXdT0ubCBtFMQnrswpI1ZQnkj4y5LIRNWi
+N6hT/IrSE2JHVfcRKs1pjQbAKSQNtyEg6O9xhexZ2TPE429jSGdGV4GFTiUfdTNH
+Z7sYpKAHssirV4kmZomu64dkoS3eHfmsj2Zgp+Ho2InXoFf++TM=
+=Dqs9
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 334485abf617..45732226a8e4 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 31 Oct 2022 20:09:38 +0000
+Tue, 01 Nov 2022 02:11:34 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 56732450e7ea..459c3f0c073c 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Oct 31 08:09:37 PM UTC 2022
+Tue Nov  1 02:11:34 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index bbb0df5ce9e2..2234b833e027 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 31 Oct 2022 20:15:01 +0000
+Tue, 01 Nov 2022 02:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 5afab24bd775..e8d1a3f94824 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-4e04d83b73b34d4cfdd29ec087acf3df4162d439 1667246125 2022-10-31T19:55:25+00:00
+49bff7d46ce09578936677f8538df3f1842494d6 1667265329 2022-11-01T01:15:29+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 482745684f70..9c9dbe9237f2 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1667247001 Mon 31 Oct 2022 08:10:01 PM UTC
+1667268601 Tue 01 Nov 2022 02:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index a314d98a48d9..45732226a8e4 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 31 Oct 2022 20:09:37 +0000
+Tue, 01 Nov 2022 02:11:34 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 918ce8dd8f52..56f0c0d1a34d 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index 1a0a5e103c33..61fc00a10901 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -8,5 +8,5 @@ AUX suricata.service 501 BLAKE2B 00631ada0d2993eae97a028ef950b031b91bb3af346ee35
 AUX suricata.tmpfiles 24 BLAKE2B 150b74a6775137704915015871ab4455b8d0b9204a75c398ea746e9194b0c0a787904f9015b98f36a685fac0dbb0fcb43746096dd403bf882afa5dfef12af94d SHA512 1530aed4efb35f988e2f0134388ea11ffc3ba1f217845a2c5dd47f947983ed4d343126e49d66a86ca7894ff60b5134464ddbe07509dcc80c001131f09cb7e2dd
 DIST suricata-6.0.8.tar.gz 32697425 BLAKE2B 1e445885f3a672081cbb8f17de9fb0fa21a2c618b80ea8d3d9362c0475149d833986cac047ad90b1c1a5b5b19025ff501a695e0f197c00457859b3858f51ecba SHA512 ab1eceedde70179e4a447297039e64132e0a2361e8424ad42c9037273a3f6eaf4c8d5d0306af6f26c8b373636b621ac1d7d505952306d9170c6a87e6fb863b61
 DIST suricata-6.0.8.tar.gz.sig 566 BLAKE2B 817756401d628e49fb0f54faca05d87131711946aa641d0f0a5957fa2f5d6378e1b5cafeaf67b176b66cb0be0afd790aea1312042a195535e57571276aef1edc SHA512 d0d354b6fca3ef088e2371d6262f4bd45fb06747fcc32519510e690ced933d828fc1acf64d8d1b17d0360ce280905e5bf4b1c9fb8016d82cdee57a432bded884
-EBUILD suricata-6.0.8.ebuild 7034 BLAKE2B 3bae5bcdbf4d8f0ba1b703b167c7d2036c1cc7435e8f3afcff3a2827f37a97ccb7144d6493b3180bfdb717481379e19c7ed45b9b61a6212573756108d001a8ea SHA512 59d3cd61407f82959ad780894e8efcba4e360c359321b867fc2a8524091624208f406f2009e02e9b64b49419b6e52faf71fdba479180e9f57faa87c6c46583cd
+EBUILD suricata-6.0.8.ebuild 7086 BLAKE2B 22df0d0e1592c4a7149e98e0947590e9fd3a55db0e1fa283b3cea657c0bb0e606bc6b25983504774f4e387638b79241a28dc34585d4b65d1652985f33c742944 SHA512 619ba7cb4a53c91e12b503be1933f68c83c84dfcbe0402020c02a61541cb8dc08f7990e5a63c4b8381fd1e0253314fde14ead26bcb0037816bc04b4b6e2c8dae
 MISC metadata.xml 1047 BLAKE2B 8418aaa86ecf0e2baaf3f927c764dd8f0471f29c0b691ec3baac6988291e9e591ea4263b89a4a25b44cc2642d58bbffcfa5fdecd628ea101e4dd3d67e1914515 SHA512 1e6e38f2d0cd4335e274ab1ac72a445a3bfdd7a5c028d06a387e0f879cf7859681856ff03986816d5dae1ac841958652003b5c8057187885c579a695f8bc11cd
diff --git a/net-analyzer/suricata/suricata-6.0.8.ebuild b/net-analyzer/suricata/suricata-6.0.8.ebuild
index 5176b2844776..9b39a338afc0 100644
--- a/net-analyzer/suricata/suricata-6.0.8.ebuild
+++ b/net-analyzer/suricata/suricata-6.0.8.ebuild
@@ -128,6 +128,8 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install
 	python_optimize
+	# Bug #878855
+	python_fix_shebang "${ED}"/usr/bin/
 
 	if use bpf; then
 		rm -f ebpf/Makefile.{am,in} || die
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index b028a1846430..e062bab9385c 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/ddclient/Manifest b/net-dns/ddclient/Manifest
index 479ff278d84a..ed529fb833dd 100644
--- a/net-dns/ddclient/Manifest
+++ b/net-dns/ddclient/Manifest
@@ -7,6 +7,6 @@ AUX ddclient.tmpfiles 149 BLAKE2B 0ad955937dd6cf714530429ffb423e0acc7033bdf7e248
 AUX ddclient.tmpfiles-r1 144 BLAKE2B ccee5c685e9ade37b67c629b09a3c7b92d88ad2fa80dadf5299460a792a4a6c93d112a5d910a2e8dc0f01b14f5f678890ad5a7d1e7e62399cf8917af67084c41 SHA512 47c688084f2d3a0015557140b9a74857a40b352bad1bcc95a42d7d848fa2f1fc17d62d551462e9e893d32211394b924701a6780b8dce02789603623b4b377dc6
 DIST ddclient-3.10.0_rc2.tar.gz 274330 BLAKE2B 898c2f66306ed7d8f69535bae17cd8c6f8ab764ab167ef5cdd648370b242f4b8715cacf027787d30ce2ba5f47bbe714b35ae00868352dd780610ab5a1781e987 SHA512 345f40542e04ede5e8679dc0722279955d6a261ad91f6c207c07927b63b61ffa5898fed716e5201ca8b84d6dd3e0321f0a7fef67cc300a1a8969c417c0f0696f
 DIST ddclient-3.9.1.tar.gz 63469 BLAKE2B 8ae6543353d96f76d926117ae53d74da6e8bc8f116fa15b8b0d39bc29a4c334bfc3d673b8f1c57139213b91414d1b9a2063fde9e1015f03fb76ba70a60956a7e SHA512 a8a4d6cb94e4239a7b7b4fc7d9ebef703cbd6c45fc3394b644694a053b5b8aa8d109410b5b8b3676a5f30b18474d24c7feb16c65c30b28bd7d941d8a214b1346
-EBUILD ddclient-3.10.0_rc2.ebuild 2017 BLAKE2B 16c44affe1d4ad7eee18256dad6c9c77d6d156e2f4691b6623b3cbed5c6d474e59771e32a1a27cf7129552fa1d253f111695eba31e3b13281c0e02b6d5b16868 SHA512 3241cc0d241ce54d08ecc004a1638cb71debea8d011530d5f749e6432a59fc02a09f077a05c3c1ee526bca310473ea6179558fc866d7f2398ea19aebd3e532d7
+EBUILD ddclient-3.10.0_rc2-r1.ebuild 2273 BLAKE2B 38e585ae753d8d2c25f9259e8c91e50d0d911990f46943a73a4da888046411ddb1b077d2ba861a3d07ab6b8523850f9971eed9a719c7f21fab343a5ac54835fa SHA512 7cdf739461dd2e0e122d79aff8d7367d8ad4da5b96c9517fe47f6cc098b6d43589b87be536a57b2f5807295b7549cc06a9a963e232c499d841bfb33801d6f4df
 EBUILD ddclient-3.9.1-r2.ebuild 1618 BLAKE2B df9c01a08d4304721d2871fa4954168df0f1aa164ea3f2d12709f794110724209d4eae2de861381dafe86282178f15024e363bf87989f88bdaf4ada3cc9d2f78 SHA512 8aa21cb06d101dd366ae5896b2a90b4e6114e18c20d70e8eb7e7ead9f9783085be4c1b2a42f013e18d6084186c9540270008e5aa68ea328d1a4b80dbaeabf122
 MISC metadata.xml 1007 BLAKE2B 89ea98f09f32202507c02215e1f5d3842cf9c160d599d57c02f2b5ae59c7b8571726bb29cc3cf1aa20061c42366a918e9b09ea323baa5a61e6f5094fe2538d69 SHA512 3da6531c3f00847b0e45d280340bfcc71af519d0b7e998300aab645eb47f959560650633fa9bb23f59458b74296b633bbd11c401818eebf12d3f1d9c7049dec3
diff --git a/net-dns/ddclient/ddclient-3.10.0_rc2.ebuild b/net-dns/ddclient/ddclient-3.10.0_rc2-r1.ebuild
index f4d5478a2573..3d430b48e271 100644
--- a/net-dns/ddclient/ddclient-3.10.0_rc2.ebuild
+++ b/net-dns/ddclient/ddclient-3.10.0_rc2-r1.ebuild
@@ -15,8 +15,8 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="examples selinux"
-RESTRICT="test"
+IUSE="examples selinux test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-group/ddclient
@@ -30,14 +30,25 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-ddclient )
 "
 
+BDEPEND="
+	test? (
+		dev-perl/HTTP-Daemon
+		dev-perl/HTTP-Daemon-SSL
+		dev-perl/Plack
+		dev-perl/Test-MockModule
+		dev-perl/Test-Warnings
+	)
+"
+
 src_prepare() {
 	default
 
 	# Remove PID setting, to reliably setup the environment for the init script
 	sed -e '/^pid/d' -i ddclient.conf.in || die
 
+	# Disable 'get_ip_from_if.pl' test, as it fails with network-sandbox
 	# Don't create cache directory, as it's created by init script / tmpfiles
-	sed -e '/MKDIR_P/d' -i Makefile.am || die
+	sed -e '/get_ip_from_if.pl/d' -e '/MKDIR_P/d' -i Makefile.am || die
 
 	# Remove windows executable
 	if use examples; then
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 63c7451181fa..50d0e514293e 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 7434c7a06787..6a55081c8a46 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,7 +1,6 @@
-AUX irssi-1.4.1-no-werror-decl.patch 486 BLAKE2B 8999e9e015c642cb79007e419882f59f51ff1faccc32b285fb7b179e2f2d2d54632707fe70fc66d03174590635439e21390c98e0455b4df382a48c4e445ca95d SHA512 b74cc0b10d0d4a138f4f6098e967a27b9c1ada5f1b5159129b7885fb9c736f1766e4a6421eae34cfc1232efed705b26b6f40d712a518a149d987f8b29706baed
-DIST irssi-1.4.1.tar.xz 1210772 BLAKE2B b02dfeae1e3ac5d52c5d22f8d2284e0314d9c39628e5389eed2a90d22904754869567750909b65315472068113f1efa8e304696564e2c2517b7a17219cf92dda SHA512 e0c53c456bd92af60e8845dba6d338bc0f880639ba19118c22324a5044101a16f7a387377f2a15aa74364f75fe9ed0d5fac0f353c3ea2158190f76ed89dfdd22
 DIST irssi-1.4.2.tar.xz 1211740 BLAKE2B 916028948640d264707bf4c8405fe63ee2781b0990abc40c4d60c5fd34bebe38de7d35cf6856c69dab39121ba5d72c962b763fda408cb81326392edc8447d3a8 SHA512 428157b85226b5299f55679d9384d3ae8b1e61f50a528bf21ffdf2f4b56014e0a86bdcf9ce05cf4dedd59d53829323bb62029a570f90ebf3243a06c3ce220caf
-EBUILD irssi-1.4.1.ebuild 1576 BLAKE2B 9d9095d410aeaf258b8e16e3614e1e1aa72f0b1337baeea61229742de2c0fac806c0a6040be6af95a6b618ea7afefba7a20453714fcc6afcedfd98efe9c1429e SHA512 57a5b65e52e12671af3d49cb4601a8aef3041bd7fcc7b8b48b418c82640306ae66230e7583042be1ecbd4f53f5fcf7ae3a4490ced67054e978fa20decffe749c
+DIST irssi-1.4.3.tar.xz 1212556 BLAKE2B 48091e26bf547e510814d2ce709e2000771b75112fe5706ee328c6436659b7f0157f24058d508fae791175e1ff92de67224412fec18376fefc64a847d4e3bf6d SHA512 d9122180990965e701deb37f212a1ef60fd697ba24c827c2bb15dcd7c4f7f4caf02f6dd99cb5a0cf0b2682325b93ecfd0f00adb296ad832b5a95953ea08567f5
 EBUILD irssi-1.4.2.ebuild 1515 BLAKE2B 139623063f584e8654e6d8c96c4ab71ce2863673403a145db7143717a1eb94bb94cbd7c3f48831e5457dcd63e7b63c02e7bf11e9de1acb7774c0cbfc010871ba SHA512 84b1344ba35b76c73209f05e0ea525373955171d7b5c208c081a8adb82cfc60a762820c3e16b5378a5e97f49eabbb1391da51239d5cf16c95c2345d38de3de59
-EBUILD irssi-9999.ebuild 1526 BLAKE2B 0799cb63e399eb5120ed488b19a7e8072b135e0825bf0028844111395a640864b92a3e86487914221a76d085c7d14456d5d3385b20617e5a788e7c8c23da7e2a SHA512 23223f7af4cdf94e97ab927856ca526ebb1564a717bc6cbe0b43c86586054e31af144f052f71bf0c7e2fae0fe1453838278ffaebdb10eea7f5a353745b24c9c7
+EBUILD irssi-1.4.3.ebuild 1523 BLAKE2B 599ad91797a27943d1ab8c35a2d9339db76da9efe6a30a32289ca29247451cd55d0bfca3befef3e857924414174b2f63c1d88247ade51c3b362ad22ef6ebde35 SHA512 3ecf1256953b46685d039fd3be02339e3d753b482d4bb5583c42b479de62c609be8162246a6cab1e07c4e23703242a3bae62c76a043a9738be49714962b6d4a2
+EBUILD irssi-9999.ebuild 1523 BLAKE2B 599ad91797a27943d1ab8c35a2d9339db76da9efe6a30a32289ca29247451cd55d0bfca3befef3e857924414174b2f63c1d88247ade51c3b362ad22ef6ebde35 SHA512 3ecf1256953b46685d039fd3be02339e3d753b482d4bb5583c42b479de62c609be8162246a6cab1e07c4e23703242a3bae62c76a043a9738be49714962b6d4a2
 MISC metadata.xml 701 BLAKE2B a337d1efcdc3f02d98639cf52c0c878408b1675aa261d708fef301ba34734eb296469662c6df53941829af915579cb9b4730e15b5c157839d4633ed940e5a532 SHA512 b9ee2b27c9d3482c29e4960fac77062cbbb9a593eb8576483b49e31e04b941119a5ce56b679da4377f8e488d188061272c25cb8270d948996faeb7b77e7b2a64
diff --git a/net-irc/irssi/files/irssi-1.4.1-no-werror-decl.patch b/net-irc/irssi/files/irssi-1.4.1-no-werror-decl.patch
deleted file mode 100644
index 83b03680cd44..000000000000
--- a/net-irc/irssi/files/irssi-1.4.1-no-werror-decl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/851522
-https://github.com/Perl/perl5/issues/19382
---- a/meson.build
-+++ b/meson.build
-@@ -553,9 +553,6 @@ configure_file(output : 'irssi-config.h',
- # CFLAGS #
- ##########
- 
--#### warnings ####
--add_project_arguments(cc.get_supported_arguments('-Werror=declaration-after-statement'), language : 'c')
--
- #### personality ####
- add_project_arguments(cc.get_supported_arguments('-fno-strict-aliasing'), language : 'c')
- if get_option('buildtype').contains('debug')
diff --git a/net-irc/irssi/irssi-1.4.1.ebuild b/net-irc/irssi/irssi-1.4.3.ebuild
index 02f6a6136342..ea7e65988b49 100644
--- a/net-irc/irssi/irssi-1.4.1.ebuild
+++ b/net-irc/irssi/irssi-1.4.3.ebuild
@@ -17,7 +17,7 @@ else
 	MY_P="${P/_/-}"
 
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
@@ -39,10 +39,6 @@ BDEPEND="dev-lang/perl
 	virtual/pkgconfig"
 RDEPEND+=" selinux? ( sec-policy/selinux-irc )"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.1-no-werror-decl.patch
-)
-
 src_configure() {
 	local emesonargs=(
 		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-9999.ebuild
index 5f30465fce93..ea7e65988b49 100644
--- a/net-irc/irssi/irssi-9999.ebuild
+++ b/net-irc/irssi/irssi-9999.ebuild
@@ -35,10 +35,8 @@ RDEPEND="
 	perl? ( dev-lang/perl:= )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig
-"
+BDEPEND="dev-lang/perl
+	virtual/pkgconfig"
 RDEPEND+=" selinux? ( sec-policy/selinux-irc )"
 
 src_configure() {
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 5032011988dc..62b86e50bc14 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups-pk-helper/Manifest b/net-print/cups-pk-helper/Manifest
index c1b2a4cc0115..90b499f45bf4 100644
--- a/net-print/cups-pk-helper/Manifest
+++ b/net-print/cups-pk-helper/Manifest
@@ -1,3 +1,3 @@
 DIST cups-pk-helper-0.2.7.tar.xz 54500 BLAKE2B e9107c18396e87bc8e385a32d00ac6d15bfcc6f53e9c04514bbc9e7bee6b4a87ba16b97da321c72fb01fa273a0fdcb396a0eed335e9e37eb98d7a299ec480ca1 SHA512 8f1d5dce73a52552d00eb3f54b39e03ca7ae711a0591572a25bd8926e228457628f1ee7e6ae89bda1b0ef473f860ad85bff9036ca1bc244d2cbda530bab96d40
 EBUILD cups-pk-helper-0.2.7.ebuild 808 BLAKE2B 259ab2b9c530793ee75c66805128ba08dc1fd047a658acbb0d9d61286926ac59011855090bfbdd7b4242c2a17a3fe8ff368081cdbfb95ac26d466c544b71467c SHA512 0a103b8f8d2f4c46212b44a4817e03d31c373a97d990dc688481d43d4142692c1065910155be28bbcd92ac3a4feed654af1f6a846c9f46115233f6ad18c53636
-MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
+MISC metadata.xml 370 BLAKE2B 1914b6be4d0815b599dbe5530505c255c0c4cb36d72c72aad247dcf3c86eaf288e97f08ee97615154fa851be96d2b2ef251a4397ef6fe9d9ab984b8d2ec1cb60 SHA512 3328ea2af6adba62d7499a686dccbe273064a8faff026dcf821a1b11e64ee92fbddff3d4806fdce2df0c41cf7c0712e4e1406dd76308e55dd1222ef7b5ea767c
diff --git a/net-print/cups-pk-helper/metadata.xml b/net-print/cups-pk-helper/metadata.xml
index f453528b934f..5f0502eb8386 100644
--- a/net-print/cups-pk-helper/metadata.xml
+++ b/net-print/cups-pk-helper/metadata.xml
@@ -1,8 +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="freedesktop-gitlab">cups-pk-helper/cups-pk-helper</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-voip/Manifest.gz b/net-voip/Manifest.gz
index 6a0363a7715b..3bb6cf2916b3 100644
--- a/net-voip/Manifest.gz
+++ b/net-voip/Manifest.gz
diff --git a/net-voip/telepathy-gabble/Manifest b/net-voip/telepathy-gabble/Manifest
index f94b94eb4d07..95c067fa991f 100644
--- a/net-voip/telepathy-gabble/Manifest
+++ b/net-voip/telepathy-gabble/Manifest
@@ -3,4 +3,4 @@ AUX telepathy-gabble-0.18.4-openssl-1.1.patch 8115 BLAKE2B 155503c50aa76003c202b
 DIST telepathy-gabble-0.18.4-python3.patch 16302 BLAKE2B 6cbd6469febe4acc6d8d07c0c209b47fbf79990601f41c4715f13944d81165df6dccfc344b3cc674fa131fc383a609ae628d8508ff96b05ef63634af6c32b638 SHA512 3b8ea10b5330c5d02d4bc4508a7d9a348bb4c9a93a92419fb66668e06f461097fb16a1a4b956c327740cf6dc77693b921a63f37a6095c21fcab6d1169e62a2f4
 DIST telepathy-gabble-0.18.4.tar.gz 2584311 BLAKE2B c1708be2ebe0b7dd06b53af1087c349e1a1f0b83dfffe463c72e31e459d2efd4db5bad7ade7a478bd4b91948aade822bfa6c13fe175863759cc98c44beca8178 SHA512 4303f1da7eeadf1f0e69fa881cd8b08dc41f4fd061df3f2ecdc80735d8be3e8cf24d8482f265f1858d8dfed71f62e8bc02c13f9525db8d21c9d927e25fa66218
 EBUILD telepathy-gabble-0.18.4-r4.ebuild 2508 BLAKE2B af7effa6020378f0308a4de81c87a591fda1826fd15e562153a978daa642e039709c4527f92791ac9285ea36bb88f84891c3a2378b26a97f678bd9e0b52811db SHA512 c59dbfbdf936cb9879a9e7e6051d44b833693b05b1ae80554d02d40865a0a09db67e038f508381edaf01064fa3b00168148c0a5da6d891080280b69e7c55540c
-MISC metadata.xml 373 BLAKE2B be5b2a6b3f064d72456b4b51848604ad2d20f9c1f36b930dab8705e42b5cb0df3170fe3d2b800cde2a6ef049fc41e32290360db054b178e6539e8feb4fd5bed4 SHA512 8ab1cb1e96ffe816a792e17bfa5ac0f8156b0bd7bf8677bc93806390bbf7d51f710a0e0437cad05233bb6013809a7dc313530d708a18e17ebb3f2ecdb720e076
+MISC metadata.xml 498 BLAKE2B c1abaf1c98f367d3fa22baf5ca76bcf5ecd62229e489f26128679435519ab529f6a3278dc59c683a39f8c6b1748f73fa11e8230a1521f721055b890e419dd6eb SHA512 e04ac4529646839852d5ea9fab5ae27c9a070ba80953b56bc07c5fd0e7e07e171f2d1ee5cb2e9b2c29a06cf8bd4d5df68179412a0bf2b97812c98355a3429f1e
diff --git a/net-voip/telepathy-gabble/metadata.xml b/net-voip/telepathy-gabble/metadata.xml
index 7924de1e7a4c..83b656ac6207 100644
--- a/net-voip/telepathy-gabble/metadata.xml
+++ b/net-voip/telepathy-gabble/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>
-<use>
-	<flag name="jingle">Enable voice calls for jabber</flag>
-	<flag name="plugins">Enable plugin loader</flag>
-</use>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="jingle">Enable voice calls for jabber</flag>
+    <flag name="plugins">Enable plugin loader</flag>
+  </use>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">telepathy/telepathy-gabble</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-voip/telepathy-rakia/Manifest b/net-voip/telepathy-rakia/Manifest
index fb73cc775eaf..001a8289315a 100644
--- a/net-voip/telepathy-rakia/Manifest
+++ b/net-voip/telepathy-rakia/Manifest
@@ -1,4 +1,4 @@
 DIST telepathy-rakia-0.8.0-py3.patch 4472 BLAKE2B 6eb45f91f351ba6ee0afa16022921efaa764168acf9a0891b57cba4ab90c5f2f3f58c7704ecc7224d9aa1a9559a6be7b96cb8ab3c5382552fe2d640ecfd94ab5 SHA512 cf76d730001da55e1bececbfab9810c83643c6b4cabc6c92c106fafae8a64d75b2eaa455599d70a0e40f13ea6d293f0621948e3a3d047d4002ce3b08b58858f0
 DIST telepathy-rakia-0.8.0.tar.gz 659116 BLAKE2B b940d28828220f83c3408aeb9effc26f17d62729f01073539ca4381604bc762b411064d6de92a557ff0f7a8a1920799163f6ede2dba6cfec01967145501a1da2 SHA512 5378e1a2909c4218cc9c6fecf0b01beff0b52fd40cc040a601090dbaae330b3506fc74dc5ae86e5f0c954dd3c41fd7ba4e5a294f8fc11d74aa6eb9025097e9ae
 EBUILD telepathy-rakia-0.8.0-r1.ebuild 1067 BLAKE2B 79efaeb2ea78a26f9f141d893876a9d32db3898d4984aaa8f7de282c8efe0c7176a5a0bf43287844cb550c627267a054c6a15b08d28c11de42a8a9bee5a16e38 SHA512 dbcdfe3a09c73ae4c97456c273370a7d104980c3248e3bf5c30f15f90f1f21aa76333383979d2d61b06ae9e54eab7dbb1d4c5bbf269ae27c2783b3fb30332881
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 366 BLAKE2B b59368537b47acdf4b53ad848a9dd8d6b4a36a02ec510e0bcf06bb76f9d9d845e12ddcc9effaccaa0deacc0f2031ee5da0bb7ed4c99a920f85f5f308c2ad68e1 SHA512 1dad3c93ef56e04f66c94eaaf1b2063570bac8f37aa514acaf95ec597fb4baa8f9084f5fb866e9cbfbb3754c30a89ee54cbcaf90d58826cd87143b446a6fe4a9
diff --git a/net-voip/telepathy-rakia/metadata.xml b/net-voip/telepathy-rakia/metadata.xml
index 7b343b06be8a..e919da2d3a78 100644
--- a/net-voip/telepathy-rakia/metadata.xml
+++ b/net-voip/telepathy-rakia/metadata.xml
@@ -1,8 +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="freedesktop-gitlab">telepathy/telepathy-rakia</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-voip/telepathy-salut/Manifest b/net-voip/telepathy-salut/Manifest
index 6b269fe72116..4be9e3ef3c1d 100644
--- a/net-voip/telepathy-salut/Manifest
+++ b/net-voip/telepathy-salut/Manifest
@@ -3,4 +3,4 @@ AUX telepathy-salut-0.8.1-openssl-1.1.patch 6746 BLAKE2B 81e67ee46317f5abf9c1a6f
 DIST telepathy-salut-0.8.1-python3.patch 5878 BLAKE2B db76eaf004418d48359c0ca710a59782fc1cda304825c75259daca41f3cd94ced207be06db7e5fd4d290b8021276077076eed330c20c2249b1577f0670697f93 SHA512 b924fae314d9efcc22226415e5904521593821996cdef9e5149ebc5ee2ceb4c2c210c311aeed3a01e634cb6ddc8f36b83d1473d700a8a6d1171c934217ef4185
 DIST telepathy-salut-0.8.1.tar.gz 1823482 BLAKE2B 22f93d48cc749ed74ac1ee4103ea0bf5b1f93b2d14c95a4bd2edde977a5c43db5d5fe54dd246c561ee94f13b4030ab42c011f537a0e6688e8be3ac0aa0f1ca67 SHA512 34537ac9ce0b78015e184963ea79beaa7332ac11803f9683ff34577d9f0a14f7ed287aacb2c00059f2ff2f300c325a09a78a320e83d0a0031ad976da2c197a90
 EBUILD telepathy-salut-0.8.1-r5.ebuild 1776 BLAKE2B c1575686ef07471dbe7a0d7c06079c5aca8c8f4a3bf50cc2c9ea9a0061c7931155aeb07c461ab14c31ce11290af80b1bcf33df599a649390d45736dad793d7a0 SHA512 aecacc391242a7e345c6470da719e0979e8ef049fa2f371a8b63fc83241eb246ac67ff16bec7b37e04909317e00711fea333bad2952210d4c905b3a3487c9d23
-MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
+MISC metadata.xml 366 BLAKE2B b12ac25ddb2a06bf7763365a9e3720e4b9f174da16e09f516f61f4f7b255968364e7e2cdda2f20f02159f979dfc24e0385f61a2ba14ee7d3ca32bc9628a2aa2e SHA512 d6080a911f07c8b4cba5c95fe51f98068a2df6716ead5baafc52975f37c6ad2ac051aa9df1b0e1e8d20590ea3e43dde4a25f59eaa4ea6c15bb80bde7e0adb095
diff --git a/net-voip/telepathy-salut/metadata.xml b/net-voip/telepathy-salut/metadata.xml
index f453528b934f..d04ce07aef49 100644
--- a/net-voip/telepathy-salut/metadata.xml
+++ b/net-voip/telepathy-salut/metadata.xml
@@ -1,8 +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="freedesktop-gitlab">telepathy/telepathy-salut</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 1b911bcf6eb8..e933a0ee5dc2 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/networkmanager-openconnect/Manifest b/net-vpn/networkmanager-openconnect/Manifest
index cfa507eca81e..085c1685416e 100644
--- a/net-vpn/networkmanager-openconnect/Manifest
+++ b/net-vpn/networkmanager-openconnect/Manifest
@@ -1,3 +1,3 @@
 DIST NetworkManager-openconnect-1.2.8.tar.xz 857808 BLAKE2B b9dd1f75eb34b3149b1d8520fa34caec9547c581affd8065116376f5ee9b0332dc8791af63a88b918445b17b9fd5655b5c154a32c150da62a015ae94221c4634 SHA512 5209fb15ce22511f9b9ccde5e19c86136c3236490c4793afcc2d4081ad87dc4c5fde7f6335db1f50cbbb674b1afc7c42a8c89a6d046ba3945691b2dfb3691d38
 EBUILD networkmanager-openconnect-1.2.8-r1.ebuild 1164 BLAKE2B 5be683a47ed72b19cb4458aa2ed60b181d84ad3b2c92fafa5557ed7eec6c98d47764ebbb10912d923956d33cd89da650a931dc14192193b021c44f35b1190f58 SHA512 7bf50c93378f3e3a445fed64cd92cbfd7e6fbd3b039f47ad2cc4d3aefb19ba428d542c096464178bbcb064c95e6ed6b4ff27d3b7acc07a511d8ccefe12065a0e
-MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
+MISC metadata.xml 367 BLAKE2B 8c8ffe5ee3afd7b5ed558d27e396416f66fcd42e981a4e40ba737e96baa94ef41c8cda9a3f46efece9acc4ce724233dcafa7106722e461601a58f1b3e40411e5 SHA512 6ec9eda5753bf693fc162bb70cba3d4a2065d293c250bc4c4c04d40446597039b9ad5406919c489c4a02eed5ee17d81ebac41867b328660794dfa71a39b9291e
diff --git a/net-vpn/networkmanager-openconnect/metadata.xml b/net-vpn/networkmanager-openconnect/metadata.xml
index f453528b934f..f638ec81412c 100644
--- a/net-vpn/networkmanager-openconnect/metadata.xml
+++ b/net-vpn/networkmanager-openconnect/metadata.xml
@@ -1,8 +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/NetworkManager-openconnect</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-vpn/networkmanager-openvpn/Manifest b/net-vpn/networkmanager-openvpn/Manifest
index ac47535f99f3..a12a90ac48ac 100644
--- a/net-vpn/networkmanager-openvpn/Manifest
+++ b/net-vpn/networkmanager-openvpn/Manifest
@@ -2,4 +2,4 @@ DIST NetworkManager-openvpn-1.10.0.tar.xz 698340 BLAKE2B 3061aa0525897fe1321ac28
 DIST NetworkManager-openvpn-1.8.18.tar.xz 592488 BLAKE2B 01880d834b8eee62d66a81652cc3a6904afc0ad926193b9f346298bfc66fb05922d49a19bfa2c788f76026df1a052e2c0727021ded22ba63545ab669a9250296 SHA512 4cdbd6e6fc6ae1849b45e18bbad29748ee7a538c753901f871de350f08d861acb24770ec74dfb288136b0307b36e6ca784f51f982ade26babaa60e4a1e2f31fd
 EBUILD networkmanager-openvpn-1.10.0.ebuild 1071 BLAKE2B f6cb2c4ef52ce4191abf58272fd9aa14853430374b83b31b96ad00de39019c816e018fe7504aeaa8264ba631db2d93f16bad896e51a2f532e863373cc23761da SHA512 71a9ded75abdecec01d834733ef485d88232792241564ebc16aa0db4bae63cddd66cc1deccd790d70be26776b2e06eddaaf04e137e80efaa1e59b74f9da4ffb5
 EBUILD networkmanager-openvpn-1.8.18.ebuild 1113 BLAKE2B 7e7a35d8810107d138394a61f47b9d596670bd47b6f3a1b10d93b0210aae89f9152120c583d4a164ce510ae09105c28c0c62c57e8e139963f01851ae46e43818 SHA512 c9f4b0e5db24f0e9ca997e8d7e90e22d11219341104f23962bf45c42cc6afd7457232578fd4fbf8e09bf33b96219d163ab09dc1deeda02c443372fd19a5a47e2
-MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
+MISC metadata.xml 363 BLAKE2B 2ff0b1a3948001faad595b1e106a906aee729c0f576a6f7b66f766bcb309f4ef1f12ba3d24af1cf130db8e734d913402f74e9a12adef51bfcd77cdb532ab81ae SHA512 6b05e736c4c25efc495d219779f29c570a1e45ab6f259751c44e28a6c7fc94dae1b8d7ebd21d4297e11f64a591f8e72576e20711f52f3364e9fdbc727cf133e9
diff --git a/net-vpn/networkmanager-openvpn/metadata.xml b/net-vpn/networkmanager-openvpn/metadata.xml
index f453528b934f..2618d49ff24b 100644
--- a/net-vpn/networkmanager-openvpn/metadata.xml
+++ b/net-vpn/networkmanager-openvpn/metadata.xml
@@ -1,8 +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/NetworkManager-openvpn</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-vpn/networkmanager-pptp/Manifest b/net-vpn/networkmanager-pptp/Manifest
index c573bc4b5020..3a14683d55df 100644
--- a/net-vpn/networkmanager-pptp/Manifest
+++ b/net-vpn/networkmanager-pptp/Manifest
@@ -1,3 +1,3 @@
 DIST NetworkManager-pptp-1.2.10.tar.xz 400760 BLAKE2B 47fe1da3f173f91a7b4b0993e59feb20db10707c119e4270b51730b9e171431025d428f5dd76db66eee0df76f4509d2cd3b44d69af3c8b89a4d07e02ef028410 SHA512 712f6f79642d82b729eaf6a6d03ea62c0c09e0b151af01f02dfca1dfa142aadefd84ab16bb04424e85698ed69f1674520a50620dbf9e49f52e67822b476db9a3
 EBUILD networkmanager-pptp-1.2.10.ebuild 1330 BLAKE2B f38770f7a40310fb4531e8d2d0b0782ad68454c6a96eb4202c2569af5ab9bc919437a87f4c40b0fd2e3bc5e3ef1064fd28610787e6b34b05e7103f4d928240d1 SHA512 5ae4c1f22a2a9340751dfafc32249ced96b6c3f305fe59e8a2ff534348c27bb13f465f9bb296d684f865f47b96c9f9a7219057bcb7eda33fe409f562bf23f54d
-MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
+MISC metadata.xml 360 BLAKE2B 3903a7b5c9b8ee7ab04bebf86f713d729169a82d0712f5abf556470cce718df9df7a282902660bce68582321b4c2eb215d4028d88c3625ae014e16a9d4e73363 SHA512 493ecbe619912440f551f3d3835727721157a371cb246fa5bf4a770950425cc86568addf6603aa6aed9e0ac899507834d2452b2edd4ae81b16d00deaedc125ec
diff --git a/net-vpn/networkmanager-pptp/metadata.xml b/net-vpn/networkmanager-pptp/metadata.xml
index f453528b934f..b387b9fcf163 100644
--- a/net-vpn/networkmanager-pptp/metadata.xml
+++ b/net-vpn/networkmanager-pptp/metadata.xml
@@ -1,8 +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/NetworkManager-pptp</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-vpn/networkmanager-vpnc/Manifest b/net-vpn/networkmanager-vpnc/Manifest
index 0afa553ac010..72b58ad27596 100644
--- a/net-vpn/networkmanager-vpnc/Manifest
+++ b/net-vpn/networkmanager-vpnc/Manifest
@@ -1,3 +1,3 @@
 DIST NetworkManager-vpnc-1.2.8.tar.xz 428980 BLAKE2B 637bcd1c9bcc443056629c86c3bce50065a209dee4f20a7cf40d15d1ffd622dac5c9aea664d0903d32c0db1503e6976fc65461d821920f531aefb2f141f95bee SHA512 04ed5d64aad5168b0a3585d62742ff3ed3d084ad2ade7016506cc42e91db598aa3199b40c9b1787c77eca59780784960e1c629e900536267bfed6d878807b1fe
 EBUILD networkmanager-vpnc-1.2.8.ebuild 888 BLAKE2B f6e50249be97afc2c458e637ce6425ea28990d98469b7ccf013c23022d4d9405436221fdee88024be808308e8c5cd88a3386d873fefdf1fa43e48fd3ab6a68a6 SHA512 3521800eb42791b0b411e911676d5d206d2150f4b331251a891722f832f147f566475b63c0cd0b0e119b49747522729156858351d10e11af36beb95defb9f16a
-MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
+MISC metadata.xml 360 BLAKE2B 7cb8cea5b64b9d21b48222f3d576377cf30aaec7871a5ee484eafae0caf4619c353088b52fb2d474f38273bc8c620fff4fe64e1f978d444dd91d8587d6fd4f29 SHA512 968f8d3a530d5abb426e861f001185829951223fb3434f87ba00492d3fba310f4a3edd445778f1f6c23ad35a6b47db20528aebbcb0a7fa6babba4aa25740bd87
diff --git a/net-vpn/networkmanager-vpnc/metadata.xml b/net-vpn/networkmanager-vpnc/metadata.xml
index f453528b934f..a615da6a491a 100644
--- a/net-vpn/networkmanager-vpnc/metadata.xml
+++ b/net-vpn/networkmanager-vpnc/metadata.xml
@@ -1,8 +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/NetworkManager-vpnc</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 017cc86dd539..b65227bc1acf 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/gnome-bluetooth/Manifest b/net-wireless/gnome-bluetooth/Manifest
index f63fb0c8135d..e66af82932c3 100644
--- a/net-wireless/gnome-bluetooth/Manifest
+++ b/net-wireless/gnome-bluetooth/Manifest
@@ -6,4 +6,4 @@ DIST gnome-bluetooth-42.4.tar.xz 304048 BLAKE2B 7451c893496f04e38d36ba93aa7c9650
 EBUILD gnome-bluetooth-3.34.5.ebuild 1884 BLAKE2B 5d76a26723cb8ddbe4d8cb9ba19feebcef1c637037e698f048799ff16f1d457d1963adc43489f1645a3f29ba123bcef60a62cd7ef66a89c3c592372f47be1a75 SHA512 e13a32f323a3fb8fd49a7996e352a0d9ff3a1328d2faaa7a5a4b1673d21e4fe099d889012ad0c97267a99b0013c10b3dc18e2ad2816a5b52c652eebdabcba24a
 EBUILD gnome-bluetooth-42.3.ebuild 1661 BLAKE2B 4886d572399c2a8258770400413d43018acfb4232e6bc8dabecb44139c83ad26e07881ff8cf6d09cc6a7b6e049f35854484a11c1acd1faea4411c0dea428cead SHA512 b0cb5724f0e3397f0c8a2a48556354708246b8f0db639beec8dec7089e631a2288afcb5d75985160d765cc8cf8fb449efd9273648c23a193ca6baf9a24fe6bb1
 EBUILD gnome-bluetooth-42.4.ebuild 1664 BLAKE2B 4fc4753d90638a362f8ccdf0b402f61f784c5b0dfdf74ae5046fc027f5d957be3b9f98cffc765b0dc8f2eb98d942b54cb1215f45ad2b89c271fec4717bf03500 SHA512 b7cb5ec1691e1bf0195da7357e6ba0c8a52326c1212a5a3e7c0bc49aa97093df63abb1c569d5994dc6a5619dc3a5a02444254ce7c0fe6e8f15e6b364b4d17891
-MISC metadata.xml 373 BLAKE2B 06ad2a850886ca86649105c60fc64b5e6eb56250669a4eaa50524b500c59a39db80db85cfb7a1be7386f97e60cb758848be389b2eb3cb0a8a4cf42a95eb36c81 SHA512 976a99db6d5b42b1b2a22c59a05f44f9e5a3fee093082778e67fad2fb910c49bc7783b81bb81a6b678457ad8c1f4c3b954a906ade7913057c00def44ca4b0d13
+MISC metadata.xml 486 BLAKE2B f7080e058845d3931203b7912dfe5c31ecf36573241f33878cba7ca2ae240d62d067ea470845f6dfbb261631550916d430656040b8efcaec20123eb2be9ad5e4 SHA512 7b7f53d1648ad533caa02a18b859a3498e62a964f24a0e321f7661feecf95c02516f0ec65f23891a375a834d625dba7222c8e0919bc721558e747d582b6a4197
diff --git a/net-wireless/gnome-bluetooth/metadata.xml b/net-wireless/gnome-bluetooth/metadata.xml
index 11abdacb27d2..ee2f33268bb2 100644
--- a/net-wireless/gnome-bluetooth/metadata.xml
+++ b/net-wireless/gnome-bluetooth/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="sendto">Build the bluetooth-sendto application to send files to various locations/devices</flag>
-</use>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="sendto">Build the bluetooth-sendto application to send files to various locations/devices</flag>
+  </use>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/gnome-bluetooth</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 0683b0ac4135..fef4b67cb23a 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 302bbac22fbf..3bbe8df6600f 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Conrad Kostecki <conikost@gentoo.org> (2022-11-01)
+# Mask tests, as not all needed deps are available on this arch.
+# See #878933 for progress.
+net-dns/ddclient test
+
 # Sam James <sam@gentoo.org> (2022-10-29)
 # pandoc not keyworded here, bug #878355
 app-admin/conky doc
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 5609dc901228..7b2259ef262c 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Conrad Kostecki <conikost@gentoo.org> (2022-11-01)
+# Mask tests, as not all needed deps are available on this arch.
+# See #878933 for progress.
+net-dns/ddclient test
+
 # Volkmar W. Pogatzki <gentoo@pogatzki.net> (2022-08-09)
 # dev-java/jaxws-api not keyworded
 >=dev-java/jmock-2.12.0 test
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 0b7e2fd38c3c..7d91109f91b4 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,11 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Conrad Kostecki <conikost@gentoo.org> (2022-11-01)
+# Mask tests, as not all needed deps are available on this arch.
+# See #878933 for progress.
+net-dns/ddclient test
+
 # Arthur Zamarin <arthurzam@gentoo.org> (2022-08-15)
 # deps not keyworded
 dev-util/pkgcheck emacs
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 0b06a8ad3d18..b170dc1e0b6d 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Conrad Kostecki <conikost@gentoo.org> (2022-11-01)
+# Mask tests, as not all needed deps are available on this arch.
+# See #878933 for progress.
+net-dns/ddclient test
+
 # Mike Gilbert <floppym@gentoo.org> (2022-10-16)
 # Only supported on MIPS.
 dev-lang/gnat-gpl -fixed-point
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index f95c2845afb1..e1ee5dcafd9f 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -79,7 +79,7 @@ app-admin/keepassxc:autotype - Add support to autotype the passwords into other
 app-admin/keepassxc:browser - Enables browser plugin support
 app-admin/keepassxc:keeshare - Enable KeeShare sharing integration
 app-admin/keepassxc:network - Enable network support
-app-admin/keepassxc:yubikey - Enable database unlocking via YubiKey.
+app-admin/keepassxc:yubikey - Enable database unlocking via hardware keys supporting YubiKey-style HMAC-SHA1 protocol
 app-admin/lnav:pcap - Enable support for pcap files.
 app-admin/logrotate:acl - Installs acl support
 app-admin/logrotate:cron - Installs cron file
@@ -8049,7 +8049,7 @@ sys-block/fio:rbd - Enable Rados block device support via sys-cluster/ceph
 sys-block/fio:rdma - Enable infiniband support via sys-cluster/rdma-core
 sys-block/fio:tcmalloc - Link against dev-util/google-perftools by default which will speed up USE=rbd up to 20%
 sys-block/fio:zbc - Enable ZBC & ZAC disks via sys-block/libzbc.
-sys-block/gparted:wayland - Enable interim workaround to allow running GParted under Wayland by granting permission to the X11 display using x11-apps/xhost.
+sys-block/gparted:wayland - Enable interim workaround to allow running GParted under Wayland by granting permission to the X11 display using x11-apps/xhost
 sys-block/libfabric:cuda - Enable for CUDA provider
 sys-block/libfabric:efa - Enable Amazon EC2 Elastic Fabric Adapter provider
 sys-block/libfabric:rocr - Enable Radeon Open Compute provider
@@ -8851,7 +8851,7 @@ x11-libs/cairo:utils - Build support for Cairo script and trace utilities
 x11-libs/cairo:valgrind - Built-in support to mark memory regions
 x11-libs/fltk:games - Builds and installs some extra games
 x11-libs/fox:tools - Install adie, calculator, shutterbug, and pathfinder apps.
-x11-libs/gtk+:broadway - Enable the GDK Broadway backend.
+x11-libs/gtk+:broadway - Enable the GDK Broadway backend
 x11-libs/gtk+:colord - Use x11-misc/colord for color management in printing
 x11-libs/gtk+:sysprof - Enable profiling data capture support using dev-util/sysprof-capture
 x11-libs/gtkdatabox:glade - Build with libglade and glade-3 supports, which includes a glade's module for GtkDataBox widget
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 763f0d1eca92..ac2a9db87532 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/geocode-glib/Manifest b/sci-geosciences/geocode-glib/Manifest
index 254f98a84004..61ec17e3f0ba 100644
--- a/sci-geosciences/geocode-glib/Manifest
+++ b/sci-geosciences/geocode-glib/Manifest
@@ -2,4 +2,4 @@ AUX 3.26.4-r200-do-not-install-icons.patch 1060 BLAKE2B 358511d8f441562f81540545
 DIST geocode-glib-3.26.4.tar.xz 75352 BLAKE2B be783328b2372e1647c3fd6debadaf8313688fe1c993cbc1e084cd9ad8ba8fec0b142a0f579f63085684ef8fafc6e7ec6f54441a085d25d9d5f2eed31a893d1b SHA512 998c2f02a8d3d34a8b6a4b031da2e7c28df27014bcf58f3374fbc0c829fff6257c2622fd9bf331e05b85fbc761c64554fb77ce2d986e0f8b59b17aa486f9f609
 EBUILD geocode-glib-3.26.4-r200.ebuild 1219 BLAKE2B 188448c36bb6b8b761d66ad4c274be23458be054b8c5b4c6b71248ed25ec2ea18da92634f3a5ceb1b5494cf9260965655890f9329af9e0e3fb49b869f66353f7 SHA512 1b5b18104e6ea2c3795f56ea464862a52592312d13cf89d6c68bfca480f8ee610ca6c752c871e35e53357115e09f9b2b1bc43f7946ff84b9b54b820dc133dba5
 EBUILD geocode-glib-3.26.4.ebuild 974 BLAKE2B aa9554ca93f0607df9b2c3d3d5fe80f3c87751fbe73594403393343662deb01dce700565e8796006aa3a607e727f9fd77845ea46dd77a690a9c27f5f2c16a637 SHA512 71e5bc980648f16c27f5cfc9a9963e404421d13b7e3a8c0d40da5414e23306c7c06956a41031223ceabaf2b7ba8a5582b1ae081d4361924b75a958e988a299ce
-MISC metadata.xml 417 BLAKE2B 887efe27b7afb861a1da9dd6f3a8bdcbf515e0db4993e6fc897e376b4b4efb7607ede8057ab3a9a1d2ea7c375e27fe6a465f781b0de0d628158cd01d414b9089 SHA512 83a96a8542a501f30f0b1c072f74731b36602b9146003c15e9596318db776b048a46dc0a85a9864280e26e848a08259da51043aee008447f230fc740a56d9968
+MISC metadata.xml 530 BLAKE2B b1ec0087512fd3f1f73946579481a6734bc6555c1118209a7883bc0ce0e13d9f028c4a7271ec458fc3a1147a2fdaf9692e16d805e09144d2cb729ee77edc1932 SHA512 ecfd5406ec2f8bae406225cf2ae2acfb07cf70ac8b121b2da3c5f814281c9f6a6eda9f06029cc9756e354502d3dc15a7aaf57919d144276ad27d79325bd697a3
diff --git a/sci-geosciences/geocode-glib/metadata.xml b/sci-geosciences/geocode-glib/metadata.xml
index 2a0d060bc40b..70cb7ffcf02c 100644
--- a/sci-geosciences/geocode-glib/metadata.xml
+++ b/sci-geosciences/geocode-glib/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>
-<longdescription lang="en">
-	geocode-glib is a helper library for geocoding and reverse-geocoding
-	services offered by OpenStreetMap and Nominatim.
-</longdescription>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <longdescription lang="en">
+    geocode-glib is a helper library for geocoding and reverse-geocoding
+    services offered by OpenStreetMap and Nominatim.
+  </longdescription>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/geocode-glib</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index f63273d4260f..c1bb022ad371 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -4,4 +4,4 @@ DIST gnome-maps-43.1.tar.xz 2329212 BLAKE2B 6597597dcf5b056a33670f502c3ab0b9658b
 EBUILD gnome-maps-42.3-r3.ebuild 1571 BLAKE2B d89dd8060f01ab68fc9c33d84d1a4c320389f8a06621379bbc41dfcfbdfaedd018fbcd18c8de9204e08a8a732e5913f236ecce1050923fffca5bc69b1364983e SHA512 f2d232245df8b3cd350c448a2312e17eda7a509652124cf6b6aed4ebf9b4834a2478bfdcfc200060e5b0370e89b0ac7fb9c8cbf42b9688007937c65d56f59e5f
 EBUILD gnome-maps-43.0.ebuild 1214 BLAKE2B dae6bf86bb7024b419cc575409378b28ef9b445f70237413e679d7ca0ef69a9e526590be6df9225f5720bcc69bf2da95f3b19401b365c9d047459eaca4acbe33 SHA512 d5cfd0d485e26d399ee291e5e9cdf8214bfd396268631e26c367be3ad5a052aba6bc7c36e725054e78c0bcd653467ea4b8db2d8fb54466712dce273f690d6205
 EBUILD gnome-maps-43.1.ebuild 1214 BLAKE2B dae6bf86bb7024b419cc575409378b28ef9b445f70237413e679d7ca0ef69a9e526590be6df9225f5720bcc69bf2da95f3b19401b365c9d047459eaca4acbe33 SHA512 d5cfd0d485e26d399ee291e5e9cdf8214bfd396268631e26c367be3ad5a052aba6bc7c36e725054e78c0bcd653467ea4b8db2d8fb54466712dce273f690d6205
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 351 BLAKE2B 720552be0df0a6687b1c65211e4532bcdf2f76a1dbc2cfedf801876006bdef781b6e7a3caab9f61a6d5a17fcb73caaa194bb54d356fd903c6ba3d8849c1e8ae5 SHA512 cb4a26c3d4dbcdc7e6ba7cd7136cddf8633002eab39741c4fe5d033bd3154d17d002d475c8f5370aae652ba1b34f952ce1401ea8d71d22ad4ea4aae364fe9645
diff --git a/sci-geosciences/gnome-maps/metadata.xml b/sci-geosciences/gnome-maps/metadata.xml
index 7b343b06be8a..e3a36a2d3462 100644
--- a/sci-geosciences/gnome-maps/metadata.xml
+++ b/sci-geosciences/gnome-maps/metadata.xml
@@ -1,8 +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/gnome-maps</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 940d3008f3ef..be0ba136d99a 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index 1a2bf741cad1..8f421258de5e 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -1,4 +1,4 @@
 AUX accountsservice-22.04.62-gentoo-system-users.patch 1318 BLAKE2B 69c74ad620cebd6864efff7ad87401a72ea5f644a773a682653b45584e34755aaf12a0e79ba816c990b0af2784d01fec5e8b657699ecfc7c38343330a36fda57 SHA512 a85a6ca785a3863d96eae39bc3eee5fe89bedd0bdae40cd6bc2e077bb88f72d73d0be63dcf0e0a788f0f5d69ed39801c9ede623afe8ed08c94372314b1fddd09
 DIST accountsservice-22.08.8.tar.xz 102672 BLAKE2B 7c9436d3845fc1883772b434c4f9e2fba934d17e6d4452a6be65e1d790a23b331eaaa64b0e6eff6fefe79587a40cf1749a0f3de09f323b10740046bd9d145c9d SHA512 2ca3ceb1b44338d9924b86788256d4eef7ec10e0c2197bfb8cc6c31ae224fab3051f03cb406a526f90057684965bef4ba0f2cc01b26198ec1fc6baec36ad3ff8
 EBUILD accountsservice-22.08.8.ebuild 2028 BLAKE2B 8a1969318c06c329cd82d9e22f545c84fb781f90abe8b67b0c94dfb8794c4b6ca8703b4acc78f3feec741a20282cead8fe7e06bd5c180fe5b6a4dc8cd3f7f79c SHA512 5982977814a56aa15b2533ff64638cb402809fcf5e378fe5f03fd77100dfcca6650c382dded1ced4c48c3b110765056cb933973b1e5aa701fa80986784a41915
-MISC metadata.xml 435 BLAKE2B 15950bf42bdf008f146f8bb89c9b8f29734eb244c7c8f664d6b9cfef3999b241de1fbec5bec7ed9cd874875a49b814001662122b488e5137a83f4ae6c8eef7aa SHA512 a5c93f2a4ab9453a20e6a6f9de924f5eff56a3e16a994c6ff09892a4739dbddc4d422bf4ad4d20c0772433932542b797277c2109bd39695588c1c02ef3d172dd
+MISC metadata.xml 559 BLAKE2B c43012a95ec8ddd3ce687f69b4dc1889c82f31828f8e1f53bded7723b82c2a8faff594674fbd819370078dc13f48f51df45a3a280563c6a00080e5332128498c SHA512 6c1e1e291bcd11a06fe4e7b73031accdf0fe839cb7372f96d1cc52e5c1a1a1b032adcf0da7dde016331fefcb1ae1402386ba3ab2713b4256e9e60dd2b73f76f5
diff --git a/sys-apps/accountsservice/metadata.xml b/sys-apps/accountsservice/metadata.xml
index 1394e6dc5f5a..a5e0c3471d4e 100644
--- a/sys-apps/accountsservice/metadata.xml
+++ b/sys-apps/accountsservice/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>
-	<use>
-		<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag>
-		<flag name="systemd">Use <pkg>sys-apps/systemd</pkg> for session tracking</flag>
-	</use>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag>
+    <flag name="systemd">Use <pkg>sys-apps/systemd</pkg> for session tracking</flag>
+  </use>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">accountsservice/accountsservice</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest
index f5d9632af1ae..09275a67ca91 100644
--- a/sys-apps/baobab/Manifest
+++ b/sys-apps/baobab/Manifest
@@ -4,4 +4,4 @@ DIST baobab-43.0.tar.xz 594832 BLAKE2B 1cf42a475bf08ddf85d3fb2944f80e274eeb47d1e
 EBUILD baobab-41.0.ebuild 854 BLAKE2B 6e723adedb979773babe606eb4ed3052d84219d787b770048811f2740219ed5404860ee7e91d4cd97a963168e3a313d3f9135c4190e43d44a6c141fbfb2bc005 SHA512 b38a58f149cd86dbf2b34a9c541cc5d1c0dc310895792a6f86e25cf651c15667f279610826e56d7289313b46a561061af102d2392d65946abd1065a6e4956f03
 EBUILD baobab-42.0.ebuild 859 BLAKE2B 0f3863b0420f9e26de47c5df7196485275b5f7d43f77796552d4593362f029c3a6f7681754d4152b33c8b61ef869153ef013be8ab3efc0709620b5b7eddb4287 SHA512 96a67fd627c121803c1ed8d272c4b1821ca9fac7dcaed8f4358b37c27f6802e0e2ad1abb65e0455c65ff830c82442922d201366553a3a327d983d2af90f40d05
 EBUILD baobab-43.0.ebuild 858 BLAKE2B 1e30507137d49b78d52e421c1a8012745b7924f304ebebea89626575937abd5599e37ed6c4fac6f3982d22b1ea6306eb5f84a31a53ef85ef9d08072cc5b6ca45 SHA512 c0f41c11a4a4a44f00d086808dbd1b2c6f1df099748dfdd9195b2db948c0b8eadaeaf23086a91fe852f8337a237cee22d6e9139059378de5076c7d23086a9f9c
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 347 BLAKE2B 983e64fe7491b1205d37910affc27542fd793cf95bddc6b6584ec859b99e0751b11a92886c4bc6da63f7fee20c6a470272a18df2e88edfc4f8260f8b6fd971f8 SHA512 543d1c0b086cff34c3f5b66dd5ed9f6c91e3ef7599a6bdff7121454e934bbd55c20180fde028839dfe1537c468ed85b61efa7708229369261836fea5bbc0bdce
diff --git a/sys-apps/baobab/metadata.xml b/sys-apps/baobab/metadata.xml
index 7b343b06be8a..bda41aace7cc 100644
--- a/sys-apps/baobab/metadata.xml
+++ b/sys-apps/baobab/metadata.xml
@@ -1,8 +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/baobab</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index ed9d7533366f..857ff8d324a2 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,8 +1,4 @@
 AUX cpuid-20220620-makefile.patch 1359 BLAKE2B b16bd455de251f3989718fa56c1b19f97d79271998ccf774f74f0886ab8072be482e480604bfad462e0ac9c325470d12e80150e6fc588abfae629cd6499e0ea4 SHA512 680e477460679ae016c95d0e0c5cef916486629011b43cafb5f90c1c097b8c245d4c8b7861a20bdeee05b87b2220ad37a5ca589ff952dd9d7580ca301aac0ada
-DIST cpuid-20220812.src.tar.gz 137109 BLAKE2B 158f152d55b0d8f8ca2df59fc19b9f91142296ef4657b6b2b39ca401abfb26db822be7eadb3a4010847483e75aa213b64756dec6cc625db8c96c8fe8e2a8c468 SHA512 f57c1bb78bad3a9a0d210d5da2a57ea6ffeca83c677f20423dc11af551684ba417b8e5641559cf1d5077567937bd2b2350f232e317ff7be388727983be2c1f6a
-DIST cpuid-20220927.src.tar.gz 137355 BLAKE2B 70c51273fb87fe86a4bf1ddef938275474ad3af496cfdbc8e1b8e7dcf3f33b478340fcd3c8c49c6a0d2fe4927e399977e9c53cab118da0098eae2cc83cea51fc SHA512 f621c4cf8cbe027133442aa29018b9b52eb4d0e45a362cf613fee772456ac9e3347582c2feacb6d3358602f6da6425fcd88924e1ba937c89a5eaac43b1f9143f
 DIST cpuid-20221003.src.tar.gz 138457 BLAKE2B 0eef33fc38ff0bb96bec2928a376cf849a5141e1fd161f1a2649e106543a0eb0b29b13e450ad11e251398dda155dc817944c5c81c3ff0b0fc2d7c92779c3ff0a SHA512 7e787caf59e980cf1eca8012d6269b61cd8bf0a1a79c4534d8bb9924b6eff2fa5c0408bc8581e50ef205a280e7861ca62a7d49e7378faff0f185a97463a115a1
-EBUILD cpuid-20220812.ebuild 600 BLAKE2B 1ebc72661435e3d658e51857de187ab6ebf663548f0431f18c5240350d70bf7bd3390503bb5b45d527f28697ff6eaf0ab093847bf812a109f405ba75f95760d8 SHA512 2a2860ba8cb11dcc186d3cfea20232055a184de370651887aacf9db71ffa6cb80594e057ff8f7a4a81f926f38ef1c148cb2a690f9c1ac371acf46dcb01a3e06a
-EBUILD cpuid-20220927.ebuild 602 BLAKE2B 0b44750e78eaccaa51fef6961672ee30daffe9d77ec413201a4779b94ecce53fa10539907cdd3d79d1f6dcdc5a3e542c8cfc0a10deaf6fac01d48b9bbffdf089 SHA512 7abdb0e2514f001cae3c99bd2f0e128a2d17e7ee2d38cbeb7d0043635b02747415ff3c3b3ac86fbd2313d2dc6351e1c0a0094c048fa4e4e0146e3fa5b0290d6d
-EBUILD cpuid-20221003.ebuild 602 BLAKE2B 0b44750e78eaccaa51fef6961672ee30daffe9d77ec413201a4779b94ecce53fa10539907cdd3d79d1f6dcdc5a3e542c8cfc0a10deaf6fac01d48b9bbffdf089 SHA512 7abdb0e2514f001cae3c99bd2f0e128a2d17e7ee2d38cbeb7d0043635b02747415ff3c3b3ac86fbd2313d2dc6351e1c0a0094c048fa4e4e0146e3fa5b0290d6d
+EBUILD cpuid-20221003.ebuild 600 BLAKE2B 1ebc72661435e3d658e51857de187ab6ebf663548f0431f18c5240350d70bf7bd3390503bb5b45d527f28697ff6eaf0ab093847bf812a109f405ba75f95760d8 SHA512 2a2860ba8cb11dcc186d3cfea20232055a184de370651887aacf9db71ffa6cb80594e057ff8f7a4a81f926f38ef1c148cb2a690f9c1ac371acf46dcb01a3e06a
 MISC metadata.xml 532 BLAKE2B 49d1eb34a9859763d42159adcf9a2dca3128af78aef52cedc4483950084238ba780bd841788f4b27eb72fc44e61c2c5bd264b6c6e2c57824ccf146b6ecad50e9 SHA512 f51db55a3cc5478afba39a42731122db8ac720af8685e093b6952efd2778c9f0668ac936d2a1cdacaf2586d62d0f13240d664a7bd4fbd18236c816e9e6745600
diff --git a/sys-apps/cpuid/cpuid-20220812.ebuild b/sys-apps/cpuid/cpuid-20220812.ebuild
deleted file mode 100644
index eddf220e872c..000000000000
--- a/sys-apps/cpuid/cpuid-20220812.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Linux tool to dump x86 CPUID information about the CPUs"
-HOMEPAGE="http://www.etallen.com/cpuid.html"
-SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-BDEPEND="
-	app-arch/gzip
-	dev-lang/perl
-"
-
-DOCS=( "ChangeLog" "FUTURE" )
-
-PATCHES=( "${FILESDIR}/${PN}-20220620-makefile.patch" )
-
-src_prepare() {
-	default
-
-	tc-export CC
-}
-
-src_install() {
-	emake BUILDROOT="${ED}" install
-
-	einstalldocs
-}
diff --git a/sys-apps/cpuid/cpuid-20220927.ebuild b/sys-apps/cpuid/cpuid-20220927.ebuild
deleted file mode 100644
index 0f77190b474c..000000000000
--- a/sys-apps/cpuid/cpuid-20220927.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Linux tool to dump x86 CPUID information about the CPUs"
-HOMEPAGE="http://www.etallen.com/cpuid.html"
-SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-BDEPEND="
-	app-arch/gzip
-	dev-lang/perl
-"
-
-DOCS=( "ChangeLog" "FUTURE" )
-
-PATCHES=( "${FILESDIR}/${PN}-20220620-makefile.patch" )
-
-src_prepare() {
-	default
-
-	tc-export CC
-}
-
-src_install() {
-	emake BUILDROOT="${ED}" install
-
-	einstalldocs
-}
diff --git a/sys-apps/cpuid/cpuid-20221003.ebuild b/sys-apps/cpuid/cpuid-20221003.ebuild
index 0f77190b474c..eddf220e872c 100644
--- a/sys-apps/cpuid/cpuid-20221003.ebuild
+++ b/sys-apps/cpuid/cpuid-20221003.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 BDEPEND="
 	app-arch/gzip
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 5d93f99de659..c7d32d09b408 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -2,4 +2,4 @@ DIST gnome-disk-utility-42.0.tar.xz 1740332 BLAKE2B 4d05876364a475d1e16651569862
 DIST gnome-disk-utility-43.0.tar.xz 1752240 BLAKE2B 906183e7f61c4e9d2206fe2c99034f06a0aa3869d253587325ae18b336dffc6d8523a2f4d89c4338ed64947e73c5a24de15dfdb15a9d42d77fe51fd2321bf159 SHA512 8cb1b10fba21c90bceec9521103defe092dea9a4c89a39ae44e4d5981dd0d1958649e7a2743535f0135a3c9179cad0e0aced98dfc805e19bdec81651abcecf48
 EBUILD gnome-disk-utility-42.0.ebuild 1420 BLAKE2B f49175cccf7b980232eead9e9d9c8bb88c89c6b1fbd9e80d54f1d1d74505757995c40d50c70e6cf1b70866306ebf8d138f86c9d27aa8d0f630e676a72ca1c8d1 SHA512 07e8d01b90398ec739b4a2d1d421e7b340fde1b437707312e71b0572663c91a2d4881dc7fbd95cbe44819f77d383a1c6a9f6da0d0f56ebb77282680d832cd769
 EBUILD gnome-disk-utility-43.0.ebuild 1420 BLAKE2B 86a4aa721ce5a0064388dbfdc39e598a754ccd475201e5717baabeee5a1019bd8321f98cfbda22287a758a682f252b593a428cad6d2c861afe349a2df22fb3af SHA512 dbd9f2153790c9d6524b4098264a54a112b63a56ea969cb0b924fa046ffcba8e21d8ca32d106cbdeb63f7a2e15868ec8911c9440539e48d06f3e409ba559287f
-MISC metadata.xml 598 BLAKE2B e9bd803739e63d5667cf9d84b27af2efeeac8e31591d022cfce00fa147f4ee267ea2c03624f43c2d822c00b853b1606f6663814a731182aaf557be259ab2fe45 SHA512 fa5f53e258f9db1447b28979f655b6794491af9eafd0d6f113d43fd2073d36fcedc126fef7fde4a21b99e2ad11e4442c7c333d9dfaeee92064b0de23c071c23e
+MISC metadata.xml 725 BLAKE2B 173521fe25d9d15cc28c6c4abb434b246222a2c6e15392fdf655e4be1006f83026e9fabf7d29f9d41421c5f13f114c6649971defe18bde1ae1c40f7355859902 SHA512 88e461ac9ac3c8d2a321ef3a1ad44d17b8b3e4355f92320857c77b1a5c6d707d3b3613518dda5cfec9fe4e44067f97a9bac9b1b56ac037b7f0d86da82ecc93b3
diff --git a/sys-apps/gnome-disk-utility/metadata.xml b/sys-apps/gnome-disk-utility/metadata.xml
index d45bf7909b29..1d4f056df527 100644
--- a/sys-apps/gnome-disk-utility/metadata.xml
+++ b/sys-apps/gnome-disk-utility/metadata.xml
@@ -1,17 +1,19 @@
 <?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="fat">Include FAT16/FAT32 support
-		(<pkg>sys-fs/dosfstools</pkg>)</flag>
-</use>
-<longdescription lang="en">
-	Disks provides an easy way to inspect, format, partition, and configure disks
-	and block devices. Using Disks, you can view SMART data, manage devices,
-	benchmark physical disks, and image USB sticks.
-</longdescription>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="fat">Include FAT16/FAT32 support (<pkg>sys-fs/dosfstools</pkg>)</flag>
+  </use>
+  <longdescription lang="en">
+    Disks provides an easy way to inspect, format, partition, and configure disks
+    and block devices. Using Disks, you can view SMART data, manage devices,
+    benchmark physical disks, and image USB sticks.
+  </longdescription>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/gnome-disk-utility</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-apps/irqbalance/Manifest b/sys-apps/irqbalance/Manifest
index 34bf1211584d..a532691dbbad 100644
--- a/sys-apps/irqbalance/Manifest
+++ b/sys-apps/irqbalance/Manifest
@@ -2,6 +2,8 @@ AUX irqbalance.confd-1 577 BLAKE2B 2744f203cb1d20ec44bec2f4cd2adc92209575a4742c6
 AUX irqbalance.init.4 555 BLAKE2B a90aa453f6d59ec8da954d47a386cfcc2395e36b3b7f9b0cef74714e348e23b091aa00d8db586593e2e85a01f8fc2d97be7a8c754d44a6f5728f7e2e98393df1 SHA512 0252900f183a714f2c1c9f57bca7b26e2c2b3d12e6ca46085203b4b04aff41cc97c6a54b1f0e66b37d7f214f127633c0179cede8deee57dcc1f3635ec17c337c
 DIST irqbalance-1.9.0.tar.gz 55779 BLAKE2B 11df51b03a473da10340c0c9ca9a28b3d9f9ed81e202e434b135a4be1cf54bc5558b33a4a922eba89bdd8cebbd6d3448527507fa72f03c4ff494ae83d513854e SHA512 878977da5eff18e53bdceeaa4aca952f73ba8b03eb028cf176816af971ffc65f0b1f1bb3a68e3a2502491895cc2b9438652dc97d5696232bb2f64860109e9a24
 DIST irqbalance-1.9.1.tar.gz 62126 BLAKE2B 218e6f90d0e9ca9b2e276a69fd0c97438ff16c96772f30281c10a051eafdf929a66f13c03d512232fff836aa1c2095bc404006dfc16904c2c2cba245f4b57b59 SHA512 ec2abd3aad61e5370ca13a767fb6b5b206b61f5751853995780dd62e1657d88d74819ff5838ad2599855c701ea5d53755bf108a5427469faa7b1f042351b6068
+DIST irqbalance-1.9.2.tar.gz 62188 BLAKE2B bc640323c3a594090f77983e63d9b7df177a05b859e4d29edb5b654f886c9e9f0d748ce22b1323bee443ea8369e014b9e0ce383bfe6f396692346649199d10a2 SHA512 d0fb157fbfc096fa9cfb4562e51fd4c3f4fa8788f72377c58b27df67c70073b787bba05e39809dcbe17532bb5b8e74b6d27c5e5b3d9af09bc9ce1a9b6aab9378
 EBUILD irqbalance-1.9.0.ebuild 1334 BLAKE2B 74900103bf0167ae4d3dc4fe0d73de353ccc818f29b9edddffe9c163f47f46d3baee119b403ceb24058598739c9c691a69bd4a896f47a591687435c22ab32124 SHA512 03363872eae5a613833a7e1b6506f5440cc40b1bdce4aafbb891e5091f1c1815848c3df8f0b578a3742b25b5f3a0dd3f22100fb1c2068882a3affb4fbfa625ad
 EBUILD irqbalance-1.9.1.ebuild 1447 BLAKE2B 7eaa404c0b23614b66d9a877bb4e01cab888771d03687a9ce00523fbbc112a4b3c14f3a049591050b7931f56b5a7fd9e18addb8465a2f4d3218d421794536cd8 SHA512 2c330e7c59e80f7bb929d146ad9fc38470c7b013a9c92c0673618b076542fe13f3fb34c324c753f0b666fac70cb169da30c10ff4e461f299b14402792d3af0d6
+EBUILD irqbalance-1.9.2.ebuild 1447 BLAKE2B 7eaa404c0b23614b66d9a877bb4e01cab888771d03687a9ce00523fbbc112a4b3c14f3a049591050b7931f56b5a7fd9e18addb8465a2f4d3218d421794536cd8 SHA512 2c330e7c59e80f7bb929d146ad9fc38470c7b013a9c92c0673618b076542fe13f3fb34c324c753f0b666fac70cb169da30c10ff4e461f299b14402792d3af0d6
 MISC metadata.xml 547 BLAKE2B 0a83f459995622fe247317aa9f045c0696f888712e9e5b56ac4eedb12862772044aaf407e25181ac84d64b9fced0e950b74c9dfcfa7a44e2451356dbab03461a SHA512 90b145e0e3fd1519eb1e6a412fc06700eed8bd27bea262e3d0bed02b0140586c0a9a01b9e301d3c0ec464c2cfbc6f80118c48eead3c830ba13dfd3b1588f6c9f
diff --git a/sys-apps/irqbalance/irqbalance-1.9.2.ebuild b/sys-apps/irqbalance/irqbalance-1.9.2.ebuild
new file mode 100644
index 000000000000..1edb1533cf88
--- /dev/null
+++ b/sys-apps/irqbalance/irqbalance-1.9.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd linux-info
+
+DESCRIPTION="Distribute hardware interrupts across processors on a multiprocessor system"
+HOMEPAGE="https://github.com/Irqbalance/irqbalance"
+SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~x86"
+IUSE="caps +numa systemd selinux tui"
+# Hangs
+RESTRICT="test"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/libnl:3
+	caps? ( sys-libs/libcap-ng )
+	numa? ( sys-process/numactl )
+	systemd? ( sys-apps/systemd:= )
+	tui? ( sys-libs/ncurses:=[unicode(+)] )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-irqbalance )
+"
+
+pkg_setup() {
+	CONFIG_CHECK="~PCI_MSI"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	# Follow systemd policies
+	# https://wiki.gentoo.org/wiki/Project:Systemd/Ebuild_policy
+	sed \
+		-e 's/ $IRQBALANCE_ARGS//' \
+		-e '/EnvironmentFile/d' \
+		-i misc/irqbalance.service || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with caps libcap-ng)
+		$(use_enable numa)
+		$(use_with systemd)
+		$(use_with tui irqbalance-ui)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/irqbalance.init.4 irqbalance
+	newconfd "${FILESDIR}"/irqbalance.confd-1 irqbalance
+	systemd_dounit misc/irqbalance.service
+}
diff --git a/sys-apps/osinfo-db-tools/Manifest b/sys-apps/osinfo-db-tools/Manifest
index 7d73658b8567..aaf1007da15a 100644
--- a/sys-apps/osinfo-db-tools/Manifest
+++ b/sys-apps/osinfo-db-tools/Manifest
@@ -2,4 +2,4 @@ AUX 1.10.0-use-libsoup-2.4.patch 570 BLAKE2B a43ae98006dc2791c4594dfba5cd5a7400f
 DIST osinfo-db-tools-1.10.0.tar.xz 60508 BLAKE2B 2b9abbdba25add96440e2a937ae994c0305f995b924ffc7c88c2c31c122d3e5cf0c710fbf55724bea56f63be7250321ee27d2179e3f247461d6843f7e03dfc58 SHA512 27271b15404a6cb0065854ba8556c272cf3427ff4fd18fc9a22dbca2b01686c32661b24e18f5eff9a1b240a3a459d8fe66cbde530873d60b8c850bdd0b42c475
 EBUILD osinfo-db-tools-1.10.0-r1.ebuild 1056 BLAKE2B c197806b9a5f1e4b6abdd04e954006dcfae0dd6007078dc9dc2d90e550c00c7771336dd1ef51457e9731da172d00055e9b3d69e0283332465f37b724c32e1050 SHA512 e47b2e22b6d05379114f970bb65dd5c39de177e8d8275083444de88df96776f20d7f1e3b8e60befb192ba6f5331c9d5b76ba8eb3dee20e2eadd3754bb2563723
 EBUILD osinfo-db-tools-1.10.0.ebuild 1126 BLAKE2B d6a124d684cd7f447995b3a7bb51f5a1d04d362c2556b8681d9c0ebb1cfe7c760a5373037a7a88811b841d87985131422e53dadd3b325f0c50236eb1258867e4 SHA512 84ae52f3ef95c853104ca23f1068327437141b8bbfda1a41582172d0e739d1e454f5fa658fb9dd708ac1b9747e0f51eb2649e7b6e6b78b4f866af36b00dc17a9
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 354 BLAKE2B d60564aa9028df9e48d1213b20c33f1057fd21becf7ecf5f3004138fd5eac922b36d5c609d2bbdb03a8208d9a6f5a2969982c68b9ea9bee5c4e212e0caabd4fa SHA512 e6377db8098215eafb31f39fcbbf7982702419d3be0a7ad4a8299e0073d59e79f44d45e2c232fda0276e1f1ebf476ad19028bde0d780b662b1ffe3fa1817ba39
diff --git a/sys-apps/osinfo-db-tools/metadata.xml b/sys-apps/osinfo-db-tools/metadata.xml
index 7b343b06be8a..48917863fc09 100644
--- a/sys-apps/osinfo-db-tools/metadata.xml
+++ b/sys-apps/osinfo-db-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="gitlab">libosinfo/osinfo-db-tools</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index 6bffe345d57f..0ce04136d35f 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -4,4 +4,4 @@ DIST osinfo-db-20221018.tar.xz 136440 BLAKE2B 819e3debffb2381242047d8e93cb8eff04
 EBUILD osinfo-db-20220516.ebuild 692 BLAKE2B 6a023a7d52c7ac117481e628e0a0d8aabf43e2a18ef0daeca80503b3e3256ddb13ff063d45c4f11d4e58e3d871d47871559b68ce4e9be6fcdbe7920289cbb575 SHA512 f98f2d6cbd7c52c5c149030f4983d2a27ce24639b2886062f1205ca4636823df0bb1de63de08fec2bfa0eb9a95a4530b30d3aae540abe05d930ae549dccfe049
 EBUILD osinfo-db-20220830.ebuild 695 BLAKE2B 320bab52572b923ba2de94d64fc029461fadf1c5c709396ae570dd20015cce555226e839c2cd4e80afc089c96a3508d2afa8b20c3ff061334f0e69ac877189d2 SHA512 22dcc990da0b6c5159e8e598641630ab84a45697c99aaf1e71de3a6efbf0ecc9423caaf9cc251c356e941260b62fc722b418ba8e239e661288d1eda838e5c529
 EBUILD osinfo-db-20221018.ebuild 695 BLAKE2B 320bab52572b923ba2de94d64fc029461fadf1c5c709396ae570dd20015cce555226e839c2cd4e80afc089c96a3508d2afa8b20c3ff061334f0e69ac877189d2 SHA512 22dcc990da0b6c5159e8e598641630ab84a45697c99aaf1e71de3a6efbf0ecc9423caaf9cc251c356e941260b62fc722b418ba8e239e661288d1eda838e5c529
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 348 BLAKE2B fcfdacef0e6fc650338b935811d7b2ff4460497bb332b87312bd4c69c7ac260d9dc5288b383be27b1522a9ff9717a51fd4b2bd8d97f67e359ca8e5ff6c2c5c64 SHA512 4519bf98303033ae9fa40088f38eb6d703053eb6896d939756669dcf50404c5dac577fd3870afa4be5e40da4d4901b65f452b6779dac886d1673866b3e0f6f2c
diff --git a/sys-apps/osinfo-db/metadata.xml b/sys-apps/osinfo-db/metadata.xml
index 7b343b06be8a..319bd60a927c 100644
--- a/sys-apps/osinfo-db/metadata.xml
+++ b/sys-apps/osinfo-db/metadata.xml
@@ -1,8 +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="gitlab">libosinfo/osinfo-db</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index b6564df1555c..b1e9ff7bc177 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -5,7 +5,7 @@ AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed6
 AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed83b34a3e4d45bb008de9a134892a5321b37b56809c7a44530d18e33c7877177e8b64b2d89dfc2de844bed433db6d5e57831d20fbfb456 SHA512 8d697dbd305f6b95a4ddc47cf9d99a0e954f54e161bd59164917b62a78ff5c23fa2d5be2614569c0a2297595dae59e1ee71bb04da72cbe0c0807e1abd7da974d
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
-DIST systemd-252-rc3.tar.gz 11754095 BLAKE2B a1eb08336e47c7c68b31b48a69cb71bd4ebb96912af6a05731979dd64ed6eb9eea729fa2d240d5f2abe7b306b0778bee7ab82e0ffd075f04566f983c557b41f2 SHA512 3968f1df6eab12bb3fe9575e1bd9c87f7e1f45d22c404f250a0dc3e0da801cb089a5e4a1ebc9ef0e3b38c47d55db895eca3da419e757bc1e7f825d154e9b5468
+DIST systemd-252.tar.gz 11759896 BLAKE2B ebc4ca81714cfc3b512c81d78201e4372665d0b43fe869a356214afef512b193af62ffd252b68594281fd2e009bb551cf7b2390fe80a8de452b40c04850a4928 SHA512 c9a5f4e3d11cf6a73b0f0d34f7e8f380b9b39bd4e8dd540affcba2eb24b777943f90662eb6ca2bd24276eb5d502312fcc2f097ec242ed1ca79603dbbde19ec7f
 DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 58a0ee4adcc9d35b15b9cc98b3da81d1103b61a6c0bee722468a5113cd7d6de1d40c46ef964ba9ecc4746e81b516ae4b2f1d046874d62db066735c652592612e SHA512 7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738
 DIST systemd-stable-251.5.tar.gz 11444428 BLAKE2B 96df35dae789b11ead1960e1139046972a29c41f74ca800e0fafd84e6a8c238f8d4a30e2991ee94e07e866bc0c3137774ee116f276ac1203cca85254ccf91913 SHA512 2c645a694d45a2670920115529c5f34001153dafe26e5c4e65f8d1a37922a351569d056fc002f1af72dfc173988f93e11893460f64b497e3d5fc339083dcb2fa
 DIST systemd-stable-251.6.tar.gz 11448383 BLAKE2B 987ea88ea23662fd4119e3c796cc2e5f428fcce6cf0b033a5f8da7974c0026d41851f517e489354bbc22973b33c3932ac7280c56527f03a1fcbce3092148b638 SHA512 2da41ac7e939a893ada3ce682a6fe7dd326e8e0132221589da3d2b1d994e1a879118e0c6025f03351dac6567d754223a5f5401d64a5ca9256ab95512800370f8
@@ -14,6 +14,6 @@ EBUILD systemd-251.4.ebuild 15500 BLAKE2B c8ea106e1dbbf830fba008ed6f70486e36a629
 EBUILD systemd-251.5.ebuild 15508 BLAKE2B dd89dde571cfd27fad856e2802c8b837d96b567f07fcae62af911f9dc6ebf6752ef7a287a7f1d695695a8f84cd43638a156101fcd53488fd25bdf43d65cb8560 SHA512 1c4b6a2dd35171dea0363d1331bfa67967fdb9bc8025cf4b3fea7b20af60748373473a3efed0710a8c86762ba53fb3bdcd0df62bb1e70a55a43a1ab722171ecd
 EBUILD systemd-251.6.ebuild 15557 BLAKE2B 124b3527e460ec93d8a1f5a5fea3f435aa8db9a6b25b729ef46480b451a89aa77800d7a6062b7ba94d817152951f6f22c58d68708e2fd0fafbf73841b23bb9a0 SHA512 09f4318b267ef45fcd92d4ce3f25d5c6e665f0d1662cb339796c60e38c48ab780977d93f816f80c8e7512f6cb2c9802e68914375b351a08d14d96d2ff30365e5
 EBUILD systemd-251.7.ebuild 15557 BLAKE2B 124b3527e460ec93d8a1f5a5fea3f435aa8db9a6b25b729ef46480b451a89aa77800d7a6062b7ba94d817152951f6f22c58d68708e2fd0fafbf73841b23bb9a0 SHA512 09f4318b267ef45fcd92d4ce3f25d5c6e665f0d1662cb339796c60e38c48ab780977d93f816f80c8e7512f6cb2c9802e68914375b351a08d14d96d2ff30365e5
-EBUILD systemd-252_rc3.ebuild 15373 BLAKE2B 05086c1624ee74cc5942c0a3d861d8aaca5415ff3e28d9abdf7f405d50499789f8e61aa19308313715b77c55419be5e4735930921e9cd7fe0f3b175affe71213 SHA512 0e7cf6a4a5639554cc3c9d58bb61e03461a44a6e0eedfa36fcf586124b3705ecfb785bde6df136b560e12253963ab05aaae6439a7228284bcbbb64cb5fb5310f
+EBUILD systemd-252.ebuild 15372 BLAKE2B f480ab02dd6910b271805ef126bfefd478b9c94487dd4d2134edebd5a15e780ecb9104ae16a0f50dd921f642cb78389ffb486cc9ea76ea3d4db863a0db12d63f SHA512 ee3c87a63e7295e02679364f7337985eaf073026e57672b6352bb65979224791e491222b4309ca66ecc4df6c1b312acb4b706419299800fa8c94e179c235f5c6
 EBUILD systemd-9999.ebuild 15372 BLAKE2B f480ab02dd6910b271805ef126bfefd478b9c94487dd4d2134edebd5a15e780ecb9104ae16a0f50dd921f642cb78389ffb486cc9ea76ea3d4db863a0db12d63f SHA512 ee3c87a63e7295e02679364f7337985eaf073026e57672b6352bb65979224791e491222b4309ca66ecc4df6c1b312acb4b706419299800fa8c94e179c235f5c6
 MISC metadata.xml 2545 BLAKE2B fc424b7f9e471860cba69b6f11ea2094c70f125cd55c42ea77e4549a399680c4444119c79424c266828a284b0214001421f760477b1341844dddd2d474d70c33 SHA512 f0b8c4614e3c88d123916bb3399d6025ab30ff839849b136a29e1960bf0c50699b3f09b5307f40b77cc8c5566c20b11de2364a08311adceb15507df3e4bb0565
diff --git a/sys-apps/systemd/systemd-252_rc3.ebuild b/sys-apps/systemd/systemd-252.ebuild
index 2b38fab6fdb7..d4f1b4c5d629 100644
--- a/sys-apps/systemd/systemd-252_rc3.ebuild
+++ b/sys-apps/systemd/systemd-252.ebuild
@@ -23,7 +23,7 @@ else
 	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 inherit bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
diff --git a/sys-apps/xdg-desktop-portal-gnome/Manifest b/sys-apps/xdg-desktop-portal-gnome/Manifest
index 486fb4e92c3c..d28856419848 100644
--- a/sys-apps/xdg-desktop-portal-gnome/Manifest
+++ b/sys-apps/xdg-desktop-portal-gnome/Manifest
@@ -4,4 +4,4 @@ DIST xdg-desktop-portal-gnome-43.1.tar.xz 125248 BLAKE2B 5290041b3b0d24c6d62c143
 EBUILD xdg-desktop-portal-gnome-42.3.ebuild 830 BLAKE2B 856d89e8fb635f5747c36611bfdcd7b8be3e22567551c3782eefe031ae14c8477a534fc211002d68db87ff9842bf01e68958653b14b38620cdd745bdd576f464 SHA512 3e336678ed9103c04d21b9f8c1f09b987b20cefc33d957f9aecaa4d924080d5e06c5d8d316fa1c732e944e7204f2b129f29a4717fa7adf51a5aa59ee2a674b0c
 EBUILD xdg-desktop-portal-gnome-43.0.ebuild 836 BLAKE2B 4dd124fe920c5f8a8ff97fde3a6fce9db0ba103be50c6dac5df38122d0e53a2e7a4c26ff8df07335615b0e2c562938e3ed231b596f57a08010fa0d0de47e76fa SHA512 cbfb4ea7e1e7b7ce3441fc91c73175fc058e34ff5a5dcf3b42cb82ac42aad3d2dcf7b6157d77f9e91873979d40abac4f3935fdd91895dc5bf5636f7712339f8a
 EBUILD xdg-desktop-portal-gnome-43.1.ebuild 836 BLAKE2B 4dd124fe920c5f8a8ff97fde3a6fce9db0ba103be50c6dac5df38122d0e53a2e7a4c26ff8df07335615b0e2c562938e3ed231b596f57a08010fa0d0de47e76fa SHA512 cbfb4ea7e1e7b7ce3441fc91c73175fc058e34ff5a5dcf3b42cb82ac42aad3d2dcf7b6157d77f9e91873979d40abac4f3935fdd91895dc5bf5636f7712339f8a
-MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
+MISC metadata.xml 365 BLAKE2B 2e19983c4095f43cd1c2c15ffadd6d2fec127291bc3017b788cad8f54eda2767ba7bacb73ebd64b3d63f9e6ced1d95c07ad1c7f48f5b0e45ae1c7439b8ca849f SHA512 be38ae716e9291da42d39c6c756f8c7f4d0e65fc10fc405d5dc086643d2cddc5b6e101be1fadae9aa5508085964c550262703b949b03d29b130744d760ad4eb7
diff --git a/sys-apps/xdg-desktop-portal-gnome/metadata.xml b/sys-apps/xdg-desktop-portal-gnome/metadata.xml
index f453528b934f..399d422030ef 100644
--- a/sys-apps/xdg-desktop-portal-gnome/metadata.xml
+++ b/sys-apps/xdg-desktop-portal-gnome/metadata.xml
@@ -1,8 +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/xdg-desktop-portal-gnome</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-apps/xdg-desktop-portal-gtk/Manifest b/sys-apps/xdg-desktop-portal-gtk/Manifest
index b382c57bc5f5..6b1033fffed8 100644
--- a/sys-apps/xdg-desktop-portal-gtk/Manifest
+++ b/sys-apps/xdg-desktop-portal-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST xdg-desktop-portal-gtk-1.14.0.tar.xz 381316 BLAKE2B 73a1e1d9944c4776ef2ebff33b26559767aad10784e9518690d31575a6216014bd0c518bde9a3b4e92d6a7edbf1aaa3510d669a025b7574c4df978f7c24b83ac SHA512 b0ba54e1ddbdfbd22b8b31bf4ece261dc0beba303e642f10afc72659dd5477438a30688c9d018e3d1ed2adbc053ddf4e3a2d70de8cac03d9519355772862fafc
 EBUILD xdg-desktop-portal-gtk-1.14.0.ebuild 1342 BLAKE2B 9833cd4a94dd6cb397393097c8c3c33f1f0dd7c436399d240081b4df51108302a8110950e01f1f7457a254f77870e87fbeecfe2d18194e7f8fb128ea713c07dc SHA512 401ee11a715c9e7c1eca3fcef31dbc0bdae1ab53d75f07675179ba1ad70271be5bef1a6356f81322f0667b511750c989a5720c6efecce7dda0b2380ed9c0e118
-MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
+MISC metadata.xml 359 BLAKE2B b88d2d0b01e730aecbf4ce4f75f3aeb70177190ee0ffbdb4afbc55cf49c9e2fa29b10a67086488a22c77999204ed0a863332595257cb64e85c4fe29b2664a040 SHA512 75b9ab2cbe62b8556c6deff6c52b993fc099a3dbb8242929693f16ab907a2cd70d1b06de702d15150d2b0b47532168c72fa7fcbeb29467d49624b2d8c18172c6
diff --git a/sys-apps/xdg-desktop-portal-gtk/metadata.xml b/sys-apps/xdg-desktop-portal-gtk/metadata.xml
index f453528b934f..bc078a9a0ecd 100644
--- a/sys-apps/xdg-desktop-portal-gtk/metadata.xml
+++ b/sys-apps/xdg-desktop-portal-gtk/metadata.xml
@@ -1,8 +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">flatpak/xdg-desktop-portal-gtk</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 8fdf4c65efe2..bd1fa39f5dcd 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index 8e48b9cf6f96..511feef6cecf 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -2,4 +2,4 @@ AUX gparted-1.3.1-musl-nullptr.patch 2446 BLAKE2B a1a0e278edfecaac9de5068d4ff37b
 AUX gparted-1.4.0-musl-basename.patch 2166 BLAKE2B b7241a431d0df6e8780ce28746356ce8d716fdb2561ea80c424c9bbcac13e262540dca5661fd72cebba539444f51ef54f49a4b18d5d398768367e7b5d6ee2e26 SHA512 1456d8f4dbf253c22e8dbf2ac59865a7b27066ba25d8f31537a822be3faea1976c0e56341aecc322ac9787cb2e3e55242f35d8e7d28203799edfe2cd007e66a4
 DIST gparted-1.4.0.tar.gz 4308426 BLAKE2B 834782196e7cfe5c5553200743cbbaf700e59ef01076919d16138e736ebbbb16185ec68cd27546f1ff851ff742c51fc170a0f6596e9b014684b8be1d29acfea9 SHA512 20f94622fc1a2727f1fc9bb39ea9f04f14af06b0ff7e47c2149730d5eb339089b0d3c21cd3c9ce6f971e955a9f6ab89cc32fd5b7545a5e340b451297d87e8f39
 EBUILD gparted-1.4.0-r1.ebuild 2862 BLAKE2B 61168b1c3726f16f246995aed3ef04e77ed3eb9cf8bbc14e3f483a5ccb51202830d63b27a763bcd231bac401ef95a78a5d0df45b6699e9fa04f93c0b0fe59291 SHA512 187de3a597508c7c17c7433625cd5a7736a58ec2b19b170110ae5ac6c5f8453d0a50c6d9799d5948955ecee0b3cb43ee74f0264db0bae5776b90a9ec36a52f4b
-MISC metadata.xml 915 BLAKE2B 0d1b9e847455a3920c9826b8f352481448aa08b6a7625db5d19da403b5d20dcf4dcc78a9b7a3925fe06915a5078979668028c7c1e8da869a3f9d493fed22d2cb SHA512 7df8fd771da273681728e142d7e6ef10b5434dd40ac96eb2da96c1331116dbc33c7a25be5ca69dd8a56d3eb4ed961d4a51d4f0c554b44e5752169b0f5b9d2e8a
+MISC metadata.xml 1007 BLAKE2B 9ac47d4a18d3f0a9743de27544cc2ca9c30014b6bec3c1538fdcf867d8ea683b85733e25713fd5cb943c1a6f2c1b43cbf09e45162e1bdb0c2a2dd85d30b5406a SHA512 33863a91927a45758ab0f56ac9bad51f5143d68b02e6e04c1a488a6a7a6554c57ddf72abfe92993845b3ce561325dd37af901e8be7689164eaee9c3a50c427cf
diff --git a/sys-block/gparted/metadata.xml b/sys-block/gparted/metadata.xml
index 429a9e244163..1a39b4483452 100644
--- a/sys-block/gparted/metadata.xml
+++ b/sys-block/gparted/metadata.xml
@@ -1,24 +1,24 @@
 <?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>
-	<longdescription lang="en">
-	GParted is the Gnome Partition Editor. It can create, grow, shrink, move and
-	copy various filesystems.
-	</longdescription>
-	<longdescription lang="fr">
-	GParted est l'éditeur de partition de Gnome. Il peut créer, redimensionner,
-	déplacer et copier différents systèmes de fichiers.
-	</longdescription>
-	<use>
-		<flag name="wayland">Enable interim workaround to allow running GParted under
-		Wayland by granting permission to the X11 display using <pkg>x11-apps/xhost</pkg>.</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">gparted</remote-id>
-		<remote-id type="cpe">cpe:/a:gparted:gparted</remote-id>
-	</upstream>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <longdescription lang="en">
+    GParted is the Gnome Partition Editor. It can create, grow, shrink, move and
+    copy various filesystems.
+    </longdescription>
+  <longdescription lang="fr">
+    GParted est l'éditeur de partition de Gnome. Il peut créer, redimensionner,
+    déplacer et copier différents systèmes de fichiers.
+  </longdescription>
+  <use>
+    <flag name="wayland">Enable interim workaround to allow running GParted under Wayland by granting permission to the X11 display using <pkg>x11-apps/xhost</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">gparted</remote-id>
+    <remote-id type="cpe">cpe:/a:gparted:gparted</remote-id>
+    <remote-id type="gnome-gitlab">GNOME/gparted</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 27f9015baff7..dbb5f5de3105 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index c5289203361f..0912af25443d 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -40,7 +40,7 @@ EBUILD gcc-11.3.1_p20221021.ebuild 1297 BLAKE2B 866b91db54ce086190346a069776243f
 EBUILD gcc-11.3.1_p20221028.ebuild 1297 BLAKE2B 866b91db54ce086190346a069776243f505aad03fe19d2beb80d1979000f70727d6288b6527f1789bf2fbeec3a033314ab53457eb1b076bb5986e6f648138d80 SHA512 bfc2320d5e28787e64e81efe9fb6c040e06c5f5891ccf330bdf62cbdee7c44922dfec05945c916884605835af4f664f7567e4367698736c87631e3e6182fa375
 EBUILD gcc-11.4.9999.ebuild 1267 BLAKE2B 09a26812068945e11164d0a4f8f5cc10dc261a20a647fd4102decc83eecbbe8fcc7f38093609314fa1f26c46164e8248aede741880f7cff64dd5a94836765fa2 SHA512 4ecf698cd6e96dc08683a0e9b69936cdd9085c300d330fb9830cee0e38783e0a1fc8409db39159f9b247f28fc5d7d7572ad3e975f3951f1cb8537f49886bdcde
 EBUILD gcc-12.2.0.ebuild 1434 BLAKE2B a02496eb0178f8f3e38487b233eea12467e9e799763eb447cd545ea5afd48460bc8fc64bd68c84fca38f2d4cdb7487a65b34f4ceedf335393964ec770c0a69de SHA512 62d1a2dfac584c8abe548ff03c960a9e545e34ee1bd61977413af1b31ce98e281b5b90a33be2c666f418a272658f5188e9355bacc51dd0cc7ff456bcc47f2edd
-EBUILD gcc-12.2.1_p20221008.ebuild 1427 BLAKE2B 1496d5a9fc99c58bb487268de9b1939a923bb45518432e82e94596bb04d6606411c0dc3138740399c09aa6a7916a5abd37be529ba3341e62e04c39e7506fe390 SHA512 7443ece271689de773660b938e2dfc5909003f8788e2803300f76371451489bf632402a487910f2130eca667d070fcf549749278b7275b57216e734bb49ff996
+EBUILD gcc-12.2.1_p20221008.ebuild 1434 BLAKE2B a02496eb0178f8f3e38487b233eea12467e9e799763eb447cd545ea5afd48460bc8fc64bd68c84fca38f2d4cdb7487a65b34f4ceedf335393964ec770c0a69de SHA512 62d1a2dfac584c8abe548ff03c960a9e545e34ee1bd61977413af1b31ce98e281b5b90a33be2c666f418a272658f5188e9355bacc51dd0cc7ff456bcc47f2edd
 EBUILD gcc-12.2.1_p20221022.ebuild 1437 BLAKE2B c0f35f820ac6b8361761cd90944b7a860c6bff7994497fb96e6be2178f9c888b8927bd3a908af0f0521c06d98d3c84e46c988d70e6a7e454835a978cd0b4b34b SHA512 48ee0cee1a29d0b41f78dd73ce0ebedb5eae4befe60f456f5a80128e878e61f1e6c173110b21ff3de9770f5e05c144f72bacb273532cf6ce62ee221f5281db8a
 EBUILD gcc-12.2.1_p20221029.ebuild 1437 BLAKE2B c0f35f820ac6b8361761cd90944b7a860c6bff7994497fb96e6be2178f9c888b8927bd3a908af0f0521c06d98d3c84e46c988d70e6a7e454835a978cd0b4b34b SHA512 48ee0cee1a29d0b41f78dd73ce0ebedb5eae4befe60f456f5a80128e878e61f1e6c173110b21ff3de9770f5e05c144f72bacb273532cf6ce62ee221f5281db8a
 EBUILD gcc-12.3.9999.ebuild 1545 BLAKE2B 78fdc4a7b20d22bba137cba00e49d2249c5616bf1c4cf619162da1d98c750fb3da71fbb1cd4e136624cc4e0a112547e6c4c29992aa58ab12507917c7d728831a SHA512 f3562696a79035e64b8e79cee720fe24c7041bf922d79e5cff1ae864a533997995465d0871bfc4f87f6d5a66e7f8ac02c490792554a0628ae30d96a061ef9279
diff --git a/sys-devel/gcc/gcc-12.2.1_p20221008.ebuild b/sys-devel/gcc/gcc-12.2.1_p20221008.ebuild
index de4e0d488af6..aa3dfbf98f28 100644
--- a/sys-devel/gcc/gcc-12.2.1_p20221008.ebuild
+++ b/sys-devel/gcc/gcc-12.2.1_p20221008.ebuild
@@ -35,7 +35,7 @@ EGIT_BRANCH=releases/gcc-$(ver_cut 1)
 
 # Don't keyword live ebuilds
 if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 # Technically only if USE=hardened *too* right now, but no point in complicating it further.
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 6263b72fef06..e320b6e7e667 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libosinfo/Manifest b/sys-libs/libosinfo/Manifest
index db15db9db254..fb0aea657a1d 100644
--- a/sys-libs/libosinfo/Manifest
+++ b/sys-libs/libosinfo/Manifest
@@ -2,4 +2,4 @@ AUX 1.10.0-build-Add-option-to-disable-libsoup3.patch 1484 BLAKE2B a67153267432e
 DIST libosinfo-1.10.0.tar.xz 293804 BLAKE2B 5c676a466459c4e4150294fd263cd32ed95f181a3dea913977165f61dd81d75fb545dd96d0f87661ea13db9f10706c064421a5ecf0ec1b220054149c66c957d1 SHA512 58a30d62d5a4862150826fd9fda3d5189df3693efca3a8732efaa470fa65dbb64181987534ccc13c0bf2fd4efda229217a169590405f0601927472f6ca08e4e7
 EBUILD libosinfo-1.10.0-r1.ebuild 1631 BLAKE2B 45baf0facc5e59e0e89719017be9af26288c793563d32578d1f4565d35fd0b85cbd97f7b9b751bb0e0f13e47425bed70f264a21fb904d380820a2bb4888e92d5 SHA512 c2e92c7af262a643abb2857a927cfffbf2931638ae3a747efd2ca78122eb20801ff597c5786bbd3ff15831f91d886694cc97f0d72feac657898772403a263c28
 EBUILD libosinfo-1.10.0.ebuild 1643 BLAKE2B 60596f6bc7fb1781085a16ff78c6fa5798808b57d4718864c253bacf695de4f851a9415a5a3e20bc359babf3f4bac1fa68da7f6f7376f33f772dd40f2c79e7ff SHA512 3d728843b4e4eb258d0b545c42fe9f13d9e200affd7624d35c1fa19281456ee828eea8f62114d7a9d7bf2cf7d71840b173d030193f7bd053a6f64a69c195d19d
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 348 BLAKE2B 3bf0a4c2898ac80214a7d8856d743829706c8289dcf752874c44ff0cc7e07af29a50b2dbf271983a87db47774334ad4613516d7d3340fca7824f2fa6c1b12be8 SHA512 1cd02c1f8716f281eb4f9aafb3d02edd09ef2a2fe95f5035fae5759dcc371841225d41cf908acd43d8973bc4da31c15983ae27c24650f7c244decd37d66b4074
diff --git a/sys-libs/libosinfo/metadata.xml b/sys-libs/libosinfo/metadata.xml
index 7b343b06be8a..10983b30d1b7 100644
--- a/sys-libs/libosinfo/metadata.xml
+++ b/sys-libs/libosinfo/metadata.xml
@@ -1,8 +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="gitlab">libosinfo/libosinfo</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index c7711adbc193..64bedd4e9cd6 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,5 +1,7 @@
 AUX libxcrypt-4.4.19-multibuild.patch 303 BLAKE2B cd342eef2a8ce3e305e544d37373370748690878b4171709028b7b894ad2c76c9188496ab089a46645ad6f9fca09fa4f89cdcb444e1400747ee358c079441661 SHA512 3cbd4bbd0827801faaaa2198eccccb285100cdfc43525b70816121aa70b32dc2c8479c53e16b9e99920926b1b11014dcc19909c4f72a09d9d19fcdb0fa6350cd
 DIST libxcrypt-4.4.28-autotools.tar.xz 618560 BLAKE2B c56d510201651e36cbd950b5a0a32273fdbce1f053109aa5867b2c6a57e2a896c34c981c1a2e732a8f34539b754ebe7f50d1b5bf59f9549a75ad6420921f3e1d SHA512 3c60fd32dea308152c4272522c29668c83e88bea47c98b9fe796ed70f5460ad2a9616ffbe789c03e417b28d3c792361b16031bda3d8bc5b6c06f0ebdc66c8217
+DIST libxcrypt-4.4.29-autotools.tar.xz 623720 BLAKE2B a7762a4e4a5cb65c98e69070717a066ffbfb96b5a04ae413d81148f11da2601359bc71b4e6a774dada6328785f03b8964a596c8578a0e5926d3355f29cd280d8 SHA512 278aa6e043855f7ca4e6a4676d8d55120c0bf2179d88619c574e3aea9a8a1cda91242b4a686a53ad39675b1d6dd31ae14c86dd2e5e06f93c558fc2f4fb8adaf0
 EBUILD libxcrypt-4.4.28-r1.ebuild 8806 BLAKE2B df348fd8a3aff7ba077d1e932f9bed8789605195617416ddfe0ec67d673284864530ca659803d93ae6b314b0e15d971ccd0670b4dd539bd907f7e0d161bde79c SHA512 b598e6d156f5dea5afab10270577a612f5b37137d30058bce3b9b85ec16d0ed8b20dba8c1fd8979fbbc4aa31b9fa2b0692f22ded0338edaa3847e442cbf10058
 EBUILD libxcrypt-4.4.28-r2.ebuild 9207 BLAKE2B 28819d0e37361d96af20eb5bfee10d96ddd1d53ce2174039638486aa40e3af83259ee13f9d4899c369e6f375318e1e2d02cf8e2ad627a82c347c07359c42ec09 SHA512 0c478ec3ff31a72377d91bd7e5c7230fff726f37affad760b2b3971f73e4e51a58267d310e1530a6be3c0c3f42993379bc09a1b379745fd85824c8abf0559462
+EBUILD libxcrypt-4.4.29.ebuild 9207 BLAKE2B 558e5f5329ec7fac0af9a689db104c9cd9dee82dc78c865a66cf8e620dff009fcd35a4d89bc8244bf049cf4b542587c97d4bc0fa90f5d5246fa6681cf2ee9955 SHA512 35e1dd2c357e7433f32bee11142ce2a46509ee5ff7144c1d4922f819e335f7d8308f21837de4e47b50e215d5246fceececacbf4dec239cb528744bdf1dfbf3d1
 MISC metadata.xml 913 BLAKE2B c2b3f52bd72bb46b0de4eb4a5f47dcb3aacfd248b811bcdc88db88c6f9cbe3ed1af4fda3e643b350fd22131273af03f2f888d78d306f0f7274d9432eb65075a3 SHA512 0ebbc3c2aa661f1a40e7f654384a395662b1b0235f145c7778b7b86bfb65ad09d4e8900bc6ede94413f057e769397c355bfd1bcafe8540acbf7e00e5451400c9
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.29.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.29.ebuild
new file mode 100644
index 000000000000..111353e6e533
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.29.ebuild
@@ -0,0 +1,336 @@
+# Copyright 2004-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} )
+# NEED_BOOTSTRAP is for developers to quickly generate a tarball
+# for publishing to the tree.
+NEED_BOOTSTRAP="no"
+inherit eapi8-dosym multibuild multilib python-any-r1 flag-o-matic toolchain-funcs multilib-minimal
+
+DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others"
+HOMEPAGE="https://github.com/besser82/libxcrypt"
+if [[ ${NEED_BOOTSTRAP} == "yes" ]] ; then
+	inherit autotools
+	SRC_URI="https://github.com/besser82/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+else
+	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotools.tar.xz"
+fi
+
+LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+compat split-usr static-libs system test headers-only"
+REQUIRED_USE="split-usr? ( system )"
+RESTRICT="!test? ( test )"
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+
+is_cross() {
+	local enabled_abis=( $(multilib_get_enabled_abis) )
+	[[ "${#enabled_abis[@]}" -le 1 ]] && [[ ${CHOST} != ${CTARGET} ]]
+}
+
+DEPEND="system? (
+		elibc_glibc? (
+			${CATEGORY}/glibc[-crypt(+)]
+			!${CATEGORY}/glibc[crypt(+)]
+		)
+		elibc_musl? (
+			!${CATEGORY}/musl[crypt(+)]
+		)
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-lang/perl
+	test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )"
+
+python_check_deps() {
+	python_has_version "dev-python/passlib[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if has "distcc" ${FEATURES} ; then
+		ewarn "Please verify all distcc nodes are using the same versions of GCC (>= 10) and Binutils!"
+		ewarn "Older/mismatched versions of GCC may lead to a misbehaving library: bug #823179."
+
+		if [[ ${BUILD_TYPE} != "binary" ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 10 ]] ; then
+			die "libxcrypt is known to fail to build or be broken at runtime with < GCC 10 (bug #823179)!"
+		fi
+	fi
+}
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=(
+		$(usex compat 'xcrypt_compat' '')
+		xcrypt_nocompat
+	)
+
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# WARNING: Please read on bumping or applying patches!
+	#
+	# There are two circular dependencies to be aware of:
+	# 1)
+	#	if we're bootstrapping configure and makefiles:
+	#		libxcrypt -> automake -> perl -> libxcrypt
+	#
+	#   mitigation:
+	#		toolchain@ manually runs `make dist` after running autoconf + `./configure`
+	#		and the ebuild uses that.
+	#		(Don't include the pre-generated Perl artefacts.)
+	#
+	#	solution for future:
+	#		Upstream are working on producing `make dist` tarballs.
+	#		https://github.com/besser82/libxcrypt/issues/134#issuecomment-871833573
+	#
+	# 2)
+	#	configure *unconditionally* needs Perl at build time to generate
+	#	a list of enabled algorithms based on the set passed to `configure`:
+	#		libxcrypt -> perl -> libxcrypt
+	#
+	#	mitigation:
+	#		None at the moment.
+	#
+	#	solution for future:
+	#		Not possible right now. Upstream intend on depending on Perl for further
+	#		configuration options.
+	#		https://github.com/besser82/libxcrypt/issues/134#issuecomment-871833573
+	#
+	# Therefore, on changes (inc. bumps):
+	#	* You must check whether upstream have started providing tarballs with bootstrapped
+	#	  auto{conf,make};
+	#
+	#	* diff the build system changes!
+	#
+	if [[ ${NEED_BOOTSTRAP} == "yes" ]] ; then
+		# Facilitate our split variant build for compat + non-compat
+		eapply "${FILESDIR}"/${PN}-4.4.19-multibuild.patch
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	# Avoid possible "illegal instruction" errors with gold
+	# bug #821496
+	tc-ld-disable-gold
+
+	# Doesn't work with LTO: bug #852917.
+	# https://github.com/besser82/libxcrypt/issues/24
+	filter-lto
+
+	multibuild_foreach_variant multilib-minimal_src_configure
+}
+
+get_xcprefix() {
+	if is_cross; then
+		echo "${EPREFIX}/usr/${CTARGET}"
+	else
+		echo "${EPREFIX}"
+	fi
+}
+
+get_xclibdir() {
+	printf -- "%s/%s/%s/%s\n" \
+		"$(get_xcprefix)" \
+		"$(usex split-usr '' '/usr')" \
+		"$(get_libdir)" \
+		"$(usex system '' 'xcrypt')"
+}
+
+get_xcincludedir() {
+	printf -- "%s/usr/include/%s\n" \
+		"$(get_xcprefix)" \
+		"$(usex system '' 'xcrypt')"
+}
+
+get_xcmandir() {
+	printf -- "%s/usr/share/man\n" \
+		"$(get_xcprefix)"
+}
+
+get_xcpkgconfigdir() {
+	printf -- "%s/usr/%s/pkgconfig\n" \
+		"$(get_xcprefix)" \
+		"$(get_libdir)"
+}
+
+multilib_src_configure() {
+	local -a myconf=(
+		--host=${CTARGET}
+		--disable-werror
+		--libdir=$(get_xclibdir)
+		--with-pkgconfigdir=$(get_xcpkgconfigdir)
+		--includedir=$(get_xcincludedir)
+		--mandir="$(get_xcmandir)"
+	)
+
+	tc-export PKG_CONFIG
+
+	if is_cross; then
+		if tc-is-clang; then
+			export CC="${CTARGET}-clang"
+		else
+			export CC="${CTARGET}-gcc"
+		fi
+	fi
+
+	if use elibc_musl; then
+		# musl declares getcontext and swapcontext in ucontext.h,
+		# but does not implement them in libc.
+		# https://bugs.gentoo.org/838172
+		myconf+=( ac_cv_header_ucontext_h=no )
+	fi
+
+	case "${MULTIBUILD_ID}" in
+		xcrypt_compat-*)
+			myconf+=(
+				--disable-static
+				--disable-xcrypt-compat-files
+				--enable-obsolete-api=yes
+			)
+			;;
+		xcrypt_nocompat-*)
+			myconf+=(
+				--enable-obsolete-api=no
+				$(use_enable static-libs static)
+			)
+		;;
+		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
+	esac
+
+	if use headers-only; then
+		# Nothing is compiled here which would affect the headers for the target.
+		# So forcing CC is sane.
+		headers_only_flags="CC=$(tc-getBUILD_CC)"
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" "${headers_only_flags}"
+}
+
+src_compile() {
+	use headers-only && return
+
+	multibuild_foreach_variant multilib-minimal_src_compile
+}
+
+multilib_src_test() {
+	emake check
+}
+
+src_test() {
+	multibuild_foreach_variant multilib-minimal_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant multilib-minimal_src_install
+
+	use headers-only || \
+	(
+		shopt -s failglob || die "failglob failed"
+
+		# Make sure our man pages do not collide with glibc or man-pages.
+		for manpage in "${D}$(get_xcmandir)"/man3/crypt{,_r}.?*; do
+			mv -n "${manpage}" "$(dirname "${manpage}")/xcrypt_$(basename "${manpage}")" \
+				|| die "mv failed"
+		done
+	) || die "failglob error"
+
+	# Remove useless stuff from installation
+	find "${ED}"/usr/share/doc/${PF} -type l -delete || die
+	find "${ED}" -name '*.la' -delete || die
+
+	# workaround broken upstream cross-* --docdir by installing files in proper locations
+	if is_cross; then
+		insinto "$(get_xcprefix)"/usr/share
+		doins -r "${ED}"/usr/share/doc
+		rm -r "${ED}"/usr/share/doc || die
+	fi
+}
+
+multilib_src_install() {
+	if use headers-only; then
+		emake DESTDIR="${D}" install-nodist_includeHEADERS
+		return
+	fi
+
+	emake DESTDIR="${D}" install
+
+	# Don't install the libcrypt.so symlink for the "compat" version
+	case "${MULTIBUILD_ID}" in
+		xcrypt_compat-*)
+			rm "${D}"$(get_xclibdir)/libcrypt$(get_libname) \
+				|| die "failed to remove extra compat libraries"
+		;;
+		xcrypt_nocompat-*)
+			if use split-usr; then
+				(
+					if use static-libs; then
+						# .a files are installed to /$(get_libdir) by default
+						# Move static libraries to /usr prefix or portage will abort
+						shopt -s nullglob || die "failglob failed"
+						static_libs=( "${D}"/$(get_xclibdir)/*.a )
+
+						if [[ -n ${static_libs[*]} ]]; then
+							dodir "/usr/$(get_xclibdir)"
+							mv "${static_libs[@]}" "${ED}/usr/$(get_xclibdir)" \
+								|| die "Moving static libs failed"
+						fi
+					fi
+
+					if use system; then
+						# Move versionless .so symlinks from /$(get_libdir) to /usr/$(get_libdir)
+						# to allow linker to correctly find shared libraries.
+						shopt -s failglob || die "failglob failed"
+
+						for lib_file in "${D}"$(get_xclibdir)/*$(get_libname); do
+							lib_file_basename="$(basename "${lib_file}")"
+							lib_file_target="$(basename "$(readlink -f "${lib_file}")")"
+
+							# We already know we're in split-usr (checked above)
+							# See bug #843209 (also worth keeping in mind bug #802222 too)
+							local libdir_no_prefix=$(get_xclibdir)
+							libdir_no_prefix=${libdir_no_prefix#${EPREFIX}}
+							libdir_no_prefix=${libdir_no_prefix%/usr}
+							dosym8 -r "/$(get_libdir)/${lib_file_target}" "/usr/${libdir_no_prefix}/${lib_file_basename}"
+						done
+
+						rm "${D}"$(get_xclibdir)/*$(get_libname) || die "Removing symlinks in incorrect location failed"
+					fi
+				)
+			fi
+		;;
+		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
+	esac
+}
+
+pkg_preinst() {
+	# Verify we're not in a bad case like bug #843209 with broken symlinks.
+	# This can be dropped when, if ever, the split-usr && system && compat case
+	# is cleaned up in *_src_install.
+	local broken_symlinks=()
+	mapfile -d '' broken_symlinks < <(
+		find "${ED}" -type l ! -exec test -e {} \; -print0 2>/dev/null
+	)
+
+	[[ -z "${broken_symlinks[@]}" ]] && return
+
+	eerror "Broken symlinks found before merging!"
+	for symlink in "${broken_symlinks[@]}" ; do
+		bad_dest="$(readlink -f ${symlink})"
+		eerror "\t${symlink} is broken!"
+		eerror "\treadlink -f ${symlink}:"
+		eerror "\t\t${bad_dest}"
+		die "Broken symlinks found! Aborting to avoid damaging system. Please report a bug."
+	done
+}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 9ce45c5cd23f..7282ed79b0bc 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/gnome-usage/Manifest b/sys-process/gnome-usage/Manifest
index 71fc146ce7eb..eda60490dc97 100644
--- a/sys-process/gnome-usage/Manifest
+++ b/sys-process/gnome-usage/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-usage-3.38.1.tar.xz 362368 BLAKE2B 988c5157efdbbb3a680b2360d817fa2fe0587accd647a69cc482da38ec040afefb06d9c3d41a2b8fd2e630802967301837a39ac721ff9717b778b70518abb39d SHA512 8c4621d0340e2fc893ffcc3dc54f2088971c764fbb80302eb171e9f066f62424e532319f9d89c1157945a4721c40eef5253ea4e6ff6f702f5953e61f99d36f07
 EBUILD gnome-usage-3.38.1.ebuild 833 BLAKE2B d95bfa46a1e0422f15816b54f2db78c1bdc2bb2129aabf37b1f04cea853650c3586991cc9744632460060eec61559833df82a1ebd1fa5252da55c4c95d7030ac SHA512 d251d8808f7c4e74da71a37780d548c6ecd1fc6273f7cc58daee5edf4a14a45ecdf784fee7a2d3e14b8557760a9ad4f75d84f1c417293cddb7542631d8933619
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 352 BLAKE2B e928aba75e44e7ca7d459c7628f94361ec44c477a5340c53b274c4009662b781a15f12cd4c8b7795315b56bdad04eeb483fa69de2823018efe54eff41ecad816 SHA512 3d912ef601bb9ead4d4bec1f81cc8ca9b400ecc2940acdcb0dfd1e10ceb6ae356a3bb9c8d055614c3afb0a5b5ae12d9b172ac3317688b4948c64a36e1ff4ea74
diff --git a/sys-process/gnome-usage/metadata.xml b/sys-process/gnome-usage/metadata.xml
index 7b343b06be8a..b858c6b2af5e 100644
--- a/sys-process/gnome-usage/metadata.xml
+++ b/sys-process/gnome-usage/metadata.xml
@@ -1,8 +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/gnome-usage</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index f2f540699138..6aa6fb2341b8 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 33760a9c7128..1c0e5f27b75e 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -4,4 +4,4 @@ DIST epiphany-42.4.tar.xz 6107820 BLAKE2B 7ab18ac6d8eceb3577ef53c761e26a64291219
 DIST epiphany-43.0.tar.xz 3890284 BLAKE2B 74a463030bea6489dc05c975fa885ba3e06a3c552f18d29b0579121cf3b04f73fe3c76a6057d9d941f4361732ea1029cd7abb235969ca4f649964e5f909ea2d1 SHA512 56e65c2b3868447b88b89dc97c9d63c4ef1b174334eda15c6ad6b11a38963457df01a6024109ddfaf67730c691e5d68d37abb779604d4719dbc19950d18fe426
 EBUILD epiphany-42.4-r1.ebuild 1982 BLAKE2B 5a6ffb9f5ca95ad91091c99683313ce4f8145037d008efb06282987a0c55fd9d1948ab72fd06d4bec774f932ff7cca5ea772a0732a67f18af40a4ee4e04d8c08 SHA512 8f0350fb915168f45fcc80846cc7e621cb827a8d86bde482831b8a5a97267cbf5e1991c5cf1a2feb37ad5ba7edb53c40ed7a93f583f4c84c9a64cf280167b15b
 EBUILD epiphany-43.0.ebuild 1942 BLAKE2B 0b5c0218f9eab71027f23b5554f5938f2a1bc742fdb5f20506164220c6c0a481bc8309d234e790a9fed8397c60f1f77aacdec8450ae72b6cea399ddea85f8b6a SHA512 5a81a596fada1455fe814b27b2e70e200718b184e966a97730844337e3a07b400dfefbdcc55cd3cc5a8f3cababf16bc3cbe032851d3658912e65d69b4a237f08
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 349 BLAKE2B 3d863d6eb39cc99c7587d53af80d4df96f5c1bb534e406ee904d3b39f947c24e1153707581473e1477d984cd7be541925b4ff002d546f5d50f1115d1ad639362 SHA512 10d54acb787b2d9dab84b43fcc0e578d7afcae36142bef5028ac3838bfce6ae63348a4e05ee97eaa2f7d90204457990c9cf604c8df0dd714d62b907bf4da3019
diff --git a/www-client/epiphany/metadata.xml b/www-client/epiphany/metadata.xml
index 7b343b06be8a..4103dc6a7e06 100644
--- a/www-client/epiphany/metadata.xml
+++ b/www-client/epiphany/metadata.xml
@@ -1,8 +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/epiphany</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index b239048de934..06965796a2cb 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/colord-gtk/Manifest b/x11-libs/colord-gtk/Manifest
index 724ac3bd7977..e127eec06633 100644
--- a/x11-libs/colord-gtk/Manifest
+++ b/x11-libs/colord-gtk/Manifest
@@ -3,4 +3,4 @@ DIST colord-gtk-0.2.0.tar.xz 20480 BLAKE2B 73bbb349e84e5bfd28358cbe22609de84b86f
 DIST colord-gtk-0.3.0.tar.xz 21768 BLAKE2B e6fe56dfa969f18bd406d481dd13e83b689a820aeddaf1482ec97e89a3f78d4228544c79849d330962f3d45e3506f1c0b2540ed7bfab36ede04008877d503b94 SHA512 95ea9e8925d56462b8e5230a6737ca8e75d2273b2803e00f7aa2f933d22f88373194dccc00117fce85579274cc0daf88876fa265510580b1610734bb45220896
 EBUILD colord-gtk-0.2.0.ebuild 1349 BLAKE2B dcffb41a0c1a73a35a1c507a5003006e2a229eb2172226e8f7b0ecd3aca7d47b4d871ca7a607ba3149af15dcf60a9dd3bc3bff5a20fafb6636c65a50ced0b030 SHA512 367aa2ec128152ec52e99724945dc1edef7c327b048fb7bc2dc976439456b9a144b84ff59d8c7d360a23106027f1d3d345f9b0022fe0a3e0a5896c2b7d0442a7
 EBUILD colord-gtk-0.3.0.ebuild 1346 BLAKE2B 24dccdf7a9a38ca99fa6c2563bca8f0808f284448247db5eb07a3fa2a0726dc4f656babd021be69a64b10fe0070f341d52e713ba031a5417375dd51d7bc7725d SHA512 a0d72df94656ca381d18a7641ff00636dbfe398dfeb66a2d022c32b708d4d96e75fe184e3db74ba0ab9ec2dbc8ee5599878c6781ae72ea89c531b74c4fa0c054
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 347 BLAKE2B 5e07eafdbceaac3ba067628e3b92aedd8665a862e4f888e14711166b3edadd74c4a942765980d8e2bc9d5c7f292e7acd88a35f5875aff4a45b7383fcbec222a4 SHA512 e7098abc343f956231cad7ea3e12acb60b3df90b68d4f18b70ce62769e4b2fc30658669db838ed329f7572e30040aeaaac38fd8b64a277627d552c5b8de281a2
diff --git a/x11-libs/colord-gtk/metadata.xml b/x11-libs/colord-gtk/metadata.xml
index 7b343b06be8a..a7e4ce0f7399 100644
--- a/x11-libs/colord-gtk/metadata.xml
+++ b/x11-libs/colord-gtk/metadata.xml
@@ -1,8 +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">hughsie/colord-gtk</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/gdk-pixbuf-xlib/Manifest b/x11-libs/gdk-pixbuf-xlib/Manifest
index f7c5eb38f26f..75e08749a4fd 100644
--- a/x11-libs/gdk-pixbuf-xlib/Manifest
+++ b/x11-libs/gdk-pixbuf-xlib/Manifest
@@ -1,3 +1,3 @@
 DIST gdk-pixbuf-xlib-2.40.2.tar.xz 53588 BLAKE2B a515e86bc69f59910f61fe9c275ab89c0732f0aa2cfb614ac94e597de420d25708a11b9b21313c7cfe3763434f45a8318412ae5889c24c8ed57dac68e09c0227 SHA512 246bcace03f4d7d694c4d08f28c7ad044cab63b5cf264b478ee1fe161499e7607c7ffeff93908f1f3b308e5108d78c4b51a3f90b79189d42a1a653c8edc53e37
 EBUILD gdk-pixbuf-xlib-2.40.2.ebuild 868 BLAKE2B 5c3d436cbb1e33c1ab3405483f0185a15cfe2c579427589d5d12b984bf2762c2f014f75bfd40f14583e7a1f916c210b34b456578c99bb5ba6a7193f937ba9f8d SHA512 8d5a4f0eb16f0e6bea4ac2cd34f7f57f7a92710628a522ea96458f53260253f125852ebb732908e66b7b97d06e9936460ee8c9208a12e385a2d231f9f9beb7cd
-MISC metadata.xml 337 BLAKE2B d3fca36ccca5e3d9ba2cef44bb628f26159eeb7c8ff6eb929e393f25b5873d5d315519b74d39731b4e5a5324bae20d1e2e134ef685e91c0ef5d91ad36630e533 SHA512 efcd88a724c035894d4dfed62d12ff4184929b240939dd9882a432d917d6ac5f8e1da324b19efa834b42bc27ae86cc3ecd6c80f140e9a51267e8662a9c5ef29b
+MISC metadata.xml 425 BLAKE2B ee7de00cc263619819078108a6960e1806ab7b023c1f6b34133c176ab28cebd34cc3757b0da1c94930214449e4f4ae886a06dacf40b6ff857401454c530f67ca SHA512 7e0b2f81877e55e7a6d51fade685c62895884dcf488ee94c1ae5040bef5cd536a521f6c57978263bb4f39fb38a5ba2d48416010d15a087b5ba4edbaf6973168f
diff --git a/x11-libs/gdk-pixbuf-xlib/metadata.xml b/x11-libs/gdk-pixbuf-xlib/metadata.xml
index 96616ae2f187..f84b957434d3 100644
--- a/x11-libs/gdk-pixbuf-xlib/metadata.xml
+++ b/x11-libs/gdk-pixbuf-xlib/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>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<upstream>
-	<remote-id type="cpe">cpe:/a:gnome:gdk-pixbuf-xlib</remote-id>
-</upstream>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:gnome:gdk-pixbuf-xlib</remote-id>
+    <remote-id type="gnome-gitlab">Archive/gdk-pixbuf-xlib</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 9e6096795f00..056305ea6b03 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -5,4 +5,4 @@ DIST gdk-pixbuf-2.42.9.tar.xz 6596068 BLAKE2B f464a6b326aee185b30b24f66267ad7eac
 EBUILD gdk-pixbuf-2.42.10.ebuild 2680 BLAKE2B 120cc3dc25f7312b6275102ee0ded8f7ba20d24fa7d0c1f8c12e6ba52b7829e82359d71f938567c0c005d065b187b802b33e0edba0535b33fb66e8c6e1d389c5 SHA512 ed38bfe5b15cfae2ea20c7e5b2d16399fc13f8b2646fe8520cc84fb8ccae213983dee27e49cba6fe98248b48640329adc0d25f5a9876d874b832e46aa2f71ba6
 EBUILD gdk-pixbuf-2.42.8.ebuild 3459 BLAKE2B 76c75c89dbaf850cb2943962ccf72eaab6c2ebb5bd78f4f3f214f64be80adf41f3204167aa2e6ce2be2cfb46d5917d50676f0a3ee54320956b914786cfc8e5dd SHA512 293bf38a0ca34fd3c9669e56631e0823aca22fd48308f94961c7acb32de7d7670d7302b43f486d3f93c49a86190a3fcc2df942342dc2d27d108103bbd732cf6b
 EBUILD gdk-pixbuf-2.42.9.ebuild 2801 BLAKE2B affdad5c20e4106b9e21c61b697f524f3f5e4a849db5e5a564339fd18faefe9e0055394900f1dfa5650ee320a2a157c340b34df7352e0fd27827d5970b46bb5b SHA512 58138905a87ac0d673d37585bd52cbdbf55c868ed327bda4025a09888b65048a3836d507b4316d3ee46ec94b1d8f717809dcc875ca273b37b5505e84f2b5166f
-MISC metadata.xml 332 BLAKE2B d11021f9889f64b977816523c2ed8f4b122b3f510e9649ef1548584f99b97e28f782d6fa753e92042bfefc8da4d1c9694949559660d99bdcdaa648af0bb01c4d SHA512 9bfa76b3e49cc2038dfa8af478bd12ec1832c4cf073987a88d6c1b0da791496d45f20b7a411e08c89bcffa1ce207fa07c08da244f93a2534175e0b80079965af
+MISC metadata.xml 413 BLAKE2B ef1599cbeba0cb882a3c2f3b1783ce2dbd965e86106c85531033d609d4535108522454c17b6384a458d723d9c8751c3880896a3f67cf09add1e4649db36adc16 SHA512 3527aab03be85d82f776f1a05887a69cf91c803692dd88d848d3a3878d41e9acce6b2294dd64eb9756b9b450893e542d62fc80b7544823a70e7573533c3b0a39
diff --git a/x11-libs/gdk-pixbuf/metadata.xml b/x11-libs/gdk-pixbuf/metadata.xml
index 5fa25eb4c90a..abaa572b786f 100644
--- a/x11-libs/gdk-pixbuf/metadata.xml
+++ b/x11-libs/gdk-pixbuf/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>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<upstream>
-	<remote-id type="cpe">cpe:/a:gnome:gdk-pixbuf</remote-id>
-</upstream>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:gnome:gdk-pixbuf</remote-id>
+    <remote-id type="gnome-gitlab">GNOME/gdk-pixbuf</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/gnome-pty-helper/Manifest b/x11-libs/gnome-pty-helper/Manifest
index 88a3181865de..56dc7129895c 100644
--- a/x11-libs/gnome-pty-helper/Manifest
+++ b/x11-libs/gnome-pty-helper/Manifest
@@ -1,3 +1,3 @@
 DIST vte-0.40.2.tar.xz 923852 BLAKE2B 666f1e8bd5ce1392c8c533c180e7e6700a6b0023e9b0ab467f2d99a38661fb600c53d83bda10bc97302dc54801f8e1d8780eb27a2c5cd184d786a55d513dfc24 SHA512 06d1c9a34e8e82e1bd54810d245d908ebb837538ba19fbaabe683cdf3b96b7cb1630516ddeabf18b0294922b8d98d2b9a2f5028c171fac2ad913974d94555eb2
 EBUILD gnome-pty-helper-0.40.2-r1.ebuild 775 BLAKE2B 91835a314e5e3261e912da100631ec9840745bc4217dbc9807f550b5eb58c1e6833235ec9f931e0329fe35514338d3efbf5606ddc9fcbad4d774c5cc038a27b4 SHA512 2c750e63d83b54f4963aa43a59094aca4f32a4288198b82670fc9676d0c016dc95f0167f79982ec461bbbab37aff6148893c0ac3a5195e86e36028351f921594
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 344 BLAKE2B 89c15a56a5accee14accd8b7e549bae1c2fd9e2775f52ccee4ca782bb5fe2169f136b027da491686cd16d6a9293bc3a8612a2757b653b4f9b07c097efd1d359c SHA512 8d26cca9364cbf947c09d1b19fe1f45ddaff112904927d4e0b77c6240a95013f8ded94253802a57fe8e1bf9757f2329954dc748ebf107966f0efc798dc28e87b
diff --git a/x11-libs/gnome-pty-helper/metadata.xml b/x11-libs/gnome-pty-helper/metadata.xml
index 7b343b06be8a..06ea1c3b5114 100644
--- a/x11-libs/gnome-pty-helper/metadata.xml
+++ b/x11-libs/gnome-pty-helper/metadata.xml
@@ -1,8 +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/vte</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index 9148294d3a04..06a80946aae5 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -2,4 +2,4 @@ DIST goffice-0.10.52.tar.xz 2436944 BLAKE2B 13c2d28cd9bd081d4636325e3df14193d5ff
 DIST goffice-0.10.53.tar.xz 2442336 BLAKE2B 8fda50c5d9f8223c082ea9f03334313b051bce47d18b3879c2d8a7c2bbce753f468b5135f0a3c49c54b8a695ee6f1dc355dc806c92e77f41f2d0c64b2bc30bf0 SHA512 cd2d0f49f803cb2f01b3a690bfbe3ea4be5c09e00e8ef643055f56c16549529b7c2c098b87286062d3a5048c1f64d600f74082f53710d8ed8cbb34cb6829dafd
 EBUILD goffice-0.10.52-r1.ebuild 1429 BLAKE2B 9f34e672561a8d776a16c4dcf47eab567f2f09152c886183760f6e2f4257d12bcb2c5f9d1877a867c85c512c72eeff497aa79f5a369f7653bb25b9529191c0c8 SHA512 9d89656ae9e638d96d6fe341cd1d7bc1f8dd65da85d5220234e84c349e3b43810e9ef2e5a8c74bcd4cd1170d016a630ef6855310ddb3ae4a2f60b602e9179b5c
 EBUILD goffice-0.10.53-r1.ebuild 1430 BLAKE2B 532ddedaad51044ef78d76fde533313fb08e066520bfacb9415e1c6c713534c963579efc7cb242917edb490134c6cca774787d42130d13fd3ccedb72ff956123 SHA512 31ab8acab1c4e3234f340a7bdeaa7ac6082e04279d4cc0607d0355b6eabfa6a9406e14082960b74d8d9134eb76916e1159d66ce11a6a458bd3f1cd5fc9733af2
-MISC metadata.xml 547 BLAKE2B d4d95fec4ee5b452af722544aeab368219ecd832def2458af565639cbed6e37807a8fd54dc388070bef89f6f277ac323f27cc397f9b469f60e02e001e12a91fb SHA512 b5b72cea3a76b2ce768510f32e7e4ac77a4af086671304a52f19897c54a3e8af1f36b625e590498bbb51da5c267af66ed979c8a27d9e0d6c4f4bfc7f78390326
+MISC metadata.xml 653 BLAKE2B 5dcfe5914dc4466682862c4171d1d54f8547a8bab5794bf1e95c709e84d52e4aced8c7376674d85937d424766205f317de0de199595fbca15c817b6c3c4a3b25 SHA512 49d62e1f37f3d50f9e3d9ad50c69da19289cf1aac03afdfaa2f472c77e9277c76d81f59b26f2a84ce42e690341a3a26854814f0ca125b4f05a55670cc260e715
diff --git a/x11-libs/goffice/metadata.xml b/x11-libs/goffice/metadata.xml
index ecf437858609..a0d065c6e2c2 100644
--- a/x11-libs/goffice/metadata.xml
+++ b/x11-libs/goffice/metadata.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>soap@gentoo.org</email>
-		<name>David Seifert</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<longdescription lang="en">
-		GOffice is a library of document-centric objects and utilities building
-		on top of GLib and Gtk+ and used by software such as Gnumeric.
-	</longdescription>
+  <maintainer type="person">
+    <email>soap@gentoo.org</email>
+    <name>David Seifert</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <longdescription lang="en">
+    GOffice is a library of document-centric objects and utilities building
+    on top of GLib and Gtk+ and used by software such as Gnumeric.
+  </longdescription>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/goffice</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/goocanvas/Manifest b/x11-libs/goocanvas/Manifest
index c6101e0865b8..6a5e18f50b6d 100644
--- a/x11-libs/goocanvas/Manifest
+++ b/x11-libs/goocanvas/Manifest
@@ -2,4 +2,4 @@ DIST goocanvas-2.0.4.tar.xz 584272 BLAKE2B 027ab47c1e9c241f74509001426367e86025e
 DIST goocanvas-3.0.0.tar.xz 556832 BLAKE2B 4ee632a614b6b881000bbee8d5e21a166151a94667c603c92b94c5e076fab78a6df44fe1d45fb4d7c4d65c0e060b599abf3970313542836a63efbca33d6a075b SHA512 a53839af4d98afdfc0f92531bdb09013dd71e964185dc2670af077bb7b41b9ff5c75f2801f6e77c99055b38f3603d8cf197f84affb8d7c3196526ce824b228e3
 EBUILD goocanvas-2.0.4-r2.ebuild 1284 BLAKE2B 65f623c6906304058c117ba722b9bb621fb43a70440c37727f9ba73ab584cc1b3747f13e6910db813d6c9655ae62162ad4a20a01952085f383f37eb35e34e200 SHA512 d85177cda1f6c36088e00e0b08d6e8bf7f062e5096aae047e96335d6fa61819355413d922d2f8352e2a19312f3e0c0fc299e4c2e44bfb82c1e2bdd078e91471c
 EBUILD goocanvas-3.0.0.ebuild 1289 BLAKE2B c87ad4dbad0c3c33aaeec8659c2e978b44cdf7e352c2a37d3f17eaefd0a98835834a6b62bf5053537b8970fe874026656fd252001a3de6a454eb1a6d977c9a78 SHA512 990c9f904b32bf26de79ffc59c08e009cf7133824854c7366013b0db1ed5b7116f89fd483118e3d1a2e8db5af4009442f4b39829d4d555d79b1029a65684b468
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 350 BLAKE2B 901385c2f470228637138fe2c370e5dfa452935150231e6e339756865b520560670c7783f1a854d2e4bf19f86db7e09830255c951129ac8bd859fc20a4a6041b SHA512 459b79087fe033de51d207aca5a440d53c760506289ea8b46e6bdfe84f602e3b58cb4e1dc78bcc088ce508040d1c313f553a7c0ed9426274f02785b6e43e2762
diff --git a/x11-libs/goocanvas/metadata.xml b/x11-libs/goocanvas/metadata.xml
index 7b343b06be8a..e5f3354373c0 100644
--- a/x11-libs/goocanvas/metadata.xml
+++ b/x11-libs/goocanvas/metadata.xml
@@ -1,8 +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/goocanvas</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index d809636a1110..bf84cb940613 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -9,4 +9,4 @@ DIST gtk+-2.24.33.tar.xz 12661828 BLAKE2B f3488b220aaee54bf36fa77e2112d060152e57
 DIST gtk+-3.24.34.tar.xz 21587592 BLAKE2B 708e03ee9e62f1a1742faffb63a352ec2d90a1dc46a4e0162e343bf68355ab80fbd30c1f2261b5e5339cbb66a02cfb48addbc5ecbc2b8a37f97aae86c5af1405 SHA512 95af4441b53be175acf16121a90b1db7a152cbfb3e5ed2dffc59f622b2eb5a4d74720ae8e05dc1421b6b23588f28e09e0f153f0b92777c836f522881720fb0a2
 EBUILD gtk+-2.24.33-r2.ebuild 9818 BLAKE2B 5a631aa842e0651ad920e7e759af97d08083e39c167697b25fbaa72fb52cad031befc60922734aef5f2eaf7b7ab3d17bc7d2330e9029d4672126d466f4800a9b SHA512 878d48c0009433cb5d15eba3f26d5c137f79b718238b4920ac34fe7c61276ab2bd15dd5f76383fca2febad56fff3f8a7f99f9ce72ff5044a83885f1176da4d0c
 EBUILD gtk+-3.24.34-r1.ebuild 7213 BLAKE2B de7bf8b74b60cb663bc93c8af0ce70f5aa84fdbb09262d9305797a57e85e5f33e2802b85545d9af9a81a4231c28ee59c265371d3e65472c9b924d5a6860add9b SHA512 c92a024e99eda30848aabe805af9fdd0652cde94848edbd604210d9f38a6bf860432788a7fe1ba49317e5969bf49afd1e37b82ffc7561e4393ddecbb2c289873
-MISC metadata.xml 875 BLAKE2B 40b9f97f4db18f276bb80587843146c5227b5b803306da704ad99f8c7c34fb22cddbfb9f1df3395e2288ed258970851cb9d100f40b846f95d414e2b47ab78f99 SHA512 02b9c2674783308f54bde4d983185d36b372f64f1ee5d9d2cd797fe1158e3653a1edb8ece51a0be143775e9b85d71d4375769e2682778a9286fff42cbf18836b
+MISC metadata.xml 953 BLAKE2B 29defa50a776f75e114697ad02f4ff22ecd813dd6f67ed6674f6edad57cb1db8e3bc548a98497d4c1f6133c98318e95901c9b602026e225d8dd1350e2dd5858f SHA512 00669a6a0befecca4766adf61de1e0986754ecef00af45d6d3a33724e06ffb86476e4523cf06a214d2add354ee08065dea55f31b6173e27ec3f58fc39b53570a
diff --git a/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml
index 9866b9ffd398..d2f389d5ce2a 100644
--- a/x11-libs/gtk+/metadata.xml
+++ b/x11-libs/gtk+/metadata.xml
@@ -1,24 +1,23 @@
 <?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>
-	<longdescription>
-		GTK+ is a multi-platform toolkit for creating graphical user
-		interfaces. Offering a complete set of widgets, GTK+ is suitable
-		for projects ranging from small one-off projects to complete
-		application suites.
-	</longdescription>
-	<use>
-		<flag name="broadway">Enable the GDK Broadway backend.</flag>
-		<flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management
-			in printing</flag>
-		<flag name="sysprof">Enable profiling data capture support using
-			<pkg>dev-util/sysprof-capture</pkg></flag>
-	</use>
-	<upstream>
-		<remote-id type="cpe">cpe:/a:gtk:gtk%2B</remote-id>
-	</upstream>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <longdescription>
+    GTK+ is a multi-platform toolkit for creating graphical user
+    interfaces. Offering a complete set of widgets, GTK+ is suitable
+    for projects ranging from small one-off projects to complete
+    application suites.
+  </longdescription>
+  <use>
+    <flag name="broadway">Enable the GDK Broadway backend</flag>
+    <flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management in printing</flag>
+    <flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:gtk:gtk%2B</remote-id>
+    <remote-id type="gnome-gitlab">GNOME/gtk</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/gtkmathview/Manifest b/x11-libs/gtkmathview/Manifest
index 4eb9b2b2c033..985dfccf16f1 100644
--- a/x11-libs/gtkmathview/Manifest
+++ b/x11-libs/gtkmathview/Manifest
@@ -9,4 +9,4 @@ AUX gtkmathview-0.8.0-gcc7.patch 1150 BLAKE2B 28c122d1ac04cdbe6b232325da3e5994e9
 AUX gtkmathview-0.8.0-underlinking.patch 1926 BLAKE2B 6f50638ebb9c2a6af55e3b0f13b438b97a2e606fc7639a2aa6d7e3467bfcdeb4661c6b18db200b727a3de87c457ea99013f32e49b76ebaaf0a5d9793828f280b SHA512 9f0f4404ad60d8318f6feaae81db5ff4d331509145874926667eb9274a83ae278b08a078830cfd98ae85a602fd1ac7ea13b676f5dcd70a77e8b45e9e5fe5aa0d
 DIST gtkmathview-0.8.0.tar.gz 987328 BLAKE2B 1c8403fcfab828153911a40850bdfcfdd15c8c19da5dc1d7c015a8718c647b4adde2f7201ee0abc72d6c2b5acc79b8c852d6aa4f09021bbeaa827291d963b646 SHA512 aa7eb4aa031f9b9727be3fd8635fdac0e912585de9b91c5e71400edc5fa0b3257724244f796fea0122e32318d00701e63ee7fb12b97b7abbb7940a5439d31adb
 EBUILD gtkmathview-0.8.0-r4.ebuild 1969 BLAKE2B 1e97398bf9df5f6adca7725bda0d0599f3304d1364b72b2775a6fbe5eb7522b133531794aa3e37e32534035a23f47ad9514ebed7d68fc0b813f026811c8c8a0a SHA512 cecd8b7e03670bb58288fa910901d302e751b9204efb74b5003e377c91d4b7610c338d758cf4f73e6938a5d134562996f0a59aae0c75fd12e6ee1d7e00b98c8d
-MISC metadata.xml 414 BLAKE2B d5951ee687da934c39c066c237c67ff1855fce4a6ad7bc16496fcbc7ffe4518fb0adca8597b57b25482e45fafa17b8798bb0a637df18f6deba319b442f02307d SHA512 58b806d5440e74e9f8e0cf6be8047b8f1542fb137e746a19a8991c68c35de1459e179088b3122588b59960be406d4e1238751a61f5be7c9963933bebbdfc0500
+MISC metadata.xml 527 BLAKE2B a3cb6f03478419aefd9060d13c8cbd94e620ae7d726cc175f7cd56edb0a35b7d0a5bf2d02ff9f5b47ff57ad5f332633ea6cc07fb0beaa4bc945fcdc7fe41634a SHA512 b1ff4752cf93c87fcff4ad026f8e9b3a4d8d843b13bd5ab9de494eeec48aef2582e5f0a4c7b96f6c3891e6864c42210b9240dc23d97e199a4cd7d1f00556661d
diff --git a/x11-libs/gtkmathview/metadata.xml b/x11-libs/gtkmathview/metadata.xml
index c465741566aa..35a500e8628e 100644
--- a/x11-libs/gtkmathview/metadata.xml
+++ b/x11-libs/gtkmathview/metadata.xml
@@ -1,13 +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>
-<use>
-	<flag name="mathml">Install additional fonts for proper mathml
-	support.</flag>
-	<flag name="t1lib">Enable <pkg>media-libs/t1lib</pkg> support</flag>
-</use>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="mathml">Install additional fonts for proper mathml support.</flag>
+    <flag name="t1lib">Enable <pkg>media-libs/t1lib</pkg> support</flag>
+  </use>
+  <upstream>
+    <remote-id type="gnome-gitlab">Archive/gtkmathview</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index 964b4897ac4a..644a4235c32e 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -7,4 +7,4 @@ DIST gtksourceview-4.8.2.tar.xz 1164876 BLAKE2B 3e6269b4e6a7147d5f4e0ed2096514a0
 EBUILD gtksourceview-2.10.5-r3.ebuild 1317 BLAKE2B 80f626e2a5ded1e372760139354bc61a36c64620a2476c385f24e44d8711536ab162ed299b016fa1e4734afea2a48aa1346507b0c265440857bba8b0740bf406 SHA512 796445765875a51c6467d3a80a20007d892f40c0d71a5c8b768dcc2738f091b46f24e37d9fb45715152a72bfb709b6fa272c9f973ce22eafecbf5fa01a20e15e
 EBUILD gtksourceview-3.24.11-r1.ebuild 1221 BLAKE2B 8f07e18a7443d3e7802d4da2f7c3faa7791eb55d2440a9be3a7d60edf7de3edf03274ce01e2391d812cf773fd9469a31e2588ecd069696076da35307fe2ad3d0 SHA512 f764ec43144157e7354f996a78d09c22c3de1933b3ecc1b529123d0369a8948d8a9e798b048588351ddcbe3bf9a315ef72a41a1ba809698861aafca8dbc723a1
 EBUILD gtksourceview-4.8.2.ebuild 1751 BLAKE2B d20f94cd5f313cf4fed081b8ac6a39894ef809e14e9f3eeeb7822a27ac42833aa1af048ce57e1fc5d5ef93103d93a363ae7349bd380222303295945ac94e09b1 SHA512 738aec48327b3c17fafdf334b5b031fed2e962b518864dfd354074fbf29efad73a8438c51475f102661ac4a1ade9b872fb33ffb73e124613234968da8b4d9cba
-MISC metadata.xml 319 BLAKE2B 383670a9fec1362b5c4cc12cc93d8f94140d3ba3c09ac64f125de13ea990d4fbaad7eae555c864dc18b1c5f1ddcf631e1125d161cffdea9fa97d76f775f42d7b SHA512 dabf9cb57c228ea197a473292336bad77024b7ea122c121a385755096201097215925bb8281359d3cfcdf7879d80c93d522b6f9dd08b5a33df826b8c310ce074
+MISC metadata.xml 430 BLAKE2B 97632c64552f8f8414314de16a73981465cdce4c553d550618ebaf6fdfd1ef100e32c008b6442cbbea68ad1f97ca0631f332ed9bc4fc1884fbf4ecc608b70ec0 SHA512 3c8df69407d401080882427ca5d135a462d246fc29878dbef7b0614e1ab150cb0c9349f5398397cb7c94adc854271066000a0d4ac118f8be342e2a02464e8ff9
diff --git a/x11-libs/gtksourceview/metadata.xml b/x11-libs/gtksourceview/metadata.xml
index 4bbc4d876e04..2a8dca93e90e 100644
--- a/x11-libs/gtksourceview/metadata.xml
+++ b/x11-libs/gtksourceview/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="glade">Install a glade catalog file</flag>
-</use>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="glade">Install a glade catalog file</flag>
+  </use>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/gtksourceview</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libcryptui/Manifest b/x11-libs/libcryptui/Manifest
index fbcd7ae5051b..dc5e7ff572ad 100644
--- a/x11-libs/libcryptui/Manifest
+++ b/x11-libs/libcryptui/Manifest
@@ -6,4 +6,4 @@ AUX libcryptui-3.12.2-port-gcr-3.patch 4932 BLAKE2B f711e6f0c6c8dec3c84d47e2ecc9
 AUX libcryptui-3.12.2-prompt-recipient.patch 1447 BLAKE2B b36b71220a48540ff2a4dc2ac2de2368ab9a4ea2f12721ec84d3f4459e3e8cf348fb1d51318064e40137aab2f424c881bd3f17d25ae988c0e95826cd87c52393 SHA512 4e38c0f2e813bf0ab76f2205045a3b5240d0ccb9701de8c7a73adc4edc3540ff49eff6fcd5bb011c9e91984c9b82eab8a6bef32d099501895eaf9d6187874c43
 DIST libcryptui-3.12.2.tar.xz 1163784 BLAKE2B 4a13f5dbe4229673da293115dd0d57added87f0522d6ed41d3072780e738b64bfee7c1b9af5872e9877ae22117492a5e3e1b119d4842536c2e762870fe8de85e SHA512 50ef407f0a9fe2ac8f4ab075e125fe8eabc55160b9b96a852d34e52c46be04e04b2a7c8288d2669e24865a89dc179af6bb0da8f6799e8b07fff7bc667c8eb1f0
 EBUILD libcryptui-3.12.2-r2.ebuild 1920 BLAKE2B 30bbdc274f761d7ac3c76f9b24af4285afbaaecc2c990f0ebe2649102a8169b6f2b300a5ccb62d3fa8109c812bdb385777f1a65291611eadac9f3ed839d45b46 SHA512 b326adad392092dd4c1e2b182ccb9a854c62bd0c3a7dcb0fa5ffcdd89c10a84f985540462449d563ededb649ca887ca4bbebe2c4795b7719c8096633819944a3
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 351 BLAKE2B 017b5d88dd76f4a1dc9af426e77a65454bd77a2f1acf1b4d4f596419a43320d669010ef984f1efc977cbc6146346869a930bf79c8dca2483b50ec6d639b55426 SHA512 334daf51e145670d9ffb5d8c1645a2312ded9cf0953dec27d3f17d8f42856a6056d4d4d8bd0d26117e3ac69e56afd8b882ea9844af83467cc405248a32d6ba90
diff --git a/x11-libs/libcryptui/metadata.xml b/x11-libs/libcryptui/metadata.xml
index 7b343b06be8a..fe5700dfee3c 100644
--- a/x11-libs/libcryptui/metadata.xml
+++ b/x11-libs/libcryptui/metadata.xml
@@ -1,8 +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/libcryptui</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libnotify/Manifest b/x11-libs/libnotify/Manifest
index 0944364c7e2c..5242ee87d90c 100644
--- a/x11-libs/libnotify/Manifest
+++ b/x11-libs/libnotify/Manifest
@@ -1,3 +1,3 @@
 DIST libnotify-0.8.1.tar.xz 105368 BLAKE2B 840b56941e9773b4db5ce1ffba7ca3fc04e76877349c53ed1c985acf7405a575bc9709e0255edf4562b5596de97fcd7e9dbef32d99bc853b94b203a7da0c03e4 SHA512 464b7ff9f2f6268919f336bd9c6f8c243c29282ba6ada7e491ab514b3630977a319dfa522705c68e17fff2d87effc75e009d656bc46c5e92917ad64e66b25320
 EBUILD libnotify-0.8.1.ebuild 1493 BLAKE2B 3b7db9d6bca4853a249fdde959f5f590902f6cb26a867dc32c3ffc88e3488b8bec477aad1c03e3f71e0e077b7b415fa7fcca8ee027710e5a5bd8f36bbd74903d SHA512 10d74808045e92755dbc4fb7c633f0c0036c5cfe3ddd3aa95b116eb1b3c99dc8c884574eced9c69518641cb4295c086439bd80b043d2200e1854288d70480c44
-MISC metadata.xml 397 BLAKE2B ed17366f7a815c49a838fef999ccf115e109a3ed9eb88d527e464c49692abca943f8c8971f2a263012cb12c2c1426b3747b733cc8c20926ff0139446b1c6e685 SHA512 89e5213048893402d277dd137d4236164d0cd47cc6e5208bade85cc67303f0d754259a5ccee789e2b5e77aae2188baa09f631e5ed1a0e216215bd091539cc0be
+MISC metadata.xml 487 BLAKE2B 9ca610c8e5775a9daf61254bdf6364bf8e2df0646c48c78e1178b5232faa1711c7a2cc85943dc8078b92c59b3d4d2a65525d4adc60d2fc323048c264b9495996 SHA512 7f1d6337756480c08fb487ec9115fe2ed7b7cae248fdb751fb3cb49c301807deb02b879e3ec8c275bef87d33c8eb853d6f9a16d72e6fcafb47446d8f634b2fa9
diff --git a/x11-libs/libnotify/metadata.xml b/x11-libs/libnotify/metadata.xml
index 63b6d8453c24..c01abf03c313 100644
--- a/x11-libs/libnotify/metadata.xml
+++ b/x11-libs/libnotify/metadata.xml
@@ -9,4 +9,7 @@
     <email>freedesktop-bugs@gentoo.org</email>
     <name>Gentoo Freedesktop Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/libnotify</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index 87a5d918e48c..231472a165bd 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -4,4 +4,4 @@ DIST libwnck-43.0.tar.xz 455464 BLAKE2B 591b7a9016f5149a2493d36ed8ec8a7e2a59b130
 EBUILD libwnck-2.31.0-r1.ebuild 1209 BLAKE2B 5bf316bc3ab03afbc54fbcf4095804721f86b24c81be44e416d5e1107d65954b9142a739e8d46ff07a27657b174b078a364e52640cec50a8676cdb7916f34888 SHA512 adcd8a2024f44730082de7a27bea6fdea598f3ba5495fe18f86df09e23d21218cf9fa4403a4ad665d0ca218e2aa5d1187643bb68cc57187e9825a9f558cd4eba
 EBUILD libwnck-40.1.ebuild 1417 BLAKE2B 03b3cd2b320b1699aad725de8dd7cd52782c3b876c699783685639a924093f8d64c2268d3b4501f60fab9748f173552326ca7b4b525e3c9a9fd1375a6742df89 SHA512 8549fddc4440b2e10479161d1531a42a90cf322c91658440f5fd9516355d41513f9e933808b14eecc8e962e254199b2961c37d9f527fd4e1cc05e83f3d0a24bf
 EBUILD libwnck-43.0.ebuild 1439 BLAKE2B ad29aa5bc5b69e28142ac8137829a5144ad8047dfcf173b7167b16ae7276d7dadaad0d23f7b7a2fccf5134cd0de1ab45001c8a4a96ab142d089c7b55704cf64e SHA512 e24c3eaa1e5349a5c65b5415aa1d8bab12ec848dcde50ce493ff725c7c354d588a3ed3d8d722f3ea4b43ce4bd54080dc8a82d6a4b3f0ccc2a38350b162103f1d
-MISC metadata.xml 365 BLAKE2B a7be92726d84fa9db42339b18e8ce7cafcf36a19c7573295c5b833c6ab1fcde222bcb43a645ae5c581d8fbe71e52073381f73203c89009dc9088aa4d11c9a1dd SHA512 d7fccc45d93efd6f83a0af12a1b8816a4a9d45c379f247f0728e7bcc7c4b6d8e193649ac83df6070fac2841b42708181829393cc424075067ef49496eb1f9f54
+MISC metadata.xml 460 BLAKE2B 891b6b8e3c900dd4e0d285bb440976a1539c2272e1dd5d269c6d840a410bc9fb511458dea304a96cfdb38437df99e1557a78e6d8610a2c47c9420d0eed73b562 SHA512 c9cead188269942beacef6ea2dfebd829f9851d7f41b4b4fb1f9659cc2b64a2eb8b71a4b536446fd26485c215d601f5d5db2e41fb6cc40222c6e87c085313ce3
diff --git a/x11-libs/libwnck/metadata.xml b/x11-libs/libwnck/metadata.xml
index 35f3d9b84ef1..85ada7ba73a0 100644
--- a/x11-libs/libwnck/metadata.xml
+++ b/x11-libs/libwnck/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>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<use>
-		<flag name="tools">Install wnckprop-3 and wnck-urgency-monitor-3
-			command-line tools</flag>
-	</use>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="tools">Install wnckprop-3 and wnck-urgency-monitor-3 command-line tools</flag>
+  </use>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/libwnck</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index e0b7482bd2b4..63f58bde3770 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -8,4 +8,4 @@ DIST pango-1.50.9.tar.xz 4262208 BLAKE2B 13495015a7b22fb33d6c06e2fd2f325f30a80ee
 EBUILD pango-1.42.4-r2.ebuild 2317 BLAKE2B 7bbc0227f8b846c1e51cc142e7a3088ec88c2fdc35fff8970daf3699e94e369de66380fc140aca039accd546270be27c809e13c0a71d42ae8df19f64198d22c8 SHA512 8c1c0f11ad9ecbe7f464e7b839de614e4f266d2674b843d133489b882270f02754c61b05f2624a2b4c9d571b7824d2a142ccc2105e2c7e968fc26e97e2936c1d
 EBUILD pango-1.50.11.ebuild 2417 BLAKE2B 8325fa1e7dbda26331ee4f72671d760e87eecdb13793b0447dbb0ab8c0459099004b2cc542bc192c57c14be2325596a287885677cc5d04e60523e82dee31ea18 SHA512 47aa5c1f725622aba3ffa195d19876b9da3647b36242ee97f87f0fa20022c68c0f6236c69e834b5975353ae3633e34d79ff384ba71e7154a53af49663ada5770
 EBUILD pango-1.50.9.ebuild 2409 BLAKE2B 8a80f3286eff5f0588692a19d8d1e84385448d8a640725ab1b5c4085d5dddca37595a8efc7b3500438618206167d537e61a58f9906c7a6aab597c484dce6f21a SHA512 306725b129979a7688df2133b302e3f62e8900917a0c584180be9603e286c621ca40fe6f2ba080b9149b038a1e3b859fd8af2520419bcab86124f9bc3be7b6e2
-MISC metadata.xml 523 BLAKE2B 623788e7504fe89c7d8604eaa2a6b1ab5fb022965eaa3044dd2a94b6f68638453011257659c0f17b7ced9b6945acb3eb4767f9fd3ce9686b69b3b60b867dcdfb SHA512 a60feab6e4e50cb9b477f388d4534eed4616fac6aca4f6eae450fac42bfa9ca0d7382e36b98a159732f9c6926162cb2ea55d72a644bc77629ff09fd0097226eb
+MISC metadata.xml 604 BLAKE2B 94690ca7900ce8d6418fdbaaabf9da8a85471f575a8bf81ab73523e3910d4c8db227bf653be30fe068f9c7c2e2295aa6af52c3e8da2780aaed0947c2b76b3b2a SHA512 314a9b5ad763a0077acfe0afc46fb82e26b28cec783077765f8b42e0828a059fc18804dfa522f9cb3628bf63cce1ac27af3b244c2b2166cfc9e1e5b465dd2f06
diff --git a/x11-libs/pango/metadata.xml b/x11-libs/pango/metadata.xml
index eac868b6c1cf..dfaa55f180f5 100644
--- a/x11-libs/pango/metadata.xml
+++ b/x11-libs/pango/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>gnome@gentoo.org</email>
-  <name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
-  <flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag>
-  <flag name="X">Build and install the legacy pangoxft library</flag>
-</use>
-<upstream>
-  <remote-id type="cpe">cpe:/a:pango:pango</remote-id>
-</upstream>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag>
+    <flag name="X">Build and install the legacy pangoxft library</flag>
+  </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:pango:pango</remote-id>
+    <remote-id type="gnome-gitlab">GNOME/pango</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index b9ccd7feeadd..08c9437ca5c3 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -14,4 +14,4 @@ EBUILD vte-0.28.2-r209.ebuild 1864 BLAKE2B 61c287edd403d36a67fa2b45987bcb7a5ee44
 EBUILD vte-0.68.0.ebuild 2741 BLAKE2B 66debeedcbd37b16ed63f2618bebc1c0b611855016a18dd51e54be535130843c58c1bd2a583f83563268fbb33cb40c4070352518be8aa0e1168f72c63b2b2d57 SHA512 93344cd296bc3ee4ff50df052c0118fa4529efd5f2b72c0904258f090d42ab640eb4ffd8616a085d90a13f9af04d7d9cad90acc8855573879318a4b45e348744
 EBUILD vte-0.70.0.ebuild 3183 BLAKE2B a82a76018feda98c892290f2ef5c91098040613bffbded0629067622ee07a88cdebe343d9b9c60b3ba494bce561071652ef4332ed24b83a9b5498f78de59d331 SHA512 834488332f71b0742143cc2baa64ec91f724d43e0fdea0dcca9f0c005296e8417d8ea3524b536642c433ec76b2ab21a8332be9cc70f67bf6c1eec6b5dfbe46a0
 EBUILD vte-0.70.1.ebuild 3183 BLAKE2B a82a76018feda98c892290f2ef5c91098040613bffbded0629067622ee07a88cdebe343d9b9c60b3ba494bce561071652ef4332ed24b83a9b5498f78de59d331 SHA512 834488332f71b0742143cc2baa64ec91f724d43e0fdea0dcca9f0c005296e8417d8ea3524b536642c433ec76b2ab21a8332be9cc70f67bf6c1eec6b5dfbe46a0
-MISC metadata.xml 519 BLAKE2B e34530c7e9882f9d61b6c1fe9cc1d523037bcc05034e3f98351ff33bb543a0a25d96c0debdd1572cfeb0d2166b41a324c7fdfed38482c11cbe053db96b312ef8 SHA512 313a0af6b28d47bf385594a9306f38476bbfcc44517d7219ba1d0a8ddee224a37cd4ee8f7c4f8aed8bd7eae0ad2b3461bc4ae49c5eb8b08bc61459c76bf7a5ef
+MISC metadata.xml 612 BLAKE2B 3243ec48375bf8e69a367e5d631cf84c0ba60b43d1f4a25c313a407bfb1c9826ddd1cd75784bc302e7d8998d1bedaac9d75c7f329255e605315d9f0bf6154a73 SHA512 0abc6f1deb0a7900b6b35620ad3dfa26a900445526cc6474f974ce5cca2dad65cb3f3c4e3b8a59540821a9922e2cafcc7011d705570e77d2a46c907f3962a73d
diff --git a/x11-libs/vte/metadata.xml b/x11-libs/vte/metadata.xml
index da14147f6e15..e08b74f450f2 100644
--- a/x11-libs/vte/metadata.xml
+++ b/x11-libs/vte/metadata.xml
@@ -1,13 +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>
-	<use>
-		<flag name="icu">Enable legacy charset support using <pkg>dev-libs/icu</pkg></flag>
-		<flag name="systemd">Support moving terminal child processes to their own systemd user scopes
-			to avoid terminal getting killed due to child causing OOM</flag>
-	</use>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="icu">Enable legacy charset support using <pkg>dev-libs/icu</pkg></flag>
+    <flag name="systemd">Support moving terminal child processes to their own systemd user scopes to avoid terminal getting killed due to child causing OOM</flag>
+  </use>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/vte</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index c70b89408f7e..b8c3bf1f44a6 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/alacarte/Manifest b/x11-misc/alacarte/Manifest
index f512be408cbd..c84a7c3482f6 100644
--- a/x11-misc/alacarte/Manifest
+++ b/x11-misc/alacarte/Manifest
@@ -1,3 +1,3 @@
 DIST alacarte-3.44.2.tar.xz 253580 BLAKE2B 206eea28b50ef6d0cf228031ff72c16c6ebd130dfa623b96eb727ef62aad3db0003f3a97bc188f4b8a0e9d18cc184a9230fb332131d37afb0abe71dc3d13ee1e SHA512 b62c15ca37717e988b1d64f0ab565970ae15a4bc11a3f31da8574a0b4f10a9cf8b94d0a85be34d871c106ab34c63b2dfbf535b46eb630829e73c14023b99053e
 EBUILD alacarte-3.44.2.ebuild 762 BLAKE2B 95f7448ddfbf0ae4f635f163fa3fe455145a5cd5949701e587262822bf896342c42c338d8a30a57f0215517734846d12ca04bd6db274556382ad711a7643c1d8 SHA512 b0498d1fd115c416ca222aa222fa33bd969ca244e218478eecbaf87dd049d1742c0fa4519ddab02a0afd5b11af7e78873e6aceaa789537e11d7581f68ecfa37f
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 349 BLAKE2B ae2cfe74f06d4c6aa4143f187cd3ed6934e6e131e4a997330c9d6ca11a2cd45b2835ef2b1bfab8570e5554fcce81237b025fc0683a74eaf62076e7c4f2cd2914 SHA512 7426942c020db80792d9d382763a005dc0956e6f7c02bb0e3a58e56cb69c37ce643da77524ac7273b8302bb0efb2e2c80dbb621d06809a7091395756e0f0cd06
diff --git a/x11-misc/alacarte/metadata.xml b/x11-misc/alacarte/metadata.xml
index 7b343b06be8a..c6a01ca2cfa1 100644
--- a/x11-misc/alacarte/metadata.xml
+++ b/x11-misc/alacarte/metadata.xml
@@ -1,8 +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/alacarte</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 9b061acb4183..83eda0c9cd74 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index cd9bd3f26a76..66e37705b2cd 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -8,4 +8,4 @@ DIST gnome-terminal-3.46.3.tar.gz 2881211 BLAKE2B a5c0aea858692bbab3ed20d4daa54d
 EBUILD gnome-terminal-3.44.1.ebuild 2953 BLAKE2B dd07246a8212d5c03274d63cd91ca2a5b74ecce4b1e14fb156b02bc7c3dd17b16bc24b8c4fde71c40138573092fcba4c30b20175209a1d3f2019e6ffbf381fc6 SHA512 a227e96ef2ce12def2a85ca071dd789c6c13a60e15add1a4fba9ef19228406eb2616b0192b92b37a22339f6c4c76ce4bea564a7b9278f2f3d6cf916e997df67e
 EBUILD gnome-terminal-3.46.2.ebuild 2981 BLAKE2B ffb040b8f7b8840ef8177cabe0e2d7b6933805ca040399d9121f7e8ce51f339c877ada98ed4e86ba138aade83052044b38d6e893b603f14cb236c4338c36a036 SHA512 1251905a80fd114277e3533f55ca4ae30c510e1df4069c99f303a5a2442bc9d1f9f1d161755871b909fc42bf2d6c3316b3f2d3267f4d8962fc8557cadc30bd02
 EBUILD gnome-terminal-3.46.3.ebuild 2981 BLAKE2B ffb040b8f7b8840ef8177cabe0e2d7b6933805ca040399d9121f7e8ce51f339c877ada98ed4e86ba138aade83052044b38d6e893b603f14cb236c4338c36a036 SHA512 1251905a80fd114277e3533f55ca4ae30c510e1df4069c99f303a5a2442bc9d1f9f1d161755871b909fc42bf2d6c3316b3f2d3267f4d8962fc8557cadc30bd02
-MISC metadata.xml 429 BLAKE2B 34e0c5a2d28f7aa2f8a6059af38935306a01af79daa081d71146600f6fb866038cb9122cc92570a68cfeb5ca82c76385d14046ca8fbf182c5046314f71348cb9 SHA512 8ab3ef95678ceee2c76131f4c05f620bd4f71ab26784dcbb552e4342aac0f33cf879992543365db16ae2c1d39e694aa25d0b9ee205c38fc06642b5f0c51ba7c5
+MISC metadata.xml 544 BLAKE2B 9e4dda0925c1f09a6109a01a522965c0bd2d811d91e19054fecf09e2d732f6f03245410e7472c3accf83bc015e2747cf96dcf3ededb62cf4733ece3241e51389 SHA512 e53acf30ece7ccb0307f9bb750ccfb3e90bf5d468098fe42112f4efa0fd1823d10124d8f50bf1ac56fbe4ad188bb7446e1627f1a05188f602e6e11a33496b75d
diff --git a/x11-terms/gnome-terminal/metadata.xml b/x11-terms/gnome-terminal/metadata.xml
index 4db7f8fb988e..0d5d07c52d76 100644
--- a/x11-terms/gnome-terminal/metadata.xml
+++ b/x11-terms/gnome-terminal/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>
-<use>
-	<flag name="gnome-shell">Integrate with <pkg>gnome-base/gnome-shell</pkg> search</flag>
-	<flag name="nautilus">Build <pkg>gnome-base/nautilus</pkg> extension</flag>
-</use>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="gnome-shell">Integrate with <pkg>gnome-base/gnome-shell</pkg> search</flag>
+    <flag name="nautilus">Build <pkg>gnome-base/nautilus</pkg> extension</flag>
+  </use>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/gnome-terminal</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 66a43c1cd681..56b41c4c1f00 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/adwaita-icon-theme/Manifest b/x11-themes/adwaita-icon-theme/Manifest
index 901354d66fce..a81170766abc 100644
--- a/x11-themes/adwaita-icon-theme/Manifest
+++ b/x11-themes/adwaita-icon-theme/Manifest
@@ -9,4 +9,4 @@ DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebf
 EBUILD adwaita-icon-theme-3.32.0.ebuild 1608 BLAKE2B 9fe50b4414ed37f44d8db02017e263c2ebbda88304422d56cead5eb65a0ffa74262241e5f41333ac823d6b0bdb04fcb28746ef7058be7fed349bcc34853f12e4 SHA512 a145ffb05832fbb569efa21c166cb004f94605dcfcc7c1b2a10080e9ae641902357d6f9d7a773bae3f43fa024c6ce3bf9231a93fc0366f46bda961930b5e2112
 EBUILD adwaita-icon-theme-42.0_p2.ebuild 3738 BLAKE2B ac74d2d5709b54dab08e1f1ead63ebea770f5b90615416a8dab2b75b790304525c227530b70f105dae1e8b7b0ebacf5ba5872fe3847a6b8c3303993e93b4c940 SHA512 b40d2ba13317c8c2d8ea149a066f836acb4d968d9e8eceb63ddf921492e0d278d086b7680dc6e0a5a157ed75f1a573fcfde4c5f5928afcf4bb8e2ac3e18f78d9
 EBUILD adwaita-icon-theme-43_p1.ebuild 3016 BLAKE2B 8f355d1e0526687a773b03a733b8787d91ab527b29df96285a0e52820b05c346f61489390c1e35abda071aea7b17a571055eaeb102b75e76add57d71db20e36b SHA512 5b0386f61811a2f36837b1df54d093717059250c2ef350d7c78ee49f0b74ea8b9fa7e37261097a5f2513147a70e0449a9e60b5c964f86a7f0758766b5e338497
-MISC metadata.xml 278 BLAKE2B b97d99bcd4447233dcd68edc452577abf9ff7477fc98f5ea7f9e8981bce7bd617d3180f6b3fb009c646d38e67bdc4c2d62904b8271860d69f4d24e7ada421dbf SHA512 45ff14340f242e8fbae9a42188c5d36bd2c381a2660e5efd25127d46c357107d521db31d74b67e8a2d3e0e6ddd44d9dc203c679845cba6785a6f6b1bc7eed000
+MISC metadata.xml 384 BLAKE2B f5445038d2ce25be0dc9990f704a7eaeb202de544fca1c588e4eb2f6ac945df58ffc1402bc0ba689069ad818b728842afa033931885423abe26eb357d8bac0fa SHA512 e3b17fac8cb1d27b39795745049ee81f5ac3499c198b6a1eee08298499b9e124526828a5cbcfefe7744f1efdc65e869ef0124b5341dc09228c11c742f295780d
diff --git a/x11-themes/adwaita-icon-theme/metadata.xml b/x11-themes/adwaita-icon-theme/metadata.xml
index 4f75d5ef7d47..5419bdf3d5b6 100644
--- a/x11-themes/adwaita-icon-theme/metadata.xml
+++ b/x11-themes/adwaita-icon-theme/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<stabilize-allarches/>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <stabilize-allarches/>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/adwaita-icon-theme</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-themes/gnome-backgrounds/Manifest b/x11-themes/gnome-backgrounds/Manifest
index 00676eae0310..f4a9701a1db5 100644
--- a/x11-themes/gnome-backgrounds/Manifest
+++ b/x11-themes/gnome-backgrounds/Manifest
@@ -2,4 +2,4 @@ DIST gnome-backgrounds-42.0.tar.xz 51639368 BLAKE2B 3dc288732a91d53e2db9cfca5e52
 DIST gnome-backgrounds-43.tar.xz 32816552 BLAKE2B b6b954ed102afd81e7ca1c370acb449b2ab4acec458306b4a740f2669037a9a8f741a9b4403cb509ad6df04cfa39ba6bed6b771e0b7d20d974a436480967de71 SHA512 e41e87e20da6a7d4c88d6b68832615709c3cf5d28fbb1a9c1a2af1db7e9c1db56ede141ac45df2164c6d919cb72f81e6e7d014bfe1f340759cd386c3a05217c2
 EBUILD gnome-backgrounds-42.0.ebuild 458 BLAKE2B b0cb22b5b5a6485ce1347604702bb665d737e5b7d95bf1e521897ac39c4f9b03300e15f1453de6c02085ae43dc2b7fd8330c818de6c8f1b2ef86a99737ea0c9c SHA512 1a79002a2840421cfa343882a05b40e9a4e68c9640fb8f221c239d270fa7de553295775abf00695c1c3bbf9fe814a496e61db5f2a653ca08a57b1bfc1c7928be
 EBUILD gnome-backgrounds-43-r1.ebuild 457 BLAKE2B 9864af6b87cd0ed4fa67747a80ccd19a33386cb55a00bbaa289e3bc0912a2fdcfaea4b1bbe855298ee852d544576e536a2523aa271f090e16a9d79384e1aaebf SHA512 9136a3cbd404ce27f41c6d8f1d8a6044825725ddc0847e4ec259a8df5d73ab11d4be560356a0aae7d1368e6631ef09c35575cfe9bdfb02e8854777e522738466
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 358 BLAKE2B 7d666491973a405a7657f7c54ed78082aa3f13f1ada5a38957ede5894c1e849cab4d04f71809ed1fddd64964bc7881b5098d44b61415803ae7c08a05d4359ef1 SHA512 b8bb7ac7eb7d24e475163e633997b1c14e720933bae10927aca0a88f853e610f81d041c98bc24b95b84c782aca60c7549c89cb0361f68134efdfe660cb8da937
diff --git a/x11-themes/gnome-backgrounds/metadata.xml b/x11-themes/gnome-backgrounds/metadata.xml
index 7b343b06be8a..735df50604ee 100644
--- a/x11-themes/gnome-backgrounds/metadata.xml
+++ b/x11-themes/gnome-backgrounds/metadata.xml
@@ -1,8 +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/gnome-backgrounds</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-themes/gnome-icon-theme-extras/Manifest b/x11-themes/gnome-icon-theme-extras/Manifest
index bdfa7eef792e..f652b8ee0794 100644
--- a/x11-themes/gnome-icon-theme-extras/Manifest
+++ b/x11-themes/gnome-icon-theme-extras/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-icon-theme-extras-3.12.0.tar.xz 1729576 BLAKE2B 48035e7094e3832a1d355867668c535c2aed691e3d3633963b7811cd49cddbbc08e15981df8b3f6f93ce8c66facb8a1ee04227dfa24788d6971bcdc6a4f5a277 SHA512 e74b1b31cdc6bc2d9410c874b8e0891521a657cd3cc86c391f58709fa2d35d9e983bd50faaca1f1378a11d716502143bc2b41942a9cdcd3caa2280429bb3f6f5
 EBUILD gnome-icon-theme-extras-3.12.0.ebuild 918 BLAKE2B 810935f57071210f2d82267d56a9af5f93e46693ff130225d0c73060ea9ecb1f89fc794dd788490668a0f8e199a27cfb6c597e963c034419638e51a7ea52469f SHA512 f697ce7e125beeaf368fd9777ab633264d562a6f09d573af58ec9f923fbca98de016ab9a1187efa1a4a0622620ac03c1b7367f4defecc912537a56773d6efc66
-MISC metadata.xml 260 BLAKE2B 74a7980ab34785ba7920342b0a2708af439bed09b7ffdc1ae3ca6cbbaba8b7dbd7a6894375c6d5adf00819685f44f58b1e069dcd1062a70e99f0dbcfe39dc3d3 SHA512 f4c15c784194c80663c49692140afcfef3450b722254b99b2bd7fd0d7a08c57b463afcfa3b5609e799d0b2d6ff6451172eace91e93b886856d2591d491585c0c
+MISC metadata.xml 366 BLAKE2B 057515bcc6b9d62579c883cbe6822842352f1c5b411f52dabf48a1a858365c518d9e5b3019faf0133fc5c477c036e8fad46cff6336ce7c4277702b8eca77d737 SHA512 7ffbbe5fe11a79929c34ff861eab90a7f99f0ba5cc0b52e4939d538392cc1963d104f30281b6e7d4f4d631263f8b52e177668be88fd876681f7eddf8898f923c
diff --git a/x11-themes/gnome-icon-theme-extras/metadata.xml b/x11-themes/gnome-icon-theme-extras/metadata.xml
index c6e394b17a27..ab7a1de710ce 100644
--- a/x11-themes/gnome-icon-theme-extras/metadata.xml
+++ b/x11-themes/gnome-icon-theme-extras/metadata.xml
@@ -5,4 +5,7 @@
     <email>gnome@gentoo.org</email>
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
+  <upstream>
+    <remote-id type="gnome-gitlab">Archive/gnome-icon-theme-extras</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-themes/gnome-icon-theme-symbolic/Manifest b/x11-themes/gnome-icon-theme-symbolic/Manifest
index 525a89d3973d..a772f44bb0bb 100644
--- a/x11-themes/gnome-icon-theme-symbolic/Manifest
+++ b/x11-themes/gnome-icon-theme-symbolic/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-icon-theme-symbolic-3.12.0.tar.xz 230420 BLAKE2B e9543bced2f49c98890cb684cfe58d66b84e0e18a469b1c77e24cc10968a2663a1f15e3dc49d937706eb39bbcc83189a59069c666490153a3fb460650210c613 SHA512 e2a662d38c5c1328f384d9bdd73ce54f4e1174a1d88763e4a5f772c2479081f11c81937ba2dc159ce250e433762f14de824516fc68209200d95dc47790471eda
 EBUILD gnome-icon-theme-symbolic-3.12.0-r1.ebuild 905 BLAKE2B 994f3707df2632fe06f2ae39cea7bf89278bca3c7868336f3d7141dcec2884cc6276b05331c3a584bce9b85665943fb6e2cea6fa82ffee2f71e7280f1d7e6813 SHA512 5c26ac2a843b78487519316333a0a3289fb15c2b1c52eb003b4a6ae7178906e351bdd68df22049789f0635076e8cb1263c0c0cc278b395e71717d802a824dc30
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 368 BLAKE2B da1f67e75c96907b23e81969e1f533a9b01c6c8d4def72afb856b0e84af390cba5039eb0b4db5050ccbd7149d7d7b4d082fe1287622087eb2eb89f695c981bdd SHA512 84fadc3f001f921785ce1c741fea8ecd557ce46291283ed2c54efa70ae5fbdf61f3272dd1b1c03d8d802e138e78af007aab6127223533a27ca86b316b765f86d
diff --git a/x11-themes/gnome-icon-theme-symbolic/metadata.xml b/x11-themes/gnome-icon-theme-symbolic/metadata.xml
index 7b343b06be8a..1eac03c27f29 100644
--- a/x11-themes/gnome-icon-theme-symbolic/metadata.xml
+++ b/x11-themes/gnome-icon-theme-symbolic/metadata.xml
@@ -1,8 +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">Archive/gnome-icon-theme-symbolic</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-themes/gnome-themes-standard/Manifest b/x11-themes/gnome-themes-standard/Manifest
index 517cd72cd68c..6c564cee876a 100644
--- a/x11-themes/gnome-themes-standard/Manifest
+++ b/x11-themes/gnome-themes-standard/Manifest
@@ -1,4 +1,4 @@
 AUX gnome-themes-standard-3.22.2-exclude-engine.patch 1893 BLAKE2B 416f89fb438ced13d04ed94cb7a8504fd0cf664bd61a8a30e703f8c0e9afb16407c34ed14dcb395f9c9a4d19d3d90c1d73f2a64f2acb3de34b6d9ba6a649afe8 SHA512 9b7f4efdce158485850e12566dce91a7b3494bae8191bcacb581a737dde15bcce9b10af8f28ab920605e86008744ad380312f26fc3d624bada910599501159f9
 DIST gnome-themes-extra-3.28.tar.xz 2953272 BLAKE2B 122ff5f1d95086c5cad6818efa79763ab574b7d6792b846198ac7ed5b521747d4357025ebd0ac6b5ea1161bf1dd3482ac2e867822bf863928b05a8486172ba0d SHA512 bccc446e86b12476b86a0fe2e3354500c8fb3eef62a85c3823d69aaa259e032e1f94e7993bf633397b669c425ef42635b0cf17b376f0b7cf1869bb1d7160ede0
 EBUILD gnome-themes-standard-3.28.ebuild 1024 BLAKE2B 35e3f0e65fde19385b70211cf80f0a7a683e3b8556a8011311c57d3dd4c0d614cff3b8bb65c09effa33386114d9d35850159bbd2a3f470283b67c46c9653196c SHA512 a84204f349a512a6f96ea699d6938267c20434bd76271516a528d350430c6741e79a962ed974476a07d180fcdbd649d8d79093116304a46ce740c247a6382c33
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 359 BLAKE2B 6c344664474c64e3c2187d052304d04e4c06c3d5bf9a90f4fabf5bb3fd17085e371dcebd90e81c915134e60fb982b02af88665b07e08fc2d7c2de46e24b0c48a SHA512 ce0f8facf3f91c70f2a003a5d3dc0965da0891bdf16b598efc42ff1fd3a3b3954dff671874cbe0197d28efb11ceadd88ccefc5ffc127470a33210cc69f813518
diff --git a/x11-themes/gnome-themes-standard/metadata.xml b/x11-themes/gnome-themes-standard/metadata.xml
index 7b343b06be8a..aa2c53f255ed 100644
--- a/x11-themes/gnome-themes-standard/metadata.xml
+++ b/x11-themes/gnome-themes-standard/metadata.xml
@@ -1,8 +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/gnome-themes-extra</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-themes/sound-theme-freedesktop/Manifest b/x11-themes/sound-theme-freedesktop/Manifest
index 12fc4f0ceef5..a0f1c2c6fdc9 100644
--- a/x11-themes/sound-theme-freedesktop/Manifest
+++ b/x11-themes/sound-theme-freedesktop/Manifest
@@ -1,3 +1,3 @@
 DIST sound-theme-freedesktop-0.8.tar.bz2 478237 BLAKE2B 3f4f5969bb4cf1b285df8bd79184dc49873a40bd0832d270bc36a9b72c1fb33034cce3595b784a2807954c9fd20fe29ec38d5ded68f02ed717e492ee09a83762 SHA512 f08e0414443f3a47bc433a69a7226d2b9383bc7c64e0711e8a605bd761ac69ea052a6db7f0037d88fbf0900efddaae6466ca96391eb71295ee1d0edbd0364621
 EBUILD sound-theme-freedesktop-0.8.ebuild 583 BLAKE2B 75957a69af0b84d5ed60ab2610ff5f69605cb0545065f2f11430f7a87cf6c438c287837b5dc8cb1fb9fb65ac26281e82f93c76ee096c929c8efd80a6fc3dc39b SHA512 4563ae57d4cb25bc03d64f9abdf630e3c3f90f8fc3bfc630b7cff3d0155b5f28a1fa9ffe744891e6635727c1ca92f0f705c4bc538736af72486c5738eda209b2
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 360 BLAKE2B 1ce8d58b1274448c8d6a10737d3d88f0b58dc82609bf53cafbd54666ece371058998907ea89c9d481d11ae4ec16a7101e8d09809d39e98206e45c88644c94f2e SHA512 4ea402d0f33145c6fbd24364560b6f8ff4eef88d7b135803a4dfc53acbc85af99e4289053f207fbc5e63c315a1c6b449a539bcac30605680f37aad89b97bedb7
diff --git a/x11-themes/sound-theme-freedesktop/metadata.xml b/x11-themes/sound-theme-freedesktop/metadata.xml
index 7b343b06be8a..8dc271ba6ba1 100644
--- a/x11-themes/sound-theme-freedesktop/metadata.xml
+++ b/x11-themes/sound-theme-freedesktop/metadata.xml
@@ -1,8 +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="freedesktop-gitlab">xdg/xdg-sound-theme</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-themes/zukitwo/Manifest b/x11-themes/zukitwo/Manifest
index 5d7babd9dea3..549e3be3b0cb 100644
--- a/x11-themes/zukitwo/Manifest
+++ b/x11-themes/zukitwo/Manifest
@@ -1,2 +1,2 @@
 EBUILD zukitwo-2016.08.08.ebuild 372 BLAKE2B 6893945eb5239991065b752c3a51efa09a68ec4ac37f19e5c8d15c4a4d31b5341ae4cbfff26cbbbcad2786738ff1fa30b5222e450cd95d2c8712d0bc2a820293 SHA512 79c56d79cb9cf418929395286199414e934a3a17364444e00aea5727cf9754394ccf41d4f44d417ec11c146d8ded031e70b3913ef2d17c8907f64d2a3631688e
-MISC metadata.xml 365 BLAKE2B a8cbfe3203996bbe4b695babb15d078271c0db748e91f9f4b4a0301a88426e5a7586390464862ff7d33fef870197b9c338242580da08b193c6f8409fbe05cc9a SHA512 3152fb3273c42a593a13405cbfdf0a125eea4b52bb85ba159fd592eff07405883f6804391977375222e120d6bfd1d487941af7f288b604504b927bf5f46ffa2c
+MISC metadata.xml 458 BLAKE2B 435b2e50439b02c112c9c75a42b7d4e481ce349a2b0d287a4d85c4e62aebc4ebb5ef34f2d797ddb8a709853531b12757fad0c0054f2f3152cb71e61f49df3681 SHA512 ed9cf1e99918d92b9a92aba017f78be4400624c7e0b7038d0e4976d9dca7ba3b7e072c2f0496e3276f60401b993dd75b93d5e0e2cd82db2ee2a08eba237129d8
diff --git a/x11-themes/zukitwo/metadata.xml b/x11-themes/zukitwo/metadata.xml
index afe1751920c5..8d8b736ee956 100644
--- a/x11-themes/zukitwo/metadata.xml
+++ b/x11-themes/zukitwo/metadata.xml
@@ -8,4 +8,7 @@
   <use>
     <flag name="gnome-shell">Install theme for <pkg>gnome-base/gnome-shell</pkg></flag>
   </use>
+  <upstream>
+    <remote-id type="github">lassekongo83/zuki-themes</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 4b9b83ed47c8..75cdb9109a1c 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index 4a56706f374a..e3ebb27b4c68 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -2,4 +2,4 @@ DIST metacity-3.44.0.tar.xz 1973772 BLAKE2B 24582202543d8f1c29632843615b841be1ec
 DIST metacity-3.46.0.tar.xz 1958124 BLAKE2B f7db5d38ab2c9aef8809f02ada76a453e712a471d59c3c991d0e1a5cfa1b9d37f901f38ef9057301a6232fca49846af0e80c6792bb5dcffa85694f64983d918f SHA512 5a203a4190dc919ec83fa3f4f7a86aa1594c82051b4e5afb76eb11acb38c573367deca85dead64564e2e96304903cd84eb5b4fc904ddc0672677114103d299b2
 EBUILD metacity-3.44.0.ebuild 1289 BLAKE2B 6f454bb3677428e6b63f868d2be60bcd7aab5c568a89592445ee11f52c87d1906c540537ec6f8cbc52f0874ac63691b35764ccd559ebd35439c2d3c8092a3a37 SHA512 a336d179dec5dadc00d749a4f0dffafc5c01c59414ed1d7c790f1157d663d18ab2484e693b69dde4ecefac743d68dc3d9718e406908ee8ecdd848728038f0692
 EBUILD metacity-3.46.0.ebuild 1295 BLAKE2B a5074328f70255fc349b80bda1229498c7c45111f002978ef6d9af8bdff738fabd5932affbc3c37103494b9feb2fd1dbb094df31e437535c44a943c56e861648 SHA512 d508ed8fc03f232aab0d9a652ee264a1d729dac264e18835a8f0b8b31e1e08055043bd43aa764ecb8842dce17ac07b11b4a6d84210cf98e29b0f48885dfb6b4c
-MISC metadata.xml 478 BLAKE2B 6b6edfb923803da21c7d6c7bb9732bc387e4f57d0682ad79a4bad3a973c8f4746ecfe3ccd376f4ae41784e019f29861b973c66cc35ba3535126de2fc6c827b98 SHA512 759912aaecef429c799aa70ec28428be7572f7eb5ddadcc3f6c0aec469d6fd9ddc3cb0d3f54585b60a2a5764bbc6b4bde5da596d9800f5989f638d60795b1533
+MISC metadata.xml 587 BLAKE2B b3cf07b5d226dba9d333ca3c897727b165663ddbd112924fe6d751ded222054f560bbf3b541f3d884040a8e25ef672f912d20e4b8cb2290e9888567a2b418f9f SHA512 07f9e9ecdc9d2934c6ec6d2d314336a1887ac1a39b7384cc994a745113949850411c5b0707c61dd6c902dae5fb0578768cf1a03c76daf5ff1071a0b4bb42d6fb
diff --git a/x11-wm/metacity/metadata.xml b/x11-wm/metacity/metadata.xml
index e685ec70a527..e6d1a7d56ae1 100644
--- a/x11-wm/metacity/metadata.xml
+++ b/x11-wm/metacity/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>
-<use>
-	<flag name="libcanberra">Enable sound event support using <pkg>media-libs/libcanberra</pkg></flag>
-	<flag name="vulkan">Enable Vulkan based compositor support via META_COMPOSITOR=vulkan environment variable</flag>
-</use>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="libcanberra">Enable sound event support using <pkg>media-libs/libcanberra</pkg></flag>
+    <flag name="vulkan">Enable Vulkan based compositor support via META_COMPOSITOR=vulkan environment variable</flag>
+  </use>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/metacity</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 4959934ec6c5..08e090e911a8 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -7,4 +7,4 @@ DIST mutter-43.0.tar.xz 2768452 BLAKE2B 4b5cddbadf0e71b26f37725cb301235e0ae33e62
 EBUILD mutter-42.4-r1.ebuild 5461 BLAKE2B 0a61cd1d21dcfa3173f00934f07feed6bbef60eb3f290a71cc960fa1f91d3fa2901685d54a5829c640a385bcdbd5674b49c7bd3d6c94e7dc189c1d88697f5bc1 SHA512 ca7fa2ca79d0763f2ebcf2a7372f302d25ffc94063cd3ba38d371aa032ea0b79fa0fb21d5239fd9f7dd60be67ced1440cde709426436db672aa9f755f30aae53
 EBUILD mutter-42.5.ebuild 5470 BLAKE2B e20f8db146377f71c56b336a8ccecaa9e7fbf1b0d79eabfb451dced852934255e68f34edfcd4a5fa153b96048c460fdd175c5deeb2c501099e6264446a11327c SHA512 1d017e60926b31cc5a6836e9adcc3222e970e2fc442b255cb56285b2d5193b46790987b1b57f7f715fa77c5d1ae2c1801be2ef00ad81798c4ac77330d3460f8a
 EBUILD mutter-43.0.ebuild 5780 BLAKE2B 886592ce31a257b3b34f9633b6cffcfd84b78d8f63f30ef0a1aed891b512395fdf124600fa4b10a98d7b54aab783991a48eac83d20400f293a3d61fefb9c0970 SHA512 c1468a1cda7bd194221e249d7bb98b35924be62d8dd14beb315af8cdf2641e3c139a62411fbdc0762a4abc01c7a86dc111c0dea56568fe2a68d8a97887fc310f
-MISC metadata.xml 485 BLAKE2B c44b289cf5592b16abd0d7a095e2c042550d6bc37a3ab8a0ac287a9c501cdd5b30e7ddba0286dbcf25845f659afa07ae92182c063fb3b549ed448829197cc2ee SHA512 16628e78b4c9b07283733038e66d9b0ec58a1964593be2aa4e81be117a26944a9d642175ab0eceb06913bb178034d4e49364ae977c60f296cbc3cb0acafdb90e
+MISC metadata.xml 584 BLAKE2B 8c15ff1bc0bbadd7fe37f4a903d90c49f10aee6fd8cd83bcd81d486113397607f30b0a9c3aa43ee0b0f8e0cea8e8caaebac8560da70090fd0dbfbba8f8c0250d SHA512 924fc21a5378dc447e36c21f09ce45ebb61ea4de1dc1f541cb45ce139352616983141e8e1466fcc34dceaf1a5ea0f8e87023b25291e6796ef3f2163777e00a87
diff --git a/x11-wm/mutter/metadata.xml b/x11-wm/mutter/metadata.xml
index 8addea99395c..ce29c97748be 100644
--- a/x11-wm/mutter/metadata.xml
+++ b/x11-wm/mutter/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>
-	<use>
-		<flag name="elogind">Rely on <pkg>sys-auth/elogind</pkg> as logind provider for Wayland sessions</flag>
-		<flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag>
-	</use>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="elogind">Rely on <pkg>sys-auth/elogind</pkg> as logind provider for Wayland sessions</flag>
+    <flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/mutter</remote-id>
+  </upstream>
 </pkgmetadata>