gentoo resync : 21.06.2020

8 files changed, 92 insertions, 175 deletions

diff --git a/app-crypt/hashcat/Manifest b/app-crypt/hashcat/Manifest
index 12c817d29e1a..34db87e46a73 100644
--- a/app-crypt/hashcat/Manifest
+++ b/app-crypt/hashcat/Manifest
@@ -1,12 +1,7 @@
-DIST hashcat-4.1.0.tar.gz 3956136 BLAKE2B f9d6f9322e4c50ee1e156c283da1257a24f0e2cb22618cf93b8b11dd1964f6741f409429ee904412f70301e4b2381b388bcab0296a30ea3a94569efe7aaaeec6 SHA512 c9e01847c89dd8521da8734ea324c69f1e9bfef50c059e9dc29d4b947fe090405774a57ae688f907698c7d9a2d1f087b730e0a994dc5ed0d5d937a9ef950dd73
-DIST hashcat-4.2.0.tar.gz 3965021 BLAKE2B ad208f2debe1e4ece893e4a277b199962aa98aab57a2e78aef1d4177dcf7fc03bf262657dfe0f51c2ae845c8ed92232de7131f909d63bdc91e9f14e0b9602bb6 SHA512 686975db24737a718b484dd84b66807dfbe9694f1832da648b3c3b9fc8b859cd5c4c4d0aebf04ae862de38656d92c989e4e9515a07bec19b3779d74350beb0bd
-DIST hashcat-4.2.1.tar.gz 3966264 BLAKE2B 2034fff6aa8724cded0c8576cb4593d90f94eaea8f932e511ed82f2576ded2ffd6f686dac484e52a9ebb3029e90845469418ac414f2edf03e3fdc3350df8766f SHA512 a2cfc7e19e82b237892bacc79ca1a62a3b2ea598e4e5f60d4e275a0c128d865945595d8f918e3bb93bf62376f11f448ff53257faa12fd051dfc64973fbb6ed1e
-DIST hashcat-5.0.0.tar.gz 4019964 BLAKE2B 5d33bb2b0d82018d8ea6a906bee48375376879a47e5ca8f880d6fad6c6763d1ef90d44b228257021603e560acadf3d8fbfcbafdbd41dbad3733141d3c3957762 SHA512 090f07a011961a2c9a9bdf31e8a5efae4b443b6b205e964a6cd74bed6efe8fae2377f22ce7728ad7e732e9f943cf30da88066fe0990d085547f1e2ba000a3d95
+AUX hashcat-6.0.0-missing-not-fatal.patch 1515 BLAKE2B 2cf28447a83df00db96f73380195a5a86648cd068a14adfea65d6eacc7a760f4b1513a35b524d7bed087ad5375f5c439adb71216c00b6c85a788fafb59fa6ca2 SHA512 bb8f51febbf46b2318af8ee230fa686cce9a340b2d59068fbf64c2236df467f80bb44c5fc172f5d99da0e2ed32eeb6d9c5498408cb6c077a18f2f294b2217664
 DIST hashcat-5.1.0.tar.gz 4266878 BLAKE2B 677554fc5d6c5a93d0f4955c2e3cb6a40913ca2f7d00a89cf0c00bb48cadcaca94d3fdf55b853208f9fda4ce1bcc13fed865c5128a7c429223bcf8b4b825a15b SHA512 90605c2bcd0ec275d2f6ec581899b95cdc320b1494613a19803192c8a08037a7829b3776ed42c58eb6551ec1a746f47f94ab5b273958ca74e0fc57315e209ece
