11 files changed, 212 insertions, 140 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index d644d15debfd..2e10b546f39f 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
index 3a008501f8ad..abe263e0758f 100644
--- a/dev-util/ostree/Manifest
+++ b/dev-util/ostree/Manifest
@@ -1,8 +1,6 @@
 AUX ostree-2022.6-musl-allperms.patch 478 BLAKE2B 95191befc9281591480f3a80717817e262798b7d6fc3abf35cb5c0462267822092a102de446f5334e3807816418e7b2b5b4dd59cd66796734b85131873e2dc9a SHA512 275e4fd6c1547c852ec9d2a8649c45c5bec6fdc2351e9333adfc3ed31b0cbedefaca6db95ba97ec8a65fa16bd550827909f7172b46a6b64a184840272578b7cc
-DIST ostree-2022.6.tar.xz 2124464 BLAKE2B c6ea1f11d08261e8532345ffc18bec9e77d04e63aab0c8e2eb03a4b3d3c2c594bcc9e6c5341e4caefe81fbd06a055cd39b0f2f2b43d3e876837a9bac43c704f5 SHA512 03f6b6947a372e36d3a1ae3bbe47543c562113039ce10db9c6f26a7b4015afb41950bd00bd1931937a5fb3043689ca1046eb87afd890571cfedbfa1ef36219a7
-DIST ostree-2022.7.tar.xz 2076728 BLAKE2B 7308be450e4aa9bebe3e8b86031bf75b7d0cd07a2e36d6d11d01aa8e8d19ed02e8560931a83f18856c7d4fc7ae6045d22b6aa4d7f577f3df9e704ae9d7562d3e SHA512 725eff027b2c4c1aec0c222a5fa6059f3a777f4d0c831b82a4021befba0078692aa5ced2c4c609530c70462b4148a3cc33152e3d9dc4a5d6f8cf98f61ef09c2a
 DIST ostree-2023.1.tar.xz 2079904 BLAKE2B 993570624cb43684d81fff9f3789a9cee3b998f945a78bc6eb99330eed45739d1e6fb66589cefba10eea608c5cd389cc121a890c27efa773a405a5d8b1f117d9 SHA512 a6a6e47d6cb9ec6826d48a50a2abac69e4a040f2b5830d39e8a006c738a163fb15fde8630bf271d92cec9470601281669cd4bf942e4b7c4d42441bd5d1730572
-EBUILD ostree-2022.6.ebuild 2749 BLAKE2B 19b1bb11064d08c7feb4d174f449d72e76079817fd22652a94e39ebad8b0f3ef49a7e87bba80edbaa07c166f6ddadd90f95b12796e646a905ec17da5e4e2f119 SHA512 4116942743ddfa37219d4f2a6fe2c3a5bd1c75e2a6b67fd80270574750c562a950bbf524e9337664e14188b7fc80b16c5650ec7e7dcce85312403530beb592a3
-EBUILD ostree-2022.7-r1.ebuild 2829 BLAKE2B e8334a9adf020f19cf780dca768796888afd4972d979e85b95f5e01258a6b1d0f4b23c3a598d7469e73459bb55a993ab23d699a6c07ca71523a9207cfc8f7e3b SHA512 5e14b237243c390d1bc63735b7eb6b5c6ca40ff27efa478cd5e36c418c0f6c5fb7707f1fe20b4b681d75dbf891a6a687f1b10a5e5d79b5052669e31a11f03101
+DIST ostree-2023.2.tar.xz 2081320 BLAKE2B f773bf979b4bc97b9b8f96dc4385745bc386c29952a36c07cdd33a7db7802876ce154b5ac1f3669605ab3949a539aa8e2b3a3d94608557eb65249b5188f9d012 SHA512 549a2bdf8cef93d421aaf990e2d1c534063f0314b5933db7ce123bdd138229e24cc171d541296e45a7546a91d35149c1c8f29ea90949876200c574e7ec297b98
 EBUILD ostree-2023.1.ebuild 2824 BLAKE2B 144f93d943f0879e9104d78996600c50c7e6f936a578baf15b13f65191f8299ef45805008111443d00ac6dc85d270c48403d1bcf8bfbb090be8ce899e49f32aa SHA512 7b44a33dfbd808708009cb3c7e6f4b92bdf9d6a6c7f657bc86033451435ad5907f7e1dbeca45a7eaab24e394159ef0e96a3a9f691bfc7b093c92f5158d3a58e9
