Merge branch 'next'

21 files changed, 26 insertions, 15 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 978ff28ba4fc..099c63bc9054 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/atool/Manifest b/app-arch/atool/Manifest
index 44b7157e16a9..8c7f7a55e4c9 100644
--- a/app-arch/atool/Manifest
+++ b/app-arch/atool/Manifest
@@ -1,4 +1,4 @@
 DIST atool-0.39.0.tar.gz 119307 BLAKE2B 770da3764a75d29472ce052c568ff534b88a394ef022c91678693e2eeaad1613343dcbda907346e2ac83eb4e6c164bc8e7a07b3edbad919e7cacb3846221eb90 SHA512 2011c13f510a140e71d26f9eac60d07f2cb9004dc278303fd37c5c7f78a6a2366ad9193e7b4e015d9fba8218c59205a6339189ae4775b0afc42328f9607524d3
-EBUILD atool-0.39.0-r1.ebuild 399 BLAKE2B 0d2ea8448a5661b5efe0b232c353c3d85af4ef5a8f86fedfcd31db67a0cb33cea561f169110b908e09822c300c7124af4635dcac60a0f491286862d8466595f1 SHA512 40732c25ceab10f627bb549f06fc8f88a402004c29b385a61b4790a22f4a94c018ea4f9197cbd6f4370f66c6874fe093ef3cc864498bc48ecfba23df33c8d24c
+EBUILD atool-0.39.0-r1.ebuild 397 BLAKE2B 2f135263b9377ca21f8405695607667edcc7973155bf7417a1a389590b6e0259d40b3e664ece0fb3329cd83b06183bef09e0e0a6cc4eb4cfb99aa037b09865ff SHA512 4fedacf094bd90bb79cc0731eac449867fa6c59a8fdf6e7f42d15937a508136b1d1411f9a2508087fb9955f586616d4cb79a4c4ecd7c146639c55e07e294bf91
 EBUILD atool-0.39.0.ebuild 409 BLAKE2B e6d40c0322d1e7819fcbf9a4f0873306a97d07edbd6f00bbfb3b0fd107ffdda62d5fcf23069e73b93da7508dbd9db9ffa416aa40060bf13749fba7de79fa022c SHA512 ecf7cc68e9c5f3946b7e456c3223827f50a65c4ce4782e06bab6e0a8f28c9ad3bb88aeca4d1c2aecb8cf1fd2afe749f1991a45605172f501e71b24fea59917e3
 MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6
