gentoo resync : 20.03.2021

31 files changed, 161 insertions, 51 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index a6d0c2053617..0bcf90f2731e 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 1771a4ae9b2e..2277a1135da4 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -9,9 +9,9 @@ DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c
 EBUILD compiler-rt-sanitizers-10.0.1.ebuild 4490 BLAKE2B 5bbce4ab70e2b1434698eae6a37c529c7ffa58ae90236c0ddef3023a00cf1bb6d3ed8b3ae767b81f0abb9759e33fb5e1d9e8f755505db72ceb9cc46f6cb1a179 SHA512 fda208adbbb4fa7e14d3a27956bce3a809c202ecf5eceb0fac956a0ec0879579f8f94f69172cd934481a98d84cdc36ea2fdc46b8ad906dbb48795673d2d7c4eb
 EBUILD compiler-rt-sanitizers-11.0.0.ebuild 5092 BLAKE2B 243f8ddf60558abf5d1ad9e6a1e31333769d1e0e33ff401c915b243297583de8f21be8ab15605a2744a981ff8cd0d1ba760aafc7bc13c43586a901b6050fd0a6 SHA512 04af5692fd79ba8fe51d69664d09f4c2ef2546559a5e5538363d22dbfb791e0f313ce289fdb56dcbfd116e399a3d34dab293a1f355acaf6700bb3003bd50e729
 EBUILD compiler-rt-sanitizers-11.0.1.ebuild 6080 BLAKE2B b276c7e47eea0a950ceb0aaac11beea427cc91e7c91adde1181fdf47e0aaa454ff9ede64ca3f9cf348a8e80336e916c26faf3c4318a42fc30d0a2f3856104c3a SHA512 75dc8e9bc49d82e5a1aeb2ff1b385095e9372200feeb8f3e0ffa2425f638ba89017b4a0262b57e6f24484ec39e35c3225def76f3330bada56cbcdffcbaf0e768
-EBUILD compiler-rt-sanitizers-11.1.0.ebuild 6084 BLAKE2B 3c3ae974c0f1e9fea3ea102c8108c11b906db7a318af1210ef0b13e3b34cd7352d8645edbb5346b6b8b4f814f28449b3d0d0bbd397717ef00701d73b2dac8130 SHA512 7a24a080c33fcf574906d10e332a3faedb94853bce6c667b9afa6a1b4b59164e014aa9cca533dac8fedb1c6a666eb3cff8ed8211b84f03666aa49ac1f4bcf542
+EBUILD compiler-rt-sanitizers-11.1.0.ebuild 6083 BLAKE2B 6ad663e46a03683f5b2be6b910418e40151e3205b62cd50d575d0bb8a3b74564b23e1f548dbcb9f99b3381bf1362f276581565e476ee590afed008c6ad198d60 SHA512 8e9dfa7b2058b47e91fd2f9e2dee036a7438df89017a26ce4a245630afe64409415285982db96889ed9a22e880c7b5cb205fb50eb682bcb72ddef680ff898fa2
 EBUILD compiler-rt-sanitizers-12.0.0.9999.ebuild 5928 BLAKE2B bb7e0bfb84cd7aa447eab7f0ac79d611b65ddfcafa4539a48a73fc4430178369e5be362bd7f3a2c5a9db9cc7a6b0ed815fd3b45553a06cc1c47493adf4902f8c SHA512 8c7d54a81388e13cea8d72c1cdd9f9828b184e05d06da547ddf90c3a2a23da7dad22805559fd9573f88fa91e21d6dfddd59b1c83f00002a31c590c023fe6869f
 EBUILD compiler-rt-sanitizers-12.0.0_rc2.ebuild 5928 BLAKE2B bb7e0bfb84cd7aa447eab7f0ac79d611b65ddfcafa4539a48a73fc4430178369e5be362bd7f3a2c5a9db9cc7a6b0ed815fd3b45553a06cc1c47493adf4902f8c SHA512 8c7d54a81388e13cea8d72c1cdd9f9828b184e05d06da547ddf90c3a2a23da7dad22805559fd9573f88fa91e21d6dfddd59b1c83f00002a31c590c023fe6869f
 EBUILD compiler-rt-sanitizers-12.0.0_rc3.ebuild 6003 BLAKE2B 90595ab86e646385cf823452958c3f052093d12990c310917d55cff9f22c4e5a93e905e6e6731f31f8643340ccea08b46bccdb77dc8ebe9bf94b5e6bf313d3e8 SHA512 a0e0d604a1b87d07c262bf6ecdce01d5a301f3a6cc0d2192ffc0af671851a74cd167bf0b653e246f2a2429a796c3b69ed4f02724a3070993c43afd15b626aa0c
 EBUILD compiler-rt-sanitizers-13.0.0.9999.ebuild 5928 BLAKE2B bb7e0bfb84cd7aa447eab7f0ac79d611b65ddfcafa4539a48a73fc4430178369e5be362bd7f3a2c5a9db9cc7a6b0ed815fd3b45553a06cc1c47493adf4902f8c SHA512 8c7d54a81388e13cea8d72c1cdd9f9828b184e05d06da547ddf90c3a2a23da7dad22805559fd9573f88fa91e21d6dfddd59b1c83f00002a31c590c023fe6869f
-MISC metadata.xml 1341 BLAKE2B d850193d6899816f33ec45aa714a9edcc04c668832a4148881ada810565cab45066e61d5b365b15ced7864220ce51cde31a559e4dadb83dc935955c9a68389ec SHA512 9fd1c971444f1d6dbd0b0559308a269385b0842767d97d3619b20b300569165cd807e52412d36d6ca9427a5fd5788ae5a19ef7d5c1b47cc73cc4eccf20b3fee7
+MISC metadata.xml 1341 BLAKE2B 27ba2b57b7ba21538680b5535aec8b0e8e772a040b25ac8c9285765ed00a485a01ce6dd47c32686c7d162d072f4d6d7d2e1a790e9bd867b61a460b01ad79bade SHA512 909a922e1b0e9649534d88bb7692b1d1d7a9d3d539a4926054dac834d672da065cfea5b2aab02dd23f2a7b0dde0eb0b10ae453990c3ecf99ec20f6a2d2bdbac6
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0.ebuild
index c877ae4241f1..726f400a85f7 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+clang test elibc_glibc"
 # base targets
 IUSE+=" +libfuzzer +profile +xray"