+EBUILD ostree-2023.2.ebuild 2651 BLAKE2B 1c2e921eabf6ba07731654af72e28c6e4d58aa7571b39edfcc253df2eab833430e19365a0e0db11c1b5a51e71438f4e8d2692f0802672b9fe9821d7c1ff22202 SHA512 f4919163f99fa1de99ee307ec5c03eff49cf684fea5a727b2a8cbac88e4b6dc2a8368b5d5fe8b1b5501148a475a3d83759a818be56495065538120fb22b34faa
 MISC metadata.xml 1990 BLAKE2B 1c3e6400d24f0701211c0b8dcfba8d31c06b7c493cbe6eb2c5432ea818d0a0fbe863f8f1661eb386d179bb186cb7c970f7d7a3f8c9c42ea4b03b3d4ea0472a57 SHA512 04e37ddcd7348d43d475e04c996ee8b2e94c64143325dcfb21c5738b75f71ecd2c2ec64c8f91fbd06f5a6228671e90fdf10a939d4457abe4d0f88492435b4601
diff --git a/dev-util/ostree/ostree-2022.6.ebuild b/dev-util/ostree/ostree-2022.6.ebuild
deleted file mode 100644
index 030a24150f38..000000000000
--- a/dev-util/ostree/ostree-2022.6.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-DESCRIPTION="Operating system and container binary deployment and upgrades"
-HOMEPAGE="https://ostreedev.github.io/ostree/"
-SRC_URI="https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz"
-
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="archive +curl doc dracut gnutls +gpg grub +http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf"
-RESTRICT+=" test"
-REQUIRED_USE="
-	dracut? ( systemd )
-	http2? ( curl )
-	httpd? ( || ( curl soup ) )
-"
-
-COMMON_DEPEND="
-	app-arch/xz-utils
-	dev-libs/libassuan
-	dev-libs/glib:2
-	sys-fs/fuse:3
-	sys-libs/zlib
-	archive? ( app-arch/libarchive:= )
-	curl? ( net-misc/curl )
-	dracut? ( sys-kernel/dracut )
-	gpg? (
-		app-crypt/gpgme:=
-		dev-libs/libgpg-error
-	)
-	grub? ( sys-boot/grub:2= )
-	introspection? ( dev-libs/gobject-introspection )
-	libmount? ( sys-apps/util-linux )
-	selinux? ( sys-libs/libselinux )
-	sodium? ( >=dev-libs/libsodium-1.0.14:= )
-	soup? ( net-libs/libsoup:2.4 )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-	)
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	doc? ( dev-util/gtk-doc )"
-
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	sys-devel/flex
-	sys-devel/bison
-	virtual/pkgconfig"
-
-S="${WORKDIR}/lib${P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-musl-allperms.patch
-)
-
-src_prepare() {
-	default
-
-	sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \
-		-i Makefile.in Makefile-man.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Needs Bison (bug #884289)
-	unset YACC
-
-	local econfargs=(
-		--enable-man
-		--enable-shared
-		--with-grub2-mkconfig-path=grub-mkconfig
-		--with-modern-grub
-		$(use_with archive libarchive)
-		$(use_with curl)
-		$(use_with dracut dracut yesbutnoconf) #816867
-		$(use_enable doc gtk-doc)
-		$(usex introspection --enable-introspection={,} yes no)
-		$(use_with gpg gpgme)
-		$(use_enable http2)
-		$(use_enable httpd trivial-httpd-cmdline)
-		$(use_with selinux )
-		$(use_with soup)
-		$(use_with libmount)
-		$(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; })
-		$(use_with sodium ed25519-libsodium)
-		$(use_with systemd libsystemd)
-		$(use_with zeroconf avahi)
-	)
-
-	if use systemd; then
-		econfargs+=(--with-systemdsystemunitdir="$(systemd_get_systemunitdir)")
-	fi
-
-	unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
-	econf "${econfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-util/ostree/ostree-2022.7-r1.ebuild b/dev-util/ostree/ostree-2023.2.ebuild
index 8affb7d1e501..32ce2d1f9766 100644
--- a/dev-util/ostree/ostree-2022.7-r1.ebuild
+++ b/dev-util/ostree/ostree-2023.2.ebuild
@@ -1,27 +1,31 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools systemd tmpfiles
 
 DESCRIPTION="Operating system and container binary deployment and upgrades"
 HOMEPAGE="https://ostreedev.github.io/ostree/"
-SRC_URI="https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz"
+SRC_URI="
+	https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz
+		-> ${P}.tar.xz
+"
+S="${WORKDIR}/lib${P}"
 
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 LICENSE="LGPL-2+"
 SLOT="0"
 
 IUSE="archive +curl doc dracut gnutls +gpg grub +http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf"
-RESTRICT+=" test"
+RESTRICT="test"
 REQUIRED_USE="
 	dracut? ( systemd )
 	http2? ( curl )
 	httpd? ( || ( curl soup ) )
 "
 
-COMMON_DEPEND="
+RDEPEND="
 	app-arch/xz-utils
 	dev-libs/libassuan
 	dev-libs/glib:2
@@ -47,21 +51,19 @@ COMMON_DEPEND="
 		)
 	)
 	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )"
