gentoo resync : 29.12.2022

17 files changed, 99 insertions, 362 deletions

diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index d32d0812ccc6..fa15cdaa93ad 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/afflib/Manifest b/app-forensics/afflib/Manifest
index 2116ca136e8f..3e1e1f25a16b 100644
--- a/app-forensics/afflib/Manifest
+++ b/app-forensics/afflib/Manifest
@@ -1,4 +1,4 @@
 AUX afflib-3.7.19-search-path.patch 1132 BLAKE2B 8314c7591277658c704f0e82105ecb2af7e70761aaab1e9329aa72f400a4b3774e2ba3ccc6e271b4a1be78b0935cbac058acb3e5dbc8e16123e9d3f21b4ef018 SHA512 80551435c89a7dbacfbce5c9d73a47e89d31600511abffab9a8235b60b0b398bc26d10a144676c99e5f11b680a994a2ffc8eab3409a332f708f5cdd5782985fb
 DIST afflib-3.7.19.tar.gz 540165 BLAKE2B dea0998741121d2c1ae0e42ced9652ec46816282128469af75e0a32f9e4e2d09ac4afb4888ee7925366a03a867932f2446bfcd3800ab4dc021939ab6c38c797b SHA512 6e0df7477bf7dbd3814099d94e3fce122e0cf9b714a425521b7458f4eedc6e8b8e7283fd37926b7c992cdf21d3adec620df29a79a6a5311bf1d1b5d4930768bc
-EBUILD afflib-3.7.19.ebuild 1617 BLAKE2B 6c0235a91a60aebd4702f3cadaf469fc6ed4ab24f978713a2dcf7f760844a6edbfedc3f7039406d0fe9e02576d97273d6c0af9a9c8ef2ffe3989f2d8e3bcb8c0 SHA512 429a1fd7f7c98df71b34df5c7e22bb7ed983b1032cdb0d8c0d41d9e6d31fafcb1ef38de116443715ed05e256d3b978f7590913ed7b177c1dfc7425df4a725d9c
+EBUILD afflib-3.7.19-r1.ebuild 1614 BLAKE2B 851e31a84a4b73711a01972ef1f501fb1d5d05df0dad5ba53ad20dfb4124905ea4a7c69202b69e61bd4048eaa0051ff7c4a1ea2f18540511f5e62ced22cddd59 SHA512 09b844ad646aca55750020ce8f921b112d4a17750dc154be1cafd53f7bcb1f92254868bf3ac1327dab4256be45bc4d1f99a764a2fdeab7e7671d7557f04e22dd
 MISC metadata.xml 430 BLAKE2B 5f2c13fd07809bc142d3604b217df84931f7ac4c51aebe8b9eb33121b145b9f35319a5374fbe1bf22d06a186fb49f6f704b3cdf30a54de1c7223deab0c7c147a SHA512 b7929231cb22470e855ee73cc7bc0f04f73da20fe145ee004cc6f5a4d79c63b11adcba7d885f1036401fd4ccefb0056f5025d2268fe0d79ed04e5000207ed86a
diff --git a/app-forensics/afflib/afflib-3.7.19.ebuild b/app-forensics/afflib/afflib-3.7.19-r1.ebuild
index a9cfa61c34b8..1becd23f068c 100644
--- a/app-forensics/afflib/afflib-3.7.19.ebuild
+++ b/app-forensics/afflib/afflib-3.7.19-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit autotools python-single-r1
 
 MY_PN=AFFLIBv3
@@ -25,15 +24,15 @@ RESTRICT="test"
 
 RDEPEND="
 	dev-libs/expat
-	sys-libs/zlib:0=
-	fuse? ( sys-fs/fuse:= )
-	dev-libs/openssl:0=
-	ncurses? ( sys-libs/ncurses:0= )
+	sys-libs/zlib:=
+	fuse? ( sys-fs/fuse:0 )
+	dev-libs/openssl:=
+	ncurses? ( sys-libs/ncurses:= )
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]')
 	)
-	readline? ( sys-libs/readline:0= )
+	readline? ( sys-libs/readline:= )
 	s3? ( net-misc/curl )
 "
 DEPEND="${RDEPEND}"
@@ -66,10 +65,12 @@ src_configure() {
 		$(use_enable static-libs static)
 		$(use_enable threads threading)
 	)
+
 	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
+
 	find "${ED}" -name "*.la" -delete || die
 }
