gentoo auto-resync : 31:07:2022 - 21:13:58

17 files changed, 53 insertions, 40 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 5702bcd66080..5809ebfd286b 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 6d240fa8c95c..8b65d2022b2d 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -9,5 +9,5 @@ DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d24995
 EBUILD compiler-rt-sanitizers-13.0.1.ebuild 6337 BLAKE2B 67f5e39af19ab6e4dccb2989d044a1f148a7e3cafd7134ea7ccdc75481416158613137e3cc7204d32b3c868d00e5047c9d378f09814b8fc1e46ad876d5214423 SHA512 c49b998f5f990103e53253f22f19313e3b8e884818bdc5b651ee976957f8fa10d36ce6146b1db65336c60e4f22f67c435c5841e0f8cea48901724790d3c6738f
 EBUILD compiler-rt-sanitizers-14.0.4.ebuild 6346 BLAKE2B 5a869f26e4802980060fb20e1e6b02793bbe42ac1350cc07a2f37ce911814e7d68b2b196e7acd8639064d35ec70f7e848d65bc6ab0df326ae1e3fb55a382ef45 SHA512 c95589be30252865f6f3992f9aca665282ef041089dce6469b7c1e530871808101d3d39fbb288f265319711dfe3066d36b6d9b4299cfc329765e4c620156c31d
 EBUILD compiler-rt-sanitizers-14.0.6.ebuild 6349 BLAKE2B 6d27940bd10da586648cbde4488e9c401b37a6d90dbc028483a23eabde26fc65d4dd4bff851256f1e7ab1e3a7044f31fab0dbb3f5e13980d38c1410b68e29d93 SHA512 bf140701f85322ec7a8debd6cbb8bd1725e0f7fcc021e97a8251993e87c9150f2d6c0e56b35826de6d71dfb9d2cb9d51935b39302281134551d09607cc3edb92
-EBUILD compiler-rt-sanitizers-15.0.0.9999.ebuild 6292 BLAKE2B a5bd1d74f6f2aa61cd33aa0639941acc4bd8f5921eff4d1ee79ff9f56a944500a1f9f82fae5b6600a0552edf602e48b1970848ae1994090b0c6193935c3e7694 SHA512 f03e4ada8927e105815a89181fa682789e9d038f4171f24880280b34d4526c56a6f20decf86e72c342d6b12294a6d18d1357d7cbf99f58675270e2c834f041c6
+EBUILD compiler-rt-sanitizers-15.0.0.9999.ebuild 6292 BLAKE2B a0cb8f93777efbe56af67b5c79d187bfe2dfedfdbbe4bac3eaf921c7e1e7f307e6cefe5fd00afa799cda93d0538ad313009544d20182accf4a35895948bebd62 SHA512 9782e162eb492c0a03555a671ed1bea614304359afbb6a04a4f6232c1ab0f3c796e5e617e032f9213e0f430a6871a05adc1616f3aaed1e57424b8916466d85f9
 MISC metadata.xml 1412 BLAKE2B 75675507000fa6a6b8182e6b45a08a2716ae7fb9a7e3428dc8420464e4c1d1bdb5bea62cc2f553c579de5a4faa752b35cb3529d980fb07a055ff4ddf6e752707 SHA512 f05ea5168b923db72f4f5b53e9b748ebbcdae9eff09d86323313055933b47fc0089e1b2d73cd997d73dcfb2dca032344955816425fbddc09d27ca751463aadbb
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0.9999.ebuild
index 45dfe176a902..964e7e01049f 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
 
 DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 308cab008c93..c80a2f98d5e0 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -9,5 +9,5 @@ DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d24995
 EBUILD compiler-rt-13.0.1.ebuild 3868 BLAKE2B b2b643b850023513b69076bc791b22b74aa54445250cba334a2d3dfdc26a1ea11d30d1ce9df6cb2d1c813b66eaa59a130821470b3a3076237f9ef93d2919a124 SHA512 334a2609ae6882dbbb9caca5bb3bc7ba0a668f9a8f337570d54bde926d7ebfaa87fe4e53dddc73ea602b2d52e7537b9490f8936736480f1ddac6c9caf7b6832d
 EBUILD compiler-rt-14.0.4.ebuild 4017 BLAKE2B 9bb27fe3965eb71a40c3a9060e878e6cbefb5f3395b691a70ad6fc9ceeb352ae0d8275ce7165250c9857b8865367c9062c99dcef771e852830a171c0b0331d05 SHA512 3af70c7d10b15c324870b10368f66938402dd020ca9dfbe2aa82469442a76feeac9a09606e92a984fda7139a0779091ec0b96170a63abe95c014d90780788f8c
 EBUILD compiler-rt-14.0.6.ebuild 4019 BLAKE2B f97793688c6e2dd3f2874217813ee9759bb896e192e146a2bc17e97daa0d9f8d8708938c68ab1270ef9dc49eb52bb7c29b4edd94382993e8de0a73f006238d23 SHA512 73a150cb917587e1e9a0adc499ae6cb1d473e455400b1b19777b30dea72846f01114bc52018dda7ff7090ea43b365793ad5a3515e4601dbd9ba4226c62322c77