-
-DEPEND="${COMMON_DEPEND}
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
-	doc? ( dev-util/gtk-doc )"
-
-RDEPEND="${COMMON_DEPEND}"
+	doc? ( dev-util/gtk-doc )
+"
 BDEPEND="
 	dev-util/glib-utils
 	sys-devel/flex
 	sys-devel/bison
-	virtual/pkgconfig"
-
-S="${WORKDIR}/lib${P}"
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}"/ostree-2022.6-musl-allperms.patch
@@ -69,10 +71,6 @@ PATCHES=(
 
 src_prepare() {
 	default
-
-	sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \
-		-i Makefile.in Makefile-man.am || die
-
 	eautoreconf
 }
 
@@ -103,7 +101,7 @@ src_configure() {
 	)
 
 	if use systemd; then
-		econfargs+=(--with-systemdsystemunitdir="$(systemd_get_systemunitdir)")
+		econfargs+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
 	fi
 
 	unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
diff --git a/dev-util/scap-driver/Manifest b/dev-util/scap-driver/Manifest
index af35cc9042f1..f70143e6160e 100644
--- a/dev-util/scap-driver/Manifest
+++ b/dev-util/scap-driver/Manifest
@@ -1,6 +1,8 @@
 AUX 0.29.3-fix-kmod-build-on-5.18+.patch 2363 BLAKE2B 8e5a89b68fb67076d01a7dc295157d2f2542a2db84460a35ed3162b77ff860097f1761317b93dec6aa0d6294b4414e445fd2c94df700bb5d738210982174f595 SHA512 f7c1e57cb05de1a97a3332055f6d6f74a637f38281a4e98b202cf84c9dd02b90e0b4fee3dbc44653760231ce55ad396aec3018b3b239249b6a37b018f672fba4
 AUX 0.29.3-fix-kmod-build-on-6.2+.patch 1420 BLAKE2B 45f312bce9ce3dbaa0ddd300ccfd7dfcc3fb6d537cd0b716642d25b4c5a3747798ca23d237d67c92d32da500edb5e0458bfdff4a940d2f6fdb84144c5687028d SHA512 4b84a2559cb6a72d294b5cac6ec2d6f2de8ae90e298e27afcdff6bc046366afca6468ac923c4197623f14bbe0a4d0bd3757f34740a367e6b7c4e76472b102379
+AUX 0.29.3-fix-kmod-build-on-6.3+.patch 939 BLAKE2B c626a6c9e41510d9720a8d161f4b6fa2efc729437cffdeea97ab346b0dca9a18af82339e403b63c7ac297304893f686a20f5c612df417229b82701367530098d SHA512 c2b020de87c92724f93a0937e2ece2f1e88f8b0dbb5b1d85bffccd51fddc1fc2024fe0ae222f2f01adeb5dc34964b1e86f27f0bdfee347bf1bb927388c1b6c5c
 DIST falcosecurity-libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz 816972 BLAKE2B b47ae6a7677935500ebdab8aea7f4c49ef50b7175ec097e7213a1f041ac2b5aa642379924927ec12c84271016e9ab9d191c0c1d4ffacd6ade58b7a03c37f9221 SHA512 65e5916e5f9507fd867a5e9ba3b2670a1b73b7672a22479d3019e948a52ad74441d7e2ce1c74ebd0fdbd1ce66808efa49f285bd5180bceae9d4e6730a60787ce
 EBUILD scap-driver-0.29.3-r1.ebuild 1871 BLAKE2B fa97c444251044913625228bd42d8ab22be21f69ddc75f4e45c15df832c1d1a6dab927f146fdb03addfa244a71ae2329d9651a2a454b79f45dd8a99eb53509da SHA512 7cc7ec73b64691fb8109b4fb406ce3ce565d9d09ead707290394599035f9d6059e5f88bce857b380c967a1edf008442541d692fd453a57880c1f61458da736d9
+EBUILD scap-driver-0.29.3-r2.ebuild 1921 BLAKE2B 992e21dfddd65f396a715da0040abbd33dea30c8e0347bdb4dd3886e10f4b4ccfd1c9083e63d422b99b4eff32494dfc026550ddef96e345a03d19d8ea5a94219 SHA512 6a7ba57ae0a3cde946981dea2e36a77342a4333dd41d47e4cb3f1938219d47c5fc89f267ced7650413217a36de2f132c8aac3650d20b18e2574c88654ab094a5
 EBUILD scap-driver-0.29.3.ebuild 1818 BLAKE2B 739c7da7402f536aa4ee483c77de16498fef6460bdaad84f35bb7bb6f4ad06daac2e99349498f68f741c8348120ccb535bdaa7333d17ce10f3feea78d4889ddf SHA512 7c7d39dc69f2cdc28e656911513ca560722399b051adb5ef6a5626503536337ab7eeae39a2b9ababd217188324e4f270cc3ff9105ca04c63f3f9a919ebf26931
 MISC metadata.xml 494 BLAKE2B d0bc754d3af2488b9dc7672fc63e962f4c885d88a819e4332bd1c25f84c967e2e1cd8489122490a864cbfd930225b3dc28c8bfad4426750c030dce6ef5a08b4e SHA512 b77b7c103cfb606333814af210a0fae1f7956ddd9d3c3a044b0bebf42553f5ffe99d04549fb9c5e40fce33e9d23761830b4944b2cd83bd8ca2193f9b7da60fc0
diff --git a/dev-util/scap-driver/files/0.29.3-fix-kmod-build-on-6.3+.patch b/dev-util/scap-driver/files/0.29.3-fix-kmod-build-on-6.3+.patch
new file mode 100644
index 000000000000..6926df857179
--- /dev/null
+++ b/dev-util/scap-driver/files/0.29.3-fix-kmod-build-on-6.3+.patch
@@ -0,0 +1,20 @@
+
+Bug: https://github.com/falcosecurity/libs/issues/1063
+Subset of patch taken from: https://github.com/falcosecurity/libs/pull/1071
+
+diff --git a/driver/ppm_fillers.c b/driver/ppm_fillers.c
+index 0441923c6d..cfa967f134 100644
+--- a/driver/ppm_fillers.c
++++ b/driver/ppm_fillers.c
+@@ -1329,7 +1329,10 @@ int f_proc_startupdate(struct event_filler_arguments *args)
+ 
+ 		if (exe_file != NULL) {
+ 			if (file_inode(exe_file) != NULL) {
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 12, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
++				exe_writable |= (file_permission(exe_file, MAY_WRITE) == 0);
++				exe_writable |= inode_owner_or_capable(file_mnt_idmap(exe_file), file_inode(exe_file));
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5, 12, 0)
+ 				exe_writable |= (inode_permission(current_user_ns(), file_inode(exe_file), MAY_WRITE) == 0);
+ 				exe_writable |= inode_owner_or_capable(current_user_ns(), file_inode(exe_file));
+ #else
diff --git a/dev-util/scap-driver/scap-driver-0.29.3-r2.ebuild b/dev-util/scap-driver/scap-driver-0.29.3-r2.ebuild
new file mode 100644
index 000000000000..129db40bcb86
--- /dev/null
+++ b/dev-util/scap-driver/scap-driver-0.29.3-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake linux-mod
+
+DESCRIPTION="Kernel module for dev-util/sysdig"
+HOMEPAGE="https://sysdig.com/"
+
+# The driver is part of falcosecurity/libs, but for versioning reasons we cannot (yet)
+# use semver-released packages; instead we pull in a commit that is used and known
+# to work with sysdig, see sysdig/cmake/modules/falcosecurity-libs.cmake for details.
+# For now the commit here and the one referenced in sysdig should be in sync.
+LIBS_COMMIT="e5c53d648f3c4694385bbe488e7d47eaa36c229a"
+SRC_URI="https://github.com/falcosecurity/libs/archive/${LIBS_COMMIT}.tar.gz -> falcosecurity-libs-${LIBS_COMMIT}.tar.gz"
+S="${WORKDIR}/libs-${LIBS_COMMIT}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="!<dev-util/sysdig-${PV}[modules]"
+
+CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-kmod-build-on-5.18+.patch
+	"${FILESDIR}"/${PV}-fix-kmod-build-on-6.2+.patch
+	"${FILESDIR}"/${PV}-fix-kmod-build-on-6.3+.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		# we will use linux-mod, so just pretend to use bundled deps
+		# in order to make it through the cmake setup.
+		-DUSE_BUNDLED_DEPS=ON
+		-DCREATE_TEST_TARGETS=OFF
+		-DDRIVER_VERSION=${LIBS_COMMIT}
+	)
+
+	cmake_src_configure
+
+	# setup linux-mod ugliness
+	MODULE_NAMES="scap(extra:${BUILD_DIR}/driver/src:)"
+	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
+	# work with clang-built kernels (#816024)
+	if linux_chkconfig_present CC_IS_CLANG; then
+		BUILD_PARAMS+=' CC=${CHOST}-clang'
+		if linux_chkconfig_present LD_IS_LLD; then
+			BUILD_PARAMS+=' LD=ld.lld'
+			if linux_chkconfig_present LTO_CLANG_THIN; then
+				# kernel enables cache by default leading to sandbox violations
+				BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
+			fi
+		fi
+	fi
+
+	BUILD_TARGETS="all"
+}
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index a17b17df5c24..3dc242300959 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -5,11 +5,13 @@ DIST strace-5.19.tar.xz 2353276 BLAKE2B 44b9a87f36e66481d8ac2107efbc389fa64c47b2
 DIST strace-6.0.tar.xz 2367144 BLAKE2B ab9cb1f81b01068de5af5125ec2901b57a2f2b24fc01f4f68a284d74eb9fc0f4d583510a353554327845e7c157ea71ca4042ce3c27b3d2b0469d65a13aabfab1 SHA512 2f5aa18949b9f64769eee4e7720e41bf4a61e3b552acad693ff7baed2e662407a7b5e8bfba94ac49bb71639d21cd54084de902fb4337904f48480b25b8e72b54
 DIST strace-6.1.tar.xz 2351272 BLAKE2B f11bdddcc23d9bbe7196a102165ac40d3f39e0dec8b9c727e226d99ae0b6f22865bd0582d4e9c15fdce87dd405e0e9c68b60041bd2b90bc8480557f82ca6dcb8 SHA512 3f0678d74c5c3e6b30c4dc4ed7ee4cb0829d3b7142dc014fcd887db3a68133bf7fedc623bae381dfe4305bd6cd15d4ca6776c6491009c2a053bb8c6ca1ae8e12
 DIST strace-6.2.tar.xz 2364280 BLAKE2B 8e51cb3e426e9b99d598b4fcece21ba7873e81468cddae04c2f0b1a48dc40643c626acadd226389c33dbef5350b502817d3459d445fc17cce149f7e501c15ae2 SHA512 56708faa3f73c0673c98a5b8b8fe35289ecf2870f4f775bcb7a6be59451ef84685564c0129aca15b576d851f8efa1ff760e27658b914d1f31adf4de3b1ad721f