diff --git a/app-forensics/lynis/Manifest b/app-forensics/lynis/Manifest
index d41857411d4d..f0d32a5b0475 100644
--- a/app-forensics/lynis/Manifest
+++ b/app-forensics/lynis/Manifest
@@ -1,4 +1,4 @@
 AUX lynis.cron-new 72 BLAKE2B 1f2d683c74e9e85f142c23277f24e8c81b33e4d1691a6f171694194bd5d81a5e1473532afe2c6fca23c995d9c7bd08d18d6eed78a07661618c12e22b35e9ff81 SHA512 1cdaaee433912c2ccdec8ad7c9b88be55fe3f1d68e2fca79cc6e0e10112d465a70cfbe0a049623437f604bfc9793e0d29b709e035cbf710d4d38ba48acc5355f
-DIST lynis-3.0.7.tar.gz 338212 BLAKE2B d9cddcba9c83ddee08ea38c8e80bf6f0a78179ad102673a876a1fe3d4544612e945d8637a8d026ce7bff72b09d6274223031e1cb6fc74596b2c65f0380fecd67 SHA512 c65d42071a48b15c2f16ceaf30404db0dac740c4cc6109442a0757e0576f794ebaf9430547eb1a0a452ce85993f00e8779ce2c4ffc47c206d674b8fd2cb02e3a
-EBUILD lynis-3.0.7-r1.ebuild 1797 BLAKE2B d52a6e8ffe953af973b32d54fa0f5d28920f8f431b51f5fdb917292c4eef781bcc04a3a6e0b176e8771adea3b048346d94f50428de70469fc2067d26b73980c7 SHA512 1cbb68236f68d559d29cd4c78307d55aa798fedd38c87e62f12c39e147066e9aa84d8560e8904653d25da9ab6feca968b8e5f0def845f884ffd405089e1c8b6f
+DIST lynis-3.0.8.tar.gz 339467 BLAKE2B 490bd6799619a4247c3fa68cc96f2f1fead651b23db0ffb512394960f8ca0360ab7f25d2bb8d9e742641558972e1fdd4b1e18d7de0d13007988276eed3a97b1f SHA512 df41aa8b7518a72ee17732eb7e69ccc62ca6e1323d3adc7aec509cd1c21494fece873e101bc317655dafbf58b32699f56dd27eec13a2ce615801cee75961cd33
+EBUILD lynis-3.0.8.ebuild 1797 BLAKE2B d52a6e8ffe953af973b32d54fa0f5d28920f8f431b51f5fdb917292c4eef781bcc04a3a6e0b176e8771adea3b048346d94f50428de70469fc2067d26b73980c7 SHA512 1cbb68236f68d559d29cd4c78307d55aa798fedd38c87e62f12c39e147066e9aa84d8560e8904653d25da9ab6feca968b8e5f0def845f884ffd405089e1c8b6f
 MISC metadata.xml 324 BLAKE2B 3ccc9fa29e93b80f279e24768171e1ed3ae9c371ec0cc1fca13770f498c91a75235e886b1c873dbf2a6a7355caa054c614612054251f3cdd828813e93948b6be SHA512 349bad0292a35a2434456d7b9385163a41e2430651f3fe115a3953ae8419d4369b339691b84502ff661267c8948fac13eeffe9dec2cb0a92bdf3d478cb48b0a5
diff --git a/app-forensics/lynis/lynis-3.0.7-r1.ebuild b/app-forensics/lynis/lynis-3.0.8.ebuild
index 6209f7360914..6209f7360914 100644
--- a/app-forensics/lynis/lynis-3.0.7-r1.ebuild
+++ b/app-forensics/lynis/lynis-3.0.8.ebuild
diff --git a/app-forensics/magicrescue/Manifest b/app-forensics/magicrescue/Manifest
index e57067d42ae5..23b944ca1fde 100644
--- a/app-forensics/magicrescue/Manifest
+++ b/app-forensics/magicrescue/Manifest
@@ -1,6 +1,5 @@
 AUX magicrescue-1.1.10-ldflags.patch 1140 BLAKE2B 98deed569c8809e0e7a31c86cd29f1e79eaa2a2da986f2dcbce3591a1eba0e0aff43caf48db008a1c7c09e27d602e8c10a41889c7a89ad3696e9a5514449eec5 SHA512 abcb734fc4381408d8c4072e637a326a1b619defc244f70fb68608485a4a36ff4b4a206c296bb7dec0ae19fbe8030b88c9a6b528ca0f1934a0308f167ddd966d
 AUX magicrescue-1.1.10-remove_toolsdir.patch 4087 BLAKE2B ce13561cac085ca3c558d02fd9538ce9c3973a022fb3e51048ede5643e258d2a352425f5c3e1a164d209d2ecbb46a6c3c73da997c08a2d61f23fa764d8c526be SHA512 4b2a627475d3fff6b3a8c30dd883b3358043a429d05772bc4e1f658273a7c2a7beb29bc69978ac817074ba25827e4954a948076d77de73832eaf479e4bc1b8c8
 DIST magicrescue-1.1.10.tar.gz 227237 BLAKE2B a1584f4e6f4b6771783c565901775e181ba2e952e780565831e5d46245a4dd4670657cec7fb57b18d7dfc09954faec410da2dfe1b35130c23d22d8a6ccf0ab07 SHA512 54fc943a1f521563a3416040eb6b140e3ef79966b615ae0223be0558b810f9202c2d1e5ba0165c43a614caf78dbce1b0992775bef39e9611d2dc290e4582c29d
