gentoo auto-resync : 20:08:2023 - 03:40:24

6 files changed, 28 insertions, 476 deletions

diff --git a/app-crypt/hashcat/Manifest b/app-crypt/hashcat/Manifest
index a3e192ce378e..d04db9990672 100644
--- a/app-crypt/hashcat/Manifest
+++ b/app-crypt/hashcat/Manifest
@@ -1,13 +1,6 @@
 AUX hashcat-6.2.4-brainless.patch 1040 BLAKE2B 0bcdb5fce7b22f95844c5fcef1c92ee0d78a10830a91991033d5476057e883408b595486dcc5d3fb3fad1c4d6b0c05f5e0a5c16f4404aee613a97203f88d8ab6 SHA512 a00d84c8611d43870c4d46be78454350e17471ad4d8d9ac98528b8527cde81bb23deed931c01d042511b98c8962554fbdc965e62555f640cb19f2196418f4f7a
 AUX hashcat-6.2.4-pocl-quoting-include.patch 1480 BLAKE2B 4999e878010c8083e0ba708adafc46ee744ca4127f8f2442ae1c659a1ca59525f0a66ffb55e845ffb0da897259d7206c53534fec4a58c6daa6bdc25e28493fe9 SHA512 ed64891dc00a546b07e32aa65a30ea30bbb0b6aeacf616e43f59b0c28dfafcdc54dce8e194fdf0805187dbf57c6c0a9655153823734d7e9537ab150b798b7205
-DIST hashcat-6.2.1.tar.gz 5815254 BLAKE2B b6ce0edf7a7fe725570e557b6b414c8aad02e24933b2610be2607c895778d635543a90806aa40c3521f83f93de3b7556f04274d4f9893dacb53af82974df0be2 SHA512 435d8c66e1de14a4a95364eb06f41d10d221c4cf3286bed5ce333d3d07fe7ec2097fa57a3f925ef108a0c17091a65dc18b9c782f69ab8c0575061c14c9354563
-DIST hashcat-6.2.4.tar.gz 6269444 BLAKE2B 15d774253841350710e89bb6358f5fd615ef6e0645f271507d5bfc3e814be1533f78b83b90c11b24c7088ac60f2bb9098cf3410c4bedb5d53b0ccff4d840664c SHA512 bb18646794e168616e6f018b41c1a17c26bb0d8625aaeec0bd0d734efbc331008f432efde7b3d08e8838c995c771a406670812edaf7d605e7fdff9ef001aa954
-DIST hashcat-6.2.5.tar.gz 6341872 BLAKE2B e55a0aac0cb28041f92fc6685fb004058744e150d84d9b690bdb16bb7f4612edd12b987debcfc5d39d0c4e87bdd799148cae6974d47904c1e3d2953ceb32f076 SHA512 2b881146c625172c91cb74b33851473155dcde2421fba1b4acfba28116499b9cff832a62c4dbc24e16df06a827494f30699a7d0e5195d5ed107704f525255383
 DIST hashcat-6.2.6.tar.gz 14234640 BLAKE2B fbbebc0a35b920442d4e1fb5822a8b9867db62bcc2404fba514fe1f06f0aa859a116cbe204eed71d340ad826dcfffffadca6963e5eec875ae2fee59068968b61 SHA512 b5e4f40fb5ed0a47977243e1f95bf1deae0b04bd5ca26338395305c42573fe5b17557835f6f5d8b7402812e8eadda2b260d6b927ce99429fd1b87eb26f002f8a
