gentoo auto-resync : 01:06:2024 - 00:07:06

8 files changed, 1 insertions, 764 deletions

diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
index 3f2918e419e2..0f7c89f5ce87 100644
--- a/dev-util/trace-cmd/Manifest
+++ b/dev-util/trace-cmd/Manifest
@@ -1,13 +1,3 @@
-AUX trace-cmd-3.1.4-hang-make-4.4.patch 3094 BLAKE2B 7e2a83981b214125daff015b464f8c6c233fb91944b2dbae7c38b4440045bb872beb47540d63736b580d45ffedd3345926b14a3733ae9b1d1cc801f09f3c2943 SHA512 ec660038b02b2afed0b06d08be79ad6fbae7ea02caaa88367ac5b8c59b9ea9e52f3f01f77d936188c612c3c2521f6d6925f5e4c5a1de6977586373d0568311d3
-DIST trace-cmd-v3.1.4.tar.gz 328452 BLAKE2B 6d3c964d1ba585213b75834b1037449464e5d54e5f49ed5b532cc599f6b960b79d0f0327a6af38e38b3471b54316810d9f05ef6cc7a3a4e39ee7eec9864e5ef9 SHA512 93ad775c1767d2a02b72386a29867c3bc141171403c152c0c4cb907da16b5ae69100924279d9529083449c1774c97c35d5b4790b188bcd4930cfa69076cef0b8
-DIST trace-cmd-v3.1.5.tar.gz 328689 BLAKE2B ae77b418505c545ef2b701c484cec944b6d8b9e7b0df9ea0a6475b099d59997a426a4c3f69fc2cfdaaaa4280f5fc53b18caf7a39011cd980fa331122f59feb13 SHA512 7262e69a990986975f0ee9287b16afc48f4f481fcb54ce64ca51dbba2e4c8cbb3c7c7d3d888aba10f3b12ac6b1cf9e612dd98982dc8d48ea221d231e3d16ac4d
-DIST trace-cmd-v3.1.6.tar.gz 329041 BLAKE2B 0f5adace645f8598b11c2f4db4c0f6081fbb60bd6f27bf5b2d59d2ab5279a3f4ed065af924ea7204df206295408167e9a21924f09254d7d4daa8f07c53f77967 SHA512 2504863556a86759173f7114f5ab9a1d5641cefdd2bc9af64d8e5232d175e9c946fbb9dcec00d91b903e74b0e1bc52332877ddc9b705d6cfe2af9cb39797a446
-DIST trace-cmd-v3.1.7.tar.gz 329075 BLAKE2B 943757031f7d73b3bccf6ea00927de1b8954e9c6cc02e83f308b309027f64c3383cc16e39c40b3fcd09a71df3abb86af0c6d1bfcb527c486d213021a446b8156 SHA512 42d1acb12b1177c6b8aaef9af2e314c6be22e27ee0887be41fce848fb031e61c570ca52105db4fb9e0af9e8a35fb3c1c8c75bbf9f99f035317feab5fbc52cc0c
 DIST trace-cmd-v3.2.tar.gz 342848 BLAKE2B d82309b72d00ae1b757039c7a358e7703c9e74527112baa05eb44f971067b1189b7833621766fdf8affc812b84b7bcfd071b2946495197d81a8ed8ff7240779e SHA512 6a8474e619b32ccf60217eba1ce472bdf6e77f6aff118b579f329b49eaf1b20c9a7802b539876be7c782f33dc78587cc510c7b4bf12af5707bfa2813e59ae442
