gentoo resync : 05.12.2021

5 files changed, 54 insertions, 198 deletions

diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index e44fb6539631..958dae48c411 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,13 +1,11 @@
-AUX bpftrace-0.10.0-dont-compress-man.patch 722 BLAKE2B 583969e9f4457a49f17f33d984ab2585ec2e6f6976846af4d39084ce41bf334892b0971d1a1571e9495d4a05eea680412899d1fb23a8eb25a9b9cab84c3b101b SHA512 1f588dd589933c2fbb0ca79a5782c542cb137e748a442b9904153f76d142ae117755e1c24acfc50947e6040afbad78f31ef0c181082695f63ebb61b3acbe4b6a
 AUX bpftrace-0.11.4-old-kernels.patch 563 BLAKE2B 3b2afb997119188e7095b24ec459f4b5ae28626f6905c45f6510f84b7c6f28aa3b5174f1f48a30763990b2a3cc50c6336249fe1dc4cf31656871a8adce43c8d7 SHA512 332e6cc4d1c21e917451c9aa6028b082f53dde8221419ba45ad7ae6321e444b3f67ec8366cbd56638d8f8b68a3be06af892eba765c810744951af1de9b994113
 AUX bpftrace-0.12.0-fuzzing-build.patch 491 BLAKE2B 6fcc78660f69742247bedded028a4c18f933f32c424bb5d11976ff5ddbe16587948e6c75303e75daad440f2cd578fb1a4c3682ca34657a3d2b83a0f67843f994 SHA512 ab9f0b8115ac17130841e7d9b1ad59e5f2a6836acd48ab1d5c3fec45ce75a7833d033a37cb1ddcdd72cd794c202cdaeb287689f67bbb2a9baccb8628c3ff2a59
-AUX bpftrace-0.13.0-install-libs.patch 5716 BLAKE2B a50df0b1aa633aeea97af0c9db22729ef81af11722340bd8f10e3d66082e5ff002f2c73712667ba918cbcc51d194980dbf5ad95381102cecd218afa4a394bf31 SHA512 437af44d5953c1510e56aed3ee39c12ff2e06adb3c4fb16e335c4de1ba8dc2aff1f6fdf92cf2e1873ada4574b460b3d7788e5b52f9422c7bf66dfb92375dc7e0
+AUX bpftrace-0.14-libbpf-0.6.patch 619 BLAKE2B 5873130d6d9c58878b1b089c28d370175628e6bdd5cc360e37c67f2938175715d2babb07e94b77f07ba9fe32f9e45d1ef0403769e51db28ab4f6418217b3fdcc SHA512 f07ef4b5ef6205de4c0618fbec2972d260160ab64ff28088fba2fdb329be601cfb4560563939c22db44d8cc77669748e00e5ea0053d07509350781141c5b6ae5
 AUX bpftrace-0.14.0-dont-compress-man.patch 1760 BLAKE2B dc07764635e845729e684b0817ccda599824481b7a60f7b89f8a18081fedf84b003ffb06c0cd8c289d8100c58e9fb7959174a3cbd165f485169ecea38a9f19cb SHA512 386a4d6cd46973db42c43f6790ffda165b8697feb576d14e95631a2f1bb26aca37c67ae0ee6f09be5983aa292653dac496a1f207de5e36dfcf986bb78b614bb1
 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.13.0.tar.gz 952412 BLAKE2B 8e3f6f28b0c652e2257e1a970b80b87ba5ac5e94dc26719bffe16a0bbff48efc2b9ab5bc03e5fe4b764f5c9c3df16039d931f1f13c1f14327880838a373edacc SHA512 16b3f11c365cc7e306045a5cb6bcf6c66b92d746884f6587ce7cc4c76841b284757bff7b38b9838eb3db129e996e4f1b13afec34da57981362dadef8460816d0
 DIST bpftrace-0.14.0.tar.gz 991314 BLAKE2B 3222068d7f84c13f736197cef2d188fa31a25db6bd266afe5cbacb1c062155b5ebd5d0310fbad56c15574a795766a33b12624f0252b0bc0677bf05324f414df5 SHA512 78f2d9a4d54c0dda1947b924a828777b402befc3a05031b609da4d256907df1e64f946454a9be7317449f49706f02a881febc4e63d2ef2f4e76924ea19e36ddb