+DIST strace-6.3.tar.xz 2382284 BLAKE2B 7373ebddd6f23713b752ed91598e536d61e08865907c7825dd3492574c7feb0ad6d56bea0e144e1082ac1882d68bb5f160f25e70bfc6e2fd47571ef2c40403fb SHA512 2b0a57e3ee8a23eb3882123149cd732c568322614bf8fde69fabcea64d0d4e3c46c71d63183e0e8d9f8744a7b1cebc823cc67023660c37547f5b854fcc1ca9df
 EBUILD strace-5.17.ebuild 2448 BLAKE2B 99b2514d006878e750d31ea9711581fb5d1980f3091c7ded5d3ac129054f3793bc22ec00657d95ea4f7ac00bf2f6df76f79ba8bbbfc1ce0dd3fb741fe5d9e104 SHA512 496610adfb263912392935a7fea69f79ac98f0339a91719221b615a4ba1e330b6fe9159663f7e9bdc8e3bb58031a62a5c472bf934630cddc851bed65c5e57633
 EBUILD strace-5.18.ebuild 2344 BLAKE2B 2c55a36cfa70076014cbf0ae1c80768193367c71d3e8c123570707f7adbda59dec9fac4699e3c706c1b6a0ba993605434321b032b938c135b0030da5e64fb80d SHA512 dfdac81e07edb2e8ad236a92348fb68feb67a5fa644f7ea0f08aa0345eda737847d67249982595774c44b5934d00d86413630edf9371a604bb461f7bd4ef786f
 EBUILD strace-5.19.ebuild 2447 BLAKE2B 88535b5906a24d4b2ccf26777e4a9fddc382187721598b44a6092e6ca7087601e2895575ba0046bd78c1caeeeface1dc52883b7fb30e266129b40bb5ea19b8df SHA512 c29e74848ff20d686ff02acbec5e08a9ad55d5f1970bc30779fde8e609ba88688fee69d6a63e6607c1da32b53676995f29adea9e81498e3feeaeaa0bb7fe6b16
 EBUILD strace-6.0.ebuild 2442 BLAKE2B 6cb1e240ee130494e165598f3ab853c0f2541365533ec5ee2b2e17bdc4e7b235ab32e2095699a69f461c2818c653975085604304d875134f1b9958ad11b44e49 SHA512 9a94e1bdeb02a857cba180f2ee23bd0b7c8031f5a533ce496396ed7011e85ae7ac6c96dd6919dab4e8ae70a8cf6c37ec5e07ad142e6f60d86899db7c6fe4a0a3
 EBUILD strace-6.1.ebuild 2434 BLAKE2B fccc5a75dda51852abdbcc18d010f14bb1e52e3f0f92f78db4791e8af014c6c9816caea6bb5a2792390865abca8c217a414c24e78ac7ed743aa004f23d588d26 SHA512 c0efdfb974253fccfcfa1d68aebdeff45ad8b15f206d1140c26e44e98331d69350d8cb844d73b048ffb5bf6415e41f264826af6a73bebf2d61d5de151540245e
 EBUILD strace-6.2.ebuild 2442 BLAKE2B a83bce1936924f68b7d5edc81440b7cb2101016f0902cc0c02c3e235c2a9a74069c4e8616821a0597638bfa1e24ec0e859870af1886a5f5314196918d73bcfee SHA512 9b9d1b2a23c9ef98d706c4862b189b28647348b9987d111102223d237b70b42cdd40a803cdbff00cc8103e8c221418ef0e2bc40f3a214b7c08b78f93cb246f13
