From a2f130f3156ea1d203e99a781424790176b9b2b5 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 6 Feb 2023 03:18:56 +0000
Subject: gentoo auto-resync : 06:02:2023 - 03:18:56

---
 dev-util/Manifest.gz                               | Bin 68392 -> 68384 bytes
 dev-util/bpftrace/Manifest                         |   4 +-
 dev-util/bpftrace/bpftrace-0.17.0-r1.ebuild        |  95 ---------------------
 dev-util/bpftrace/bpftrace-0.17.0-r2.ebuild        |  95 +++++++++++++++++++++
 .../files/bpftrace-0.17.0-install-libs.patch       |   6 +-
 5 files changed, 101 insertions(+), 99 deletions(-)
 delete mode 100644 dev-util/bpftrace/bpftrace-0.17.0-r1.ebuild
 create mode 100644 dev-util/bpftrace/bpftrace-0.17.0-r2.ebuild

(limited to 'dev-util')

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index df3bef2b9f80..b7000de41ca2 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index cc70efc85cf3..00bdb57113e4 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -3,10 +3,10 @@ AUX bpftrace-0.15.0-dont-compress-man.patch 1885 BLAKE2B 89a327cef68fa838d5c04b3
 AUX bpftrace-0.15.0-llvm-15-pointers.patch 1023 BLAKE2B fc66196f11e9384878921309d09e3f205674a88041c93b0b353bf38ff345b4192b83cd1c80a15258b97710624b3341c9ed19b60beff38c163f677d644843ff54 SHA512 8282aa82eb867eed3378adc4ff2b73c6427d4f979cfb5268444bf122126c758229d680985e4ede7e8d011a14d4a122d6742650f57ee0e0759e3b1bfb9ba9458f
 AUX bpftrace-0.16.0-install-libs.patch 8507 BLAKE2B 84842c5c400e2921d40f32ccd27ec06174c517e35b3a413907231e128d636e7c4711d131682d3fbc75a861bf3cd0cf83de2ca1c4bfbf2606e69d32f898fbd3a4 SHA512 93341eca7566d1328cbd670685859803cc76869be2eb3d52d38e3956f30d28f63d73ba32ae7f111dfd01ccb95899be6e1834fe7e1f1ee3794a0b796b8f52574e
 AUX bpftrace-0.16.0-opaquepointer.patch 20038 BLAKE2B beeda98ded230a8bb22d2a32dd0e839f138ca9c9fec10402d039f4385016b4330ce94756641e4f24a5a1e294ce08d282cbf4f7e01ef0c817dda21d2324f7cf60 SHA512 4b61fe7d21a42493590e5e6bc7507852d6a1f0d685d78958d6aa2c1602211d99bbccced25a2c118ecdedd802ccfdd009b940ccb81573b28b010a476952bd1da7