diff --git a/app-arch/atool/atool-0.39.0-r1.ebuild b/app-arch/atool/atool-0.39.0-r1.ebuild
index 729fa245614b..4ab3fb6b4aec 100644
--- a/app-arch/atool/atool-0.39.0-r1.ebuild
+++ b/app-arch/atool/atool-0.39.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}
diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest
index d0138629e40d..d78870ebeadb 100644
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@@ -2,4 +2,4 @@ AUX cpio-2.12-name-overflow.patch 404 BLAKE2B f15aaffd716a6dca8b00f0831cd3bfa897
 AUX cpio-2.12-non-gnu-compilers.patch 223 BLAKE2B e5ba3da0c1dc23199e52c3782d3a11504b075b1216d20cd8643591abdc3a69afe1db254800327ece8f07f83438756d88c5c10c606b4e14c76a309941dc4ed1f9 SHA512 369efc3393affdb91191ab7a55a6dd3a1157ddfa294bd9a4763cc63e6df72af3a7ab614234d69e327edf14a97e4fb800aee32a379ade73c0f80b0dd8ecf33f03
 DIST cpio-2.12.tar.bz2 1258605 BLAKE2B 4b6d42a1d8aaeaa980cab5894b2e264451e96a108f2c3aa89d3e6fde0bff338e026ee233ebd7c8cf41f3c926d42d38b866778244db774055736ca8792889e160 SHA512 0cd4da5f2fbca179ab4e666a5f878414c086a5f98bce4c76273f21d9b2a6fe422d901b5d453826c5f81bbe363aa015047a1e99779ad1a451c8feca6205c63120
 EBUILD cpio-2.12-r1.ebuild 859 BLAKE2B 837ebfa3106778479403b8e5786a09405d2c680ac3b6d54c54f6f509246bcd037772088b0b8ac664697381044a7bb295812ee0af26a585ae843969918ac1c9b4 SHA512 47f6af66d7ca6a35e00783cf2ec80adbee6084e23faf7934ffee9ce2d2c9cd37541c6b76bdb88493c2c09759730d5553ffc80ed52cfbeedf9e9f4477cdebe886
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
+MISC metadata.xml 327 BLAKE2B 5f895635aeb7efdcc8e9999d6892fb8dd6668d204fbedf5492cf086a3ada6d9b1c71ffb2344de642b279de34d7ef459371d0eff173ed70cc404f6ef50d81987e SHA512 9aed569e7f3412d9891326d8d0bdbd48fd46dcbcb3d045ddbe7971e2d9e315e2d71ee9c5adebaa12425cfadf03de00ba5c70a16a4227634b9cf40e534d96fb05
diff --git a/app-arch/cpio/metadata.xml b/app-arch/cpio/metadata.xml
index 56c124413057..867891812d33 100644
--- a/app-arch/cpio/metadata.xml
+++ b/app-arch/cpio/metadata.xml
@@ -5,4 +5,7 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnu:cpio</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-arch/deb2targz/Manifest b/app-arch/deb2targz/Manifest
index b337bb4b55f2..ec8a04124ba5 100644
--- a/app-arch/deb2targz/Manifest
+++ b/app-arch/deb2targz/Manifest
@@ -1,5 +1,5 @@
 AUX deb2targz-any-data.patch 602 BLAKE2B ee85b284a594cc937e73ea66c24960fdbecf547742c1db010d90e10af72aa667c267fb13f858ca221d80c16af26c09fcaa9812567f0f5b7e9b015d5a44d3cb66 SHA512 0dfc301d17b171e52867e0837701596b60c697cc7a0520f0c003be8146d1d1470305186d443c1f7a4757938b06b2261cfb66f84f5a5776998681b9300bc20903
 DIST deb2targz 1947 BLAKE2B bfbe08a5671bda8da3a5d897f58aca863988a9ec7b7cf23ee81fb45e2bf85bd8b0909457bdc2cb545d42ccb5f56fda5559bd40547231c1c52441bf0b3560173b SHA512 9b6a533fbe232721304f3bc1d9ea952f78fb108ace3bd0a0eab206be8462bc547ff49ab9310f209079b9ed6f86413c8f0819a117b95c67b6082e37d416716b1c
 EBUILD deb2targz-1-r2.ebuild 646 BLAKE2B 4bbad5f015e86c02b923ae39fbbe51eb6c04c95b5977dae1de48faffcb698c611401cfebad4d06b13aec7ea8acb365254fa26267be0c60e6a103634d17797d0b SHA512 496a8acfabeff21f0f0e14dba5242d23f1cd1820c7b0bc2ebb2cce8ac5ab12582a9d1dfd75966f2ca915303064ff06962e4b48da89bc2b7ff4101fca0e2dee2b
-EBUILD deb2targz-1-r3.ebuild 627 BLAKE2B 30959fe781b1fc840e9da72668b9008d9dd3a550a6b4384dba7dbb995a55f905d099eb4da05011e54d52dd162b1dbd9b892b7f484dafda783affbc83d74abc47 SHA512 1fa3de53fa5c09d09b80b20ace9859489f2880b8e714a643bafa4718fce217fcb2d631c95fc38a561d65ed32b56f16f26f4e7cdef279034e84b3f2155402b616
+EBUILD deb2targz-1-r3.ebuild 622 BLAKE2B b8895a8f8be466158c1ed6a020683450aa3d63ce5a2911ff7374628aafe296b2a1ab478d866c80aa48e34465d729fa91dd2ae4e2e94cdcae60cfe8aae5c85b46 SHA512 69033d90ebb736dde8b5ad992c79107c1b5c72a40904a32aa82d6ef3a194b9a1c8c96a12efa7bbac22ac46568a01266f0811ee4737cb2536109b5456ca0e2bb4
 MISC metadata.xml 213 BLAKE2B a6b42a8b7c6f0c5a0b853af172e748301d2f4b9f2aa0424e217029affb54c88b1061dd970241a942e59a2a5ec66521ab9b67818181c03bd1dd019965e39eab3d SHA512 bddb1ae151571d0cd8833b083fd24fb4f1372e8fef6e726833ac8837abff03fb86ef85c7d954837ac82ecb906f1be4418d32d1011a2bc4be7711f2ab69a43380