-EBUILD compiler-rt-15.0.0.9999.ebuild 3958 BLAKE2B c27de8bb32d8cee66812809e4f0fc8853abd61c3163db89b384181702ee1a71ff88b9cae0c0f2735b04a8abe8ac5c7567f1114a5efe2feff5ac90a2c22769333 SHA512 69e71e8c52175116bbaed73d1b5e7bd5be34020f547731842b8c6c1f6cb0a79125d97eee5c7e68c9c25902c5436f23f6b876bb15ec1d3b00a3df936a3fe17ccf
+EBUILD compiler-rt-15.0.0.9999.ebuild 3958 BLAKE2B 8ce1194a4434fbfefe9edca0ed102a920afa85bc56d2cb0ed89ea7e525f11bd559a963de68504be03cad930b2611a2424b5511f1c92f924d684ea6a98d2851f6 SHA512 90bc2a25edc6d8aad2b21172651d2d220109ecc18166820e9bcfec68dc2a8541bc249a017d855d466cd148ee3f6f970191ed92f714ed68670e763bdfd7c06e27
 MISC metadata.xml 416 BLAKE2B 79a58249c94b605ba57f346c4e05b43853cf6cfb8bb65a4f4e3c44039cccfdb83dd31bfaaaf398bcbdc393efabdfc7ed186fe775976c46227e74decf2c8f4fb2 SHA512 ce30c79a575e5933effb1fec36f9a4ef02d9f97f312feb39c55a88cbda9a1bae1d7af2ec4ad5f66212cbb2cdbfb26f1a436689f16f410153c9d65eb010264c48
diff --git a/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild
index 7f791e2294c8..8af221eaa8ad 100644
--- a/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
 
 DESCRIPTION="Compiler runtime library for clang (built-in part)"
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index 9a616ba2b310..f943ecd667bd 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -14,12 +14,12 @@ DIST ldb-2.5.1.tar.gz 1736209 BLAKE2B f06df9878ca664a456859464895e91c21da55c340e
 DIST ldb-2.5.2.tar.gz 1730347 BLAKE2B a0d3a9ae02f79c27b396314b804195ecd37b8bcd843fb94f9813a69fb15773db94ed2210f4102e395333562c2dccebabde1c2dcc0c2fceac97dfa31b2ad97e3d SHA512 02ae1246f99d9b6d6b33c5030488aa46c6abb535b4da4b13799a62b49d32c490b7c088ef41c0bc5a1b2f7263c680faceb8033827834cb6f66916adcdb5be421c
 EBUILD ldb-2.3.2-r1.ebuild 2942 BLAKE2B d2495240018b7ecece8c88092c30ea64f411ea0f073f0ff2404ca6184fe931ada8342ea3beffd710fb0d3c137174cc01fba37d73d7884ad11edba84855f2ae08 SHA512 8711a2758689c818b66af5548af9881cf217839d5ea951cbcdbc83531ec602a9b39e1d2b12e8452e60691f09ef4e9db0d0d639e7d4a45d16cc7e75db583c714b
 EBUILD ldb-2.3.3.ebuild 2942 BLAKE2B d2495240018b7ecece8c88092c30ea64f411ea0f073f0ff2404ca6184fe931ada8342ea3beffd710fb0d3c137174cc01fba37d73d7884ad11edba84855f2ae08 SHA512 8711a2758689c818b66af5548af9881cf217839d5ea951cbcdbc83531ec602a9b39e1d2b12e8452e60691f09ef4e9db0d0d639e7d4a45d16cc7e75db583c714b