-EBUILD hashcat-6.2.1-r1.ebuild 2778 BLAKE2B b7cc13c326c8e16e014a47587cfe1fd13655f541b61c6775ab272980fd4d6e8bd57065a85019fce9f8336df325a78275b5302efe0d282cd72c3bdd6b7e93115e SHA512 bcc110789c5a260a9a6f2deb2bc4649a058cb940bf4f6ca71f4d7c24030ca87417ccfa9207727929916e8e871dc5fc526fb13d4a26af27e278e45acddef68b5f
-EBUILD hashcat-6.2.4-r1.ebuild 2888 BLAKE2B dc79427a21aaac44371bd86e9b63761b0acedc6144d588993996728b1d3c9ab9529aed319a4b28a44eaa9b0dc8b397b9bf7808c05300b621b71cbccc40985fd5 SHA512 e6f596682a789b735c80ced40cff61f9c000a6c0b92742db5ad5c450f745304fa3c5f3315c65163b2d2168e0dc3fe6f3afaf8f8efb2088061644bbd707b51192
-EBUILD hashcat-6.2.4.ebuild 2834 BLAKE2B 3655e6a31038a45aa0106b501f902f828f0e7c818d3a53634218f0e1281aa06149c69dcdc49fbd4c96ee122150bb68cc0a5b7767ef9e9a286d9693c45f0c0ca4 SHA512 d453f5c9da614c8bb625d844d628739a78f4074d0283a6347e9f1157130f63c96d02612eb1cf6a092924e77e9939b5ad02a110aeb46ad4a4462043b59cd03050
-EBUILD hashcat-6.2.5.ebuild 2732 BLAKE2B f31745535c47efe9ba40229e3ad0a828b1c0b242938898d50bda7fa29ebdaa4cfefaec132afa531105ba850f385b8717b26bf4f274a3f7efa253664141027dba SHA512 ee2a40820af6eaf18abdf1045f382d28f316a7f7a7fe68223d58a86fb565733ad7010b7cd6de3869038a781dc453da9bc6cec3ecf21a1b14c3278685e964f059
 EBUILD hashcat-6.2.6.ebuild 2732 BLAKE2B 2e48b80c34b0dc76621e0cf3dd9d1700dcf11c967e89707145f1faef70461d6ce73780fa40aacfc2fb87b22dca0b88e7b303df596168ee62349b5a246839e8aa SHA512 828f723c75c7752ff05b127ab35b89be060d9777b4928c7494ac90e4b60acf142809e3aefbbc468384fef34b8ce52d14a1961c3e42840e3bbae1a20dd724abc7
-EBUILD hashcat-9999.ebuild 2778 BLAKE2B b7cc13c326c8e16e014a47587cfe1fd13655f541b61c6775ab272980fd4d6e8bd57065a85019fce9f8336df325a78275b5302efe0d282cd72c3bdd6b7e93115e SHA512 bcc110789c5a260a9a6f2deb2bc4649a058cb940bf4f6ca71f4d7c24030ca87417ccfa9207727929916e8e871dc5fc526fb13d4a26af27e278e45acddef68b5f
+EBUILD hashcat-9999.ebuild 2732 BLAKE2B 911bcb18ca12ab0543df78c68c5260fb48afd048c6c75705ee1b0fdca33bb4ddb0ce69771d8b6a69516b6b7a4880641168b3450761cdbc9c3e15c5ef9dee3884 SHA512 3901ac0fa5d87bff2da42923a4a5d4250d077d92945cab1c2354bbd7040a9091740fc09d8ba76accaf9edf868d0fddce796a16d4bbae5483ae00178190f3690a
 MISC metadata.xml 396 BLAKE2B ed0f4406e46280943a8ae7cb68486b8410653efa96e284b11d139aa201d3e64adc21abbc78021f247f8ab05da5a81483633f764917c160f776e42bb269b5ceab SHA512 482f749520452bc1dfc1e22d0cd0c694c7f1158526fbaaf6179d67e1617d17710d85ba2eb29dc65216635fd99c2f7796029604b40a447eb358fde9aca1b39ed7