-AUX bpftrace-0.17.0-install-libs.patch 13643 BLAKE2B d5f2f99cb0afaa29bf68315291487cedabcc72aadaa99130e55a7f14646729325db9f8475d785f60683e8a3b2cc5725160a954b6609b82b86b71a4ac6dde9bb9 SHA512 c58dce02750757176d6b5e15fe71ef992e256d420d32dd06059733c8851fe069b6195719804e705d8c245d2811e26eb4140bab5419832083a523074b56cabb5e
+AUX bpftrace-0.17.0-install-libs.patch 13720 BLAKE2B dd9e6c2fbd7e9b9d968d392d0585a612c0cd3d06bcdb2a8a58123742603e16001b4c946b83cd3ae4234eb18f547b0a4e28fd123f4ad63382ce35ec054afe8c96 SHA512 bff931ecd358237976fbfd7f2a966d9b734f96b4458b85fe1348de51993bc0ec976a2f88919a1c1eaa8844028b6cd963eaad6ff698498febf24d2418b415760b
 DIST bpftrace-0.16.0.gh.tar.gz 1023480 BLAKE2B 20fa877adeaada655462004142a80f107f82a3fa73fd7a7675a477d45ecd3a28115af5d612da2b06e2d760cfa3e574583e4cc4d62f4175c49ecc9d9b3fcceb6e SHA512 52ca4fea4e2f8d2cbf0f9f1bc69af0ee3408201f019006dd2e838b9458cfc01761eba3df24c39e05cf93220d85d0cecc69bb44ec72f9f44cec0eb94479bff734
 DIST bpftrace-0.17.0.gh.tar.gz 1033934 BLAKE2B 960582096fcf1652a65c4f8e18dcc5e17792c3b5c048dff59465fc1fc43d39e033c06ebc5c9bc88310b429a81fac5a8cfcdc261e7f0dcdcba4823b518f74fa3e SHA512 b1c8fc81b23f38bc45b4e73edd29c4cd0775e703b368612f00902fbda39dc3758038cd7afa351c1711cec467efd2a199a6b8b933b03aebd591d230d533e190d3
 EBUILD bpftrace-0.16.0-r1.ebuild 1740 BLAKE2B b798c92e0e80396c069d83b1f9d55d019382a4f3615c4a064d9b0c196c010c4399d488c41ef403702a5e3ccdff14d1cd4466a8b0d6cdb25902b48498197120b7 SHA512 0b252876bcd309520eb3daa4216cf21e1d8b1eb2ea0e33f5abe3b5d48cf32e8c5e5739f46c395f4678c64e39841e87093b829269563eadd51bdb10acf0b51d3c
 EBUILD bpftrace-0.16.0-r2.ebuild 1791 BLAKE2B bd0db18452f6d36ea37658b477219fc10edb329b17aa0fb6f26bce4578c9ddba88915e0a026fd190fcb5eba8bf005d930d6fcda590da623725a8254e8f224f30 SHA512 569974b254bd1ffc50018bc66edac49bb0f2c07a8990caded28fdf24f5728b16df08cc20157f07e248eb960291ecf9c8f5782bc4e1701ce2e8631f0abcbd8164
-EBUILD bpftrace-0.17.0-r1.ebuild 1839 BLAKE2B f548b7564b9cdde46cab15d0038c3fb87674ad8663c958bdb4422a948484b9e5fcdd08fe5d2c77ed7a532206f7198728057b60a55cdb2f404625e0b28968dd97 SHA512 d4d2de19dc4e6da6fe447e0d29f094471b0b3e2733c84f868921bc2fd129d61a222935f22a7b2fb6d52dc8bce17053dc182848474edf19d32ee49331ed25ffad
+EBUILD bpftrace-0.17.0-r2.ebuild 1839 BLAKE2B f548b7564b9cdde46cab15d0038c3fb87674ad8663c958bdb4422a948484b9e5fcdd08fe5d2c77ed7a532206f7198728057b60a55cdb2f404625e0b28968dd97 SHA512 d4d2de19dc4e6da6fe447e0d29f094471b0b3e2733c84f868921bc2fd129d61a222935f22a7b2fb6d52dc8bce17053dc182848474edf19d32ee49331ed25ffad
 MISC metadata.xml 499 BLAKE2B ce7c46f4c5e49f2f779ff6584053f7fc78dffaeee432ac46a8881b3d49dc569e309af95aaf9d6e77a36ebc87be0cd2f86a5db7b733463e4252d3a242d914f293 SHA512 dfb827afd47feb8204ef40c940ebcc7d1b3217cdf0f24425e4ab32195309d727225e942d777871565e47a2c02244d053f46ed25165e9728c94e0683ff61bf4ce
