dev-util/bpftrace: Remove old

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>

8 files changed, 3 insertions, 416 deletions

diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 04ce369b610f..6aab218fe7ed 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,5 +1 @@
-DIST bpftrace-0.10.0.tar.gz 835854 BLAKE2B 623369bb2a2ad8d5eec364afa98bdae3fbe5e66182d8f1187fe86a8bd70ee357a554eb063fdbe5476eab23912adf2cf027092cac3e6989d8f716e91aa5d01212 SHA512 da400efe78cea505a32deead594b047ec4394d3eefe86e7b6853fe2dc715c5847a3abcbd26c1fac39d0a534f1e57d6c0bc3625e0c3f1054b0d84b7b1d6eb69b9
-DIST bpftrace-0.11.0.tar.gz 867444 BLAKE2B a99255befadea0b4cb54299a8318c0a7a667ac2258b612750705b4d351ac59f4411f2567bc0100929291e3c9756d276671e41af9d398b118b3d486dace2953d7 SHA512 32bf0c23a7b0e1a57d0e0b8fc845a9e184e201ac3f6018a3d3cee8c97096093b333578cb898ede02fb3ab8d55ba9bcd2bb67ac70b81a49461c0f6e5c03c2a6f5
-DIST bpftrace-0.11.1.tar.gz 867481 BLAKE2B d77e69e21a1cdd65c610b57a8e16d02ff2da69bbb6fd207ff312d2ee3dd4ccbaded205e4b9f16a7ff24177fbc227304ffbb447cd974f44c7828d54f38ad573d5 SHA512 361cedc6ce8a950188717db5ffd005b9709371010810cf6bc870ca945c1db9bdc7ab99b55b694345d580d03145b3eb6ca169f2f1f9909f3e9fc34250df9999f3
-DIST bpftrace-0.11.2.tar.gz 867724 BLAKE2B 6d0a10c8a4261277fc3a6e5f422e26238673dcd76abcae6bd8079cc98ee713d3d34d3e09284f5c79ba323d7203d6d944999da17f73ab2afbf1d403cb0dd1a392 SHA512 25bcc9863d24646108252f0010b96afb823eb795c8c6d94112b7804740d7688139ead7d862a205a1b44b86ef135b412e533fc119939ce550e5509b1bd37952fa
 DIST bpftrace-0.11.3.tar.gz 867967 BLAKE2B 950362e4a4c0f61d67056eacfde0b54a9be9b65285b243cbbb137d113020868f01b1792fddaffbaf41ed174b47cd2f197c0aa89f78690d3e71dae4b7a4c05e3e SHA512 76f6b19ce2a2f3989ebafc49a4df337c6b5f3acf39e7415846b16ee08e2fa7a59821cd18de3c9ed29420b323de8458d1411ccf801e9cd5f3ac64f2bd981e2c3c