diff --git a/app-crypt/hashcat/hashcat-6.2.1-r1.ebuild b/app-crypt/hashcat/hashcat-6.2.1-r1.ebuild
deleted file mode 100644
index 1adb6223b74a..000000000000
--- a/app-crypt/hashcat/hashcat-6.2.1-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils toolchain-funcs
-
-DESCRIPTION="World's fastest and most advanced password recovery utility"
-HOMEPAGE="https://github.com/hashcat/hashcat"
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/hashcat/hashcat.git"
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-IUSE="brain video_cards_nvidia"
-DEPEND="
-	app-arch/lzma
-	app-arch/unrar
-	sys-libs/zlib[minizip]
-	brain? ( dev-libs/xxhash )
-	video_cards_nvidia? ( >x11-drivers/nvidia-drivers-440.64
-						|| ( dev-util/nvidia-cuda-toolkit
-							virtual/opencl )
-						)
-	!video_cards_nvidia? ( virtual/opencl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# remove bundled stuff
-	rm -r deps/OpenCL-Headers || die "Failed to remove bundled OpenCL Headers"
-	rm -r deps/xxHash || die "Failed to remove bundled xxHash"
-	# TODO: Gentoo's app-arch/lzma doesn't install the needed files
-	#rm -r deps/LZMA-SDK || die "Failed to remove bundled LZMA-SDK"
-	#rm -r deps || die "Failed to remove bundled deps"
-
-	# do not strip
-	sed -i "/LFLAGS                  += -s/d" src/Makefile
-	# do not add random CFLAGS
-	sed -i "s/-O2//" src/Makefile || die
-	#sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die
-	# respect CC, CXX, AR
-	sed -i \
-		-e 's/:= gcc/:= $(CC)/' \
-		-e 's/:= g++/:= $(CXX)/' \
-		-e 's/:= ar/:= $(AR)/' \
-		src/Makefile || die
-
-	export PREFIX="${EPREFIX}"/usr
-	export LIBRARY_FOLDER="/usr/$(get_libdir)"
-	export DOCUMENT_FOLDER="/usr/share/doc/${PF}"
-
-	default
-}
-
-src_compile() {
-	tc-export CC CXX AR
-
-	# Use bundled unrar for now, bug #792720
-	emake \
-		SHARED=1 \
-		PRODUCTION=1 \
-		ENABLE_BRAIN=$(usex brain 1 0) \
-		USE_SYSTEM_LZMA=0 \
-		USE_SYSTEM_OPENCL=1 \
-		USE_SYSTEM_UNRAR=0 \
-		USE_SYSTEM_ZLIB=1 \
-		USE_SYSTEM_XXHASH=1 \
-		VERSION_PURE="${PV}"
-
-	pax-mark -mr hashcat
-}
-
-src_test() {
-	if use video_cards_nvidia; then
-		addwrite /dev/nvidia0
-		addwrite /dev/nvidiactl
-		addwrite /dev/nvidia-uvm
-		if [ ! -w /dev/nvidia0 ]; then
-			einfo "To run these tests, portage likely must be in the video group."
-			einfo "Please run \"gpasswd -a portage video\" if the tests will fail"
-		fi
-	#elif use vidia_cards_fglrx; then
-	#	addwrite /dev/ati
-	fi
-	#this always exits with 255 despite success
-	#./hashcat -b -m 2500 || die "Test failed"
-	LD_PRELOAD=./libhashcat.so.${PV} ./hashcat -a 3 -m 1500 nQCk49SiErOgk || die "Test failed"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${ED}" \
-		SHARED=1 \
-		PRODUCTION=1 \
-		ENABLE_BRAIN=$(usex brain 1 0) \
-		USE_SYSTEM_LZMA=0 \
-		USE_SYSTEM_OPENCL=1 \
-		USE_SYSTEM_UNRAR=1 \
-		USE_SYSTEM_ZLIB=1 \
-		USE_SYSTEM_XXHASH=1 \
-		VERSION_PURE="${PV}" \
-		install
-}
diff --git a/app-crypt/hashcat/hashcat-6.2.4-r1.ebuild b/app-crypt/hashcat/hashcat-6.2.4-r1.ebuild
deleted file mode 100644
index 8d00e75fa192..000000000000
--- a/app-crypt/hashcat/hashcat-6.2.4-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils toolchain-funcs
-
-DESCRIPTION="World's fastest and most advanced password recovery utility"
-HOMEPAGE="https://github.com/hashcat/hashcat"
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/hashcat/hashcat.git"
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-IUSE="brain video_cards_nvidia"
-DEPEND="
-	app-arch/lzma
-	app-arch/unrar
-	sys-libs/zlib[minizip]
-	brain? ( dev-libs/xxhash )
-	video_cards_nvidia? ( >x11-drivers/nvidia-drivers-440.64
-						|| ( dev-util/nvidia-cuda-toolkit
-							virtual/opencl )
-						)
-	!video_cards_nvidia? ( virtual/opencl )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.2.4-brainless.patch
-	"${FILESDIR}"/${PN}-6.2.4-pocl-quoting-include.patch
-)
-
-src_prepare() {
-	# remove bundled stuff
-	rm -r deps/OpenCL-Headers || die "Failed to remove bundled OpenCL Headers"
-	rm -r deps/xxHash || die "Failed to remove bundled xxHash"
-	# TODO: Gentoo's app-arch/lzma doesn't install the needed files
-	#rm -r deps/LZMA-SDK || die "Failed to remove bundled LZMA-SDK"
-	#rm -r deps || die "Failed to remove bundled deps"
-
-	# do not strip
-	sed -i "/LFLAGS                  += -s/d" src/Makefile
-	# do not add random CFLAGS
-	sed -i "s/-O2//" src/Makefile || die
-	#sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die
-	# respect CC, CXX, AR
-	sed -i \
-		-e 's/:= gcc/:= $(CC)/' \
-		-e 's/:= g++/:= $(CXX)/' \
-		-e 's/:= ar/:= $(AR)/' \
-		src/Makefile || die
-
-	export PREFIX="${EPREFIX}"/usr
-	export LIBRARY_FOLDER="/usr/$(get_libdir)"
-	export DOCUMENT_FOLDER="/usr/share/doc/${PF}"
-
-	default
-}
-
-src_compile() {
-	tc-export CC CXX AR
-
-	# Use bundled unrar for now, bug #792720
-	emake \
-		SHARED=1 \
-		PRODUCTION=1 \
-		ENABLE_BRAIN=$(usex brain 1 0) \
-		USE_SYSTEM_LZMA=0 \
-		USE_SYSTEM_OPENCL=1 \
-		USE_SYSTEM_UNRAR=0 \
-		USE_SYSTEM_ZLIB=1 \
-		USE_SYSTEM_XXHASH=1 \
-		VERSION_PURE="${PV}"
-
-	pax-mark -mr hashcat
-}
-
-src_test() {
-	if use video_cards_nvidia; then
-		addwrite /dev/nvidia0
-		addwrite /dev/nvidiactl
-		addwrite /dev/nvidia-uvm
-		if [ ! -w /dev/nvidia0 ]; then
-			einfo "To run these tests, portage likely must be in the video group."
-			einfo "Please run \"gpasswd -a portage video\" if the tests will fail"
-		fi
-	#elif use vidia_cards_fglrx; then
-	#	addwrite /dev/ati
-	fi
-	#this always exits with 255 despite success
-	#./hashcat -b -m 2500 || die "Test failed"
-	LD_PRELOAD=./libhashcat.so.${PV} ./hashcat -a 3 -m 1500 nQCk49SiErOgk || die "Test failed"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${ED}" \
-		SHARED=1 \
-		PRODUCTION=1 \
-		ENABLE_BRAIN=$(usex brain 1 0) \
-		USE_SYSTEM_LZMA=0 \
-		USE_SYSTEM_OPENCL=1 \
-		USE_SYSTEM_UNRAR=1 \
-		USE_SYSTEM_ZLIB=1 \
-		USE_SYSTEM_XXHASH=1 \
-		VERSION_PURE="${PV}" \
-		install
-}
diff --git a/app-crypt/hashcat/hashcat-6.2.4.ebuild b/app-crypt/hashcat/hashcat-6.2.4.ebuild
deleted file mode 100644
index 4a204caae634..000000000000
--- a/app-crypt/hashcat/hashcat-6.2.4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils toolchain-funcs
-
-DESCRIPTION="World's fastest and most advanced password recovery utility"
-HOMEPAGE="https://github.com/hashcat/hashcat"
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/hashcat/hashcat.git"
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-IUSE="brain video_cards_nvidia"
-DEPEND="
-	app-arch/lzma
-	app-arch/unrar
-	sys-libs/zlib[minizip]
-	brain? ( dev-libs/xxhash )
-	video_cards_nvidia? ( >x11-drivers/nvidia-drivers-440.64
-						|| ( dev-util/nvidia-cuda-toolkit
-							virtual/opencl )
-						)
-	!video_cards_nvidia? ( virtual/opencl )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.2.4-brainless.patch
-)
-
-src_prepare() {
-	# remove bundled stuff
-	rm -r deps/OpenCL-Headers || die "Failed to remove bundled OpenCL Headers"
-	rm -r deps/xxHash || die "Failed to remove bundled xxHash"
-	# TODO: Gentoo's app-arch/lzma doesn't install the needed files
-	#rm -r deps/LZMA-SDK || die "Failed to remove bundled LZMA-SDK"
-	#rm -r deps || die "Failed to remove bundled deps"
-
-	# do not strip
-	sed -i "/LFLAGS                  += -s/d" src/Makefile
-	# do not add random CFLAGS
-	sed -i "s/-O2//" src/Makefile || die
-	#sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die
-	# respect CC, CXX, AR
-	sed -i \
-		-e 's/:= gcc/:= $(CC)/' \
-		-e 's/:= g++/:= $(CXX)/' \
-		-e 's/:= ar/:= $(AR)/' \
-		src/Makefile || die
-
-	export PREFIX="${EPREFIX}"/usr
-	export LIBRARY_FOLDER="/usr/$(get_libdir)"
-	export DOCUMENT_FOLDER="/usr/share/doc/${PF}"
-
-	default
-}
-
-src_compile() {
-	tc-export CC CXX AR
-
-	# Use bundled unrar for now, bug #792720
-	emake \
-		SHARED=1 \
-		PRODUCTION=1 \
-		ENABLE_BRAIN=$(usex brain 1 0) \
-		USE_SYSTEM_LZMA=0 \
-		USE_SYSTEM_OPENCL=1 \
-		USE_SYSTEM_UNRAR=0 \
-		USE_SYSTEM_ZLIB=1 \
-		USE_SYSTEM_XXHASH=1 \
-		VERSION_PURE="${PV}"
-
-	pax-mark -mr hashcat
-}
-
-src_test() {
-	if use video_cards_nvidia; then
-		addwrite /dev/nvidia0
-		addwrite /dev/nvidiactl
-		addwrite /dev/nvidia-uvm
-		if [ ! -w /dev/nvidia0 ]; then
-			einfo "To run these tests, portage likely must be in the video group."
-			einfo "Please run \"gpasswd -a portage video\" if the tests will fail"
-		fi
-	#elif use vidia_cards_fglrx; then
-	#	addwrite /dev/ati
-	fi
-	#this always exits with 255 despite success
-	#./hashcat -b -m 2500 || die "Test failed"
-	LD_PRELOAD=./libhashcat.so.${PV} ./hashcat -a 3 -m 1500 nQCk49SiErOgk || die "Test failed"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${ED}" \
-		SHARED=1 \
-		PRODUCTION=1 \
-		ENABLE_BRAIN=$(usex brain 1 0) \
-		USE_SYSTEM_LZMA=0 \
-		USE_SYSTEM_OPENCL=1 \
-		USE_SYSTEM_UNRAR=1 \
-		USE_SYSTEM_ZLIB=1 \
-		USE_SYSTEM_XXHASH=1 \
-		VERSION_PURE="${PV}" \
-		install
-}
diff --git a/app-crypt/hashcat/hashcat-6.2.5.ebuild b/app-crypt/hashcat/hashcat-6.2.5.ebuild
deleted file mode 100644
index c0d476c28a7e..000000000000
--- a/app-crypt/hashcat/hashcat-6.2.5.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pax-utils toolchain-funcs
-
-DESCRIPTION="World's fastest and most advanced password recovery utility"
-HOMEPAGE="https://github.com/hashcat/hashcat"
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/hashcat/hashcat.git"
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="brain video_cards_nvidia"
-
-DEPEND="app-arch/lzma
-	app-arch/unrar
-	sys-libs/zlib[minizip]
-	brain? ( dev-libs/xxhash )
-	video_cards_nvidia? (
-		>x11-drivers/nvidia-drivers-440.64
-		|| (
-			dev-util/nvidia-cuda-toolkit
-			virtual/opencl
-		)
-	)
-	!video_cards_nvidia? ( virtual/opencl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Remove bundled stuff
-	rm -r deps/OpenCL-Headers || die "Failed to remove bundled OpenCL Headers"
-	rm -r deps/xxHash || die "Failed to remove bundled xxHash"
-
-	# TODO: Gentoo's app-arch/lzma doesn't install the needed files
-	#rm -r deps/LZMA-SDK || die "Failed to remove bundled LZMA-SDK"
-	#rm -r deps || die "Failed to remove bundled deps"
-
-	# Do not strip
-	sed -i "/LFLAGS                  += -s/d" src/Makefile || die
-
-	# Do not add random CFLAGS
-	sed -i "s/-O2//" src/Makefile || die
-
-	#sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die
-
-	# Respect CC, CXX, AR
-	sed -i \
-		-e 's/:= gcc/:= $(CC)/' \
-		-e 's/:= g++/:= $(CXX)/' \
-		-e 's/:= ar/:= $(AR)/' \
-		src/Makefile || die
-
-	export PREFIX="${EPREFIX}"/usr
-	export LIBRARY_FOLDER="/usr/$(get_libdir)"
-	export DOCUMENT_FOLDER="/usr/share/doc/${PF}"
-
-	default
-}
-
-src_compile() {
-	tc-export CC CXX AR
-
-	# Use bundled unrar for now, bug #792720
-	emake \
-		SHARED=1 \
-		PRODUCTION=1 \
-		ENABLE_BRAIN=$(usex brain 1 0) \
-		USE_SYSTEM_LZMA=0 \
-		USE_SYSTEM_OPENCL=1 \
-		USE_SYSTEM_UNRAR=0 \
-		USE_SYSTEM_ZLIB=1 \
-		USE_SYSTEM_XXHASH=1 \
-		VERSION_PURE="${PV}"
-
-	pax-mark -mr hashcat
-}
-
-src_test() {
-	if use video_cards_nvidia; then
-		addwrite /dev/nvidia0
-		addwrite /dev/nvidiactl
-		addwrite /dev/nvidia-uvm
-
-		if [[ ! -w /dev/nvidia0 ]]; then
-			einfo "To run these tests, portage likely must be in the video group."
-			einfo "Please run \"gpasswd -a portage video\" if the tests will fail"
-		fi
-	fi
-
-	# This always exits with 255 despite success
-	#./hashcat -b -m 2500 || die "Test failed"
-	LD_PRELOAD=./libhashcat.so.${PV} ./hashcat -a 3 -m 1500 nQCk49SiErOgk || die "Test failed"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${ED}" \
-		SHARED=1 \
-		PRODUCTION=1 \
-		ENABLE_BRAIN=$(usex brain 1 0) \
-		USE_SYSTEM_LZMA=0 \
-		USE_SYSTEM_OPENCL=1 \
-		USE_SYSTEM_UNRAR=1 \
-		USE_SYSTEM_ZLIB=1 \
-		USE_SYSTEM_XXHASH=1 \
-		VERSION_PURE="${PV}" \
-		install
-}
diff --git a/app-crypt/hashcat/hashcat-9999.ebuild b/app-crypt/hashcat/hashcat-9999.ebuild
index 1adb6223b74a..add467bdd498 100644
--- a/app-crypt/hashcat/hashcat-9999.ebuild
+++ b/app-crypt/hashcat/hashcat-9999.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit pax-utils toolchain-funcs
 
 DESCRIPTION="World's fastest and most advanced password recovery utility"
 HOMEPAGE="https://github.com/hashcat/hashcat"
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV}" = "9999" ]; then
+if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/hashcat/hashcat.git"
 else
