gentoo resync : 22.12.2021

38 files changed, 402 insertions, 166 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 6feb39d919fe..19dcb1d2363e 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/bin86/Manifest b/sys-devel/bin86/Manifest
index 938b1c817ab7..f086ed3cdc5a 100644
--- a/sys-devel/bin86/Manifest
+++ b/sys-devel/bin86/Manifest
@@ -1,4 +1,6 @@
 AUX bin86-0.16.17-amd64-build.patch 327 BLAKE2B 076e7fb11802f082f94f3e688553ae9f561609ae6675c67105ee9a30292185edd12b90a5149bc34ba6d6a453ce7648943c732a865bb238a4ebe5e8185ce6ed51 SHA512 8e4102c5b0848249c69fd9b3f16a93b12bbe8dce9771b78514bf423bec7b0144677f4eae07cb0ea479bf03dbd21092fdb2ce0a028df95f28c37d48b660466c13
+AUX bin86-0.16.21-amd64-build.patch 398 BLAKE2B c9457b574beceac90ba1ae5207b4164426f731252c0e728901ab6ee628a570c4ca95a4395e53b6a3f73fa41107678dd766185daa158e99e6ec609ae026ea48fa SHA512 d7be4857acf46ee6dd803048726083b471dc302c7189c64acf71e00923d736ebe9174a87ed0f90f5eb71221c35c18f2259f0f62a47f8e64c682a6d7afcf2504d
 DIST bin86-0.16.21.tar.gz 154283 BLAKE2B 6c88a5cf86623130f6ed45cefb9ee9293d8888f4d0e5712d96a24a6fe84bbe5002869761e9c39bb20c8af74e3fe76cf65632ef43e55d81d0e5cb9212f3cae56a SHA512 e80e06965fbdcf13100aae4690071d01a6efe74aed7ff8f14e5892c6803393a1b5acda1296e0f0e1837dfb73e0edd02e9cccfeabbeabe1b68fa6b6b85ced1f56
+EBUILD bin86-0.16.21-r1.ebuild 839 BLAKE2B 6eecb19c6033d79e056d7d0958cd9fb6f563ec6212192489271bd0b49ccada960c1a2283b1ca2e52d02e8173bf5d4a40b84ea0d716f5a0ce744d1ac515685fcb SHA512 7bbc87ab86117b04d209220ef80de9b5cc38f6a1af4619c33f8a1d8ed49ceaff38cf49824a2e746c1e0b084d5c981df86a1c87aaf917e5086c55932fcb64d3bc
 EBUILD bin86-0.16.21.ebuild 855 BLAKE2B 7a13609b50ddc239fc1ca03e21bada1a45b7eecc73127cf16dd8323572fc43dc14f7a033b5d5ac364903d5e495136b159231266fbd16219d5e28e006708c2387 SHA512 96d3a8d61e02c3039f9197313ea88aadbf991aea9626226621992cf924e1b34cd1ab49fa664b102bf92e2a43859761572f5ea56d05c0c8e19a73cc9979e0bce4
 MISC metadata.xml 243 BLAKE2B 88a8c5cbe0638cb7bdd3ddd42933def8a1cd34061ea459a0fc0bf392b72a0555955bd0812488b7024933258fb38f82c4fffaf8cb981a609c2d26f999520d44c5 SHA512 3232362e301749801c78b456fa395a8dd155629d5d06a22a4929ab29405e2ffdf1f1a77414d7c069b30456b87b3909c7c73684b9b44f9cf1e47eff0306c88928
diff --git a/sys-devel/bin86/bin86-0.16.21-r1.ebuild b/sys-devel/bin86/bin86-0.16.21-r1.ebuild
new file mode 100644
index 000000000000..c8aa201710f6
--- /dev/null
+++ b/sys-devel/bin86/bin86-0.16.21-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Assembler and loader used to create kernel bootsector"
+HOMEPAGE="http://v3.sk/~lkundrak/dev86/"
+SRC_URI="http://v3.sk/~lkundrak/dev86/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+PATCHES="${FILESDIR}"/${PN}-0.16.21-amd64-build.patch
+
+src_prepare() {
+	use elibc_musl && CPPFLAGS="${CPPFLAGS} -U__linux__"
+	sed -i \
+		-e '/^PREFIX/s|=.*|=$(DESTDIR)/usr|' \
+		-e '/^MANDIR/s|)/man/man1|)/share/man/man1|' \
+		-e '/^INSTALL_OPTS/s|-s||' \
+		-e "/^CFLAGS/s|=.*|=${CFLAGS} -D_POSIX_SOURCE ${CPPFLAGS}|" \
+		-e "/^LDFLAGS/s|=.*|=${LDFLAGS}|" \
+		Makefile || die
+	tc-export CC
+	default
+}
+
+src_install() {
+	dodir /usr/bin /usr/share/man/man1
+	default
+}
diff --git a/sys-devel/bin86/files/bin86-0.16.21-amd64-build.patch b/sys-devel/bin86/files/bin86-0.16.21-amd64-build.patch
new file mode 100644
index 000000000000..9e5a85299fe6
--- /dev/null
+++ b/sys-devel/bin86/files/bin86-0.16.21-amd64-build.patch
@@ -0,0 +1,19 @@
+This should make it built on other archictectures as well
+
+https://bugs.gentoo.org/428228
+
+diff --git a/ld/x86_aout.h b/ld/x86_aout.h
+index 542a70d..a38488d 100644
+--- a/ld/x86_aout.h
++++ b/ld/x86_aout.h
+@@ -19,7 +19,9 @@ typedef long Long;
+ typedef int32_t Long;
+ #define __OUT_OK 1
+ #else
+-typedef char Long[4];
++#define __OUT_OK 1
++#include <inttypes.h>
++typedef int32_t Long;
+ #endif
+ #endif
+ 
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index b233f3b5dc12..0077d4d9e97f 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -22,7 +22,7 @@ EBUILD binutils-2.33.1-r1.ebuild 11909 BLAKE2B 7401764d65bb05f67b9892bbd6e1b66eb
 EBUILD binutils-2.34-r2.ebuild 12005 BLAKE2B 8455ac022e79d7099fa863cd969cff17aa6ff3e3a260120da75b2564bc8eaae3287b3f1242df8daa68f95bb47b491502552f67bb84d91ad9c11684663a4b86eb SHA512 36f794faedf862a43ae5e3895100506c18b12be46ba9e152d694be932a9f9f754539c4faaa9a72ffdcd2410b5555e97af22c1947233a26548242d8e5de37f152
 EBUILD binutils-2.35.2.ebuild 12886 BLAKE2B f917e60ca6585449a67d14de97f653617f0ae86a9fc7f5442443314ca25d4dae6b05338b7d76455a2b64ca5077a57837699417f56752a53678f21b2dc8174cf0 SHA512 963629da28ae4bc0ec436341269f03f2eaa7bf40d2ffa7d7c9a1ee4ac2c29ee8a8ded88cd3263b9155be7d66b6267f941dede3aa0246eb5540831a543b780db1
 EBUILD binutils-2.36.1-r2.ebuild 12788 BLAKE2B ce79b2adc7b9affff16cf23a5465007a1103aaeba4c6a97a73123028452a1ce51d9e305c1b3740c83c7ab291a93f9338eecb48ac3919c95d53e2522ca2326a11 SHA512 dacb6dbb601dd3f1ab214b6c8ab05d08c7f75cdf76024833a8766235ae058ad51394058c5bc357ac4fd323a51d28f360352e0bedc7f726e66cb362435a8e8322
-EBUILD binutils-2.37_p1-r1.ebuild 13067 BLAKE2B 4ebf5ec7d780b35ce8fa1504cf0e732daab35f2bb810979afe0b1406c8a9b9a5da6d04941adc51481dc7ccf0976d28b95daa445f7dad5e112d0ae5e3e43432d2 SHA512 c3b331e42e3efc501e3327b58f9a0692cf6ea220e23387fba0b0d9f82c7ced6b7c4f3de404643e15ce63abb00ad2e538cbe262b72194e0e69caf3899cd543ad7
+EBUILD binutils-2.37_p1-r1.ebuild 13128 BLAKE2B 2c6b39578d362583dc0f5b73bd29de96745cafd9d5ce48cb6dc6588c4be219de19b84876984d35f65759077467f0d364e5737d345e9aa5326a23627acec0ee27 SHA512 7e72f27c8987c19dc5e3c1ae70b7503621f94f9045038bde09ec8a9f2f988a8cfa3a06ea39a1d17ba17e4d0c4c5690b647d271d4837fae216f2eb9ee6e8c4499
 EBUILD binutils-2.37_p1.ebuild 13074 BLAKE2B 962aba0656d4a267d0803f22eb964cc2f5ae354adc2bd74e75b8cfad7f233ea3c4af911f6d16133cd1b50445153894036d5d78c18941a88cb8dc807efc11e1b7 SHA512 db3dc207c1cc072765c056861b3c3bc4bf18e3f7264d08b08578965d597c70ba616df4683ce94426b5d317a862e656344bdbb5afc6728b30e46d3df86e2c4b26
