gentoo resync : 12.05.2022

22 files changed, 16 insertions, 1540 deletions

diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 88120067ebf2..d32d0812ccc6 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/aflplusplus/Manifest b/app-forensics/aflplusplus/Manifest
index 4b9a91f0daf4..c03f7afd91f3 100644
--- a/app-forensics/aflplusplus/Manifest
+++ b/app-forensics/aflplusplus/Manifest
@@ -1,10 +1,5 @@
-AUX aflplusplus-3.0c-LDFLAGS.patch 445 BLAKE2B cfb1282dcba575ed96f355bf6695896f69625b1ace2c6b5d02a0c507fc2a09d4ee6cba97d27f7ac08516a525e5a09c5d3cfab75f3c3f4421357c8aa2cc5aee8c SHA512 d3f43709debf92a0a51077c33c85cf16d9e74324999267c66765f4eeda46d0091ee5c08a6e94bdb635ee6f970445c06e0ac1fdceba561c9345670ef7e365dfb0
-AUX aflplusplus-3.13c-CFLAGS.patch 5732 BLAKE2B 95e4a581fa9e0e9cf8c321968c8f4774c5012f4d5fe0f1d940b0bab3aa15803758c343af0969a5f7fd05b3454845ff306325cd29821f04d630c4bb42f4bfa2c9 SHA512 3e35b5068d64429a435f58e03fc557056ee9b0f73d4c407e34abef083b7c4f47b072f84d1e2abe99bf49449a5f6f46217b158893b84d635bed025979edb8c5e0
-AUX aflplusplus-3.14c-no-ignore-errors-makefile.patch 3047 BLAKE2B 2eaf28e5a758f55294360280b97a06c7e600606c7f22cd3619265ca534ae2146f1d5bae3e4cb30bf9aac89e662bba6491db726693ac644e5070236fd259a0ca8 SHA512 e074b068745e1989153448de1610de5975dd6d738b233056eb30d884208c0b8c61ce82020c3c94b0c95390f31616334cf81e4569af3a16767c1dbffafe1cc75a
 AUX aflplusplus-4.00c-no-ignore-errors-makefile.patch 4990 BLAKE2B e3e4b734e4e2b6d6e6fa384ec3b92003b1ee2a1313ec76eb5b6c0e6a6552dc8d08bb2639add2a11c2203fc9b731deff18015f497531beaa27ef59a6dd8e83be2 SHA512 ccf75c622c9a0227b3bc916f182bb1ad5fa6453622773f3a63a9d697c2e11a8597cc1758b48a19546101c1ea9bd7dc5ec91e75e960ddb3aef580b0447cd5675c
 AUX aflplusplus-4.00c-respect-flags.patch 7004 BLAKE2B a13695116d491e9dc0a05a3d2f3fa14fa9126350ea8debbd5e3664cac45c91969f34d1de6062f62adbbaf97c0fb485f74d6c367ff37464fe34f7b66db9663996 SHA512 2eb8e116fa690e08eb91ced2b760e87d4c623b020ac451409ca68501b32c9aee7773e237c0bdfeef09086b851e95a3b3fb216e7ca58681e64fc12a958994f7d1
-DIST aflplusplus-3.14c.tar.gz 2162934 BLAKE2B 0830b320cea65b9bdd048a08a388c7145164f6b7f4dc140a2f4268a3aa22dc608a771169c830e2196e7a0d543e6f3da49f39736f3b2514c559b986ce929d43c4 SHA512 318607cff40b5f2fc94938747e2ac6b8f400767138eb39edf4daf320afbdab417d0d97a80a1c9db8bb557ad4b7b62f887ae6e692c376f5d5673a493bd23bb811
 DIST aflplusplus-4.00c.tar.gz 2805041 BLAKE2B c1ce15aa9860fc02a7d6f608cae9dd8987b72253b465ea734c721d1b6927e482c31b907aeafe82c00618465227e2e140bfc595151ea5d73037638c3ee630872c SHA512 23a7a4260e581f7c212393e1e14704464bbbc3ff5465b3472db31c6c7f2cd25a9ecc5ad81fad8958c775fcd01b22269085e6c69419a07fbbdb9ec317a3e39beb
-EBUILD aflplusplus-3.14c-r2.ebuild 2218 BLAKE2B bc586c6e3154fe8df05f5867c791a43316a4b1d83a9c8291a6b7d8a103fca3f5c567fc309acac75a5073e2d1bed3fa081593ab59d292e51f337a4aaedab8e620 SHA512 c20e73459494b7b55e143a65eba0d86d68d378733d4744bafc8a22ac961af571f44f3945683a13ca3a0097487dda053b44935059f57a1eb7df5d0d13de3b1927
-EBUILD aflplusplus-4.00c.ebuild 2099 BLAKE2B 08387382daf3f1b0bf7a8eb2970e8e11e6810b01aa67a5fff2a14c3d59b50d8265f661e30650ec6c65cc34293e812f68918169ae1c101548873812a9dd55682f SHA512 29821834e8d1efc6da3d7fe0a599b342ee2ca194032baa4fcf907294ed2b1d8c93caa650b071062d401531568070d7c665d2eb37f2526d31676ea4c9bbf4174d
+EBUILD aflplusplus-4.00c.ebuild 2071 BLAKE2B c511a90fae8a8e42a9e110208ab3dd840f65a203de8eb517713f4637930bda648bb271dc185124ccca34a795c7f34264e616e1a64068a63faa457a3d91a9ebba SHA512 66c28ea49e70fc058a6a953d927b3e75675b1254d3ca29bb12a37cb56462a8ce8235ee5c7d21535619902d482933ecc5f7c927d546f4126e75d13bd7577a0159
 MISC metadata.xml 328 BLAKE2B c9ad582740e9c2ad03a30fe0eaafb8ee19f0d9bc2e98cc7bcd14385a3407f84301479d324b92d3aecafdc1e5cfef1d2cfc8a15c2ecb5d8f2fa348d82de920128 SHA512 e56ce158f6764926c2ed4dc486f017ce75fa272ac8e6ad16e4a816f8c734d7313e3dc9cb007bab07efe73e59cab185312a02d6178296bfe25002719ce4975d14
diff --git a/app-forensics/aflplusplus/aflplusplus-3.14c-r2.ebuild b/app-forensics/aflplusplus/aflplusplus-3.14c-r2.ebuild
deleted file mode 100644
index 0bae6dec57a2..000000000000
--- a/app-forensics/aflplusplus/aflplusplus-3.14c-r2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-LLVM_MAX_SLOT=13
-inherit toolchain-funcs llvm optfeature python-single-r1
-
-DESCRIPTION="A fork of AFL, the popular compile-time instrumentation fuzzer"
-HOMEPAGE="https://github.com/AFLplusplus/AFLplusplus"
-SRC_URI="https://github.com/AFLplusplus/AFLplusplus/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/AFLplusplus-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Tests involve heavy use of LD_PRELOAD in some cases
-# This isn't compatible with sandbox
-RESTRICT="test"
-
-# It turns out we need Clang too
-RDEPEND="
-	${PYTHON_DEPS}
-	>=sys-devel/llvm-10:=
-	|| (
-		sys-devel/clang:10
-		sys-devel/clang:11
-		sys-devel/clang:12
-		sys-devel/clang:13
-	)
-	!app-forensics/afl
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-util/cmocka )
-"
-
-QA_PREBUILT="/usr/share/afl/testcases/others/elf/small_exec.elf"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0c-LDFLAGS.patch"
-	"${FILESDIR}/${PN}-3.13c-CFLAGS.patch"
-	"${FILESDIR}/${PN}-3.14c-no-ignore-errors-makefile.patch"
-)
-
-llvm_check_deps() {
-	has_version -b "sys-devel/clang:${LLVM_SLOT}" && \
-		has_version -b "sys-devel/llvm:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -i -e 's/-O3 -fno-unroll-loops//' GNUmakefile || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		CFLAGS_FLTO="" \
-		PREFIX="${EPREFIX}/usr" \
-		HELPER_PATH="${EPREFIX}/usr/$(get_libdir)/afl" \
-		DOC_PATH="${EPREFIX}/usr/share/doc/${PF}" \
-		MAN_PATH="${EPREFIX}/usr/share/man/man8"
-}
-
-src_test() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)"
-}
-
-src_install() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		HELPER_PATH="${EPREFIX}/usr/$(get_libdir)/afl" \
-		DOC_PATH="${EPREFIX}/usr/share/doc/${PF}" \
-		MAN_PATH="${EPREFIX}/usr/share/man/man8" \
-		install
-}
-
-pkg_postinst() {
-	# TODO: Any others?
-	optfeature "fuzzing with AFL_USE_ASAN" sys-libs/compiler-rt-sanitizers[asan]
-	optfeature "fuzzing with AFL_USE_MSAN" sys-libs/compiler-rt-sanitizers[msan]
-}
diff --git a/app-forensics/aflplusplus/aflplusplus-4.00c.ebuild b/app-forensics/aflplusplus/aflplusplus-4.00c.ebuild
index d327f3912c26..3cc127a6a3d0 100644
--- a/app-forensics/aflplusplus/aflplusplus-4.00c.ebuild
+++ b/app-forensics/aflplusplus/aflplusplus-4.00c.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9,10} )
 LLVM_MAX_SLOT=13
@@ -24,23 +24,18 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="test"
 
 # It turns out we need Clang too
-RDEPEND="
-	${PYTHON_DEPS}
-	>=sys-devel/llvm-10:=
+RDEPEND="${PYTHON_DEPS}
+	>=sys-devel/llvm-11:=
 	|| (
-		sys-devel/clang:10
 		sys-devel/clang:11
 		sys-devel/clang:12
 		sys-devel/clang:13
 	)
-	!app-forensics/afl
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-util/cmocka )
-"
+	!app-forensics/afl"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cmocka )"
 