@@ -17,33 +15,42 @@ else
 	SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
+LICENSE="MIT"
+SLOT="0"
 IUSE="brain video_cards_nvidia"
-DEPEND="
-	app-arch/lzma
+
+DEPEND="app-arch/lzma
 	app-arch/unrar
 	sys-libs/zlib[minizip]
 	brain? ( dev-libs/xxhash )
-	video_cards_nvidia? ( >x11-drivers/nvidia-drivers-440.64
-						|| ( dev-util/nvidia-cuda-toolkit
-							virtual/opencl )
-						)
+	video_cards_nvidia? (
+		>x11-drivers/nvidia-drivers-440.64
+		|| (
+			dev-util/nvidia-cuda-toolkit
+			virtual/opencl
+		)
+	)
 	!video_cards_nvidia? ( virtual/opencl )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	# remove bundled stuff
+	# Remove bundled stuff
 	rm -r deps/OpenCL-Headers || die "Failed to remove bundled OpenCL Headers"
 	rm -r deps/xxHash || die "Failed to remove bundled xxHash"
+
 	# TODO: Gentoo's app-arch/lzma doesn't install the needed files
 	#rm -r deps/LZMA-SDK || die "Failed to remove bundled LZMA-SDK"
 	#rm -r deps || die "Failed to remove bundled deps"
 
