gentoo resync : 15.12.2019

6 files changed, 39 insertions, 120 deletions

diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 5320415ff610..ebec8b950f0f 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,12 +1,9 @@
 AUX bpftrace-0.10_pre20190614-install-libs.patch 4653 BLAKE2B 66229e4b3f7edc345eeac5f833348f7a434ee7f6c830c344b3c357fafec98b8cc8c725cf37ee01802d085cdbf9deb0fa13d9dd72161b230aff589c75b17890a3 SHA512 63f899bd119f86ee6e9bae0c2ef6e657a37a33c700414ea4757353f0637e89ef9ed3dbf1b70414eec1a5c2658451e8be3e7de1941a0796cac621361bcdd14537
-AUX bpftrace-0.9-llvm-8.patch 1306 BLAKE2B ef6c7cfd58f6683d3a234fef6a5aae6a8136b04e1ee5c14db76c62490f6b487ddb06465be16df4fda7cc92e2cfa1d97129e7e1e852a26468e24f8059314f13a6 SHA512 4067aee17715312cf49dc3510754d6aaaa4dba25dfb802dc434d068bf5f35135aca2c107b2463044e5f88890ac20c1ba97eff604616913f5246c57eda3aed7ee
-AUX bpftrace-0.9_pre20190311-install-libs.patch 4453 BLAKE2B d8b552a04fa4815c8b2209c57ad9dbecb3938531ef3c6ad481d5ec034e8a8aff323f29acfa920f00d612a2f859b0b03272955384c06ee5051d7c8844163fdae6 SHA512 0fe1ea870b5a963ac040a7a636cd0255e60577bd7e9aa6080e40116c964c4a4bc1b5858290c2f381916433504bf28118f9b03089fb0baee32085aad104b1621c
+AUX bpftrace-0.9.3-install-libs.patch 5117 BLAKE2B 6cad778dd19ab040f3bd88390329cc49261c83dcc0ff97f9e663d5fb0d55da87d0e4c1efaabbd31b11e383ea0f904fdab8bd7f34fbdd0805abe20d623673c1fc SHA512 0842712b8d32ba4f7bc0767e3748ed4e8517187c9c75d426e1946aacce3a46fd5f7100d4cef0bed655a763d102cfeff160d549065f6b9c6000a7b3f496cb8b87
 AUX bpftrace-mandir.patch 906 BLAKE2B d875e2523b7e719624d92c58a8f058cdd597da07bf6472d2e3dc05eb46be64718ed4056e15a93e4c22264fa35ceb6b79b428febade422ba435a2a2b9e17fb707 SHA512 11544e9e5892ae3657ff903fa2780e71223e380322b4059ddcea4a6edd80c5a7ab8d45188eb577127f64a6705a6ae41d53f3ba7e05bf450853b12a9ba3d84904
-DIST bpftrace-0.9.1.tar.gz 704365 BLAKE2B 03c73eac9cc116df916536239124a6a649aa1a390c97848baedaf5b329f5eda8752c9e39053e741a485d623240954f6659099f0c0ab65cc4bbf00fc6e52d0b46 SHA512 e813c598b3acb85d94e1cb02f75b5fa849f10ee1cc39fb73e843a797946d7642463bcc3d083ff377d68b9e2a1aabb56995ab4ebe2be822f4f393448c7f02ca4b
 DIST bpftrace-0.9.2.tar.gz 715019 BLAKE2B 1f20998bd379b91cb46d7e856a5d892e0de7ad6d9f85cb657fcf6a0c879167c0931d28c78e4be98adab349144fe0bc99871cf70556dd1998e5b8f918fa1702e3 SHA512 5c6ee5fec690a907c370ed0bed85906d304215d7f97b99a2cae90453061f522fa6369627c9524a5a24e97c6cbb595a880a2a1b1d71095fffb693a4cef172a6f0