diff --git a/sys-libs/compiler-rt-sanitizers/metadata.xml b/sys-libs/compiler-rt-sanitizers/metadata.xml
index a5d8a2f90b20..b1905bb2cb09 100644
--- a/sys-libs/compiler-rt-sanitizers/metadata.xml
+++ b/sys-libs/compiler-rt-sanitizers/metadata.xml
@@ -5,27 +5,27 @@
 		<email>llvm@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='clang'>Force building using installed clang (rather
+		<flag name="clang">Force building using installed clang (rather
 			than the default CC/CXX).</flag>
-		<flag name='libfuzzer'>Build fuzzing runtime.</flag>
-		<flag name='memprof'>Build memory profiler runtime.</flag>
-		<flag name='profile'>Build profiling runtime.</flag>
-		<flag name='sanitize'>Build sanitizer runtimes.</flag>
-		<flag name='xray'>Build XRay runtime.</flag>
+		<flag name="libfuzzer">Build fuzzing runtime.</flag>
+		<flag name="memprof">Build memory profiler runtime.</flag>
+		<flag name="profile">Build profiling runtime.</flag>
+		<flag name="sanitize">Build sanitizer runtimes.</flag>
+		<flag name="xray">Build XRay runtime.</flag>
 
-		<flag name='asan'>Build Address Sanitizer runtime.</flag>
-		<flag name='dfsan'>Build Data Flow Sanitizer runtime.</flag>
-		<flag name='lsan'>Build Leak Sanitizer runtime.</flag>
-		<flag name='msan'>Build Memory Sanitizer runtime.</flag>
-		<flag name='hwasan'>Build Hardware ASAN runtime.</flag>
-		<flag name='tsan'>Build Thread Sanitizer runtime.</flag>
-		<flag name='ubsan'>
+		<flag name="asan">Build Address Sanitizer runtime.</flag>
+		<flag name="dfsan">Build Data Flow Sanitizer runtime.</flag>
+		<flag name="lsan">Build Leak Sanitizer runtime.</flag>
+		<flag name="msan">Build Memory Sanitizer runtime.</flag>
+		<flag name="hwasan">Build Hardware ASAN runtime.</flag>
+		<flag name="tsan">Build Thread Sanitizer runtime.</flag>
+		<flag name="ubsan">
 			Build Undefined Behavior Sanitizer runtime.
 		</flag>
-		<flag name='safestack'>Build SafeStack runtime.</flag>
-		<flag name='cfi'>Build Control Flow Integrity runtime.</flag>
-		<flag name='scudo'>Build Scudo Hardened Allocator.</flag>
-		<flag name='shadowcallstack'>Build ShadowCallStack.</flag>
-		<flag name='gwp-asan'>Build GWP-ASAN runtime.</flag>
+		<flag name="safestack">Build SafeStack runtime.</flag>
+		<flag name="cfi">Build Control Flow Integrity runtime.</flag>
+		<flag name="scudo">Build Scudo Hardened Allocator.</flag>
+		<flag name="shadowcallstack">Build ShadowCallStack.</flag>
+		<flag name="gwp-asan">Build GWP-ASAN runtime.</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 19db538b496a..b1676d08f9df 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -9,9 +9,9 @@ DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c
 EBUILD compiler-rt-10.0.1.ebuild 2759 BLAKE2B ef75dd0b6d96bf2dfb562ac59bc6bbb8aebc69684dd3acf302b4700fad90fd80e62088b0c141aa23958ec7f06dafd01f6d5f451b4c995fb01541eb1a39dcb127 SHA512 51a5c6fcb385651f5d91d5985396f176fc7405fc4a95321a8ff896f8c22b922bfc987aaa5462a6be3df3ee2ac179633226e97955b4ffd486ec414a4e82e9470c
 EBUILD compiler-rt-11.0.0.ebuild 3541 BLAKE2B d9847d05f37311727267169e5798e2cf3af779a565776b273e0041434774cbcf9544a85fd5ceef555326f59a94ad2a1978581529689a6c46d160937dbd2d7b8f SHA512 940e19da15e1f9af55e978155152e3ee65216c16cbfd96b32a0ffee2df5f7bf1ab1e14b3f214df858b116aec810f9ddef9a5c21d11d3f33eb56ea16116d69e7f
 EBUILD compiler-rt-11.0.1.ebuild 3544 BLAKE2B c12af62e30475143bd86e5b87042003bb9d1dbf3918d566210c7593ab12168095bf9a0f16f185e613c33c48a101e209b55288015b0b8c45168cc3ac098d805ca SHA512 5464a523dd54dc9dddc1de15a657c1f07dad4ab64cc6bbdab13cbf315451614400730281bd3c7c6e64580d003ca57bf074c061cd224a5a6a32f19c2157b31c3f
-EBUILD compiler-rt-11.1.0.ebuild 3548 BLAKE2B c1f96cde71af8b605056e827c750c5dfe07382ecf494dca1f5d689fc3a8caff18d8ac595f6d47b7b9f9fec8e7cbba3ddcbb07176958ffacd541b314a3baad587 SHA512 bafd2287d7d07ef083e0aed54f76d8c82d7fa317a5432cb9e1ad8c05bbf78c6577178d42e278dafd92bb0f0803031c25038c0870a51008ca7b22a396ebbfde8a
+EBUILD compiler-rt-11.1.0.ebuild 3547 BLAKE2B fa31c4be8bf49c9c803659cebc09d3caf3390da23a73ae925f44bed2c1026e8e80ffc753f02a418280a97f1b89bd7d155255da4ad6e09dca487142151e7b518f SHA512 2b6f62b854fef02b14fb0bbfcb88f80cf6a8cd632ff111c0bd5912e9518e4a26778c7eb86567fee06bc98810986a703aa675a9c79739b5edc0805a6ec7d177b9
 EBUILD compiler-rt-12.0.0.9999.ebuild 3508 BLAKE2B 6ab25dee0e7088ac9c5cb422e40d82b2ae03df25c32201c309c509a58f6381de4319ec715539f5752828310045a1e3ac2d237e7a8616584565eb17b6b9741e00 SHA512 c67bf80040a90a161e364c01057c37fc4e9858f1bfbb9b00ea9601e1844d74e0c1e5c0b629a061efe7b8c620cfe37eeeb32284da00b252283491f6538bdc5d7c
 EBUILD compiler-rt-12.0.0_rc2.ebuild 3508 BLAKE2B 6ab25dee0e7088ac9c5cb422e40d82b2ae03df25c32201c309c509a58f6381de4319ec715539f5752828310045a1e3ac2d237e7a8616584565eb17b6b9741e00 SHA512 c67bf80040a90a161e364c01057c37fc4e9858f1bfbb9b00ea9601e1844d74e0c1e5c0b629a061efe7b8c620cfe37eeeb32284da00b252283491f6538bdc5d7c
 EBUILD compiler-rt-12.0.0_rc3.ebuild 3508 BLAKE2B 6ab25dee0e7088ac9c5cb422e40d82b2ae03df25c32201c309c509a58f6381de4319ec715539f5752828310045a1e3ac2d237e7a8616584565eb17b6b9741e00 SHA512 c67bf80040a90a161e364c01057c37fc4e9858f1bfbb9b00ea9601e1844d74e0c1e5c0b629a061efe7b8c620cfe37eeeb32284da00b252283491f6538bdc5d7c
 EBUILD compiler-rt-13.0.0.9999.ebuild 3508 BLAKE2B 6ab25dee0e7088ac9c5cb422e40d82b2ae03df25c32201c309c509a58f6381de4319ec715539f5752828310045a1e3ac2d237e7a8616584565eb17b6b9741e00 SHA512 c67bf80040a90a161e364c01057c37fc4e9858f1bfbb9b00ea9601e1844d74e0c1e5c0b629a061efe7b8c620cfe37eeeb32284da00b252283491f6538bdc5d7c
-MISC metadata.xml 333 BLAKE2B 24e417cb7b8ab7730b18a3e1e5e29d008042e4fd53cf1ba3cc9d18719160b0410854ddfae52315c690138e61fb0196015968fa09b98af6470cd8bdecc09205ef SHA512 97daa7452a696b7297c47f5f637a33425f82b51426060a75b3de6bc812f9ddcd3c70ae068bc3e88ce937ab1eb10d59b0ab48a2d2c0397a112b8b6a754e333bdc
+MISC metadata.xml 333 BLAKE2B fc411d2ccf9b848ed7ba71d6a1eb01c54237a38e3c612c22d39549f6b23ebc3179dd08c855852a72b9a4f4ae89418a078048702324df27b4fac11c36e80f846b SHA512 ca50c4e5ef7d52c167bca6a4ab2961a1f7f82d0e84722ec65b8ae44d0ff8a4a7db1dce630f6f18f7b526f77c432af7ebc9a29564659631bad1e3900b6f1df49b
diff --git a/sys-libs/compiler-rt/compiler-rt-11.1.0.ebuild b/sys-libs/compiler-rt/compiler-rt-11.1.0.ebuild
index ed8d7713b352..2503f211925e 100644
--- a/sys-libs/compiler-rt/compiler-rt-11.1.0.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-11.1.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+clang test"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
diff --git a/sys-libs/compiler-rt/metadata.xml b/sys-libs/compiler-rt/metadata.xml
index 3b996021381a..f78b121d9105 100644
--- a/sys-libs/compiler-rt/metadata.xml
+++ b/sys-libs/compiler-rt/metadata.xml
@@ -5,7 +5,7 @@
 		<email>llvm@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='clang'>Force building using installed clang (rather
+		<flag name="clang">Force building using installed clang (rather
 			than the default CC/CXX).</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-libs/fts-standalone/Manifest b/sys-libs/fts-standalone/Manifest
index 3d41bf683913..16323f3e741c 100644
--- a/sys-libs/fts-standalone/Manifest
+++ b/sys-libs/fts-standalone/Manifest
@@ -2,4 +2,4 @@ DIST fts-0.2.tar.gz 339498 BLAKE2B 3800196fd67d03c5e732dec1cf6aeee85d417720c3e89
 DIST fts-standalone-1.2.7.tar.gz 19336 BLAKE2B 045cfc32dffd18b58093dfe578a029ca15083eec98812ea2849acf37fd2c8e7272840b15b4966201421624d96ba69208a36b58d5420cef2563c107cfae98ea93 SHA512 949f73b9406b06bd8712c721b4ec89afcb37d4eaef5666cccf3712242d3a57fc0acf3ca994934e0f57c1e92f40521a9370132a21eb6d1957415a83c76bf20feb
 EBUILD fts-standalone-0.2-r1.ebuild 529 BLAKE2B 827b54285e26354155bc0ddb7baea086642d192a5245c039f344b4004d98c32204c3688bf4f3a2e6c74ef5952200cb1bc246e84b7582812c4699399cb5b943f2 SHA512 8054bb5de4170dc8890b058713dd5ca56266e629c8a2e4e83fa17bbb572fa54eabc3050cbd32ebdf293bcb7de99d0e2ff6b9f935a3c5d0138de4ceed3f021917
 EBUILD fts-standalone-1.2.7.ebuild 739 BLAKE2B d5c775ccb42a8a803389897ca19ccc474dedb017cf7af17a4fa0fe94627b30a10bf4ba560f9217b58b0d342eb10130521b07aeb67a0d40ca9424444a756516de SHA512 1546100a8a6b394685188dd00100feeff9550777304cb32442fa6a6518061a6f486e1bef3d977ea7d97b9ec4d0dacfa06441d48d2f8658758693fbfb11f4ba62
-MISC metadata.xml 334 BLAKE2B b0cf07fe22c503cef4450546f0825c6e72df4e7b6fb85de9bc7d6e206e96efbb0f2d50391aa1fc3d5ffb6376aa290481253ca2ff8762bc1686b6057df9401d76 SHA512 f42362781a8bd718ddb3cc00aba96d8f7c5104a3dd0722cb189e827d2c0f7e78cec8d7dffbf3cf9ee82b5fba00330427486ae48247e3a2b3c0308e68d45702ab
+MISC metadata.xml 334 BLAKE2B a37098ad8340db9ffba8dbcc3831d0749059da31021e7a2115e29f461a6fbde4cdbf380e8e10dc17683931ee3eeae7d1b7877af9368f2df1edc3cf1b4810c4de SHA512 3e4a4dff13bfd8e0f1c034568703338706e172de89cec89e965b7b4b1e7f60ab776fc719f3904ffc7479d6c1f378998c7fdc234519934bd9442e3bbb3cfe44c5
diff --git a/sys-libs/fts-standalone/metadata.xml b/sys-libs/fts-standalone/metadata.xml
index f9ca28f3ecc6..568c8bd97d21 100644
--- a/sys-libs/fts-standalone/metadata.xml
+++ b/sys-libs/fts-standalone/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index 9a112340d1cd..e2b6402523e4 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -5,9 +5,9 @@ AUX libcap-2.42-build-system-fixes.patch 6518 BLAKE2B 138347d98901a0a41c36a3f3e1
 AUX libcap-2.45-build-system-fixes.patch 6618 BLAKE2B 0f18fbf2ba66b0b6131b4f1b9df1005ddeccda31ace7085104531cf57c09d7d2f7ed1aea489f9ef6f2d9701c80acae94265a08aa25951fc6fa95820d0441f789 SHA512 738090eaba52eed82bb8cbf1f3a9a440a1b2e409e875965f8499e78047faad21476e9be42e3707f968e3b5d633b0581b27e09f101b0e4de26abeaf58c7b45e33
 AUX libcap-2.48-build-system-fixes.patch 6274 BLAKE2B 4c81eb50b0a682ca9df03145a53e884589e0961e1b754b522f40d48fca60fe983ae93349d256e62977bf28c99c8c25763d05aa8483aebfc436664756a220d70a SHA512 5b88a5c5ea14d2270ed4018249ceb32b0c91db03ed18a6989cc44250da91887385dc3f37087f716771ddbaa90c7e3d733a64063507465eb354252d9f64b85f80
 DIST libcap-2.43.tar.xz 125284 BLAKE2B bde36f8397f4adb74760eb403daa06bee1b8f45ddc253cc3c3ef1f6e95d0e4c76d0f2e6fa3335a8bc451f18ac7128c96230f6aba9ae0320fa4f9d669e7b4f715 SHA512 817add571fb2c54ad2a39974e6545b8fc8d855ecdcf2e00b2cc10e583802c49dfea2d8bca484c89ecd574fdacfc46565b51e3064a4407cf1985defb913240d45
-DIST libcap-2.47.tar.xz 131960 BLAKE2B 745bd3ba9819a1582880dff81d94ccf198fcf3f89d776ac0ce3055535e5370a0be57c5efdf7287f99ed50189af14ee46e90805d0a324f92d394211ffc6d7002d SHA512 cfa4aaa82b7dbb76e38cd207401603582343b14eb91d6df23e0ea6698d0ec0ab2b368fe0d08208a014a1b1a68d11316ecefa45c27983f9ad95e7b8184351fad8
 DIST libcap-2.48.tar.xz 132280 BLAKE2B 43ab75b73a5297ec24467fae82378f8c7aba5356afcebfb32a695d664a4b5268526fd90a009596c0f516a626d8f4523a9b49ec3225b6a886da32e62eb5b55ea5 SHA512 3cb1e2b026c0f60d6f225c7255944d45023e59fd065b8f832739fc90d33b3347981675de12dd705c4ecbd647a494a17daf39e1d92599bcd1a83306886edadba1
+DIST libcap-2.49.tar.xz 139568 BLAKE2B 5746dcdf2a737e747450bd50a701ee8543277b17b7fbf1304b79f707a088ea74dc6dc79c61ff89b55b718a460a7b0814f960f44d07944a97b832b78f4e14e07f SHA512 2934a2ded1370edeb9603dbf43d8ca23a2eb5d67efc5cec5d4ba96c707a8db2702da8aa9be0cb86c5ff100d37ec96115c7777a7566ad0ab2e0b4a288bbe357d0
 EBUILD libcap-2.43.ebuild 2172 BLAKE2B 94abe1f5d3ebb812f67f7d1170c4f1fa9766b75526ac1a088bd8019b76c76695784b8d57f5740f0c684f8a3fe4440bf8b61f5eec3fbfdd1bd1eb7543fe8710f5 SHA512 7593c942c3650af81cbd905d97f5265efb53a16ac9bd9156eada840ea10c85e64de2464fbc4088306a73e3761a1606f8000e9a95e9ee36b15db741e33aa08612
-EBUILD libcap-2.47.ebuild 2211 BLAKE2B 039b339674c58e2ef751d351e1aee338a780b7c41a41733403a3930dede8e9dc40fe2ad2baacd64f95f980f62a788d84e6d96484dd71deb777787b22d4309b5f SHA512 527ae893595d258eee71fc88b9453c66397d006c97afe3e6e17e857bbc212f6e454c4ea41de09850004e20118f7975185c84a8e5f8ce7369113c56ff9c18af52
 EBUILD libcap-2.48.ebuild 2211 BLAKE2B 0fcb26a104e587f7eff0748d418adc37ed827740f1c0ae1e1047271683f69c1dd9a5079c5d6a1d68be0b7b31d4b4ad4ab22f42dc361076e6467c343bf4e19e7d SHA512 4db06e0129107b57def2ad8329b6b9c882408f8c51ec2359e54f936590585b6569f59219255bbc587083343e2bfede40c5faafb5ef04afda110d9d4caf927236
+EBUILD libcap-2.49.ebuild 2212 BLAKE2B 626c3af7ebdf8f55f5344ecaa8d7278a24cb5993eace8722ab4efcfa30772aa8618a0651d0a16ce7b2f1791ceab19319e37fd5314846502ae46ba01f7ecd3089 SHA512 e95d9c43b005e541699fc3ced59191dfedde0859dd849095493d5f73a41ab19cc02a5f7e4df3b6b05426e809970e521f2afbd663c54608956fe82473a916f0ed
 MISC metadata.xml 332 BLAKE2B 2177c836192a85a6d943221da405f7f11f355011767789d81009d5e4d822a203302a946fa1a0ffbc66be6a37a7069aa94a796125fa1dedbdf023762b47f8f614 SHA512 a9887500fd60b72156ac2589b1fefab8dd70b0c03477dd795f147fdc91bbe6fd027b8cf58c3e86cdb6e831368d34b4881cdf0e833af5aee9e7d1a01e90408ae1
diff --git a/sys-libs/libcap/libcap-2.47.ebuild b/sys-libs/libcap/libcap-2.49.ebuild
index e74b1a5547fc..72541ceffde4 100644
--- a/sys-libs/libcap/libcap-2.47.ebuild
+++ b/sys-libs/libcap/libcap-2.49.ebuild
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.45-build-system-fixes.patch
+	"${FILESDIR}"/${PN}-2.48-build-system-fixes.patch
 	"${FILESDIR}"/${PN}-2.38-no_perl.patch
 	"${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch
 	"${FILESDIR}"/${PN}-2.21-include.patch
@@ -78,7 +78,7 @@ multilib_src_install() {
 		rm -r "${ED}"/usr/$(get_libdir)/security || die
 	fi
 
-	if use pam; then
+	if use pam ; then
 		dopammod pam_cap/pam_cap.so
 		dopamsecurity '' pam_cap/capability.conf
 	fi
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 05811a542559..3214d734ed8a 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -8,7 +8,7 @@ DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c
 EBUILD libcxx-10.0.1.ebuild 5966 BLAKE2B 230f37223e113c8f17020986b4fe65478d2bc65c5b4236f9709e556159e9118d0659172a59544b1767d9d55884549b51592d45fded05a91bf0e8762388c1baaf SHA512 4cf81cf1a0922d50c4357811169d4c2eda890ed6636fd2a0cee47c7181434bee76b36411ab487ef42d8179650d3c379336ad6c2ec1d18f109338e76d38e82f9d
 EBUILD libcxx-11.0.0.ebuild 6830 BLAKE2B a57ee66a8096c4456483bbb2a1d67a7e153dce97bdb7eb6a2d8e5ec5ac839d28c7c43f315f8399a5dc5bc157bd8b08cde156e1b3e962cfd05fe95dc6ca811929 SHA512 abaa0922a39380b3dffb65ea8a2c4774ae8c2fa561e9ceec30e70851779a13aedb2853bdf34c7586656dd389fb7b1e0c7dda9ac9de23ae52986b5392dd8ff12a
 EBUILD libcxx-11.0.1.ebuild 6831 BLAKE2B e1b3768dce61c69f4a4f4e7be022966b229e7cea11b1c24351a0c25a1ffe57ed8d4d04c20ce8811f39694849a52c20b980f664070482ffcbaa4e6b431fc8b414 SHA512 afb1ac8b1e5206c0b7988f9fc2644531b486840791beb8e997dfbd5c82a95cc3effab27fc28269d362d8c40873c1d0caf560c1e6a36880f6da72c28909f66802
-EBUILD libcxx-11.1.0.ebuild 6835 BLAKE2B f6d1949fe821d3038af20faa593e8e8f1f99495deb2d58a00670b0273debb5a1a51112cec6e5f4bd5cdd4f8796f18fdc6c5dea709b42c3fe4c0a340c79a11fba SHA512 d64fd24069e39f8e00cfcc463e7c31fde0c432d2bf282153063ff3aa0d2cf485be1fb649da73133f01b420532807b9623f5795e65cafefc3cd6731f2ac2f50a6
+EBUILD libcxx-11.1.0.ebuild 6834 BLAKE2B 159ae462f29a3a5c9776d9176de1bbba916171e47875053b3f472407ec20b6176bca9dcee6fbcbba493b91b78b5cb415f2805c79b3513c70885bdb75854fed81 SHA512 a051209facb4b7aad7ff115704bd7216d0d500c00d4072ddd598f91fc6eab5a85e28cfa3517628c48f4c58a409a4cb5a3db723997b7b6cdf7bf6116bfa80ac87
 EBUILD libcxx-12.0.0.9999.ebuild 6794 BLAKE2B cdde8697e6c974e68fc5ef47027ae108386b72c1e4506550f94984cd8dcc836dee6823c9660d252a73c8acfff5c1084f32bfe44247bfc2c3f6998f3d6dbb5f0b SHA512 cbc5f18d8be0ab2ab0294e33dc528e6a306b5abcf5411015cfa48427e4dbe10b614ebd38da03dc1b3127ca892de5ab9484493e3cd10d1a52f6d8abaa74ab2ab4
 EBUILD libcxx-12.0.0_rc2.ebuild 6794 BLAKE2B cdde8697e6c974e68fc5ef47027ae108386b72c1e4506550f94984cd8dcc836dee6823c9660d252a73c8acfff5c1084f32bfe44247bfc2c3f6998f3d6dbb5f0b SHA512 cbc5f18d8be0ab2ab0294e33dc528e6a306b5abcf5411015cfa48427e4dbe10b614ebd38da03dc1b3127ca892de5ab9484493e3cd10d1a52f6d8abaa74ab2ab4
 EBUILD libcxx-12.0.0_rc3.ebuild 7002 BLAKE2B c3277780ae78ff0e1ed5affae0b76b89b6bb5d9782edc535a2092541b9ab2a745b33c2535a8c75317320c61cf6ee57216f575195cbd21bba2c3c5967f541bc30 SHA512 169a0c2ccc298989f0b2495675c93a4d908de03c94c10b1bcc0a825a032c98f8d3ed5b4e854ad4c9d70d6c4384ba084134ba0dbb76a09e5a51dcc4b795501d70
diff --git a/sys-libs/libcxx/libcxx-11.1.0.ebuild b/sys-libs/libcxx/libcxx-11.1.0.ebuild
index 9414c15c0f46..26e9ff250d52 100644
--- a/sys-libs/libcxx/libcxx-11.1.0.ebuild
+++ b/sys-libs/libcxx/libcxx-11.1.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://libcxx.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
 IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test"
 REQUIRED_USE="libunwind? ( libcxxabi )"
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 7948f4162706..a2e0d9896a6c 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -7,7 +7,7 @@ DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c
 EBUILD libcxxabi-10.0.1.ebuild 3237 BLAKE2B 828cabd1bccb0f7dc672648fd1143f1913df2b3f075194da3b053413ad8e0ff8f8669ce6263fa51ed0b02702e0bd611a77f4009e57a7d2659362db21c5665e4e SHA512 b9fef273fea1343aab604c3606fa4b9ed340e0e6f649e68f81f1285d96374f440ab787937b203ee5eba5b8e867a5926b48f63d8739c326fd1a646193635dd65e
 EBUILD libcxxabi-11.0.0.ebuild 3557 BLAKE2B 17ffd28ae4044bfa72830f1ee5614e2d89e8b3382c6fde88e6725bc5ef9bb374632c4abefa334931e8c2c52e232e0b4a74ea53be59d777acc3a80f33290ee499 SHA512 bf185e151c0926ccf5e87d30a4f42f1b4a6fbfe175c7cd40ce0f2abee0b2450d3fedf74366d786796ccb55193ad7ffdd01d9a9c6ee97529bf9f6dc7080ae6289
 EBUILD libcxxabi-11.0.1.ebuild 3559 BLAKE2B dc74318b252f772fbc6833e413ee2dd9b682c01ae3bca88a78d2f7854aa374311474f7af9f19453e4b4fbb6db4149e8330db7632faf710a0aeb2e0d741119096 SHA512 18632637cb6fb86a3c003ba66f6a80aece299f50e356870599bb932fa100ba3e51293cee71576cc994a7e2b5f56f3b4ec8b4d3eae6202322d50a9bc0aa922ac3
-EBUILD libcxxabi-11.1.0.ebuild 3563 BLAKE2B b7114186df8da65e7c1297d41aec60b5bff2372ac319f15019f84eaa0f1459cf2788eccb01bbf75df383d50ced4e9e6722ac4d20abf69afcdb76d9c78c6cac9c SHA512 663e88359e06cd7d146b6f1bb43ea0235241b4f77cf559036ba0c1c6e4d99a9b0eda48a5146aafd798055f0a164e2eea21742593c405a7e54d852edd2e581ade
+EBUILD libcxxabi-11.1.0.ebuild 3562 BLAKE2B d9365f694b49f0bca2a0ca395e2ac88c85bb779a044885cfa606f02c69c54d85ba2e1a848bf9d21bce364adb1595b38c1734ef6ba59ed644232d68066e38003e SHA512 ecc2e706fc91193b0e5e87d39a4d53a96947bb9c623728be2705c3f3ba12618c39560460f8fe73e2d2adf9857b7e3c89bf59b541d236871107270b24b25578e8
 EBUILD libcxxabi-12.0.0.9999.ebuild 3505 BLAKE2B fe4d762e646ab8a6daad3ca1da7d63c34ffb6735a6bb6657e03e724428422706d821057715369cd818ecc696453620d7f2473535ac031ec0cc0a5bc6f4ec2186 SHA512 40ce77407d30efc2ada70d0166bcadbc4140e33275ecf537dcbd7580e3e8fc9ff030a29ba6be4a67bcadc9835ee8b1a2cd3fef07085c57df4792c04b445b0d7b
 EBUILD libcxxabi-12.0.0_rc2.ebuild 3505 BLAKE2B fe4d762e646ab8a6daad3ca1da7d63c34ffb6735a6bb6657e03e724428422706d821057715369cd818ecc696453620d7f2473535ac031ec0cc0a5bc6f4ec2186 SHA512 40ce77407d30efc2ada70d0166bcadbc4140e33275ecf537dcbd7580e3e8fc9ff030a29ba6be4a67bcadc9835ee8b1a2cd3fef07085c57df4792c04b445b0d7b
 EBUILD libcxxabi-12.0.0_rc3.ebuild 3505 BLAKE2B fe4d762e646ab8a6daad3ca1da7d63c34ffb6735a6bb6657e03e724428422706d821057715369cd818ecc696453620d7f2473535ac031ec0cc0a5bc6f4ec2186 SHA512 40ce77407d30efc2ada70d0166bcadbc4140e33275ecf537dcbd7580e3e8fc9ff030a29ba6be4a67bcadc9835ee8b1a2cd3fef07085c57df4792c04b445b0d7b
diff --git a/sys-libs/libcxxabi/libcxxabi-11.1.0.ebuild b/sys-libs/libcxxabi/libcxxabi-11.1.0.ebuild
index 7ceb778be532..41331ecb05d2 100644
--- a/sys-libs/libcxxabi/libcxxabi-11.1.0.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-11.1.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://libcxxabi.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
 IUSE="+libunwind static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 3ba3dbf51ae6..94b3188c1850 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -7,9 +7,9 @@ DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c
 EBUILD libomp-10.0.1.ebuild 2893 BLAKE2B 6085966e4e392ded8492c6b398d3a14ba5205aee8ecf3f63d0853e463f1bf007ff3b3c31555eb7cb566cc8c4bdc580e9d0ce38ca7cd58785820a7949e2969024 SHA512 e1b7b17dd0800908adbb06b29c7ef2d5bd73c66784104b554c59e5c5176c9c49c5432e0ecd72c6e3c00e71def839342cbedbd666f3886afa3ea92d8fc94ba591
 EBUILD libomp-11.0.0.ebuild 2900 BLAKE2B 8dd6c10719ec67cb10e15610cb99276e8e802994a19c3e3028e365458fc02cb2514cbb6032a1d62528776d31a023de81a08935f923520c1d4ec055e285aacf1b SHA512 855a5730ac4e786506ce70d92bf7c46e11531ef73e0a663e9512b9861e7bdf441113a484d1aa583313f6990bfc81e56eb536dcf8d81d95a8375a3073efca2ebc
 EBUILD libomp-11.0.1.ebuild 2902 BLAKE2B c032a2c7ba9ed2237c14ba6ba0f7558369990e29c96a3d0ef97e3f94492c6042bc626fca813718441ce2de3f44e3605331cc63d4d7db8677ddd6ed7539359cdd SHA512 0e70d6b1b84232b9090c069c437d40dd83a76177b5c3b4048a3ea3a52e4f50ef1d6de68fea78b0e7c8d79ca2f9fb876053219114829e6853c3e021b345fd4d79
-EBUILD libomp-11.1.0.ebuild 2906 BLAKE2B 532bba9092f082b646fbf7d22c929568e8e763d9ed23b23e5ec6691fe8b5188f359d592892fb2f35768354d722470f538a54285dbac0170e7589471a50d3d836 SHA512 541d34bdc48d88dc140aa7510e8696a2c139347ba5b99f7023582de2bdadfc8e69e204998890598a5fec09aa4c01429c57024fce4a35f9cda90b8961c1fc9afe
+EBUILD libomp-11.1.0.ebuild 2905 BLAKE2B 1a0e17f861b690031143fadc3f93c0a9def81e49b2c2786b085e921eb0ba93de7372a2a85ee1adbecc6ea877696e7912052e1b3ff78341b81e6e20f5e7a4c222 SHA512 c2365e3ed12b208478bb4ea064bd8899ebabbbc620877de074daed04678df9a4dc528be233a72ccdb26742da3c0c7f8460310991a37f56caae18e5cbae29356b
 EBUILD libomp-12.0.0.9999.ebuild 2858 BLAKE2B 7e0c70445e2822d34c0f48f99debbe2f99e35601cfc3ce8e5d5a22888b29b6af5ca5090c66ebc7fb77990e2fdce37b958a2803d2a4be7e626359b48a7ad68c01 SHA512 8c7c35ed7c2d747d0d47a0d9588f2486a93852f31e7e1120688f41b09089e9507534fbae5d609b18bb28899de7dce2670ea1b87eb2e90cf06bbc116cac7daa22
 EBUILD libomp-12.0.0_rc2.ebuild 2858 BLAKE2B 1472a9384d0b92de2402af12c14ea7225aab79198114290c1511b12df7bd63956f95c40791928f85cc67a88c92f62059ac4d4fda1f7a0c3e831a33d827ad19b7 SHA512 2524adeb5ce85b79ea591e273631ffb65bcb8e409367bb7db8a38e9368622cf39d6d7ca2d200b7a57ca125081844ebdc625fdda33193f64e1af0c93ed0f48a22
 EBUILD libomp-12.0.0_rc3.ebuild 2858 BLAKE2B 1472a9384d0b92de2402af12c14ea7225aab79198114290c1511b12df7bd63956f95c40791928f85cc67a88c92f62059ac4d4fda1f7a0c3e831a33d827ad19b7 SHA512 2524adeb5ce85b79ea591e273631ffb65bcb8e409367bb7db8a38e9368622cf39d6d7ca2d200b7a57ca125081844ebdc625fdda33193f64e1af0c93ed0f48a22
 EBUILD libomp-13.0.0.9999.ebuild 2858 BLAKE2B 1472a9384d0b92de2402af12c14ea7225aab79198114290c1511b12df7bd63956f95c40791928f85cc67a88c92f62059ac4d4fda1f7a0c3e831a33d827ad19b7 SHA512 2524adeb5ce85b79ea591e273631ffb65bcb8e409367bb7db8a38e9368622cf39d6d7ca2d200b7a57ca125081844ebdc625fdda33193f64e1af0c93ed0f48a22
-MISC metadata.xml 825 BLAKE2B 07802144018f2f74b0927b53a346f99cbc7e36dbf501bb8dfc786f8d549c10eb688afafb1759f13d4d56d10f1bcae67dfa86cc2047cc39a9655a09a22e9a4260 SHA512 de43d5be94a5ea1cdfd3ae747d55b50d5d6ee577743f55d006d585d2d5acd5b3100845486ac415685f07361cd9985bae9347fff9c65417d198c49a61b4f6ba5e
+MISC metadata.xml 825 BLAKE2B 9c4afd81e02ecba9db7cac8487acf4e9dcbf772d62ee46c5c95510f1c624b52e0005786d06c119d4d7f0bf498fbd9cae2f9200a27ea427c9d6e83a5d74d45c1c SHA512 b2ba293ffb87f06c21172607234e8f69730d8ade0732fe98a5bc876353a01853dbef8cbe0ace0f6a556f2ae7217facee040349b460815dc2cf2f3b48cfd46762
diff --git a/sys-libs/libomp/libomp-11.1.0.ebuild b/sys-libs/libomp/libomp-11.1.0.ebuild
index 80389c54aa07..351b5006feff 100644
--- a/sys-libs/libomp/libomp-11.1.0.ebuild
+++ b/sys-libs/libomp/libomp-11.1.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://openmp.llvm.org"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
 IUSE="cuda hwloc kernel_linux offload ompt test"
 # CUDA works only with the x86_64 ABI
 REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
diff --git a/sys-libs/libomp/metadata.xml b/sys-libs/libomp/metadata.xml
index 58df765860eb..fbce49e0d110 100644
--- a/sys-libs/libomp/metadata.xml
+++ b/sys-libs/libomp/metadata.xml
@@ -9,10 +9,10 @@
 		<email>llvm@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='cuda'>Build CUDA offloading plugin (only with USE=offload)</flag>
-		<flag name='hwloc'>Enable CPU affinity support via hwloc</flag>
-		<flag name='offload'>Support offloading OpenMP using libomptarget</flag>
-		<flag name='ompt'>Enable OpenMP Tools Interface support</flag>
+		<flag name="cuda">Build CUDA offloading plugin (only with USE=offload)</flag>
+		<flag name="hwloc">Enable CPU affinity support via hwloc</flag>
+		<flag name="offload">Support offloading OpenMP using libomptarget</flag>
+		<flag name="ompt">Enable OpenMP Tools Interface support</flag>
 	</use>
 	<longdescription>The OpenMP subproject of LLVM is intended to contain all of the components required to build an executing OpenMP program that are outside the compiler itself.</longdescription>
 </pkgmetadata>
diff --git a/sys-libs/libosinfo/Manifest b/sys-libs/libosinfo/Manifest
index 1cc5e804aade..a1540dfee604 100644
--- a/sys-libs/libosinfo/Manifest
+++ b/sys-libs/libosinfo/Manifest
@@ -1,3 +1,5 @@
 DIST libosinfo-1.8.0.tar.xz 273324 BLAKE2B 0d289df4eb1eb0f9793227b7925cfc37e253a4db0da5c420e7b058d4c060ae50a5609bd25f7d07822e0110e535561f675cf8eddbe6bce0875757f10ee30b2c22 SHA512 1d831443af9eea6a5ba1edccafcd47e56fc55e3cc43c0572044abc9c70c4eb8bbe0d95019d42bbdc3b680a2f52511863412ea9587c6eb553353b3802e94b2960
+DIST libosinfo-1.9.0.tar.xz 279376 BLAKE2B 9f231f022d80e96fc9b031ff8f16ea1e432e5e3ce079e384ad123043b89dd5e47ae119aec3052c8926965bf30c49b150f0ee727fb3b0e0391d393b1031aabeab SHA512 2e62e69f4353eb935734f091caa4cc4e3dce74020a93b684807470f068da73e8ecb7f4af0623b6d3053ecff3a34c6709a783dec3d25a56dc69f0e7ff9041cf26
 EBUILD libosinfo-1.8.0-r1.ebuild 1517 BLAKE2B dddb734dbb4428417fa830d31f9e1bbc8f165d5d8a6d03ff8e929b3025a8106b1e7a2db2cc4191bbba2e0b77da85768a54a70fb85480569d9a2f772f63e4cc67 SHA512 541d1a76d09bd950909f4b754286095d48af5614e3552d56316272f846d8a5eefc5c8c5fa68d210be69f0c31fc3dfde226097b5dc747e378efef86e52c48d642
+EBUILD libosinfo-1.9.0.ebuild 1520 BLAKE2B b04063d0559ff79ae8c779afe4a9f3a745b28ba8ccb0e363228dddc5b99187559386a46f129dde7facb882a16f1339d8fb547135203131cb998a8ee0f422ab62 SHA512 619dbe2412b7dc5bb3b8a6fbfbe243e631c6e91cd8839b61a20d85061dd4fec518d5697534d03af54f92b735f3092abb6b8bdf408b51350dbabc436bceda9fff
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-libs/libosinfo/libosinfo-1.9.0.ebuild b/sys-libs/libosinfo/libosinfo-1.9.0.ebuild
new file mode 100644
index 000000000000..b019a119ace7
--- /dev/null
+++ b/sys-libs/libosinfo/libosinfo-1.9.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit meson udev vala xdg
+
+DESCRIPTION="GObject library for managing information about real and virtual OSes"
+HOMEPAGE="https://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="gtk-doc +introspection +vala test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# Unsure about osinfo-db-tools rdep, but at least fedora does it too
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	net-libs/libsoup:2.4
+	>=dev-libs/libxml2-2.6.0
+	>=dev-libs/libxslt-1.0.0
+	sys-apps/hwids[pci,usb]
+	sys-apps/osinfo-db-tools
+	sys-apps/osinfo-db
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+"
+DEPEND="${RDEPEND}"
+# perl dep is for pod2man for automagic manpage building
+BDEPEND="
+	dev-lang/perl
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.10
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	xdg_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc enable-gtk-doc)
+		$(meson_feature introspection enable-introspection)
+		$(meson_use test enable-tests)
+		$(meson_feature vala enable-vala)
+		-Dwith-pci-ids-path=/usr/share/misc/pci.ids
+		-Dwith-usb-ids-path=/usr/share/misc/usb.ids
+	)
+	meson_src_configure
+}
diff --git a/sys-libs/libsmbios/Manifest b/sys-libs/libsmbios/Manifest
index 02d5df7557e9..1fdcdd1c8723 100644
--- a/sys-libs/libsmbios/Manifest
+++ b/sys-libs/libsmbios/Manifest
@@ -2,4 +2,4 @@ AUX libsmbios-2.2.28-cppunit-tests.patch 350 BLAKE2B c735096c5fe0e33eec728e28009
 AUX libsmbios-2.4.3-avoid_bashisms.patch 2909 BLAKE2B 426ca128f142307ea89cc5003c298518115805a518b348345f154094e34be932721aa6c880612fa7fe3473bc1156bf7c2dc1ce085dd9511ddeaf58e54d2464e1 SHA512 d2199481d87527ce7e90ca355cdfaf48a859982e67090e248034139b19ce2d61717e9887d246c7bd6b1e46f3f97cf6ec6bbdf04e3091c513221cb42d0f1431b3
 DIST libsmbios-2.4.3.tar.gz 644140 BLAKE2B 684bff4f6cf755796f785e9a93d4ddbe2a1af52082cdebc27d203772a6a2a0259edb4b9d19921f90fc78b48d54700223fbc2628665b963ebcb601010ff4340ab SHA512 7f6fb36fa9653e123b416b275953fb5652025e76dac3b4ec5600168e193ea56f8ac3ea1a3b5db29d2770e73d88152d712a35bf77a9b3fc5596570fae885585ad
 EBUILD libsmbios-2.4.3.ebuild 1788 BLAKE2B e4872329f12b1529e54d562aa55d18b8ec0a8d6e45bdd6104eba316f7e79057cb1a7a1e98791603f9a9c2bee26e0513762bf6e94a2a95904e8efcecd838082b9 SHA512 4c207f4bdd39d352d28d3312fd2e72dac8b4e4b434c3dd5bb96d93ecf12e1f377d8c96e4e4bfdd80a10bc9043df83bc30e23915cc936d75ff73da0d08e8109e7
