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

6 files changed, 81 insertions, 177 deletions

diff --git a/dev-libs/libtracefs/Manifest b/dev-libs/libtracefs/Manifest
index a4560f6e3439..33aaebd48070 100644
--- a/dev-libs/libtracefs/Manifest
+++ b/dev-libs/libtracefs/Manifest
@@ -1,9 +1,6 @@
-DIST libtracefs-1.6.1.tar.gz 193086 BLAKE2B 53f6740c7f06e1d618594e03ec7fbda273bbeb87bfda67acfad1e1670fd69670187c7267af1abcd1502c338499dc8d4ffe28a213b3ad17ff5a6e2b435c1c242f SHA512 9fa9b470869bdc0134cc72eb7a9e0131638c3416d24e403c7fc819d49a5e521ca8c852ece4ac87d6a744c32846a2567c44c1e3b8b329f77db2d89e57c9e36340
-DIST libtracefs-1.6.3.tar.gz 193859 BLAKE2B 89029e59590f4e25c5d39d5b638c381e966e8dee055bf7873492a6cdc8b1e1df90cad84a8db4e1abcacbc43fbb23c9fefbdb53123a409a19d07925e7a39efcdb SHA512 273d008644b5d205def79fa8c1db51f21327c02abee16dfc706cfa7ad421be111ac3280b2dd493a8be5f4d9f2fdcb471d7de17e6b3e56df7cb2f1a11b4e1bfaa
-DIST libtracefs-1.6.4.tar.gz 193967 BLAKE2B 24ca0affbd3343429c096795ea25fca6b96c5e806fff197149db290a4b3ed4ad642738a74d395c025b2a5813d9a14ada9b36be8bc0bdbc31d110542fb49ce1ae SHA512 0db20393272ce75c9132fc189993929545f41ac00cc9b0fdbb6adcb4bcda41433f05c047d06d9774f9b00b9e3ed3cfed3879e75365e72c0bb705cf16449e06c4
+AUX libtracefs-1.8.0-mmap.patch 677 BLAKE2B 3acde3a229c9e6bc0e3b0cba91cf36fb861a7e26203c5cfe15a44bdffd3855d350f839b796b67d6553f70cfe05c1155959baca3ee4720bfb128ddf85f00af80e SHA512 8d34762df2cbfd555117daaf4a2cc7b8a9735a864b194da316d30ee32f488aa133b38dfc75b2cb3ef18fbf4db7e29ef40674e916b163821a834a870fb716bc0d
 DIST libtracefs-1.7.0.tar.gz 205716 BLAKE2B 7e11ed75e65ddfb6e95fa67db2d3a3000e722108b6cb9d8efe7f057bf96afa608f0452e42090dab077b59044d3cbaebf2e4361812b994943964ea611b0ec6a49 SHA512 8b95c798a9013c0278da1c68ab4625446e1cc9d437eed91a6ce16660e7787f0af04ab65ce0dba536039f2facca39c50df5e45335b1af630e7bcce70b584e2f0c
-EBUILD libtracefs-1.6.1-r2.ebuild 1363 BLAKE2B 63ca275f16bb40d52273defab3eaf43f08fe73af13efa9c416ef3eb3d4698ff542ee9618fc575993ee806682b464d04d1fe0ad9e0f0834ecdc21ae29dabda159 SHA512 5cdf431afd163ff14c4234664f31e61f822da1a5f7dc2d44e404c60e7deb0b2311cc673067bf3df610ef778da3f4dcdf77134c971bee4816877b6d0537ad6ca5
-EBUILD libtracefs-1.6.3-r2.ebuild 1371 BLAKE2B 12e8b123542412df2707f66ddc9abc443e050d8c8f32151e08b7e9a99f721680be69dbaa3160045c87702c9eb0d75da526ff69d3cf47c65e9f16805e617438f4 SHA512 05b300f1a3debab95185f49040f7969e299483b2708dfec8a641d4eebe7741e2990363144cb6cb29e70b92e6ff6a45ecf0d744fe146ae8607c35caba087becf0
-EBUILD libtracefs-1.6.4-r1.ebuild 1502 BLAKE2B abb1fe6eba5ae91aa8032f8c86ccf6bde0c9eeb108510f4ad36f0204651bf5b7a0dbd947e1e833a913edb3a0cc177383eb3e652180a99ce1760d72771bcc4618 SHA512 2231af6f8a2f58afb0fd702395bea1637c498d53915bdfae55e65197257ef97cfdbd9e5675be0c8e2da5a3473e0cede8089b4e10c98e5a2948dd32cb7c1a0911
+DIST libtracefs-1.8.0.tar.gz 224662 BLAKE2B 06ee6872ec5cd6c671ee2ddd3de19356ffa560b3ae20318e36be6a95bfe37bf61233841e32c530ab0a3463d13dd57ff1b09bba296663b25d76da2a2ea3e89f51 SHA512 2d9728186de63f03a2222d56efe6b373c038519ad1e81dd10d97640c296696df6b0661743dcd9e851edda5225342ea10a8746434439f7ad878e26780b797eb6c
 EBUILD libtracefs-1.7.0.ebuild 1150 BLAKE2B af045d49b27568fc3546a41cc866e624090ac1b7ca4f61d5cdafa008000d2a6a3e05e98274f363cb31ce334c8f71e481fc771ba73573ca2238a90a8291c2484c SHA512 64b558c92a98f6494dd0b37df22d250161c6b1ae8fc1ad16eee18df6a2275037476c1170b68c8c71c7a177aec05fd1c50d94016a502ac471da072ac0310e0d55