-DIST bpftrace-0.9.tar.gz 668655 BLAKE2B 650756ed7334cb92a64adc36a0bd86fff5c16c53fb94d57cc570dd3cd893d467e754da80c98da36c1ec1d14327fa6025b194d963e4a2d1bec99ebb868555b6bc SHA512 771c412a6b1ee7a7d5bba9e0910633056c6f5523e5d1efd9d7ccb5b9f9b462b7bda8d170c5ed0653f3c1bfd5cc77fce2fd552f12eb8222a8747620b3dc9b49f8
-EBUILD bpftrace-0.9-r1.ebuild 1369 BLAKE2B dc88a0672c969716d83aba591e99c477dee5527faa60bf418fe8547b5d86286d743ef04e673e0aeae418f3bab34da0768b2d3575f0a9ae84a8467180931ab903 SHA512 6865fad28da5145dc206c42a52e99efa372f1380751980b0210a0cb0e62bcde7be2cb3ddccd0724b9c9de1ffc4aac075e61df4b2fd8441b8adbb7183070e126a
-EBUILD bpftrace-0.9.1.ebuild 1402 BLAKE2B 539e79098fd31d8ade5449f53e9b63d4c8b3ecd3e2716eab76f8a7eab00e11480224502369899f68eb839c9cb48cebc1f5fd6d6c231f93a4a16d58e19e973171 SHA512 9021699f98686a48954e39d653797b10d68cc56b284bdc77a58778dec41c20617031b1ccf8e15283a6b630b366856f6ec0d1013c6150709cc37f25d786f289db
+DIST bpftrace-0.9.3.tar.gz 743506 BLAKE2B d00708bcebaf7f039788dfc52f4a0bb501bb3c52e8b789060f824652b3917ea3950d77dbc7bee04da013f4b552338251bda9781d19a03ec227208b943fded232 SHA512 49b12735fe2fbf4f72d3d0c0372a7a570c7abc92d1f626624d591a863009c8bfabdf86825f133885800c7ea293773651be66e4c792f9cd397f82d250a7af83be
 EBUILD bpftrace-0.9.2.ebuild 1402 BLAKE2B 539e79098fd31d8ade5449f53e9b63d4c8b3ecd3e2716eab76f8a7eab00e11480224502369899f68eb839c9cb48cebc1f5fd6d6c231f93a4a16d58e19e973171 SHA512 9021699f98686a48954e39d653797b10d68cc56b284bdc77a58778dec41c20617031b1ccf8e15283a6b630b366856f6ec0d1013c6150709cc37f25d786f289db
-EBUILD bpftrace-9999.ebuild 1350 BLAKE2B 76883153a41d52398860f2868517d2e6d2445547fdc2d3770d3988bc25d9dde5c709c1130b814c1cf312d632ee0c62fd40b348e0bc8a1f27dd356a0ab242ab81 SHA512 ba62b663bc23618228ce110fe4390414a463dec185fe1b2760d54073e61625264a08d305b65b0de2721a6d62e0f7488e6ca2abe7e31c36258864c01dbc82786e
+EBUILD bpftrace-0.9.3.ebuild 1391 BLAKE2B db3f13374aeac65bc6bbaccc6ae187c6f601c753d7b426562dad7af055c1c4a32965abd1a4d8100eddf96cc6b5cac8c1d839cbc4c9cd2ba4822f83c23bcb6c2c SHA512 1fc37e191621ba5c63d43e55f772b505eddff423f37d3697061a4a03000a5bbc8086cb5e4df87c98d080317213581058128b4a5a40c807e5034e6786ca8d37ee
+EBUILD bpftrace-9999.ebuild 1339 BLAKE2B 89932b8689799d37f5730662705d644059796e27abbb187e57f741450dbf1034d5322f3e94a4a493f0341f939fcc3902e3173d8b2357c70695c3f3dd957d7db5 SHA512 b7df8cb8af0c74599fb87a32ff1efff499e3559682c72fea78ea5d53e9513f0738fff86acbc91c54b21e3b20ba0e0ccea8f559e7d80f359e45e8448a7fa94000
 MISC metadata.xml 308 BLAKE2B 5440fafa478bdbdf6906c74d697a9542deb8b13b76527a380df723562759d914d597dff029f93ba4567ce4e0f4723fded5a13ea7d2032752253bad1906e753dc SHA512 c27c2ef4795e9167ea133e0c0e2c6d67425d6db754bd563d9cb7a791b4a155ebe855ad0e67c2b29235a9b9761f29dbb14958b124c95a1aaddb97801c763914ba