-EBUILD magicrescue-1.1.10-r2.ebuild 996 BLAKE2B c0a53477f47e3b0dbbb5308d8670e561cf80df8adc66a1fa450a0755d28b5fd7615333472d62f2118af8c3eb64e5f3f598d7b0bdde7a4d2a3ffaf6d5ee55da42 SHA512 95053ba5738fdc9505808bae77d7589ea3644306d499fc4d4e93d7740c9e91af0556998009f1d09d6b628d5662f966b77c494676fb4eef05c9b89f6503ebe356
-EBUILD magicrescue-1.1.10.ebuild 1016 BLAKE2B ffea7870e2181c79b931b9205e46dba6167a71496f97d81d0ea70b84a7ccb2ff0e279aed3e30bc60bc6fb384b9172232d991ea013bbe1c2523ff6390377ba23e SHA512 3c9586f388b1dfa77af4d5e35d89efb9cb178818e3319d44487c83431e0058da4982f58497abfb1fac245b47a74e1ced44e1cf43442bb8d50a6d79b47e6f805f
+EBUILD magicrescue-1.1.10-r2.ebuild 1065 BLAKE2B 89b8650ca7cc579556e826a06c75dc055b2580c247980b5bd7727d3c005216a2029187cc7fdccec83ca2e5bcb123edd710d7e78942e0a61314bfa89cdf19f4df SHA512 9ac04f21266e98e69397f103f8a51f4923f1d2910ca4bc236ef8e26d21595a7793eeea6fd61bd8db4c0a18141fcb3dcff226dc04e66503ffecde3ca49a4e90b9
 MISC metadata.xml 750 BLAKE2B 2d31ceb3d7946f742beea0391f8da9fd3f725fb8f70e9bc307c925789ae0078093dcee5c3701a35a8deed15b3fb7e95fb55e48a5f87058e879437bf4389b953d SHA512 5feab26aca11abdb49fcce5a0ac0db39129bcda43a030f58618beadf9a3299616e91497a5bdf1c347dbb66ba19fd4f30b9cb89149351a086d55a3230a555910a
diff --git a/app-forensics/magicrescue/magicrescue-1.1.10-r2.ebuild b/app-forensics/magicrescue/magicrescue-1.1.10-r2.ebuild
index 792a497947f0..57f9325b02a0 100644
--- a/app-forensics/magicrescue/magicrescue-1.1.10-r2.ebuild
+++ b/app-forensics/magicrescue/magicrescue-1.1.10-r2.ebuild
@@ -11,12 +11,14 @@ SRC_URI="https://github.com/jbj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
+# - File collision with net-mail/safecat, bug #702004
+# - BDEPEND on perl for pod2man, bug #852671
 DEPEND="sys-libs/gdbm:="
 RDEPEND="${DEPEND}
 	!net-mail/safecat"