+EBUILD strace-6.3.ebuild 2442 BLAKE2B a83bce1936924f68b7d5edc81440b7cb2101016f0902cc0c02c3e235c2a9a74069c4e8616821a0597638bfa1e24ec0e859870af1886a5f5314196918d73bcfee SHA512 9b9d1b2a23c9ef98d706c4862b189b28647348b9987d111102223d237b70b42cdd40a803cdbff00cc8103e8c221418ef0e2bc40f3a214b7c08b78f93cb246f13
 EBUILD strace-9999.ebuild 2442 BLAKE2B 6cb1e240ee130494e165598f3ab853c0f2541365533ec5ee2b2e17bdc4e7b235ab32e2095699a69f461c2818c653975085604304d875134f1b9958ad11b44e49 SHA512 9a94e1bdeb02a857cba180f2ee23bd0b7c8031f5a533ce496396ed7011e85ae7ac6c96dd6919dab4e8ae70a8cf6c37ec5e07ad142e6f60d86899db7c6fe4a0a3
 MISC metadata.xml 779 BLAKE2B 89b4360e876fbb34a7a766a57ba9ca088a5e03e9ef66fdbe0a2b15df4cfb625daba11dc76920dec405b97cb87df49fd3c9edc0e184e73262b14b616af36fa4dd SHA512 88b2d94fd6efebaa617c8344bff3997f31c6262b9376cbce014bf7f6225f02bd8ee7bcaf98df4477435319bbb92addcdb6756e5d37a137a863f0bef1ecc5fced
