gentoo resync : 22.05.2021

3 files changed, 91 insertions, 21 deletions

diff --git a/app-crypt/hashcat/Manifest b/app-crypt/hashcat/Manifest
index 9804456f81eb..7ab15a74d615 100644
--- a/app-crypt/hashcat/Manifest
+++ b/app-crypt/hashcat/Manifest
@@ -1,4 +1,4 @@
-DIST hashcat-6.1.1.tar.gz 5385180 BLAKE2B a1a90f691222c7810150a23d513bd1d24bca4682dd8dec2ff5bdc9cc9f82d5a2b00407de966a7c7db131cf1c1709b5f78c97d45176598d6bb7ebd381c38b4ba8 SHA512 788539b488ba55684d6d93ce18f3b05fa822a8cbfcdbcde9c2b54001d8927580dca253e0e9ff9a19f4278045046d732e104054fc743c39f47952ca24d2e93724
-EBUILD hashcat-6.1.1.ebuild 2288 BLAKE2B 918da55148fdf18985a059fe0a824237d314b26f5891d92fbe5d1fa3b4a12fd2bf34f5bf2158658057df93a4072b2de35f2c78e2bd97c211e8bb1afd809d469e SHA512 c1111b5c454ba44430eb17b62a53b3c6cb5d5347481d4efe9db02208cfca9ccd3252b21f5625a13c13f23e71c42122271a625bdca5990632a47a74ada15e8f7e
-EBUILD hashcat-9999.ebuild 2288 BLAKE2B 918da55148fdf18985a059fe0a824237d314b26f5891d92fbe5d1fa3b4a12fd2bf34f5bf2158658057df93a4072b2de35f2c78e2bd97c211e8bb1afd809d469e SHA512 c1111b5c454ba44430eb17b62a53b3c6cb5d5347481d4efe9db02208cfca9ccd3252b21f5625a13c13f23e71c42122271a625bdca5990632a47a74ada15e8f7e
+DIST hashcat-6.2.1.tar.gz 5815254 BLAKE2B b6ce0edf7a7fe725570e557b6b414c8aad02e24933b2610be2607c895778d635543a90806aa40c3521f83f93de3b7556f04274d4f9893dacb53af82974df0be2 SHA512 435d8c66e1de14a4a95364eb06f41d10d221c4cf3286bed5ce333d3d07fe7ec2097fa57a3f925ef108a0c17091a65dc18b9c782f69ab8c0575061c14c9354563
+EBUILD hashcat-6.2.1.ebuild 2736 BLAKE2B 505511065865f8c67b5fd057624841817a85971ee7cc22ed51da9dfff97006567ca7dd615e313c20a3ab7531891f67144dae16dd027adc94787840b2dcfdd0c0 SHA512 bc1c70ed0344879af8667ee193b7fb0ca10e49115728e19c43960a5385e6063558619e137c727dc9c29781243dc72fba680b329347dd015ccf430a0ad69c93ab
+EBUILD hashcat-9999.ebuild 2736 BLAKE2B 505511065865f8c67b5fd057624841817a85971ee7cc22ed51da9dfff97006567ca7dd615e313c20a3ab7531891f67144dae16dd027adc94787840b2dcfdd0c0 SHA512 bc1c70ed0344879af8667ee193b7fb0ca10e49115728e19c43960a5385e6063558619e137c727dc9c29781243dc72fba680b329347dd015ccf430a0ad69c93ab
 MISC metadata.xml 395 BLAKE2B fc7a2bac75e2c4805d002a30364e4f0e20ef972e1c8c91dc1ef3fb2f55914b8fc717a3a9502f064a19e6b0e590db779c650eab94c7b819a497a1d7ec41a78771 SHA512 6476fd0ec2f099314595408d6a593d74d126be57edc651ae5180dc8f36ae26f9db947b038e7d08f4e3f856ea9750f7bfc814f8e31d8ba829258a4dcdef5af75d
diff --git a/app-crypt/hashcat/hashcat-6.1.1.ebuild b/app-crypt/hashcat/hashcat-6.2.1.ebuild
index 4bcf042ea7e7..dc3813e63de6 100644
--- a/app-crypt/hashcat/hashcat-6.1.1.ebuild
+++ b/app-crypt/hashcat/hashcat-6.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit pax-utils multilib
+inherit pax-utils toolchain-funcs
 
 DESCRIPTION="World's fastest and most advanced password recovery utility"
 HOMEPAGE="https://github.com/hashcat/hashcat"
@@ -20,6 +20,8 @@ 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
@@ -29,24 +31,46 @@ DEPEND="
 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
+
+	# do not strip
 	sed -i "/LFLAGS                  += -s/d" src/Makefile
-	#do not add random CFLAGS
+	# do not add random CFLAGS
 	sed -i "s/-O2//" src/Makefile || die
-	sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die
-	export PREFIX=/usr
+	#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/${P}"
+	export DOCUMENT_FOLDER="/usr/share/doc/${PF}"
+
 	default
 }
 
 src_compile() {
-	emake SHARED=1 PRODUCTION=1 ENABLE_BRAIN=$(usex brain 1 0) USE_SYSTEM_LZMA=0 USE_SYSTEM_OPENCL=1 USE_SYSTEM_XXHASH=1 VERSION_PURE="${PV}"
+	tc-export CC CXX AR
+
+	emake \
+		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}"
+
 	pax-mark -mr hashcat
 }
 
@@ -68,5 +92,16 @@ src_test() {
 }
 
 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_XXHASH=1 VERSION_PURE="${PV}" 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 4bcf042ea7e7..dc3813e63de6 100644
--- a/app-crypt/hashcat/hashcat-9999.ebuild
+++ b/app-crypt/hashcat/hashcat-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit pax-utils multilib
+inherit pax-utils toolchain-funcs
 
 DESCRIPTION="World's fastest and most advanced password recovery utility"
 HOMEPAGE="https://github.com/hashcat/hashcat"
@@ -20,6 +20,8 @@ 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
@@ -29,24 +31,46 @@ DEPEND="
 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
+
+	# do not strip
 	sed -i "/LFLAGS                  += -s/d" src/Makefile
-	#do not add random CFLAGS
+	# do not add random CFLAGS
 	sed -i "s/-O2//" src/Makefile || die
-	sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die
-	export PREFIX=/usr
+	#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/${P}"
+	export DOCUMENT_FOLDER="/usr/share/doc/${PF}"
+
 	default
 }
 
 src_compile() {
-	emake SHARED=1 PRODUCTION=1 ENABLE_BRAIN=$(usex brain 1 0) USE_SYSTEM_LZMA=0 USE_SYSTEM_OPENCL=1 USE_SYSTEM_XXHASH=1 VERSION_PURE="${PV}"
+	tc-export CC CXX AR
+
+	emake \
+		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}"
+
 	pax-mark -mr hashcat
 }
 
@@ -68,5 +92,16 @@ src_test() {
 }
 
 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_XXHASH=1 VERSION_PURE="${PV}" 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
 }