diff --git a/dev-util/bpftrace/bpftrace-0.9-r1.ebuild b/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
deleted file mode 100644
index 74351e85e8c4..000000000000
--- a/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs linux-info cmake-utils
-
-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
-	SRC_URI="https://github.com/iovisor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	BDEPEND="app-arch/xz-utils "
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-COMMON_DEPEND="sys-devel/clang:=
-	dev-libs/libbpf:=
-	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
-	>=dev-util/bcc-0.9.0:=
-	virtual/libelf"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-cpp/gtest )"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND+="dev-util/cmake
-	sys-devel/flex
-	sys-devel/bison"
-
-QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
-
-PATCHES=(
-	"${FILESDIR}/bpftrace-0.9_pre20190311-install-libs.patch"
-	"${FILESDIR}/bpftrace-mandir.patch"
-	"${FILESDIR}/bpftrace-0.9-llvm-8.patch"
-)
-
-# lots of fixing needed
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~BPF_JIT ~BPF_EVENTS"
-
-	check_extra_config
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local -a mycmakeargs
-	mycmakeargs=(
-		"-DSTATIC_LINKING:BOOL=OFF"
-		"-DBUILD_TESTING:BOOL=OFF"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-util/bpftrace/bpftrace-0.9.1.ebuild b/dev-util/bpftrace/bpftrace-0.9.3.ebuild
index 5fcb41040f5d..74f1dd849d2c 100644
--- a/dev-util/bpftrace/bpftrace-0.9.1.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.9.3.ebuild
@@ -40,7 +40,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
 
 PATCHES=(
-	"${FILESDIR}/bpftrace-0.10_pre20190614-install-libs.patch"
+	"${FILESDIR}/bpftrace-0.9.3-install-libs.patch"
 	"${FILESDIR}/bpftrace-mandir.patch"
 )
 
diff --git a/dev-util/bpftrace/bpftrace-9999.ebuild b/dev-util/bpftrace/bpftrace-9999.ebuild
index 659b5f9766a9..ccad41e9941b 100644
--- a/dev-util/bpftrace/bpftrace-9999.ebuild
+++ b/dev-util/bpftrace/bpftrace-9999.ebuild
@@ -38,7 +38,7 @@ BDEPEND+="dev-util/cmake
 QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
 
 PATCHES=(
-	"${FILESDIR}/bpftrace-0.10_pre20190614-install-libs.patch"
+	"${FILESDIR}/bpftrace-0.9.3-install-libs.patch"
 	"${FILESDIR}/bpftrace-mandir.patch"
 )
 
diff --git a/dev-util/bpftrace/files/bpftrace-0.9-llvm-8.patch b/dev-util/bpftrace/files/bpftrace-0.9-llvm-8.patch
deleted file mode 100644
index 14d6a167a863..000000000000
--- a/dev-util/bpftrace/files/bpftrace-0.9-llvm-8.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/src/bpforc.h b/src/bpforc.h
-index a6ee583..8d0e579 100644
---- a/src/bpforc.h
-+++ b/src/bpforc.h
-@@ -80,8 +80,13 @@ class BpfOrc
-   ExecutionSession ES;
-   std::unique_ptr<TargetMachine> TM;
-   std::shared_ptr<SymbolResolver> Resolver;
-+#if LLVM_VERSION_MAJOR >= 8
-+  LegacyRTDyldObjectLinkingLayer ObjectLayer;
-+  LegacyIRCompileLayer<decltype(ObjectLayer), SimpleCompiler> CompileLayer;
-+#else
-   RTDyldObjectLinkingLayer ObjectLayer;
-   IRCompileLayer<decltype(ObjectLayer), SimpleCompiler> CompileLayer;
-+#endif
-
- public:
-   std::map<std::string, std::tuple<uint8_t *, uintptr_t>> sections_;
-@@ -91,7 +96,11 @@ class BpfOrc
-       Resolver(createLegacyLookupResolver(ES,
-         [](const std::string &Name __attribute__((unused))) -> JITSymbol { return nullptr; },
-         [](Error Err) { cantFail(std::move(Err), "lookup failed"); })),
-+#if LLVM_VERSION_MAJOR >= 8
-+      ObjectLayer(ES, [this](VModuleKey) { return LegacyRTDyldObjectLinkingLayer::Resources{std::make_shared<MemoryManager>(sections_), Resolver}; }),
-+#else
-       ObjectLayer(ES, [this](VModuleKey) { return RTDyldObjectLinkingLayer::Resources{std::make_shared<MemoryManager>(sections_), Resolver}; }),
-+#endif
-       CompileLayer(ObjectLayer, SimpleCompiler(*TM)) {}
-
-   void compileModule(std::unique_ptr<Module> M) {
diff --git a/dev-util/bpftrace/files/bpftrace-0.9_pre20190311-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.9.3-install-libs.patch
index 68bd82559443..0ddb07b47408 100644
--- a/dev-util/bpftrace/files/bpftrace-0.9_pre20190311-install-libs.patch
+++ b/dev-util/bpftrace/files/bpftrace-0.9.3-install-libs.patch
@@ -1,9 +1,9 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8ff6e1f..a276ba2 100644
+index 5e0d770..d51edf6 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -43,9 +43,10 @@ find_package(FLEX REQUIRED)
- bison_target(bison_parser src/parser.yy ${CMAKE_BINARY_DIR}/parser.tab.cc)
+@@ -51,9 +51,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})
@@ -31,25 +31,25 @@ index b8b0d96..0803c1e 100644
  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 b47f66d..36de26b 100644