-EBUILD hashcat-4.1.0.ebuild 1278 BLAKE2B 91cfef7aae4aeafab3acf969011b1972c7f578eb95294be2dab71e86ec7a4664fbb8bda0c4c4b52214af95f42fcc71a3344611c7dacfcbc199ed915f0e38faf9 SHA512 06d8bf4b38da6c366db3f901bb0bd887459158229de890bf4ae28aa4e31ee72d5409ec86510b6a5a0c3f5726a6bdcb463e2e19a40bc24c0d8852a0f80f5fd78c
-EBUILD hashcat-4.2.0.ebuild 1323 BLAKE2B 038b4a3de1259a13e1b7655fb454fcb9e26948f48aa7cb45288b8039917ca732fd0022d686f80d264f1f1ec5a7551f81d617593ebfc6d6f1218315114f387f3f SHA512 776c800315ea9ee09476a1870134df575210b05a336fe46ee9ef763d0fc6e3b1c23d739c67c115b80ff3f48a227ba3a99a58f652b43324e673f50560e2e45715
-EBUILD hashcat-4.2.1.ebuild 1369 BLAKE2B 6bd72666c506aa48dccb6464ecd1084ec7b397dd1bd064ac2321ab8cb7947ee272ec2ba5150101b5d16a4730b9d8df32bfd95d7bb838d8cbcdf6427d33327894 SHA512 d6345507dad42bb3e4015e7d8795a25c8515cad55087d9bcdb6f740add0cf3e509a64b31945c26c561c53c61bcc02864087fe313d11642d0caed3e39d76587bd
-EBUILD hashcat-5.0.0.ebuild 1625 BLAKE2B b0c091c95dce2b8e243f8010079ea3ec0abdb7622f861ef991086c3d4ae07a830ebf0771074ee9336d587213d592909611d41ffe139264832b2fc31072cf489f SHA512 c982352784431e8cb13cd5eec896ada0367c342dfef396732a3ae81135711b883f33d9e6c6418be07cac5f5e36e1fbc6f370ce4813e361a4fe03f38486c92756
-EBUILD hashcat-5.1.0.ebuild 2214 BLAKE2B 4e83644b6d52e7dacdb48d7cdf5ace1536e94aef273b22133dace7431ca9ef6dba88960bafe5848ce39c786a765d3ce58d037b9474ddfdd9ea556bc3a41bc299 SHA512 02bd43009fca243aee558617533cdfe949a7492819893422a7cd3476c45018d06556b83d770b59ad120eb4bb188fb13136fc8167bada6e3866253835e5f48dc7
-EBUILD hashcat-9999.ebuild 2214 BLAKE2B 4e83644b6d52e7dacdb48d7cdf5ace1536e94aef273b22133dace7431ca9ef6dba88960bafe5848ce39c786a765d3ce58d037b9474ddfdd9ea556bc3a41bc299 SHA512 02bd43009fca243aee558617533cdfe949a7492819893422a7cd3476c45018d06556b83d770b59ad120eb4bb188fb13136fc8167bada6e3866253835e5f48dc7
+DIST hashcat-6.0.0.tar.gz 5360568 BLAKE2B 9d44c94d136a4c4cf7254ee11dc978db6bb1159d66ea525777c0a3dae59149983c9e8220f50cdbe6c24e330c757f3519b48f920662582e914f80068723ba5acd SHA512 b508c77e1735c02bb59c427774a3f4fafdea37d09777ef2dcb6e5081cb993d02c4f46a6ab846dc97a8cef2b0f69bbc191e26b8f1608a299bc2c1a6b3d2474f96
+EBUILD hashcat-5.1.0.ebuild 2201 BLAKE2B ba3d5b2652ae0fea0226265a9ae71b93eb6d0c225d9973466a4330b8b2c3c573ad41434f4be1f888e05737b417b7de639ddeb0b447ad910d37d754db79b99079 SHA512 4e6f0fd1b6e5f7451bfeb0408caec1eda01dedf6394b227fb948ab592b70e0fee81a777497baf73b5f67156f4a1c5f57fceae17e984671b8b29be5e96f626a1c
+EBUILD hashcat-6.0.0-r1.ebuild 2351 BLAKE2B d451d10baba0e2555c712ba0aaa344787b31c5884926eaef923171b5129930f2ae9fe158cc2523e150b60c568eabe4546a3527a5c57c1334809c18a31431d947 SHA512 30e9e5392527e0fec4bd0ccd314963540a776f84ee0e908c9a5de0785c2edd9b6a8576daa5f4a5c602526d939b5c691a02134fb3f12afc3ce4120bbaccaac1cf
+EBUILD hashcat-9999.ebuild 2295 BLAKE2B 4504eab73c1b0fb65d6d9c1c3c93e3030699b234e890374b4a84b9c59743d32c79d4472d0163da2c3bf0b02282ef34c65d48a68d8c38a0ec9b0734626d875d98 SHA512 9e6db642a6a1e38f91b939add0a57b15dc8d3ce95e1c82685c0ebe9cf070a77f500eefccb956874c1ad0cf38a1d421c62dc63d32228918553ae7bbfc8312754f
 MISC metadata.xml 395 BLAKE2B b058a0b0749da5d258660ddc67733d9f6ba09d10acf98ccb2c46b23534d09cd2865a6e37050b96f89dc97a9584e6791360398c41576224905b667a9b149fd3f7 SHA512 1d2ee684f0180752b2dd6eee437ce2714437775a0224a34c6ffd9f9b86ef8c375947b25f5a372358672a4c69516861fe1fc26d1dbd972684f2df725fba87698e