diff --git a/dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild b/dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild
deleted file mode 100644
index 26c1753afef8..000000000000
--- a/dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 2019-2020 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
-	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
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-COMMON_DEPEND="dev-util/systemtap
-	sys-devel/clang:=
-	dev-libs/libbpf:=
-	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
-	<sys-devel/clang-10:=
-	<sys-devel/llvm-10:=[llvm_targets_BPF(+)]
-	>=dev-util/bcc-0.12.0:=
-	virtual/libelf"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-cpp/gtest )"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND+="dev-util/cmake
-	sys-devel/flex
-	sys-devel/bison"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
-
-PATCHES=(
-	"${FILESDIR}/bpftrace-0.10.0-install-libs.patch"
-	"${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch"
-	"${FILESDIR}/bpftrace-0.10.0-llvm-multi.patch"
-	# bpf_detach_kfunc has always been a noop
-	"${FILESDIR}/bpftrace-0.10.0-no-bpf_detach_kfunc.patch"
-)
-
-# lots of fixing needed
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="
-		~BPF
-		~BPF_EVENTS
-		~BPF_JIT
-		~BPF_SYSCALL
-		~FTRACE_SYSCALLS
-		~HAVE_EBPF_JIT
-	"
-
-	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.11.0-r1.ebuild b/dev-util/bpftrace/bpftrace-0.11.0-r1.ebuild
deleted file mode 100644
index 6eeeb6c28d67..000000000000
--- a/dev-util/bpftrace/bpftrace-0.11.0-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs 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
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-COMMON_DEPEND="
-	dev-util/systemtap
-	sys-devel/clang:=
-	dev-libs/libbpf:=
-	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
-	sys-devel/clang:=
-	>=dev-util/bcc-0.13.0:=
-	virtual/libelf
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-cpp/gtest )
-"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND+="
-	>=dev-util/cmake-3.8
-	sys-devel/flex
-	sys-devel/bison
-"
-
-S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
-QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
-
-PATCHES=(
-	"${FILESDIR}/bpftrace-0.11.0-install-libs.patch"
-	"${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch"
-)
-
-# lots of fixing needed
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="
-		~BPF
-		~BPF_EVENTS
-		~BPF_JIT
-		~BPF_SYSCALL
-		~FTRACE_SYSCALLS
-		~HAVE_EBPF_JIT
-	"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=11 llvm_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local -a mycmakeargs
-	mycmakeargs=(
-		"-DSTATIC_LINKING:BOOL=OFF"
-		"-DBUILD_TESTING:BOOL=OFF"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/bpftrace/bpftrace-0.11.1.ebuild b/dev-util/bpftrace/bpftrace-0.11.1.ebuild
deleted file mode 100644
index 6eeeb6c28d67..000000000000
--- a/dev-util/bpftrace/bpftrace-0.11.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs 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
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-COMMON_DEPEND="
-	dev-util/systemtap
-	sys-devel/clang:=
-	dev-libs/libbpf:=
-	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
-	sys-devel/clang:=
-	>=dev-util/bcc-0.13.0:=
-	virtual/libelf
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-cpp/gtest )
-"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND+="
-	>=dev-util/cmake-3.8
-	sys-devel/flex
-	sys-devel/bison
-"
-
-S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
-QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
-
-PATCHES=(
-	"${FILESDIR}/bpftrace-0.11.0-install-libs.patch"
-	"${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch"
-)
-
-# lots of fixing needed
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="
-		~BPF
-		~BPF_EVENTS
-		~BPF_JIT
-		~BPF_SYSCALL
-		~FTRACE_SYSCALLS
-		~HAVE_EBPF_JIT
-	"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=11 llvm_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local -a mycmakeargs
-	mycmakeargs=(
-		"-DSTATIC_LINKING:BOOL=OFF"
-		"-DBUILD_TESTING:BOOL=OFF"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/bpftrace/bpftrace-0.11.2.ebuild b/dev-util/bpftrace/bpftrace-0.11.2.ebuild
deleted file mode 100644
index 263e993188ec..000000000000
--- a/dev-util/bpftrace/bpftrace-0.11.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs 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
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-COMMON_DEPEND="
-	dev-util/systemtap
-	<dev-libs/libbpf-0.2:=
-	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
-	<=sys-devel/llvm-12:=[llvm_targets_BPF(+)]
-	<=sys-devel/clang-12:=
-	>=dev-util/bcc-0.13.0:=
-	<dev-util/bcc-0.17.0:=
-	virtual/libelf
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-cpp/gtest )
-"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND+="
-	>=dev-util/cmake-3.8
-	sys-devel/flex
-	sys-devel/bison
-"
-
-S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
-QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
-
-PATCHES=(
-	"${FILESDIR}/bpftrace-0.11.0-install-libs.patch"
-	"${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch"
-)
-
-# lots of fixing needed
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="
-		~BPF
-		~BPF_EVENTS
-		~BPF_JIT
-		~BPF_SYSCALL
-		~FTRACE_SYSCALLS
-		~HAVE_EBPF_JIT
-	"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=11 llvm_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local -a mycmakeargs
-	mycmakeargs=(
-		"-DSTATIC_LINKING:BOOL=OFF"
-		"-DBUILD_TESTING:BOOL=OFF"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/bpftrace/bpftrace-9999.ebuild b/dev-util/bpftrace/bpftrace-9999.ebuild
index 6eeeb6c28d67..2a14dc584768 100644
--- a/dev-util/bpftrace/bpftrace-9999.ebuild
+++ b/dev-util/bpftrace/bpftrace-9999.ebuild
@@ -25,10 +25,10 @@ IUSE="test"
 
 COMMON_DEPEND="
 	dev-util/systemtap
-	sys-devel/clang:=
-	dev-libs/libbpf:=
+	<dev-libs/libbpf-0.2:=
 	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
-	sys-devel/clang:=
+	<=sys-devel/llvm-12:=[llvm_targets_BPF(+)]
+	<=sys-devel/clang-12:=
 	>=dev-util/bcc-0.13.0:=
 	virtual/libelf
 "
diff --git a/dev-util/bpftrace/files/bpftrace-0.10.0-llvm-multi.patch b/dev-util/bpftrace/files/bpftrace-0.10.0-llvm-multi.patch
deleted file mode 100644
index 48eeeb8e2001..000000000000
--- a/dev-util/bpftrace/files/bpftrace-0.10.0-llvm-multi.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -ru a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2020-05-20 21:00:22.789744736 -0500
-+++ b/CMakeLists.txt	2020-05-20 18:52:38.241091110 -0500
-@@ -30,6 +30,11 @@
-   elseif(STATIC_LIBC)
-     message(WARNING "static libc is known to cause problems, consider STATIC_LIBC=OFF. Proceed at your own risk") #iovisor/bpftrace/issues/266
-   endif()
-+else()
-+  find_package(LLVM 9 REQUIRED CONFIG)
-+
-+  message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
-+  message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
- endif()
-
- if(EMBED_LIBCLANG_ONLY AND NOT EMBED_CLANG)
-diff -ru a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt
---- a/src/ast/CMakeLists.txt	2020-05-20 21:00:22.777744534 -0500
-+++ b/src/ast/CMakeLists.txt	2020-05-20 20:52:39.657888690 -0500
-@@ -42,26 +41,29 @@
-     if(EMBED_LIBCLANG_ONLY)
-       unlink_transitive_dependency("${CLANG_EXPORTED_TARGETS}" "LLVM")
-     endif()
--    target_link_libraries(bpftraceast ${CLANG_EMBEDDED_CMAKE_TARGETS})
-+    target_link_libraries(bpftraceast ${CLANG_EMBEDDED_CMAKE_TARGETS})
-   else()
-     list(INSERT clang_libs 0 libclang.a)
-   endif()
-
-   if(EMBED_LLVM)
--    target_link_libraries(bpftraceast ${LLVM_EMBEDDED_CMAKE_TARGETS})
-+    target_link_libraries(bpftraceast ${LLVM_EMBEDDED_CMAKE_TARGETS})
-   else()
-     llvm_map_components_to_libnames(llvm_libs bpfcodegen ipo irreader mcjit orcjit ${LLVM_TARGETS_TO_BUILD})
--    target_link_libraries(bpftraceast ${clang_libs})
--    target_link_libraries(bpftraceast ${llvm_libs})
-+    target_link_libraries(bpftraceast ${clang_libs})
-+    target_link_libraries(bpftraceast ${llvm_libs})
-   endif()
- else()
--  find_library(found_LLVM LLVM HINTS ${LLVM_LIBRARY_DIRS})
--  if(found_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(bpftraceast ${llvm_libs})
-+  find_package(LLVM 9 REQUIRED CONFIG)
-+
-+  include_directories(${LLVM_INCLUDE_DIRS})
-+  add_definitions(${LLVM_DEFINITIONS})
-+
-+  find_library(found_clang clang HINTS ${LLVM_LIBRARY_DIRS})
-+  if(found_clang)
-+    target_link_libraries(bpftraceast ${found_clang})
-   endif()
--  target_link_libraries(bpftraceast libclang)
-+  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(bpftraceast ${llvm_libs})
- endif()
diff --git a/dev-util/bpftrace/files/bpftrace-0.10.0-no-bpf_detach_kfunc.patch b/dev-util/bpftrace/files/bpftrace-0.10.0-no-bpf_detach_kfunc.patch
deleted file mode 100644
index 145fb1c0ca91..000000000000
--- a/dev-util/bpftrace/files/bpftrace-0.10.0-no-bpf_detach_kfunc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/attached_probe.cpp b/src/attached_probe.cpp
-index c7e789e..08f657e 100644
---- a/src/attached_probe.cpp
-+++ b/src/attached_probe.cpp
-@@ -116,7 +116,7 @@ void AttachedProbe::attach_kfunc(void)
- int AttachedProbe::detach_kfunc(void)
- {
-   close(tracing_fd_);
--  return bpf_detach_kfunc(progfd_, NULL);
-+  return 0;
- }
- #else
- void AttachedProbe::attach_kfunc(void)