gentoo auto-resync : 19:08:2022 - 02:35:40

4 files changed, 76 insertions, 3 deletions

diff --git a/dev-libs/libtracefs/Manifest b/dev-libs/libtracefs/Manifest
index 9f9d4a5132c2..bbf43267b039 100644
--- a/dev-libs/libtracefs/Manifest
+++ b/dev-libs/libtracefs/Manifest
@@ -1,4 +1,7 @@
 AUX libtracefs-1.3.1-musl-pthread.patch 505 BLAKE2B 34d07b0d7527d245f459bfb0a8339da56f7deec1a064c74a8419375dcec9b0c46ec7348603689846a60c0afaccc02ee4956cddaff42910d493c44fde343e1a04 SHA512 2d097f71c08625b4d0c49388537a73c06cea7047c34c04bba6bf5053308c49e8cced7da8cb9b173c00b18160de7404ff9f8cbdc5782ec6ef9c2a89b3d4f76790
+AUX libtracefs-1.4.2-fix-test.patch 257 BLAKE2B 80d8dab428f5d2e4a8124437c8468c6cf941c4b3f03cae3330db684e2b01060dd5c5acacae63fa3589651cf3bf213264fd0f408c7404248a0f57ef1fe0472c92 SHA512 42068f3009e81f3648d89515ea057e58f6327794316315248a5f0ec5351c76aaffe8815a8587cbaf2d3bcb6386f2238b1a735efda685bd3ed9d675a213201174
 DIST libtracefs-1.3.1.tar.gz 175453 BLAKE2B d9801c9f50513a8b2d2de57f768aec69c3e47b4c41ba1e887b28465d3a0a6bf10e5d2c60f81615615176bdb65e10ef7e2b7dee5cbb214705cc69e55bb923231c SHA512 1d8423ff1033a4ab601dd8e9fa4a801c27425234505070733641c8c9a4dd382cc6563d3fde89958f18e0bc95e2cbbdf65e69a2935fe208d5de9fd3ac26374ec1
-EBUILD libtracefs-1.3.1.ebuild 1229 BLAKE2B 08d405c80c0fed9ef970dedfe862e94e2671ee95252a2445c78ae5ef63f12ea0fa19b3b4a60a8b9a3e8d6a43e6908b9eeb7832be3c7b3fcded34845e884adf40 SHA512 809b4b115b64c336a6a1d7190b45f6632e0a8439cac5451c8de41b8662231c564ae100b5870cfaa538f4a35ad383ee3a2a285cf3fe13f4321a3016d69d6e7a11
+DIST libtracefs-1.4.2.tar.gz 178382 BLAKE2B a956423370077613417812ad18da284521e8798701d558f4e419af6c43bd8a06c489525bbab26e6bc5d5d5e8fd0e6a7322d34f976a4ea560670eb594818d07fc SHA512 4a66c3cf8050de5acc4c63996cbcfa2c014e26ad6011eb89b0cff47ffbd6343637009354edf6bb173b9fd08103012774376c33fd6f642741f7990f2d6de3ea0c
+EBUILD libtracefs-1.3.1.ebuild 1391 BLAKE2B 28d81702b711190ddfa0b62a322ab222566c1ecd7185df38e1c30a57910e976f5c7fa42aa32b322934585cdb35d9936a0736e00c5674107ee58629dada2db684 SHA512 566dbbba263d368be4c3ddcc406025bde03f92555d1717bf958a6b71d3833bffea0bb68b3dfe4b50a542108522663e4fc549473379e7447061c2ddd90ea1bbb2
+EBUILD libtracefs-1.4.2.ebuild 1387 BLAKE2B b81fac4348de3bc92044a17bca680c836902a935804d8062156962bb5f9db5125631c28c61d11afe62a6349b34365a8918c1c78f4c419ff1bb34443b6699e0b9 SHA512 f7ed18ce5665c6d37a7148ff4ce3e9ac550f448c8a5699f9c346490c1624ed0ff584943c13cab52f2a2f29929a21d58abf8248db60c6f9aa57edb8f21ebf4b75
 MISC metadata.xml 256 BLAKE2B e4fb7b4732dc88ff20c10bd7e5425beca8310c14d3934046ad6fcd99d8f401ea8610a6df5444d094f5bae4e5120cb7aedc15b45f0862b73f83bd7d5e54617337 SHA512 d37651285ce883fc1c73b41e09e66788d47b2451a4f96ac4237e6bef59643b3171a7a24900f204f0ca1accdbd5961d74e4bd7c8c41e1d29492874e4cbc737611
diff --git a/dev-libs/libtracefs/files/libtracefs-1.4.2-fix-test.patch b/dev-libs/libtracefs/files/libtracefs-1.4.2-fix-test.patch
new file mode 100644
index 000000000000..fb2bdb2f5995
--- /dev/null
+++ b/dev-libs/libtracefs/files/libtracefs-1.4.2-fix-test.patch
@@ -0,0 +1,11 @@
+# Fix PATH_MAX not defined due to missing limits.h
+--- a/utest/tracefs-utest.c
++++ b/utest/tracefs-utest.c
+@@ -11,6 +11,7 @@
+ #include <time.h>
+ #include <dirent.h>
+ #include <ftw.h>
++#include <limits.h>
+
+ #include <CUnit/CUnit.h>
+ #include <CUnit/Basic.h>
diff --git a/dev-libs/libtracefs/libtracefs-1.3.1.ebuild b/dev-libs/libtracefs/libtracefs-1.3.1.ebuild
index d5ffcefc4d9b..f3049d954da5 100644
--- a/dev-libs/libtracefs/libtracefs-1.3.1.ebuild
+++ b/dev-libs/libtracefs/libtracefs-1.3.1.ebuild
@@ -23,9 +23,10 @@ RDEPEND="
 	>=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 )
+	doc? ( app-text/xmlto app-text/asciidoc dev-util/source-highlight )
 "
 
 PATCHES=(
@@ -51,5 +52,6 @@ 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
-	use doc && emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install-doc
+	# 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.4.2.ebuild b/dev-libs/libtracefs/libtracefs-1.4.2.ebuild
new file mode 100644
index 000000000000..70e3e35683e6
--- /dev/null
+++ b/dev-libs/libtracefs/libtracefs-1.4.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2019-2022 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-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 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.2-fix-test.patch
+)
+
+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
+}