diff --git a/dev-util/bpftrace/bpftrace-0.17.0-r1.ebuild b/dev-util/bpftrace/bpftrace-0.17.0-r1.ebuild
deleted file mode 100644
index f976f34e8416..000000000000
--- a/dev-util/bpftrace/bpftrace-0.17.0-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT=16
-
-inherit llvm linux-info cmake
-
-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}.gh.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-# remove keywords until build works:
-# https://github.com/iovisor/bpftrace/issues/2349
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="fuzzing test"
-
-# lots of fixing needed
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/libbpf-1.1:=
-	>=dev-util/bcc-0.25.0:=
-	>=sys-devel/llvm-10:=[llvm_targets_BPF(+)]
-	>=sys-devel/clang-10:=
-	<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="
-	app-arch/xz-utils
-	sys-devel/flex
-	sys-devel/bison
-	virtual/pkgconfig
-"
-
-QA_DT_NEEDED="
-	/usr/lib.*/libbpftraceresources.so
-	/usr/lib.*/libcxxdemangler_llvm.so
-"
-
-PATCHES=(
-	"${FILESDIR}/bpftrace-0.17.0-install-libs.patch"
-	"${FILESDIR}/bpftrace-0.15.0-dont-compress-man.patch"
-	"${FILESDIR}/bpftrace-0.11.4-old-kernels.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 mycmakeargs=(
-		-DSTATIC_LINKING:BOOL=OFF
-		# bug 809362, 754648
-		-DBUILD_TESTING:BOOL=$(usex test)
-		-DBUILD_FUZZ:BOOL=$(usex fuzzing)
-		-DENABLE_MAN:BOOL=OFF
-		-DUSE_SYSTEM_BPF_BCC:BOOL=ON
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# bug 809362
-	dostrip -x /usr/bin/bpftrace
-	doman man/man8/*.?
-}
diff --git a/dev-util/bpftrace/bpftrace-0.17.0-r2.ebuild b/dev-util/bpftrace/bpftrace-0.17.0-r2.ebuild
new file mode 100644
index 000000000000..f976f34e8416
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.17.0-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=16
+
+inherit llvm linux-info cmake
+
+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}.gh.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# remove keywords until build works:
+# https://github.com/iovisor/bpftrace/issues/2349
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="fuzzing test"
+
+# lots of fixing needed
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/libbpf-1.1:=
+	>=dev-util/bcc-0.25.0:=
+	>=sys-devel/llvm-10:=[llvm_targets_BPF(+)]
+	>=sys-devel/clang-10:=
+	<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="
+	app-arch/xz-utils
+	sys-devel/flex
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+QA_DT_NEEDED="
+	/usr/lib.*/libbpftraceresources.so
+	/usr/lib.*/libcxxdemangler_llvm.so
+"
+
+PATCHES=(
+	"${FILESDIR}/bpftrace-0.17.0-install-libs.patch"
+	"${FILESDIR}/bpftrace-0.15.0-dont-compress-man.patch"
+	"${FILESDIR}/bpftrace-0.11.4-old-kernels.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 mycmakeargs=(
+		-DSTATIC_LINKING:BOOL=OFF
+		# bug 809362, 754648
+		-DBUILD_TESTING:BOOL=$(usex test)
+		-DBUILD_FUZZ:BOOL=$(usex fuzzing)
+		-DENABLE_MAN:BOOL=OFF
+		-DUSE_SYSTEM_BPF_BCC:BOOL=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# bug 809362
+	dostrip -x /usr/bin/bpftrace
+	doman man/man8/*.?
+}
diff --git a/dev-util/bpftrace/files/bpftrace-0.17.0-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.17.0-install-libs.patch
index a884acc7ef28..7c14f8f9416e 100644
--- a/dev-util/bpftrace/files/bpftrace-0.17.0-install-libs.patch
+++ b/dev-util/bpftrace/files/bpftrace-0.17.0-install-libs.patch
@@ -213,10 +213,10 @@ index c776d204..41e84317 100644
  
  if(LIBPCAP_FOUND)
 diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt
-index d01d1ea3..7d96587f 100644
+index d01d1ea3..82bfeccc 100644
 --- a/src/arch/CMakeLists.txt
 +++ b/src/arch/CMakeLists.txt
-@@ -1,21 +1,21 @@
+@@ -1,21 +1,23 @@
  if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
 -    add_library(arch aarch64.cpp)
 +    add_library(bpftracearch aarch64.cpp)
@@ -246,6 +246,8 @@ index d01d1ea3..7d96587f 100644
  else()
    message(FATAL_ERROR "Unsupported architecture: ${CMAKE_SYSTEM_PROCESSOR}")
  endif()
++
++install(TARGETS bpftracearch LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt
 index c390ea6a..37019bd9 100644
 --- a/src/ast/CMakeLists.txt
-- 
cgit v1.2.3