-	# do not strip
-	sed -i "/LFLAGS                  += -s/d" src/Makefile
-	# do not add random CFLAGS
+	# Do not strip
+	sed -i "/LFLAGS                  += -s/d" src/Makefile || die
+
+	# Do not add random CFLAGS
 	sed -i "s/-O2//" src/Makefile || die
+
 	#sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die
-	# respect CC, CXX, AR
+
+	# Respect CC, CXX, AR
 	sed -i \
 		-e 's/:= gcc/:= $(CC)/' \
 		-e 's/:= g++/:= $(CXX)/' \
@@ -80,14 +87,14 @@ src_test() {
 		addwrite /dev/nvidia0
 		addwrite /dev/nvidiactl
 		addwrite /dev/nvidia-uvm
-		if [ ! -w /dev/nvidia0 ]; then
+
+		if [[ ! -w /dev/nvidia0 ]]; then
 			einfo "To run these tests, portage likely must be in the video group."
 			einfo "Please run \"gpasswd -a portage video\" if the tests will fail"
 		fi
-	#elif use vidia_cards_fglrx; then
-	#	addwrite /dev/ati
 	fi
-	#this always exits with 255 despite success
+
+	# This always exits with 255 despite success
 	#./hashcat -b -m 2500 || die "Test failed"
 	LD_PRELOAD=./libhashcat.so.${PV} ./hashcat -a 3 -m 1500 nQCk49SiErOgk || die "Test failed"
 }