-QA_PREBUILT="/usr/share/afl/testcases/others/elf/small_exec.elf"
+QA_PREBUILT="usr/share/afl/testcases/others/elf/small_exec.elf"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.00c-respect-flags.patch
diff --git a/app-forensics/aflplusplus/files/aflplusplus-3.0c-LDFLAGS.patch b/app-forensics/aflplusplus/files/aflplusplus-3.0c-LDFLAGS.patch
deleted file mode 100644
index 3e8f4dd92d1a..000000000000
--- a/app-forensics/aflplusplus/files/aflplusplus-3.0c-LDFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/GNUmakefile.gcc_plugin
-+++ b/GNUmakefile.gcc_plugin
-@@ -129,7 +129,7 @@ afl-common.o: ./src/afl-common.c
- 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ $(LDFLAGS)
- 
- ./afl-gcc-pass.so: instrumentation/afl-gcc-pass.so.cc | test_deps
--	$(CXX) $(CXXEFLAGS) $(PLUGIN_FLAGS) -shared $< -o $@
-+	$(CXX) $(CXXEFLAGS) $(PLUGIN_FLAGS) -shared $< -o $@ $(LDFLAGS)
- 	ln -sf afl-cc afl-gcc-fast
- 	ln -sf afl-cc afl-g++-fast
- 	ln -sf afl-cc.8 afl-gcc-fast.8
diff --git a/app-forensics/aflplusplus/files/aflplusplus-3.13c-CFLAGS.patch b/app-forensics/aflplusplus/files/aflplusplus-3.13c-CFLAGS.patch
deleted file mode 100644
index a3f54b437b83..000000000000
--- a/app-forensics/aflplusplus/files/aflplusplus-3.13c-CFLAGS.patch
+++ /dev/null
@@ -1,99 +0,0 @@
---- a/GNUmakefile.gcc_plugin
-+++ b/GNUmakefile.gcc_plugin
-@@ -28,14 +28,14 @@ MAN_PATH    ?= $(PREFIX)/share/man/man8
- 
- VERSION     = $(shell grep '^$(HASH)define VERSION ' ./config.h | cut -d '"' -f2)
- 
--CFLAGS          ?= -O3 -g -funroll-loops -D_FORTIFY_SOURCE=2
-+CFLAGS          ?= -D_FORTIFY_SOURCE=2
- CFLAGS_SAFE     := -Wall -Iinclude -Wno-pointer-sign \
-                    -DAFL_PATH=\"$(HELPER_PATH)\" -DBIN_PATH=\"$(BIN_PATH)\" \
-                    -DGCC_VERSION=\"$(GCCVER)\" -DGCC_BINDIR=\"$(GCCBINDIR)\" \
-                    -Wno-unused-function
- override CFLAGS += $(CFLAGS_SAFE)
- 
--CXXFLAGS    ?= -O3 -g -funroll-loops -D_FORTIFY_SOURCE=2
-+CXXFLAGS    ?= -D_FORTIFY_SOURCE=2
- CXXEFLAGS   := $(CXXFLAGS) -Wall -std=c++11
- 
- CC          ?= gcc
---- a/GNUmakefile.llvm
-+++ b/GNUmakefile.llvm
-@@ -237,7 +237,7 @@ else
-         AFL_CLANG_DEBUG_PREFIX =
- endif
- 
--CFLAGS          ?= -O3 -funroll-loops -fPIC -D_FORTIFY_SOURCE=2
-+CFLAGS          ?= -fPIC -D_FORTIFY_SOURCE=2
- CFLAGS_SAFE     := -Wall -g -Wno-cast-qual -Wno-variadic-macros -Wno-pointer-sign -I ./include/ -I ./instrumentation/ \
-                    -DAFL_PATH=\"$(HELPER_PATH)\" -DBIN_PATH=\"$(BIN_PATH)\" \
-                    -DLLVM_BINDIR=\"$(LLVM_BINDIR)\" -DVERSION=\"$(VERSION)\" \
-@@ -254,7 +254,7 @@ ifdef AFL_TRACE_PC
-   $(info Compile option AFL_TRACE_PC is deprecated, just set AFL_LLVM_INSTRUMENT=PCGUARD to activate when compiling targets )
- endif
- 
--CXXFLAGS          ?= -O3 -funroll-loops -fPIC -D_FORTIFY_SOURCE=2
-+CXXFLAGS          ?= -fPIC -D_FORTIFY_SOURCE=2
- override CXXFLAGS += -Wall -g -I ./include/ \
-                      -DVERSION=\"$(VERSION)\" -Wno-variadic-macros \
-                      -DLLVM_MINOR=$(LLVM_MINOR) -DLLVM_MAJOR=$(LLVM_MAJOR)
-@@ -434,20 +434,20 @@ afl-llvm-dict2file.so:	instrumentation/afl-llvm-dict2file.so.cc instrumentation/
- 
- .PHONY: document
- document:
--	$(CLANG_BIN) -D_AFL_DOCUMENT_MUTATIONS $(CFLAGS_SAFE) $(CPPFLAGS) $(CLANG_CFL) -O3 -Wno-unused-result -fPIC -c instrumentation/afl-compiler-rt.o.c -o ./afl-compiler-rt.o
--	@$(CLANG_BIN) -D_AFL_DOCUMENT_MUTATIONS $(CFLAGS_SAFE) $(CPPFLAGS) $(CLANG_CFL) -O3 -Wno-unused-result -m32 -fPIC -c instrumentation/afl-compiler-rt.o.c -o ./afl-compiler-rt-32.o 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; else echo "failed (that's fine)"; fi
--	@$(CLANG_BIN) -D_AFL_DOCUMENT_MUTATIONS $(CFLAGS_SAFE) $(CPPFLAGS) $(CLANG_CFL) -O3 -Wno-unused-result -m64 -fPIC -c instrumentation/afl-compiler-rt.o.c -o ./afl-compiler-rt-64.o 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; else echo "failed (that's fine)"; fi
-+	$(CLANG_BIN) -D_AFL_DOCUMENT_MUTATIONS $(CFLAGS_SAFE) $(CPPFLAGS) $(CLANG_CFL) -Wno-unused-result -fPIC -c instrumentation/afl-compiler-rt.o.c -o ./afl-compiler-rt.o
-+	@$(CLANG_BIN) -D_AFL_DOCUMENT_MUTATIONS $(CFLAGS_SAFE) $(CPPFLAGS) $(CLANG_CFL) -Wno-unused-result -m32 -fPIC -c instrumentation/afl-compiler-rt.o.c -o ./afl-compiler-rt-32.o 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; else echo "failed (that's fine)"; fi
-+	@$(CLANG_BIN) -D_AFL_DOCUMENT_MUTATIONS $(CFLAGS_SAFE) $(CPPFLAGS) $(CLANG_CFL) -Wno-unused-result -m64 -fPIC -c instrumentation/afl-compiler-rt.o.c -o ./afl-compiler-rt-64.o 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; else echo "failed (that's fine)"; fi
- 
- ./afl-compiler-rt.o: instrumentation/afl-compiler-rt.o.c
--	$(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -O3 -Wno-unused-result -fPIC -c $< -o $@
-+	$(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -Wno-unused-result -fPIC -c $< -o $@
- 
- ./afl-compiler-rt-32.o: instrumentation/afl-compiler-rt.o.c
- 	@printf "[*] Building 32-bit variant of the runtime (-m32)... "
--	@$(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -O3 -Wno-unused-result -m32 -fPIC -c $< -o $@ 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; ln -sf afl-compiler-rt-32.o afl-llvm-rt-32.o; else echo "failed (that's fine)"; fi
-+	@$(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -Wno-unused-result -m32 -fPIC -c $< -o $@ 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; ln -sf afl-compiler-rt-32.o afl-llvm-rt-32.o; else echo "failed (that's fine)"; fi
- 
- ./afl-compiler-rt-64.o: instrumentation/afl-compiler-rt.o.c
- 	@printf "[*] Building 64-bit variant of the runtime (-m64)... "
--	@$(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -O3 -Wno-unused-result -m64 -fPIC -c $< -o $@ 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; ln -sf afl-compiler-rt-64.o afl-llvm-rt-64.o; else echo "failed (that's fine)"; fi
-+	@$(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -Wno-unused-result -m64 -fPIC -c $< -o $@ 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; ln -sf afl-compiler-rt-64.o afl-llvm-rt-64.o; else echo "failed (that's fine)"; fi
- 
- .PHONY: test_build
- test_build: $(PROGS)
---- a/unicorn_mode/samples/c/Makefile
-+++ b/unicorn_mode/samples/c/Makefile
-@@ -35,7 +35,7 @@ clean:
- 	rm -rf *.o harness harness-debug
- 
- harness.o: harness.c ../../unicornafl/include/unicorn/*.h
--	${MYCC} ${CFLAGS} -O3 -c harness.c
-+	${MYCC} ${CFLAGS} -c harness.c
- 
- harness-debug.o: harness.c ../../unicornafl/include/unicorn/*.h
- 	${MYCC} ${CFLAGS} -g -c harness.c -o $@
---- a/unicorn_mode/samples/persistent/Makefile
-+++ b/unicorn_mode/samples/persistent/Makefile
-@@ -35,7 +35,7 @@ clean:
- 	rm -rf *.o harness harness-debug
- 
- harness.o: harness.c ../../unicornafl/include/unicorn/*.h
--	${MYCC} ${CFLAGS} -O3 -c harness.c
-+	${MYCC} ${CFLAGS} -c harness.c
- 
- harness-debug.o: harness.c ../../unicornafl/include/unicorn/*.h
- 	${MYCC} ${CFLAGS} -DAFL_DEBUG=1 -g -c harness.c -o $@
---- a/utils/afl_untracer/Makefile
-+++ b/utils/afl_untracer/Makefile
-@@ -1,7 +1,7 @@
- ifdef DEBUG
-   OPT=-O0
- else
--  OPT=-O3
-+  OPT?=-O2
- endif
- 
- all:	afl-untracer libtestinstr.so
diff --git a/app-forensics/aflplusplus/files/aflplusplus-3.14c-no-ignore-errors-makefile.patch b/app-forensics/aflplusplus/files/aflplusplus-3.14c-no-ignore-errors-makefile.patch
deleted file mode 100644
index 0b029396390c..000000000000
--- a/app-forensics/aflplusplus/files/aflplusplus-3.14c-no-ignore-errors-makefile.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-https://bugs.gentoo.org/800941
-
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -310,12 +310,12 @@ all:	test_x86 test_shm test_python ready $(PROGS) afl-as llvm gcc_plugin test_bu
- 
- .PHONY: llvm
- llvm:
--	-$(MAKE) -j -f GNUmakefile.llvm
-+	$(MAKE) -j -f GNUmakefile.llvm
- 	@test -e afl-cc || { echo "[-] Compiling afl-cc failed. You seem not to have a working compiler." ; exit 1; }
- 
- .PHONY: gcc_plugin
- gcc_plugin:
--	-$(MAKE) -f GNUmakefile.gcc_plugin
-+	$(MAKE) -f GNUmakefile.gcc_plugin
- 
- .PHONY: man
- man:    $(MANPAGES)
-@@ -562,8 +562,8 @@ all_done: test_build
- .PHONY: clean
- clean:
- 	rm -f $(PROGS) libradamsa.so afl-fuzz-document afl-as as afl-g++ afl-clang afl-clang++ *.o src/*.o *~ a.out core core.[1-9][0-9]* *.stackdump .test .test1 .test2 test-instr .test-instr0 .test-instr1 afl-qemu-trace afl-gcc-fast afl-gcc-pass.so afl-g++-fast ld *.so *.8 test/unittests/*.o test/unittests/unit_maybe_alloc test/unittests/preallocable .afl-* afl-gcc afl-g++ afl-clang afl-clang++ test/unittests/unit_hash test/unittests/unit_rand
--	-$(MAKE) -f GNUmakefile.llvm clean
--	-$(MAKE) -f GNUmakefile.gcc_plugin clean
-+	$(MAKE) -f GNUmakefile.llvm clean
-+	$(MAKE) -f GNUmakefile.gcc_plugin clean
- 	$(MAKE) -C utils/libdislocator clean
- 	$(MAKE) -C utils/libtokencap clean
- 	$(MAKE) -C utils/aflpp_driver clean
-@@ -618,8 +618,8 @@ binary-only: test_shm test_python ready $(PROGS)
- 
- .PHONY: source-only
- source-only: all
--	-$(MAKE) -j -f GNUmakefile.llvm
--	-$(MAKE) -f GNUmakefile.gcc_plugin
-+	$(MAKE) -j -f GNUmakefile.llvm
-+	$(MAKE) -f GNUmakefile.gcc_plugin
- 	$(MAKE) -C utils/libdislocator
- 	$(MAKE) -C utils/libtokencap
- 
-@@ -661,8 +661,8 @@ install: all $(MANPAGES)
- 	@if [ -f utils/afl_network_proxy/afl-network-server ]; then $(MAKE) -C utils/afl_network_proxy install; fi
- 	@if [ -f utils/aflpp_driver/libAFLDriver.a ]; then set -e; install -m 644 utils/aflpp_driver/libAFLDriver.a $${DESTDIR}$(HELPER_PATH); fi
- 	@if [ -f utils/aflpp_driver/libAFLQemuDriver.a ]; then set -e; install -m 644 utils/aflpp_driver/libAFLQemuDriver.a $${DESTDIR}$(HELPER_PATH); fi
--	-$(MAKE) -f GNUmakefile.llvm install
--	-$(MAKE) -f GNUmakefile.gcc_plugin install
-+	$(MAKE) -f GNUmakefile.llvm install
-+	$(MAKE) -f GNUmakefile.gcc_plugin install
- 	ln -sf afl-cc $${DESTDIR}$(BIN_PATH)/afl-gcc
- 	ln -sf afl-cc $${DESTDIR}$(BIN_PATH)/afl-g++
- 	ln -sf afl-cc $${DESTDIR}$(BIN_PATH)/afl-clang
---- a/GNUmakefile.llvm
-+++ b/GNUmakefile.llvm
-@@ -460,6 +460,7 @@ document:
- test_build: $(PROGS)
- 	@echo "[*] Testing the CC wrapper and instrumentation output..."
- 	unset AFL_USE_ASAN AFL_USE_MSAN AFL_INST_RATIO; ASAN_OPTIONS=detect_leaks=0 AFL_QUIET=1 AFL_PATH=. AFL_LLVM_LAF_ALL=1 ./afl-cc $(CFLAGS) $(CPPFLAGS) ./test-instr.c -o test-instr $(LDFLAGS)
-+	@test -e test-instr || { echo "[-] Testing CC wrapper failed. You seem not to have a working compiler." ; exit 1; }
- 	ASAN_OPTIONS=detect_leaks=0 ./afl-showmap -m none -q -o .test-instr0 ./test-instr < /dev/null
- 	echo 1 | ASAN_OPTIONS=detect_leaks=0 ./afl-showmap -m none -q -o .test-instr1 ./test-instr
- 	@rm -f test-instr
diff --git a/app-forensics/aide/Manifest b/app-forensics/aide/Manifest
index 16a8890381b6..bcbe8354d26d 100644
--- a/app-forensics/aide/Manifest
+++ b/app-forensics/aide/Manifest
@@ -1,14 +1,8 @@
-AUX aide-0.16-fix-LIBS-LDFLAGS-mixing.patch 874 BLAKE2B e61f6b269dcc3679d68714c315cfff8e8feb4146028abc33e780cb7429c4466c78b7e50c427fb78ffdc310335450a012f7a08b6ecd5aaf562b8ab18565c5f927 SHA512 930967c1c7be54d10beb26e4281083a0f7cf500a5f161cf2af6c0a7b377e9bce092942a3a88c6cbb080e3eab500ec8a7bec1ff295f774ef70146240837961a8f
 AUX aide-0.16-fix-acl-configure-option.patch 770 BLAKE2B 92d26163475e5a5ddd9b374cc4d50bc2c290aebedf1562b6d02b15f8b7c2f99b86d0eb414b58f9799b2cd63f9744fc5ce1a20965b7a7fa8984317f492db2173a SHA512 a2a5675ed0dec291724f08885bb4186c813c7ec99d90688e8db5d5f1e369d606c9dfb820a4735dff062476fd332e0d69dbd017022d6a9f1163956bd756fdc6d5
-AUX aide-0.16.2_p20200614_define_hash_use_gcrypt.patch 1174 BLAKE2B 694c7859a43f814f1b9ab18c0e0fa458bdbc6ebc0fb1d076cf51839cf48c341f13b84ae08c2ef419a62b53ffe12879fa2b230f546e57c89a5816fd4d2bff902b SHA512 ec31e674141feb03fbe4eb94c82f2c7b366bd31c4d845818650303c7e971ff9c814de8112c818da9de78bb32ca087f75ff313f35d18301775915ecc8b9975e52
 AUX aide-0.17.4-bashism.patch 2759 BLAKE2B 973ecaf273b2a5f69c3346d486a7df4f035e436b67dbc28b8aa878f19188fcf46d05b95a969da89c7c168e3c1c2d377d5525d98b47a6b434f2b97dfc29d1f7ab SHA512 1d4d8acbd3d7c035ef8c94ef2b477c446d268a418f95797fb0824570295b697cb498747fc091839671913ccaaedac0e5779b9e324712eefc8093c143660d2a00
-AUX aide.conf-r1 3194 BLAKE2B a911d5623adb4122cae21494c5e7542adbfa787bda78f840e1385219adfec19c5a3079b34e16f2c8e9afbe8554b6fc2ae291f7bdd1728b8ac77c7b16135260ae SHA512 24f6af48767e4edd69c4b806c418501583f03574f05bbf87e98659ba36b64acf8e95a772ce690175071127910248a9c6761392ca889cfee235a475341d3a7a77
 AUX aide.conf-r2 3277 BLAKE2B 9792a13c590d9c72d94f1a24ef700c4ff77f3c672fd3e67589b694ab7fff1779728f12f1b590323c64ea129a794be71235a825f2e0fcf7d3f4699bb4de75d2c1 SHA512 1fc31c986e785910918dbc33f8912efb442770d0974f996d7dfe6c525b8602ed609cd19a41b5edd759e0099b02de16bde21ca67fe8d5d3085f0c0812a8a460c1
-AUX aide.cron 5997 BLAKE2B 2273eb902b9ba8fc5e999375d0dfa59e2c5c56a919bf3bd06e7b638213332b34c4a1240c717c2189f787dc249847f7115e2a21ac139b5db1df2151ade9f5a154 SHA512 0931c1b9185e0b9a563c3589858b0ba20716344f29d6d1fc7226498f3c744af1d3c3fd72824f101f9b3e08710f443c9fdad312e28c0bcb93665d1dcb076f4b47
 AUX aide.cron-r2 5681 BLAKE2B 517f7a0a01bb6eb104d6f758191990c4da518fd15af9f88a5521e4b958d558ddb84d0fa9c7b089a62f8b11cd8b2df52c138f49d6b4f276eab2f70a0262f6d5f0 SHA512 104e7025f193d2e2cf93d18a52d66059c7a539d7d2c6f3f514f2cca4252260e1668cf18c6acfaf5069038a9f97f0052a38ea32fb75c0af7e2b2920a819e96922
 AUX aideinit 2949 BLAKE2B 244aaec9a38f19c6a7af706572a896e922215d6321aee4537ef5ce47326f41fd84880331a86ec71dcf7ee4e2ac2a11bf979ce66eff73dd2e8a2072e9eb7e8aab SHA512 a6bce52432251458b977fb363d5801206c273fb9404c55f7bcb82b9d5a65aa19d1660d61d457c9af87f1a8fada95e2f8203489b1876b2b2a259e6374e15cdc57
-DIST aide-0.16.2_p20200614.tar.gz 144202 BLAKE2B a2533eaf0dd6caa82718eaa89878ddc101f64767788eeac3a250ceb584a2c5958ef8a5481b89eeb720e21af07da8f3576fb46d8ee9966fd2361354a35a7eaa6e SHA512 f5f83b8401465471043c60aeb6314f7bcab24c9f962f6ce550445bec8d866a5c8c00eba9e9f157f1223cde58631de139533c7de64fb3c861a5d8e7b5e367e106
 DIST aide-0.17.4.tar.gz 331783 BLAKE2B 584a385d0a0e80edf0b89eef202431adfea7fe8ba04c774e49dfb7230e766e19a48572e9d6c80386668572e459db9770b04978df484bd49c7de6433657500e13 SHA512 b6dba54fd204e1899d47b0b4139786cbeaa51c388027e2cfc1bb839297a70ae8ad6f37429594a730fac8007d62b4ba5b61a4aa22edbc55cbe986ccfaf5197f31
-EBUILD aide-0.16.2_p20200614.ebuild 3725 BLAKE2B cd6c5ddb8f94d0a35430f93d998d287b1b94f7a9fc06c7fb25b713cd7ef8b20cfb0119da3f2efad5db4c6064eb7c95816abf5f503468f60fe7c13cf18f279eca SHA512 7c019a53a53409f12da04a186e37be3ed4f0561e89d0ac0b2190065a84371e4dd9cf276ef42789fec907e31785fc4782abef5c0ca5886b32404d7046f44398b0
 EBUILD aide-0.17.4-r2.ebuild 2440 BLAKE2B c60cd6577e7887079f0876beb9121b7e8e3e3cb929738e328978113546cfb80b05dd45717475ff5dc92f1800685c12b1e213680aec483a05319a82f30971c672 SHA512 51b2772571329b90affc44cea3583eef127cade567f050188a78271c116d33c3795c89593a8d555e5f8d443664c7a6d8ad70210e7000cacae8c88aa88334a739
-MISC metadata.xml 643 BLAKE2B 7e5eb2247bb681683886521e9f58dae4de58db2719a5a47550134e89b4b9e3e3aaf7e8d63710a5bd81e74f9a8d63bede8f1eabf2def85f60370b69b6b44041ef SHA512 247e747485777b0e1794c623049d8fcdb348fb071d09ecb2d35d975d3785530ca4b8c8d1bae116cc8daa29cd154c871ba71c8d2dd313222707621e269a7d100d
+MISC metadata.xml 567 BLAKE2B a3b852325f904e2fbf4a95b67a49ba259583e78f01194bb2dd79851cbd77bd35b5bc786e74c72892adf264471a9a93ae609611252f7e2f1a630dbe1463a80b33 SHA512 c7e14ed38ffa394bd611cb831e509a5f8897c6d394bc78b6ae5074141188ca7bb8aa9efe425930c6db5fade44505fc60f212b0e86bf187622ac8c7443e7a5272
diff --git a/app-forensics/aide/aide-0.16.2_p20200614.ebuild b/app-forensics/aide/aide-0.16.2_p20200614.ebuild
deleted file mode 100644
index cd9f0a7ea377..000000000000
--- a/app-forensics/aide/aide-0.16.2_p20200614.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools readme.gentoo-r1
-
-DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a file integrity checker"
-HOMEPAGE="https://aide.github.io/ https://github.com/aide/aide"
-
-COMMIT="7949feff20501724a43929ee7894b005812ffb4f" # 20200614
-SRC_URI="https://github.com/aide/aide/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="acl audit curl e2fs mhash postgres selinux xattr zlib"
-
-REQUIRED_USE="
-	postgres? ( !mhash )
-	"
-
-COMMON_DEPEND="
-	dev-libs/libpcre
-	acl? ( virtual/acl )
-	audit? ( sys-process/audit )
-	curl? ( net-misc/curl )
-	e2fs? ( sys-fs/e2fsprogs )
-	!mhash? (
-		dev-libs/libgcrypt:0=
-		dev-libs/libgpg-error
-	)
-	mhash? ( app-crypt/mhash )
-	postgres? ( dev-db/postgresql:= )
-	selinux? ( sys-libs/libselinux )
-	xattr? ( sys-apps/attr )
-	zlib? ( sys-libs/zlib )"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-aide )"
-
-DEPEND="${COMMON_DEPEND}"
-
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-HTML_DOCS=( doc/manual.html )
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-Example configuration file was installed at '${EPREFIX}/etc/aide/aide.conf'.
-Please edit it to meet your needs. Refer to aide.conf(5) manual page
-for more information.
-
-A helper script, aideinit, was installed and can be used to make AIDE
-management easier. Please run 'aideinit --help' for more information."
-
-PATCHES=(
-	"${FILESDIR}/aide-0.16-fix-LIBS-LDFLAGS-mixing.patch"
-	"${FILESDIR}/aide-0.16-fix-acl-configure-option.patch"
-
-	# Remove not available gcrypt algorithm 7 DB_HAVAL
-	# See: https://sourceforge.net/p/aide/bugs/105/
-	"${FILESDIR}/${P}_define_hash_use_gcrypt.patch"
-)
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-pkg_setup() {
-	if use postgres; then
-		ewarn "\nWARNING!"
-		ewarn "You need to choose one of the postgres versions before building"
-		ewarn "\nPlease select a target postgres version/slot using:\n"
-		ewarn "    ~# eselect postgresql list"
-		ewarn "    ~# eselect postgresql set <version>\n"
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e 's| -Werror||g' configure.ac || die
-	echo "m4_define([AIDE_VERSION], [${PV}])" > version.m4 || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}/etc/${PN}"
-		--with-confighmactype="sha512"		# Override default weak MD5 hash.
-		--with-dbhmackey="sha512"			# Override default weak MD5 hash.
-		# Disable broken l10n support: https://sourceforge.net/p/aide/bugs/98/
-		# This doesn't affect anything because there are no localizations yet.
-		--without-locale
-		--without-prelink
-		--disable-static
-		$(use_with zlib)
-		$(use_with curl)
-		$(use_with acl posix-acl)
-		$(use_with selinux)
-		$(use_with xattr)
-		$(use_with e2fs e2fsattrs)
-		$(use_with mhash mhash)
-		$(use_with !mhash gcrypt)
-		$(use_with postgres psql)
-		$(use_with audit)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	readme.gentoo_create_doc
-
-	insinto /etc/${PN}
-	insopts -m0600
-	newins "${FILESDIR}"/aide.conf-r1 aide.conf
-
-	dosbin "${FILESDIR}"/aideinit
-	dodoc -r contrib/ "${FILESDIR}"/aide.cron
-
-	keepdir /var/{lib,log}/${PN}
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if use postgres; then
-		elog "\nDue to a bad assumption by aide, you must issue the following"
-		elog "command after the database initialization (aide --init ...):"
-		elog '\n    ~# psql -c "update pg_index set indisunique=false from pg_class \\ '
-		elog "          where pg_class.relname='TABLE_pkey' and \ "
-		elog '          pg_class.oid=pg_index.indexrelid" -h HOSTNAME -p PORT DBASE USER'
-		elog "\nwhere TABLE, HOSTNAME, PORT, DBASE, and USER are the same as"
-		elog "in your aide.conf.\n"
-	fi
-}
diff --git a/app-forensics/aide/files/aide-0.16-fix-LIBS-LDFLAGS-mixing.patch b/app-forensics/aide/files/aide-0.16-fix-LIBS-LDFLAGS-mixing.patch
deleted file mode 100644
index 453abe5f1eae..000000000000
--- a/app-forensics/aide/files/aide-0.16-fix-LIBS-LDFLAGS-mixing.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 6da37687ba7cf259ac19cae2e1c16115b6848143
-Author: Ilya Tumaykin <itumaykin@gmail.com>
-Date:   Thu May 25 13:34:55 2017 +0300
-
-build: fix incorrect LIBS/LDFLAGS mixing
-
-Otherwise build with LDFLAGS='-Wl,--as-needed' and curl support fails.
-See https://bugs.gentoo.org/show_bug.cgi?id=271326
-and https://sourceforge.net/p/aide/bugs/96/
-
-diff --git a/configure.ac b/configure.ac
-index 3598ebe..0c5cb0c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -713,7 +713,7 @@ if test x$with_curl = xyes; then
-   AC_CHECK_HEADERS(curl/curl.h,,
-  	[AC_MSG_ERROR([You don't have curl properly installed. Install it or try --without-curl.])])
-   CFLAGS="$CFLAGS $CURL_CFLAGS"
--  LDFLAGS="$LDFLAGS $CURL_LIBS"
-+  LIBS="$LIBS $CURL_LIBS"
-   AC_CHECK_LIB(curl,curl_easy_init,havecurl=yes,
-  	[AC_MSG_ERROR([You don't have curl properly installed. Install it or try --without-curl.])]
- )
diff --git a/app-forensics/aide/files/aide-0.16.2_p20200614_define_hash_use_gcrypt.patch b/app-forensics/aide/files/aide-0.16.2_p20200614_define_hash_use_gcrypt.patch
deleted file mode 100644
index e643a0017de8..000000000000
--- a/app-forensics/aide/files/aide-0.16.2_p20200614_define_hash_use_gcrypt.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Nur aide-0.16/include/md.h aide-0.16.new/include/md.h
---- aide-0.16/include/md.h	2016-07-25 22:56:55.000000000 +0200
-+++ aide-0.16.new/include/md.h	2018-11-21 14:07:01.347479021 +0100
-@@ -48,7 +48,7 @@
- #define HASH_GCRYPT_COUNT GCRY_MD_CRC32
- #ifndef WITH_MHASH
- #define HASH_USE_GCRYPT (DB_MD5|DB_SHA1|DB_RMD160|DB_TIGER|DB_CRC32|\
--                         DB_HAVAL|DB_CRC32|DB_SHA256|DB_SHA512)
-+                         DB_CRC32B|DB_SHA256|DB_SHA512)
- #endif
- #endif
- 
-diff -Nur aide-0.16/src/md.c aide-0.16.new/src/md.c
---- aide-0.16/src/md.c	2016-07-25 22:56:55.000000000 +0200
-+++ aide-0.16.new/src/md.c	2018-11-21 14:06:05.602295496 +0100
-@@ -55,10 +55,12 @@
-     r=DB_TIGER;
-     break;
-   }
-+/* until libgcrypt-1.8.4 not implemented yet, see doc/gcrypt.info-1
-   case GCRY_MD_HAVAL: {
-     r=DB_HAVAL;
-     break;
-   }
-+*/
-   case GCRY_MD_SHA256: {
-     r=DB_SHA256;
-     break;
-@@ -219,7 +221,7 @@
- 			if(gcry_md_enable(md->mdh,i)==GPG_ERR_NO_ERROR){
- 				md->calc_attr|=h;
- 			} else {
--				error(0,"gcry_md_enable %i failed",i);
-+				error(0,"gcry_md_enable %i failed, see /usr/include/gcrypt.h enum gcry_md_algos",i);
- 				md->todo_attr&=~h;
- 			}
- 		}
diff --git a/app-forensics/aide/files/aide.conf-r1 b/app-forensics/aide/files/aide.conf-r1
deleted file mode 100644
index 87df5e168c80..000000000000
--- a/app-forensics/aide/files/aide.conf-r1
+++ /dev/null
@@ -1,133 +0,0 @@
-# Example configuration file for AIDE
-# See more: man 5 aide.conf
-
-database=file:/var/lib/aide/aide.db
-database_out=file:/var/lib/aide/aide.db.new
-
-# Change this to "no" or remove it to not gzip output
-# (only useful on systems with few CPU cycles to spare)
-gzip_dbout=yes
-
-# Default: 5
-#verbose=5
-
-report_url=file:/var/log/aide/aide.log
-report_url=stdout
-#report_url=stderr
-
-# Here are all the things we can check - these are the default rules 
-#
-# p:   permissions
-# ftype: file type
-# i:   inode
-# l:   link name
-# n:   number of links
-# u:   user
-# g:   group
-# s:   size
-# b:   block count
-# m:   mtime (modification time)
-# a:   atime (access time)
-# c:   ctime (change time)
-# S:   check for growing size
-# I:   ignore changed filename
-# ANF: allow new files
-# ARF: allow removed files
-# md5: md5 checksum
-# sha1: sha1 checksum
-# sha256: sha256 checksum
-# sha512: sha512 checksum
-# rmd160: rmd160 checksum
-# tiger: tiger checksum
-# crc32:    crc32 checksum
-# R:   p+ftype+i+l+n+u+g+s+m+c+md5+X
-# L:   p+ftype+i+l+n+u+g+X
-# E:   Empty group
-# X:   acl+selinux+xattrs+e2fsattrs (if groups are explicitly enabled)
-# >:   Growing file p+ftype+l+u+g+i+n+S+X
-
-# Defines formerly set here have been moved to /etc/default/aide.
-
-# Custom rules
-Binlib = p+i+n+u+g+s+b+m+c+md5+sha256+rmd160
-ConfFiles = p+i+n+u+g+s+b+m+c+md5+sha256+rmd160
-Logs = p+i+n+u+g+S
-Devices = p+i+n+u+g+s+b+c+md5+sha256+rmd160
-Databases = p+n+u+g
-StaticDir = p+i+n+u+g
-ManPages = p+i+n+u+g+s+b+m+c+md5+sha256+rmd160
-
-# Next decide what directories/files you want in the database
-
-# Kernel, system map, etc.
-=/boot$ Binlib
-# Configs
-/etc ConfFiles
-!/etc/mtab
-# Binaries
-/bin Binlib
-/sbin Binlib
-/usr/bin Binlib
-/usr/sbin Binlib
-/usr/libexec Binlib
-/usr/local/bin Binlib
-/usr/local/sbin Binlib
-#/usr/games Binlib
-# Libraries
-/lib(64)? Binlib
-/usr/lib(64)? Binlib
-/usr/local/lib(64)? Binlib
-# Log files
-=/var/log$ StaticDir
-#!/var/log/ksymoops
-/var/log/aide/aide.log(.[0-9])?(.gz)? Databases
-/var/log/aide/error.log(.[0-9])?(.gz)? Databases
-#/var/log/setuid.changes(.[0-9])?(.gz)? Databases
-!/var/log/aide
-/var/log Logs
-# Devices
-!/dev/pts
-# If you get spurious warnings about being unable to mmap() /dev/cpu/mtrr,
-# you may uncomment this to get rid of them. They're harmless but sometimes
-# annoying.
-#!/dev/cpu/mtrr
-#!/dev/xconsole
-/dev Devices
-# Other miscellaneous files
-/var/run$ StaticDir
-!/var/run
-# Test only the directory when dealing with /proc
-/proc$ StaticDir
-!/proc
-
-# You can look through these examples to get further ideas
-
-# MD5 sum files - especially useful with debsums -g
-#/var/lib/dpkg/info/([^\.]+).md5sums u+g+s+m+md5+sha1
-
-# Check crontabs
-#/var/spool/anacron/cron.daily Databases
-#/var/spool/anacron/cron.monthly Databases
-#/var/spool/anacron/cron.weekly Databases
-#/var/spool/cron Databases
-#/var/spool/cron/crontabs Databases
-
-# manpages can be trojaned, especially depending on *roff implementation
-#/usr/man ManPages
-#/usr/share/man ManPages
-#/usr/local/man ManPages
-
-# docs
-#/usr/doc ManPages
-#/usr/share/doc ManPages
-
-# check users' home directories
-#/home Binlib
-
-# check sources for modifications
-#/usr/src L
-#/usr/local/src L
-
-# Check headers for same
-#/usr/include L
-#/usr/local/include L
diff --git a/app-forensics/aide/files/aide.cron b/app-forensics/aide/files/aide.cron
deleted file mode 100644
index c28b78f8e9db..000000000000
--- a/app-forensics/aide/files/aide.cron
+++ /dev/null
@@ -1,192 +0,0 @@
-#!/bin/bash
-# Modified: Benjamin Smee
-# Date: Fri Sep 10 11:35:41 BST 2004
-
-# This is the email address reports get mailed to
-MAILTO=root@localhost
-
-# Set this to suppress mailings when there's nothing to report
-QUIETREPORTS=1
-
-# This parameter defines which aide command to run from the cron script.
-# Sensible values are "update" and "check".
-# Default is "check", ensuring backwards compatibility.
-# Since "update" does not take any longer, it is recommended to use "update",
-# so that a new database is created every day. The new database needs to be
-# manually copied over the current one, though.
-COMMAND=update
-
-# This parameter defines how many lines to return per e-mail. Output longer
-# than this value will be truncated in the e-mail sent out.
-LINES=1000
-
-# This parameter gives a grep regular expression. If given, all output lines
-# that _don't_ match the regexp are listed first in the script's output. This
-# allows to easily remove noise from the aide report.
-NOISE="(/var/cache/|/var/lib/|/var/tmp)"
-PATH="/bin:/usr/bin:/sbin:/usr/sbin"
-LOGDIR="/var/log/aide"
-LOGFILE="aide.log"
-CONFFILE="/etc/aide/aide.conf"
-ERRORLOG="aide_error.log"
-MAILLOG="aide_mail.log"
-ERRORTMP=`tempfile --directory "/tmp" --prefix "$ERRORLOG"`
-
-[ -f /usr/bin/aide ] || exit 0
-
-DATABASE=`grep "^database=file:/" $CONFFILE | head -n 1 | cut --delimiter=: --fields=2`
-FQDN=`hostname -f`
-DATE=`date +"at %Y-%m-%d %H:%M"`
-
-# default values
-
-DATABASE="${DATABASE:-/var/lib/aide/aide.db}"
-
-AIDEARGS="-V4"
-
-if [ ! -f $DATABASE ]; then
-	/usr/sbin/sendmail $MAILTO <<EOF
-Subject: Daily AIDE report for $FQDN
-From: root@${FQDN}
-To: ${MAILTO}
-Fatal error: The AIDE database does not exist!
-This may mean you haven't created it, or it may mean that someone has removed it.
-EOF
-	exit 0
-fi
-
-# Removed so no deps on debianutils - strerror
-#[ -f "$LOGDIR/$LOGFILE" ] && savelog -j -t -g adm -m 640 -u root -c 7 "$LOGDIR/$LOGFILE" > /dev/null
-#[ -f "$LOGDIR/$ERRORLOG" ] && savelog -j -t -g adm -m 640 -u root -c 7 "$LOGDIR/$ERRORLOG" > /dev/null
-
-aide $AIDEARGS --$COMMAND >"$LOGDIR/$LOGFILE" 2>"$ERRORTMP"
-RETVAL=$?
-
-if [ -n "$QUIETREPORTS" ] && [ $QUIETREPORTS -a \! -s $LOGDIR/$LOGFILE -a \! -s $ERRORTMP ]; then
-	# Bail now because there was no output and QUIETREPORTS is set
-	exit 0
-fi
-
-MAILTMP=`tempfile --directory "/tmp" --prefix "$MAILLOG"`
-
-(cat << EOF
-This is an automated report generated by the Advanced Intrusion Detection
-Environment on $FQDN ${DATE}.
-
-EOF
-
-# include error log in daily report e-mail
-
-if [ "$RETVAL" != "0" ]; then
-	cat > "$LOGDIR/$ERRORLOG" << EOF
-	
-*****************************************************************************
-*                    aide returned a non-zero exit value                    *
-*****************************************************************************
-
-EOF
-	echo "exit value is: $RETVAL" >> "$LOGDIR/$ERRORLOG"
-else
-	touch "$LOGDIR/$ERRORLOG"
-fi
-< "$ERRORTMP" cat >> "$LOGDIR/$ERRORLOG"
-rm -f "$ERRORTMP"
-
-if [ -s "$LOGDIR/$ERRORLOG" ]; then
-	errorlines=`wc -l "$LOGDIR/$ERRORLOG" | awk '{ print $1 }'`
-	if [ ${errorlines:=0} -gt $LINES ]; then
-		cat << EOF
-
-****************************************************************************
-*                      aide has returned many errors.                      *
-*           the error log output has been truncated in this mail           *
-****************************************************************************
-
-EOF
-		echo "Error output is $errorlines lines, truncated to $LINES."
-		head -$LINES "$LOGDIR/$ERRORLOG"
-		echo "The full output can be found in $LOGDIR/$ERRORLOG."
-	else
-		echo "Errors produced  ($errorlines lines):"
-		cat "$LOGDIR/$ERRORLOG"
-	fi
-else
-	echo "AIDE produced no errors."
-fi
-
-# include de-noised log
-
-if [ -n "$NOISE" ]; then
-	NOISETMP=`tempfile --directory "/tmp" --prefix "aidenoise"`
-	NOISETMP2=`tempfile --directory "/tmp" --prefix "aidenoise"`
-	sed -n '1,/^Detailed information about changes:/p' "$LOGDIR/$LOGFILE" | \
-	grep '^\(changed\|removed\|added\):' | \
-	grep -v "^added: THERE WERE ALSO [0-9]\+ FILES ADDED UNDER THIS DIRECTORY" > $NOISETMP2
-	
-	if [ -n "$NOISE" ]; then
-		< $NOISETMP2 grep -v "^\(changed\|removed\|added\):$NOISE" > $NOISETMP
-		rm -f $NOISETMP2
-		echo "De-Noised output removes everything matching $NOISE."
-	else
-		mv $NOISETMP2 $NOISETMP
-		echo "No noise expression was given."
-	fi
-	
-	if [ -s "$NOISETMP" ]; then
-		loglines=`< $NOISETMP wc -l | awk '{ print $1 }'`
-		if [ ${loglines:=0} -gt $LINES ]; then
-			cat << EOF
-
-****************************************************************************
-*   aide has returned long output which has been truncated in this mail    *
-****************************************************************************
-
-EOF
-			echo "De-Noised output is $loglines lines, truncated to $LINES."
-			< $NOISETMP head -$LINES
-			echo "The full output can be found in $LOGDIR/$LOGFILE."
-		else
-			echo "De-Noised output of the daily AIDE run ($loglines lines):"
-			cat $NOISETMP
-		fi
-	else
-		echo "AIDE detected no changes after removing noise."
-	fi
-	rm -f $NOISETMP
-	echo "============================================================================"
-fi
-
-# include non-de-noised log
-
-if [ -s "$LOGDIR/$LOGFILE" ]; then
-	loglines=`wc -l "$LOGDIR/$LOGFILE" | awk '{ print $1 }'`
-	if [ ${loglines:=0} -gt $LINES ]; then
-		cat << EOF
-
-****************************************************************************
-*   aide has returned long output which has been truncated in this mail    *
-****************************************************************************
-
-EOF
-		echo "Output is $loglines lines, truncated to $LINES."
-		head -$LINES "$LOGDIR/$LOGFILE"
-		echo "The full output can be found in $LOGDIR/$LOGFILE."
-	else
-		echo "Output of the daily AIDE run ($loglines lines):"
-		cat "$LOGDIR/$LOGFILE"
-	fi
-else
-	echo "AIDE detected no changes."
-fi
-) > ${MAILTMP}
-
-(
-cat <<EOF
-Subject: Daily AIDE report for $FQDN
-From: root@${FQDN}
-To: ${MAILTO}
-EOF
-cat ${MAILTMP}
-) | /usr/sbin/sendmail $MAILTO
-
-rm -f "$MAILTMP"
diff --git a/app-forensics/aide/metadata.xml b/app-forensics/aide/metadata.xml
index acd69e82070a..cdb014ee4e07 100644
--- a/app-forensics/aide/metadata.xml
+++ b/app-forensics/aide/metadata.xml
@@ -5,7 +5,6 @@
 	<use>
 		<flag name="e2fs">Enable support for checking file attributes on ext2/ext3/ext4 filesystems</flag>
 		<flag name="curl">Use curl for http,https and ftp backends</flag>
-		<flag name="postgres">Use postgresql library for storing databases</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">aide/aide</remote-id>
diff --git a/app-forensics/sleuthkit/Manifest b/app-forensics/sleuthkit/Manifest
index 98c0bf48379e..950642ada999 100644
--- a/app-forensics/sleuthkit/Manifest
+++ b/app-forensics/sleuthkit/Manifest
@@ -1,18 +1,13 @@
 AUX sleuthkit-4.1.0-tools-shared-libs.patch 1678 BLAKE2B f60496480425fd78bc211a663be80db2472a9683f1ff76c747f8190d5544df532857f6e1fb4343d0405f8bf51aa7b7bf86ed55fffbeea0153341ce9f2dca077b SHA512 b559f669837194bed447ac269884ab50e6ea746aba2df799688964245c22814567871f12f96d43ba74016d5c448247b02bef5d7bdfd32fd782ef5e668686238e
 AUX sleuthkit-4.10.1-exclude-usr-local.patch 858 BLAKE2B 706aee34f3555fb703e2b2d88ebe63919b02ac93f1627dda12116bea89f0303a5d4b9adc5f1695e4e96d643d09f88514fe41d144fca1a4f8cd7618b22d21b2f7 SHA512 a4d5d31b63483e6fb88c4a1b06f40587d2b66f63092c67755fec41c29e9f671e9e2e508c0752d2894e77b059a96ae15fd33e663fd23a13dad16acf5184959c88
 AUX sleuthkit-4.6.4-default-jar-location-fix.patch 1768 BLAKE2B d9a0675223506649a5db7aa4e0ef883ecea84c8484836d2020528696f13e14bbe9334c2967c7b698126fb1cedd6a6719fbbe3fb945b4ea9b89d643a61232d5e8 SHA512 acc076ca74d3e5d7c75425292730783801a7afe858ea119186229a319ba4fd2e076c1214daca3e4aa3d5a7717c5ed08a9ca0bf11bb4dc2a04d3aad190dbf57c6
-DIST SparseBitSet-1.1.jar 23706 BLAKE2B 8623a723f11f97386a108c775fefddd324997b68bea7f7ade0581ec5800bfa8d32f699ab903ad66c631b7b5c69ba1ef377243653f5044f39234dac07543eb129 SHA512 cf75431c5f705961800ce5cbca2acb9b2459eaf98ec37b5ee21c5a90d204ffb466fa25457b0560fbb024489777efbea0276201024c7b1b2853124930ac490983
 DIST commons-validator-1.6.jar 186077 BLAKE2B 39080bebfde71d87847b65f212d47a51bab9567cb0aaf7122359a67a8eb817877a6cc80495a15aefb12936d0e36532ed771dc0a2dff8401fc301f658ed38ef88 SHA512 aded530d3b79ead6ba5c44668c6d6964d7721f9617249f6aaa1c8f558ad4b3d3c1b6d78b639a4cb8dd27a671879b662fdbba0502fd04e131f3286169507df30c
 DIST gson-2.8.5.jar 241622 BLAKE2B b13887177b5d5f2a11b2dde1fdbaa3a95b55bb7b5500624c7eb0745e861c897ed1e27868bad19d30a1670c90f3068a8fd40e1b81e5e25e96819fa5c371a5e1af SHA512 5dd7214c542a7b93aab3eab0ba13e4ac3d6ddb05c795fb6d3992e21925a98dce87cb186ac67b4d3ad146f96e14d38b3892837eca57a27b4e845aca6d4e4f708a
 DIST sleuthkit-4.10.1.tar.gz 3524246 BLAKE2B ddea16693730a993032868ea60423d4bfcf3cba470010854c7bd36ab0a033325d906a0e4760501d59fdda4f37e12052f8672d33e4e374d1a6cdb03e22d0de367 SHA512 3ee335ba98bbb16985207ad50bc15a607ea2bcf550bba392be1cace8982c893a29e9de64e6598d02f41f9f745dc720f829317ed31f068e6cb1f6c230699e47bf
-DIST sleuthkit-4.11.0.tar.gz 3619891 BLAKE2B ce18579d1e82ab26fd05c92da6bac84a50b856b321fa9cb21c42cb36c1795794e72b71225b392b1a3f732738e9da0161c4e93c17359730ab6dabba6fa3a77154 SHA512 fabaf0e7815145f82cf7d8c342d403939511afa36f29318a89212a8aa1a3465e2050629ff9e308b34cfeb3c2c98efa94f9546737cba749c075c4e583b8808580
 DIST sleuthkit-4.11.1.tar.gz 3718417 BLAKE2B 4ce1fa68f770e61942e00e6a05ac751afdd7f33d781ec1069e9a8cb9a27d22f0ed506e9affeaddaf9ecfa98e6d30f468314b5a00d35b20ba01fc312765dbef14 SHA512 04e4ca1c18bda56c816aa493eb3b887f2f62162e16c35079d4208b89464a78109fc189fec55ea6db8a60ab01a4e46c87902f00286abee203ff0c53ab572cfeda
-DIST sleuthkit-4.9.0.tar.gz 3473764 BLAKE2B 3950e586595f53a81c845b3b1fbaf4939a84ee3d81e8141cabf41c9fbee1b1f5cf1b8bd6cab95b157d60364541736f750c8ada61c76da89e663721b9a67330ef SHA512 1db8b9f825aa551fe5bdf01285832b903fb4f2d6a8fd9a57a5cd5c9005dfdbec22d3dd49d394616d838e2a2111110018e787f2ed467a1c27a500fc75bed0dd0b
 DIST sleuthkit-libewf_64bit-20130416.tar.gz 23818247 BLAKE2B 23be933ed8a74e4834ee6571a28d81ba16e98e4e4e27b5b1b3b655d1d92a6eadcba35aadf96aa404e6e0a225b27f3f5daff2836879b87fe58440a3ad5645de44 SHA512 611cbb57de17600caee0330bbe9917c4481d7711a35dba8c072fd49cd3e1714e0a3ce30fd8fcac9981db848e80870bf5d215326c56808bb6f5b4c8dcc1e5a3c9
 DIST sqlite-jdbc-3.25.2.jar 7064881 BLAKE2B 3917da6127137bab710a9e61f326f59320ce94654ebb8ae5e694b05aed6b9b1bd367ade2f08ce5bb52c3ac296992240ad949969f5eff712615d07a18588c6a17 SHA512 efd1ea26d7f4f9bc66bf0d5f80234a0c535829bd498e4c5a0cab42873b58ac69133497d8c45689a1d3a39e657a2d0474d6b930c7bc415dd623801ee4a7354ffb
 EBUILD sleuthkit-4.10.1-r3.ebuild 8387 BLAKE2B 832c89db383af53b50b5bae028ec6aafce52f42fedb73ade88894af8f8c7f76fb46d0fe2177c459aa28307144399ff5962d92323db5fdd98a33e71180940452c SHA512 1ff1f735609032ca8d46196f202195369e31e8a8bea90d5be5e5e6807f0dae0a4e910c07a3efff8e28e00a3beb81bfbd97d5923acab033b929a8a29ee3e93286
-EBUILD sleuthkit-4.10.1-r4.ebuild 7873 BLAKE2B 27dc0eb205ec70dd4949f00539ffe4cf6824b2c0727ee05151e46a099b4727482eebd79454a9a1ca6e34dfc9287213ab6592599ccc3ed4fe05adfeb603e70dc7 SHA512 7f7e7ecd7f4282c0ac9144d2a4dd3aafd2883dd81037335a1c68c842781786f56c90cf9ab0a5031b7c051734e8551694b0c97ef3a7b1013af15f0041da6f298d
-EBUILD sleuthkit-4.11.0.ebuild 7873 BLAKE2B 27dc0eb205ec70dd4949f00539ffe4cf6824b2c0727ee05151e46a099b4727482eebd79454a9a1ca6e34dfc9287213ab6592599ccc3ed4fe05adfeb603e70dc7 SHA512 7f7e7ecd7f4282c0ac9144d2a4dd3aafd2883dd81037335a1c68c842781786f56c90cf9ab0a5031b7c051734e8551694b0c97ef3a7b1013af15f0041da6f298d
-EBUILD sleuthkit-4.11.1.ebuild 8320 BLAKE2B 1b621be9383b949536b336008769299d59b6fe7f09118bb12d1eed89a99b615225ae0e05bde9bc30631b9c0d5170e48b5df7f9406d092bf0a077b004addb908e SHA512 e9c0c39e9653353ffe121e48f85769a1bb95db0a92f244d83a6a8db5595f36b161e04ee4a3f3b9c21a64fbfc8bfbdbbd64fb1880ae7de85984d0b31d9c514fb7
-EBUILD sleuthkit-4.9.0-r1.ebuild 8231 BLAKE2B 7b4f0e8dd2d27fe04c9206b1f9730457f3f66d872bb03cedd2ac7c59b9f25bf9a690ba44e8d7c4b3c8088835dd7ccb0d3d74bc86869994e08b07b2596213ad1e SHA512 686c92fd1fe586c9f77f166e37a6a22b71f8eb9d43961873ab41b9fddf81c949895b40c7349ca85e326a5e9f79df8310347eb13828c035dde132d49a49655628
+EBUILD sleuthkit-4.10.1-r5.ebuild 7869 BLAKE2B 33799750817fe23eec655770f4e3af6a55c173d7924b6ccee9bb064b1d213849e1f4594d8f7c518637aa0ea9396e205190e9e9e459f88f2b5c15c3ff4ca20c62 SHA512 34548ccea8fea1e0ad79bcf2ae3a9610f69b6c4e972cecfd3c9fcecc468b6f28d1847be9d3b17621895e17f7759bc8564bc2a964d1ffce0fc0eeec09fdee3531
+EBUILD sleuthkit-4.11.1-r1.ebuild 8316 BLAKE2B 8f3c29334299cbde16fed19b86d1f44d6a8e7afa6b06d3bb7b1b1681e81da64662691ccae22789817e77890c1fb551d14fd57cedbe2fb836d4010b3f1eadba02 SHA512 5292e74a8ce4fc34b0c89f5533c43666d71ebcd3e393c21114de99ec2fe632dd1ce14ad939fb205ece4ce416030fb47349753e4e2359637b5e6c2ef425859302
 MISC metadata.xml 608 BLAKE2B 4ffbcef7c2ce2700da294752bdc19b2e98323f2fe3f73aa8f8bfe430fa6a148b8a464959a21300398ae4f6933f1383bc014a697283d148dcbe9616e6a38b01d6 SHA512 59fc9a08d8fa875adc1b9cf8a2f47e38611e474a160ef00a7b75582601cb503bb10f19ab303487658d5f16c25991eba2b7a98d4ff5182b8c4ca8dc6e905a04f3
diff --git a/app-forensics/sleuthkit/sleuthkit-4.10.1-r4.ebuild b/app-forensics/sleuthkit/sleuthkit-4.10.1-r5.ebuild
index 78faebc794c0..2376e0f7e793 100644
--- a/app-forensics/sleuthkit/sleuthkit-4.10.1-r4.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.10.1-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,7 +36,7 @@ DEPEND="
 		dev-java/commons-lang:3.6
 		>=dev-java/commons-validator-1.6:0
 		>=dev-java/gson-2.8.5:2.6
-		dev-java/guava:20
+		dev-java/guava:0
 		>=dev-java/jdbc-postgresql-9.4:0
 		>=dev-java/joda-time-2.4:0
 		dev-java/sparsebitset:0
@@ -232,7 +232,7 @@ src_compile() {
 		java-pkg_jar-from --into "${TSK_JAR_DIR}" commons-lang:3.6
 		java-pkg_jar-from --into "${TSK_JAR_DIR}" commons-validator
 		java-pkg_jar-from --into "${TSK_JAR_DIR}" gson:2.6
-		java-pkg_jar-from --into "${TSK_JAR_DIR}" guava:20
+		java-pkg_jar-from --into "${TSK_JAR_DIR}" guava
 		java-pkg_jar-from --into "${TSK_JAR_DIR}" jdbc-postgresql
 		java-pkg_jar-from --into "${TSK_JAR_DIR}" joda-time
 		java-pkg_jar-from --into "${TSK_JAR_DIR}" sparsebitset
diff --git a/app-forensics/sleuthkit/sleuthkit-4.11.0.ebuild b/app-forensics/sleuthkit/sleuthkit-4.11.0.ebuild
deleted file mode 100644
index 78faebc794c0..000000000000
--- a/app-forensics/sleuthkit/sleuthkit-4.11.0.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_BSFIX_NAME="build.xml build-unix.xml"
-inherit autotools java-pkg-opt-2 java-ant-2
-
-DESCRIPTION="A collection of file system and media management forensic analysis tools"
-HOMEPAGE="https://www.sleuthkit.org/sleuthkit/"
-# TODO: sqlite-jdbc does not exist in the tree, we bundle it for now
-#		See: https://bugs.gentoo.org/690010
-# TODO: Upstream uses a very specific version of libewf which is not in
-#       the tree anymore. So we statically compile and link to sleuthkit.
-#       Hopefully upstream will figure something out in the future.
-#		See: https://bugs.gentoo.org/689752
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz
-	java? (
-		http://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.25.2/sqlite-jdbc-3.25.2.jar
-	)
-	ewf? ( https://github.com/sleuthkit/libewf_64bit/archive/VisualStudio_2010.tar.gz -> sleuthkit-libewf_64bit-20130416.tar.gz )"
-
-LICENSE="BSD CPL-1.0 GPL-2+ IBM java? ( Apache-2.0 )"
-SLOT="0/19" # subslot = major soname version
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="aff doc ewf java static-libs test +threads zlib"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-db/sqlite:3
-	dev-lang/perl:*
-	aff? ( app-forensics/afflib )
-	ewf? ( sys-libs/zlib )
-	java? (
-		>=dev-java/c3p0-0.9.5:0
-		dev-java/commons-lang:3.6
-		>=dev-java/commons-validator-1.6:0
-		>=dev-java/gson-2.8.5:2.6
-		dev-java/guava:20
-		>=dev-java/jdbc-postgresql-9.4:0
-		>=dev-java/joda-time-2.4:0
-		dev-java/sparsebitset:0
-	)
-	zlib? ( sys-libs/zlib )
-"
-# TODO: add support for not-in-tree libraries libvhdi and libvmdk
-# libvhdi: https://github.com/libyal/libvhdi
-# libvmdk: https://github.com/libyal/libvmdk
-# DEPEND="${DEPEND}
-# 	vhdi? ( dev-libs/libvhdi )
-# 	vmdk? ( dev-libs/libvmdk )
-# "
-
-RDEPEND="${DEPEND}
-	java? ( virtual/jre:1.8 )
-"
-DEPEND="${DEPEND}
-	java? ( virtual/jdk:1.8 )
-	test? ( >=dev-util/cppunit-1.2.1 )
-"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.1.0-tools-shared-libs.patch
-	"${FILESDIR}"/${PN}-4.6.4-default-jar-location-fix.patch
-	"${FILESDIR}"/${PN}-4.10.1-exclude-usr-local.patch
-)
-
-src_unpack() {
-	local f
-
-	unpack ${P}.tar.gz
-
-	if use ewf; then
-		pushd "${T}" &>/dev/null || die
-		unpack sleuthkit-libewf_64bit-20130416.tar.gz
-		export TSK_LIBEWF_SRCDIR="${T}"/libewf_64bit-VisualStudio_2010
-		popd &>/dev/null || die
-	fi
-
-	# Copy the jar files that don't exist in the tree yet
-	if use java; then
-		TSK_JAR_DIR="${T}/lib"
-		mkdir "${TSK_JAR_DIR}" || die
-		for f in ${A}; do
-			if [[ ${f} =~ .jar$ ]]; then
-				cp "${DISTDIR}"/"${f}" "${TSK_JAR_DIR}" || die
-			fi
-		done
-		export TSK_JAR_DIR
-	fi
-}
-
-tsk_prepare_libewf() {
-	# Inlining breaks the compilation, disable it
-	sed -e 's/LIBUNA_INLINE inline/LIBUNA_INLINE/' \
-		-i "${TSK_LIBEWF_SRCDIR}"/libuna/libuna_inline.h || die
-}
-
-src_prepare() {
-	use ewf && tsk_prepare_libewf
-
-	# Do not pass '-Werror'. This is overkill for user builds.
-	sed -e '/AM_CXXFLAGS/ s/-Werror//g' \
-		-i tsk/util/Makefile.am \
-		-i tsk/pool/Makefile.am || die
-	# Remove -static from LDFLAGS because it doesn't actually create
-	# a static binary. It confuses libtool, who then inserts rpath
-	sed -e '/LDFLAGS/ s/-static//' \
-		-i tools/pooltools/Makefile.am || die
-
-	if use java; then
-		pushd "${S}"/bindings/java &>/dev/null || die
-
-		# Prevent "make install" from installing
-		# jar files under /usr/share/java
-		# We'll use the java eclasses for this
-		# See: https://github.com/sleuthkit/sleuthkit/pull/1379
-		sed -e '/^jar_DATA/ d;' -i Makefile.am || die
-
-		java-pkg-opt-2_src_prepare
-
-		popd &>/dev/null || die
-	fi
-
-	# Override the doxygen output directories
-	if use doc; then
-		sed -e "/^OUTPUT_DIRECTORY/ s|=.*$|= ${T}/doc|" \
-			-i tsk/docs/Doxyfile \
-			-i bindings/java/doxygen/Doxyfile || die
-	fi
-
-	# It's safe to call this even after java-pkg-opt-2_src_prepare
-	# because future calls to eapply_user do nothing and return 0
-	default
-
-	eautoreconf
-}
-
-tsk_compile_libewf() {
-	local myeconfargs=(
-		--prefix=/
-		--libdir=/lib
-		--enable-static
-		--disable-shared
-		--disable-winapi
-		--without-libbfio
-		--with-zlib
-		--without-bzip2
-		--without-libhmac
-		--without-openssl
-		--without-libuuid
-		--without-libfuse
-
-		--with-libcstring=no
-		--with-libcerror=no
-		--with-libcdata=no
-		--with-libclocale=no
-		--with-libcnotify=no
-		--with-libcsplit=no
-		--with-libuna=no
-		--with-libcfile=no
-		--with-libcpath=no
-		--with-libbfio=no
-		--with-libfcache=no
-		--with-libfvalue=no
-
-	)
-	# We want to contain our build flags
-	local CFLAGS="${CFLAGS}"
-	local LDFLAGS="${LDFLAGS}"
-
-	pushd "${TSK_LIBEWF_SRCDIR}" &>/dev/null || die
-
-	# Produce relocatable code
-	CFLAGS+=" -fPIC"
-	LDFLAGS+=" -fPIC"
-	econf "${myeconfargs[@]}"
-
-	# Do not waste CPU cycles on building ewftools
-	sed -e '/ewftools/ d' -i Makefile || die
-	emake
-
-	# Only install the headers and the library
-	emake -C libewf DESTDIR="${T}"/image install
-	emake -C include DESTDIR="${T}"/image install
-	find "${T}"/image -name '*.la' -delete || die
-
-	popd &>/dev/null || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-offline="${TSK_JAR_DIR}"
-		$(use_enable java)
-		$(use_enable static-libs static)
-		$(use_enable threads multithreading)
-		$(use_with aff afflib)
-		$(use_with zlib)
-	)
-	# TODO: add support for non-existing libraries libvhdi and libvmdk
-	# myeconfargs+=(
-	# 	$(use_with vhdi libvhdi)
-	# 	$(use_with vmdk libvmdk)
-	# )
-	myeconfargs+=(
-		--without-libvhdi
-		--without-libvmdk
-	)
-
-	use ewf && tsk_compile_libewf
-	myeconfargs+=( $(use_with ewf libewf "${T}"/image) )
-
-	if use java; then
-		pushd "${S}"/bindings/java &>/dev/null || die
-		java-ant-2_src_configure
-		popd &>/dev/null || die
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Give it an existing bogus ivy home #672220
-	local -x IVY_HOME="${T}"
-
-	# Create symlinks of jars for the required dependencies
-	if use java; then
-		java-pkg_jar-from --into "${TSK_JAR_DIR}" c3p0
-		java-pkg_jar-from --into "${TSK_JAR_DIR}" commons-lang:3.6
-		java-pkg_jar-from --into "${TSK_JAR_DIR}" commons-validator
-		java-pkg_jar-from --into "${TSK_JAR_DIR}" gson:2.6
-		java-pkg_jar-from --into "${TSK_JAR_DIR}" guava:20
-		java-pkg_jar-from --into "${TSK_JAR_DIR}" jdbc-postgresql
-		java-pkg_jar-from --into "${TSK_JAR_DIR}" joda-time
-		java-pkg_jar-from --into "${TSK_JAR_DIR}" sparsebitset
-
-		# case-uco needs gson and expects it under case-uco/java/lib
-		# symlink it to the jar dir we create for java bindings
-		ln -s "${TSK_JAR_DIR}" "${S}"/case-uco/java/lib || die
-		ln -s ./gson.jar "${TSK_JAR_DIR}"/gson-2.8.5.jar || die
-	fi
-
-	# Create the doc output dirs if requested
-	if use doc; then
-		mkdir -p "${T}"/doc/{api-docs,jni-docs} || die
-	fi
-
-	emake all $(usex doc api-docs "")
-}
-
-src_install() {
-	# Give it an existing bogus ivy home #756766
-	local -x IVY_HOME="${T}"
-	local f
-
-	if use java; then
-		pushd "${S}"/bindings/java &>/dev/null || die
-
-		# Install case-uco
-		pushd "${S}"/case-uco/java &>/dev/null || die
-		java-pkg_newjar "dist/${PN}-caseuco-${PV}".jar "${PN}-caseuco.jar"
-		popd || die
-
-		# Install the bundled jar files as well as the
-		# sleuthkit jar installed here by case-uco
-		pushd "${TSK_JAR_DIR}" &>/dev/null || die
-		for f in *; do
-			# Skip the symlinks java-pkg_jar-from created
-			[[ -f ${f} ]] || continue
-
-			# Strip the version numbers as per eclass recommendation
-			[[ ${f} =~ -([0-9]+\.)+jar$ ]] || continue
-
-			java-pkg_newjar "${f}" "${f/${BASH_REMATCH[0]}/.jar}"
-		done
-		popd &>/dev/null || die
-
-		popd &>/dev/null || die
-	fi
-
-	default
-	# Default install target for case-uco installs the jar in the wrong place
-	rm -r "${ED}"/usr/share/java
-
-	# It unconditionally builds both api and jni docs
-	# We install conditionally based on the provided use flags
-	if use doc; then
-		dodoc -r "${T}"/doc/api-docs
-		use java && dodoc -r "${T}"/doc/jni-docs
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-forensics/sleuthkit/sleuthkit-4.11.1.ebuild b/app-forensics/sleuthkit/sleuthkit-4.11.1-r1.ebuild
index 0221dca95e72..145498c3e809 100644
--- a/app-forensics/sleuthkit/sleuthkit-4.11.1.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.11.1-r1.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 		dev-java/commons-lang:3.6
 		>=dev-java/commons-validator-1.6:0
 		>=dev-java/gson-2.8.5:2.6
-		dev-java/guava:20
+		dev-java/guava:0
 		>=dev-java/jdbc-postgresql-9.4:0
 		>=dev-java/joda-time-2.4:0
 		dev-java/sparsebitset:0
@@ -245,7 +245,7 @@ src_compile() {
 		java-pkg_jar-from --into "${TSK_JAR_DIR}" commons-lang:3.6
 		java-pkg_jar-from --into "${TSK_JAR_DIR}" commons-validator
 		java-pkg_jar-from --into "${TSK_JAR_DIR}" gson:2.6
-		java-pkg_jar-from --into "${TSK_JAR_DIR}" guava:20
+		java-pkg_jar-from --into "${TSK_JAR_DIR}" guava
 		java-pkg_jar-from --into "${TSK_JAR_DIR}" jdbc-postgresql
 		java-pkg_jar-from --into "${TSK_JAR_DIR}" joda-time
 		java-pkg_jar-from --into "${TSK_JAR_DIR}" sparsebitset
diff --git a/app-forensics/sleuthkit/sleuthkit-4.9.0-r1.ebuild b/app-forensics/sleuthkit/sleuthkit-4.9.0-r1.ebuild
deleted file mode 100644
index 14c04f32bf32..000000000000
--- a/app-forensics/sleuthkit/sleuthkit-4.9.0-r1.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_BSFIX_NAME="build.xml build-unix.xml"
-inherit autotools java-pkg-opt-2 java-ant-2
-
-DESCRIPTION="A collection of file system and media management forensic analysis tools"
-HOMEPAGE="https://www.sleuthkit.org/sleuthkit/"
-# TODO: sqlite-jdbc does not exist in the tree, we bundle it for now
-#		See: https://bugs.gentoo.org/690010
-# TODO: SparseBitSet does not exist in the tree, we bundle it for now
-#		See: https://bugs.gentoo.org/690012
-# TODO: Upstream uses a very specific version of libewf which is not in
-#       the tree anymore. So we statically compile and link to sleuthkit.
-#       Hopefully upstream will figure something out in the future.
-#		See: https://bugs.gentoo.org/689752
-# TODO: gson-2.8.5 does not exist in the tree. Building it seems to
-# 		require Java 9. We have Java 11 in the tree but I don't see a
-# 		way to use it as a gentoo-vm in order to build gson. Sleuthkit
-# 		upstream still uses Java 8.
-# 		See: https://bugs.gentoo.org/706274
-# TODO: commons-validator-1.6 does not exist in the tree. The latest version
-#		as of writing this ebuild is 1.4.1, for which the build fails. As
-#		per #711930, this is a security sensitive bump. We're gonna fetch
-#		the jar file here and file a bug request for a bump as well:
-#		    https://bugs.gentoo.org/721020
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz
-	java? (
-		https://repo1.maven.org/maven2/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar
-		http://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.25.2/sqlite-jdbc-3.25.2.jar
-		http://repo1.maven.org/maven2/com/zaxxer/SparseBitSet/1.1/SparseBitSet-1.1.jar
-		https://repo1.maven.org/maven2/commons-validator/commons-validator/1.6/commons-validator-1.6.jar
-	)
-	ewf? ( https://github.com/sleuthkit/libewf_64bit/archive/VisualStudio_2010.tar.gz -> sleuthkit-libewf_64bit-20130416.tar.gz )"
-
-LICENSE="BSD CPL-1.0 GPL-2+ IBM java? ( Apache-2.0 )"
-SLOT="0/13" # subslot = major soname version
-KEYWORDS="amd64 ~hppa ppc x86"
-IUSE="aff doc ewf java postgres static-libs test +threads zlib"
-RESTRICT="!test? ( test )"
-
-#
-# Note: It is not possible to move the dep on dev-java/jdbc-postgresql
-# inside a conditional postgres? block because java sources import
-# org.postgres unconditionally as of writing this (version 4.6.4). The
-# postgres USE flag will be used for the TSK postgresql support however.
-#
-DEPEND="
-	dev-db/sqlite:3
-	dev-lang/perl:*
-	aff? ( app-forensics/afflib )
-	ewf? ( sys-libs/zlib )
-	java? (
-		>=dev-java/c3p0-0.9.5:0
-		dev-java/commons-lang:3.6
-		dev-java/guava:20
-		>=dev-java/jdbc-postgresql-9.4:0
-		>=dev-java/joda-time-2.4:0
-	)
-	postgres? ( dev-db/postgresql:= )
-	zlib? ( sys-libs/zlib )
-"
-# TODO: add support for not-in-tree libraries libvhdi and libvmdk
-# libvhdi: https://github.com/libyal/libvhdi
-# libvmdk: https://github.com/libyal/libvmdk
-# DEPEND="${DEPEND}
-# 	vhdi? ( dev-libs/libvhdi )
-# 	vmdk? ( dev-libs/libvmdk )
-# "
-
-RDEPEND="${DEPEND}
-	java? ( virtual/jre:1.8 )
-"
-DEPEND="${DEPEND}
-	java? ( virtual/jdk:1.8 )
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-util/cppunit-1.2.1 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.1.0-tools-shared-libs.patch
-	"${FILESDIR}"/${PN}-4.6.4-default-jar-location-fix.patch
-)
-
-src_unpack() {
-	local f
-
-	unpack ${P}.tar.gz
-
-	if use ewf; then
-		pushd "${T}" &>/dev/null || die
-		unpack sleuthkit-libewf_64bit-20130416.tar.gz
-		export TSK_LIBEWF_SRCDIR="${T}"/libewf_64bit-VisualStudio_2010
-		popd &>/dev/null || die
-	fi
-
-	# Copy the jar files that don't exist in the tree yet
-	if use java; then
-		TSK_JAR_DIR="${T}/lib"
-		mkdir "${TSK_JAR_DIR}" || die
-		for f in ${A}; do
-			if [[ ${f} =~ .jar$ ]]; then
-				cp "${DISTDIR}"/"${f}" "${TSK_JAR_DIR}" || die
-			fi
-		done
-		export TSK_JAR_DIR
-	fi
-}
-
-tsk_prepare_libewf() {
-	# Inlining breaks the compilation, disable it
-	sed -e 's/LIBUNA_INLINE inline/LIBUNA_INLINE/' \
-		-i "${TSK_LIBEWF_SRCDIR}"/libuna/libuna_inline.h || die
-}
-
-src_prepare() {
-	use ewf && tsk_prepare_libewf
-
-	# Do not pass '-Werror'. This is overkill for user builds.
-	sed -e '/AM_CXXFLAGS/ s/-Werror//g' \
-		-i tsk/util/Makefile.am \
-		-i tsk/pool/Makefile.am || die
-
-	if use java; then
-		pushd "${S}"/bindings/java &>/dev/null || die
-
-		# Prevent "make install" from installing
-		# jar files under /usr/share/java
-		# We'll use the java eclasses for this
-		# See: https://github.com/sleuthkit/sleuthkit/pull/1379
-		sed -e '/^jar_DATA/ d;' -i Makefile.am || die
-
-		java-pkg-opt-2_src_prepare
-
-		popd &>/dev/null || die
-	fi
-
-	# Override the doxygen output directories
-	if use doc; then
-		sed -e "/^OUTPUT_DIRECTORY/ s|=.*$|= ${T}/doc|" \
-			-i tsk/docs/Doxyfile \
-			-i bindings/java/doxygen/Doxyfile || die
-	fi
-
-	# It's safe to call this even after java-pkg-opt-2_src_prepare
-	# because future calls to eapply_user do nothing and return 0
-	default
-
-	eautoreconf
-}
-
-tsk_compile_libewf() {
-	local myeconfargs=(
-		--prefix=/
-		--libdir=/lib
-		--enable-static
-		--disable-shared
-		--disable-winapi
-		--without-libbfio
-		--with-zlib
-		--without-bzip2
-		--without-libhmac
-		--without-openssl
-		--without-libuuid
-		--without-libfuse
-
-		--with-libcstring=no
-		--with-libcerror=no
-		--with-libcdata=no
-		--with-libclocale=no
-		--with-libcnotify=no
-		--with-libcsplit=no
-		--with-libuna=no
-		--with-libcfile=no
-		--with-libcpath=no
-		--with-libbfio=no
-		--with-libfcache=no
-		--with-libfvalue=no
-
-	)
-	# We want to contain our build flags
-	local CFLAGS="${CFLAGS}"
-	local LDFLAGS="${LDFLAGS}"
-
-	pushd "${TSK_LIBEWF_SRCDIR}" &>/dev/null || die
-
-	# Produce relocatable code
-	CFLAGS+=" -fPIC"
-	LDFLAGS+=" -fPIC"
-	econf "${myeconfargs[@]}"
-
-	# Do not waste CPU cycles on building ewftools
-	sed -e '/ewftools/ d' -i Makefile || die
-	emake
-
-	# Only install the headers and the library
-	emake -C libewf DESTDIR="${T}"/image install
-	emake -C include DESTDIR="${T}"/image install
-	find "${T}"/image -name '*.la' -delete || die
-
-	popd &>/dev/null || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-offline="${TSK_JAR_DIR}"
-		$(use_enable java)
-		$(use_enable static-libs static)
-		$(use_enable threads multithreading)
-		$(use_with aff afflib)
-		$(use_with zlib)
-	)
-	# Workaround the automagic detection of postgresql
-	local -x ac_cv_lib_pq_PQlibVersion="$(usex postgres)"
-	# TODO: add support for non-existing libraries libvhdi and libvmdk
-	# myeconfargs+=(
-	# 	$(use_with vhdi libvhdi)
-	# 	$(use_with vmdk libvmdk)
-	# )
-	myeconfargs+=(
-		--without-libvhdi
-		--without-libvmdk
-	)
-
-	use ewf && tsk_compile_libewf
-	myeconfargs+=( $(use_with ewf libewf "${T}"/image) )
-
-	if use java; then
-		pushd "${S}"/bindings/java &>/dev/null || die
-		java-ant-2_src_configure
-		popd &>/dev/null || die
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Give it an existing bogus ivy home #672220
-	local -x IVY_HOME="${T}"
-
-	# Create symlinks of jars for the required dependencies
-	if use java; then
-		pushd "${S}"/bindings/java &>/dev/null || die
-
-		java-pkg_jar-from --into "${TSK_JAR_DIR}" c3p0
-		java-pkg_jar-from --into "${TSK_JAR_DIR}" commons-lang:3.6
-		java-pkg_jar-from --into "${TSK_JAR_DIR}" guava:20
-		java-pkg_jar-from --into "${TSK_JAR_DIR}" jdbc-postgresql
-		java-pkg_jar-from --into "${TSK_JAR_DIR}" joda-time
-
-		popd &>/dev/null || die
-	fi
-
-	# Create the doc output dirs if requested
-	if use doc; then
-		mkdir -p "${T}"/doc/{api-docs,jni-docs} || die
-	fi
-
-	emake all $(usex doc api-docs "")
-}
-
-src_install() {
-	local f
-
-	if use java; then
-		pushd "${S}"/bindings/java &>/dev/null || die
-
-		java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
-
-		# Install the bundled jar files
-		pushd "${TSK_JAR_DIR}" &>/dev/null || die
-		for f in *; do
-			# Skip the symlinks java-pkg_jar-from created
-			[[ -f ${f} ]] || continue
-
-			# Strip the version numbers as per eclass recommendation
-			[[ ${f} =~ -([0-9]+\.)+jar$ ]] || continue
-
-			java-pkg_newjar "${f}" "${f/${BASH_REMATCH[0]}/.jar}"
-		done
-		popd &>/dev/null || die
-
-		popd &>/dev/null || die
-	fi
-
-	default
-
-	# It unconditionally builds both api and jni docs
-	# We install conditionally based on the provided use flags
-	if use doc; then
-		dodoc -r "${T}"/doc/api-docs
-		use java && dodoc -r "${T}"/doc/jni-docs
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-forensics/yara/Manifest b/app-forensics/yara/Manifest
index f0d2d4545a30..d1dac363171b 100644
--- a/app-forensics/yara/Manifest
+++ b/app-forensics/yara/Manifest
@@ -1,7 +1,3 @@
-DIST yara-4.1.3.tar.gz 936462 BLAKE2B abfdd5918abe3641056ccde3eebb754cbd66eff5569978d3b1aad5d925d62fcb96b1f7367d0d014dd165db8634418259667be3b2441f93e0848bfbd905ca32dd SHA512 1bfa1787c62dfd9a87fa8db5e8c2fa68f082ae66b16b5373bdcc6bc66b32016fcaffd4baa7e59a7c1f6d3426c972eca9cc22f70d475067d7557b1014a4ab65fc
 DIST yara-4.2.0.tar.gz 1284059 BLAKE2B 735d161fde5f84199315f1ce6d31f1ad79488312bede85d2941a03cb97fe75c3c4db0b3cba75782d338a462d87e9d9ed57b393bbdb68decfb350a1bbd096258b SHA512 24ca707015c77d87126bcaac0991997f6b09403024765d615a06db47191a3f0177e1c1eb4a917ec8412876b61d28f4a708f36999ddd9214c3967968c71ae3b7c
-DIST yara-4.2.0_rc1.tar.gz 1283822 BLAKE2B d7bf869e670a0223895aac31df0dbe063d3f0110d1981ae8a42ab26726976790c744b522f13a6963f521310a281fab2b27d6336b23e504a4a9a3d414473ae452 SHA512 03bd09d7c020078946101854e68b7f9ca17c04f7a68624e9e15dc476fe209cc11b010108a0e7aea9746f05aabdbb8d6a6a2ffc54516eb9cb86f170c4259934df
-EBUILD yara-4.1.3.ebuild 1084 BLAKE2B 0a458d363a826219fca0b28da3d9520446597d89f5d51564b3801b7703421b2eead7360d0deb88382c4fd5459ff7165d60de16b060c3b3282f24ec71ce903d4e SHA512 a30a98f8a109130c06f578a76aa99f91bf2baaddaaa514b67e51cdc5957cb7b9f7a219827359a64df380425c26253e1114cfbed2007cbd5adf37cec9322c00b7
 EBUILD yara-4.2.0.ebuild 1154 BLAKE2B d881ba15e2b3bfcde9ce490981af10e8a2828edcfd6a729d5ce69b763fd4f6be1bd1c13fb83bc79602ba6d0be4f2c2f52cd840f07419687d2e8293bb2df1370c SHA512 edb5a75ad5fdef624320c18950a11faf45e5a04152afc3ec4c7621d07e9eb3000c8bd82e695ff8d5226ecb5347c3ab155dca98482d6bf102c261cf5c10f7b799
-EBUILD yara-4.2.0_rc1.ebuild 1154 BLAKE2B d881ba15e2b3bfcde9ce490981af10e8a2828edcfd6a729d5ce69b763fd4f6be1bd1c13fb83bc79602ba6d0be4f2c2f52cd840f07419687d2e8293bb2df1370c SHA512 edb5a75ad5fdef624320c18950a11faf45e5a04152afc3ec4c7621d07e9eb3000c8bd82e695ff8d5226ecb5347c3ab155dca98482d6bf102c261cf5c10f7b799
 MISC metadata.xml 1151 BLAKE2B a2f641c9c0f851884cc6482248446d7b509e4ca2c5cec26159063a0fec025b8928955cfefbdf87e26ace0d06a01a2cec7d1f3d10b09b99b1cf1040c09519adfa SHA512 5001e3a14dc458a6b27f69226fb346dc8bf07058270e20b81f325c0742300ccb6e241b3d3dc6f55eccc43b68f0fea74977d33d8bcca6d0612057f6015f857500
diff --git a/app-forensics/yara/yara-4.1.3.ebuild b/app-forensics/yara/yara-4.1.3.ebuild
deleted file mode 100644
index e11e07efff40..000000000000
--- a/app-forensics/yara/yara-4.1.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A malware identification and classification tool"
-HOMEPAGE="http://virustotal.github.io/yara/"
-SRC_URI="https://github.com/virustotal/yara/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/8"
-KEYWORDS="~amd64 ~x86"
-IUSE="+dex +dotnet +cuckoo +macho +magic profiling python test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/openssl:=
-	cuckoo? ( dev-libs/jansson:= )
-	magic? ( sys-apps/file:= )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="python? ( =dev-python/yara-python-$(ver_cut 1)* )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable profiling) \
-		$(use_enable cuckoo) \
-		$(use_enable magic) \
-		$(use_enable dotnet) \
-		$(use_enable macho) \
-		$(use_enable dex) \
-		$(use_enable test static)
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-
-	# TODO: Allow tests to work against dyn. lib rather than building
-	# statically just for tests.
-	find "${ED}" -name '*.a' -delete || die
-}
diff --git a/app-forensics/yara/yara-4.2.0_rc1.ebuild b/app-forensics/yara/yara-4.2.0_rc1.ebuild
deleted file mode 100644
index 8bac51561719..000000000000
--- a/app-forensics/yara/yara-4.2.0_rc1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A malware identification and classification tool"
-HOMEPAGE="http://virustotal.github.io/yara/"
-SRC_URI="https://github.com/virustotal/yara/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${PV/_/-}"
-
-LICENSE="Apache-2.0"
-SLOT="0/8"
-if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~amd64 ~x86"
-fi
-IUSE="+dex +dotnet +cuckoo +macho +magic profiling python test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/openssl:=
-	cuckoo? ( dev-libs/jansson:= )
-	magic? ( sys-apps/file:= )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="python? ( =dev-python/yara-python-$(ver_cut 1)* )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable profiling) \
-		$(use_enable cuckoo) \
-		$(use_enable magic) \
-		$(use_enable dotnet) \
-		$(use_enable macho) \
-		$(use_enable dex) \
-		$(use_enable test static)
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-
-	# TODO: Allow tests to work against dyn. lib rather than building
-	# statically just for tests.
-	find "${ED}" -name '*.a' -delete || die
-}