-EBUILD ldb-2.3.4.ebuild 3005 BLAKE2B bc5b406e3df600e1967e684b85597830afc2e0d7d200b8af1bb9408f367b88cc0675c2fac5ff23132a3ef0706278caa8088f2d21b91f227bf24a59a68eca0e86 SHA512 abeeb41495d874dc66bb56c13007e88beb2fe5461cc379f555b82e71adab9fef15afab53870a986c65e25ab6ff7801287fcfe7b99b146e3ddecbb29ca9660e28
+EBUILD ldb-2.3.4.ebuild 3010 BLAKE2B 632921f7638af2e4b226b67daf4a8129aa939261e1f2dd9000b86be4027a2e415b532b26b1a6356c5da0d2e89eb54617e218e7aba768fab8815d2829660cf29f SHA512 23a97f3a216f9059da3e0181d5c30bd2409675ac0d18a099d6e3b1a8dacba1e9733ef33d0b7aafadd201621783adf4df8ccb6eb5206b61604c11ca6942d2cb43
 EBUILD ldb-2.4.1-r1.ebuild 2943 BLAKE2B e96f5909024e90dd48096bd1a80d123460cd86c6a1743372992cdab7ed758f0759f889f558ce999cd493b625a231f8185852e18cf678f086bc221a61f895e887 SHA512 60ffaadddc5007e6c3aa8cbad369b20e5691b26ed163e747196cc7c1fb40ee74477ea00e022cfd94ff69eb9c911aaa51945d793913aa3056321b8026bd38bb66
 EBUILD ldb-2.4.2-r1.ebuild 3000 BLAKE2B b792c10c41f0f6aa6e05ee45fc59bfb88c7bdec2a3e6c191a374b387e9b4d169b9179fcf698e8d0856b4335dff27741e1d6873a013f298faf3e73889a7210671 SHA512 a9b6fe64a246d67c6193a2d14377a479a4dca9c851b9c183984c217dcfb32a0a5e15bf32ba5f373eb6aa2c4d106c2403f11c39123685ddd001c93072b6cb3e7b
 EBUILD ldb-2.4.3.ebuild 3007 BLAKE2B 543d57e1e3e50a57fdde0a15003fbd04990b16300df7e38b0be8021549f57e2bbfc30417a81b8519ca47d236cfbf3be3bf10d8dbeeff2b5d06e575ab9acff22b SHA512 71027d7877c6af0db3b859aa3271aefb3e9bb0134d732393e5c7d6a2b14da9a55d255fac0e04de271caf269a9d627f4203a932ed13d74137558d1c7adfcccc51