-EBUILD binutils-9999.ebuild 13083 BLAKE2B b1b5a0f27b8b960157962dc5ca861308d95e1ec95113168a815fc95428a4790a7db0b24290b0c95a3cb3a1da572dec5b8cc08c9def1deb53c8884baf8d3984f0 SHA512 b188d46e800f197cc18f62beec9ad72c3de53dd73176d5a4cfa30dedafccc41aaa520b0e0a58571de8cb417d751f1439cc818d02a823808bb04c7de86db968cc
+EBUILD binutils-9999.ebuild 13144 BLAKE2B a8a2a82bf406f442fef31cbd4e7db3a679161ccafa4f24ecd6a92ce9dd6eca896cc3d49f788c297791d1d8ddd5754807d2e59d12d870217f70a327e11d653eca SHA512 70b2ce6715c30d24f803f10d7edd66d556975bb9612c27b6dabab7e7b6a5b0cb4bc69a35e90ba818b35e6f79122b9361a7d52793bdf3389d2925942772311337
 MISC metadata.xml 727 BLAKE2B 4ee6dbcec8f8ec7e5fe028344dcad9689e6d4edd1871a4b9f6b28952edafa2dd41df7e03f3a72d3fcf5853a791f7a77a5aa08108d24ae9589e7c0c98b564ddad SHA512 999c1f33f4a25ab6b8e1ede0862e9ad849dd44366236914f2558cc9377336d49989e592973625d9833ad238645e918d7341817e2170ff6a6029b40f7addb775c