diff --git a/app-arch/deb2targz/deb2targz-1-r3.ebuild b/app-arch/deb2targz/deb2targz-1-r3.ebuild
index 3a448ce52469..1896a9892dff 100644
--- a/app-arch/deb2targz/deb2targz-1-r3.ebuild
+++ b/app-arch/deb2targz/deb2targz-1-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.miketaylor.org.uk/tech/deb/${PN}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="dev-lang/perl"
 
diff --git a/app-arch/dump/Manifest b/app-arch/dump/Manifest
index e3d26baa1f8e..cfcc903e6f90 100644
--- a/app-arch/dump/Manifest
+++ b/app-arch/dump/Manifest
@@ -1,5 +1,5 @@
 AUX dump-0.4.46-openssl11.patch 3324 BLAKE2B 5cc60ef04e7f53e96e900bc78e41f4c4bcf46f3000663ac7bb1995856b5cf067c69d84331b5dfd52da4ef2649e61f6e410e59f9a99bff3be44f9e46df1b75b4f SHA512 ae7c2549683a4cf33760685fe5b07ca88b158e81f5e3b866e58f618dced4c5909dec231d07a1df590a5ebbbc9f0eee575e63f4ffae719afe01315d53d63a76b0
 DIST dump-0.4b46.tar.gz 578200 BLAKE2B 91102bdba06f3affdf4ebd9de525145c0a4cc1b9fb4c6ff222c411c118b3b7835f3aad666d530019d8b9ee46590e4a283a143d188d6800218100cecf67877274 SHA512 a30e72ab6c4d18497dffe3d25634c2e55ca90861d1cd8a6c0fd44709e735a217dbf4cdabb8c80e02053def94d9a22cf1d685ee0d0f24f5b748ee5f0de19cf17d
-EBUILD dump-0.4.46-r1.ebuild 2135 BLAKE2B 1505e8f281290cc526c57c1e6f804c29686da9b3ff5e4a663766c65b6934333672c780aff266e92df1dc6b4d9c381fc91ccd4ede4d0dc7fc93106e6443dd81d1 SHA512 445ab2cecffb3c53b4d4294e602160bcaf0d8d61cd782282d6b2a64d7c8cbf8011b5bbf25d974e66eae145a29d054b5865f3a4b2bf1f50a08db0ce6f12ab0d49
+EBUILD dump-0.4.46-r1.ebuild 2130 BLAKE2B 4b14a0e748b2a85ebcb7a0d02b4f191a624b9691e5dc6c3494f44d064388819447b37aeb18ccfd82a0e7a77bbc2a8e2217a9d38aecab574b875d92412ae61e08 SHA512 05feb7fa8948abde6f4c0d5f2df5e08a4b01b57b502f4cab0dc82f34a4f2fd3c82f21f8fa29cd13b6d24d374bd7d37bc11ce59551203173bdca73aa885d68a0b
 EBUILD dump-0.4.46.ebuild 2113 BLAKE2B 431fd8ae0fa1c3b28015f27687c28f43a8d6fcb205c97a99f3d4ee1e96d3da7683456f02e4683b85c202848ddcc9efdaac85b63f31e0a4ad5fbf2d430465a8b5 SHA512 b99325a0d0cee4599e2e00ed40ea4a49050321c7b11d6fc2416dafa7b2dff56896d7861940ed009393e73dd514beb9f2b9c7e4c494664ed9c517987844ffba90
 MISC metadata.xml 542 BLAKE2B beff8763f8b3848f9592dbf200cb547e9c416e7d675b4e9015f20b417861523949916da4a6a38553abf7fdf5fc839841870f74258becb4e8dbbcbca9c564e328 SHA512 670b1e0032f69e22337cbd18c25ecda11a239d63345c32526e111ad2eb23199892aa7e1f39a79168bb4b81b6ebde4c7796f8ccf78233f3244bfbaf62c7e0345d