diff --git a/app-crypt/hashcat/files/hashcat-6.0.0-missing-not-fatal.patch b/app-crypt/hashcat/files/hashcat-6.0.0-missing-not-fatal.patch
new file mode 100644
index 000000000000..52120e0e05c4
--- /dev/null
+++ b/app-crypt/hashcat/files/hashcat-6.0.0-missing-not-fatal.patch
@@ -0,0 +1,53 @@
+diff --git a/docs/changes.txt b/docs/changes.txt
+index 1527da46..420c2102 100644
+--- a/docs/changes.txt
++++ b/docs/changes.txt
+@@ -1,3 +1,11 @@
++* changes v6.0.0 -> v6.0.x
++
++##
++## Improvements
++##
++
++- OpenCL Runtime: Reinterpret return code CL_DEVICE_NOT_FOUND from clGetDeviceIDs() as non-fatal
++
+ * changes v5.1.0 -> v6.0.0
+ 
+ ##
+diff --git a/src/backend.c b/src/backend.c
+index 80fdbb38..7f79879f 100644
+--- a/src/backend.c
++++ b/src/backend.c
+@@ -5185,7 +5185,31 @@ int backend_ctx_init (hashcat_ctx_t *hashcat_ctx)
+         {
+           event_log_error (hashcat_ctx, "clGetDeviceIDs(): %s", val2cstr_cl (CL_rc));
+ 
+-          return -1;
++          // Special handling for CL_DEVICE_NOT_FOUND, see: https://github.com/hashcat/hashcat/issues/2455
++
++          #define IGNORE_DEVICE_NOT_FOUND 1
++
++          if (IGNORE_DEVICE_NOT_FOUND)
++          {
++            backend_ctx_t *backend_ctx = hashcat_ctx->backend_ctx;
++
++            OCL_PTR *ocl = (OCL_PTR *) backend_ctx->ocl;
++
++            const cl_int CL_err = ocl->clGetDeviceIDs (opencl_platform, CL_DEVICE_TYPE_ALL, DEVICES_MAX, opencl_platform_devices, &opencl_platform_devices_cnt);
++
++            if (CL_err == CL_DEVICE_NOT_FOUND)
++            {
++              // we ignore this error
++            }
++            else
++            {
++              return -1;
++            }
++          }
++          else
++          {
++            return -1;
++          }
+         }
+ 
+         opencl_platforms_devices[opencl_platforms_idx] = opencl_platform_devices;
diff --git a/app-crypt/hashcat/hashcat-4.1.0.ebuild b/app-crypt/hashcat/hashcat-4.1.0.ebuild
deleted file mode 100644
index 71db0a6fe5dd..000000000000
--- a/app-crypt/hashcat/hashcat-4.1.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils pax-utils multilib
-
-DESCRIPTION="World's fastest and most advanced password recovery utility"
-HOMEPAGE="https://github.com/hashcat/hashcat"
-SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="custom-cflags video_cards_nvidia"
-DEPEND="virtual/opencl"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	#do not strip
-	sed -i "/LFLAGS                  += -s/d" src/Makefile
-	#do not add random CFLAGS
-	sed -i "s/-O2//" src/Makefile || die
-	export PREFIX=/usr
-	export LIBRARY_FOLDER="/usr/$(get_libdir)"
-	eapply_user
-}
-
-src_compile() {
-	default
-	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"
-	./hashcat -a 3 -m 1500 nQCk49SiErOgk || die "Test failed"
-}
diff --git a/app-crypt/hashcat/hashcat-4.2.0.ebuild b/app-crypt/hashcat/hashcat-4.2.0.ebuild
deleted file mode 100644
index b94ec8299ae8..000000000000
--- a/app-crypt/hashcat/hashcat-4.2.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils pax-utils multilib
-
-DESCRIPTION="World's fastest and most advanced password recovery utility"
-HOMEPAGE="https://github.com/hashcat/hashcat"
-SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="video_cards_nvidia"
-DEPEND="virtual/opencl
-	video_cards_nvidia? ( >x11-drivers/nvidia-drivers-367.0 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	#do not strip
-	sed -i "/LFLAGS                  += -s/d" src/Makefile
-	#do not add random CFLAGS
-	sed -i "s/-O2//" src/Makefile || die
-	export PREFIX=/usr
-	export LIBRARY_FOLDER="/usr/$(get_libdir)"
-	eapply_user
-}
-
-src_compile() {
-	default
-	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"
-	./hashcat -a 3 -m 1500 nQCk49SiErOgk || die "Test failed"
-}
diff --git a/app-crypt/hashcat/hashcat-4.2.1.ebuild b/app-crypt/hashcat/hashcat-4.2.1.ebuild
deleted file mode 100644
index 6e73c7c23841..000000000000
--- a/app-crypt/hashcat/hashcat-4.2.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils pax-utils multilib
-
-DESCRIPTION="World's fastest and most advanced password recovery utility"
-HOMEPAGE="https://github.com/hashcat/hashcat"
-SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="video_cards_nvidia"
-DEPEND="virtual/opencl
-	video_cards_nvidia? ( >x11-drivers/nvidia-drivers-367.0 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	#do not strip
-	sed -i "/LFLAGS                  += -s/d" src/Makefile
-	#do not add random CFLAGS
-	sed -i "s/-O2//" src/Makefile || die
-	export PREFIX=/usr
-	export LIBRARY_FOLDER="/usr/$(get_libdir)"
-	export DOCUMENT_FOLDER="/usr/share/doc/${P}"
-	eapply_user
-}
-
-src_compile() {
-	default
-	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"
-	./hashcat -a 3 -m 1500 nQCk49SiErOgk || die "Test failed"
-}
diff --git a/app-crypt/hashcat/hashcat-5.1.0.ebuild b/app-crypt/hashcat/hashcat-5.1.0.ebuild
index d85c65f96f6b..bc8b3fb95c51 100644
--- a/app-crypt/hashcat/hashcat-5.1.0.ebuild
+++ b/app-crypt/hashcat/hashcat-5.1.0.ebuild
@@ -12,7 +12,6 @@ SLOT="0"
 if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/hashcat/hashcat.git"
