--- a/hashcat-6.2.1-r1.ebuild	2021-05-29 10:09:32.000000000 +0300
+++ b/hashcat-6.2.1-r1.ebuild	2021-07-23 07:16:29.206198937 +0300
@@ -17,10 +17,11 @@
 	SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
-IUSE="brain video_cards_nvidia"
+IUSE="brain video_cards_nvidia +system-unrar +system-zlib"
 DEPEND="
 	app-arch/lzma
 	app-arch/unrar
+	system-unrar? ( >=app-arch/unrar-6.0.7 )
 	sys-libs/zlib[minizip]
 	brain? ( dev-libs/xxhash )
 	video_cards_nvidia? ( >x11-drivers/nvidia-drivers-440.64
@@ -60,15 +61,15 @@
 src_compile() {
 	tc-export CC CXX AR
 
-	# Use bundled unrar for now, bug #792720
+	# Use bundled unrar for <unrar-6.0.7 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_UNRAR=$(usex system-unrar 1 0) \
+		USE_SYSTEM_ZLIB=$(usex system-zlib 1 0) \
 		USE_SYSTEM_XXHASH=1 \
 		VERSION_PURE="${PV}"
 
@@ -84,7 +85,7 @@
 			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
+	#elif use video_cards_fglrx; then
 	#	addwrite /dev/ati
 	fi
 	#this always exits with 255 despite success