-# File collision with net-mail/safecat, bug #702004
+BDEPEND="dev-lang/perl"
 
 PATCHES=(
 	"${FILESDIR}/${P}-ldflags.patch"
diff --git a/app-forensics/magicrescue/magicrescue-1.1.10.ebuild b/app-forensics/magicrescue/magicrescue-1.1.10.ebuild
deleted file mode 100644
index d9f26ef7e6b8..000000000000
--- a/app-forensics/magicrescue/magicrescue-1.1.10.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Find deleted files in block devices"
-HOMEPAGE="https://github.com/jbj/magicrescue"
-SRC_URI="https://github.com/jbj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="|| ( sys-libs/gdbm sys-libs/db:* )"
-RDEPEND="${DEPEND}
-	!net-mail/safecat"
-# File collision with net-mail/safecat, #702004
-
-PATCHES=( "${FILESDIR}/${P}-ldflags.patch"
-		  "${FILESDIR}/${P}-remove_toolsdir.patch" )
-
-src_prepare() {
-	tc-export CC
-	sed -i -e "\
-			s:\$(INSTALLDIR)/share/magicrescue/recipes:\$(INSTALLDIR)/share/doc/${P}/recipes:;\
-			s:\$(INSTALLDIR)/man/man1:\$(INSTALLDIR)/share/man/man1:;\
-			s:\$(INSTALLDIR)/share/magicrescue/tools:\$(INSTALLDIR)/bin:" Makefile.in || die "could not mangle Makefile.in"
-	default
-}
-
-src_configure() {
-	# Not autotools, just looks like it sometimes
-	./configure --prefix=/usr || die
-}
diff --git a/app-forensics/rkhunter/Manifest b/app-forensics/rkhunter/Manifest
index 536d86676480..efa330d12876 100644
--- a/app-forensics/rkhunter/Manifest
+++ b/app-forensics/rkhunter/Manifest
@@ -4,4 +4,4 @@ AUX rkhunter-1.4.cron 4002 BLAKE2B 4effc65dbff981fc90370dfae3c5e6b7d6d6f60e5aabc
 AUX rkhunter.bash-completion 2499 BLAKE2B 5cc845f3780e5b92acb84aad8141147b87245d554770282b91ba04771d7d8e727691872bdee129f25c7dd1a1440944e4b6959b9981c9c73683f1fddd479b225c SHA512 8fba540f5425169810b8baaf2e801638e3286aa93a69d4a96f5916e3bc9b632edaef6b509b8ca58f8047a7c7d4bb4bf348ad7923e855edce3dd0432725a944e7
 DIST rkhunter-1.4.6.tar.gz 302137 BLAKE2B 89c61386b57f743f4205f8c826eaa8a9dc9a0d413ac47efb26b6f93d8d642f619f35b7a4c021521b662547c02a16071b8980d158cfb9e081a64870558dbaeff0 SHA512 c51a21b6b66ed1f73a19d8ce04eaba35999eefcb666acc824989c3bf53ac56d24a33ac4fec290be942e33fe24674406b371eafff73f7e697b9e03ec031b37216
 EBUILD rkhunter-1.4.6-r1.ebuild 1421 BLAKE2B 01672b9f5175a07e82de80ea504bf2f417d5044d62734e0dd016ddb47275ab095002dc7bc40d17feda058f3d3cd1ded5db3fa526cfa900983fa95eb4df964dc3 SHA512 df67033f0f6398d4ef2da17801bed918d2decaf9271bc1a905001ef58b2a1b7307431483772d8e48b3c9b2fd03bd30f38e2430f4e3e27ce919b87d6ccc0b97cf
-MISC metadata.xml 218 BLAKE2B 0ce49a64748cd4ca9fea2da8bdf5ca011123c240069f4d1c29548a591a4b0da449814eefa820122203bfa2cc9f29c968f429470a2637960394170b8c003c3898 SHA512 16ccf29ca9a3634a03604d188ceb82a718a94b2b5b343ad9bc27c206dc5b4445201aa7b17d6d0f11367f23a124145650f90162fabdd7f161e02bafe1f8a1ab13
+MISC metadata.xml 246 BLAKE2B 71f95ea599de237367403827e76d52e998bba4eb792ff480bd82ba30fb410ba21d1cd9354d2b74a786c0a07364db79126e35def1c76152001bda50051174a672 SHA512 25ba413deaa84fe7bd1129f82e8ef9de9e335a8ec5d1d42a29164a40dddc2d0e06e9762160af686044488c163aff60c6ad9843b6df1e551df8446c138f86e6ae
diff --git a/app-forensics/rkhunter/metadata.xml b/app-forensics/rkhunter/metadata.xml
index 921f63f4fe05..32f2e6c9f915 100644
--- a/app-forensics/rkhunter/metadata.xml
+++ b/app-forensics/rkhunter/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">rkhunter</remote-id>
 	</upstream>
diff --git a/app-forensics/sleuthkit/Manifest b/app-forensics/sleuthkit/Manifest
index 950642ada999..817aad2d9cca 100644
--- a/app-forensics/sleuthkit/Manifest
+++ b/app-forensics/sleuthkit/Manifest
@@ -1,13 +1,10 @@
 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 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.1.tar.gz 3718417 BLAKE2B 4ce1fa68f770e61942e00e6a05ac751afdd7f33d781ec1069e9a8cb9a27d22f0ed506e9affeaddaf9ecfa98e6d30f468314b5a00d35b20ba01fc312765dbef14 SHA512 04e4ca1c18bda56c816aa493eb3b887f2f62162e16c35079d4208b89464a78109fc189fec55ea6db8a60ab01a4e46c87902f00286abee203ff0c53ab572cfeda
 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-r5.ebuild 7869 BLAKE2B 33799750817fe23eec655770f4e3af6a55c173d7924b6ccee9bb064b1d213849e1f4594d8f7c518637aa0ea9396e205190e9e9e459f88f2b5c15c3ff4ca20c62 SHA512 34548ccea8fea1e0ad79bcf2ae3a9610f69b6c4e972cecfd3c9fcecc468b6f28d1847be9d3b17621895e17f7759bc8564bc2a964d1ffce0fc0eeec09fdee3531
+EBUILD sleuthkit-4.10.1-r5.ebuild 7866 BLAKE2B e0f362c8b2fe8176a48eae2628b43baf9e21ddbb8bf8459e626077d4708e57160e90d708d5561e76798c6c263371d54424a1283966b8fdafbc1c61cfa3c56eb8 SHA512 293515763d2d40cb87b675ec5cd0f3458d0ace2087addb1f3713012bf52e0e99b0edf36ea57bf0d340ad27ea4999bc86ca0f33779613d663ea1fbbff1731ad8b
 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-r3.ebuild b/app-forensics/sleuthkit/sleuthkit-4.10.1-r3.ebuild
deleted file mode 100644
index 345ed4e0ca35..000000000000
--- a/app-forensics/sleuthkit/sleuthkit-4.10.1-r3.ebuild
+++ /dev/null
@@ -1,301 +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: 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
-		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/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/guava:20
-		>=dev-java/jdbc-postgresql-9.4:0
-		>=dev-java/joda-time-2.4:0
-		dev-java/sparsebitset
-	)
-	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
-	"${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}" 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
-	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.10.1-r5.ebuild b/app-forensics/sleuthkit/sleuthkit-4.10.1-r5.ebuild
index 2376e0f7e793..a2a1eadc3ede 100644
--- a/app-forensics/sleuthkit/sleuthkit-4.10.1-r5.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.10.1-r5.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.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"
+KEYWORDS="amd64 ~hppa ppc x86"
 IUSE="aff doc ewf java static-libs test +threads zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/app-forensics/yara/Manifest b/app-forensics/yara/Manifest