-MISC metadata.xml 564 BLAKE2B bc9809af663bd6abb97b0fd1e91b520e3827f8d6656f774093944217907c2246bcaf55cb123dca43b2acdcee5aa24657dda9384d3f081c45e82d3c4f5e05e61e SHA512 d32499f8dc915da23ef8ce3b0f799d213d5cf700da8b80c83a94770d7fef72bc22ddbfbecf92e49c8ea0f56c4c2b718e53563a450870a77d7cdd3d3c5f610b1a
+MISC metadata.xml 564 BLAKE2B 9692567feec851f92126289afe0b4117d9e397615dcbd265b73cf8883417739899b26bd9ee2fb6621c61e3c18262858fa78b7975edf4f87f7032356ccdd4c875 SHA512 68273bacd56e8af3314737d8bda5e09c8ce9c089e5d942b4a2afd86187f702d3d5fa9419db5042f660aaa8ab12d0eeb69cfa14c7fc26589e1b4a638dde83b92a
diff --git a/sys-libs/libsmbios/metadata.xml b/sys-libs/libsmbios/metadata.xml
index 5da9415b6118..426debbdad90 100644
--- a/sys-libs/libsmbios/metadata.xml
+++ b/sys-libs/libsmbios/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 39192d05dffd..3ccc25308f92 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -7,9 +7,9 @@ DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c
 EBUILD llvm-libunwind-10.0.1.ebuild 3185 BLAKE2B 150bde0a85684ac2cbc01d20139e458f57377c2c9692037e7fec432019b16f073d6e14d772dfee190ab8a682e4b133f538dce51fce3ede54e8e20152575ac7c1 SHA512 4cdf4ce69be5ca630701d4e41bdcfead01eac10ced7edc39a9b20628e3225b65b33ac493d3010f8ac8cfe5cce73b70bb2d4988d1ea00f2766efdbe30c03aa6de
 EBUILD llvm-libunwind-11.0.0.ebuild 3207 BLAKE2B 38d6419d35871059220e6d43672454fd29a8155da65cd4a729679a01c8bf8a9c97078bd01256126370d2caf48f91bcc44b12c33a8f93f3a737b1128d09e684e7 SHA512 7d450f6dcbf347679c9ac33e8838d9f334bd000e971cdc4c0cd8cfdee0ffe5eee253172fa3c7418e0fa13d6e439e95cd8d816fb69aa2253510c9943486ac1638
 EBUILD llvm-libunwind-11.0.1.ebuild 3209 BLAKE2B 1d083ebb9be360918af9e89a9eaf98c84b6290414cb8870120d34d2c62c98369e942782a330d654bc80ff62817120dcf676288edabc22ead93b6e18c9d9b87ce SHA512 5c8ff80f595b24bf7cda3d724dba2946a47f57177db716246115c9865320bed3ca7bc8dd90547796d2baafce4036fecc4d7351d57ac925984c5b39ef4fb82e1b