-EBUILD ldb-2.4.4.ebuild 3062 BLAKE2B 815d6ddc9d3c4d674545fe4b91bb49d17ff4ab26e013057550cef98bac41ab46f5bc7c125fef4a1c01f9d7dc108dd6fe31f3827ca27283376071046ca1ca4399 SHA512 e59137d185362a895eac41b7e80a36f63751959b06b7d52429b1b28b14b1dc62f551cc5236983102a00589bf086486932e6b546097c2e265db4a2f6242f3093a
+EBUILD ldb-2.4.4.ebuild 3067 BLAKE2B 367048331bd26f4920b2b4d6d514bfc11a4ece835eb6939ff397c47998a7d8b9f552b2297209df23dc0712ae755043c4596405af15dee84cbf090bf3d38e2ac7 SHA512 13dc06b1f368da58fdc3b920fe94d051babc57b836a08dc97edddc0b15b4e9456b41486ba54107a8201fd653c465562440758e60c82e7cc931ab4ce07ed53396
 EBUILD ldb-2.5.0-r1.ebuild 3007 BLAKE2B 0abb5aa964f1b945d2bddd1154421bf35d24e9fb78dde2b0ae34b4495326142dbda601c1aa2579bdfb81face8bf6072f0dafb676524d2aa3c1f2e9947c7a9cf7 SHA512 ff46752cb5c33374665b52eef69398821f7c463deaa1a5c8c05115b94fb97cc56c805df49826f09ded208adf91a50799fa9f43e878f36291676ff7e2c9f917a7
 EBUILD ldb-2.5.1.ebuild 3007 BLAKE2B 170849834a556b081cbc072f591d766eaf65d930165d3cee11cc01de81eb8325b15cdc8e4e2abd083e630f6c956bf70140982172c360d0f49c1a818d8551cfa1 SHA512 62f423a99c35d367122e6edae52aa76a387d569c824bd2cbf4b4c22221be655926b3db3e7b5d0230b7ba34c376c9a274feacc78855e00ded0580f4e1ac605a93
-EBUILD ldb-2.5.2.ebuild 3062 BLAKE2B 37a460f7a8682d39a51097ff90f1781aaf61eb6ac269b03d0b4468694375e3de2ea4d308ec21ac9879ae20c3b55f64c7ddc7f5a5c967f5de3e8495e3a116796e SHA512 ce49c8f7af069f0f1d04a85d364ed4d0ee721ad1a89a852890de69da71de6c2c344c061d61ee073fdc28ba7a8bbd48e1ac8f2f3d6bd17dca820927be45e774de
+EBUILD ldb-2.5.2.ebuild 3067 BLAKE2B 3a2066b7963b379bbfea68511bc3c7c4853d4cd05fb1e41c2ab38d70eaa16540a1e07dc31040ddde3d82e20aaf8507cb9594fdcd29c068f98386a905de837bfd SHA512 5453194e0929b4d883613358e4601fc45aaaca047e7468c8fbf266012ed3b563bfbd72862642865f176d3cefc27080d66e04a91c47ea6270edbabec842206fe5
 MISC metadata.xml 526 BLAKE2B 004dbbf0286ced4bcd404eb3caf091f973e67e00b9230d2399f07dcb31d93a423045b353c1813958da151cded2f52996608de1b4294e3cb90cb8da0ac8877f9f SHA512 9f8008b5b57e5f73e79df68d828f1644edb0a154fa97504c3088301aa60e6ba3ac83a2e06d55d14c06cded89196dd635598f1d767ca93398cbf9610af3b49038
diff --git a/sys-libs/ldb/ldb-2.3.4.ebuild b/sys-libs/ldb/ldb-2.3.4.ebuild
index 0730a2c090be..d98d303d64c7 100644
--- a/sys-libs/ldb/ldb-2.3.4.ebuild
+++ b/sys-libs/ldb/ldb-2.3.4.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~
 IUSE="doc ldap +lmdb python test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	test? ( python )"
+	test? ( lmdb python )"
 
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/ldb/ldb-2.4.4.ebuild b/sys-libs/ldb/ldb-2.4.4.ebuild
index 05b4d0c727a9..1b553e360e10 100644
--- a/sys-libs/ldb/ldb-2.4.4.ebuild
+++ b/sys-libs/ldb/ldb-2.4.4.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~
 IUSE="doc ldap +lmdb python test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	test? ( python )"
+	test? ( lmdb python )"
 
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/ldb/ldb-2.5.2.ebuild b/sys-libs/ldb/ldb-2.5.2.ebuild
index c723951c9d16..3016e578d88c 100644
--- a/sys-libs/ldb/ldb-2.5.2.ebuild
+++ b/sys-libs/ldb/ldb-2.5.2.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~
 IUSE="doc ldap +lmdb python test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	test? ( python )"