diff --git a/dev-util/strace/strace-6.3.ebuild b/dev-util/strace/strace-6.3.ebuild
new file mode 100644
index 000000000000..24526a0eb263
--- /dev/null
+++ b/dev-util/strace/strace-6.3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools edo flag-o-matic toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/strace/strace.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="https://strace.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="aio perl selinux static unwind elfutils"
+REQUIRED_USE="?? ( unwind elfutils )"
+
+BDEPEND="virtual/pkgconfig"
+LIB_DEPEND="
+	unwind? ( sys-libs/libunwind[static-libs(+)] )
+	elfutils? ( dev-libs/elfutils[static-libs(+)] )
+	selinux? ( sys-libs/libselinux[static-libs(+)] )
+"
+# strace only uses the header from libaio to decode structs
+DEPEND="
+	static? ( ${LIB_DEPEND} )
+	aio? ( >=dev-libs/libaio-0.3.106 )
+	sys-kernel/linux-headers
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	perl? ( dev-lang/perl )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.11-static.patch"
+)
+
+src_prepare() {
+	default
+
+	if [[ ! -e configure ]] ; then
+		# git generation
+		sed /autoreconf/d -i bootstrap || die
+		edo ./bootstrap
+		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
+	fi
+
+	eautoreconf
+
+	# Stub out the -k test since it's known to be flaky. bug #545812
+	sed -i '1iexit 77' tests*/strace-k.test || die
+}
+
+src_configure() {
+	# Set up the default build settings, and then use the names strace expects.
+	tc-export_build_env BUILD_{CC,CPP}
+	local v bv
+	for v in CC CPP {C,CPP,LD}FLAGS ; do
+		bv="BUILD_${v}"
+		export "${v}_FOR_BUILD=${!bv}"
+	done
+
+	filter-lfs-flags # configure handles this sanely
+
+	export ac_cv_header_libaio_h=$(usex aio)
+	use elibc_musl && export ac_cv_header_stdc=no
+
+	local myeconfargs=(
+		--disable-gcc-Werror
+
+		# Don't require mpers support on non-multilib systems. #649560
+		--enable-mpers=check
+
+		$(use_enable static)
+		$(use_with unwind libunwind)
+		$(use_with elfutils libdw)
+		$(use_with selinux libselinux)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} ; then
+		# bug #643044
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..."
+		return 0
+	fi
+
+	default
+}
+
+src_install() {
+	default
+
+	if use perl ; then
+		exeinto /usr/bin
+		doexe src/strace-graph
+	fi
+
+	dodoc CREDITS
+}
diff --git a/dev-util/wayland-scanner/Manifest b/dev-util/wayland-scanner/Manifest
index 0e3a569b601c..72bba1887b58 100644
--- a/dev-util/wayland-scanner/Manifest
+++ b/dev-util/wayland-scanner/Manifest
@@ -1,6 +1,6 @@
 DIST wayland-1.21.0.tar.xz 225936 BLAKE2B 2b43eb1517d476bb2b4daed1083373655b57d047968fdb93dbbbbe4235af12e25557627e30b5c3d2575bac4beaf1e0a0b8ef10a3c673538d9097501f33c05836 SHA512 5575216d30fdf5c63caa6bcad071e15f2a4f3acb12df776806073f65db37a50b5b5b3cc7957c5497636f4ac01893e2eaab26e453ded44b287acde01762f5fdc3
 DIST wayland-1.22.0.tar.xz 229544 BLAKE2B b0bb366e7f3494813d1574228ae5dd48eccde035120d6dd8709e3a24738681ab9dd9ba6a13924b6a35982d331fa8911fa7346911da9f618be9c9109da0288629 SHA512 fb1974efc8433e97254eb83fe28974198f2b4d8246418eb3d34ce657055461e0c97bc06dd52e5066ae91bbe05bac611dc49a0937ba226ac6388d5a47241efb12
 EBUILD wayland-scanner-1.21.0.ebuild 1023 BLAKE2B f9dc1119418dd9e0c9b9b75386eb92b9c04d042e272cf51396b8518195d3a0393e73a1cadf920bd670c59409c6812501beec53c66f5e742aab31fa555b7b4b38 SHA512 53e6eb2afb669fd64310446a2233d1cdc5587319ac915a8c3d0d06923261a5231bce8290f70921fc3d7caa47b5a5027a00726c7e643044e9855c65bd0a3fbe37