-EBUILD llvm-libunwind-11.1.0.ebuild 3220 BLAKE2B 1a87780e778d92757362ee877add870e330ce263e9d8b997644d891497578ec5b18bf24972a86ef7dab4b09bcbcf3e70c9a38ef37789f9af76eadaa0616bf913 SHA512 55b3bbdd59be06c97ff920ef076d31b9f344fdcdd772378d34e87106480f77c2d88c1211c410b0a3985b718e47af753fc79213fd13d41d9dfb70a19aefdeeb0d
+EBUILD llvm-libunwind-11.1.0.ebuild 3219 BLAKE2B f0c036f8a6e3fdaa6f3d476a905cd65cb6442ddc1869b903c38c1866c836dd5c3581b8ffdcaef47fdd3633592eb984fde4b21856cf3a759c5269d181ade0c0a6 SHA512 ead13889ecd76740082f5ecb03308f7530f45a19a7ecdc96315d70b8c1c59d0b95af0de72ecceca775b3726b7a114cc5e8dca0918df9a2810b3c1916d6fed594
 EBUILD llvm-libunwind-12.0.0.9999.ebuild 3191 BLAKE2B c6d413951aed1e093b629506afdb3f76f5887239dc4aedd1d9f7063549d2cad5b286d253df25aacb20116ad6ac6f85453d357eb96de02611d18d5f136d62ebc4 SHA512 99693bac2c943e756f4c7b586d78add1811f91c0bf9bad235bb9a9feb4df1edb779d1e01759ff86a484e48a8bca2ebd6740d5a4c4cdf9dbddab6ebc6a0bd8591
 EBUILD llvm-libunwind-12.0.0_rc2.ebuild 3191 BLAKE2B c6d413951aed1e093b629506afdb3f76f5887239dc4aedd1d9f7063549d2cad5b286d253df25aacb20116ad6ac6f85453d357eb96de02611d18d5f136d62ebc4 SHA512 99693bac2c943e756f4c7b586d78add1811f91c0bf9bad235bb9a9feb4df1edb779d1e01759ff86a484e48a8bca2ebd6740d5a4c4cdf9dbddab6ebc6a0bd8591
 EBUILD llvm-libunwind-12.0.0_rc3.ebuild 3191 BLAKE2B c6d413951aed1e093b629506afdb3f76f5887239dc4aedd1d9f7063549d2cad5b286d253df25aacb20116ad6ac6f85453d357eb96de02611d18d5f136d62ebc4 SHA512 99693bac2c943e756f4c7b586d78add1811f91c0bf9bad235bb9a9feb4df1edb779d1e01759ff86a484e48a8bca2ebd6740d5a4c4cdf9dbddab6ebc6a0bd8591
 EBUILD llvm-libunwind-13.0.0.9999.ebuild 3191 BLAKE2B c6d413951aed1e093b629506afdb3f76f5887239dc4aedd1d9f7063549d2cad5b286d253df25aacb20116ad6ac6f85453d357eb96de02611d18d5f136d62ebc4 SHA512 99693bac2c943e756f4c7b586d78add1811f91c0bf9bad235bb9a9feb4df1edb779d1e01759ff86a484e48a8bca2ebd6740d5a4c4cdf9dbddab6ebc6a0bd8591