-EBUILD trace-cmd-3.1.4-r2.ebuild 3338 BLAKE2B b9c5437bca8b2c52bbdcd86c39db0b1bd72d7fe39028b5ee0317c0ce3d7c9eaead454341ab8dd7018b30601dc335e22fc0bcca6eec23a5c3a25c6f075495b1c5 SHA512 0f91d5296079c7143cc58be2348811bef0adf4bf65242612f6971c74bc6d63c203b401b57d76f1571b56e9f019f8bce7dea280a2a8235b5da36290f4bb06dd00
-EBUILD trace-cmd-3.1.5-r2.ebuild 3353 BLAKE2B b686d73cacf84e8d569fe2085146ce99e255873c3f5942de9f9c6eb95640319c3ce2bb58587e876a0ccb6ffab97effba80f8b74bc36aff028188f59f360b05da SHA512 290a7844d5e7cbf7a2fccb8b8a1e40ee08687c121ee6e79066b2baebe65afec7f87759e142795ce2dd5f39f2d3a70affa96ad29a93ba66ab6f186e638aeceaf7
-EBUILD trace-cmd-3.1.6-r1.ebuild 3316 BLAKE2B 57fa192e7f9961e3e5119cbc32b4f9cecbb14c8113889212eeab136d307a689bbb21a6580c5e4eda2ea926cda6cbefce539fa69674af3f5b231d28c593bc3f8d SHA512 59b81bbb1d634c3311747cef83687da0aa20e54bd1f2e312f84e1ad3ce64d4e482fe5b93c9ac2a4ff9de857295cc05f7c110e49c79bc1ff72319fd70cb7f3227
-EBUILD trace-cmd-3.1.7.ebuild 3316 BLAKE2B 57fa192e7f9961e3e5119cbc32b4f9cecbb14c8113889212eeab136d307a689bbb21a6580c5e4eda2ea926cda6cbefce539fa69674af3f5b231d28c593bc3f8d SHA512 59b81bbb1d634c3311747cef83687da0aa20e54bd1f2e312f84e1ad3ce64d4e482fe5b93c9ac2a4ff9de857295cc05f7c110e49c79bc1ff72319fd70cb7f3227
-EBUILD trace-cmd-3.2-r2.ebuild 2434 BLAKE2B 498d4b4224cc24e183c8e756a5d739fbefa8435058ca3f5c08f247cf6c5edfa5809ad669e61e833349a2803edda3c0449e01fea717aeccb8eeb8525ac3611694 SHA512 80d9d0abe66ca01470a952882204248c6409d5d883b915037478244d52f08f53ef3c63872eb9dbe474b42eac58678407b6ec9ab8792b6402f336427b7c70d696
 EBUILD trace-cmd-3.2-r3.ebuild 2433 BLAKE2B 5c25fdfed3c93edf6f9c821347aec2d7d81365370fb7434c1fa00c05270bcc143b5992ce3f05a98cb952fb10fa9f127c2b08d61de64d851f0399338c47b5dc96 SHA512 5878b79f60626a184108af2c1477299e573389c83b6f5b1e87747ba8f5a1e2cb3d6763c9f7470e8a1a63aed2eba79dfb87758ecbb3bd5538563c7c2e06a2a182
