gentoo auto-resync : 20:01:2023 - 00:00:11

4 files changed, 61 insertions, 4 deletions

diff --git a/dev-libs/libtracefs/Manifest b/dev-libs/libtracefs/Manifest
index 576f730a1b56..828421784f59 100644
--- a/dev-libs/libtracefs/Manifest
+++ b/dev-libs/libtracefs/Manifest
@@ -1,5 +1,7 @@
 DIST libtracefs-1.6.1.tar.gz 193086 BLAKE2B 53f6740c7f06e1d618594e03ec7fbda273bbeb87bfda67acfad1e1670fd69670187c7267af1abcd1502c338499dc8d4ffe28a213b3ad17ff5a6e2b435c1c242f SHA512 9fa9b470869bdc0134cc72eb7a9e0131638c3416d24e403c7fc819d49a5e521ca8c852ece4ac87d6a744c32846a2567c44c1e3b8b329f77db2d89e57c9e36340
 DIST libtracefs-1.6.3.tar.gz 193859 BLAKE2B 89029e59590f4e25c5d39d5b638c381e966e8dee055bf7873492a6cdc8b1e1df90cad84a8db4e1abcacbc43fbb23c9fefbdb53123a409a19d07925e7a39efcdb SHA512 273d008644b5d205def79fa8c1db51f21327c02abee16dfc706cfa7ad421be111ac3280b2dd493a8be5f4d9f2fdcb471d7de17e6b3e56df7cb2f1a11b4e1bfaa
-EBUILD libtracefs-1.6.1-r1.ebuild 1360 BLAKE2B 1ec46baeb0585e53ee07e686dc388a9976ab3d671f266df03860fbb7089d89ffd197ef9abf10f5b3c6d0f97e4905a07b203621daf952192f96f8015eaf407465 SHA512 36e14cbc0b94f49c9bb1b4a9bad5979fe654b5f0a92fc4a6d668adb86fda5132eaeceb9b4889b25ef6242790102d5d35c5ec17de517926cdc945feaaa1879f33
-EBUILD libtracefs-1.6.3-r1.ebuild 1368 BLAKE2B 6b95d9a5a92b5d8ed13cdced202e088087bb53d932bae4ea9158ba697861679e9284a96234318adade318630eb6b989485156e2c2581fb6c6deb6264c8781fb1 SHA512 52e317811ab4cab3e88b18a72f6d92ae5d19cb7806da9051858dcbd2dce4ee9ef54c729aa019fdd3255226457bead574daa7ef5c868e67c4c782438c6c83776e
+DIST libtracefs-1.6.4.tar.gz 193967 BLAKE2B 24ca0affbd3343429c096795ea25fca6b96c5e806fff197149db290a4b3ed4ad642738a74d395c025b2a5813d9a14ada9b36be8bc0bdbc31d110542fb49ce1ae SHA512 0db20393272ce75c9132fc189993929545f41ac00cc9b0fdbb6adcb4bcda41433f05c047d06d9774f9b00b9e3ed3cfed3879e75365e72c0bb705cf16449e06c4
+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.ebuild 1371 BLAKE2B 12e8b123542412df2707f66ddc9abc443e050d8c8f32151e08b7e9a99f721680be69dbaa3160045c87702c9eb0d75da526ff69d3cf47c65e9f16805e617438f4 SHA512 05b300f1a3debab95185f49040f7969e299483b2708dfec8a641d4eebe7741e2990363144cb6cb29e70b92e6ff6a45ecf0d744fe146ae8607c35caba087becf0
 MISC metadata.xml 363 BLAKE2B e7330c25a8a87a9811793ee730e7822000fdf1cbdda003302e5d542118204d905583a4acd07a5f37a15952bbe6265ff606d44978db823905c724b5f142d5d2ae SHA512 7be0cfa3fd15ef0cfc0647c73d69a7efc5f00d8b7f9d85c6092326d638132e7f989b855fe5f3bd9ab770e860e7858f8d462f8727b9ddeee64a0c44f7e66acf9c
diff --git a/dev-libs/libtracefs/libtracefs-1.6.1-r1.ebuild b/dev-libs/libtracefs/libtracefs-1.6.1-r2.ebuild
index dbdbb0bd1c19..e5a02ff37b52 100644
--- a/dev-libs/libtracefs/libtracefs-1.6.1-r1.ebuild
+++ b/dev-libs/libtracefs/libtracefs-1.6.1-r2.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 IUSE="doc"
 
 RDEPEND="
-	!<dev-util/trace-cmd-1.6.1
+	!<dev-util/trace-cmd-3.1.4-r2
 	>=dev-libs/libtraceevent-1.3.0
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/libtracefs/libtracefs-1.6.3-r1.ebuild b/dev-libs/libtracefs/libtracefs-1.6.3-r2.ebuild
index 77b947c93f1a..8586159db3f2 100644
--- a/dev-libs/libtracefs/libtracefs-1.6.3-r1.ebuild
+++ b/dev-libs/libtracefs/libtracefs-1.6.3-r2.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 IUSE="doc"
 
 RDEPEND="
-	!<dev-util/trace-cmd-1.6.1
+	!<dev-util/trace-cmd-3.1.4-r2
 	>=dev-libs/libtraceevent-1.3.0
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/libtracefs/libtracefs-1.6.4.ebuild b/dev-libs/libtracefs/libtracefs-1.6.4.ebuild
new file mode 100644
index 000000000000..8586159db3f2
--- /dev/null
+++ b/dev-libs/libtracefs/libtracefs-1.6.4.ebuild
@@ -0,0 +1,55 @@
+# 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
+}