+	test? ( lmdb python )"
 
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 2116baddf977..b439798a1f4b 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -9,5 +9,5 @@ DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d24995
 EBUILD libcxx-13.0.1.ebuild 6780 BLAKE2B 575c9089d74bddc871e97147c53f7c298cd1683b989eba6b50601b45693c11d0647e3bd6f70c0a75caaea7ee3fea2f88f1bbad444d7f1785a62175337659e2e3 SHA512 f0ff78e48acca25cb925aee5106fba0d547ab8522ccfd65e2198d4f481f83abbadc415ac3808e45387fc945980f9892fdbda3b6a26d54163cebfa4f12fa17172
 EBUILD libcxx-14.0.4.ebuild 6958 BLAKE2B e756b18011f0097115d4bc692fc4eb84c84d0ac68694b4611e4f73a032cb3b04e1137f7089b7b7dc4d0b37d1463465a791e468110c3c61438728eb90e7b9425f SHA512 fc0bde903c11f74f78f1d432bb0f5c15d002fd8c390719c6e4b9d77f1459c0397346b97c3cc51d75b34a486adb9b7992e646e5d043b3f278e46560d56e9d43cd
 EBUILD libcxx-14.0.6.ebuild 6961 BLAKE2B 9f04467faee5cd162906a77764b3ee4af20f3f7b7821c00a078293c922912111f88ba479bbc9effc363284bfafcac71ec9a42db26ea73c8469670408b3de0d96 SHA512 40fdd13646e02c3fb2cd54dab00a5ff41e7b8fa523d197119aac5e19d0540b35cf5d5bbc770d2511179807883af122f764e2da9918e685ae5b811930dfeb47ad
-EBUILD libcxx-15.0.0.9999.ebuild 7106 BLAKE2B 77e452201191ab5e913eb53f7869ade436c655ec83627ee481ef80285c7fc6ba41198029e7a042cfc7c88883c8840702309cdfe6ffcdd53e9e5255c25e01fe96 SHA512 60415c895c622f64ab6fd5c984d44621510307908326e5de415610f757fbd03b79fa893c572a7b7f479908751ce57d4046e0798a3f55981bb7673dd53543ff6b
+EBUILD libcxx-15.0.0.9999.ebuild 7161 BLAKE2B 003e9af70722b09e98efb51ead68533dff908a6f36ea6b9d73faa8be1e64c5e2d14c229bd3fefd4b56910ab4fd2d2cd7e068a60f1f6ffebca55ac7cfff47f83f SHA512 fae292ba51bbee7c2df22d58ce377161fdbaa5150e2f46197e2763741e858a80f3cdce13fa1ed22d0ff6aff276bc8217d1bc785f4ab30832abffbb438038689f
 MISC metadata.xml 828 BLAKE2B 40af456df8ac1cfdb66fd62a217abbb4ca837956529906118c35232000435d9e991d18dd0332b7b95eed70d4c7610c7a1aee80af8ba511763edc1423749a4aa4 SHA512 257f8fd05fcade26ca02305356b67c8e2d67a87b180e38a189a659212093b07b9a710b871fbaab894dba9eba5fe450b76c52cc82f6405c24cc1ab2df3abe8bfd
diff --git a/sys-libs/libcxx/libcxx-15.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-15.0.0.9999.ebuild
index 22e74228d61a..3acf567e062b 100644
--- a/sys-libs/libcxx/libcxx-15.0.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-15.0.0.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
 	toolchain-funcs
 
@@ -177,11 +177,29 @@ multilib_src_configure() {
 	cmake_src_configure
 }
 
+multilib_src_compile() {
+	cmake_src_compile
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		gen_shared_ldscript
+		use static-libs && gen_static_ldscript
+	fi
+}
+
 multilib_src_test() {
 	local -x LIT_PRESERVES_TMP=1
 	cmake_build check-cxx
 }
 
+multilib_src_install() {
+	cmake_src_install
+	# since we've replaced libc++.{a,so} with ldscripts, now we have to
+	# install the extra symlinks
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		dolib.so lib/libc++_shared.so
+		use static-libs && dolib.a lib/libc++_static.a
+	fi
+}
+
 # Usage: deps
 gen_ldscript() {
 	local output_format
@@ -198,38 +216,33 @@ END_LDSCRIPT
 }
 
 gen_static_ldscript() {
-	local libdir=$(get_libdir)
-	local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "libsupc++.a")
-
 	# Move it first.
