From fd3c1be769bb61186a7d433ce694b0059a8f84a5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 12 Feb 2024 23:35:51 +0000 Subject: gentoo auto-resync : 12:02:2024 - 23:35:51 --- dev-util/trace-cmd/Manifest | 2 +- dev-util/trace-cmd/trace-cmd-3.2-r1.ebuild | 95 ---------------------------- dev-util/trace-cmd/trace-cmd-3.2-r2.ebuild | 99 ++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+), 96 deletions(-) delete mode 100644 dev-util/trace-cmd/trace-cmd-3.2-r1.ebuild create mode 100644 dev-util/trace-cmd/trace-cmd-3.2-r2.ebuild (limited to 'dev-util/trace-cmd') diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest index d16c6e8e165e..35fabbef304c 100644 --- a/dev-util/trace-cmd/Manifest +++ b/dev-util/trace-cmd/Manifest @@ -8,5 +8,5 @@ EBUILD trace-cmd-3.1.4-r2.ebuild 3338 BLAKE2B b9c5437bca8b2c52bbdcd86c39db0b1bd7 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-r1.ebuild 2364 BLAKE2B ca0299fe55182993352a931dea10faa41ee288e819907afb926ece22b712ae3ef38009525d8cdf22d1b81e667b74e3e72cdfbd0454eebc3ed9b0b08b0425a78c SHA512 f4a26c78c0984cab958d6425d2b23efba827af4ebc56c4dcc9cc0a1b3e876dd9f15f5d772676601cb1ebd76ff24f07a97cd7873add08a60d3a6bdda8e87c0ae1 +EBUILD trace-cmd-3.2-r2.ebuild 2414 BLAKE2B 80d0e40baa3224d50acf3d4f4ee8e84b1a103f1020f38ddfeba914546c0becc4260870dd726233af9bdb34e0f07cbc1b48a019a5c8b281f1b8be965babb13a8f SHA512 87a79292984b029148cc1a1dd9d77f2248f45705731fb98ea0cfd6fd26c71dd301b9d0273cf90090f5c67283328d37cb4c5c7cfb4c63094f908c9129de831e5d MISC metadata.xml 462 BLAKE2B 60ccc0b91ad64f83db4df7cafd5af9355192c5f60139cc523f2c0d1bd287a75501822773443995b0e6f51986aa504a473a74e87c4db78ed9780e24816128f91e SHA512 9a8f02d6b9b23aa4350d7ce48a6aca9541ec5fcde82437c6c9ff1cfc950c8843994eb31133b67d678a9babaa8a15230c00cfba65c45f5db4d4859db0198cb554 diff --git a/dev-util/trace-cmd/trace-cmd-3.2-r1.ebuild b/dev-util/trace-cmd/trace-cmd-3.2-r1.ebuild deleted file mode 100644 index ac238bb320a9..000000000000 --- a/dev-util/trace-cmd/trace-cmd-3.2-r1.ebuild +++ /dev/null @@ -1,95 +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-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 - dev-util/source-highlight - 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 - - # TODO: fix bash completion name - mv "${D}"/usr/share/bash-completion/completions/${PN}.bash \ - "${D}"/usr/share/bash-completion/completions/${PN} || die -} diff --git a/dev-util/trace-cmd/trace-cmd-3.2-r2.ebuild b/dev-util/trace-cmd/trace-cmd-3.2-r2.ebuild new file mode 100644 index 000000000000..5b793f1856fd --- /dev/null +++ b/dev-util/trace-cmd/trace-cmd-3.2-r2.ebuild @@ -0,0 +1,99 @@ +# 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-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 + 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 $(python_get_sitedir) +} -- cgit v1.2.3