gentoo auto-resync : 06:05:2024 - 00:00:51

11 files changed, 249 insertions, 99 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 2cc8f9516923..b3468821ddf3 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/dropwatch/Manifest b/dev-util/dropwatch/Manifest
index aca24f1875d7..acf68c29e09d 100644
--- a/dev-util/dropwatch/Manifest
+++ b/dev-util/dropwatch/Manifest
@@ -1,5 +1,3 @@
-AUX dropwatch-1.4-binutils-2.23.patch 1467 BLAKE2B 39ad7b6b42252b6fb2e8f6803ed190e0e6f23b92b7a6a90f85c58b9b86ad5324753e2a1639191d3eb795015c4264c5a62ecdaff31a0e60a66a193c03a4a11f0e SHA512 933ce0de5582ee28141ebe53e1320f430b856af379fee0b8822fdc23d8b7b937a9c7b1fc89629583e7f5faedea87fc56f4c9cf6e48aa81f9e54e6aa532ca23fa
-AUX dropwatch-1.4_p20150706-makefile.patch 492 BLAKE2B c4d1a5d458a450679c106972af579e8cf861aecb2008f580670f9d57ef1813f8b1aa4d26a8ec3eecb1958cf00837b320cc1b00f52de575d4b724d1ad7ebfb21e SHA512 b221abe751c3c2c9b82f2c8d75632295ff54e43af2f13f319d5b7be571cfa5e8912d7dd0e1eba13572486d66c58e0cab46362e8fb69e09e08e6e4c876c2fc627
 DIST dropwatch-1.5.4.gh.tar.gz 24774 BLAKE2B 36cd3fa3e2afc755cb5b34d43c31424ba176db4e6c83894e6bb97e458e214638fa69ec692b8fed84befbb01fd969c04d4d1c7374e82dfcec1a512f4e9e00d86d SHA512 4af06c05c694d4a044a5e92ba9869a865730bb2caa28cddc33160481f490ed77a7300ef57c9f76722d7bc8d4ac47cdfd5f13daf4f764500f3c90a72b5ee58d61
 EBUILD dropwatch-1.5.4.ebuild 764 BLAKE2B 7c04390dd13279ead8a4cd6b7163ab11fc9691758c25113d6195bed4f19dc122059afb5efb43d1fa668878c106b2b8d8b97facc8c48b660c49bd0264ee09c100 SHA512 625b1c605b6666cf443e5ecb5e04674a41d4e1bcaa48dd0936725ac85aab7e4ba999cd03fc9a15a302a64bd62d29594ee1bb722bb534559a2d6d44dc150f4e58
 MISC metadata.xml 479 BLAKE2B 6acc63fc21687ec304c60a0ef13e813327875c022c3d08f7e165f3e0ef1952898f7ccb710e2d24891010bffc7d11830dfdd3b42192eb55814726fe8c994073bd SHA512 43278f3d08c66cb44c507b5ae89e803219bdf7718dcc1d1b0a6f93ad594fe5b872dba6d1c039c8bcbeca308a6aa75c5c919fd683d0981a15dd11be7315a712ff
