gentoo auto-resync : 06:04:2024 - 06:30:53

47 files changed, 968 insertions, 60 deletions

diff --git a/Manifest b/Manifest
index 0bc07c2db9fb..69e35f8d33fe 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29767 BLAKE2B 92c09a443150fea612dd0a8061fac9f6883fcd1eb743ed11d6f7f83d047862c8fe13b4f0204260f52cbe9a0405845f8d827248c4ab6fdd193479c062a2e9a528 SHA512 f54961dec192a098686b962b2cdc24794615031227c1fd26ad04faf8c1a00cc5d90241205816a5b85d8e47285d1d00459cdf2a8b2d2affd8c4842b4082a20359
-TIMESTAMP 2024-04-05T22:40:12Z
+MANIFEST Manifest.files.gz 29760 BLAKE2B 85f0c5b2278b0e8776bf00019f530176c19ed25485e968c3350eef9132cbc6b2c0f58ba62928e1e64ee5ab36ff47411eaabf0719ce4dc8430a357860850452ee SHA512 fead2f335b371de25e8645403e22eb3997fe1e7bdf9aee0b0ab9e2e60e8ea44d1c8adff8d95e57561e504b495ffecc120407c8fc8794fe870c1b33c3517f7136
+TIMESTAMP 2024-04-06T04:41:51Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYQfcxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYQ0o9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA91hAAmVBsqzc3P7g/i3FyICU3iiAgOe50xdlY+9ELnfkYlR9ICzIqF3TSjIEB
-5QAnwliAPGKwHuabhHlkvhIuPGTxCsCRFtM72NzgOP6mF9nPgGplKdwgEspFTBzp
-yRVjAHjKlnU6UacqkgcmaY8AArAB08U/rMBqgUBkTHS+zCrOVPm6e+kE1X9Wn0xh
-zQYI/saVA1vxB4yigOXZcxgpSciw2hSceGEmu42UEFI5thOnbbGbgMIuEtdQPh8O
-AxD9t2oG9HyscUMjpNxqk3Bqv41XURAc/YE8j1Zqn/tkIcpPsjC7BUPheocOze8D
-4wVL/+h6d4LzZMCkOTMiljpJvZwcIV/yvpQCs3JY6hWBbWWKvi1l4URVe8kfHAqL
-0c02zK0JLX+PIkLtY18LFhdXjT9HEPNDidye61cUj+H+eR3pQBp8gCvHJX9SqPK9
-S5hABOvGQcNR+HAg7cOxgj517ze5qtom83hWjJTbC0PYxwCKX8mONftUwj8Je1Rf
-78a5/YPVQqHYhGag5Mta58dD1bRXREltAT5P0ybrfJ1alP33LNHpEvOk8gb3bHAb
-7xzHh2GDjHlA2hXVdRtIElvywSnlowGmYJAic2fwjq94myRc5QqRKBeg0cvbmXRn
-QCGnINmqXUiKovMOIzrBVFmRiGW1qQDefVlBAdRXVJSgtCcn4eU=
-=mCJa
+klBs+A//Y3LE3dqu5hkWN8Rb+nQ1CNLuO0PvPTib6wgxEMkTD+lSf8wioyYjhPef
+3ljNdDdczReDdPL5edsmkzswpY/gHoKoPQlU6UjqXHTy9kJut2hESg8SRiNbkc55
+RRugSgmxDCQK9gjZONQ5LVLZsdFQyNrU96tSIjyaxAsFcMb2Yl6YURHzFI3Nc/AM
+5WH/g08px2druaMtGUY2QoveHwpaVuM6FnHznS5tTzWUl+H+U4as0CHZpUnQVZ1B
+NFWiI5fCmqw2Zb6VNbtogTbctHpW2owMGH4LV6F5cYja5pLPyTY5fQmTteBMG1H7
+NkcticjFubTbH50ujcm3hPvatR4AzRbPe9jPFWG+Gg4XK/xQAzmgb/ucw6Dgihfo
+1WaAW7a95RLWjjlGsezL9esY6H1i+6SXnvtMRCxB7gTugt+XJk6I2MGShuq8zWhB
+UI3ertKQipeE0lTjg7dR/O4BI93XcPxlB0NwfLADRnsyPGW/DXlXHyYpMdvBThxY
+MPnqACHMHJ1IZkwmP1/KDmiHMN7xu0OJLPszt53uFSQaFOEJqkvmBdEc5QkNEF/B
+em35Yani5QZG9yrysP942kwTw9SYm1vrq23PnujpV6ngVf/Ne3Kq6zypB9w0UbCM
+DqIZi8ZQv4w5XRve/+LKSL1UISU9bhF7bOFTBTgVlR5goxizNRw=
+=pEZ3
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 7421a1e113de..1a948fd71426 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 991d07ce5e27..77516576ded9 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 0cc306239b00..a2779c04dea6 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -1,5 +1,7 @@
 AUX sysstat-12.6.2-check_overflow.patch 1071 BLAKE2B efa23b3c2fbe1aac353b7282836639dbee08b6cd2fbba9856213a92c65ec8df688182e996966330aa501cbc75845d7159861334715c3ee40c9eb045f42afd153 SHA512 8329d50044c011b30d9ce034d24207502b811cd61b152da6fba330072a63599ebea7f1939856b9e8d6ca79f42c64b0a619138aea6349af7fe69a34319a7b0ec7
+AUX sysstat-12.6.2-defs_and_flags.patch 297 BLAKE2B e0cc3f6d75fa9df9d923494ede247bc1de80c8bfccc1afda1616a739234aec798e1fbe9d9450d0b6c93f5d3b97a7c99301affb73d1df6f4dd85ae009b52e61d5 SHA512 34b572699f3ab9e5cd3bf991b62de258b7a08a1be5be61e33eb282c0e56ec2135229e71ae8c6cf0bec90e6f1e89a95aab81cec2249fbc97f327768d06974cd09
 AUX sysstat.init.d 378 BLAKE2B fe781f1a53e183023da2b46ecefb37881eedf8e8df2623927b24f33aa3344776b39db038d598ad050f1d48462d52300fb17731f29b0a8ab9c800fbe379efa249 SHA512 328ee3d40d45a0b1702c74fe0195ce4444cc8f63cb0fa68ba40ca20cfa183dd7acf4fc846cd76a4bcf426a3b4064316061dbbf26ca20047711528399e17b20b4
 DIST sysstat-12.6.2.tar.gz 1455025 BLAKE2B aba2d8fd5fae8d6df740173d7ccd60beb0628c4c2205342f72ec03d6c48995d397de0d6f2cace24accf1a9274da37cf3bba86888717bc8d62d262ffd1c6f995e SHA512 376047de55598c6f671b999203809219a40206a9c58499399681af9ebe6048dd4da96c8ef5827d75cc369a7b69c3f1aadef1a5e8deec318a12b230d61f09fc08
 EBUILD sysstat-12.6.2-r1.ebuild 1780 BLAKE2B 7d1b3c4134f6f19ba14af313653ed57e17dfb4a30162257341731f1b742dbb78100c98d01cc6bd761a53b3defcb9073836baacc533de902bda6035a2e273706b SHA512 77054f63ddfbd61d46113888c68ec7ab2a9cfb615c05b4d110e3d30f1bb1fe4a969662fbe68d788ccc80d46030b98ffd9baee89095b5389a61c19feed764b214
+EBUILD sysstat-12.6.2-r2.ebuild 1788 BLAKE2B 85fc631dabaf4ca7b321982732713708354116bf416a5177a61eeade16ac788e5363dc51140e42cdab205443257f7f485461e3dd7b1439d1f13dafe2781e1c75 SHA512 32c8288d5a99717f56ea67f3bfe883573eb612ffe367f5c5cb7c027d444f5b7b6735a0af0696f579eabb8800e2ef2d61936442dfb3c23d2cce691fa2373a5df0
 MISC metadata.xml 437 BLAKE2B 1ca03db67ea2dd54c60d454f2215d23e3ab00013beecd400830ba56cc17fd9fc070f2fb1222d21518981a8b76b391ea3fa0e459c11d9a749209ce11b73f74678 SHA512 7856c36c0805a65d36982a9eeef389683954564df7ecd01e8c07db3fa75114bc8459a9d3b8a049953437f023c2f31fd6527d082d4bf9c82692acff468e6fb316