-MISC metadata.xml 302 BLAKE2B 1cdee7813ed9a3766b2eddccd14f9e0576ba5cc7f812d7af4f35c8c2e5991790f3800c6473c37da90d72804832fd9af969a2e3bf7aa625f0d3a32da1dbcefacf SHA512 3afaef82e6a495a81e221524ae7604dc170ef5c103333728674faf0417c45ba7996118c10466eaa24f8feef9ed8f0fc60d535a5195462317d61c61a531c8a285
+MISC metadata.xml 302 BLAKE2B ef8858b3c26dfa1727e57685381dbf71eb74008e74127b06467aaff9eea2fd7f3fdcdb1819529b8e828d42720745855e948d608bbe3eb40778fe1e4e260118ad SHA512 d5e641d63402052ef7af157f98998868a816d5e5072424725b09ded5c2477b26aaafbb8874473367a860d3fc365e0f4f0db451315ec4be3df23cce4c1194f2d7
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-11.1.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-11.1.0.ebuild
index cc29dc8d0435..fe667842ccfa 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-11.1.0.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-11.1.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/llvm-mirror/libunwind"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
 IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/llvm-libunwind/metadata.xml b/sys-libs/llvm-libunwind/metadata.xml
index cfce3f1a81b3..d36a3f021769 100644
--- a/sys-libs/llvm-libunwind/metadata.xml
+++ b/sys-libs/llvm-libunwind/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/sys-libs/metadata.xml b/sys-libs/metadata.xml
index bb3bb995d357..1088337d85ff 100644
--- a/sys-libs/metadata.xml
+++ b/sys-libs/metadata.xml
@@ -29,4 +29,3 @@
 		Kategoria sys-libs zawiera biblioteki systemowe.
 	</longdescription>
 </catmetadata>