-	mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die
+	mv lib/libc++{,_static}.a || die
 	# Generate libc++.a ldscript for inclusion of its dependencies so that
 	# clang++ -stdlib=libc++ -static works out of the box.
-	local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)"
+	local deps=(
+		libc++_static.a
+		$(usex libcxxabi libc++abi.a libsupc++.a)
+		$(usex libunwind libunwind.a libgcc_eh.a)
+	)
 	# On Linux/glibc it does not link without libpthread or libdl. It is
 	# fine on FreeBSD.
-	use elibc_glibc && deps+=" libpthread.a libdl.a"
+	use elibc_glibc && deps+=( libpthread.a libdl.a )
 
-	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die
+	gen_ldscript "${deps[*]}" > lib/libc++.a || die
 }
 
 gen_shared_ldscript() {
-	local libdir=$(get_libdir)
-	# libsupc++ doesn't have a shared version
-	local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "libsupc++.a")
-
-	mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die
-	local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)"
-
-	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die
-}
+	# Move it first.
+	mv lib/libc++{,_shared}.so || die
+	local deps=(
+		libc++_shared.so
+		# libsupc++ doesn't have a shared version
+		$(usex libcxxabi libc++abi.so libsupc++.a)
+		$(usex libunwind libunwind.so libgcc_s.so)
+	)
 