-EBUILD bpftrace-0.13.0-r1.ebuild 1701 BLAKE2B 26ac82532abf6d1b194f7770dec7c9b6fa8e137ad1927924e02c84339fe0765b3942c8f8fd28b1564ff44afd26653a8abb10d230d56ed9606648633606791bcb SHA512 b800a79a0aa70c5acb8fd4f9b37cae9d99c82684063ec5544f537c0128cb21f490c062b8ae539f08ed28dcac4db75eac5b8c1b4e5274b7156fbffe182d0f18fc
 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 1872 BLAKE2B ab91e1a581b24ad5faed9b9d056e22c7cfa54450b667918832612fc9c48f7f8c7ec36aa93d897978052b4be9b42bc13a0df4d1c04c443101c29b9974e18eafce SHA512 fc410d7e3bc21c2db26d8659b25da5b2da4a6385beccd25489eff2cb705e84e38247daa671fde8765c72a38bde62e13ab1e1aa6fccba1fe03346a205df7baffa
 MISC metadata.xml 499 BLAKE2B ce7c46f4c5e49f2f779ff6584053f7fc78dffaeee432ac46a8881b3d49dc569e309af95aaf9d6e77a36ebc87be0cd2f86a5db7b733463e4252d3a242d914f293 SHA512 dfb827afd47feb8204ef40c940ebcc7d1b3217cdf0f24425e4ab32195309d727225e942d777871565e47a2c02244d053f46ed25165e9728c94e0683ff61bf4ce
diff --git a/dev-util/bpftrace/bpftrace-0.13.0-r1.ebuild b/dev-util/bpftrace/bpftrace-0.14.0-r4.ebuild
index bf4eda842dfa..0aeeffbf10f6 100644
--- a/dev-util/bpftrace/bpftrace-0.13.0-r1.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.14.0-r4.ebuild
@@ -3,59 +3,56 @@
 
 EAPI=7
 
+LLVM_MAX_SLOT=13
+
 inherit llvm linux-info cmake
 
 DESCRIPTION="High-level tracing language for eBPF"
 HOMEPAGE="https://github.com/iovisor/bpftrace"
-
-if [[ ${PV} =~ 9{4,} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/iovisor/${PN}"
-	BDEPEND=""
-else
-	MY_PV="${PV//_/}"
-	SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	BDEPEND="app-arch/xz-utils "
-fi
+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"
 
-COMMON_DEPEND="
+RDEPEND="
 	dev-libs/libbpf:=
 	>=dev-util/bcc-0.13.0:=
 	dev-util/systemtap
-	>=sys-devel/llvm-6:=[llvm_targets_BPF(+)]
-	<=sys-devel/llvm-13:=[llvm_targets_BPF(+)]
-	<=sys-devel/clang-13:=
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)]
 	sys-libs/binutils-libs:=
-	virtual/libelf
+	virtual/libelf:=
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/cereal:=
 	test? ( dev-cpp/gtest )
 "
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND+="
-	>=dev-util/cmake-3.8
+BDEPEND="
+	sys-apps/sed
+	app-arch/xz-utils
 	sys-devel/flex
 	sys-devel/bison
+	virtual/pkgconfig
 "
 
-S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
 QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
 
 PATCHES=(
-	"${FILESDIR}/bpftrace-0.13.0-install-libs.patch"
-	"${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch"
+	"${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"
 )
 