-
diff --git a/sys-libs/rpmatch-standalone/Manifest b/sys-libs/rpmatch-standalone/Manifest
index a342e1cf100c..bcba8edda8c5 100644
--- a/sys-libs/rpmatch-standalone/Manifest
+++ b/sys-libs/rpmatch-standalone/Manifest
@@ -1,3 +1,3 @@
 DIST rpmatch-standalone-1.0.tar.gz 3151 BLAKE2B e396d18bfb092aa59c70e81028ba889c1095c97b5f13bffbb4ae7b97a1ce63a6c536663304e4fdefaa06a22854dd5b986ff7238f0091b23bcd336cc6db0fca75 SHA512 9d8fc3be66f23b57793eccf62998d1c0ff8df24d8781d37ee99faf618cdceeda778132df2c75ace2ecd8aa6392bcdf15eaa9ce0acd657401af049ccf61fd5b14
 EBUILD rpmatch-standalone-1.0.ebuild 807 BLAKE2B 1b12d3c301190140ee79ded5e6cb1321ece98bb4358462357123ff1c5337f24e106e967862485bd2939af3e9330d9813bba1666002d59db96972f0f36dc533a8 SHA512 0a9f581b18be40bf695b880dece5e5365cece77e30fb5174d87502f9188f6e71e4c40137f3907290bf5d0d433f7cd4049471d05ce45a2d09159ab441a0c139d4
