gentoo resync : 07.01.2022

2 files changed, 94 insertions, 0 deletions

diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index b1b295a6719e..f5b0f3a1e205 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -5,7 +5,9 @@ AUX bpftrace-0.14.0-dont-compress-man.patch 1760 BLAKE2B dc07764635e845729e684b0
 AUX bpftrace-0.14.0-fuzzing.patch 499 BLAKE2B 3dfbc2594676c37c239c92c94b475cbfa9b30ff785bba436e0cf5729deac51c7f10826ddb9603f02bd39645af626e0aa2565b46ac79ede40d936203def321391 SHA512 bf2a3569097274a46e5ed9fe8ea014ae3a0c9f42684e56b948cd6ec458e022d98aaecaac7577150e3a78c81583e678fbfa0f798c342e827ea7af9a4c2b128f0f
 AUX bpftrace-0.14.0-install-libs.patch 8077 BLAKE2B ae165fd4eceae5d159d28b9a0fb29e8c12dd565c127984469ad55675e115f48ae0de471ddb3b88699560472e63f0fd4fef187708d722f5e42e749f0cbe066ae1 SHA512 3664a93d9ab6f824ea2c7689020287a8cc3da45c27a146a3301394e5adbde56a899727d7fd15d912dd7b2ba8e9c84508e4c5b563d551e7315ec05c1f9eddfc7d
 DIST bpftrace-0.14.0.tar.gz 991314 BLAKE2B 3222068d7f84c13f736197cef2d188fa31a25db6bd266afe5cbacb1c062155b5ebd5d0310fbad56c15574a795766a33b12624f0252b0bc0677bf05324f414df5 SHA512 78f2d9a4d54c0dda1947b924a828777b402befc3a05031b609da4d256907df1e64f946454a9be7317449f49706f02a881febc4e63d2ef2f4e76924ea19e36ddb
+DIST bpftrace-0.14.1.tar.gz 991481 BLAKE2B 832f213760eb86804d63df782ff1923f6355b63770b8c4d486dd2547ae3dc474f9e4923f3107bbefbf2066dc013c930d4765ef86ef4d10bda6757513e30c2de1 SHA512 0be06c209ba12f70a0d1140b168dac94945c1b034dbd0c7dae5460fca43eec10bb436e28c122ec37b259256bf6b9bb23a3c5e7f8435feb67eae1b9277debaf73
 EBUILD bpftrace-0.14.0-r2.ebuild 1800 BLAKE2B 595833564e6d29016a523502877ab550a65d8749f6afd4a090ee10fb0c06470488c00ea8379b8f84cdce994651e2b323402c7b1663a2113db90b4b1a101c3c5d SHA512 37f6b42c84c82107b51b035d94e7ff704587c6241e05e872ed98cf6ad4a17acab24f66265339dc57e905a82b868acc4182f4a245cecdb52a5871d4db53757574
 EBUILD bpftrace-0.14.0-r3.ebuild 1714 BLAKE2B 920871a51ced4378659f415e3f08ed29a3b2aaee9613977b0efa090d86429c1a464c71fa7a9d5ec73a134f38a9086c9af8519ca88c60c008233796ca3e4af9e6 SHA512 b667cdbb36ffdace520ed8c29c384ea50c71679f1e798f1e5921a59307ef2c3202789bd8fcc988d0c1776ab88feebc869de6d9f60a071721e9a3fc3b56d1dead
 EBUILD bpftrace-0.14.0-r4.ebuild 1897 BLAKE2B 9e895fff1c210b84f2b25ece52f155b80373ad798777ca4737612e4c1c7eb275206baccce366faa68f6ec65ec732d81e7008542b485ede9a303213c3cdede8f4 SHA512 377ed0d43308a1a7d785537bbd4975c64ecb0bf133491d9133c5d76b50ea5f5db7e0f341e0e3142ac0949dd67f40453d6b59c7bfa2028634ef4380b67463355a
+EBUILD bpftrace-0.14.1.ebuild 1897 BLAKE2B 64e23a87fd0c2b7e55d2d909ab1d45b80dc59ec10b1e056799dc016824312874bdea7f52dfcb0a19efb33bb5d78e628fa7a6fffd19a5fc164313d947ef3b49b9 SHA512 2d650c65d67af11dc76f554f56b7ba374b295ccd4c738181f04496866b86ac7c83d3b9a18d92a9d823dd7e5a390547220cde3a0f5e1188cbf9a2f80af5f65d26
 MISC metadata.xml 499 BLAKE2B ce7c46f4c5e49f2f779ff6584053f7fc78dffaeee432ac46a8881b3d49dc569e309af95aaf9d6e77a36ebc87be0cd2f86a5db7b733463e4252d3a242d914f293 SHA512 dfb827afd47feb8204ef40c940ebcc7d1b3217cdf0f24425e4ab32195309d727225e942d777871565e47a2c02244d053f46ed25165e9728c94e0683ff61bf4ce
diff --git a/dev-util/bpftrace/bpftrace-0.14.1.ebuild b/dev-util/bpftrace/bpftrace-0.14.1.ebuild
new file mode 100644
index 000000000000..81645fe66617
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.14.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LLVM_MAX_SLOT=13
+
+inherit llvm linux-info cmake toolchain-funcs
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace"
+MY_PV="${PV//_/}"
+SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="fuzzing test"
+# lots of fixing needed
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/libbpf:=
+	>=dev-util/bcc-0.13.0:=
+	dev-util/systemtap
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)]
+	sys-libs/binutils-libs:=
+	virtual/libelf:=
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/cereal:=
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	sys-apps/sed
+	app-arch/xz-utils
+	sys-devel/flex
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
+
+PATCHES=(
+	"${FILESDIR}/bpftrace-0.14.0-install-libs.patch"
+	"${FILESDIR}/bpftrace-0.14.0-dont-compress-man.patch"
+	"${FILESDIR}/bpftrace-0.14.0-fuzzing.patch"
+	"${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
+	"${FILESDIR}/bpftrace-0.12.0-fuzzing-build.patch"
+	"${FILESDIR}/bpftrace-0.14-libbpf-0.6.patch"
+)
+
+pkg_pretend() {
+	local CONFIG_CHECK="
+		~BPF
+		~BPF_EVENTS
+		~BPF_JIT
+		~BPF_SYSCALL
+		~FTRACE_SYSCALLS
+		~HAVE_EBPF_JIT
+	"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+}
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DSTATIC_LINKING:BOOL=OFF
+		# bug 809362, 754648
+		-DBUILD_SHARED_LIBS:=OFF
+		-DBUILD_TESTING:BOOL=OFF
+		-DBUILD_FUZZ:BOOL=$(usex fuzzing)
+		-DENABLE_MAN:BOOL=OFF
+		-DLIBBPF_INCLUDE_DIRS="$($(tc-getPKG_CONFIG) --cflags-only-I libbpf | sed 's:-I::g')"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# bug 809362
+	dostrip -x /usr/bin/bpftrace
+	doman man/man8/*.?
+}