gentoo auto-resync : 03:02:2024 - 17:44:31

4 files changed, 171 insertions, 4 deletions

diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
index 3d13b97bff44..d16c6e8e165e 100644
--- a/dev-util/trace-cmd/Manifest
+++ b/dev-util/trace-cmd/Manifest
@@ -2,9 +2,11 @@ AUX trace-cmd-3.1.4-hang-make-4.4.patch 3094 BLAKE2B 7e2a83981b214125daff015b464
 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.ebuild 3293 BLAKE2B 7903d1794f4a5fbf558ddbbee4b3359359fb6d6e1e447abe76df1ab1358543df03186c2ad6c0f2fbb86bae0c1cf6a3fefdabd1a2d626b403c19f229436f87f66 SHA512 92f661d066e9aa88355de47e83de57801facc11971bd1b93639ec3db94a0c508ec8aa97775d42bc0eda1587993a33704d68be9404a4f7a18ef991fdc43306c72
-EBUILD trace-cmd-3.2.ebuild 1801 BLAKE2B f7952990a73ccb0dd5644592c6de060d7f7df73527290c417628c136a52c079cee68e7b67c1cd0605c5d20cda7bdf2c5059cb1fe2cf7d05a91e53af9ad0c7b15 SHA512 d3d676f1b553e67a14e28e715c5e9a483a393105944d21d7a859fafbc69ad8a1b7ae2b1fdbf989387c954293a5ea2d8355315b2bb362d51b1c7c3ef1a97bc83a
+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
 MISC metadata.xml 462 BLAKE2B 60ccc0b91ad64f83db4df7cafd5af9355192c5f60139cc523f2c0d1bd287a75501822773443995b0e6f51986aa504a473a74e87c4db78ed9780e24816128f91e SHA512 9a8f02d6b9b23aa4350d7ce48a6aca9541ec5fcde82437c6c9ff1cfc950c8843994eb31133b67d678a9babaa8a15230c00cfba65c45f5db4d4859db0198cb554
diff --git a/dev-util/trace-cmd/trace-cmd-3.1.6.ebuild b/dev-util/trace-cmd/trace-cmd-3.1.6-r1.ebuild
index abddbafded31..1b9f3ed7bace 100644
--- a/dev-util/trace-cmd/trace-cmd-3.1.6.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-3.1.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -34,6 +34,7 @@ RDEPEND="
 	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
 "
diff --git a/dev-util/trace-cmd/trace-cmd-3.1.7.ebuild b/dev-util/trace-cmd/trace-cmd-3.1.7.ebuild
new file mode 100644
index 000000000000..1b9f3ed7bace
--- /dev/null
+++ b/dev-util/trace-cmd/trace-cmd-3.1.7.ebuild
@@ -0,0 +1,145 @@
+# 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.ebuild b/dev-util/trace-cmd/trace-cmd-3.2-r1.ebuild
index 0faa6c63b891..ac238bb320a9 100644
--- a/dev-util/trace-cmd/trace-cmd-3.2.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -61,6 +61,17 @@ pkg_setup() {
 	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
@@ -74,3 +85,11 @@ src_configure() {
 	# 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
+}