-multilib_src_install() {
-	cmake_src_install
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		gen_shared_ldscript
-		use static-libs && gen_static_ldscript
-	fi
+	gen_ldscript "${deps[*]}" > lib/libc++.so || die
 }
 
 pkg_postinst() {
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 72596c9dbc43..ede184778d66 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -5,5 +5,5 @@ DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d24995
 EBUILD libcxxabi-13.0.1.ebuild 3605 BLAKE2B 7bdc8ecd9c35cdc247f08f9d5687d7362013be7c9c5afe006817cb5a384d4dd272bc686c6fe2ddf2a9bde5be8d1fa185ae60da940fded833a356f76e6105feb8 SHA512 69c4564fc68e3037620de0ce0cda29093bff9eb919f48f4760558edd1031c0d198991e6346774244701679aa0619d6afd814ec80d0d66265418408416621d9d0
 EBUILD libcxxabi-14.0.4.ebuild 3522 BLAKE2B f62a0fabd80aeb3f67cc8a199b8b945cf6bcf42d7fa8287eb90a695a0f18129e43c6c31a15e350a999e482d372ac36612d94b25759a242b8a890e18ada743679 SHA512 74ebf7281951e8911ae842f6a1b6adf3dc0b906d17fc6cbec1c362aa8d7ae193c5f44ec1dfc1a3c40360c86f963533c6139012d4bd0ab2db5be98918d9627fa6
 EBUILD libcxxabi-14.0.6.ebuild 3522 BLAKE2B f62a0fabd80aeb3f67cc8a199b8b945cf6bcf42d7fa8287eb90a695a0f18129e43c6c31a15e350a999e482d372ac36612d94b25759a242b8a890e18ada743679 SHA512 74ebf7281951e8911ae842f6a1b6adf3dc0b906d17fc6cbec1c362aa8d7ae193c5f44ec1dfc1a3c40360c86f963533c6139012d4bd0ab2db5be98918d9627fa6
-EBUILD libcxxabi-15.0.0.9999.ebuild 3568 BLAKE2B a3d7c90a9ca50845dab3c01cf3bba0bd671834ba8a17402e0fee275792835800d3f686bcaf21435ef16bca799d8c26420c44b7852412bccf693e8e6ea61edb23 SHA512 2ab84a69d811c28362e7c121e8d6b911ff6f81fe55aa027ccc4d5fcf3346c2db323e7771fccaab1417a51f0d24ba2c11295961e9ae7ac913c919f2c07d076876
+EBUILD libcxxabi-15.0.0.9999.ebuild 3568 BLAKE2B ef75c700764d782bec43b9110a061e2c9c6ec9adb42d1a6680a932d65f656ef534b941ba309f4d7f6dd4b2b01d9f67c3475aca85ce65ceb5a81d4380de924c76 SHA512 2e85d96cea5f84d13d6055d0af114b6972d70657bd7565a3364f4500e190ef527af39db662b4e3145e99c87bf1dd86eebfdf17cd98d3d6c3c66be2b0b4dad621
 MISC metadata.xml 557 BLAKE2B 4f6b0acb7cfdf74971a6fd96051d9f9020141c6117333a8de42bd043935b7bff8d9942faabdf3b1c94597c460393f64eb7d3f7b7d49f39ecfd0094de460f563e SHA512 67a812ef768e681ae77ef6e13bccffcbe53b41e94901f0558b3c7acaf896605ca670c4bb5a690bd9afa3b5a76271341710520a6abc0024c18f437fabde20e847
diff --git a/sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild
index 6ea01b5466e1..81e3519d948a 100644
--- a/sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
 	toolchain-funcs
 
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 4379c6de5636..e7d9c3a3d346 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -8,5 +8,5 @@ EBUILD libomp-13.0.1.ebuild 3836 BLAKE2B bfecc3ecb5928ba0c4f1e79baf7108705b33b65
 EBUILD libomp-14.0.4.ebuild 3823 BLAKE2B 4d60017e3f8b82fa5e45d4524039bafca2c81c859dcdfc25232e500e1b7e955b7eed3cd6dcd79a67da9182f0545b88af8d9426a95dc314122415a5bf8f94e2c3 SHA512 fd08853add3a0c7a38b5c5f7501d24f4a879f3a0aaf936df82c7a40a7235852b4998bb11fcf969bbebb3c849f5aa06179d23763cfcdb02b4609aa5ece0473770
 EBUILD libomp-14.0.6-r1.ebuild 3846 BLAKE2B ba454ff21aa950024868546e76e34f7eae5e0df1e72f828832c7f32d4b5cb544d479b18e609adbfc2352e5773c9cc08717a0b09d6bcbf1c76020dc4911edd7e6 SHA512 6547e2e6c9847fa9dc0eee0717db07347764937f942db9a13f3e47615954fc3a15b7db1516f629c0e2036ee8367cba6aea7bd27c27d2a4b9b51922afc97e7ebb
 EBUILD libomp-14.0.6.ebuild 3828 BLAKE2B 0887d1ac8543821e06bb09a1c3b3331c7d727fc9101232893f19270a7bdc0092c9be0c85e5a9976450e7c131fff8918346515fbf880c700ebd113a5c399948a8 SHA512 d82f5e9129e7515cbf2d836519de4b7ddecc14ed9948584f3a49ea58d6dbd27a0b90a88d5329a9bc568e4063daf0c9ce8755c6c9ddcadad1a56a1f7142511721
-EBUILD libomp-15.0.0.9999.ebuild 3250 BLAKE2B 38ebbaa5f6c0551d37c7a32460c2c68e7c8d3cc7a6f3d0aec96f7a469e75ea04eb3108485c7c2287f99f612e99a8ed4e91a196e05545b374e642403af2696a52 SHA512 8394e1da91788ef1fed9f94aecdf5edcd51965b2a5c5967a586cb890ccf3b18c75dee91af3e250af60b5de2edc474874fe598ca3b26cc257a9369e0ffbbfe77a
+EBUILD libomp-15.0.0.9999.ebuild 3250 BLAKE2B 93eb6805d0b96f8b9adb99c0b69b41a8b0f7e58c9aa3a8c8d58d98b265f0656b802638b3faf206f8603e7a591227eeb1853a97be6629c24b32c2f609369e3be5 SHA512 340e88828c233a54a03622db8cbfc468fc9a117665014cf5c431ae611e21bffe6286d3cd41478ae6425047ba9cb1f067498c19895b74dc432e93caf753874c70
 MISC metadata.xml 908 BLAKE2B c200fb1c93ae8fbd3963b2b575586fbe8f6df2308a2babbe3da77c2cf59c3fa43f938849d47df2ef4acf381f247848c363a20cf33ad763be169764cbe43c4bb4 SHA512 3cde603a2de523c21fbf288d459d76c697f2291d3dc3dac47e70781a910b4d524442d3076d8541818f2d43c3c6477af75d5f0cb76c4fbe0b4567a11d67edb056
diff --git a/sys-libs/libomp/libomp-15.0.0.9999.ebuild b/sys-libs/libomp/libomp-15.0.0.9999.ebuild
index 5ded2b167951..8ba05d6be239 100644
--- a/sys-libs/libomp/libomp-15.0.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-15.0.0.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit cmake-multilib linux-info llvm llvm.org python-any-r1
 
 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 7f8548a8dccf..b691e8cdb38e 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -6,5 +6,5 @@ DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d24995
 EBUILD llvm-libunwind-13.0.1.ebuild 3810 BLAKE2B c215ba47340bda6a466f6ffcdf978d0d3ab4f4f1f456114f854f53dd3dd04d197ee235c4623d0a3d6e0f26022fef909be2ad04e93679ce357c396c94dc7d3a49 SHA512 96827c5f5838898ac368b79677b6e17fb0545a6a5239f8262622034843777ad4f071f9f80e3c33e0e1a2df334abcefbd7e867c5957d2bf72a1b8416b5b7ac714
 EBUILD llvm-libunwind-14.0.4.ebuild 3200 BLAKE2B 884692225751f6315f794655e2fbfeae7eb18e13b613f819e45ed485acb33daead6fe6b418df1e77167d5f243e5aaae4c8a415568e87b0aa315ae3b48aa43aa3 SHA512 e01166633fd76113dbc216b6755956a0f28d8a67d641cf5bc1195be49c23b89aa24d9f0fd974304f8a06ec41fdb7cc17a909a07f651604cf0bcd2fe549eaf922
 EBUILD llvm-libunwind-14.0.6.ebuild 3200 BLAKE2B 884692225751f6315f794655e2fbfeae7eb18e13b613f819e45ed485acb33daead6fe6b418df1e77167d5f243e5aaae4c8a415568e87b0aa315ae3b48aa43aa3 SHA512 e01166633fd76113dbc216b6755956a0f28d8a67d641cf5bc1195be49c23b89aa24d9f0fd974304f8a06ec41fdb7cc17a909a07f651604cf0bcd2fe549eaf922
-EBUILD llvm-libunwind-15.0.0.9999.ebuild 3021 BLAKE2B 8a793824ac5f44721629b5df0e90b20370c94064420078d246fda4a9792ef42274e11861e2c1e0acefca7b2b6ba47f48f4020c0a1d7bf4ab467fdb7bb666503b SHA512 4f463b07b5e626ef107d630d76890b4d45fc4fdc28a5bb9c10b71affc5347bcbad11831b9904d0acfedeadc288a9f9671b84fb21f52c8ea92b67023c7f6b43c9
+EBUILD llvm-libunwind-15.0.0.9999.ebuild 3021 BLAKE2B be3b0ee26470c838caee43b7dbfcba897af644a586d87bce92833f988f3f5496b9b30da32e33cd29c214be4c3786babd9c890add057d470f09ca6c4493a1d11d SHA512 a353f815c9a2f467d643793777954eb8b5b4cf07a94d1315913b80961c52613351273e24e5aacae02c91993702d6cd3ac221264f009e031ad6ad83e722764115
 MISC metadata.xml 438 BLAKE2B 2a36fbbc59e137056029c62aef6d167d9c82531c2582d7bad5cb13cc36e5c4c9518ffe8c56d06bbcfd97ad22eda71a8b776f3984195f53d06cf45659b438dc00 SHA512 4f18b054072d00e5440faa31a59f9ef587d035b5f25e30913f0b1449debee967fa794fae2548e87db3fb2177ce853ab075e1f11f3cc763f5d7fdf06147108845
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-15.0.0.9999.ebuild
index a51bc775278f..dc3e0d055af3 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.0.9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-15.0.0.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
 	toolchain-funcs