diff --git a/app-arch/dump/dump-0.4.46-r1.ebuild b/app-arch/dump/dump-0.4.46-r1.ebuild
index 1734d2b375d0..7040189b5061 100644
--- a/app-arch/dump/dump-0.4.46-r1.ebuild
+++ b/app-arch/dump/dump-0.4.46-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dump/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
 # We keep uuid USE flag default dsiabled for this version. Don't forget
 # to default enable it for later versions as this is the upstream default.
 IUSE="bzip2 debug ermt libressl lzo readline selinux sqlite ssl static test uuid zlib"
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index cb8f4b22d37c..d99b9088f714 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -4,4 +4,4 @@ DIST libarchive-3.3.3.tar.gz 6535598 BLAKE2B 627949d24572b8345800e72a24d1e8d95cd
 DIST libarchive-3.4.0.tar.gz 6908093 BLAKE2B 6da5798ceabb542d8b877b3d672f6e6431ed7340ec0160a5d8cef28591b516b55d426002379eddc632a478bfd2f034a358f8552f55c9f066fd7f5c31c218b462 SHA512 2f9e2a551a6bcab56fb1a030b5d656df7299a3d151465aa02f0420d344d2fada49dee4755b3abff9095f62519e14dc9af8afa1695ecc6d5fdb4f0b28e6ede852
 EBUILD libarchive-3.3.3.ebuild 3625 BLAKE2B 572ade5c05fa4a9951c6ffca4ccf5dfecbaa1a13538ec8f7589823b7dd90f3476722f92afa79d615236811f8838f852c2a68803ac74756022eb9167607de32df SHA512 e87384a803a6a4148517ce235f2be295f6b59c7e8e0bba6a9c0c2b1bc3be90d5eb41d1763efe70a30fce202c77bd3e56b71213135dec26aaf8a5540cc46f1c60
 EBUILD libarchive-3.4.0.ebuild 3691 BLAKE2B f45351446ccf244340cfbce44cc0eacefee6f906b3c35aa6f0c2ded9d7215e70eec6ca1b81f88731ee47da444d8d4683c9b2a55d51438430ca230e89e07683aa SHA512 ef81ab5a6a773e6061729f726a6af5d752693e98b97c07c573d8e4c32fae1c22165d866f46500c2994cbe151f9c828c411b1277d18e5e57eedcd8d4ec06f9602
-MISC metadata.xml 1447 BLAKE2B 342ab0c5aeb3fdae86b39228d4df3c98163b55c1fa23318b2b7a22f714303f1f0615d60d9c057b0a91f90e61e6a7357043096463ca3efe1e8d5cbcd2a5897ce9 SHA512 85b5c67f258ab07b14f15967024bd5d1f11a81bd203e67d40398b42b3728735e28cf2645a0db865c6b6ed81a64da6de470ce62c882d0f72dbceb5361f791b81d
+MISC metadata.xml 1512 BLAKE2B e658ac7af58e3e66dd905eced32a378de6fc82af4f8cad2464b486b9ec307da60caeef4df7d7e8783b00c55c1e9cddb04cd0193973e98c2dbb70eec0c70bae32 SHA512 53f74595b98f09eb31e30a4236cb6b155d013d55286a19f480cbdb006864fbd380d4fe35b48a53a25315ecd835bcb301af3959a66b45b995b0f98fe01d7e78de
diff --git a/app-arch/libarchive/metadata.xml b/app-arch/libarchive/metadata.xml
index 8451f55586c8..69042b3e7224 100644
--- a/app-arch/libarchive/metadata.xml
+++ b/app-arch/libarchive/metadata.xml
@@ -33,6 +33,7 @@
 		</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:libarchive:libarchive</remote-id>
 		<remote-id type="github">libarchive/libarchive</remote-id>
 		<bugs-to>https://github.com/libarchive/libarchive/issues</bugs-to>
 	</upstream>
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index 26dc26e93bb0..b4472dd2b397 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -3,6 +3,6 @@ DIST lz4-1.9.1.tar.gz 285336 BLAKE2B 50dfad2e92028a1ccfe186efb5dbe24e4641e104da6
 DIST lz4-1.9.2.tar.gz 305796 BLAKE2B 0021487bee8657bc825fdd2b98a6dc8a6d10be3240fe0bebf6563e9c855a15bf5440a02d5cd6ee1f1e8502743348bcec1e866d3287b07e623887e9eb9da35eee SHA512 ae714c61ec8e33ed91359b63f2896cfa102d66b730dce112b74696ec5850e59d88bd5527173e01e354a70fbe8f036557a47c767ee0766bc5f9c257978116c3c1
 EBUILD lz4-1.8.3.ebuild 911 BLAKE2B 674ce798fb551fd4bdc4a0e5b2913f238532439e98c8887a5d3cb64e7bf5a7349e225dc290da191c97f01a2b03a8770409b915513c65d710bbc072de6b4aa8f6 SHA512 982493e85bf02014b490a10e4dc57e25e193e493ef6fcb65f77af84dab9501fef5087bd8d80f3e16f4cffa4cec025e7ecc1829ff163f5a043fd35fa4a55a3487
 EBUILD lz4-1.9.1.ebuild 924 BLAKE2B 07b61eb5aed95e530b0ee84711a503f57b448c5b0699bee2b8986c8f25162aca1726a8dc0eb6b0d4f8213d5303e44294991d49fc6eaeb3904f1a960426fcd9a4 SHA512 d633e839c63dda8779606f9ccced3a27239562a0e32eef99b69fa93115be6e7e1041d2bd2cf3a7e1b853923b32c5fea0476c842ee39ad752c0285eacf92936d8