-# lots of fixing needed
-RESTRICT="test"
-
 pkg_pretend() {
 	local CONFIG_CHECK="
 		~BPF
@@ -70,19 +67,26 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	LLVM_MAX_SLOT=12 llvm_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
+	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="$(pkg-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/*.?
+}
diff --git a/dev-util/bpftrace/files/bpftrace-0.10.0-dont-compress-man.patch b/dev-util/bpftrace/files/bpftrace-0.10.0-dont-compress-man.patch
deleted file mode 100644
index 750ed4f712a3..000000000000
--- a/dev-util/bpftrace/files/bpftrace-0.10.0-dont-compress-man.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/man/man8/CMakeLists.txt b/man/man8/CMakeLists.txt
-index f1fc334..7ee58ed 100644
---- a/man/man8/CMakeLists.txt
-+++ b/man/man8/CMakeLists.txt
-@@ -1,12 +1,3 @@
--find_program(GZIP gzip)
- file(GLOB FILES *.8)
--set(GZFILES "")
--foreach(FIL ${FILES})
--  get_filename_component(NAME ${FIL} NAME)
--  add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz
--    COMMAND ${GZIP} -c ${FIL} > ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz
--    DEPENDS ${FIL})
--  list(APPEND GZFILES "${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz")
--endforeach()
- add_custom_target(man ALL DEPENDS ${GZFILES})
--install(FILES ${GZFILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
-+install(FILES ${FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
diff --git a/dev-util/bpftrace/files/bpftrace-0.13.0-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.13.0-install-libs.patch
deleted file mode 100644
index fb75f9db1ba3..000000000000
--- a/dev-util/bpftrace/files/bpftrace-0.13.0-install-libs.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e33bb1ca..52e1fa25 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -100,9 +100,10 @@ find_package(FLEX REQUIRED)
- bison_target(bison_parser src/parser.yy ${CMAKE_BINARY_DIR}/parser.tab.cc VERBOSE)
- flex_target(flex_lexer src/lexer.l ${CMAKE_BINARY_DIR}/lex.yy.cc)
- add_flex_bison_dependency(flex_lexer bison_parser)
--add_library(parser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS})
--target_compile_options(parser PRIVATE "-w")
--target_include_directories(parser PUBLIC src src/ast ${CMAKE_BINARY_DIR})
-+add_library(bpftraceparser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS})
-+target_compile_options(bpftraceparser PRIVATE "-w")
-+target_include_directories(bpftraceparser PUBLIC src src/ast ${CMAKE_BINARY_DIR})
-+install(TARGETS bpftraceparser LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- include(CheckSymbolExists)
- set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
-diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
-index a95c60a1..f5c4d676 100644
---- a/resources/CMakeLists.txt
-+++ b/resources/CMakeLists.txt
-@@ -1,6 +1,7 @@
--add_library(resources headers.cpp)
-+add_library(bpftraceresources headers.cpp)
- 
--target_include_directories(resources PUBLIC ../src)
-+target_include_directories(bpftraceresources PUBLIC ../src)
-+install(TARGETS bpftraceresources LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- function(embed_headers output)
-   file(WRITE ${output} "#include \"headers.h\"\n\nnamespace bpftrace {\n")
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 0361cdaa..f9c536a3 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -49,6 +49,7 @@ add_executable(${BPFTRACE}
- )
- 
- install(TARGETS ${BPFTRACE} DESTINATION ${CMAKE_INSTALL_BINDIR})
-+install(TARGETS libbpftrace LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
- target_link_libraries(${BPFTRACE} libbpftrace)
- 
- if (BUILD_FUZZ)
-@@ -109,7 +110,7 @@ if(STATIC_LINKING)
- endif(STATIC_LINKING)
- 
- 
--target_link_libraries(libbpftrace parser resources ast arch)
-+target_link_libraries(libbpftrace bpftraceparser bpftraceresources bpftraceast bpftracearch)
- 
- if (LIBBPF_BTF_DUMP_FOUND)
-   target_include_directories(libbpftrace PUBLIC ${LIBBPF_INCLUDE_DIRS})
-diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt
-index 76bb217e..4ad0f626 100644
---- a/src/arch/CMakeLists.txt
-+++ b/src/arch/CMakeLists.txt
-@@ -1,15 +1,17 @@
- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
--    add_library(arch aarch64.cpp)
-+    add_library(bpftracearch aarch64.cpp)
- elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR
-        CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
--    add_library(arch ppc64.cpp)
-+    add_library(bpftracearch ppc64.cpp)
- elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "s390" OR
-        CMAKE_SYSTEM_PROCESSOR STREQUAL "s390x")
--    add_library(arch s390.cpp)
-+    add_library(bpftracearch s390.cpp)
- elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
--    add_library(arch x86_64.cpp)
-+    add_library(bpftracearch x86_64.cpp)
- elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "mips64")
--    add_library(arch mips64.cpp)
-+    add_library(bpftracearch mips64.cpp)
- 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 5234388c..8b40faaa 100644
---- a/src/ast/CMakeLists.txt
-+++ b/src/ast/CMakeLists.txt
-@@ -1,4 +1,4 @@
--add_library(ast
-+add_library(bpftraceast
-   ast.cpp
-   attachpoint_parser.cpp
-   codegen_llvm.cpp
-@@ -13,17 +13,18 @@ add_library(ast
-   signal.cpp
-   visitors.cpp
- )
-+install(TARGETS bpftraceast LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
--target_include_directories(ast PUBLIC ${CMAKE_SOURCE_DIR}/src)
--target_include_directories(ast PUBLIC ${CMAKE_SOURCE_DIR}/src/ast)
--target_include_directories(ast PUBLIC ${CMAKE_BINARY_DIR})
--target_link_libraries(ast arch)
-+target_include_directories(bpftraceast PUBLIC ${CMAKE_SOURCE_DIR}/src)
-+target_include_directories(bpftraceast PUBLIC ${CMAKE_SOURCE_DIR}/src/ast)
-+target_include_directories(bpftraceast PUBLIC ${CMAKE_BINARY_DIR})
-+target_link_libraries(bpftraceast bpftracearch)
- 
- if (HAVE_BCC_KFUNC)
--  target_compile_definitions(ast PRIVATE HAVE_BCC_KFUNC)
-+  target_compile_definitions(bpftraceast PRIVATE HAVE_BCC_KFUNC)
- endif(HAVE_BCC_KFUNC)
- 
--add_dependencies(ast parser)
-+add_dependencies(bpftraceast bpftraceparser)
- 
- if (STATIC_LINKING)
-   set(clang_libs
-@@ -54,11 +55,11 @@ if (STATIC_LINKING)
- 
- 
-   if(EMBED_USE_LLVM)
--    target_link_libraries(ast "-Wl,--start-group" ${CLANG_EMBEDDED_CMAKE_TARGETS} ${LLVM_EMBEDDED_CMAKE_TARGETS} "-Wl,--end-group")
-+    target_link_libraries(bpftraceast "-Wl,--start-group" ${CLANG_EMBEDDED_CMAKE_TARGETS} ${LLVM_EMBEDDED_CMAKE_TARGETS} "-Wl,--end-group")
-   else()
-     llvm_map_components_to_libnames(llvm_libs ${llvm_lib_names})
--    target_link_libraries(ast ${clang_libs})
--    target_link_libraries(ast ${llvm_libs})
-+    target_link_libraries(bpftraceast ${clang_libs})
-+    target_link_libraries(bpftraceast ${llvm_libs})
-   endif()
- 
-   if(STATIC_LIBC)
-@@ -68,11 +69,11 @@ if (STATIC_LINKING)
- else()
-   find_library(found_LLVM LLVM HINTS ${LLVM_LIBRARY_DIRS})
-   if(found_LLVM)
--    target_link_libraries(ast LLVM)
-+    target_link_libraries(bpftraceast LLVM)
-   else()
-     llvm_map_components_to_libnames(_llvm_libs bpfcodegen ipo irreader mcjit orcjit ${LLVM_TARGETS_TO_BUILD})
-     llvm_expand_dependencies(llvm_libs ${_llvm_libs})
--    target_link_libraries(ast ${llvm_libs})
-+    target_link_libraries(bpftraceast ${llvm_libs})
-   endif()
--  target_link_libraries(ast libclang)
-+  target_link_libraries(bpftraceast libclang)
- endif()
diff --git a/dev-util/bpftrace/files/bpftrace-0.14-libbpf-0.6.patch b/dev-util/bpftrace/files/bpftrace-0.14-libbpf-0.6.patch
new file mode 100644
index 000000000000..e4a383dd69fc
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.14-libbpf-0.6.patch
@@ -0,0 +1,17 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 47a050e2..5dd5ff3f 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -123,10 +123,8 @@ endif(STATIC_LINKING)
+ 
+ target_link_libraries(libbpftrace parser resources runtime aot ast arch cxxdemangler_llvm)
+ 
+-if (LIBBPF_BTF_DUMP_FOUND)
+-  target_include_directories(runtime PUBLIC ${LIBBPF_INCLUDE_DIRS})
+-  target_link_libraries(runtime ${LIBBPF_LIBRARIES})
+-endif(LIBBPF_BTF_DUMP_FOUND)
++target_include_directories(runtime PUBLIC ${LIBBPF_INCLUDE_DIRS})
++target_link_libraries(runtime ${LIBBPF_LIBRARIES})
+ 
+ if(HAVE_BFD_DISASM)
+   if(STATIC_LINKING)