diff --git a/sys-devel/binutils/binutils-2.37_p1-r1.ebuild b/sys-devel/binutils/binutils-2.37_p1-r1.ebuild
index dd449cff9164..b1c9f93dd000 100644
--- a/sys-devel/binutils/binutils-2.37_p1-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.37_p1-r1.ebuild
@@ -177,6 +177,8 @@ src_configure() {
 	# Keep things sane
 	strip-flags
 
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
 	local x
 	echo
 	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index 8394f7f945ea..530596b9a949 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -178,6 +178,8 @@ src_configure() {
 	# Keep things sane
 	strip-flags
 
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
 	local x
 	echo
 	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index e2b5a9ea685d..46de9a989ce2 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -4,5 +4,5 @@ DIST bison-3.8.1.tar.xz 2800372 BLAKE2B 0b70ee1b3ab8075540d9254cffdc1dfc9a9fb354
 DIST bison-3.8.2.tar.xz 2817324 BLAKE2B e211b61494c911f55b72a8b70b5a48cdf4000ce9e675a1f1f52735bb8f57d93a3f8075341451263af9c9c531004907ae2b62b1873e7e4664c2cd26fa3b12271c SHA512 d4d23af6671406e97257892f90651b67f2ab95219831372be032190b7156c10a3435d457857e677445df8b2327aacccc15344acbbc3808a6f332a93cce23b444
 EBUILD bison-3.7.6.ebuild 2433 BLAKE2B 0ed0bec877079f60e821b335f829182a23d564111df453066ba7d312c9c943bd944cf095b6c4aeb8756efcf6299fd7e8fcbcdba0befc8b8804d629fc5f21c6d3 SHA512 2ad813a961f85a7f120f95b1a6d37cc217368a660ae763b2fdc1c61c85ba99ca26a92bca932591ea73d7ca69c8ce1902d0d1a3317fd44b30a89cf6f3dacea07e
 EBUILD bison-3.8.1.ebuild 2492 BLAKE2B 9a7c6514cb839e0ed4d86652aeff12b309f80dad54253c2791acd66744cadec894357ac2a106e9fe92dfb0c5fa8f9c749c4c9816e031a822ae8c5e4eb0148796 SHA512 75ef8593d1884d207a7fe5bf82741e5c73d59e4be299afba037ffd741135154734aa6d8c4c4611eddeaaba3bc397052c51326a66949edb82ca15f9336d217102
-EBUILD bison-3.8.2.ebuild 2492 BLAKE2B 9a7c6514cb839e0ed4d86652aeff12b309f80dad54253c2791acd66744cadec894357ac2a106e9fe92dfb0c5fa8f9c749c4c9816e031a822ae8c5e4eb0148796 SHA512 75ef8593d1884d207a7fe5bf82741e5c73d59e4be299afba037ffd741135154734aa6d8c4c4611eddeaaba3bc397052c51326a66949edb82ca15f9336d217102
+EBUILD bison-3.8.2.ebuild 2484 BLAKE2B df7004ff97a7e2b9970a955b96c8706b608cc9586631e1414d912ef080ee54d48ee4879684f8fdeca43692d06c6007d72bd21ad79db2b72000a41b879b2c22bf SHA512 9522c4cf9c9421bdacf6ad7546275067c1130dc4fe8008f3134f8f26b6c6a35c64abfbc9dde9fcd7519ce2404a84311ea709b31f0d7f693f80e888cabf0efbc0
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-devel/bison/bison-3.8.2.ebuild b/sys-devel/bison/bison-3.8.2.ebuild
index 21002c007b81..0815391c170c 100644
--- a/sys-devel/bison/bison-3.8.2.ebuild
+++ b/sys-devel/bison/bison-3.8.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index 532d6aa5a879..f3b6b41a2d9c 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,8 +1,8 @@
 AUX bmake-20210206-tests.patch 467 BLAKE2B 7c66cfbb610f2ea9615a737dd2d97fbea359ecb0e5b5c746447b9a0e9d2dff188f6f0d45225dd07d1226a86297f0c9ba8b8be7587039f2cc7ceaab4bde61f570 SHA512 3d855d54b64e2871ad8ccd494939c92a6bca2bec61f186e907a9b6b8b4f51b4ff63fcacbb8b6d44cef33a39c6ba2bed6c1fdd30d7ad65ad03d1d659781c420fe
 AUX bmake-20210314-mk-fixes.patch 2054 BLAKE2B 404e99593f04408e3f62d8c6118fc1676ef414b4cc18f5ec8b089182fad8865ad79e40c236e58b084f3194bdcc94c92e1e10e40efbddc142b84053117065e202 SHA512 8c9e823dd158e352021f0905e2a15cb8d7da3020c49a8f824cc5dbd8f33910fc64629d5f400fd8651a16b07e0685a1247a661fd9230a62b7330bd5fc71427dd4
-DIST bmake-20211001.tar.gz 767532 BLAKE2B 1571db7f342d91b1504598dc53ca1f1e9aeea4c4ed3f637721803107122fcf7ed9c8cfdc034d996ab400364d35ff721fb0b248a92e5a1283dacd7a83c9c7b1d5 SHA512 b8d3d19facfa3ef46ca8c966f8ccfaeff65a1d9f210072fa569fa12573900babd6d6624e397e71d76d58b551fad13c26e590d02eb94f726e29a6a00d1b8b0b75
 DIST bmake-20211024.tar.gz 774782 BLAKE2B 8ec30e133af832ed1cafba7592060dae1ad9e8937d1dd124446e0c74a26a40ca7ad42cfef10282ff13304672565ffaa8219dc027ba8fed2fdf735699397c7e41 SHA512 c39e5541d1c501ea8371825017fb0136a0778e02ec87c77a2f84a80d277573f97985f0b260147284b3cb4309ae6cfd3565330c2a6171fd98aec2c58f5a38b28d
+DIST bmake-20211212.tar.gz 780800 BLAKE2B 4a69f4881c70319d9548a688284036732ca541c0abc3082dc126ff743e550e6ccd1dee5c0909029e35f7e2329866e806615c2e4f8cd3bd4d7739e9b03f677326 SHA512 210065d90e1d4ec68df78d9c19d7f685d2a3f8dbd837ca1f6e40f250ae94b9e03f8ca07d15d3e9f34f27229b3e410ca9aef633fcc5f7661967a2553846524eb3
 DIST mk-20210330.tar.gz 107380 BLAKE2B 9ac30a117d9ba31635cf8d8d29fdba76f148611f47628403ca8f807081c32509f10498d3c30fd24985e5420af4710fe59fc6315d71f2d0c1cfed93263a06553a SHA512 6acd3ee911442934082f4f877d795b07c5e23022eaa9c0874799d97e92a2f5a663cb45f94b7f9745c49cbbce6b7e755a29e381ccfb9e68a0be1eedbd22fd5d3b
-EBUILD bmake-20211001.ebuild 1265 BLAKE2B 9e38d36c77052e8829a8e75a36178a705218f910f0b588ca1f459de6f1a3e1f0445894ab7a34da2723e1caf14494b8a1fef663395b657e0dc492ec38aff94f4d SHA512 f7d935f6c5b449c52c67b0f2cf61d7e6eeba38d4d24f7934f46023cf2fcc136d06c1f4443d51340723b32b00bc7314f0af99dbe342edc515f74e489ee3da0e3c
-EBUILD bmake-20211024.ebuild 1266 BLAKE2B a5942f2e09caac94b265833f06d341cf4c15856cd81dcb44e606250ffbd13b8ed541ccc11a953fdf5762da59c151667a5755fa2436415d6bc09e2498b89c63ca SHA512 e2afff68379224b51a8274901f00a18e7f230d95ee63488d936ddaa1f419331f16f7f379266d27f6408f4b1bd743d867ddf5706653ea196bbe76ac9fe5dbfd10
+EBUILD bmake-20211024.ebuild 1265 BLAKE2B 9e38d36c77052e8829a8e75a36178a705218f910f0b588ca1f459de6f1a3e1f0445894ab7a34da2723e1caf14494b8a1fef663395b657e0dc492ec38aff94f4d SHA512 f7d935f6c5b449c52c67b0f2cf61d7e6eeba38d4d24f7934f46023cf2fcc136d06c1f4443d51340723b32b00bc7314f0af99dbe342edc515f74e489ee3da0e3c
+EBUILD bmake-20211212.ebuild 1266 BLAKE2B a5942f2e09caac94b265833f06d341cf4c15856cd81dcb44e606250ffbd13b8ed541ccc11a953fdf5762da59c151667a5755fa2436415d6bc09e2498b89c63ca SHA512 e2afff68379224b51a8274901f00a18e7f230d95ee63488d936ddaa1f419331f16f7f379266d27f6408f4b1bd743d867ddf5706653ea196bbe76ac9fe5dbfd10
 MISC metadata.xml 353 BLAKE2B 70bd5eb274c4693a005986471e5a5c29a162bd0a080a7ba590c64171f2aa171bf9670093419f0b3e9ef304e5478f71df4899082e3dc76b4b0cedfe782a6625df SHA512 ade70c57a7ae5165c432d2024ec685609971347a94ecd69ab73142ff602f4cafb49df880d4dd1cee5695f1ea11c2c0ccc837d9a1ad38e50c61d0d27049279bc5
diff --git a/sys-devel/bmake/bmake-20211024.ebuild b/sys-devel/bmake/bmake-20211024.ebuild
index 5d5f15630855..f3e4c0d04f65 100644
--- a/sys-devel/bmake/bmake-20211024.ebuild
+++ b/sys-devel/bmake/bmake-20211024.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 # Skip failing test (sandbox and csh)
 PATCHES=( "${FILESDIR}"/${PN}-20210206-tests.patch )
diff --git a/sys-devel/bmake/bmake-20211001.ebuild b/sys-devel/bmake/bmake-20211212.ebuild
index f3e4c0d04f65..5d5f15630855 100644
--- a/sys-devel/bmake/bmake-20211001.ebuild
+++ b/sys-devel/bmake/bmake-20211212.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 # Skip failing test (sandbox and csh)
 PATCHES=( "${FILESDIR}"/${PN}-20210206-tests.patch )
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 679397488889..350d57265d44 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -15,5 +15,5 @@ EBUILD clang-12.0.1.ebuild 11934 BLAKE2B 475676d2f39c8fd4943613f38d370c38e540038
 EBUILD clang-13.0.0.ebuild 11496 BLAKE2B 8f13ce96f6a736a5877b7ac01ca2b6dfe1584f33cfbb104b97a1662eaedd4cc1fc90ee9827303e3aa88e1fffd8733d07b005bf71bf318c577c8cbf7abc499f1a SHA512 0b4823110e8ae21b02216069a071ae0d299a02f1903ea97b9fcaba70bb47c243b31aa2fdc80977ad15180e9a054a79e01be7578363386122b73fb250baecbdc1
 EBUILD clang-13.0.1.9999.ebuild 11432 BLAKE2B de320c8dbe6cb5370445de891b152527985d9f1c7b95c7b2f9c05a52992379313494710e2de6d0efa6875d83c7ea0b9b78d7934fa56c23e5c4aabe03370425f7 SHA512 37670f1a64b7397c2548f13d0bb82190b8c13e8c9fe051baafbe04408ae14d8a5925db0e330498e2d4badc1a1e3e0b90792a802032038c6f3b4d1bce114d91e3
 EBUILD clang-13.0.1_rc1.ebuild 11438 BLAKE2B 57732231a9c7aba72a4226e21baa8385b217a57a3820d5ac4214a4a8887bd8d79e981dbd9cdb98e580ed1ecb35f4a7213a9ce3a2051b8f14b86c6346248b93d5 SHA512 3809e39542c449a1171e69afb91afbe0c2e69220584f55ec307c51d3290903497fd97a21ed044d4699f087a70df71a185a4747514896e2c1241c2b369b065d1c
-EBUILD clang-14.0.0.9999.ebuild 11432 BLAKE2B de320c8dbe6cb5370445de891b152527985d9f1c7b95c7b2f9c05a52992379313494710e2de6d0efa6875d83c7ea0b9b78d7934fa56c23e5c4aabe03370425f7 SHA512 37670f1a64b7397c2548f13d0bb82190b8c13e8c9fe051baafbe04408ae14d8a5925db0e330498e2d4badc1a1e3e0b90792a802032038c6f3b4d1bce114d91e3
+EBUILD clang-14.0.0.9999.ebuild 11482 BLAKE2B 72fbcc1554a11a7425658adb293a2cebe78cba415739d958af3b466f22f8c13294f69d3369301f1e45d06a020dda7f61fb7d3f7b6fc0c34fc6300fe97609a811 SHA512 cc4f6effcca92a09f949a490e786519dde1a9b6d84af48c78603a5888bc82c0a846a9adc74c5a31363dc8d29d4b104cb2f838e58d8e13df7fad5f98f8f060cfd
 MISC metadata.xml 1337 BLAKE2B 5e4f7d63cd9f3b03600801cbe3b2963a1e6b2fb48e36fdb12862f467829222c182f5958d35b535d8fa8467ebaad05c9641cd645294706e3a0f4a078dc9c2f8cf SHA512 50c1a7c33414f9d6294873478f1017dfb21311b36c916e15a8b068cf2a968fe8d774b51515f61c3632d2b204f103cc7ae6853b14d582291087a0fb8e15c0b35a
diff --git a/sys-devel/clang/clang-14.0.0.9999.ebuild b/sys-devel/clang/clang-14.0.0.9999.ebuild
index 0a01ce5254cf..26a32f2542ff 100644
--- a/sys-devel/clang/clang-14.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-14.0.0.9999.ebuild
@@ -262,6 +262,7 @@ multilib_src_configure() {
 	)
 	use test && mycmakeargs+=(
 		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${BUILD_DIR}/bin/llvm-lit"
 		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)
 
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 1878ccbc138d..f81d11424a05 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -12,7 +12,7 @@ DIST gcc-11-20211127.tar.xz 75659912 BLAKE2B 2de0883de6596457189da75977aa4628a45
 DIST gcc-11.2.0-musl-patches-1.tar.bz2 2999 BLAKE2B 3e36bbf2f93fdce15e20f807fa262f7a7abbde85b6f6b4e1383f6eccd8a53d876687d56cde83a80cde8a50e15bec407a1212aa0c85520892563e3d5ef7aaca98 SHA512 21483912a7b152f27db82d837a4cf91f2552d5fe238702aeca0c0dd8c7d3695bc70d8794c94a19106df28e053baf14c38433ca8e38e849082b76273cb51f2384
 DIST gcc-11.2.0-patches-1.tar.bz2 11537 BLAKE2B 9dd791ada244c9b70b8b99f9f305a688c248134715ed1b26d406e53b114983faae6873cdc521497164388d24d5f61c199e98df146bc02f5578e877295bcf5c82 SHA512 6539efc60c656d0798a5896dc1b944ed69914b815102c7a1c10bdba4ef935abd326b01309f38316e121f1ed90ceb2abcaf65df6af116892daad829ac2623cefc
 DIST gcc-11.2.0.tar.xz 80888824 BLAKE2B 69b61234ac436edfea2933df68c434a2ce7aa4454ef4da573e82587e1a42dc420189e949cfdadaf4cb37fc0de9674822210a95b77ff03aca0dbedfe67df19cc6 SHA512 d53a0a966230895c54f01aea38696f818817b505f1e2bfa65e508753fcd01b2aedb4a61434f41f3a2ddbbd9f41384b96153c684ded3f0fa97c82758d9de5c7cf
-DIST gcc-11.3.0-patches-0.tar.bz2 12483 BLAKE2B 3673956c529655f5c616caf92b8004e41a10ff158b1512efa4af4bfb707e8379f9d7d0337c3780c38afe5b322ad95bf63a981d873fb00f44571f7260961b4626 SHA512 7d19c24a13871288812ba50b113ac64629be7e72e642023dd77ddebd9b6a51cae9d2de7eb8cc42c1188b0553f62bb186614014ba10cf92de5967c09f08392393
+DIST gcc-11.3.0-patches-2.tar.bz2 14029 BLAKE2B 83def740a49e7dc957fe635b1c97c3553f67bdc164aa919747d5a784de807f724b509b51880e631ace68700268d9f1048e9f075145f8b16ff69bd9f6ca6ff3d1 SHA512 3a13b5f68a5ce0182a703fd257e46ed644caf7b70a44c32d2e09b9dd36f81e66f22bb0c31063dd96adad1076e08e69bdccfac182e01b0b0b06c2d583095b8629
 DIST gcc-12.0.0-patches-2.tar.bz2 11564 BLAKE2B 5954ee8dd5edb30ecde54275d9ffd4d2f5671de82fe7789688d1220b181fbcdeed3d5305858d8af1fd016e627687ca6f2ebc76bb6b49e9b903e8d63c3de2baea SHA512 6299a1f46fc3f29934db7af20651c0c3e1266bef89b222fc9e3bc6a7e7cd2869301c5b227a4105157456474ae8a626ec550c15971bceb2f844476a9f5bc56284
 DIST gcc-6.5.0-patches-6.tar.bz2 15320 BLAKE2B fe6b60cd45d00187e4e41e607af6a1137481a6d8f4421a0ead7da9fd86d0cd19bf428e5d150e1de4e0616606f8d6c31738da24be8151c58f7760aa92432ea3d0 SHA512 87c2a6726373999472cbd6211e486864266c833d5a07f8fb02dd3054b7dd3f86aa86ea47b17928045ef6e46d82f429f879d6f69d8adf3b6f2956f4ac6b3f80f1
 DIST gcc-6.5.0.tar.xz 74355588 BLAKE2B 538595d32000b15a53577f0dc6b164d75791a8ccdf90500d5f667ff78378ef4ab9bedb8a590848907caf863bf1165ebe108b5e81eb4b54e85ced4002affde693 SHA512 ce046f9a50050fd54b870aab764f7db187fe7ea92eb4aaffb7c3689ca623755604e231f2af97ef795f41c406bb80c797dd69957cfdd51dfa2ba60813f72b7eac
@@ -27,7 +27,7 @@ EBUILD gcc-10.3.0-r2.ebuild 473 BLAKE2B c9061341ddfa8d143fed0ac5794db4a872527f47
 EBUILD gcc-10.3.1_p20211126.ebuild 524 BLAKE2B 5336b4951c7a7a8ce88f03bd6d56118a244fdc23ed11d6925c901f4516f7a6a3b9ef8bc6df601b5dd7fbb1a2d3df82cf596c46af164528366cc6a0055de2f6eb SHA512 7f0b6c7bff11e5dcca4d6c247be9c901612dd116c25978bcf9093d32d46241ce50e2d4ad178f83261f97e26228249a2ad7def4367db607caa8f138db46351910
 EBUILD gcc-10.3.1_pre9999.ebuild 649 BLAKE2B 7c2d1e2d939433104d3fb01de2dbdb12b6022a503d2252d8371f699577eb289276897440113bc70745deb7057819d63890be8c0fd0022c02cc6d565fb1c1307e SHA512 eaca9dd9ac89a354beae99d38d7df2004289d281236f4a41457afbba563dcc8f6c1bfe24e8ea9219019c2b7e1c9abb67f428c96389fc9f6b8263db2af66ff3ef
 EBUILD gcc-11.2.0.ebuild 466 BLAKE2B 9897dc608217b7fbfd44fc14446638d23f18c0516a19b73e317aaeb328f82ea89452bf93888628a7d22d0892f6ca0a959cfc6e620a5afb9b8ee7063a4a6a173d SHA512 425b789e1c7f495b2581e9aa6a435fa7c1c23b0e167c44e81451ef2e7896b35bdbe9772bdff7b78c9deb0e4f6357f956f28151072b35fbb233ec5f9e771bf458
-EBUILD gcc-11.2.1_p20211127.ebuild 517 BLAKE2B 1116c837523bd4f8d84242e66a49678e2bd5f364e6025c5dde22bfa62dd16b62ac6513222b1dc2bc43f5ba273f5909d898787f915bf44a675309354ff7f06f2e SHA512 ed21b74da11db76c8c0f7a409ffe10ece126f4cab76a013e01a373f856278ee586d9bf71e14824dbfeb8d600aa96c48e412f64291b5c6d4d06796f4ad3d14952
+EBUILD gcc-11.2.1_p20211127.ebuild 517 BLAKE2B a5b3f00061fbfb82111be6bf2d91ca191a805a0bd392e340d80b189ecc12d02d3f750c7f5135157619c126d62021a58eeb29d5c52892316b3caf327dbbb01a92 SHA512 e9c6e31d98e988226dee5abd46ba422d938e89f7de31c353814824881aa6da3443252c481495f90f03f44fa56d94da5cc9d234cfdaed8b62b1d14e17fc30f55c
 EBUILD gcc-11.2.1_pre9999.ebuild 527 BLAKE2B 69ad8ded1819b6b584ddac3ad639750d5d13f465854bf88093d0a48f5f83f5919ff66014ff0ae67167e88d3282cb108291a0ffe86147f7f505396c77a887a017 SHA512 0011d0d43953cbcd1afa201005f52bc13bedffeab1a45469d6d7b60e2e04343b1a4385dd8bf684e442858ab80b314aa849184e3353e0e3adf44839c3753de4ad
 EBUILD gcc-12.0.0_pre9999.ebuild 367 BLAKE2B f4d4fae47ad12381f9f25e4c97964d7a155f7b1c186a324c8c96109559da063f5f568a168e32a078e1afe39bfa786260a7a3785bfed648c68156fe14ad3bce56 SHA512 2a4e545ba1ee6f16f0301a367097b0253dd9f786873b45b31be2b0284605dbb9bc8d6c34d4f0a2d7825e92fa6c8fcedca4b680e1cb7d4446574c0d993c8918c9
 EBUILD gcc-6.5.0-r4.ebuild 445 BLAKE2B 2f3d0d7d881671cb42296b53441f8c379bea95dcb83348fc9d993b1c586c828a82188ca39688a728a32e1d37f19a5bc5148e339654477c5383d90e29dc527ca3 SHA512 1c2fcee4393c001dfe1718ac6bc7ace20df0b77bfc9cf1c94683a60f3c0d42cf62b8e6afe4d8938937eef870083b7026491cc3c4952d67fa81894e543ec4653a
diff --git a/sys-devel/gcc/gcc-11.2.1_p20211127.ebuild b/sys-devel/gcc/gcc-11.2.1_p20211127.ebuild
index 808255171410..5d35927e71de 100644
--- a/sys-devel/gcc/gcc-11.2.1_p20211127.ebuild
+++ b/sys-devel/gcc/gcc-11.2.1_p20211127.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PATCH_VER="0"
+PATCH_VER="2"
 PATCH_GCC_VER="11.3.0"
 MUSL_VER="1"
 MUSL_GCC_VER="11.2.0"
diff --git a/sys-devel/icecream/Manifest b/sys-devel/icecream/Manifest
index 9d55a3b3f447..7651bc5e933c 100644
--- a/sys-devel/icecream/Manifest
+++ b/sys-devel/icecream/Manifest
@@ -1,5 +1,11 @@
+AUX icecc-scheduler.service 264 BLAKE2B 27b85732b81c77d419a3acecdc31442fa6ebd3cfb39847b61b056a266049ed4eda1fe533abec2216c6fa2b85914714b72796fe9c892c880671d9ad441a221831 SHA512 c9508266ac612cc6e9110da0d00351ef6b47855489fa9280a8e13dab1c213b0bc1b3e3e64a9bfc16ce89d295bb7418120bd46f8f2c22959d89d7178846abfe0a
+AUX iceccd.service 273 BLAKE2B 6d7ffa2776a8e2d813949185667f949a676240b231bf0c4d7640115fd79cb0b63a2a78506fdf4c557428390b56161bd1a296cb0f44a2505ce61a8de3aaa0b891 SHA512 1383cb4ef14bb673d49d000175dbc9363a55dc1eeb469abf2a393d7693eae0a9b25687a317431b02fd054c4f59bcba1a8eb7132c473c66236d7e2106b35fe079
 AUX icecream-1.0.0-libcap-ng.patch 195 BLAKE2B b6ff2376e02cfd0a1b486c53d5be1012223d16794c718a9aa64dcb89f720884c6a5d01656d99ea69cc44de2ad34731b744a9558702294189d01d01d0d330595f SHA512 31f69f07ad55465103587239249d2fd173dc3b920a026c7754635a3ada39696c1ccccbe636ced0ca2a2283b4adb8f23083a32586c2e803c1f18ad4afd3cc8746
 AUX icecream-r2 1733 BLAKE2B dbd919701df670e7cd1b47cb39fa55eb18c6e539ffa637e2a505ee60b15bb9febd54237b57f42214769e273f5a5fd29cfcc9e29a0a941807388fd9cc7d133226 SHA512 033ce0d49445db3afcbdd6724863651d4951b8f36f6253a13854abe9ee976419687579089aa1c5c808eed08aad357e34bb9f1e70570857cc39f2515ac2f211b0
+AUX icecream-tmpfiles.conf 103 BLAKE2B 4a263834594e0f1fe8cc8e356520f937cfc5f1abd9f019a2b88075643ff651d002d49de113d3ab4bcbc10e22b43e03ee85ea8f948765800ba74c43e5dd3ca0e2 SHA512 152d687a9fe18c71f08c002ee87d36fe18572a6e5b7ab976bbde784c6ff80c5ecda59f9cce4561868fa53ad76a040674af4b0579a97c78c9bf141bc0533f7631
+AUX icecream.openrc 1669 BLAKE2B 18726b8d8752f3db9a2864612423dedd00b347a6802012de5c0ca30d2516b1995c9bf4ae32d1d320a5e401d9a3466f8fc7165fa805e0b9991c16b0f4a96d59d6 SHA512 8c3c66ffd508284f0dc7c9e2695d02ff283048f82f80ac9b41982b6484967b39856a4e7651015d4bb10f74e3f0a7435bd59c0a0ec5eb62bc5aee49cae0354fde
 DIST icecc-1.0.0.tar.bz2 485534 BLAKE2B 31a978a4a461f20716a95277426e79d4c298c212d36361dbbd68c5affcbbbe2f0c71f743cc7b731d86fbb5f09ab556182482f56e1382be8572d019f80a004fc8 SHA512 4292ecef6232112c3f4531cb2290a55f70c5c24095fef0865af2526d49fc10a043ffb06d22552e161f671c18ff1ab62795c3a63e2c8cb26f869cf65d0938af2a
+DIST icecream-1.3.1.tar.gz 224068 BLAKE2B d7d66dadf27b0b88ab706bf217ce2b0d33b5db2ed95e48c4e9dcbd000931688ad6809ecbd4e14f0f3889bcebddc8543bd364c9dda09ba71e5dc04d0a5a2122d5 SHA512 d850394b4093defcf2c50bb3f9306348a45bf17d21f4730baeee7125998c2a548b7b3a7597785855d7e388e84830769bf0ec1c4136330a4c8e359cbdd111f5da
 EBUILD icecream-1.0.0-r3.ebuild 1274 BLAKE2B 2967a7bec5f09e6477a099f6c49323e3a94a721ac84555deee6719737da356d3f214835d8d6c9a00f7e4a5f81d8cda9ac624aa18ac8ac289097a161518cce408 SHA512 7fac57e7f533db016f503f47256076d5ba5b13a83d68237a192c2b22d2914984342874bb47b6cafabe5b915297b2c5912a3fe66e2d16e4cc6fc20a94160626e9
+EBUILD icecream-1.3.1.ebuild 1686 BLAKE2B 179d8da593e7a3d45930ca0fddc5202bcad2f8b5229e9dc2624ba0cc170075fd7c0f7eb635a95a9141dc0839bb92a5420c4e97d7b0008ad382cdf0eee44af4e1 SHA512 361b643bc8d83e1102f266858a9c12c70cc37267033b0dc22633ff6a9cae903fb62702ad7c8f52306e5a01030c6a6c3eab8e19063775d2146019f90e5c6dfb2f
 MISC metadata.xml 337 BLAKE2B 0a42596492049a954cd58c992c68ef68bec2a53a4eaaa83978b2d56c577f6c54fc8bc18b7621b0561fd8a348996d138e8a676ea129c94d08633663d3e254ac1a SHA512 7c96d0c35a47e595cf50c1c6efe5ccb186ec974ed0b31fea908240380f796fb9e77e2eba0ce9995a8473cd836056421d6475022f68685d88f8c360292d7284ec
diff --git a/sys-devel/icecream/files/icecc-scheduler.service b/sys-devel/icecream/files/icecc-scheduler.service
new file mode 100644
index 000000000000..f0db05af534e
--- /dev/null
+++ b/sys-devel/icecream/files/icecc-scheduler.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Icecream distributed compiler scheduler
+
+[Service]
+Type=simple
+User=icecream
+Group=icecream
+SyslogIdentifier=icecc-scheduler
+ExecStart=/usr/sbin/icecc-scheduler -u icecream -l /var/log/icecream/scheduler -v
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-devel/icecream/files/iceccd.service b/sys-devel/icecream/files/iceccd.service
new file mode 100644
index 000000000000..0b74362dfb3a
--- /dev/null
+++ b/sys-devel/icecream/files/iceccd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Icecream Distributed Compiler
+After=network.target nss-lookup.target
+
+[Service]
+Type=simple
+SyslogIdentifier=iceccd
+ExecStart=/usr/sbin/iceccd -u icecream -b /var/cache/icecream -l /var/log/icecream/iceccd -v
+Nice=5
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-devel/icecream/files/icecream-tmpfiles.conf b/sys-devel/icecream/files/icecream-tmpfiles.conf
new file mode 100644
index 000000000000..a7cbf53f96ef
--- /dev/null
+++ b/sys-devel/icecream/files/icecream-tmpfiles.conf
@@ -0,0 +1,2 @@
+d     /run/icecc          0775 root     icecream -
+d     /var/cache/icecream 0755 icecream icecream 3d
diff --git a/sys-devel/icecream/files/icecream.openrc b/sys-devel/icecream/files/icecream.openrc
new file mode 100644
index 000000000000..b574874b2075
--- /dev/null
+++ b/sys-devel/icecream/files/icecream.openrc
@@ -0,0 +1,55 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	basedir="${ICECREAM_BASEDIR:-'/var/cache/icecream'}"
+	verbosity="${ICECREAM_VERBOSITY:-'-v'}"
+	netname="${ICECREAM_NETNAME:+"-n ${ICECREAM_NETNAME}"}"
+	iceccd_logfile="${ICECREAM_LOG_FILE:-'/var/log/icecream/iceccd'}"
+	nice="${ICECREAM_NICE_LEVEL:+"--nice ${ICECREAM_NICE_LEVEL}"}"
+	scheduler="${ICECREAM_SCHEDULER_HOST:+"-s ${ICECREAM_SCHEDULER_HOST}"}"
+
+	if [ "$ICECREAM_RUN_SCHEDULER" = 'yes' ]; then
+		sched_logfile="${ICECREAM_SCHEDULER_LOG_FILE:-'/var/log/icecream/scheduler'}"
+
+		ebegin 'Starting Distributed Compiler Scheduler'
+		start-stop-daemon -u icecream --start --quiet --exec /usr/sbin/icecc-scheduler -- -d -l "$sched_logfile" $netname $verbosity
+		eend ${?}
+	fi
+
+	noremote=''
+	if test "$ICECREAM_ALLOW_REMOTE" = 'no' 2> /dev/null; then
+		noremote='--no-remote'
+	fi
+
+	maxjobs=''
+	if [ -n "$ICECREAM_MAX_JOBS" ]; then
+		if test "$ICECREAM_MAX_JOBS" -eq 0 2> /dev/null; then
+			maxjobs='-m 1'
+			noremote='--no-remote'
+		else
+			maxjobs="-m $ICECREAM_MAX_JOBS"
+		fi
+	fi
+
+	ebegin 'Starting Distributed Compiler Daemon'
+	start-stop-daemon --start --quiet --exec /usr/sbin/iceccd -- -d -l "$iceccd_logfile" $nice $scheduler $netname -u icecream -b "$basedir" $maxjobs $noremote $verbosity
+	eend ${?}
+}
+
+stop() {
+	ebegin 'Stopping Distributed Compiler Daemon'
+	start-stop-daemon --stop --quiet --name iceccd
+	eend ${?}
+
+	if [ "${ICECREAM_RUN_SCHEDULER}" = 'yes' ]; then
+		ebegin 'Stopping Distributed Compiler Scheduler'
+		start-stop-daemon --stop --quiet --name icecc-scheduler
+		eend ${?}
+	fi
+}
diff --git a/sys-devel/icecream/icecream-1.3.1.ebuild b/sys-devel/icecream/icecream-1.3.1.ebuild
new file mode 100644
index 000000000000..72ab4fad07b2
--- /dev/null
+++ b/sys-devel/icecream/icecream-1.3.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+AT_NOELIBTOOLIZE="yes"
+inherit autotools systemd tmpfiles
+
+DESCRIPTION="Distributed compiler with a central scheduler to share build load"
+HOMEPAGE="https://github.com/icecc/icecream"
+SRC_URI="https://github.com/icecc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+
+DEPEND="app-arch/libarchive:=
+	app-arch/zstd:=
+	acct-user/icecream
+	acct-group/icecream
+	dev-libs/lzo:2
+	sys-libs/libcap-ng"
+RDEPEND="${DEPEND}
+	dev-util/shadowman"
+BDEPEND="app-text/docbook2X"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-clang-rewrite-includes \
+		--enable-clang-wrappers
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	systemd_dounit "${FILESDIR}"/iceccd.service
+	systemd_dounit "${FILESDIR}"/icecc-scheduler.service
+
+	newconfd suse/sysconfig.icecream icecream
+	newinitd "${FILESDIR}"/icecream.openrc icecream
+
+	keepdir /var/log/icecream
+	fowners icecream:icecream /var/log/icecream
+	fperms 0750 /var/log/icecream
+
+	newtmpfiles "${FILESDIR}"/icecream-tmpfiles.conf icecream.conf
+
+	insinto /etc/logrotate.d
+	newins suse/logrotate icecream
+
+	insinto /etc/firewalld/services
+	doins suse/iceccd.xml
+	doins suse/icecc-scheduler.xml
+
+	insinto /usr/share/shadowman/tools
+	newins - icecc <<<"${EPREFIX}"/usr/libexec/icecc/bin
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]]; then
+		eselect compiler-shadow remove icecc
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process icecream.conf
+
+	if [[ -z ${ROOT} ]]; then
+		eselect compiler-shadow update icecc
+	fi
+}
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 7c7716ee6680..8204f53caa95 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -5,8 +5,8 @@ DIST llvmorg-13.0.1-rc1.tar.gz 147284646 BLAKE2B 3a1d8d382de633b7f8fc998f8ad1e03
 EBUILD lld-11.1.0-r1.ebuild 1250 BLAKE2B befcc678c9eda33c73806c12b2c24bb8f3b8c9310303c42ceb87247e9816862f25bab546a5989bbe018f40118283c432c71f895e0b333a27a3e344d570e58102 SHA512 7a2046cc5bef8a7c0889fa6fb0bbf1eeaf776cd446ce3188df6c70898de097c0833e6d9293d4a7dad99fa1d6bf894440920549b6295ed442aa0c560149a71a58
 EBUILD lld-11.1.0.ebuild 1399 BLAKE2B bfa3538e4bd9492e94547f4ed304d75ff5da1e58c1d1a3e044be9da0c77a6ac71fce301ef3e6970cc520cb0c31abd9a81a668998b9c808852b157c91c3e398f4 SHA512 2ae031e69815ad5711567fc0ff5a7aa20d1cd49bb29dadb03f9754bc69da89d309d57996f3a67157be55c87c75cac7ab00ec53deb9b579ed74901c1789f7cf5b
 EBUILD lld-12.0.1.ebuild 1666 BLAKE2B fd1f8a4601c74d8507996e8804663812816c161ebf9351cd2fd262fb3cf1894013b3059800dd856bc0e896af7fc75b381bf353e1d22d43fe36d5859a2086b983 SHA512 6d1ba9cf7ab959da15975b4d1c3117f0a235618bfbf0bb743d73447105ab6672b25e839cadc34415b721c8755eb28abb2ddadb8c4793d3d7f4506f032e4d868b