-EBUILD lz4-1.9.2.ebuild 924 BLAKE2B 07b61eb5aed95e530b0ee84711a503f57b448c5b0699bee2b8986c8f25162aca1726a8dc0eb6b0d4f8213d5303e44294991d49fc6eaeb3904f1a960426fcd9a4 SHA512 d633e839c63dda8779606f9ccced3a27239562a0e32eef99b69fa93115be6e7e1041d2bd2cf3a7e1b853923b32c5fea0476c842ee39ad752c0285eacf92936d8
+EBUILD lz4-1.9.2.ebuild 916 BLAKE2B f1b3ff6bd834a2380bc8a21b01fe8ca9a171a49492c8dde04d53504d34e284b507de057d0e8c358c822441d002e991fc8e7bca84c759a8ec86dfa47a31fdd1d8 SHA512 2d90ac62435dac894de0f36e4f2c130e8cac94e0ce50a9892ae61222742de473ccc6a6d75bfca64245aae3e04c454552f99ef74512890fb23e3ac5fcac0dab3a
 EBUILD lz4-9999.ebuild 924 BLAKE2B 07b61eb5aed95e530b0ee84711a503f57b448c5b0699bee2b8986c8f25162aca1726a8dc0eb6b0d4f8213d5303e44294991d49fc6eaeb3904f1a960426fcd9a4 SHA512 d633e839c63dda8779606f9ccced3a27239562a0e32eef99b69fa93115be6e7e1041d2bd2cf3a7e1b853923b32c5fea0476c842ee39ad752c0285eacf92936d8
 MISC metadata.xml 537 BLAKE2B fe6b4b4291dd1358a873cf34cd4f62fc6b08ac0db2449c7bb2840a715f13c68521140b244f66f00e8881ed53b4d66e988d71baf75bc6b5c79dbbabc2d12f6615 SHA512 4fc89afbcd032d88e43f346105f02da50e946c706f60aa7991c64e768941409e335005c6a4f283c0dd4d2ddc8faba53e4968334763e9c8c46538bc5810fe9699