diff --git a/app-admin/sysstat/files/sysstat-12.6.2-defs_and_flags.patch b/app-admin/sysstat/files/sysstat-12.6.2-defs_and_flags.patch
new file mode 100644
index 000000000000..854a66219ff9
--- /dev/null
+++ b/app-admin/sysstat/files/sysstat-12.6.2-defs_and_flags.patch
@@ -0,0 +1,18 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -94,10 +94,14 @@
+ endif
+ 
+ # Compiler flags
++ifndef CPPFLAGS
++CPPFLAGS = @CPPFLAGS@
++endif
++CPPFLAGS += @DEFS@
+ ifndef CFLAGS
+ CFLAGS = @CFLAGS@
+ endif
+-CFLAGS += -Wall -Wstrict-prototypes -pipe -O2
++CFLAGS += $(CPPFLAGS)
+ 
+ ifndef DFLAGS
+ DFLAGS = @DFLAGS@
diff --git a/app-admin/sysstat/sysstat-12.6.2-r2.ebuild b/app-admin/sysstat/sysstat-12.6.2-r2.ebuild
new file mode 100644
index 000000000000..2645fb504348
--- /dev/null
+++ b/app-admin/sysstat/sysstat-12.6.2-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://sebastien.godard.pagesperso-orange.fr/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="dcron debug nls lm-sensors selinux systemd"
+
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+COMMON_DEPEND="
+	nls? ( virtual/libintl )
+	lm-sensors? ( sys-apps/lm-sensors:= )
+"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	!dcron? ( !sys-process/dcron )
+	selinux? ( sec-policy/selinux-sysstat )
+"
+
+REQUIRED_USE="dcron? ( !systemd )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-12.6.2-check_overflow.patch
+	"${FILESDIR}"/${PN}-12.6.2-defs_and_flags.patch
+)
+
+src_prepare() {
+	if use dcron; then
+		sed -i 's/@CRON_OWNER@ //g' cron/sysstat.crond.in || die
+	fi
+	default
+}
+
+src_configure() {
+	tc-export AR
+
+	# --enable-lto only appends -flto
+	sa_lib_dir=/usr/lib/sa \
+		conf_dir=/etc \
+		econf \
+			$(use_enable !systemd use-crond) \
+			$(use_enable lm-sensors sensors) \
+			$(use_enable nls) \
+			$(usex debug --enable-debuginfo '') \
+			--disable-compress-manpg \
+			--disable-stripping \
+			--disable-pcp \
+			--enable-copy-only \
+			--enable-documentation \
+			--enable-install-cron \
+			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+}
+
+src_install() {
+	keepdir /var/log/sa
+
+	emake \
+		CHOWN=true \
+		DESTDIR="${D}" \
+		DOC_DIR=/usr/share/doc/${PF} \
+		MANGRPARG='' \
+		install
+
+	dodoc -r contrib/
+
+	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+	systemd_dounit ${PN}.service
+
+	rm "${D}"/usr/share/doc/${PF}/COPYING || die
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 0ed460137846..203e38832dfa 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 8d254681d058..a694c9c9c040 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -6,13 +6,16 @@ DIST wine-9.0.tar.xz 30007216 BLAKE2B cf53177201a2f7eeb35d0d8ce220f80808d979099a
 DIST wine-9.3.tar.xz 30098792 BLAKE2B fa6f0c73f0886918b035557a37c0553feeea5692ae15e8d67fc4360c59c1bbab9f7f93e58ae29a41800da50b961b49957cf2d060d6b5da34bd956bf7cb3e5fab SHA512 3d75a0e1360765aca453d120e1f47fb50716119f3cab2be1176003a19bba31a6affae4a845840ce52665d97e0edd46dc78a13462d6d6a7e861cd970a0a3d4d1d
 DIST wine-9.4.tar.xz 30166096 BLAKE2B bd65086e6f6e11bc6c7cd65dba6e6997911851f1a2f25cad0b4f8100d695df3c76b0799768ab9047dfd5d8afc7c749a5e5c88003d2f4ca69f417387cc06d527d SHA512 fbc927b04f75fe48e52efb6599ffc84f27f1a08d180386e782c94b37b54ab2a3540ed6cd387d7a59f5aca4df2c9ac3e3c127c3067c16e2357e57b4b0a0ced99d
 DIST wine-9.5.tar.xz 30371420 BLAKE2B c14ebf02f0f5b91bc2b2517ff3630f22c6af7fdc827c5d024d809a383a65446284a5349c8109835112f5353f361088f4f32de1a3d04299fbf39deacbc0e8e8bf SHA512 8ccad8f6e6b1428886dee9fae771796e2021b4122cd96464350352bede25421406e6a6a0fdd63d8b99b896db8dc529aa6e05d6ac7966bee49ce3055b18a8af91
+DIST wine-9.6.tar.xz 30261488 BLAKE2B 53115a8a80593856679718b2055340860221701bc82a784a111a992f5e67b031d7407a16f6df6d4da67f382f30c35d2dd82af2a671a058a76b621c91199e426e SHA512 cc2ea5597636da8d392d1d63b9c135679eff69ea671dc6b53b6f2d44a890aee0e17275174485f6e8dd99c7db737eb82a800a2b05c4966f15e28167c5a6098922
 DIST wine-staging-9.0.tar.gz 9577631 BLAKE2B 0012978f54c618e73d407dd49dccff02853912d0c015098889802518e8c51b280f5d60e11291335dafc68944ee01cbcb7fd6c5825ef10ae1520c7b82d9846718 SHA512 362209fcadcf029152b681c76beb231d0cc8de1609b994094f1dc88ab871fddda08b3d8c2fe36ceb38909a9d634c1ade864ca0f28a6a7715ec286a8b2884981f
 DIST wine-staging-9.3.tar.gz 9672031 BLAKE2B 9613d3ac8aab4208e1f4392e7fdf0f673a6159751665b2f0ab868b9140edaf32f1d4bbb5efe75458e4cce910385ebe6cec2b898f172bd0e0de87bdc675bfe221 SHA512 56a92cd8bbc1ba7fda9fea9d998efac44d2a805d4ebb4253a37ecff8edd51852773f848556935f05418f488698e1ec4cc52a79327f7f5d77390af90f95f9bdf6
 DIST wine-staging-9.4.1.tar.gz 9482082 BLAKE2B 59f0b513c7df9c46a8f6ff034a2f67b92f4bb19cb1375a8ff979b7ab01223d425daf7047bd5166e946599bafe5e3ce7aa2670f893f8f6871e8c692dbe0577617 SHA512 897d9c292fc7d399591490fb53c62e80caab9a16619a261a84fa5b2f4a6ae5c389a6a39f29925532841c8c74254e80aa7cb764f60cf64cd431526b347df559ca
 DIST wine-staging-9.5.tar.gz 9526239 BLAKE2B a6f5a351a3979fc81a0d8c6325da4f08021d19eb7ac6ad52906a6fcf19552f01bdc8fbebc9b33fc82e14cdd6e6d50347dc7bc73e622d589d2e9eec5d577d3158 SHA512 8c756fe505092e21dd37c709ac3917c305b70881c05270f0e188ccdf9ff36b9fd224adad424d37c6919637d2af55afbfba49079eb5b6708a6cf4f2dd98966784
+DIST wine-staging-9.6.tar.gz 9522775 BLAKE2B 5598d408774e3142d6de5ccddccb68d8e1e4544c43b5691751599e6b86df6b8899f6113b8b58d75fb8e032a6c7aed9ffbb3ecb1553aa2d7593d69513e9a0177a SHA512 83691eb560c860d40669a524196a522007c76420b5b5076da4f446a4180fee7558ef228cf1f4179eb78a6d36c8ab78fd2784ffc879b0aacbef7c72a7f88e7ed2
 EBUILD wine-staging-9.0.ebuild 14876 BLAKE2B 72117e7bf8a228954afa8f549aebfac550e533c3ef5eb26a9c0c17d8136e2f8508cc96870df2e32829d71e27daf4346b4cf0ffc021aa7d5004d66e4b2493ae0d SHA512 1aa5cf1f5257edf7fb4cf70f22b34f5b1d0f01bf77a0bbaf00f9446f4f88ba2055477855cbe438a6d92b2cc2bd1503b3b45d91a65117b1e75876f0d23fc52c27
 EBUILD wine-staging-9.3.ebuild 15006 BLAKE2B 8190038ce61f0af3c495261ccadada7c8dc2326af4423b7b812ef5ce259b59d2b3e2a94175a9513aa266906f213ded51280a3505fdb234548f747df06bab9c38 SHA512 60de26f08aa1358355b278a1937d1a96c66499370cd94b3a9bbb54c5c0fdbea3a3c5e26ed4d9d43ffc1f8adb4dfc74ad668dc9d4e20a58559e54006041f37fa6
 EBUILD wine-staging-9.4.1.ebuild 15049 BLAKE2B b1bc45572f1955269a7580f2982d1ab359e0b7540d639336445b909db980b072c851a55d8e3b22ce44ce93b9a1d618b96c9f1b0f6f7197999412e67df2677316 SHA512 2ee2f358fc07be3a0267f9300c2a729c8280b2161c157c03580d73734303273181d018423119ea672822218e1ee1e0f585dfc639bed7f8a80c9556c5a54843ec
 EBUILD wine-staging-9.5.ebuild 15006 BLAKE2B 8190038ce61f0af3c495261ccadada7c8dc2326af4423b7b812ef5ce259b59d2b3e2a94175a9513aa266906f213ded51280a3505fdb234548f747df06bab9c38 SHA512 60de26f08aa1358355b278a1937d1a96c66499370cd94b3a9bbb54c5c0fdbea3a3c5e26ed4d9d43ffc1f8adb4dfc74ad668dc9d4e20a58559e54006041f37fa6
+EBUILD wine-staging-9.6.ebuild 15006 BLAKE2B 8190038ce61f0af3c495261ccadada7c8dc2326af4423b7b812ef5ce259b59d2b3e2a94175a9513aa266906f213ded51280a3505fdb234548f747df06bab9c38 SHA512 60de26f08aa1358355b278a1937d1a96c66499370cd94b3a9bbb54c5c0fdbea3a3c5e26ed4d9d43ffc1f8adb4dfc74ad668dc9d4e20a58559e54006041f37fa6
 EBUILD wine-staging-9999.ebuild 15006 BLAKE2B 8190038ce61f0af3c495261ccadada7c8dc2326af4423b7b812ef5ce259b59d2b3e2a94175a9513aa266906f213ded51280a3505fdb234548f747df06bab9c38 SHA512 60de26f08aa1358355b278a1937d1a96c66499370cd94b3a9bbb54c5c0fdbea3a3c5e26ed4d9d43ffc1f8adb4dfc74ad668dc9d4e20a58559e54006041f37fa6
 MISC metadata.xml 2659 BLAKE2B 8a80b12643e82b98b71bc408e2fd79736da01c8f7d914c7a592cb685893ea3896bc44fecf0160faec803b284d3f6bb38cf36fb4745d9d43e0e1ced8702fcaf9d SHA512 a271e537318a4e90236c195f1f8c24c3255b5465345246627797d37238e2b6292d0734a9ab19542ee34fc1e9312dc4418694992f5ce3c53310228cc6bf14ef90
diff --git a/app-emulation/wine-staging/wine-staging-9.6.ebuild b/app-emulation/wine-staging/wine-staging-9.6.ebuild
new file mode 100644
index 000000000000..ff73fe1caa6e
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-9.6.ebuild
@@ -0,0 +1,477 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools edo flag-o-matic multilib multilib-build optfeature
+inherit prefix python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=9.0.0
+WINE_P=wine-$(ver_cut 1-2)
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git"
+	WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
+else
+	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
+	SRC_URI="
+		https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
+		https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
+HOMEPAGE="
+	https://wiki.winehq.org/Wine-Staging
+	https://gitlab.winehq.org/wine/wine-staging/
+"
+
+S="${WORKDIR}/${WINE_P}"
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
+	llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
+	kerberos +mingw +mono netapi nls opencl +opengl osmesa pcap perl
+	pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
+	+truetype udev udisks +unwind usb v4l +vulkan wayland wow64
+	+xcomposite xinerama
+"
+# bug #551124 for truetype
+# TODO: wow64 can be done without mingw if using clang (needs bug #912237)
+REQUIRED_USE="
+	X? ( truetype )
+	crossdev-mingw? ( mingw )
+	wow64? ( abi_x86_64 !abi_x86_32 mingw )
+"
+
+# tests are non-trivial to run, can hang easily, don't play well with
+# sandbox, and several need real opengl/vulkan or network access
+RESTRICT="test"
+
+# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
+WINE_DLOPEN_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXrender[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+		opengl? (
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+			osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+		)
+		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+"
+WINE_COMMON_DEPEND="
+	${WINE_DLOPEN_DEPEND}
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+	)
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
+	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	unwind? (
+		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
+	)
+	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
+	wayland? (
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+		x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
+	)
+"
+RDEPEND="
+	${WINE_COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	dos? (
+		|| (
+			games-emulation/dosbox
+			games-emulation/dosbox-staging
+		)
+	)
+	gecko? (
+		app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}]
+		wow64? ( app-emulation/wine-gecko[abi_x86_32] )
+	)
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
+	mono? ( app-emulation/wine-mono:${WINE_MONO} )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-LibXML
+	)
+	samba? ( net-fs/samba[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="
+	${WINE_COMMON_DEPEND}
+	sys-kernel/linux-headers
+	X? ( x11-base/xorg-proto )
+"
+# gitapply.sh prefers git but can fallback to patch+extras
+BDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		dev-vcs/git
+		(
+			sys-apps/gawk
+			sys-apps/util-linux
+		)
+	)
+	|| (
+		sys-devel/binutils
+		sys-devel/lld
+	)
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	mingw? ( !crossdev-mingw? (
+		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
+		wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
+	) )
+	nls? ( sys-devel/gettext )
+	wayland? ( dev-util/wayland-scanner )
+"
+IDEPEND=">=app-eselect/eselect-wine-2"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	__clear_cache # unused on amd64+x86 (bug #900334)
+	res_getservers # false positive
+)
+QA_FLAGS_IGNORED="usr/lib/.*/wine/.*-unix/odbc32.so" # has no compiled objects
+QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.17-noexecstack.patch
+	"${FILESDIR}"/${PN}-7.20-unwind.patch
+	"${FILESDIR}"/${PN}-8.13-rpath.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
+		local mingw=-w64-mingw32
+		for mingw in $(usev abi_x86_64 x86_64${mingw}) \
+			$(use abi_x86_32 || use wow64 && echo i686${mingw}); do
+			if ! type -P ${mingw}-gcc >/dev/null; then
+				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
+				eerror "yourself by installing sys-devel/crossdev then running:"
+				eerror
+				eerror "    crossdev --target ${mingw}"
+				eerror
+				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
+				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
+			fi
+		done
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]]; then
+		EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
+		git-r3_src_unpack
+
+		# hack: use subshell to preserve state (including what git-r3 unpack
+		# sets) for smart-live-rebuild as this is not the repo to look at
+		(
+			EGIT_COMMIT=$(<"${EGIT_CHECKOUT_DIR}"/staging/upstream-commit) || die
+			EGIT_REPO_URI=${WINE_EGIT_REPO_URI}
+			EGIT_CHECKOUT_DIR=${S}
+			einfo "Fetching Wine commit matching the current patchset by default (${EGIT_COMMIT})"
+			git-r3_src_unpack
+		)
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	local patchinstallargs=(
+		--all
+		--no-autoconf
+		# patches known broken with USE=-mingw, retry occasionally (bug #921360)
+		$(usev !mingw '
+			-W winedevice-Default_Drivers
+			-W fltmgr.sys-FltBuildDefaultSecurityDescriptor
+		')
+		${MY_WINE_STAGING_CONF}
+	)
+
+	edo "${PYTHON}" ../${P}/staging/patchinstall.py "${patchinstallargs[@]}"
+
+	# sanity check, bumping these has a history of oversights
+	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
+		dlls/appwiz.cpl/addons.c || die)
+	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
+		local gmfatal=
+		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
+		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
+	fi
+
+	default
+
+	if tc-is-clang; then
+		if use mingw; then
+			# -mabi=ms was ignored by <clang:16 then turned error in :17
+			# if used without --target *-windows, then gets used in install
+			# phase despite USE=mingw, drop as a quick fix for now
+			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
+		else
+			# fails in ./configure unless --enable-archs is passed, allow to
+			# bypass with EXTRA_ECONF but is currently considered unsupported
+			# (by Gentoo) as additional work is needed for (proper) support
+			# note: also fails w/ :17, but unsure if safe to drop w/o mingw
+			[[ ${EXTRA_ECONF} == *--enable-archs* ]] ||
+				die "building ${PN} with clang is only supported with USE=mingw"
+		fi
+	fi
+
+	# ensure .desktop calls this variant + slot
+	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
+
+	# datadir is not where wine-mono is installed, so prefixy alternate paths
+	hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
+
+	# always update for patches (including user's wrt #432348)
+	eautoreconf
+	tools/make_requests || die # perl
+	# tip: if need more for user patches, with portage can e.g. do
+	# echo "post_src_prepare() { tools/make_specfiles || die; }" \
+	#     > /etc/portage/env/app-emulation/wine-staging
+}
+
+src_configure() {
+	WINE_PREFIX=/usr/lib/${P}
+	WINE_DATADIR=/usr/share/${P}
+
+	local conf=(
+		--prefix="${EPREFIX}"${WINE_PREFIX}
+		--datadir="${EPREFIX}"${WINE_DATADIR}
+		--includedir="${EPREFIX}"/usr/include/${P}
+		--libdir="${EPREFIX}"${WINE_PREFIX}
+		--mandir="${EPREFIX}"${WINE_DATADIR}/man
+
+		$(usev wow64 --enable-archs=x86_64,i386)
+
+		$(use_enable gecko mshtml)
+		$(use_enable mono mscoree)
+		--disable-tests
+
+		$(use_with X x)
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with cups)
+		$(use_with fontconfig)
+		$(use_with gphoto2 gphoto)
+		$(use_with gstreamer)
+		$(use_with kerberos gssapi)
+		$(use_with kerberos krb5)
+		$(use_with mingw)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		--without-oss # media-sound/oss is not packaged (OSSv4)
+		$(use_with pcap)
+		$(use_with pulseaudio pulse)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_with smartcard pcsclite)
+		$(use_with ssl gnutls)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with udisks dbus) # dbus is only used for udisks
+		$(use_with unwind)
+		$(use_with usb)
+		$(use_with v4l v4l2)
+		$(use_with vulkan)
+		$(use_with wayland)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+	)
+
+	filter-lto # build failure
+	use custom-cflags || strip-flags # can break in obscure ways at runtime
+
+	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
+	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
+	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
+	then
+		has_version -b sys-devel/binutils &&
+			append-ldflags -fuse-ld=bfd ||
+			append-ldflags -fuse-ld=lld
+		strip-unsupported-flags
+	fi
+
+	if use mingw; then
+		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
+
+		# CROSSCC was formerly recognized by wine, thus been using similar
+		# variables (subject to change, esp. if ever make a mingw.eclass).
+		local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
+		local mingwcc_x86=${CROSSCC:-${CROSSCC_x86:-i686-w64-mingw32-gcc}}
+		local -n mingwcc=mingwcc_$(usex abi_x86_64 amd64 x86)
+
+		conf+=(
+			ac_cv_prog_x86_64_CC="${mingwcc_amd64}"
+			ac_cv_prog_i386_CC="${mingwcc_x86}"
+
+			CROSSCFLAGS="${CROSSCFLAGS:-$(
+				filter-flags '-fstack-protector*' #870136
+				filter-flags '-mfunction-return=thunk*' #878849
+
+				# some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" and then
+				# strip-unsupported-flags miss these during compile-only tests
+				# (primarily done for 23.0 profiles' -z, not full coverage)
+				filter-flags '-Wl,-z,*'
+
+				CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
+			)}"
+
+			CROSSLDFLAGS="${CROSSLDFLAGS:-$(
+				filter-flags '-fuse-ld=*'
+
+				CC=${mingwcc} test-flags-CCLD ${LDFLAGS}
+			)}"
+		)
+	fi
+
+	# order matters with multilib: configure+compile 64->32, install 32->64
+	local -i bits
+	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
+	(
+		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
+
+		mkdir ../build${bits} || die
+		cd ../build${bits} || die
+
+		if (( bits == 64 )); then
+			conf+=( --enable-win64 )
+		elif use amd64; then
+			conf+=(
+				$(usev abi_x86_64 --with-wine64=../build64)
+				TARGETFLAGS=-m32 # for widl
+			)
+			# _setup is optional, but use over Wine's auto-detect (+#472038)
+			multilib_toolchain_setup x86
+		fi
+
+		ECONF_SOURCE=${S} econf "${conf[@]}"
+	)
+	done
+}
+
+src_compile() {
+	use abi_x86_64 && emake -C ../build64 # do first
+	use abi_x86_32 && emake -C ../build32
+}
+
+src_install() {
+	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
+	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
+
+	# Ensure both wine64 and wine are available if USE=abi_x86_64 (wow64,
+	# -abi_x86_32, and/or EXTRA_ECONF could cause varying scenarios where
+	# one or the other could be missing and that is unexpected for users
+	# and some tools like winetricks)
+	if use abi_x86_64; then
+		if [[ -e ${ED}${WINE_PREFIX}/bin/wine64 && ! -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
+			dosym wine64 ${WINE_PREFIX}/bin/wine
+			dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
+
+			# also install wine(1) man pages (incl. translations)
+			local man
+			for man in ../build64/loader/wine.*man; do
+				: "${man##*/wine}"
+				: "${_%.*}"
+				insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
+				newins ${man} wine.1
+			done
+		elif [[ ! -e ${ED}${WINE_PREFIX}/bin/wine64 && -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
+			dosym wine ${WINE_PREFIX}/bin/wine64
+			dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader
+		fi
+	fi
+
+	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
+		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
+
+	# create variant wrappers for eselect-wine
+	local bin
+	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
+		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
+	done
+
+	if use mingw; then
+		# don't let portage try to strip PE files with the wrong
+		# strip executable and instead handle it here (saves ~120MB)
+		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
+
+		if use strip; then
+			ebegin "Stripping Windows (PE) binaries"
+			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
+				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} +
+			eend ${?} || die
+		fi
+	fi
+
+	dodoc ANNOUNCE* AUTHORS README* documentation/README*
+}
+
+pkg_postinst() {
+	if use !abi_x86_32 && use !wow64; then
+		ewarn "32bit support is disabled. While 64bit applications themselves will"
+		ewarn "work, be warned that it is not unusual that installers or other helpers"
+		ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32,"
+		ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib."
+	elif use abi_x86_32 && { use opengl || use vulkan; } &&
+		has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'
+	then
+		ewarn "x11-drivers/nvidia-drivers is installed but is built without"
+		ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
+		ewarn "applications under ${PN} will likely not be usable."
+	fi
+
+	optfeature "/dev/hidraw* access used for *some* controllers (e.g. DualShock4)" \
+		games-util/game-device-udev-rules
+
+	eselect wine update --if-unset || die
+}
+
+pkg_postrm() {
+	eselect wine update --if-unset || die
+}
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index ed06e2130d8a..02c162034dc3 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/framework-laptop-kmod/Manifest b/app-laptop/framework-laptop-kmod/Manifest
index 8109bc0769af..ff3ea6f27a40 100644
--- a/app-laptop/framework-laptop-kmod/Manifest
+++ b/app-laptop/framework-laptop-kmod/Manifest
@@ -1,3 +1,5 @@
 DIST framework-laptop-kmod-0_pre20231204.gh.tar.gz 10728 BLAKE2B 921112a6f895c916a6f1403d405472bbb084a84aa42cc80d938f59f692f49a535a8e5613dc01d07b502a86d2a5e4f9c16999d9edf495b75027dbc81f5845da79 SHA512 e104011e15fad74c5d74050844471aaeb20354304f3e6985b6d3f40fa82169d2c7c893a98cf3c49e7a4138c899b0197b3c538454d4494750ce22b50d169440dc
+DIST framework-laptop-kmod-0_pre20240405.gh.tar.gz 13016 BLAKE2B 10a92fbbb1974213846ca4d4bc3bec5074b192661ea46e178c9786f2fbec63fb0beff9439d1d1ae9cd633d83207d5272549ef0975a5c23cfe77219df6513ba24 SHA512 243a51eb454c68433fb74027c6675da1227907c9fcf546ef4ae624c031ee701dbeef49b4cc6b8077d3c9e5284a524e13277518fae7449dd7142899b4c5bb3e5e
 EBUILD framework-laptop-kmod-0_pre20231204.ebuild 1104 BLAKE2B 598e2d4186b6bca80d02f2ffbd77d74f0a31a7c19e46787260a59d646623beea724811a04c5289e77124e2c79d6c46cf26d21295c1f50ab1ba043c0bee03a1b3 SHA512 0c92a0cf4a63caeb9aab6d3c6c02b319cbef71078e55e1774d4c688feb1a0cd89d5495e75d82ee2479e7960227e434a8c1adea7ca26e25e1f5dac8d792a2c710
+EBUILD framework-laptop-kmod-0_pre20240405.ebuild 1109 BLAKE2B 00d204b9091abfa64c161654b2c1040bf1846e58c0ffa524332103972c2ede65f0a0ebb0dba967c968a512ab2b9883325807d1fe16f17244d7201f84b19b0d9e SHA512 0014041af6ac2e231d218e2a592995b08d2d001cbac5361b48bdaaa88fe6e51514a87d1110a67e63a678167669358cc17bf34f90f047bfc166021f6c640d6ec5
 MISC metadata.xml 344 BLAKE2B e35364b1c9e10982f93848cf7a64ade9132672edbca7e631ec5b8fb23dbea4e3ad251a33f6a3b95c694cb63ccaf279eb011730a3f18be588677170414d7c49cf SHA512 2203683eea9b10b06f551344fa91d8d27692fb1918c163893dbceaa8f481b0272861555ae60e1f0e13c1a023e46206a1a804a39585fbdf9bf1a10a9130e03bec
diff --git a/app-laptop/framework-laptop-kmod/framework-laptop-kmod-0_pre20240405.ebuild b/app-laptop/framework-laptop-kmod/framework-laptop-kmod-0_pre20240405.ebuild
new file mode 100644
index 000000000000..681b5a814f8f
--- /dev/null
+++ b/app-laptop/framework-laptop-kmod/framework-laptop-kmod-0_pre20240405.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-mod-r1
+
+COMMIT_HASH="6ee08ebb558627863236ff00fab98d25f582ac01"
+DESCRIPTION="Kernel module to expose more Framework Laptop stuff"
+HOMEPAGE="https://github.com/DHowett/framework-laptop-kmod"
+SRC_URI="https://github.com/DHowett/framework-laptop-kmod/archive/${COMMIT_HASH}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT_HASH}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CONFIG_CHECK="
+	~CROS_EC
+	~CROS_EC_LPC
+"
+
+DOCS=(
+	README.md
+)
+
+pkg_setup() {
+	linux-mod-r1_pkg_setup
+
+	MODULES_MAKEARGS+=(
+		KDIR="${KERNEL_DIR}"
+	)
+}
+
+pkg_pretend() {
+	check_extra_config
+}
+
+src_compile() {
+	local modlist=(
+		framework_laptop
+	)
+	linux-mod-r1_src_compile
+}
+
+pkg_postinst() {
+	linux-mod-r1_pkg_postinst
+
+	#if kernel_is -lt 6 7 0; then
+		ewarn "For the Framework Laptop 13 AMD Ryzen 7040 series and the Framework Laptop 16a,"
+		ewarn "you will need to apply the patch series from this URL:"
+		ewarn "https://lore.kernel.org/chrome-platform/20231005160701.19987-1-dustin@howett.net/"
+	#fi
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 7ed510cfe70d..12926495fc3d 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index e0e398475d49..8aea6e1061ec 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -2,8 +2,10 @@ AUX libbpf-9999-paths.patch 883 BLAKE2B 663e03ae01afd7be73c281e8b83cf5534717c28f
 DIST libbpf-0.8.1.tar.gz 942702 BLAKE2B 084be7d4258500fa894560ed2e52821addcc5d150dcd77fd646271b614d788b7931271be9c3e46fdbc4ed93d053ea3e09023158a8e4a31f9452d10dcb0677b58 SHA512 e3bb602f55215a4f030e564af7321ba6338937c426fcaee478b607f88b0c773c40a0c3f59a2b345bda951a19e79061733f8a3fdc10a6292e92782e65754b584a
 DIST libbpf-1.2.2.tar.gz 1000104 BLAKE2B 45a2ceabd38b3ea55f466de68d0806df6ae802b509063ca12d670ba972bac3dc5c7e518e8c9904915dbc9877c27ea892a7b857aa03d4e86016969b2d278b0b4a SHA512 bc7620207e6f521b9b5baab00bd81346084b8eabf81bff3ec24e5367d389f2a331a0b082798f8bb5d4fea836c3c0cc961fc881abc3a4e05d91152150bdfe47be
 DIST libbpf-1.3.0.tar.gz 999282 BLAKE2B 5ee0a45cd06be482c9523ec2a9bb26cf12b89df23f515b037badda868770069d5ffb751c011222b86b1d43034a1cdd537cb263883ed0645641548adc9c9896eb SHA512 59990189538e47765542e9ed6e88bc78c9d29bc077b5666bb1303cf15579c90b3d35a0d631b9bbd4bff2708243dc91d901bd68c119fb74dfd10a3e1066aa9acc
+DIST libbpf-1.4.0.tar.gz 1015490 BLAKE2B 46932f972201581f9f5be98063888216fd522ac549561efdec09603dfcbf0132418f50c2aed80d656fd25b235a9dc3b4ffe459cab9445a8508a7af620989072f SHA512 400c91a4870be8bb115f7abcc12c460700980fb6a3afdf43c885b1cdbe28fed1d37142d3987a85e12b4c565787a48f5cd0b07cafff067d91902d70713528929f
 EBUILD libbpf-0.8.1.ebuild 1153 BLAKE2B 98da8cd35ab316a4bbf9d4e6a9c40b278ecd1385d8077a16e4582fb9a4209c40ebcf4ec9e24d3312334ace6c2f99da9732e7a9379a0dd478baa66bdd790a4793 SHA512 16a7e9a08fe9d782da9f57727b50592d42c7cfcd5cbf407197c5764e2a7175f0277a116e25379092e0f67adac353513f614d9bfe2edac2990d0fc91d5adc9a26
 EBUILD libbpf-1.2.2.ebuild 1185 BLAKE2B 57c4bfa90f1601343e66e0233c30af684c47688eda103bd2672472cf6a199f8849f0821d2e889e583dc09a4a8e36b9a9f92fb3d1abb6e2db844b5f57c3566489 SHA512 ab6998bfa3a4674c6df8ccfa0b46216779d6ea48d22f33a45836f233f3c755b714aeada2f8950814a083a1a490ca10672df60351b9c8ece555fe98a3a1bb5c27
 EBUILD libbpf-1.3.0.ebuild 1244 BLAKE2B 1d5e177c1413d136a9e27220d7e3a7da0eb315191eaecdb32bc3409120e5bea0082cbee6110bdfec47c12c39a69de2a67cb2a7944deeecb0f9675983b3892d74 SHA512 e7b817cc258547e83399e3546ded27a1074f36c27aa0a47fd631e520d8a43a7c10277f45bc45acd48ec2176b7df0e516736797276cca594e8eda90d4a423fe59
-EBUILD libbpf-9999.ebuild 1192 BLAKE2B e26a265cb13392e4e90e48ab96cabad38188e9b28ccf40e8e7b11a08117193dbe025f5ab71c09da29a7e3ab2561c154389e87be9b1a1fba8e7d57eb3105a07bb SHA512 955be1dde34476c2b66014f9b3da584ea38459105f49980e29fd943198feb3ee228a6ffb121c9bbce7c109712c37bbc8996f8cc4715eba626bd08aadaa23d7e8
+EBUILD libbpf-1.4.0.ebuild 1257 BLAKE2B 34b5183bd4bb8c605eb8de29a6f4634e173fc6f435bbbc05ef233ec6e6a75416083e447c861c8f7c5762c520d7d83a1dd90528b3352273becab8ef272df93555 SHA512 6b08a58ae46cb5c7927e7e2591cb14e56ba01eb0512c0e3bf877eb2d1454f239cd2cba7e649963167bab16b5bd588e45d4c60fe6f2b73e0a86734cebdce153f4
+EBUILD libbpf-9999.ebuild 1251 BLAKE2B 2ede02f43b6d6849a3ecc57bbfa29d2089013cb14c18604ea57454fe5ced1c3bcc77aff74684e7b1286acca7d7c42dcbce2c4553e3c694813b83ff1e5f54317b SHA512 9bd941c52ea5b4582f1818a728dabb4668358c0eab1a20444c4c2249a1d92290207f50c16647c267e04155a6c0148c42c424f3db13de84aba7e2fef81ef550ff
 MISC metadata.xml 420 BLAKE2B c61b50bd86dd9d110c35d57a9352ca3862790460f0a6f8e4be9e4ac2eb603fe6c1d6bbe8d77e9fdf32d08e7aaf19349516f25a0fdcb29e2671d71d2c230fc1f5 SHA512 131f77e33aa5b3cbc037a297fe0ed9affbcb956b4c7ddc64889eba5f8315f5090ae4fd7a6054f8961461072ca77d13f8bc6674f3ed27372b7b96c4322c487676
diff --git a/dev-libs/libbpf/libbpf-1.4.0.ebuild b/dev-libs/libbpf/libbpf-1.4.0.ebuild
new file mode 100644
index 000000000000..6cd9245fc9a6
--- /dev/null
+++ b/dev-libs/libbpf/libbpf-1.4.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
+HOMEPAGE="https://github.com/libbpf/libbpf"
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+S="${WORKDIR}/${P}/src"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-2"
+SLOT="0/$(ver_cut 1-2 ${PV})"
+IUSE="static-libs"
+
+DEPEND="
+	sys-kernel/linux-headers
+	virtual/libelf
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+DOCS=(
+	../{README,SYNC}.md
+)
+
+PATCHES=(
+	"${FILESDIR}"/libbpf-9999-paths.patch
+)
+
+src_configure() {
+	append-cflags -fPIC
+	tc-export CC AR PKG_CONFIG
+	export LIBSUBDIR="$(get_libdir)"
+	export PREFIX="${EPREFIX}/usr"
+	export V=1
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		LIBSUBDIR="${LIBSUBDIR}" \
+		install install_uapi_headers
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+
+	dodoc "${DOCS[@]}"
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+}
diff --git a/dev-libs/libbpf/libbpf-9999.ebuild b/dev-libs/libbpf/libbpf-9999.ebuild
index 4bc4f9eafffd..a666bd28bfd5 100644
--- a/dev-libs/libbpf/libbpf-9999.ebuild
+++ b/dev-libs/libbpf/libbpf-9999.ebuild
@@ -1,10 +1,13 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit flag-o-matic toolchain-funcs
 
+DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
+HOMEPAGE="https://github.com/libbpf/libbpf"
+
 if [[ ${PV} =~ [9]{4,} ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
@@ -14,18 +17,24 @@ else
 fi
 S="${WORKDIR}/${P}/src"
 
-DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
-HOMEPAGE="https://github.com/libbpf/libbpf"
-
 LICENSE="GPL-2 LGPL-2.1 BSD-2"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="static-libs"
 
 DEPEND="
 	sys-kernel/linux-headers
-	virtual/libelf"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
+	virtual/libelf
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+DOCS=(
+	../{README,SYNC}.md
+)
 
 PATCHES=(
 	"${FILESDIR}"/libbpf-9999-paths.patch
@@ -49,6 +58,8 @@ src_install() {
 		find "${ED}" -name '*.a' -delete || die
 	fi
 
+	dodoc "${DOCS[@]}"
+
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins ${PN}.pc
 }
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 0d89ccd374ab..602c28dadfcf 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 39bc7eed71ae..a1d997b289ad 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 05 Apr 2024 22:40:07 +0000
+Sat, 06 Apr 2024 04:41:23 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 6e2e07b17ca7..f874060b7c7f 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 569494 BLAKE2B 475196fd0ff28d6023f45e6c22284bded2028bbe891778e3828fb75c3727438168bcd5ab63fe48683bb5874710c096e12470eee93163ae90c07d1f9d79810710 SHA512 94822c7f83b3b68b28e1885c442c2d9b5794eb5f861b8a0862162601a2c2b03cdc2bb6144d8b4a1d61befedf2ff1952e540c518e34c7f15ff5af14b7dc567fcb
-TIMESTAMP 2024-04-05T22:40:12Z
+TIMESTAMP 2024-04-06T04:41:50Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYQfcxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYQ0o5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB1Ow//eNbjOU9A84flhrGFG7WtjESztZSOsjNAkkQvdonOYc4gZ0KsVeQ8R4Gi
-AUUp3Uv5OLcwhapdbqr7Vxf3yqhTYQL+zKe8btS3QECcXCn+yTZwUC2oyC+xxzgb
-ze9+7VZMJy5vTQh3+snUuz9O1cJcEzhClf9DSZXtbLPs+m0YXxTTteL3Eok7EdW8
-y1Vrpa9Q83jyL6ur4RlKivG1E7Pc2MRBJnixlJlAHO8DOfJldR+CMyqtH2ElODNw
-291LJWMUV3r3ITcO0U38QSoAaG+EOWP3YZmixIu5PLon4DSrSsWdvwxSfFf1UE5F
-gsZv/0PGwdviVXEQc6F/rTxr0Zm8t/w/Caf7Zn5+8LAuHkw6Swv6TkBZelvHqv1l
-ozTDbZHe7BhD57B4cItBTLtbKEGm3Bq+t3yc2xAEUFDQoifpG7RJjwE90pMvestS
-LTXFBLWhJnOBD0bDFNFCNagHbeuJZkutCQZY1tQQ5P5M725cDwFQhAjcRzXgsJIG
-SnwbIXzqzioU7zuoS7Iu87HOED5D9LDcrXJXI2G+UJuiezHz6GLl5Nxk3mx6mppX
-X92Q2IQTVlDmetVDyyXovLZe/qNgt70z8J+mzpJAv3SWPAgN/RHfSJe3q/ExHxzc
-xQAOzFQQTnUi/gkBYCQ/rTYANt1iB7Uw2nvHqMnnGJoRKsArWh0=
-=mgY7
+klBpAQ/6A8qzH8a+W8gdZoa9Js1FukfPBCqfymImiFuQuo2fgkLNq24ui9/Qsiki
+P++MKV79JpjuHNLaJHB4yoTiJda3LtuuiUA9r4sK0cFlRcpKXOz/rcZQ/UKDIJKA
+Fs42ze5tX6GcpOg/Ca2vQEAq0fbPyUaSXqVYCB3fCHbWpIP6SGC38dDyvpBnofDh
+clFK3zR9nZKZdjf6Uds1YUDtlmOI+UeIdkdXIriypCO1dhbqqOtAvrwsZg9ftlMX
+PxJ4tzCXh80mFrQSOmY/XhR5OOlKgQb6LpOtPqbahw2o0HrDXV2Ky+nnkRemS2QJ
+yZ7/g2aLLETLR2ZncPc7TqtylIhwsoq6wptKQkpWBA0lKRTXowDboqh0OMuUdnIO
+UjatGMJm+VVwuNExZ+4A9RYzS3Yhuv6H8/nXaypkhI3HpgbArD5LViGB0RSmA/E1
+ECEkSKwuojuvNOzFFqVzfiSuGzOZS1BUBMfhSN9wv/wst8cA356jSbnzx09uSwzt
+jcAUQaVDfRJhXcKuVS5tZaQVkiOvgB6j4veAM7JVS1pc0Ql4KeK/swG6v163O6OC
+UucxgOLPKM0DbxFEdAPLAv7ZChpiVpzu+uTuuhdeV4CCQFBV/kRX0ClXUt8w7cb8
+rHySCRSgFQoL6cSuJApsovQ04Nr8rigyUbUHKqj4zkytxbdQm/A=
+=bhZW
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 39bc7eed71ae..841cd34ddd9e 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 05 Apr 2024 22:40:07 +0000
+Sat, 06 Apr 2024 04:41:46 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 66e7b22d3f5d..6e0415468682 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 2c99e66319a9..5c842d02f221 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/sysstat-12.6.2-r2 b/metadata/md5-cache/app-admin/sysstat-12.6.2-r2
new file mode 100644
index 000000000000..84001b88a44f
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sysstat-12.6.2-r2
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=nls? ( virtual/libintl ) lm-sensors? ( sys-apps/lm-sensors:= )
+DESCRIPTION=System performance tools for Linux
+EAPI=8
+HOMEPAGE=http://sebastien.godard.pagesperso-orange.fr/
+INHERIT=systemd toolchain-funcs
+IUSE=dcron debug nls lm-sensors selinux systemd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=nls? ( virtual/libintl ) lm-sensors? ( sys-apps/lm-sensors:= ) !dcron? ( !sys-process/dcron ) selinux? ( sec-policy/selinux-sysstat )
+REQUIRED_USE=dcron? ( !systemd )
+SLOT=0
+SRC_URI=https://github.com/sysstat/sysstat/archive/v12.6.2.tar.gz -> sysstat-12.6.2.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=37078ad2c2de5082408673ddf7bf7de6
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 85a93e9f7478..eebe24115563 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/wine-staging-9.6 b/metadata/md5-cache/app-emulation/wine-staging-9.6
new file mode 100644
index 000000000000..5bea6cb5571c
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-staging-9.6
@@ -0,0 +1,18 @@
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( dev-vcs/git ( sys-apps/gawk sys-apps/util-linux ) ) || ( sys-devel/binutils sys-devel/lld ) dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( >=dev-util/mingw64-toolchain-10.0.0_p1-r2[abi_x86_32(-)?,abi_x86_64(-)?] wow64? ( dev-util/mingw64-toolchain[abi_x86_32] ) ) ) nls? ( sys-devel/gettext ) wayland? ( dev-util/wayland-scanner ) sys-devel/gnuconfig >=app-portage/elt-patches-20240116 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup unpack
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) smartcard? ( sys-apps/pcsc-lite[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libxkbcommon[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers X? ( x11-base/xorg-proto )
+DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
+EAPI=8
+HOMEPAGE=https://wiki.winehq.org/Wine-Staging https://gitlab.winehq.org/wine/wine-staging/
+IDEPEND=>=app-eselect/eselect-wine-2
+INHERIT=autotools edo flag-o-matic multilib multilib-build optfeature prefix python-any-r1 toolchain-funcs wrapper
+IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos +mingw +mono netapi nls opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl +strip +truetype udev udisks +unwind usb v4l +vulkan wayland wow64 +xcomposite xinerama abi_x86_32 abi_x86_64
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) smartcard? ( sys-apps/pcsc-lite[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libxkbcommon[abi_x86_32(-)?,abi_x86_64(-)?] ) app-emulation/wine-desktop-common dos? ( || ( games-emulation/dosbox games-emulation/dosbox-staging ) ) gecko? ( app-emulation/wine-gecko:2.47.4[abi_x86_32(-)?,abi_x86_64(-)?] wow64? ( app-emulation/wine-gecko[abi_x86_32] ) ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) mono? ( app-emulation/wine-mono:9.0.0 ) perl? ( dev-lang/perl dev-perl/XML-LibXML ) samba? ( net-fs/samba[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=X? ( truetype ) crossdev-mingw? ( mingw ) wow64? ( abi_x86_64 !abi_x86_32 mingw ) || ( abi_x86_32 abi_x86_64 )
+RESTRICT=test
+SLOT=9.6
+SRC_URI=https://dl.winehq.org/wine/source/9.x/wine-9.6.tar.xz https://github.com/wine-staging/wine-staging/archive/v9.6.tar.gz -> wine-staging-9.6.tar.gz
+_eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=b3b3d1873bfbd9dd9dc62769bc5a61a6
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index f5044043e794..71e0ca5c69cd 100644
--- a/metadata/md5-cache/app-laptop/Manifest.gz
+++ b/metadata/md5-cache/app-laptop/Manifest.gz
diff --git a/metadata/md5-cache/app-laptop/framework-laptop-kmod-0_pre20240405 b/metadata/md5-cache/app-laptop/framework-laptop-kmod-0_pre20240405
new file mode 100644
index 000000000000..3522c4bbe0a4
--- /dev/null
+++ b/metadata/md5-cache/app-laptop/framework-laptop-kmod-0_pre20240405
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig )
+DEFINED_PHASES=compile install postinst pretend setup
+DEPEND=virtual/linux-sources
+DESCRIPTION=Kernel module to expose more Framework Laptop stuff
+EAPI=8
+HOMEPAGE=https://github.com/DHowett/framework-laptop-kmod
+IDEPEND=sys-apps/kmod[tools]
+INHERIT=linux-mod-r1
+IUSE=dist-kernel modules-compress modules-sign +strip
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
+SLOT=0
+SRC_URI=https://github.com/DHowett/framework-laptop-kmod/archive/6ee08ebb558627863236ff00fab98d25f582ac01.tar.gz -> framework-laptop-kmod-0_pre20240405.gh.tar.gz
+_eclasses_=dist-kernel-utils	145861da258122cbba5240a850f1a5e8	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	7ca3057b277f1e5978947b4cc289ce62	linux-mod-r1	137b318f89f77c2b66124fcc7790737a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=932563915a5fd1249edc9f5213e28222
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 95aeaf47c3ea..db3a363ac2d6 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/libbpf-1.4.0 b/metadata/md5-cache/dev-libs/libbpf-1.4.0
new file mode 100644
index 000000000000..10948372c363
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libbpf-1.4.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=sys-kernel/linux-headers virtual/libelf
+DESCRIPTION=Stand-alone build of libbpf from the Linux kernel
+EAPI=8
+HOMEPAGE=https://github.com/libbpf/libbpf
+INHERIT=flag-o-matic toolchain-funcs
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1 BSD-2
+RDEPEND=sys-kernel/linux-headers virtual/libelf
+SLOT=0/1.4
+SRC_URI=https://github.com/libbpf/libbpf/archive/v1.4.0.tar.gz -> libbpf-1.4.0.tar.gz
+_eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=c44936ca75aae4e9c87ecb3451464171
diff --git a/metadata/md5-cache/dev-libs/libbpf-9999 b/metadata/md5-cache/dev-libs/libbpf-9999
index 9563be13d6b5..46554a3ad8d1 100644
--- a/metadata/md5-cache/dev-libs/libbpf-9999
+++ b/metadata/md5-cache/dev-libs/libbpf-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=sys-kernel/linux-headers virtual/libelf
 SLOT=0/9999
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=8990c44be6c966185625ca5e289e67b6
+_md5_=6caba534950408ec40b9878a5c85ade9
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index ee4cc5cef20a..3562692d47ca 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/libX11-1.8.9 b/metadata/md5-cache/x11-libs/libX11-1.8.9
new file mode 100644
index 000000000000..51566ca334ba
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libX11-1.8.9
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-lang/perl ) sys-devel/gnuconfig >=app-portage/elt-patches-20240116 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3 virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=x11-libs/libxcb-1.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/compose-tables !<xfce-base/xfce4-settings-4.16.3 x11-base/xorg-proto x11-libs/xtrans
+DESCRIPTION=X.Org X11 library
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libX11
+INHERIT=toolchain-funcs xorg-3
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=MIT
+RDEPEND=>=x11-libs/libxcb-1.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/compose-tables !<xfce-base/xfce4-settings-4.16.3
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.8.9.tar.xz
+_eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xorg-3	2093d675f9b0882f91143352a79d06d7
+_md5_=5c60549807f858872f0974d54f71c448
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 4687d4066aa0..ac21b7856fd4 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/compose-tables-1.8.9 b/metadata/md5-cache/x11-misc/compose-tables-1.8.9
new file mode 100644
index 000000000000..64365ceab39f
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/compose-tables-1.8.9
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20240116 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-base/xorg-proto >=x11-libs/libxcb-1.11.1 x11-libs/xtrans
+DESCRIPTION=X.Org Compose Key tables from libX11
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/compose-tables
+INHERIT=xorg-3
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.8.9.tar.xz
+_eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xorg-3	2093d675f9b0882f91143352a79d06d7
+_md5_=062bbc0e5fc1c6ea17f798412fedf43d
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 6814645529f4..9c33f149f051 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 17308 BLAKE2B d6f0e1960300dcb206a4c928e0f5497ce5fdccacc5a0e5c2508a7af6e8f9498d7b9fb9ec3f5d3954053fc79e8414e01e57845b94cb5cd6f55794cf59ea3c0d33 SHA512 5f19269ff35bf881a2c86ab1b5ce45cd93f05493fcf48e1b653586b091edc5c0a54df7ffbf400b137990209ea574d0bf309d777111a8f29a227fc82a5ed91540
-TIMESTAMP 2024-04-05T22:40:12Z
+TIMESTAMP 2024-04-06T04:41:50Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYQfcxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYQ0o5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBBEQ/9GViuUi+cvCA+pEWQ7CqppcwNkiKl+ksF6aUh8lgFVerWv3z5ONJxOyi5
-o7sD4fLjUvsSmsomqXq2v3t0QHIAuWSriHUvP4y/0Ahag3wJVKmyYn/h8muuP89v
-fI0aPrg1ok/lliRDjezSVsUbNly5k4WG9vDJ6i7gD6P7wK2fmobTOI5ibsf+iQ/4
-sTrlOqQJebHfhvDkOGsv1QlO9K6wGLpyO7a/ukCYY6vwwfwvIxNMAT/GHnjKwGgA
-0vSS5jR/OTdL+i6WBIejtHmlTu8Wu/bqVtAd6G2e+q5z0jQnRyaaKy3dyvR9knVW
-wRV+Cfj/LWdHZw1Feqk19HTuSOr0fYolcVRKPRTox35Rt0/iKWlJRIrmXzt1YC0j
-Xv6IgKNmhF17qxFo/93V1HzqmdrOOZl0JwdYzXUsPbnykN80PSObBHJWJRfhS54p
-z8mBXcHhBKMo1bpvrJeaQyzKPpmY2BFCtEWWzHLmGVqVeY2j3bseY0/zUed7H+oq
-GmtuxpU1Qd+XnEknzl+SCDrSQNhSR1M/P1xIyN6y3WTuhe0KWpRWAToKe619iN6m
-fGSKolhULwAmxweLSgXhihV5fHmkgRR8EuPT5aIrbrJ34NH1hPvbtqWRfrmP+eCx
-GhAk/YyYMk75HyyPMVfvbgtQqkPGLMn29yj9SYSI1bBGF/oln1s=
-=lFZk
+klAIHRAAm0NUGjIEYKhIWr3kTC14zNX9gYsCx54FpOC+rECOZq7W0A0RtiklFa+o
+VoiKaczKcHwuuoAV+jbhnwBCRmq6VtadHR8xPehwbuHC3F5TxHCQc1FLJCQxsTQU
+cXB4us0uV+BTWwkzuPdOeYC9sMEnbkSXd0QrmcZH23e0aNJdgJapzadsGOjU/2NS
+trJed+onpPkeGPup6XmE2fZz7Q1/oduaMfYNRFhriPiow9Mn6GyPwPcCqOWNPvIy
+3NX1Hbvuy66qwYP16rEq7gLUULWiLeVKXeqk1G5pWnbaVPyalwV8RiRsRbZ80ziY
+l/BubXiUPFOzGh4rU3Z2yDmBh9Weqpp3W+bAGl5ziDBEDUAJYUObTYSNUDf5lJZ1
+6z+eAQaa+D4azK+B3ZC69bwE+w8wkUxNCVj5SoQr0lJGRgDBuC7mNZC72Pm+RHs6
+cvqCQeDhIygCB8Lpv461Tq7cgSWbhuyYpVE5K9HHJEUNzPXq9JEcL37iOSe548cG
+HL9kzwHx6UQEYxbOV8pZu+s8W+CFZtofHS9ANvYN44aFOwTIio1BEXvkbE8lQpMv
+Kwhlk+BbVIFESdbJNtmqJWnHNe+uK/z6sPT9DNRO72Nn997IM6x/97gDe0iV4KG1
+DmimtZ/Zz9gAkhaUhpbWeG4EULMquqaVFafoVADjR0G9bLGGAvw=
+=isJK
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 39bc7eed71ae..841cd34ddd9e 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 05 Apr 2024 22:40:07 +0000
+Sat, 06 Apr 2024 04:41:46 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index e3448d30d69e..8fddfed4083d 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Apr  5 10:40:07 PM UTC 2024
+Sat Apr  6 04:41:23 AM UTC 2024
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 9ed328aaf76b..eb26d6b0cf94 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 05 Apr 2024 22:45:00 +0000
+Sat, 06 Apr 2024 04:45:00 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 62a69641fcac..8717ea3f6eaf 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-b448e9d8d8a7fa8333d04f16429862b99f61e912 1712355979 2024-04-05T22:26:19+00:00
+ae91dc7be6e64895495225c86ec9065410b54ecd 1712374642 2024-04-06T03:37:22+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 1dd871ab75b9..190375e2b519 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1712356801 Fri 05 Apr 2024 10:40:01 PM UTC
+1712378400 Sat 06 Apr 2024 04:40:00 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 39bc7eed71ae..a1d997b289ad 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 05 Apr 2024 22:40:07 +0000
+Sat, 06 Apr 2024 04:41:23 +0000
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index a09d4c5e93b0..306c750c88ee 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 541af6a68135..41274c3fccc7 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,5 +1,7 @@
 DIST libX11-1.8.7.tar.xz 1859256 BLAKE2B 335d8af91c13aba11255c266c4687a7f66b021207a92485d723b4107601bbabb6a0e5535241a3bcff4ac9a99142730d2b3d2e2eaff86b507fee5b35a2590d792 SHA512 d53bfc18f38d339a6a695b09835b2ae96b323881678bfe7ddca697605e3bdf4102ff49cc3078880a6c55b5977fcdd0aadaf5429086132de3a5bda302f79a2fa6
 DIST libX11-1.8.8.tar.xz 1872808 BLAKE2B d180932c65c565d113ae768bb0035aa98ff7dd265de9a7907f54f994b1520d7fc67699032450afc5d8f9427247f73dcf71259ff6a3f734d71f6e8b6181c6891b SHA512 4e7ce8f2d88b9475f960ea1d5730ece8953509e0c057cf2d0a2f5fa6a36e6577b0dcd7f16ac91b8fdd804aabec6d7e8f3067a3a8667bd2e41d72dd68ab70ef82
+DIST libX11-1.8.9.tar.xz 1811900 BLAKE2B 8858157ac490d65e19500bfbb2ab773a3a30041f8a757ff22fff8fb0124044b8bb826f6dff4115230c757a175b61a3f7d596d976d98be760085749878d64f871 SHA512 737af91818537295ac86be601b1e3d7e37d150716ec549580913b7cc9a44fee7a6ce9dbc3d46167eed91f23fe857c4dd355ed8f8440fe5fbbf8e9ebe47091b96
 EBUILD libX11-1.8.7.ebuild 1006 BLAKE2B 8ea7476bf009cf313eec3224dbe1588b31d2facaf99106b4a5bbf3d8235417c29cb778fe7baea1850a4bf5db4a2aba30c3b89054e79f4296044a16b9a406dc01 SHA512 3e0bea40df7719fbbaaf3080341fbe5947bd79146b114b3f489a07534dd57c9f7314f9e71da68051e4f6d88e3a80edd756bfa31a6632639eb7f8d2aed4edb767
 EBUILD libX11-1.8.8.ebuild 1014 BLAKE2B 6fca1492c985e5366003d69c294b1859dd40d4f2df75a4e89c10ae178ab80002fcb5d692f1eeadd5eba009fa88de6206d4b3d85f12d9f0372cfb5f9b3472bfc8 SHA512 9582e91023bd5fff0e71b363a4aa2039e7a6d97744b28beeee4103763c067addfbd84bd0389ab73a9eca19f9f05e9d4070c5d303aebf598640fc2da58e2c8ec0
+EBUILD libX11-1.8.9.ebuild 1014 BLAKE2B 6fca1492c985e5366003d69c294b1859dd40d4f2df75a4e89c10ae178ab80002fcb5d692f1eeadd5eba009fa88de6206d4b3d85f12d9f0372cfb5f9b3472bfc8 SHA512 9582e91023bd5fff0e71b363a4aa2039e7a6d97744b28beeee4103763c067addfbd84bd0389ab73a9eca19f9f05e9d4070c5d303aebf598640fc2da58e2c8ec0
 MISC metadata.xml 395 BLAKE2B 7912fcccfd8d8a4c9c1e5601783a0668679506638511ee719bf7bb95f99415fe95a417343060cf5ca3fe918ab1f9847f74861af36d3c712afa321272cd13cf66 SHA512 c2956ef519fe59d0f713732059224568b9d7c34579654b71993b02227a512c1ac3057dc7f81c6bc93834fd4fee212f1ae26f4055ea92f3eb7524da7d9e690f8f
diff --git a/x11-libs/libX11/libX11-1.8.9.ebuild b/x11-libs/libX11/libX11-1.8.9.ebuild
new file mode 100644
index 000000000000..8b0055d7b7dc
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.8.9.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+XORG_TARBALL_SUFFIX=xz
+inherit toolchain-funcs xorg-3
+
+# Note: please bump this with x11-misc/compose-tables
+DESCRIPTION="X.Org X11 library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
+	x11-misc/compose-tables
+
+	!<xfce-base/xfce4-settings-4.16.3
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/xtrans
+"
+BDEPEND="test? ( dev-lang/perl )"
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc xmlto)
+		$(use_enable doc specs)
+		--enable-ipv6
+		--without-fop
+		--with-keysymdefdir="${ESYSROOT}/usr/include/X11"
+		CPP="$(tc-getPROG CPP cpp)"
+	)
+	xorg-3_src_configure
+}
+
+src_install() {
+	xorg-3_src_install
+	rm -rf "${ED}"/usr/share/X11/locale || die
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index d9345b112c3b..73dfe1cfa3ae 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index ccdeb58f594e..c562eca395d6 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1,5 +1,7 @@
 DIST libX11-1.8.7.tar.xz 1859256 BLAKE2B 335d8af91c13aba11255c266c4687a7f66b021207a92485d723b4107601bbabb6a0e5535241a3bcff4ac9a99142730d2b3d2e2eaff86b507fee5b35a2590d792 SHA512 d53bfc18f38d339a6a695b09835b2ae96b323881678bfe7ddca697605e3bdf4102ff49cc3078880a6c55b5977fcdd0aadaf5429086132de3a5bda302f79a2fa6
 DIST libX11-1.8.8.tar.xz 1872808 BLAKE2B d180932c65c565d113ae768bb0035aa98ff7dd265de9a7907f54f994b1520d7fc67699032450afc5d8f9427247f73dcf71259ff6a3f734d71f6e8b6181c6891b SHA512 4e7ce8f2d88b9475f960ea1d5730ece8953509e0c057cf2d0a2f5fa6a36e6577b0dcd7f16ac91b8fdd804aabec6d7e8f3067a3a8667bd2e41d72dd68ab70ef82
+DIST libX11-1.8.9.tar.xz 1811900 BLAKE2B 8858157ac490d65e19500bfbb2ab773a3a30041f8a757ff22fff8fb0124044b8bb826f6dff4115230c757a175b61a3f7d596d976d98be760085749878d64f871 SHA512 737af91818537295ac86be601b1e3d7e37d150716ec549580913b7cc9a44fee7a6ce9dbc3d46167eed91f23fe857c4dd355ed8f8440fe5fbbf8e9ebe47091b96
 EBUILD compose-tables-1.8.7.ebuild 966 BLAKE2B 3d311500f1975ad468872ba6a7a0455cd12373136383bf6cd8cc9b79e226398217d3b6ea512a3e524594eb35f01978a6501e6ec72bbb2f22489075e4f478c53f SHA512 ccd113992763322e33b1d1fa398195edaf7d38271170053de474bc348e0b4d85858ca8ba8eafd524750515404700864c179fb7adf2b8f0e7a90495427297b005
 EBUILD compose-tables-1.8.8.ebuild 1031 BLAKE2B fa277ed390cb7854b25247c5ed95a402e9511e6e1c7575c707261e460d35e00004453d3af326a225f556a6066639f0601c6a20bc774751235d5641358219e512 SHA512 eb01330f871d2b83e346658d5cd1b587a9293bee8e0c7a216274c3465794dd214d8e81fd78f0c4af1244cf6c956ab7c95b057686b8315eb78033c145217e89ba
+EBUILD compose-tables-1.8.9.ebuild 1031 BLAKE2B fa277ed390cb7854b25247c5ed95a402e9511e6e1c7575c707261e460d35e00004453d3af326a225f556a6066639f0601c6a20bc774751235d5641358219e512 SHA512 eb01330f871d2b83e346658d5cd1b587a9293bee8e0c7a216274c3465794dd214d8e81fd78f0c4af1244cf6c956ab7c95b057686b8315eb78033c145217e89ba
 MISC metadata.xml 395 BLAKE2B 7912fcccfd8d8a4c9c1e5601783a0668679506638511ee719bf7bb95f99415fe95a417343060cf5ca3fe918ab1f9847f74861af36d3c712afa321272cd13cf66 SHA512 c2956ef519fe59d0f713732059224568b9d7c34579654b71993b02227a512c1ac3057dc7f81c6bc93834fd4fee212f1ae26f4055ea92f3eb7524da7d9e690f8f
diff --git a/x11-misc/compose-tables/compose-tables-1.8.9.ebuild b/x11-misc/compose-tables/compose-tables-1.8.9.ebuild
new file mode 100644
index 000000000000..ade5421accec
--- /dev/null
+++ b/x11-misc/compose-tables/compose-tables-1.8.9.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_MULTILIB=no
+XORG_TARBALL_SUFFIX=xz
+inherit xorg-3
+
+# Note: please bump this with x11-libs/libX11
+DESCRIPTION="X.Org Compose Key tables from libX11"
+# xorg-3.eclass would attempt to fetch a tarball with a matching name to this package
+SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
+S="${WORKDIR}/libX11-${PV}/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+# Only needed by configure
+DEPEND="
+	x11-base/xorg-proto
+	>=x11-libs/libxcb-1.11.1
+	x11-libs/xtrans"
+# RDEPEND=""
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		--without-xmlto
+		--without-fop
+		--disable-specs
+		--disable-xkb
+		--with-keysymdefdir="${ESYSROOT}/usr/include/X11"
+	)
+	xorg-3_src_configure
+}
+
+src_compile() {
+	emake -C nls
+}
+
+src_test() {
+	:;
+}
+
+src_install() {
+	emake DESTDIR="${D}" -C nls install
+}