-EBUILD wayland-scanner-1.22.0.ebuild 1030 BLAKE2B 6856e91cc7614f6aff2df4ed205982bc0e2cb3dea95cb66c748c99b3f951bc9d87c24357b4262f22f383258cab8cd0010baf3bcc7fc72034848ac31f33e997c2 SHA512 8c4fd3e3b841c06842a4d448e4ad521af84c4546939c00eb7083cf169ad3d843a6229b80519ca85dbebd78e00dbaa964bca5a2b2330be49f85b8af1bf04713f8
+EBUILD wayland-scanner-1.22.0.ebuild 1023 BLAKE2B ba0b5ff61f65e33f25d12c6c78976914f96e917a3060c5082a0c182a7f4fdc8cfa3cbfc0e747f393da37b76748769d2932e6d332d8e22c8891599253f14cdfa3 SHA512 b6ca5f1018d585248109a4a3f1cea8382d81ace47d7f6f7e7eb17f4dc4303da98af54eb58711fb24c3238fb4c2290155d22366d31a156ae0cc3aec63ebba054e
 EBUILD wayland-scanner-9999.ebuild 1030 BLAKE2B 6856e91cc7614f6aff2df4ed205982bc0e2cb3dea95cb66c748c99b3f951bc9d87c24357b4262f22f383258cab8cd0010baf3bcc7fc72034848ac31f33e997c2 SHA512 8c4fd3e3b841c06842a4d448e4ad521af84c4546939c00eb7083cf169ad3d843a6229b80519ca85dbebd78e00dbaa964bca5a2b2330be49f85b8af1bf04713f8
 MISC metadata.xml 337 BLAKE2B af249efc25c3eadde73d0b49cba0e6c8a021fb4b7c9a0b96f27a4e71185c76f8ac7ff0b9efdfeadf2df324cfa578db3a73fc7bee8c249cba35d41e2145017e16 SHA512 771b226f8e16d8c570bc2ea89ee3c5176e1d0f2209afb3b2af5a9d19fbdc2037a411b84d546bea054449c8074fb0fb3c3726fb2692d084521c64cda60600c0b8
diff --git a/dev-util/wayland-scanner/wayland-scanner-1.22.0.ebuild b/dev-util/wayland-scanner/wayland-scanner-1.22.0.ebuild
index 10efdab1bcfc..f49a052f3c0d 100644
--- a/dev-util/wayland-scanner/wayland-scanner-1.22.0.ebuild
+++ b/dev-util/wayland-scanner/wayland-scanner-1.22.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PV}/downloads/wayland-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	S="${WORKDIR}/wayland-${PV}"
 fi
 inherit meson