diff --git a/app-arch/lz4/lz4-1.9.2.ebuild b/app-arch/lz4/lz4-1.9.2.ebuild
index f68caa90b673..1e087c8c3508 100644
--- a/app-arch/lz4/lz4-1.9.2.ebuild
+++ b/app-arch/lz4/lz4-1.9.2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH=dev
 else
 	SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Extremely Fast Compression algorithm"
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index 1b48b278e9c0..addd1acdfa73 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1,3 +1,3 @@
 DIST pigz-2.4.tar.gz 98234 BLAKE2B 763fe3975c6a83f46b94741d4e16b40a4edef20b7677e8d32b99856498f951edebd86634c227b0f212f0aff87fd3626e21348fdb3839a6abfb21a547bed88be6 SHA512 79b2357176f93b9f3e2bc07fee393fc4d79b7bd0041808f8ddfd23eafccde72e60ca95e97595bb624a4f732fe3612bf46d57c44541c36ae62f9aa6336abe16ba
 EBUILD pigz-2.4.ebuild 959 BLAKE2B 0920a8eb84c9b2e51da97df8f4f5bcdbce4a6e4ffe7ed097586a2af9585e32690528e4b41c0bb275457cd07b4cac45495126081c2f82812f006c11b4f16ec3bb SHA512 a92e6ad4ae204480b6fc9bdcab8fae4912557108fc830f0aff9715d46986444dd7644357f39eba5bf9ec58083ce9b567d83e5c81b84179986040e250c76e9e75
-MISC metadata.xml 499 BLAKE2B a3f4937154e9907d34d3779407b1bfc07e8de329cb34b0efe4b62f20b4c9f5b9eb09d22023496e4f5228f1cb64bb4829c30730fe6035128b14e759073ec83a82 SHA512 7c954984f01ee2bf1bb9b8f0840445fed7f47899188a884462c59a862bef568845c2cb81a966aa6d46222d45ab7a9fabfc24b1bb4d178f9f8fb1789554ca87fe
+MISC metadata.xml 577 BLAKE2B 00e7995f3a4724227abc66b81ff56b83dd41b3ed173e80267b6d739f7db140f19b31c81420177e430ded0f9f38cf8c7cc527bf092d438ce5cb3ab867da1b6695 SHA512 5f825b9a9b0570d7687f2296e36f8dae325755e2d5895701cf621f2c01ec8db892932811f4b151231dab547380d96d234f715537a911887ce9bf144b7cf54532
diff --git a/app-arch/pigz/metadata.xml b/app-arch/pigz/metadata.xml
index 478203e0a5c1..09caf7efa571 100644
--- a/app-arch/pigz/metadata.xml
+++ b/app-arch/pigz/metadata.xml
@@ -12,4 +12,7 @@
 	<use>
 		<flag name="symlink">Install symlinks which override <pkg>app-arch/gzip</pkg> implementation</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:zlib:pigz</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
index ea59933ad627..cc9cc146fcbb 100644
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -6,4 +6,4 @@ DIST unzip_6.0-21.debian.tar.xz 17740 BLAKE2B 098a84e5b05f819f9c8c6a6656fdb2359d
 DIST unzip_6.0-25.debian.tar.xz 23096 BLAKE2B 09cd89165c0354431fa0eb946bb8f8355fa09ef81cd3e3ea03e53ca7f465b323364204ffe11d8e58eeb5b46e40be598d4f709b621d163bfde09070b6847db2a6 SHA512 13c16db420fa4a34be3090a9acdd79b01320da40ac5aa89a9dfca03e64b914b28eb72aff3882d02a8197457bcb8eeb9473c998cf6920e511883c9289a949fb21
 EBUILD unzip-6.0_p21-r2.ebuild 2593 BLAKE2B f626ff277131a9d5cc952bdfcbef19677acf487435835c0f50a438e74db7c3f8e795d0f95a51f51c14e7517ee90cd5906cf7e3c94206d46796c010d6ffd074ab SHA512 934edfb2983a9e423bd6c48d9bd7d71531c50a3578c8311b2310a126b21012986fe0a2726e40890c841fff13f5d75c56f6bfc48823f495cd227377d0b3bc4268
 EBUILD unzip-6.0_p25.ebuild 2606 BLAKE2B 19fc6e70ec6ea38deff1c0433b7d7367535967919d6b5e9efa15ba1d291d3e4a1203efc41afedac544187193aa2eb4058fd0f46a80106b78d1b38361b1036a6f SHA512 1497ff9cad0d17caaca2045e1adf075ad3bda34985cb73da9bae84f2941b746eeeee9195c26591dccbbbfc67463b09adc0a0998c8105b5a9acae46cded5c8729