-	KEYWORDS=""
 else
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/app-crypt/hashcat/hashcat-5.0.0.ebuild b/app-crypt/hashcat/hashcat-6.0.0-r1.ebuild
index 30255c39d174..eab3098c5c18 100644
--- a/app-crypt/hashcat/hashcat-5.0.0.ebuild
+++ b/app-crypt/hashcat/hashcat-6.0.0-r1.ebuild
@@ -1,24 +1,41 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit eutils pax-utils multilib
 
 DESCRIPTION="World's fastest and most advanced password recovery utility"
 HOMEPAGE="https://github.com/hashcat/hashcat"
-SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+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="video_cards_nvidia"
-DEPEND="virtual/opencl
+IUSE="brain video_cards_nvidia"
+DEPEND="
 	app-arch/lzma
-	video_cards_nvidia? ( >x11-drivers/nvidia-drivers-367.0 )"
+	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}/${P}-missing-not-fatal.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"
+	#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
@@ -27,11 +44,11 @@ src_prepare() {
 	export PREFIX=/usr
 	export LIBRARY_FOLDER="/usr/$(get_libdir)"
 	export DOCUMENT_FOLDER="/usr/share/doc/${P}"
-	eapply_user
+	default
 }
 
 src_compile() {
-	emake SHARED=1 PRODUCTION=1 ENABLE_BRAIN=0 SYSTEM_LZMA_SDK=0
+	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}"
 	pax-mark -mr hashcat
 }
 
@@ -53,5 +70,5 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${ED}" SHARED=1 PRODUCTION=1 ENABLE_BRAIN=0 SYSTEM_LZMA_SDK=0 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
 }
diff --git a/app-crypt/hashcat/hashcat-9999.ebuild b/app-crypt/hashcat/hashcat-9999.ebuild
index d85c65f96f6b..32005fae3ae5 100644
--- a/app-crypt/hashcat/hashcat-9999.ebuild
+++ b/app-crypt/hashcat/hashcat-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit eutils pax-utils multilib
 
@@ -12,17 +12,20 @@ SLOT="0"
 if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/hashcat/hashcat.git"
-	KEYWORDS=""
 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="virtual/opencl
+DEPEND="
 	app-arch/lzma
 	brain? ( dev-libs/xxhash )
-	video_cards_nvidia? ( >x11-drivers/nvidia-drivers-367.0 )"
+	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() {
@@ -39,7 +42,7 @@ src_prepare() {
 	export PREFIX=/usr
 	export LIBRARY_FOLDER="/usr/$(get_libdir)"
 	export DOCUMENT_FOLDER="/usr/share/doc/${P}"
-	eapply_user
+	default
 }
 
 src_compile() {