diff --git a/dev-util/dropwatch/files/dropwatch-1.4-binutils-2.23.patch b/dev-util/dropwatch/files/dropwatch-1.4-binutils-2.23.patch
deleted file mode 100644
index 94770ab3dc91..000000000000
--- a/dev-util/dropwatch/files/dropwatch-1.4-binutils-2.23.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-commit a5aa2c3cbae207d12b9f2fded36a47031c55be36
-Author: Andrew Savchenko <bircoph@gmail.com>
-Date:   Thu Nov 17 00:04:47 2016 +0300
-
-    Fix build with recent binutils
-    
-    Gentoo-Bug:         457980
-    Upstream Ticket:    5
-
---- a/src/lookup.c
-+++ b/src/lookup.c
-@@ -27,13 +27,13 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <sys/utsname.h>
--#include <bfd.h>
- #include <string.h>
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- 
- #include "lookup.h"
-+#include <bfd.h>
- 
- extern struct lookup_methods bfd_methods;
- extern struct lookup_methods kallsym_methods;
---- a/src/lookup.h
-+++ b/src/lookup.h
-@@ -28,6 +28,9 @@
- #include <stdlib.h>
- #include <asm/types.h>
- 
-+// satisfy PR 14072 in bfd.h
-+#define PACKAGE 1
-+#define PACKAGE_VERSION 1
- 
- /*
-  * Initalization routine
---- a/src/lookup_bfd.c
-+++ b/src/lookup_bfd.c
-@@ -25,13 +25,13 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <sys/utsname.h>
--#include <bfd.h>
- #include <string.h>
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- 
- #include "lookup.h"
-+#include <bfd.h>
- 
- 
- static int lookup_bfd_init(void)
---- a/src/lookup_kas.c
-+++ b/src/lookup_kas.c
-@@ -25,7 +25,6 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <sys/utsname.h>
--#include <bfd.h>
- #include <string.h>
- #include <unistd.h>
- #include <sys/types.h>
-@@ -33,6 +32,7 @@
- #include <sys/queue.h>
- 
- #include "lookup.h"
-+#include <bfd.h>
- 
- struct symbol_entry {
- 	char *sym_name;
diff --git a/dev-util/dropwatch/files/dropwatch-1.4_p20150706-makefile.patch b/dev-util/dropwatch/files/dropwatch-1.4_p20150706-makefile.patch
deleted file mode 100644
index 42ff8f9e8365..000000000000
--- a/dev-util/dropwatch/files/dropwatch-1.4_p20150706-makefile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -1,14 +1,14 @@
- all: dropwatch
- 
- CPPFLAGS += -D_GNU_SOURCE
--CFLAGS += -g -Wall -Werror $(shell pkg-config --cflags libnl-3.0)
-+CFLAGS += -Wall $(shell ${PKG_CONFIG} --cflags libnl-3.0)
- LDLIBS += -lbfd -lreadline -lnl-3 -lnl-genl-3
- 
- OBJFILES := main.o lookup.o\
- 	 lookup_bfd.o lookup_kas.o
- 
- dropwatch: $(OBJFILES) 
--	$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@
-+	$(LINK.o) $(CFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
- 
- clean:
- 	$(RM) dropwatch *.o
diff --git a/dev-util/elfshaker/Manifest b/dev-util/elfshaker/Manifest
index 60cec41ecc6b..2126b693cd38 100644
--- a/dev-util/elfshaker/Manifest
+++ b/dev-util/elfshaker/Manifest
@@ -1,3 +1,4 @@
+AUX elfshaker-0.9.0_p20230918-update-rustc-serialize.patch 489 BLAKE2B cd7eab2e8785e37094fb365329acf23df7204423780bbf6840cb764fd4dd340aba3ffb72fa5bad6e9835dc26f7409b20e52be74eeeca44338327b8a4b9f7faa0 SHA512 6440cb344076dafd05b32969cbefd22fe1c14837b75f2517c81d93f3bcd875ef8440122bc015a7cc3e79fed9c6582691c4fd1eb773c5ad9017010674dfc430b8
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST ahash-0.7.6.crate 38030 BLAKE2B aca3661477fcd7822d6d10970151e05c28e1615f8cd7ddaac064b15102027e404b19b0f3f16dd76145048594ea1c22ae27dd08cc05c411efbae9ec7a1ef55ce9 SHA512 61354688b6fb096359faefb6f34be958cd2215d56b88c22c737d24183eaad433f811bc9e64f927e4852c87d2799c22fda82b55cfbef2ed6357ff74f0c4ffec68
 DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191
@@ -21,6 +22,7 @@ DIST cxx-build-1.0.88.crate 84429 BLAKE2B 67eaa7120368eccfbf7646170a6f7ecb69402d
 DIST cxxbridge-flags-1.0.88.crate 5253 BLAKE2B 6eab1a58c966eb7b355a8781ca49b523e52f51d9b261cabe1c0df3c74a01174afa813e4947a54604760ba7a17d15288f06949258fea7af1b200e3bba97a72eb2 SHA512 fcd1231f38b0e5d84fba7c268f337c419665a269d08fe2752f8373e5152448d544e5fe0d08d6a7e769705450d07af22ec13e0040e80859fd02161527afd7a226
 DIST cxxbridge-macro-1.0.88.crate 59476 BLAKE2B 4c364d534d0d7fd789843e10633996148b31ad501084c1bf59233c97e30c38074c4344b213f32d5f946a51363ce7195360c01e8bb0893e93ab1f8e2cf31a3605 SHA512 7ced29b6a45abfa3649a2ff2cbb1801308f62e58c74e03fa74857329dfabd1c60bccfebf40ae0e041cb1cfdb6c7823157da924ff349c04afcfc78ce24e08e8d8
 DIST elfshaker-0.9.0_p20230918.tar.gz 123248 BLAKE2B 80e174a7b1598f7d0721f60a1814f031698fc001d184dca23412d610f823253cc126fcee52d16441ee31c974bcf8639b209635f145977b4721f701deb7a44551 SHA512 631d2b6592e712a4741d82139a9c6ca1505570f26c2c4d1e04b5af2a9d41996cb1e12541b4bc884bce0d9b5875232d24dc559a5baaed48fae7a9fbda86db0efc
+DIST elfshaker-0.9.0_p20240122.tar.gz 136396 BLAKE2B c066ade3ea2e25e850237145659f4374062e075216c3fb358ac0cccf82edeb49717b31ba0d0fe6e95940ea18ce0384e00725d3e2748d61da69bbba74ed1f0aad SHA512 5017dcb13cf421902ea440951b9df03f5d3c5748ed6bead8bf5f3a1811421e14478ffbaa300b1c48b760677e3846c69ffb6a0e4b994d804c54b7937d964c30e2
 DIST flate2-1.0.25.crate 70210 BLAKE2B 992525ffeeb4433a222487cdfb0c3927ad77f914e1db94f612d80e81faef4a2c955c755c2b800251e3416d0b22726d5f7d7e432a81c3582c54b7de95ab7a324e SHA512 d81a463360ee2778f609ff297e04548120d1fda1f9e020fb2f429ea51189b8fe6cae57252fcd924d71fb65ad0f93ff7cdc7235913f8b78fa82925939cf884af7
 DIST form_urlencoded-1.1.0.crate 8734 BLAKE2B eaca73d73d16242f3fa3e38e23531c67c01404697bc7b7eb7c64fa04167dcb403a41818487fc46c5d9118842818472d549a2f5fcef5e4d962461e1c103d895d1 SHA512 9e245495dbf235b147e4216b313f2e6a96357d2782a66d71c08c2902c6a065701ca8ecdbb6b2035983a83c44cf36c921b5c71d63af0e02dd39bf5f8347117e11
 DIST fs2-0.4.3.crate 13138 BLAKE2B a8c53130014affc276544360425718c480fe6b6583675e15e8bf25dca0cd2752aeb0793135fce1bdc12bcfc0ef21fb7f6aa298981d61ac150300eb134c2014e0 SHA512 b83fefa9123f304e4813ec1dacbb1aee5dc0c94e1316cd7c8a434aa2a242c9c42523d2bd8232d78e6c84c4e172b5c46ef8605e93b54216a2d4496fdf885dcf50
@@ -62,7 +64,7 @@ DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea0
 DIST rmp-0.8.11.crate 28829 BLAKE2B 42aeff1a8d4874f1cec8a19085e4f23ae33cebcfd024c28772c0cea36e096d5ff012e6063647f31b9e9c3ca311f1036566411675fe2f632dd9dc1d5d1f7f929c SHA512 27a499316542722a4d9fe4fa9cc005b6b5fa75dcf66686a5c08aa6130497b67511c0283419adb64fec09a51a563f4991f2039280d2e74f8ea4102afbe4977f38
 DIST rmp-serde-0.15.5.crate 28657 BLAKE2B bf2db6d713e8c105b337c06b97c5ba607d509fd0de1356c7b711eff47b77f5e5246a8d2b6c876f8db4baa9c0f308cbb5b447a2a5327734711701b9d8ea6f13e5 SHA512 d546e170452eb58fd684cd0b4c150b99005a39611f40cf2b6f2919822246d36206e94808569ff8249f14e50f17989b885ef6016477bab9d16be5a18a0c8428fa
 DIST rust-crypto-0.2.36.crate 857879 BLAKE2B c486a2e43eb9ac9d2558bb39a249dcd689e86eef51d9a7613a3964baa633cebec824d5a490254dc06eca7a5faa471126de92452d62c522a3dbf494b9940a13e1 SHA512 0fac026d8799ecde523f20e7b34b9486343e48b95e79cd76bb6c8bfaeaebed550e45d59d85d8a3a58595f10c02a4a5e55691da15c203a4336a9bdb5480cd2e90
-DIST rustc-serialize-0.3.24.crate 45926 BLAKE2B 11dee8dac7eb007067ee0eb19d122bf45d912e6cefa95fd5ae3db7a4585a3f37e66b123c8c7bb761cc451b402cb9191dd5c974618331bb9aa9efbe9215115abc SHA512 60b40a0b41678287627cf5898e0ff6ac5668865f1ce5a482190ecd7539b59a955a73c675fedac76e68a5126efb92ff0cf1d1b4f24359a932463434bb76d9e884
+DIST rustc-serialize-0.3.25.crate 46114 BLAKE2B 54feaa72c7cda8aa4d4de225a99b3e2c78fa3893eef47c7666b6503e183bfd830d9693676a274e0dbf1d2f650489c4ba924ebf8650c47d11d561ec8bf8e85a11 SHA512 d7023ab949a1bcb43b3458a7bf3f6a8903a5a8e43ad87e8c635f5b1a43c72a27052b96bd9f2e9e8da4a532b5a97674850e5a11537ef8a1b17ef44017c7be1be8
 DIST rustls-0.20.8.crate 270142 BLAKE2B 0d9563e302eac78871eb8346c72fde2a05618dc8a966198cb4d607b41930dd54487d9f4d9c8ebbdf943b4593d4cbb75543c3aea9dddc61a06500b4b322aa726f SHA512 4f56494987cd3a56f47dd07d31c7f73d262a4d003cf9cc11e0bce5fa85c87f18124b1c364186501736f0d40a1f193a24d5d73f37a491ff81ca8eff568559e547
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scratch-1.0.3.crate 8198 BLAKE2B 804af80d09da85a88221c7aed7740a25a327bece99eeda0d7adceb3e5111917b70fb4a4e4e39c83b041d57baad2e3582e877356d58386e05ccd65e0a5334f86d SHA512 8fb3c0d36adbcd915e3adad108e35665ddd6e5622b252833349f89448a620bac6eaf1c212ffc172ec015e5af46e5637901c3442083b17ed29a2bdd9c0c48d595
@@ -104,5 +106,6 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST zstd-0.9.2+zstd.1.5.1.crate 27538 BLAKE2B 72b8e30910f3221dfb0a13861f30c75cab701ae481120a20bff68e7d150a00bd07868b030c52493d076b30d68ddf2a9c2fcb1a084dfd0ee15ea1da8afa3ed7d3 SHA512 44bbcf78aa75ba77c797bcff5fe738c97ab444fbecceaf302a2f40ca74761bfa13d2a74bbeffa0d8822688eeabdbfb77cbf835a7b4854aef3b5aedc7f4cea571
 DIST zstd-safe-4.1.3+zstd.1.5.1.crate 16677 BLAKE2B 0c5d74997bf72eb3bc47a314b07a90327cee7ce24a31f22eecf1cd9ab93cd8366359c7647e4f371a94f8932a0e08a05eea6b588fedc9a44226bbd5a7b03fc266 SHA512 e8387d866bd9cd2a4063780b36ec8b45a2c47a2103a1107ae045b17302dcd507d6740fb3681c0fdc786918fbae33b5b68e639308505de31b04b25ac43ba3b594
 DIST zstd-sys-1.6.2+zstd.1.5.1.crate 718776 BLAKE2B 6f59f1ee4b886beb6d72872bc557ee90d4da4d97b5834b028b55ff2d0566da72a49a589fdfd1a84146793342249120420253e15998deb22f34eab3159f76fa96 SHA512 25b28da7cd4465be2ff909cc30c879db4c0fe3e91c1faa8e2e7d9483f8439286123570f09bfa5aea1754a4473aa6f6851180b000df2094b6b56aec9b3b5d6d30
-EBUILD elfshaker-0.9.0_p20230918.ebuild 2630 BLAKE2B 99d02a8f067152b3f623cd28b0f90bd41511b53c3e50f227757d168641a380ae2560329f0ae64bbd2cb62b70c006e7bfbbfcc52e434c6de252d78cde71967b65 SHA512 1d2f57c7931b24303ea3c19350efa373f279e6d27ff3eea6a616b7565c27955872a8545c8a3ca99f6a6a80bc922606b3cf05a513e8a0de2e910aee8dbb4fbe35
+EBUILD elfshaker-0.9.0_p20230918.ebuild 2718 BLAKE2B 4be1b722ffc6fe490847323af38f245c2a79481c1d1ed9c7994b023d976d8aa48c90014dc14116667af66e27cc4eb108ca2470fa346f06bbad693274c1203a81 SHA512 fb3a864563bf379d1f72cf2fcf9208fe9d92c58761204396616910b300dec1f71d8c0375b9a67b46bda382ef58dc21fda9e37d7296f4fb05ba1ab3829078887c
+EBUILD elfshaker-0.9.0_p20240122.ebuild 2718 BLAKE2B af25bba7d6cd883c75abcab960019f491844f10f6bf8a354c701dbd9a8419ad5d0f890bf8eb4a4e7412c0e6ba35f610ab825ba27d43e2a783f65bec701a1dac0 SHA512 c9d9b9e4496defa789439b534641b1d646f73aadf63a469b504d4fcc0fdc0663be13967203f92f2b333826ba749911b5c0d371f213f00e2012c31c2981f32c81
 MISC metadata.xml 324 BLAKE2B 8448bed9352556e4fbb8cd68edd3cfd86196bd483d6b19e7ae248170fa5dfce8f780fef749953996ae89929bebd9e90a726458d0649e3eb09540bdeaf0fa2d82 SHA512 75b0c9e5a511c787585c2d45ead3704573ec50e574c4e1abf94a988f461463285688b859ed0b6f0f5def209c882a72caa3a39480fef7f72f4109b083235e4dc2
diff --git a/dev-util/elfshaker/elfshaker-0.9.0_p20230918.ebuild b/dev-util/elfshaker/elfshaker-0.9.0_p20230918.ebuild
index 92badeb52671..9a2fcdfb2d8c 100644
--- a/dev-util/elfshaker/elfshaker-0.9.0_p20230918.ebuild
+++ b/dev-util/elfshaker/elfshaker-0.9.0_p20230918.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Autogenerated by pycargoebuild 0.10
@@ -69,7 +69,7 @@ CRATES="
 	rmp-serde@0.15.5
 	rmp@0.8.11
 	rust-crypto@0.2.36
-	rustc-serialize@0.3.24
+	rustc-serialize@0.3.25
 	rustls@0.20.8
 	same-file@1.0.6
 	scratch@1.0.3
@@ -131,3 +131,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 QA_FLAGS_IGNORED="usr/bin/elfshaker"
+
+PATCHES=(
+	"${FILESDIR}"/elfshaker-0.9.0_p20230918-update-rustc-serialize.patch
+)
diff --git a/dev-util/elfshaker/elfshaker-0.9.0_p20240122.ebuild b/dev-util/elfshaker/elfshaker-0.9.0_p20240122.ebuild
new file mode 100644
index 000000000000..4cbd38452777
--- /dev/null
+++ b/dev-util/elfshaker/elfshaker-0.9.0_p20240122.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.10
+
+EAPI=8
+
+CRATES="
+	adler@1.0.2
+	ahash@0.7.6
+	android_system_properties@0.1.5
+	ansi_term@0.12.1
+	atty@0.2.14
+	autocfg@1.1.0
+	base64@0.13.1
+	bitflags@1.3.2
+	bumpalo@3.12.0
+	byteorder@1.4.3
+	cc@1.0.78
+	cfg-if@1.0.0
+	chrono@0.4.23
+	clap@2.34.0
+	codespan-reporting@0.11.1
+	core-foundation-sys@0.8.3
+	crc32fast@1.3.2
+	crossbeam-utils@0.8.14
+	cxx-build@1.0.88
+	cxx@1.0.88
+	cxxbridge-flags@1.0.88
+	cxxbridge-macro@1.0.88
+	flate2@1.0.25
+	form_urlencoded@1.1.0
+	fs2@0.4.3
+	fuchsia-cprng@0.1.1
+	gcc@0.3.55
+	getrandom@0.2.8
+	hashbrown@0.12.3
+	hermit-abi@0.1.19
+	hermit-abi@0.2.6
+	hex@0.4.3
+	iana-time-zone-haiku@0.1.1
+	iana-time-zone@0.1.53
+	idna@0.3.0
+	jobserver@0.1.25
+	js-sys@0.3.60
+	lazy_static@1.4.0
+	libc@0.2.139
+	link-cplusplus@1.0.8
+	log@0.4.17
+	miniz_oxide@0.6.2
+	num-integer@0.1.45
+	num-traits@0.2.15
+	num_cpus@1.15.0
+	once_cell@1.17.0
+	paste@1.0.11
+	percent-encoding@2.2.0
+	ppv-lite86@0.2.17
+	proc-macro2@1.0.50
+	quote@1.0.23
+	rand@0.3.23
+	rand@0.4.6
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.3.1
+	rand_core@0.4.2
+	rand_core@0.6.4
+	rdrand@0.4.0
+	ring@0.16.20
+	rmp-serde@0.15.5
+	rmp@0.8.11
+	rust-crypto@0.2.36
+	rustc-serialize@0.3.25
+	rustls@0.20.8
+	same-file@1.0.6
+	scratch@1.0.3
+	sct@0.7.0
+	serde@1.0.152
+	serde_derive@1.0.152
+	spin@0.5.2
+	strsim@0.8.0
+	syn@1.0.107
+	termcolor@1.2.0
+	textwrap@0.11.0
+	time@0.1.45
+	tinyvec@1.6.0
+	tinyvec_macros@0.1.0
+	unicode-bidi@0.3.10
+	unicode-ident@1.0.6
+	unicode-normalization@0.1.22
+	unicode-width@0.1.10
+	untrusted@0.7.1
+	ureq@2.6.2
+	url@2.3.1
+	vec_map@0.8.2
+	version_check@0.9.4
+	walkdir@2.3.2
+	wasi@0.10.0+wasi-snapshot-preview1
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.83
+	wasm-bindgen-macro-support@0.2.83
+	wasm-bindgen-macro@0.2.83
+	wasm-bindgen-shared@0.2.83
+	wasm-bindgen@0.2.83
+	web-sys@0.3.60
+	webpki-roots@0.22.6
+	webpki@0.22.0
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.5
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	zstd-safe@4.1.3+zstd.1.5.1
+	zstd-sys@1.6.2+zstd.1.5.1
+	zstd@0.9.2+zstd.1.5.1
+"
+
+inherit cargo
+
+ELFSHAKER_COMMIT="bf7097efb1e645f74f2c820741ad791f38cff38c"
+DESCRIPTION="Stores binary objects efficiently"
+HOMEPAGE="https://github.com/elfshaker/elfshaker"
+SRC_URI="
+	https://github.com/elfshaker/elfshaker/archive/${ELFSHAKER_COMMIT}.tar.gz -> ${P}.tar.gz
+	${CARGO_CRATE_URIS}
+"
+S="${WORKDIR}"/${PN}-${ELFSHAKER_COMMIT}
+
+LICENSE="Apache-2.0"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 ISC MIT MPL-2.0 Unicode-DFS-2016"
+SLOT="0"
+KEYWORDS="~amd64"
+
+QA_FLAGS_IGNORED="usr/bin/elfshaker"
+
+PATCHES=(
+	"${FILESDIR}"/elfshaker-0.9.0_p20230918-update-rustc-serialize.patch
+)
diff --git a/dev-util/elfshaker/files/elfshaker-0.9.0_p20230918-update-rustc-serialize.patch b/dev-util/elfshaker/files/elfshaker-0.9.0_p20230918-update-rustc-serialize.patch
new file mode 100644
index 000000000000..619fcf9c2bf1
--- /dev/null
+++ b/dev-util/elfshaker/files/elfshaker-0.9.0_p20230918-update-rustc-serialize.patch
@@ -0,0 +1,16 @@
+https://github.com/elfshaker/elfshaker/issues/129
+https://bugs.gentoo.org/926668
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -601,9 +601,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "rustc-serialize"
+-version = "0.3.24"
++version = "0.3.25"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
++checksum = "fe834bc780604f4674073badbad26d7219cadfb4a2275802db12cbae17498401"
+ 
+ [[package]]
+ name = "rustls"
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 9764614503be..bd97906a646e 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,3 +1,5 @@
 DIST qbs-src-1.19.1.tar.gz 4961984 BLAKE2B 2b9333ac8bba12f311ad47b1315d0a61ddf3b3a804888369f3fd868fbebca4ad13bd857451cb3fe3515fd9f9e69b42b84484289e79d3e7911c69720d7d08ab29 SHA512 b53dae9631c9d4ec1f799395948a67ce4b62ae88908cce3b00f42fb0213d80d32127c3429b95d5c32c9f7c1b861fc5a52ac6952046a6d91d035539d7412a5c4d
+DIST qbs-src-2.3.0.tar.gz 5615799 BLAKE2B f7e10d1dffe7d188c4ab5c6ed1b02837b41044f93083e052105638ed3c091a5be2d4f3bffeb39238baf6e8a1ba2cfc316fefea5f80871c851be3d7c873847c74 SHA512 6611ce02b0dc4f4a0cc68a13a7c684c07061d3fff57d2ca16470fffa253ff23f45349d86ad4ba4c0eab681f74f3c92cddd85daedf1f31fd1a7eae5bddb606cb6
 EBUILD qbs-1.19.1.ebuild 2903 BLAKE2B 311441e8a8fdd8c4be254ec784129216120dffe85a7a8172dc0abd8c26c15723eac4c4d18f22901761b10dd0883464f9864d646ff2820fc610665614a32f4116 SHA512 b04c16648754d322fe115858dd99e36ce67355063b44680d6cea3042f5b062efe59716bf3d55c8fb21e96a81f6c7e74998942cdabb8974e2c598c28ad4875bf6
-MISC metadata.xml 1088 BLAKE2B 329ee0b7c6dafed8b7d346274aed47f22d91a12b2f957e303ebac7ce8c6d021bac51c08810714570ac636948ce6003d574818aea6cc13292fbf02937168b5963 SHA512 b56969418ff375d91b9ea6b3a73cb90048701ee06fead58db3643e57cc0be1864a324ebf9c130cdc593f68984caccadbf7a5c767b6b73ba70cdb0e6e742f2b7f
+EBUILD qbs-2.3.0.ebuild 2158 BLAKE2B 847ad66aa051598ac69dac278f9e299328542f3a8ebb553bf29d1e43544ee234219f08effddf15e842fb444f944f8506d80014c87ee0e0260524b4fba2d92e84 SHA512 1523c686e9300db262c3296dc548ebb85d75f840723addf2597af4da751c15bc94b96577e1f86f4d4aea5576d4a2ce5b78dfcf9e1f74f8ee044307efef891048
+MISC metadata.xml 1135 BLAKE2B 389cfca2f13552aa0da4e29204014c678d2e710cc96fed8f68616431d5a5d0b9bcd5505b396f843dd065c66c0bd8d955ae6137637eb19226552b6b36509fe296 SHA512 854fb0ce9d21b6ff61c4ed32efeffda84d31ec809faa830b921804dc59e5d6d49d8b7326877705f94346f677d72cc17be5ed4099a6e51dbf381f7456c57567d6
diff --git a/dev-util/qbs/metadata.xml b/dev-util/qbs/metadata.xml
index 7899bcd24454..e07e064c9841 100644
--- a/dev-util/qbs/metadata.xml
+++ b/dev-util/qbs/metadata.xml
@@ -22,5 +22,6 @@
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>https://doc.qt.io/qbs/</doc>
+		<remote-id type="github">qbs/qbs</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/qbs/qbs-2.3.0.ebuild b/dev-util/qbs/qbs-2.3.0.ebuild
new file mode 100644
index 000000000000..c00fae7ed834
--- /dev/null
+++ b/dev-util/qbs/qbs-2.3.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake flag-o-matic python-any-r1
+
+DESCRIPTION="Modern build tool for software projects"
+HOMEPAGE="https://doc.qt.io/qbs/"
+SRC_URI="https://download.qt.io/official_releases/qbs/${PV}/${PN}-src-${PV}.tar.gz"
+S=${WORKDIR}/${PN}-src-${PV}
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 ) BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-qt/qt5compat:6
+	dev-qt/qtbase:6[concurrent,gui,network,widgets,xml]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+			dev-python/lxml[${PYTHON_USEDEP}]
+		')
+		dev-qt/qttools:6[assistant,qdoc]
+	)
+"
+
+CMAKE_SKIP_TESTS=(
+	# QBS does not inherit toolchain/flags knowlege from cmake, and
+	# while can use ${BUILD_DIR}/bin/qbs-config to improve this it
+	# remains very fickle and will fail in varied ways with clang,
+	# musl, -native-symlinks, and libc++. After consideration it is
+	# not worth worrying about affected tests here (even if notable).
+	tst_api
+	tst_blackbox # also skips blackbox-* (intended)
+	tst_language
+)
+
+python_check_deps() {
+	# _find_python_module in cmake/QbsDocumentation.cmake
+	python_has_version "dev-python/beautifulsoup4[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# temporary workaround for musl-1.2.4 (bug #906929), this ideally
+	# needs fixing in qtbase as *64 usage comes from its headers' macros
+	use elibc_musl && append-lfs-flags
+
+	local mycmakeargs=(
+		-DQBS_DOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
+		-DQBS_INSTALL_HTML_DOCS=$(usex doc)
+		-DQBS_INSTALL_MAN_PAGE=yes
+		-DQBS_INSTALL_QCH_DOCS=$(usex doc)
+		-DQBS_LIB_INSTALL_DIR="$(get_libdir)"
+		-DWITH_TESTS=$(usex test)
+		-DWITH_UNIT_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	local DOCS=( README.md changelogs )
+	cmake_src_install
+
+	use !test || rm -- "${ED}"/usr/bin/{tst_*,qbs_*,clang-format-test} || die
+
+	docompress -x /usr/share/doc/${PF}/qbs.qch
+}