-MISC metadata.xml 476 BLAKE2B 4cd0cc36008b6ec9ee618ef2e8a9c48e7fc6228e051a5c24e922faace6645de951a6836cc5d49a6041102944bf5b1901a5febcd6db86b67eb4182cad46a2a100 SHA512 0b82799f21ec8d57451ce8f231d24eabb02f637ee6fd2c32af12f9806f104ea53dc4d848b29950c1d5e848ea81f04a58422fa37f39287937dfb54e186f30b653
+MISC metadata.xml 534 BLAKE2B a6baad9ace7880a38dea2a34ea8cebb730e8a0742bd4447ebc9147a713eff82aed50e97dfeaed5589a7025c2ba7d9a244d101508f21f69a3dfd79c0ed61c214e SHA512 b4735d77d58b041bb5259d362f493247cdd9217423d79eab06567a5d7f1ebdfae0f80085ab3c3a842e68c6f5a6122913cb13c210d6e7fbfe398ff5ade29b97d5
diff --git a/app-arch/unzip/metadata.xml b/app-arch/unzip/metadata.xml
index 564fd76677c8..ed43f8ee64f6 100644
--- a/app-arch/unzip/metadata.xml
+++ b/app-arch/unzip/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="natspec">Use <pkg>dev-libs/libnatspec</pkg> to correctly decode non-ascii file names archived in Windows.</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:info-zip:unzip</remote-id>
 		<remote-id type="sourceforge">infozip</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest
index f579a98f51d7..b866b09d1c65 100644
--- a/app-arch/xar/Manifest
+++ b/app-arch/xar/Manifest
@@ -4,5 +4,5 @@ AUX xar-1.8-openssl-1.1.patch 1358 BLAKE2B 4e448107ce6aabb821e95e65863aa538cf8b2
 AUX xar-1.8-safe_dirname.patch 392 BLAKE2B 8bf3e2104fb4249ca9ba313f7ae1d6fc03a6d29ec1bccaf78b48696f44c7d88d3186c7c2078eb7b18b3fe1756949d527ce9a39b6dccd34e9e26fa11f72dcb4c5 SHA512 129412c27717bbb7ae3620c9ba221c7beae78e611e88ec6da1c572cdbc7905d60062710bbd37270fb78735248f6debf9a6b00ff0f9cc14470ac53717f00e463c
 DIST xar-400.tar.gz 213319 BLAKE2B 55b8695313a1a5ae778b62791f716af00edba7e7b01500eac4b951e04cf7b18e84e0d508ac5471996796e5ab59e4628a4f85a63a5929b372555e28b222c77ab1 SHA512 c54850d5443c776f18d788bf7d026b3b08274ee71321d1615238c9fa2d20cc0b21f3f298364b0d0eecd98ce2a6efc8d5039cabd5a21c2419c430d90db004d159
 EBUILD xar-1.8-r1.ebuild 1205 BLAKE2B 296674ef4169aa92ff3eb40203ddce1463fa495196e9ddd1048fa2f5859acbb8ee724a50ebcc398668a723b15dfe1af8aa27199019502d4023d17205c9c3c78b SHA512 68c48ec7b162b4cbd3ac1147e500ccf84b54b80cfc27e50063fc0d0030c8f05fb02868ee8d71a463fc23c2c71eca306ce88ea44eb0bbcd923cd66b7c08aa3b64
-EBUILD xar-1.8-r2.ebuild 1465 BLAKE2B 1aeeda746b6c7a3830fac3f2df548dd034a894442167301eea2b77513685c58373d68a01e0e5e669e6657007c545686ecee8d9f24485c69b2ff584b90e1095bd SHA512 682c965cb54d9e5f6b09580be8648340db3eec37f8a11e612d2d99532ce495e6c9047b748d24d593745e54cdc8ef8f0d78f1a838183b82b26659acfd10120d50
+EBUILD xar-1.8-r2.ebuild 1458 BLAKE2B 70c060e409083dbca4ed273a9af38f2af72b0caac62bef5379a4fbc306eabb604259d2a4adae865d4e033e634d3a2ce6064e24610db001f12915d990b99fe773 SHA512 4f1bb61b3b3df0008985674a229119e17d564b5f9b1b29dd8598bfe72e9f138b694783a58881536012a945e67e217ac69b30c3017319c4c3858f2491e2a83ad9
 MISC metadata.xml 895 BLAKE2B 7e901c1e2689bc8a94d60eb5ccb993775a7973697320dcd647bd4b3e3e13a4350cd3b1c033a176f2bec7c41bd67a5266ad87b8d3d1a9c5d1bbbceb29726c9226 SHA512 6b0ffedc678b52c23489465ab7267308210d1971ab8aca62471b3a58331bc1c7ff6f8fae9dbb27a7d597aa44b90dc4ff4eac2ef27f726a397aa1ec625d9463f1