-MISC metadata.xml 338 BLAKE2B 9e5208f1306450844341cc5c0c69eae9646aeeb3fabdd001e77d848672913ce55d66892e16bb0d811701ee9f3812a57ca68a16687ef15f4b8bddcce7de4d7ed3 SHA512 ef9fe8a5c7f8e299969e6352b588f013c005941aabb0fe1488ce5d6f2a7bcf497ad7e682c1848c684906ded4539db4c83efd66dbca54978519ec65445e041383
+MISC metadata.xml 338 BLAKE2B 97c0a85d9e74b5b1b55d07e537d935f780492f93bf2e8db32de9aefe12b2e4e10962ee3cda8158e57670b770800f06f8bb1b39011f0c9f4db1e0658b272d761e SHA512 caac5ce1707e7b5eb7aa5ec655aa7dce6741bf4cc61fa8f09b0b6473c3301ea6be67930a3348c38f151879677f792ed5e714079369968aede2c0a04992843681
diff --git a/sys-libs/rpmatch-standalone/metadata.xml b/sys-libs/rpmatch-standalone/metadata.xml
index 4aa32e43cbee..67cf88841b35 100644
--- a/sys-libs/rpmatch-standalone/metadata.xml
+++ b/sys-libs/rpmatch-standalone/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/sys-libs/zlib-ng/Manifest b/sys-libs/zlib-ng/Manifest
new file mode 100644
index 000000000000..6756eb8f98c9
--- /dev/null
+++ b/sys-libs/zlib-ng/Manifest
@@ -0,0 +1,3 @@
+DIST zlib-ng-2.0.1.tar.gz 697121 BLAKE2B c4e8c9602f9cf33746c842b2f100adad2fca2b3808691f73ca5b679bbac186a70bf575df731cf60797755275835a5839f4602e08e15faf16b216d4d6d99d4aeb SHA512 c3be0a29e07989353a41a07a4eb037efbc0de5a87f1a4fe338c97c0dc7145225bd1f1039cde4a440be3b54130e297153c5180d69a491b92bc8a69839a8c1a9e3
+EBUILD zlib-ng-2.0.1.ebuild 695 BLAKE2B 738b6ad23488631592fe8c1c0be99eb0d0b2e3963e3edf5c13eb39f2d9bf49322b6806264c0d74e6ccba6407c230d94f9cff6f2d04a296145b4f56985dc29256 SHA512 bd74daaa1d4e4216c79a12a7cb6e0dda502c43dc6e89c0e98c8df6d1e0efa9c2fa21e4632bdc7f7882ba3f4bd185d4abe0b6b39dfa190448c7ce2679713cade5
+MISC metadata.xml 420 BLAKE2B bcd9a2026fb660169b9d56d12c32b78160b18380939b4f44db319605c07c495849fe1cf33f208fd35920dad0aabe3c5d59df7d54685d022a8264d0d31f20bb8f SHA512 344b9daa07f6e11684358928c70b0469058d3d126af49a1be153395686ea87d3a889c9e9d234e44363d7e438dfc321be9d93278e299df0415f3ae8404cfe95e3
diff --git a/sys-libs/zlib-ng/metadata.xml b/sys-libs/zlib-ng/metadata.xml
new file mode 100644
index 000000000000..44db40fcc5ea
--- /dev/null
+++ b/sys-libs/zlib-ng/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+<use>
+	<flag name="compat">Enable compatibility to <pkg>sys-libs/zlib</pkg></flag>
+</use>
+<upstream>
+	<remote-id type="github">zlib-ng/zlib-ng</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/sys-libs/zlib-ng/zlib-ng-2.0.1.ebuild b/sys-libs/zlib-ng/zlib-ng-2.0.1.ebuild
new file mode 100644
index 000000000000..6c9d4fdc34fb
--- /dev/null
+++ b/sys-libs/zlib-ng/zlib-ng-2.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+# $Id: 688f948c5f3067e775bfab5057e8047f467a9ca9 $
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="zlib data compression library"
+HOMEPAGE="https://github.com/zlib-ng/zlib-ng"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="ZLIB"
+SLOT="0"
+
+#KEYWORDS="~amd64 ~x86"
+IUSE="compat test"
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	cmake_src_prepare
+	sed "/LIB_INSTALL_DIR/s@/lib\"@/$(get_libdir)\"@" \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DZLIB_COMPAT="$(usex compat)"
+		-DZLIB_ENABLE_TESTS="$(usex test)"
+	)
+	cmake_src_configure
+}