commit: ed337e6db44fe3a356caf039a3cd41c80021d3f5 Author: Yixun Lan <dlan <AT> gentoo <DOT> org> AuthorDate: Thu May 30 01:54:23 2024 +0000 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> CommitDate: Thu May 30 07:53:38 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed337e6d
dev-util/trace-cmd: drop 3.1.4-r2, 3.1.5-r2, 3.1.6-r1, 3.1.7, 3.2-r2 Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> dev-util/trace-cmd/Manifest | 4 - .../files/trace-cmd-3.1.4-hang-make-4.4.patch | 65 --------- dev-util/trace-cmd/trace-cmd-3.1.4-r2.ebuild | 148 --------------------- dev-util/trace-cmd/trace-cmd-3.1.5-r2.ebuild | 148 --------------------- dev-util/trace-cmd/trace-cmd-3.1.6-r1.ebuild | 145 -------------------- dev-util/trace-cmd/trace-cmd-3.1.7.ebuild | 145 -------------------- dev-util/trace-cmd/trace-cmd-3.2-r2.ebuild | 99 -------------- 7 files changed, 754 deletions(-) diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest index 5b3408c3cb2c..35f0014abeb8 100644 --- a/dev-util/trace-cmd/Manifest +++ b/dev-util/trace-cmd/Manifest @@ -1,5 +1 @@ -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 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 <[email protected]> -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 <[email protected]> ---- - 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/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)" -}