diff --git a/app-arch/xar/xar-1.8-r2.ebuild b/app-arch/xar/xar-1.8-r2.ebuild
index b8acc75f2315..06d11666a580 100644
--- a/app-arch/xar/xar-1.8-r2.ebuild
+++ b/app-arch/xar/xar-1.8-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libressl kernel_Darwin"
 
 DEPEND="
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 3ff2040da0b6..6d4f3ea7c3e6 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -2,4 +2,4 @@ DIST xz-5.2.4.tar.gz 1572354 BLAKE2B 877242324afd3c7eb21d3a9414c53843f4d1bb08920
 EBUILD xz-utils-5.2.4-r2.ebuild 2706 BLAKE2B d7aafa86f26a9fd8b148cc4d9183365f323852b9dde311b2d91e394119e966379a99e242ec54b312fea89bd453b454035b0d8de0a802bfb4513fb2c675eaf68e SHA512 0aaa33811944233e533d4f90a9682658680371eb47e4e8adffcaec54763f3dad4b0b724e6f3e8e1f3c7b7358468d6f616b07db84c7ab6d6bf1543316c9b6f12b
 EBUILD xz-utils-5.2.4-r3.ebuild 2644 BLAKE2B e1a2bf99fc07ba1d7a7e690fab57f0d1ea0fb8d0fe3827c1cb624bbc9bbf67fc944a0ec1306fbde55ad6c0f1ea37d2a0d9d864653f97cc00e3459198a3b345b3 SHA512 9717a7c77306a020bd547a95bbb4b9ea1b08205800fc7e048ab99ef8027f404c0489224b9cb0d97e255d271c023de0fbb54ddf1126a3dd566bb20c95ddb246e2
 EBUILD xz-utils-9999.ebuild 2644 BLAKE2B e1a2bf99fc07ba1d7a7e690fab57f0d1ea0fb8d0fe3827c1cb624bbc9bbf67fc944a0ec1306fbde55ad6c0f1ea37d2a0d9d864653f97cc00e3459198a3b345b3 SHA512 9717a7c77306a020bd547a95bbb4b9ea1b08205800fc7e048ab99ef8027f404c0489224b9cb0d97e255d271c023de0fbb54ddf1126a3dd566bb20c95ddb246e2
-MISC metadata.xml 462 BLAKE2B 66d5625b239d042389ce8fef820efdc3ce3b5cbf21f6d0aedc4874d450ea1897dc8438575f3efc5a491ea857a8b990e6a51b16d0ff0b4982b41307bb52535cf1 SHA512 8f4ca7b987587a240f932ff1719f096de148db6e11c4e0af5f2f55552cab5d0af1256be337dbe8493b584d2c25a70a308dc28b90712078fb58f40cae37cfe5b1
+MISC metadata.xml 538 BLAKE2B 1ce32a16125c6af46b02bf0ebdef56c685d1d4903b74c2331b446e764096503b06fecf6d467ffb1c1627b8dabfa58092a1db21e5eda53d66f4e9ede4714d7978 SHA512 97dffaeaa9db4117a7e7770ac1ebfe16c0c32fc3de30f7cf099dea7a6565c3971146178140e0676e1946fcef609131124cc3d0bd971eb6fde1d45086da122310
diff --git a/app-arch/xz-utils/metadata.xml b/app-arch/xz-utils/metadata.xml
index fac09b73379a..74270db09ca6 100644
--- a/app-arch/xz-utils/metadata.xml
+++ b/app-arch/xz-utils/metadata.xml
@@ -10,4 +10,7 @@
 		used in any of the default xz presets. This includes delta
 		and BCJ coders, additional match finders and SHA256 checks.</flag>
 </use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:tukaani:xz</remote-id>
+</upstream>
 </pkgmetadata>