+EBUILD libtracefs-1.8.0.ebuild 1182 BLAKE2B 03488702d567bd36fbf4db42c27c2709d206c0e003a7825bd72a86fae901ca211f82264dcc56db7750516bd0bb92e1915913bb45201084c87f069b045dc00960 SHA512 dbcbcbbf091f24024fd1b6e51822e26bf930a38c625ba07ad3a57f57aa9302c5462c1870f7c029034251a71d584308e8032c183e07af338d1374ba2ef938f93d
 MISC metadata.xml 363 BLAKE2B e7330c25a8a87a9811793ee730e7822000fdf1cbdda003302e5d542118204d905583a4acd07a5f37a15952bbe6265ff606d44978db823905c724b5f142d5d2ae SHA512 7be0cfa3fd15ef0cfc0647c73d69a7efc5f00d8b7f9d85c6092326d638132e7f989b855fe5f3bd9ab770e860e7858f8d462f8727b9ddeee64a0c44f7e66acf9c
diff --git a/dev-libs/libtracefs/files/libtracefs-1.8.0-mmap.patch b/dev-libs/libtracefs/files/libtracefs-1.8.0-mmap.patch
new file mode 100644
index 000000000000..15000318863d
--- /dev/null
+++ b/dev-libs/libtracefs/files/libtracefs-1.8.0-mmap.patch
@@ -0,0 +1,25 @@
+Subject: [PATCH] libtracefs meson: build tracefs-mmap by default
+
+Accordingly to Makefile let's add tracefs-mmap.c to build, this is needed
+for linking by other object files.
+
+Link: https://lore.kernel.org/linux-trace-devel/20240110203925.266999-1-giulio.benetti@benettiengineering.com
+---
+ src/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/meson.build b/src/meson.build
+index 5b76554..f7a98b9 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -11,6 +11,7 @@ sources= [
+    'tracefs-instance.c',
+    'tracefs-kprobes.c',
+    'tracefs-marker.c',
++   'tracefs-mmap.c',
+    'tracefs-record.c',
+    'tracefs-sqlhist.c',
+    'tracefs-tools.c',
+-- 
+2.43.0
+
diff --git a/dev-libs/libtracefs/libtracefs-1.6.1-r2.ebuild b/dev-libs/libtracefs/libtracefs-1.6.1-r2.ebuild
deleted file mode 100644
index e5a02ff37b52..000000000000
--- a/dev-libs/libtracefs/libtracefs-1.6.1-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Linux kernel trace file system library"
-HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
-
-if [[ ${PV} =~ [9]{4,} ]]; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
-	inherit git-r3
-else
-	SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="
-	!<dev-util/trace-cmd-3.1.4-r2
-	>=dev-libs/libtraceevent-1.3.0
-"
-DEPEND="${RDEPEND}"
-# source-highlight is needed, see bug https://bugs.gentoo.org/865469
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/xmlto app-text/asciidoc dev-util/source-highlight )
-"
-
-src_configure() {
-	EMAKE_FLAGS=(
-		"prefix=${EPREFIX}/usr"
-		"libdir=${EPREFIX}/usr/$(get_libdir)"
-		"CC=$(tc-getCC)"
-		"AR=$(tc-getAR)"
-		VERBOSE=1
-	)
-}
-
-src_compile() {
-	emake "${EMAKE_FLAGS[@]}"
-	use doc && emake doc
-}
-
-src_install() {
-	emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install
-	# can't prevent installation of the static lib with parameters
-	rm "${ED}/usr/$(get_libdir)/libtracefs.a" || die
-	# install-doc is wrong target, see https://bugs.gentoo.org/865465
-	use doc && emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install_doc
-}
diff --git a/dev-libs/libtracefs/libtracefs-1.6.3-r2.ebuild b/dev-libs/libtracefs/libtracefs-1.6.3-r2.ebuild
deleted file mode 100644
index 8586159db3f2..000000000000
--- a/dev-libs/libtracefs/libtracefs-1.6.3-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Linux kernel trace file system library"
-HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
-
-if [[ ${PV} =~ [9]{4,} ]]; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
-	inherit git-r3
-else
-	SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="
-	!<dev-util/trace-cmd-3.1.4-r2
-	>=dev-libs/libtraceevent-1.3.0
-"
-DEPEND="${RDEPEND}"
-# source-highlight is needed, see bug https://bugs.gentoo.org/865469
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/xmlto app-text/asciidoc dev-util/source-highlight )
-"
-
-src_configure() {
-	EMAKE_FLAGS=(
-		"prefix=${EPREFIX}/usr"
-		"libdir=${EPREFIX}/usr/$(get_libdir)"
-		"CC=$(tc-getCC)"
-		"AR=$(tc-getAR)"
-		VERBOSE=1
-	)
-}
-
-src_compile() {
-	emake "${EMAKE_FLAGS[@]}"
-	use doc && emake doc
-}
-
-src_install() {
-	emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install
-	# can't prevent installation of the static lib with parameters
-	rm "${ED}/usr/$(get_libdir)/libtracefs.a" || die
-	# install-doc is wrong target, see https://bugs.gentoo.org/865465
-	use doc && emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install_doc
-}
diff --git a/dev-libs/libtracefs/libtracefs-1.6.4-r1.ebuild b/dev-libs/libtracefs/libtracefs-1.6.4-r1.ebuild
deleted file mode 100644
index 0fa9a748d6ad..000000000000
--- a/dev-libs/libtracefs/libtracefs-1.6.4-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Linux kernel trace file system library"
-HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
-
-if [[ ${PV} =~ [9]{4,} ]]; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
-	inherit git-r3
-else
-	SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="
-	!<dev-util/trace-cmd-3.1.4-r2
-	>=dev-libs/libtraceevent-1.3.0
-"
-DEPEND="${RDEPEND}"
-# source-highlight is needed, see bug https://bugs.gentoo.org/865469
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/xmlto app-text/asciidoc dev-util/source-highlight )
-"
-
-src_prepare() {
-	default
-	sed -i -e "s|share/doc/libtracefs-doc|share/doc/libtracefs-${PV}|g" \
-		Documentation/Makefile || die
-}
-
-src_configure() {
-	EMAKE_FLAGS=(
-		"prefix=${EPREFIX}/usr"
-		"libdir=${EPREFIX}/usr/$(get_libdir)"
-		"CC=$(tc-getCC)"
-		"AR=$(tc-getAR)"
-		VERBOSE=1
-	)
-}
-
-src_compile() {
-	emake "${EMAKE_FLAGS[@]}"
-	use doc && emake doc
-}
-
-src_install() {
-	emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install
-	# can't prevent installation of the static lib with parameters
-	rm "${ED}/usr/$(get_libdir)/libtracefs.a" || die
-	# install-doc is wrong target, see https://bugs.gentoo.org/865465
-	use doc && emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install_doc
-}
diff --git a/dev-libs/libtracefs/libtracefs-1.8.0.ebuild b/dev-libs/libtracefs/libtracefs-1.8.0.ebuild
new file mode 100644
index 000000000000..b1d311a9f1cc
--- /dev/null
+++ b/dev-libs/libtracefs/libtracefs-1.8.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Linux kernel trace file system library"
+HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
+	inherit git-r3
+else
+	SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+# Please double check the minimum libtraceevent version!
+RDEPEND="
+	>=dev-libs/libtraceevent-1.8.1
+"
+DEPEND="${RDEPEND}"
+# source-highlight is needed, see bug https://bugs.gentoo.org/865469
+BDEPEND="
+	app-text/asciidoc
+	app-text/xmlto
+	dev-util/source-highlight
+	app-alternatives/yacc
+	app-alternatives/lex
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${P}-mmap.patch" )
+
+src_configure() {
+	local emesonargs=(
+		-Dasciidoctor=false
+		-Ddoc=false
+	)
+
+	# TODO: get docs & tests optional upstream
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	find "${ED}" -type f -name '*.a' -delete || die
+}