+index 65f3a34..b001a83 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -27,7 +27,8 @@ endif(HAVE_BCC_CREATE_MAP)
- if(HAVE_GET_CURRENT_CGROUP_ID)
-   target_compile_definitions(bpftrace PRIVATE HAVE_GET_CURRENT_CGROUP_ID)
- endif(HAVE_GET_CURRENT_CGROUP_ID)
+@@ -56,7 +56,8 @@ if (ALLOW_UNSAFE_UPROBE)
+   target_compile_definitions(bpftrace PRIVATE HAVE_UNSAFE_UPROBE)
+ endif(ALLOW_UNSAFE_UPROBE)
+ 
 -target_link_libraries(bpftrace arch ast parser resources)
 +target_link_libraries(bpftrace bpftracearch bpftraceast bpftraceparser
-+	bpftraceresources)
++  bpftraceresources)
  
  if (STATIC_LINKING)
    target_link_libraries(bpftrace ${LIBBCC_LIBRARIES})
 diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt
-index 425926e..13b5d31 100644
+index a26f610..53627e2 100644
 --- a/src/arch/CMakeLists.txt
 +++ b/src/arch/CMakeLists.txt
 @@ -1,5 +1,7 @@
- if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64")
+ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
 -    add_library(arch aarch64.cpp)
 +    add_library(bpftracearch aarch64.cpp)
  else()
@@ -59,7 +59,7 @@ index 425926e..13b5d31 100644
 +
 +install(TARGETS bpftracearch LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt
-index 64db7b9..1a2eb6e 100644
+index 4d77c9f..2a00572 100644
 --- a/src/ast/CMakeLists.txt
 +++ b/src/ast/CMakeLists.txt
 @@ -1,4 +1,4 @@
@@ -68,10 +68,14 @@ index 64db7b9..1a2eb6e 100644
    ast.cpp
    codegen_llvm.cpp
    irbuilderbpf.cpp
-@@ -6,12 +6,13 @@ add_library(ast
-   semantic_analyser.cpp
+@@ -7,15 +7,16 @@ add_library(ast
  )
  
+ if(HAVE_GET_CURRENT_CGROUP_ID)
+-  target_compile_definitions(ast PRIVATE HAVE_GET_CURRENT_CGROUP_ID)
++  target_compile_definitions(bpftraceast PRIVATE HAVE_GET_CURRENT_CGROUP_ID)
+ endif(HAVE_GET_CURRENT_CGROUP_ID)
+ 
 -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})
@@ -87,7 +91,7 @@ index 64db7b9..1a2eb6e 100644
  
  if (STATIC_LINKING)
    set(clang_libs
-@@ -31,16 +32,16 @@ if (STATIC_LINKING)
+@@ -35,16 +36,16 @@ if (STATIC_LINKING)
        clangSerialization
        clangToolingCore)
    llvm_map_components_to_libnames(llvm_libs bpfcodegen ipo irreader mcjit orcjit ${LLVM_TARGETS_TO_BUILD})
@@ -109,3 +113,17 @@ index 64db7b9..1a2eb6e 100644
 -  target_link_libraries(ast libclang)
 +  target_link_libraries(bpftraceast libclang)
  endif()
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 2d18277..f66a8b7 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -76,7 +76,8 @@ if(HAVE_BFD_DISASM)
+   target_link_libraries(bpftrace_test ${LIBOPCODES_LIBRARIES})
+ endif(HAVE_BFD_DISASM)
+ 
+-target_link_libraries(bpftrace_test arch ast parser resources)
++target_link_libraries(bpftrace_test bpftracearch bpftraceast bpftraceparser
++  bpftraceresources)
+ 
+ if (STATIC_LINKING)
+   target_link_libraries(bpftrace_test ${LIBBCC_LIBRARIES})