-EBUILD lld-13.0.0.ebuild 1797 BLAKE2B 4b422a7a9be9a07451617c405d9c5e29542b40b7f668a29ab582fafda439c68a623e1d439742ef0e06eb527efbad70a6c5d3b04b3d5bfa935c26cf10638ba678 SHA512 df93f8813f5e65125e9429e56785af2a98abaf39cc8c285cb4242c4ddefeef1394549e0838a6c123f3dd4ae39edd5b2e1075ab9b13543c904b68c7af53224d64
-EBUILD lld-13.0.1.9999.ebuild 1760 BLAKE2B 038c5d1d0202b4f7e825d3c9b417a402139f8a1b306a125042333ebf29e9aafe2613de9bb7fdf621f9034085ebb741b2e6ec640363315cd901c351105fef8d46 SHA512 21f23f8859be3d16c790ecfb5fdd50232eed0e62620a0c63e171d60bead363890dc6e90e45f9a018459edf51b6a3412670fe72859d401b87dbb098e2deef950e
-EBUILD lld-13.0.1_rc1.ebuild 1760 BLAKE2B 038c5d1d0202b4f7e825d3c9b417a402139f8a1b306a125042333ebf29e9aafe2613de9bb7fdf621f9034085ebb741b2e6ec640363315cd901c351105fef8d46 SHA512 21f23f8859be3d16c790ecfb5fdd50232eed0e62620a0c63e171d60bead363890dc6e90e45f9a018459edf51b6a3412670fe72859d401b87dbb098e2deef950e
-EBUILD lld-14.0.0.9999.ebuild 1760 BLAKE2B 038c5d1d0202b4f7e825d3c9b417a402139f8a1b306a125042333ebf29e9aafe2613de9bb7fdf621f9034085ebb741b2e6ec640363315cd901c351105fef8d46 SHA512 21f23f8859be3d16c790ecfb5fdd50232eed0e62620a0c63e171d60bead363890dc6e90e45f9a018459edf51b6a3412670fe72859d401b87dbb098e2deef950e
+EBUILD lld-13.0.0.ebuild 1871 BLAKE2B 13ea83d64f25df0664fcedd0ebb44dd84ebb8828f0e52b7cd00eafd0d69d1c1d0c27a2da492d8a55ad4b0b39b6569e151ddde250db3cd19bb784bdc4ee1133f7 SHA512 24e2bda650f31508528896c761587a0abeeb061d4e4198449dc50b0794622fd8c87bb8d2d816bf90801dd6914b09e644ed2d3e97cb852f8ad8c005141f5e1bf4
+EBUILD lld-13.0.1.9999.ebuild 1834 BLAKE2B c7b895660913f2ffb83a21bfee7e31a08dca08bcf2515dcd4b2a8fb4e358b14f6fc1bc6a902ed1319c1796a20b54ba902023e5ecb7cd9759cf8e0a63322ae5d7 SHA512 d19cd076098cab1ebf3c24fb7b7957a32c8dbcf0a1d32a837d9ed020e3c45267b844117c0d266a19ce4a725a3196a52f1ce9cb33a5b59c7146c7b215d3a2ee1f
+EBUILD lld-13.0.1_rc1.ebuild 1834 BLAKE2B c7b895660913f2ffb83a21bfee7e31a08dca08bcf2515dcd4b2a8fb4e358b14f6fc1bc6a902ed1319c1796a20b54ba902023e5ecb7cd9759cf8e0a63322ae5d7 SHA512 d19cd076098cab1ebf3c24fb7b7957a32c8dbcf0a1d32a837d9ed020e3c45267b844117c0d266a19ce4a725a3196a52f1ce9cb33a5b59c7146c7b215d3a2ee1f
+EBUILD lld-14.0.0.9999.ebuild 1834 BLAKE2B c7b895660913f2ffb83a21bfee7e31a08dca08bcf2515dcd4b2a8fb4e358b14f6fc1bc6a902ed1319c1796a20b54ba902023e5ecb7cd9759cf8e0a63322ae5d7 SHA512 d19cd076098cab1ebf3c24fb7b7957a32c8dbcf0a1d32a837d9ed020e3c45267b844117c0d266a19ce4a725a3196a52f1ce9cb33a5b59c7146c7b215d3a2ee1f
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/sys-devel/lld/lld-13.0.0.ebuild b/sys-devel/lld/lld-13.0.0.ebuild
index b785c62fae4b..16d9d0874180 100644
--- a/sys-devel/lld/lld-13.0.0.ebuild
+++ b/sys-devel/lld/lld-13.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake llvm llvm.org python-any-r1
+inherit cmake flag-o-matic llvm llvm.org python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/"
@@ -51,6 +51,8 @@ src_configure() {
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
 
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
 		-DLLVM_INCLUDE_TESTS=$(usex test)
diff --git a/sys-devel/lld/lld-13.0.1.9999.ebuild b/sys-devel/lld/lld-13.0.1.9999.ebuild
index 8bcce2b3022a..863c9b49bdb9 100644
--- a/sys-devel/lld/lld-13.0.1.9999.ebuild
+++ b/sys-devel/lld/lld-13.0.1.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake llvm llvm.org python-any-r1
+inherit cmake flag-o-matic llvm llvm.org python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/"
@@ -51,6 +51,8 @@ src_configure() {
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
 
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
 		-DLLVM_INCLUDE_TESTS=$(usex test)
diff --git a/sys-devel/lld/lld-13.0.1_rc1.ebuild b/sys-devel/lld/lld-13.0.1_rc1.ebuild
index 8bcce2b3022a..863c9b49bdb9 100644
--- a/sys-devel/lld/lld-13.0.1_rc1.ebuild
+++ b/sys-devel/lld/lld-13.0.1_rc1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake llvm llvm.org python-any-r1
+inherit cmake flag-o-matic llvm llvm.org python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/"
@@ -51,6 +51,8 @@ src_configure() {
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
 
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
 		-DLLVM_INCLUDE_TESTS=$(usex test)
diff --git a/sys-devel/lld/lld-14.0.0.9999.ebuild b/sys-devel/lld/lld-14.0.0.9999.ebuild
index 8bcce2b3022a..863c9b49bdb9 100644
--- a/sys-devel/lld/lld-14.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-14.0.0.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake llvm llvm.org python-any-r1
+inherit cmake flag-o-matic llvm llvm.org python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/"
@@ -51,6 +51,8 @@ src_configure() {
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
 
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
 		-DLLVM_INCLUDE_TESTS=$(usex test)
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index fa151b803ace..d965cbf6ff17 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -15,5 +15,5 @@ EBUILD llvm-12.0.1.ebuild 12621 BLAKE2B 5e5351a80d5229a7a357c788271c30d5d0ea63e9
 EBUILD llvm-13.0.0.ebuild 12187 BLAKE2B 8c22021c580fa0cd5fb28a4b1d2384627774e24a37a398d0c9eb008ce0951a797a7a9404031c69f845dc7f764387ea6183e20cefe9f27cd7e7372aa5a682d7c5 SHA512 381d29cd899dbe86a6a4f6fd78e7fee2d583d2f6b92a2767f3583f9953e9b85e617eec1abb8ebff48bab65f0cdcfb95b5232769c580351ead82619a689c39df5
 EBUILD llvm-13.0.1.9999.ebuild 12164 BLAKE2B 25e4f6bd720a1c1546eec4368f37c6a25c9c8cffb15745c2ebcbcf4e7808b4376495c288e553be85850f7bdb203893487fb3d63ab209be670b821d0f61e8f1ac SHA512 ba07d30a8b29c4ad075632a3bd32bb565d49edd74a5ea243c1475c2a8fef2aa287c2c9d1bcd71dc10e247404cc47b5f35af72825ff4902a2d9cac46186adcd15
 EBUILD llvm-13.0.1_rc1.ebuild 12167 BLAKE2B 255c9511db2b71aec24ca782c4e336b6470f7868a86fdd31184bb3bd12ff22e05a9c9492c4b490e24dcfa1fa79d4f8fa802eb9b3bf5d01f5a2847e8c4aa3dee3 SHA512 e64411b7389da1789b98a52eafcdf3eb9dd21777c938e4caf73735d7419cfc7bad754b7d1594311e31bbd62147852746c89db85efc4b814642c818a4eef6e72f
-EBUILD llvm-14.0.0.9999.ebuild 12164 BLAKE2B 25e4f6bd720a1c1546eec4368f37c6a25c9c8cffb15745c2ebcbcf4e7808b4376495c288e553be85850f7bdb203893487fb3d63ab209be670b821d0f61e8f1ac SHA512 ba07d30a8b29c4ad075632a3bd32bb565d49edd74a5ea243c1475c2a8fef2aa287c2c9d1bcd71dc10e247404cc47b5f35af72825ff4902a2d9cac46186adcd15
+EBUILD llvm-14.0.0.9999.ebuild 12176 BLAKE2B ebbe9b9d91cdf4071cf5b6376c686f65b9d2d7656c54fd04020f2f1465f834a96dc0562e39d79cdf256097fae26027f5f800237a25c9f639aec14cf9a2e37f96 SHA512 ec947a833b901487cf5c1b68ed82dbf70b8450d5eaffcfa7df8a27ae74e8b1730959013ed19d5788130c35dfabee619948c43df48fb6fdf4e5ae2fc0c218e6cf
 MISC metadata.xml 2625 BLAKE2B 1017e4672b3ccd5a4f83d9df6a9db3661f548da9d75ad2c5b63e9843bfd737ff1fb64624678704f632544ac403efd8dbb35a006542023153733a6d4037b7245d SHA512 130444ec537891dc43754057c5a68666f52cb2959f351ee5be076ed41e39d49d8fafa2d0dca78d1a751b3a3190db81910b4472e75f9bad571ae42da51a5b25dd
diff --git a/sys-devel/llvm/llvm-14.0.0.9999.ebuild b/sys-devel/llvm/llvm-14.0.0.9999.ebuild
index a12b04fb2138..85c62d774844 100644
--- a/sys-devel/llvm/llvm-14.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-14.0.0.9999.ebuild
@@ -56,7 +56,7 @@ RDEPEND="${RDEPEND}
 PDEPEND="sys-devel/llvm-common
 	binutils-plugin? ( >=sys-devel/llvmgold-${SLOT} )"
 
-LLVM_COMPONENTS=( llvm )
+LLVM_COMPONENTS=( llvm third-party )
 LLVM_MANPAGES=build
 LLVM_PATCHSET=9999-1
 LLVM_USE_TARGETS=provide
diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 3e3b29a4d80d..9c67c6d7c003 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,4 +1,4 @@
-AUX mold-0.9.6-respect-flags.patch 1253 BLAKE2B 8fc2bbc9dad9be590e84cf5f4d603cf051b659740ed39744c103c3235e20083b53b487b8499a4b4bf38af8a9a1e314857cb42bdad1009f5920e2598205dec19e SHA512 ab65b072c0f6965e18067137b9ef54f83e4a624909fbf41a1f307041014887bc76a78511f498536760af96ee70a3796d4d33501ac0b2bc95d7184872301cca73
-DIST mold-0.9.6.tar.gz 3378698 BLAKE2B 1352e4f2bc018b53f6f18f6412c4747660a808a896d0c5c620db64babe42a6a949ca444f14a426a41202c8e26ff5973996819c6e4778eeaff6cb20b5746deb0d SHA512 d3de30b371413e974728fba03958d6043026f59aead8371058a0b1dc672e2675e169a1def3afd3751058f529d6ec80ff78c773d2718c1d9f0bdea74d9f13bc2e
-EBUILD mold-0.9.6.ebuild 1626 BLAKE2B c252382f0863b55fa2fb40a0f320c22d1cfb56fbe79e12d3888c6060fefcbe502ff95fab90bcaf43417c978acc452f62821e7013c74bbd238979893642cee10e SHA512 cc9b2f138d0b13eab80962cfdc2a451915867fdfcc56f75b23ae6ad8a2d2d5365874ae6ee253be9a038ff6fe68ce80cc4e9dc8c91f15356ae82b22b46f7a6569
+DIST mold-1.0.0.tar.gz 3482927 BLAKE2B 56ebc267370548a2f91a71ebeed87871cede6f564c29dc7d44a499b95fe570f6e9c8a717baf2d9e235c7057c41e735b315493bd23d3b44574d2a44b14aaf5ef8 SHA512 99ffd0b9e2ff7157cc8b26808675c9d3147bf88961155ae19ed9b99990ac647b7ec31ee78d05062decc6d41e66d99aa0fdc398d119803929b8dbff51eb3d077c
+EBUILD mold-1.0.0-r1.ebuild 1259 BLAKE2B 912f223181163deda23ecebb0f245296eb6a86fa0224faa88ff4e59d8f773bd87454d69a9e447f7374b7905c31bf539bda57cabe6607fda3b9d4072848cc8e71 SHA512 cce5444f42579f060b4842f2115b6b8c57f5f27489a19e37bdcfcada508d6a8e03a07652cf98560d97a96f57cd2e5a27eff092407b1d5d133d5716bf3f9e621b
+EBUILD mold-9999.ebuild 1300 BLAKE2B c537e1181d10d779b17edc0d8d4f1e0022bf4f436acfa6107e87baaf7aa982c57082102c2c69fb05282c3fe80b58f1c6bf2f8190817ff8c57d38c59ac0dff17c SHA512 02be4aa0c9010fb63426ff5dc67e8017371c382d94edcd816bfea05a90a1b5fc8968ed37a4c9b06232d6ddd82ec02b7f717644da8f045b9a48e49e4bc136af97
 MISC metadata.xml 315 BLAKE2B 985e05e19ef9d575e83c8782db1272bc8a97967f2a9caa1971867bd0906bb97a2aa5ddf3ac3c31cfd46840d830a578158d3d02ef2ef2f6160693044271deb8f1 SHA512 054f3c1c92750e957e92d8c13711a3898e807a2a950f9d2a30b4960b8f49aefd51c7a2ccb19df4ab55d1e40fd04876efc6f719a5fa4020d667fc21538165b2d2
diff --git a/sys-devel/mold/files/mold-0.9.6-respect-flags.patch b/sys-devel/mold/files/mold-0.9.6-respect-flags.patch
deleted file mode 100644
index 270a28988f9d..000000000000
--- a/sys-devel/mold/files/mold-0.9.6-respect-flags.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Sam James <sam@gentoo.org>
-Date: Fri, 29 Oct 2021 22:50:40 +0100
-Subject: [PATCH] Respect *FLAGS
-
---- a/Makefile
-+++ b/Makefile
-@@ -10,10 +10,11 @@ GIT_HASH ?= $(shell [ -d .git ] && git rev-parse HEAD)
- 
- OS ?= $(shell uname -s)
- 
--CPPFLAGS = -g -pthread -std=c++20 -fPIE \
--           -DMOLD_VERSION=\"0.9.6\" \
--           -DGIT_HASH=\"$(GIT_HASH)\" \
--	   $(EXTRA_CPPFLAGS)
-+CFLAGS = -pthread -fPIE $(EXTRA_CFLAGS)
-+CXXFLAGS = -pthread -std=c++20 -fPIE $(EXTRA_CXXFLAGS)
-+CPPFLAGS = -DMOLD_VERSION=\"0.9.6\" \
-+		-DGIT_HASH=\"$(GIT_HASH)\" \
-+		$(EXTRA_CPPFLAGS)
- LDFLAGS += $(EXTRA_LDFLAGS)
- LIBS = -pthread -lz -lxxhash -ldl -lm
- 
-@@ -28,12 +29,6 @@ LTO ?= 0
- ASAN ?= 0
- TSAN ?= 0
- 
--ifeq ($(DEBUG), 1)
--  CPPFLAGS += -O0
--else
--  CPPFLAGS += -O2
--endif
--
- ifeq ($(LTO), 1)
-   CPPFLAGS += -flto -O3
-   LDFLAGS  += -flto
-@@ -73,11 +68,11 @@ endif
- all: mold mold-wrapper.so
- 
- mold: $(OBJS) $(MIMALLOC_LIB) $(TBB_LIB)
--	$(CXX) $(CXXFLAGS) $(OBJS) -o $@ $(LDFLAGS) $(LIBS)
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(OBJS) -o $@ $(LIBS)
- 	ln -sf mold ld
- 
- mold-wrapper.so: elf/mold-wrapper.c Makefile
--	$(CC) -fPIC -shared -o $@ $< -ldl
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -shared -o $@ $(LDFLAGS) $< -ldl
- 
- $(OBJS): $(HEADERS) Makefile
- 
diff --git a/sys-devel/mold/mold-0.9.6.ebuild b/sys-devel/mold/mold-0.9.6.ebuild
deleted file mode 100644
index 2edeabeb5579..000000000000
--- a/sys-devel/mold/mold-0.9.6.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="A Modern Linker"
-HOMEPAGE="https://github.com/rui314/mold"
-SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-# Try again after 0.9.6
-RESTRICT="test"
-
-RDEPEND=">=dev-cpp/tbb-2021.4.0:=
-	dev-libs/xxhash:=
-	sys-libs/zlib
-	!kernel_Darwin? (
-		dev-libs/mimalloc:=
-		dev-libs/openssl:=
-	)"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.6-respect-flags.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/	strip/d' \
-		-e '/	gzip/d' \
-		-e "s:\$(DEST)/lib:\$(DEST)/$(get_libdir):" \
-		Makefile || die
-
-	# Needs unpackaged dwarfutils
-	rm test/compressed-debug-info.sh \
-		test/compress-debug-sections.sh || die
-
-	# Seems to have been fixed in git (> 0.9.6)
-	# Broken atm?
-	rm test/mold-wrapper.sh || die
-
-	# Needs llvmgold
-	rm test/hello-static.sh || die
-}
-
-src_compile() {
-	tc-export CC CXX
-
-	emake \
-		SYSTEM_TBB=1 \
-		SYSTEM_MIMALLOC=1 \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_CXXFLAGS="${CXXFLAGS}" \
-		EXTRA_CPPFLAGS="${CPPFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS}"
-}
-
-src_test() {
-        emake \
-		SYSTEM_TBB=1 \
-		SYSTEM_MIMALLOC=1 \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_CXXFLAGS="${CXXFLAGS}" \
-		EXTRA_CPPFLAGS="${CPPFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		check
-}
-
-src_install() {
-	emake \
-		SYSTEM_TBB=1 \
-		SYSTEM_MIMALLOC=1 \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_CXXFLAGS="${CXXFLAGS}" \
-		EXTRA_CPPFLAGS="${CPPFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		DESTDIR="${ED}" \
-		install
-}
diff --git a/sys-devel/mold/mold-1.0.0-r1.ebuild b/sys-devel/mold/mold-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..767cc5c80f54
--- /dev/null
+++ b/sys-devel/mold/mold-1.0.0-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A Modern Linker"
+HOMEPAGE="https://github.com/rui314/mold"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/rui314/mold.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="AGPL-3"
+SLOT="0"
+
+# Try again after 1.0 (nearly there, but path-related issues)
+# https://github.com/rui314/mold/issues/137
+RESTRICT="test"
+
+RDEPEND=">=dev-cpp/tbb-2021.4.0:=
+	dev-libs/xxhash:=
+	sys-libs/zlib
+	!kernel_Darwin? (
+		<dev-libs/mimalloc-2:=
+		dev-libs/openssl:=
+	)"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# Needs unpackaged dwarfdump
+	rm test/elf/{compress-debug-sections.sh,compressed-debug-info.sh} || die
+}
+
+src_compile() {
+	tc-export CC CXX
+
+	emake \
+		SYSTEM_TBB=1 \
+		SYSTEM_MIMALLOC=1 \
+		STRIP="true" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_test() {
+	emake \
+		SYSTEM_TBB=1 \
+		SYSTEM_MIMALLOC=1 \
+		check
+}
+
+src_install() {
+	emake \
+		SYSTEM_TBB=1 \
+		SYSTEM_MIMALLOC=1 \
+		DESTDIR="${ED}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		STRIP="true" \
+		install
+}
diff --git a/sys-devel/mold/mold-9999.ebuild b/sys-devel/mold/mold-9999.ebuild
new file mode 100644
index 000000000000..30150e5e243c
--- /dev/null
+++ b/sys-devel/mold/mold-9999.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A Modern Linker"
+HOMEPAGE="https://github.com/rui314/mold"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/rui314/mold.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="AGPL-3"
+SLOT="0"
+
+# Try again after 1.0 (nearly there, but path-related issues)
+# https://github.com/rui314/mold/issues/137
+RESTRICT="test"
+
+RDEPEND=">=dev-cpp/tbb-2021.4.0:=
+	dev-libs/xxhash:=
+	sys-libs/zlib
+	!kernel_Darwin? (
+		>=dev-libs/mimalloc-2:=
+		dev-libs/openssl:=
+	)"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# Needs unpackaged dwarfdump
+	rm test/elf/{compress-debug-sections.sh,compressed-debug-info.sh} || die
+}
+
+src_compile() {
+	tc-export CC CXX
+
+	emake \
+		SYSTEM_TBB=1 \
+		SYSTEM_MIMALLOC=1 \
+		SYSTEM_XXHASH=1 \
+		STRIP="true" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_test() {
+	emake \
+		SYSTEM_TBB=1 \
+		SYSTEM_MIMALLOC=1 \
+		check
+}
+
+src_install() {
+	emake \
+		SYSTEM_TBB=1 \
+		SYSTEM_MIMALLOC=1 \
+		SYSTEM_XXHASH=1 \
+		DESTDIR="${ED}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		STRIP="true" \
+		install
+}
diff --git a/sys-devel/slibtool/Manifest b/sys-devel/slibtool/Manifest
index 1d0fb6cff840..4c2fb873bd7d 100644
--- a/sys-devel/slibtool/Manifest
+++ b/sys-devel/slibtool/Manifest
@@ -2,7 +2,7 @@ DIST slibtool-0.5.33.tar.xz 74100 BLAKE2B ae4901fb116c1c9463d7a817dc0c3aff2de098
 DIST slibtool-0.5.33.tar.xz.sig 833 BLAKE2B dec6515251e85e91727ef85e31fc370975058142c81c5abaa7a5b300a88b785878768fb56b68d9d7da2d9dc063e6c188136f6ee9566605ebf0cba834d9ea96b6 SHA512 00bc2117b1b68b94618effbb5ce24c09c0a0e6b76a8d0d4c34d0e6a13081d14521aa909a3b629a9e6680db5c3b720c61afdc90c6e7b1989debe1abb7574d9977
 DIST slibtool-0.5.34.tar.xz 79720 BLAKE2B 3a692d7485dcf2277f7ed99fe1ad67cf5fd33d8fe0a527d64634b0e7f956a5f58b92d812396f00d872ceb8509e058ae1a026f16a65feb2e79a9fff7bd60290da SHA512 3f7f6e4f45c4c2ae5ba5533152f08269cd77ca6fa2f3a515802bc23c7ac505b2d7340098fa98962c79035129cfd4077205596309f4acd1d634b9a1d6e2c0e96c
 DIST slibtool-0.5.34.tar.xz.sig 833 BLAKE2B 52df017d8ae3056e259a5283b0a4cea119a5ab4ce95e6c894d0d2e98fc10db101039a57c9a2a771f677c9d0afaad9273095ebdb078fca146a3d67ea25e9261fb SHA512 9f8415431a0b43e7be9a808dd6ed138a9b34b7b2c4af3ab406bdbc456ec31c877f13bc0b056ab9a50bec0b0cf1b654a133085f8523e70c8cb7d3851652d34ff7
-EBUILD slibtool-0.5.33.ebuild 970 BLAKE2B a25a6d8b11c6e789bc9d832142915ef32834b2c592dda30ae9946be637225ea4d611abf53b8164c4c873f2987c1c54c1e33490f93d9acb44a757241fba792368 SHA512 a1e017b88d9c10c770ae5f5ea541bcb6290b5df285ab0a3d95f4706f869b79f6ebc1a2c0a63e2fb32fc3ffe3506e7cdf9dfc64e40d47c704eb55eea3a8ff9bd6
-EBUILD slibtool-0.5.34.ebuild 1002 BLAKE2B ce446e3115728bc6e94adbc4248b0f488b722b6f0529a7e41f07e87f65bcc604604ae9905d3b6d487f030ac96a4572fa6c840d29d02cc60386255d73ad648819 SHA512 5d850fe11ad4c2660bf62993f8e7080a6acc93eb395acf456a06f15ed18f37b4b5fc5e6d58aaa09568e98f308c2a4438c7e8f6d9acc1352c67edd2e873b935c1
-EBUILD slibtool-9999.ebuild 970 BLAKE2B a25a6d8b11c6e789bc9d832142915ef32834b2c592dda30ae9946be637225ea4d611abf53b8164c4c873f2987c1c54c1e33490f93d9acb44a757241fba792368 SHA512 a1e017b88d9c10c770ae5f5ea541bcb6290b5df285ab0a3d95f4706f869b79f6ebc1a2c0a63e2fb32fc3ffe3506e7cdf9dfc64e40d47c704eb55eea3a8ff9bd6
+EBUILD slibtool-0.5.33.ebuild 969 BLAKE2B 5b79d5245be6e6673397e8258c247ca89ca974017cb9bf0921927ed864c01515e2999f49b94a45c10dc996207d6210a24e5d8bcdc89c0628a102083300a1d7dc SHA512 1c46ddc964802142af48b6851346f777357c0bc79b4cac8118b7560d58550dc78c9b580717c634f1edf3fe8873acf682e38287ef8d1e92b678aa3b1a503741b8
+EBUILD slibtool-0.5.34.ebuild 1001 BLAKE2B 4c74835ee5d1a370c7c4fae5a8d45b5a654c5160221dee079636346cd464170fe91c15787f2e4499b3c97b01c8a1097c684f74ef808b6a9c24df9a0c575521e8 SHA512 7b91681bdfab0fe1302077d05596f8fd26c06147b2462ca5517a6a4b4f55971c827640d71e4bef8bf6ba4614adc7709102b0f8218be2e9e442b49a2f5e74733b
+EBUILD slibtool-9999.ebuild 969 BLAKE2B 5b79d5245be6e6673397e8258c247ca89ca974017cb9bf0921927ed864c01515e2999f49b94a45c10dc996207d6210a24e5d8bcdc89c0628a102083300a1d7dc SHA512 1c46ddc964802142af48b6851346f777357c0bc79b4cac8118b7560d58550dc78c9b580717c634f1edf3fe8873acf682e38287ef8d1e92b678aa3b1a503741b8
 MISC metadata.xml 496 BLAKE2B 8ee62c41383efeccd6d577cb031630f935810e45dd3887c93482b1880d03bf87a252f7a18ba3708b0b0521e2e2e0380d6871721672802189550173a1fe89229b SHA512 d707829a4daf977fb19facd83e5f1582ff422141e0c754867218edf9bc36b208c3ddc5d66159857609128c13a1ac3b51d497e5b89ab6cb0431e25cb7a43d48a5
diff --git a/sys-devel/slibtool/slibtool-0.5.33.ebuild b/sys-devel/slibtool/slibtool-0.5.33.ebuild
index c87ae71d6df2..be4f199900aa 100644
--- a/sys-devel/slibtool/slibtool-0.5.33.ebuild
+++ b/sys-devel/slibtool/slibtool-0.5.33.ebuild
@@ -20,7 +20,7 @@ else
 
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 
-	BDEPEND="verify-sig? ( app-crypt/openpgp-keys-midipix )"
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-midipix )"
 fi
 
 LICENSE="MIT"
diff --git a/sys-devel/slibtool/slibtool-0.5.34.ebuild b/sys-devel/slibtool/slibtool-0.5.34.ebuild
index b5e6c9d4e5fb..589a18d68165 100644
--- a/sys-devel/slibtool/slibtool-0.5.34.ebuild
+++ b/sys-devel/slibtool/slibtool-0.5.34.ebuild
@@ -20,7 +20,7 @@ else
 
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
-	BDEPEND="verify-sig? ( app-crypt/openpgp-keys-midipix )"
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-midipix )"
 fi
 
 LICENSE="MIT"
diff --git a/sys-devel/slibtool/slibtool-9999.ebuild b/sys-devel/slibtool/slibtool-9999.ebuild
index c87ae71d6df2..be4f199900aa 100644
--- a/sys-devel/slibtool/slibtool-9999.ebuild
+++ b/sys-devel/slibtool/slibtool-9999.ebuild
@@ -20,7 +20,7 @@ else
 
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 
-	BDEPEND="verify-sig? ( app-crypt/openpgp-keys-midipix )"
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-midipix )"
 fi
 
 LICENSE="MIT"