-MISC metadata.xml 462 BLAKE2B 60ccc0b91ad64f83db4df7cafd5af9355192c5f60139cc523f2c0d1bd287a75501822773443995b0e6f51986aa504a473a74e87c4db78ed9780e24816128f91e SHA512 9a8f02d6b9b23aa4350d7ce48a6aca9541ec5fcde82437c6c9ff1cfc950c8843994eb31133b67d678a9babaa8a15230c00cfba65c45f5db4d4859db0198cb554
+MISC metadata.xml 351 BLAKE2B e364e607f9165c0e1ab30d22da2deae61b8c60d2140aa6891bf6267b2317fdb848f5cc17bc75ece5f5f527c6b5af44984b985136916209cbf681424eb57b960f SHA512 2aaefb91e260392774d1b982a861c9874ee2eb3004c5d207e56c0b59eaa2cb0071ef479f4032ec808388ef26c46bac38e4a78b434b7be080a79e5d2c823745a7
diff --git a/dev-util/trace-cmd/files/trace-cmd-3.1.4-hang-make-4.4.patch b/dev-util/trace-cmd/files/trace-cmd-3.1.4-hang-make-4.4.patch
deleted file mode 100644
index b65109505873..000000000000
--- a/dev-util/trace-cmd/files/trace-cmd-3.1.4-hang-make-4.4.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From e95be06da53eceeac332424d9893463c6c758b3d Mon Sep 17 00:00:00 2001
-From: jinqiang zhang <peeweep@0x0.ee>
-Date: Mon, 19 Dec 2022 22:57:32 +0000
-Subject: [PATCH] Fix compile hangs under make 4.4
-
-And run `make -d` with see below error messages:
-
-Makefile:224: not recursively expanding LIBTRACECMD_SHARED_VERSION to export to shell function
-Makefile:225: not recursively expanding LIBTRACECMD_SHARED_SO to export to shell function
-Makefile:237: not recursively expanding LIBTRACEEVENT_CFLAGS to export to shell function
-Makefile:238: not recursively expanding LIBTRACEEVENT_LDLAGS to export to shell function
-Makefile:79: not recursively expanding pkgconfig_dir to export to shell function
-
-Since make 4.4, recursively variables will set as empty string.
-
-Releated:
-  * [SV 10593] Export variables to $(shell ...) commands: https://git.savannah.gnu.org/cgit/make.git/commit/?id=98da874c
-  * [SV 63016] Don't fail exporting to $(shell ...): https://git.savannah.gnu.org/cgit/make.git/commit/?id=7d484017
-  * dev-util/trace-cmd-3.1.4 fails to compile: hangs: https://bugs.gentoo.org/881605
-
-Signed-off-by: jinqiang zhang <peeweep@0x0.ee>
----
- Makefile | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index e67cb77..ed98732 100644
---- a/Makefile
-+++ b/Makefile
-@@ -221,8 +221,8 @@ LIBS ?= -ldl
- LIBTRACECMD_DIR = $(obj)/lib/trace-cmd
- LIBTRACECMD_STATIC = $(LIBTRACECMD_DIR)/libtracecmd.a
- LIBTRACECMD_SHARED = $(LIBTRACECMD_DIR)/libtracecmd.so.$(LIBTRACECMD_VERSION)
--LIBTRACECMD_SHARED_VERSION = $(shell echo $(LIBTRACECMD_SHARED) | sed -e 's/\(\.so\.[0-9]*\).*/\1/')
--LIBTRACECMD_SHARED_SO = $(shell echo $(LIBTRACECMD_SHARED) | sed -e 's/\(\.so\).*/\1/')
-+LIBTRACECMD_SHARED_VERSION := $(shell echo $(LIBTRACECMD_SHARED) | sed -e 's/\(\.so\.[0-9]*\).*/\1/')
-+LIBTRACECMD_SHARED_SO := $(shell echo $(LIBTRACECMD_SHARED) | sed -e 's/\(\.so\).*/\1/')
- 
- export LIBTRACECMD_STATIC LIBTRACECMD_SHARED
- export LIBTRACECMD_SHARED_VERSION LIBTRACECMD_SHARED_SO
-@@ -234,8 +234,8 @@ TEST_LIBTRACEEVENT = $(shell sh -c "$(PKG_CONFIG) --atleast-version $(LIBTRACEEV
- TEST_LIBTRACEFS = $(shell sh -c "$(PKG_CONFIG) --atleast-version $(LIBTRACEFS_MIN_VERSION) $(LIBTRACEFS) > /dev/null 2>&1 && echo y")
- 
- ifeq ("$(TEST_LIBTRACEEVENT)", "y")
--LIBTRACEEVENT_CFLAGS = $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEEVENT)")
--LIBTRACEEVENT_LDLAGS = $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEEVENT)")
-+LIBTRACEEVENT_CFLAGS := $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEEVENT)")
-+LIBTRACEEVENT_LDLAGS := $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEEVENT)")
- else
- .PHONY: warning
- warning:
-@@ -253,8 +253,8 @@ endif
- export LIBTRACEEVENT_CFLAGS LIBTRACEEVENT_LDLAGS
- 
- ifeq ("$(TEST_LIBTRACEFS)", "y")
--LIBTRACEFS_CFLAGS = $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEFS)")
--LIBTRACEFS_LDLAGS = $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEFS)")
-+LIBTRACEFS_CFLAGS := $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEFS)")
-+LIBTRACEFS_LDLAGS := $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEFS)")
- else
- .PHONY: warning
- warning:
--- 
-2.39.0
-
diff --git a/dev-util/trace-cmd/metadata.xml b/dev-util/trace-cmd/metadata.xml
index a580fe510b6b..ff20f6fc3b7e 100644
--- a/dev-util/trace-cmd/metadata.xml
+++ b/dev-util/trace-cmd/metadata.xml
@@ -9,7 +9,4 @@
 		<email>dlan@gentoo.org</email>
 		<name>Yixun Lan</name>
 	</maintainer>