index d1dac363171b..4420d1650635 100644
--- a/app-forensics/yara/Manifest
+++ b/app-forensics/yara/Manifest
@@ -1,3 +1,6 @@
+AUX yara-4.2-test.patch 450 BLAKE2B b15319c9921e88504057deead820a884b963e2c240c5486fcfbaf51d7139932bd220de65f8f476f8a264529ac08fbec5ad9e40565d50a3157bb3b3ca783ff26e SHA512 36604637a5de0d6a9553b92b6f6e732cce312b7fe65dcdf70ea70e0a552251f2dd2b5916cad8c78138b946ee4b0bf558324cf944eff519e37af3c83efe61177a
 DIST yara-4.2.0.tar.gz 1284059 BLAKE2B 735d161fde5f84199315f1ce6d31f1ad79488312bede85d2941a03cb97fe75c3c4db0b3cba75782d338a462d87e9d9ed57b393bbdb68decfb350a1bbd096258b SHA512 24ca707015c77d87126bcaac0991997f6b09403024765d615a06db47191a3f0177e1c1eb4a917ec8412876b61d28f4a708f36999ddd9214c3967968c71ae3b7c
-EBUILD yara-4.2.0.ebuild 1154 BLAKE2B d881ba15e2b3bfcde9ce490981af10e8a2828edcfd6a729d5ce69b763fd4f6be1bd1c13fb83bc79602ba6d0be4f2c2f52cd840f07419687d2e8293bb2df1370c SHA512 edb5a75ad5fdef624320c18950a11faf45e5a04152afc3ec4c7621d07e9eb3000c8bd82e695ff8d5226ecb5347c3ab155dca98482d6bf102c261cf5c10f7b799
+DIST yara-4.2.1.tar.gz 1285173 BLAKE2B dc290bf7fe85d468fd519e68a12d88097d817ca064a665397ba64768078a2d572b46e488eb48747ea1904207598b41a72a510b4b8e4e8601cf518cb6ab98c322 SHA512 036a35d713647b23998135da0d27c13a8876aa44e18e3c9dc99fa425273d7c4a953cbdc78f413f29e8bf818d84b340d0719e241d2a83b7165a16d97e952c45b0
+EBUILD yara-4.2.0-r1.ebuild 1229 BLAKE2B d8883b6c768bdd079dacbfd248323454632b4382e977a531d7845c5f43ab5d54252d660b6f707507892bc6df9c83e8aa2fd60ad614ab5105011f8dc9cf6721a4 SHA512 62d73483d08730a79a0539bf3b2c538c923be2150a6a3796c488bab1195bdd35d7d74ea077c98b16cb5198f8d2b5c75ee8da0cee62612e403997947ad8f6f115
+EBUILD yara-4.2.1.ebuild 1229 BLAKE2B d8883b6c768bdd079dacbfd248323454632b4382e977a531d7845c5f43ab5d54252d660b6f707507892bc6df9c83e8aa2fd60ad614ab5105011f8dc9cf6721a4 SHA512 62d73483d08730a79a0539bf3b2c538c923be2150a6a3796c488bab1195bdd35d7d74ea077c98b16cb5198f8d2b5c75ee8da0cee62612e403997947ad8f6f115
 MISC metadata.xml 1151 BLAKE2B a2f641c9c0f851884cc6482248446d7b509e4ca2c5cec26159063a0fec025b8928955cfefbdf87e26ace0d06a01a2cec7d1f3d10b09b99b1cf1040c09519adfa SHA512 5001e3a14dc458a6b27f69226fb346dc8bf07058270e20b81f325c0742300ccb6e241b3d3dc6f55eccc43b68f0fea74977d33d8bcca6d0612057f6015f857500
diff --git a/app-forensics/yara/files/yara-4.2-test.patch b/app-forensics/yara/files/yara-4.2-test.patch
new file mode 100644
index 000000000000..43a97030a4fd
--- /dev/null
+++ b/app-forensics/yara/files/yara-4.2-test.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/836790
+https://github.com/VirusTotal/yara/pull/1683
+--- a/tests/test-rules.c
++++ b/tests/test-rules.c
+@@ -3061,7 +3061,7 @@ void test_process_scan()
+     exit(EXIT_FAILURE);
+   }
+ 
+-  spawn("/bin/sh", "-c", "VAR='Hello, world!'; sleep 600; true");
++  spawn("/bin/sh", "-c", "VAR='Hello, world!'; sleep 600& PID=\$!; trap \"kill \$PID\" EXIT; wait; true");
+ 
+   counters.rules_matching = 0;
+   counters.rules_not_matching = 0;
diff --git a/app-forensics/yara/yara-4.2.0.ebuild b/app-forensics/yara/yara-4.2.0-r1.ebuild
index 8bac51561719..55e7f11069d5 100644
--- a/app-forensics/yara/yara-4.2.0.ebuild
+++ b/app-forensics/yara/yara-4.2.0-r1.ebuild
@@ -26,6 +26,8 @@ DEPEND="
 RDEPEND="${DEPEND}"
 PDEPEND="python? ( =dev-python/yara-python-$(ver_cut 1)* )"
 
+PATCHES=( "${FILESDIR}/${PN}-$(ver_cut 1-2)-test.patch" )
+
 src_prepare() {
 	default
 	eautoreconf
@@ -51,5 +53,5 @@ src_install() {
 
 	# TODO: Allow tests to work against dyn. lib rather than building
 	# statically just for tests.
-	find "${ED}" -name '*.a' -delete || die
+	find "${ED}" -name '*.a' -o -name '*.la' -delete || die
 }
diff --git a/app-forensics/yara/yara-4.2.1.ebuild b/app-forensics/yara/yara-4.2.1.ebuild
new file mode 100644
index 000000000000..55e7f11069d5
--- /dev/null
+++ b/app-forensics/yara/yara-4.2.1.ebuild
@@ -0,0 +1,57 @@
+# 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)* )"
+
+PATCHES=( "${FILESDIR}/${PN}-$(ver_cut 1-2)-test.patch" )
+
+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' -o -name '*.la' -delete || die
+}