-	<use>
-		<flag name="udis86">Enable support for <pkg>dev-libs/udis86</pkg> disassembler library</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-util/trace-cmd/trace-cmd-3.1.4-r2.ebuild b/dev-util/trace-cmd/trace-cmd-3.1.4-r2.ebuild
deleted file mode 100644
index e884f104539b..000000000000
--- a/dev-util/trace-cmd/trace-cmd-3.1.4-r2.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_OPTIONAL=1
-
-inherit linux-info bash-completion-r1 python-r1 toolchain-funcs
-
-DESCRIPTION="User-space front-end for Ftrace"
-HOMEPAGE="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~x86"
-	S="${WORKDIR}/${PN}-v${PV}"
-fi
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/${PV}"
-IUSE="+audit doc python test udis86 +zstd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-# XXX trace-cmd autodetects this without configurability. This might cause
-# issues if the libraries are picked up with the useflag disabled and later
-# uninstalled
-RDEPEND="
-	audit? ( sys-process/audit )
-	python? ( ${PYTHON_DEPS} )
-	udis86? ( dev-libs/udis86 )
-	zstd? ( >=app-arch/zstd-1.4 )
-	!<dev-libs/libtracefs-1.6.1
-	>=dev-libs/libtracefs-1.6.1-r1
-	>=dev-libs/libtraceevent-1.6.3
-"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	test? ( dev-util/cunit )
-"
-BDEPEND="
-	virtual/pkgconfig
-	python? ( dev-lang/swig )
-	doc? (
-		app-text/asciidoc
-		dev-util/source-highlight
-	)
-"
-
-# having trouble getting tests to compile
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-hang-make-4.4.patch
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="
-		~TRACING
-		~FTRACE
-		~BLK_DEV_IO_TRACE"
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -r -e 's:([[:space:]]+)install_bash_completion($|[[:space:]]+):\1:' \
-		-e '/^prefix/s:/usr/local:/usr:g' \
-		-i Makefile || die "sed failed"
-
-	sed -i -e "s|^htmldir.*|&-${PVR}|g" \
-		-e "s|^pdfdir.*|&-${PVR}|g" \
-		Documentation/libtracecmd/Makefile \
-		Documentation/trace-cmd/Makefile || die
-}
-
-src_configure() {
-	EMAKE_FLAGS=(
-		BUILD_OUTPUT="${WORKDIR}/${P}_build"
-		"prefix=${EPREFIX}/usr"
-		"libdir=${EPREFIX}/usr/$(get_libdir)"
-		"CC=$(tc-getCC)"
-		"AR=$(tc-getAR)"
-		"BASH_COMPLETE_DIR=$(get_bashcompdir)"
-		"etcdir=/etc"
-		$(usex audit '' 'NO_AUDIT=' '' '1')
-		$(usex test 'CUNIT_INSTALLED=' '' '1' '')
-		$(usex udis86 '' 'NO_UDIS86=' '' '1')
-		VERBOSE=1
-	)
-}
-
-src_compile() {
-	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
-		trace-cmd
-
-	if use python; then
-		python_copy_sources
-		python_foreach_impl python_compile
-	fi
-
-	use doc && emake doc
-}
-
-python_compile() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	emake "${EMAKE_FLAGS[@]}" \
-		PYTHON_VERS="${EPYTHON}" \
-		PYTHON_PKGCONFIG_VERS="${EPYTHON//python/python-}" \
-		python_dir=$(python_get_sitedir)/${PN} \
-		python ctracecmd.so
-
-	popd > /dev/null || die
-}
-
-src_test() {
-	emake "${EMAKE_FLAGS[@]}" test
-}
-
-src_install() {
-	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
-		DESTDIR="${D}" \
-		install install_libs
-
-	newbashcomp tracecmd/trace-cmd.bash "${PN}"
-
-	use doc && emake DESTDIR="${D}" install_doc
-	use python && python_foreach_impl python_install
-}
-
-python_install() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	emake "${EMAKE_FLAGS[@]}" DESTDIR="${D}" \
-		PYTHON_VERS="${EPYTHON}" \
-		PYTHON_PKGCONFIG_VERS="${EPYTHON//python/python-}" \
-		python_dir=$(python_get_sitedir)/${PN} \
-		install_python
-
-	popd > /dev/null || die
-
-	python_optimize
-}
diff --git a/dev-util/trace-cmd/trace-cmd-3.1.5-r2.ebuild b/dev-util/trace-cmd/trace-cmd-3.1.5-r2.ebuild
deleted file mode 100644
index 9320c5e62ac1..000000000000
--- a/dev-util/trace-cmd/trace-cmd-3.1.5-r2.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_OPTIONAL=1
-
-inherit linux-info bash-completion-r1 python-r1 toolchain-funcs
-
-DESCRIPTION="User-space front-end for Ftrace"
-HOMEPAGE="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-	S="${WORKDIR}/${PN}-v${PV}"
-fi
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/${PV}"
-IUSE="+audit doc python test udis86 +zstd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-# XXX trace-cmd autodetects this without configurability. This might cause
-# issues if the libraries are picked up with the useflag disabled and later
-# uninstalled
-RDEPEND="
-	audit? ( sys-process/audit )
-	python? ( ${PYTHON_DEPS} )
-	udis86? ( dev-libs/udis86 )
-	zstd? ( >=app-arch/zstd-1.4 )
-	!<dev-libs/libtracefs-1.6.1
-	>=dev-libs/libtracefs-1.6.1-r1
-	>=dev-libs/libtraceevent-1.6.3
-"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	test? ( dev-util/cunit )
-"
-BDEPEND="
-	virtual/pkgconfig
-	python? ( dev-lang/swig )
-	doc? (
-		app-text/asciidoc
-		dev-util/source-highlight
-	)
-"
-
-# having trouble getting tests to compile
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.4-hang-make-4.4.patch
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="
-		~TRACING
-		~FTRACE
-		~BLK_DEV_IO_TRACE"
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -r -e 's:([[:space:]]+)install_bash_completion($|[[:space:]]+):\1:' \
-		-e '/^prefix/s:/usr/local:/usr:g' \
-		-i Makefile || die "sed failed"
-
-	sed -i -e "s|^htmldir.*|&-${PVR}|g" \
-		-e "s|^pdfdir.*|&-${PVR}|g" \
-		Documentation/libtracecmd/Makefile \
-		Documentation/trace-cmd/Makefile || die
-}
-
-src_configure() {
-	EMAKE_FLAGS=(
-		BUILD_OUTPUT="${WORKDIR}/${P}_build"
-		"prefix=${EPREFIX}/usr"
-		"libdir=${EPREFIX}/usr/$(get_libdir)"
-		"CC=$(tc-getCC)"
-		"AR=$(tc-getAR)"
-		"BASH_COMPLETE_DIR=$(get_bashcompdir)"
-		"etcdir=/etc"
-		$(usex audit '' 'NO_AUDIT=' '' '1')
-		$(usex test 'CUNIT_INSTALLED=' '' '1' '')
-		$(usex udis86 '' 'NO_UDIS86=' '' '1')
-		VERBOSE=1
-	)
-}
-
-src_compile() {
-	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
-		trace-cmd
-
-	if use python; then
-		python_copy_sources
-		python_foreach_impl python_compile
-	fi
-
-	use doc && emake doc
-}
-
-python_compile() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	emake "${EMAKE_FLAGS[@]}" \
-		PYTHON_VERS="${EPYTHON}" \
-		PYTHON_PKGCONFIG_VERS="${EPYTHON//python/python-}" \
-		python_dir=$(python_get_sitedir)/${PN} \
-		python ctracecmd.so
-
-	popd > /dev/null || die
-}
-
-src_test() {
-	emake "${EMAKE_FLAGS[@]}" test
-}
-
-src_install() {
-	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
-		DESTDIR="${D}" \
-		install install_libs
-
-	newbashcomp tracecmd/trace-cmd.bash "${PN}"
-
-	use doc && emake DESTDIR="${D}" install_doc
-	use python && python_foreach_impl python_install
-}
-
-python_install() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	emake "${EMAKE_FLAGS[@]}" DESTDIR="${D}" \
-		PYTHON_VERS="${EPYTHON}" \
-		PYTHON_PKGCONFIG_VERS="${EPYTHON//python/python-}" \
-		python_dir=$(python_get_sitedir)/${PN} \
-		install_python
-
-	popd > /dev/null || die
-
-	python_optimize
-}
diff --git a/dev-util/trace-cmd/trace-cmd-3.1.6-r1.ebuild b/dev-util/trace-cmd/trace-cmd-3.1.6-r1.ebuild
deleted file mode 100644
index 1b9f3ed7bace..000000000000
--- a/dev-util/trace-cmd/trace-cmd-3.1.6-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_OPTIONAL=1
-
-inherit linux-info bash-completion-r1 python-r1 toolchain-funcs
-
-DESCRIPTION="User-space front-end for Ftrace"
-HOMEPAGE="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-	S="${WORKDIR}/${PN}-v${PV}"
-fi
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/${PV}"
-IUSE="+audit doc python test udis86 +zstd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-# XXX trace-cmd autodetects this without configurability. This might cause
-# issues if the libraries are picked up with the useflag disabled and later
-# uninstalled
-RDEPEND="
-	audit? ( sys-process/audit )
-	python? ( ${PYTHON_DEPS} )
-	udis86? ( dev-libs/udis86 )
-	zstd? ( >=app-arch/zstd-1.4 )
-	!<dev-libs/libtracefs-1.6.1
-	!dev-libs/libtracecmd
-	>=dev-libs/libtracefs-1.6.1-r1
-	>=dev-libs/libtraceevent-1.6.3
-"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	test? ( dev-util/cunit )
-"
-BDEPEND="
-	virtual/pkgconfig
-	python? ( dev-lang/swig )
-	doc? (
-		app-text/asciidoc
-		dev-util/source-highlight
-	)
-"
-
-# having trouble getting tests to compile
-RESTRICT+=" test"
-
-pkg_setup() {
-	local CONFIG_CHECK="
-		~TRACING
-		~FTRACE
-		~BLK_DEV_IO_TRACE"
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -r -e 's:([[:space:]]+)install_bash_completion($|[[:space:]]+):\1:' \
-		-e '/^prefix/s:/usr/local:/usr:g' \
-		-i Makefile || die "sed failed"
-
-	sed -i -e "s|^htmldir.*|&-${PVR}|g" \
-		-e "s|^pdfdir.*|&-${PVR}|g" \
-		Documentation/libtracecmd/Makefile \
-		Documentation/trace-cmd/Makefile || die
-}
-
-src_configure() {
-	EMAKE_FLAGS=(
-		BUILD_OUTPUT="${WORKDIR}/${P}_build"
-		"prefix=${EPREFIX}/usr"
-		"libdir=${EPREFIX}/usr/$(get_libdir)"
-		"CC=$(tc-getCC)"
-		"AR=$(tc-getAR)"
-		"BASH_COMPLETE_DIR=$(get_bashcompdir)"
-		"etcdir=/etc"
-		$(usex audit '' 'NO_AUDIT=' '' '1')
-		$(usex test 'CUNIT_INSTALLED=' '' '1' '')
-		$(usex udis86 '' 'NO_UDIS86=' '' '1')
-		VERBOSE=1
-	)
-}
-
-src_compile() {
-	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
-		trace-cmd
-
-	if use python; then
-		python_copy_sources
-		python_foreach_impl python_compile
-	fi
-
-	use doc && emake doc
-}
-
-python_compile() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	emake "${EMAKE_FLAGS[@]}" \
-		PYTHON_VERS="${EPYTHON}" \
-		PYTHON_PKGCONFIG_VERS="${EPYTHON//python/python-}" \
-		python_dir=$(python_get_sitedir)/${PN} \
-		python ctracecmd.so
-
-	popd > /dev/null || die
-}
-
-src_test() {
-	emake "${EMAKE_FLAGS[@]}" test
-}
-
-src_install() {
-	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
-		DESTDIR="${D}" \
-		install install_libs
-
-	newbashcomp tracecmd/trace-cmd.bash "${PN}"
-
-	use doc && emake DESTDIR="${D}" install_doc
-	use python && python_foreach_impl python_install
-}
-
-python_install() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	emake "${EMAKE_FLAGS[@]}" DESTDIR="${D}" \
-		PYTHON_VERS="${EPYTHON}" \
-		PYTHON_PKGCONFIG_VERS="${EPYTHON//python/python-}" \
-		python_dir=$(python_get_sitedir)/${PN} \
-		install_python
-
-	popd > /dev/null || die
-
-	python_optimize
-}
diff --git a/dev-util/trace-cmd/trace-cmd-3.1.7.ebuild b/dev-util/trace-cmd/trace-cmd-3.1.7.ebuild
deleted file mode 100644
index 1b9f3ed7bace..000000000000
--- a/dev-util/trace-cmd/trace-cmd-3.1.7.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_OPTIONAL=1
-
-inherit linux-info bash-completion-r1 python-r1 toolchain-funcs
-
-DESCRIPTION="User-space front-end for Ftrace"
-HOMEPAGE="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-	S="${WORKDIR}/${PN}-v${PV}"
-fi
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/${PV}"
-IUSE="+audit doc python test udis86 +zstd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-# XXX trace-cmd autodetects this without configurability. This might cause
-# issues if the libraries are picked up with the useflag disabled and later
-# uninstalled
-RDEPEND="
-	audit? ( sys-process/audit )
-	python? ( ${PYTHON_DEPS} )
-	udis86? ( dev-libs/udis86 )
-	zstd? ( >=app-arch/zstd-1.4 )
-	!<dev-libs/libtracefs-1.6.1
-	!dev-libs/libtracecmd
-	>=dev-libs/libtracefs-1.6.1-r1
-	>=dev-libs/libtraceevent-1.6.3
-"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	test? ( dev-util/cunit )
-"
-BDEPEND="
-	virtual/pkgconfig
-	python? ( dev-lang/swig )
-	doc? (
-		app-text/asciidoc
-		dev-util/source-highlight
-	)
-"
-
-# having trouble getting tests to compile
-RESTRICT+=" test"
-
-pkg_setup() {
-	local CONFIG_CHECK="
-		~TRACING
-		~FTRACE
-		~BLK_DEV_IO_TRACE"
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -r -e 's:([[:space:]]+)install_bash_completion($|[[:space:]]+):\1:' \
-		-e '/^prefix/s:/usr/local:/usr:g' \
-		-i Makefile || die "sed failed"
-
-	sed -i -e "s|^htmldir.*|&-${PVR}|g" \
-		-e "s|^pdfdir.*|&-${PVR}|g" \
-		Documentation/libtracecmd/Makefile \
-		Documentation/trace-cmd/Makefile || die
-}
-
-src_configure() {
-	EMAKE_FLAGS=(
-		BUILD_OUTPUT="${WORKDIR}/${P}_build"
-		"prefix=${EPREFIX}/usr"
-		"libdir=${EPREFIX}/usr/$(get_libdir)"
-		"CC=$(tc-getCC)"
-		"AR=$(tc-getAR)"
-		"BASH_COMPLETE_DIR=$(get_bashcompdir)"
-		"etcdir=/etc"
-		$(usex audit '' 'NO_AUDIT=' '' '1')
-		$(usex test 'CUNIT_INSTALLED=' '' '1' '')
-		$(usex udis86 '' 'NO_UDIS86=' '' '1')
-		VERBOSE=1
-	)
-}
-
-src_compile() {
-	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
-		trace-cmd
-
-	if use python; then
-		python_copy_sources
-		python_foreach_impl python_compile
-	fi
-
-	use doc && emake doc
-}
-
-python_compile() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	emake "${EMAKE_FLAGS[@]}" \
-		PYTHON_VERS="${EPYTHON}" \
-		PYTHON_PKGCONFIG_VERS="${EPYTHON//python/python-}" \
-		python_dir=$(python_get_sitedir)/${PN} \
-		python ctracecmd.so
-
-	popd > /dev/null || die
-}
-
-src_test() {
-	emake "${EMAKE_FLAGS[@]}" test
-}
-
-src_install() {
-	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
-		DESTDIR="${D}" \
-		install install_libs
-
-	newbashcomp tracecmd/trace-cmd.bash "${PN}"
-
-	use doc && emake DESTDIR="${D}" install_doc
-	use python && python_foreach_impl python_install
-}
-
-python_install() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	emake "${EMAKE_FLAGS[@]}" DESTDIR="${D}" \
-		PYTHON_VERS="${EPYTHON}" \
-		PYTHON_PKGCONFIG_VERS="${EPYTHON//python/python-}" \
-		python_dir=$(python_get_sitedir)/${PN} \
-		install_python
-
-	popd > /dev/null || die
-
-	python_optimize
-}
diff --git a/dev-util/trace-cmd/trace-cmd-3.2-r2.ebuild b/dev-util/trace-cmd/trace-cmd-3.2-r2.ebuild
deleted file mode 100644
index e474369b5a2f..000000000000
--- a/dev-util/trace-cmd/trace-cmd-3.2-r2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit linux-info meson python-single-r1
-
-DESCRIPTION="User-space front-end for Ftrace"
-HOMEPAGE="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-	S="${WORKDIR}/${PN}-v${PV}"
-fi
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/${PV}"
-IUSE="python test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-# Tests segfault for now?
-RESTRICT="!test? ( test ) test"
-
-RDEPEND="
-	>=app-arch/zstd-1.4
-	!<dev-libs/libtracefs-1.6.1
-	>=dev-libs/libtracefs-1.6.1-r1
-	>=dev-libs/libtraceevent-1.6.3
-	sys-libs/zlib
-	sys-process/audit
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="
-	${RDEPEND}
-	sys-kernel/linux-headers
-	test? ( dev-util/cunit )
-"
-BDEPEND="
-	app-text/asciidoc
-	virtual/pkgconfig
-	python? ( dev-lang/swig )
-"
-
-pkg_setup() {
-	local CONFIG_CHECK="
-		~TRACING
-		~FTRACE
-		~BLK_DEV_IO_TRACE"
-
-	linux-info_pkg_setup
-
-	# TODO: Once we have options for doc+tests, we can revisit Python being
-	# single-impl.
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Due to the in-progress meson build transaction, we decide to separate
-	# the libtracecmd as an independent package, see bug #909439
-	# Note: dev-util/trace-cmd still use in-source static libtracecmd duo to
-	# it still use internal private API.
-	sed -i -e "/^libtracecmd_standalone_build/s/true/false/" \
-		"${S}"/lib/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dasciidoctor=false
-		$(meson_use python)
-	)
-
-	# TODO: udis86 isn't wired up to meson at all
-	# TODO: get docs & tests optional upstream
-	# TODO: audit/zstd/zlib lack meson options for now. Previously, the situation
-	# was somewhat automagic, so this isn't a huge loss for now, but we should
-	# upstream some build options for these.
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	use python && python_install
-
-	# TODO: fix bash completion name
-	mv "${D}"/usr/share/bash-completion/completions/${PN}.bash \
-		"${D}"/usr/share/bash-completion/completions/${PN} || die
-}
-
-python_install() {
-	python_optimize "${D}$(python_get_sitedir)"
-}