gentoo auto-resync : 02:10:2022 - 07:12:21

5 files changed, 16 insertions, 300 deletions

diff --git a/app-crypt/johntheripper-jumbo/Manifest b/app-crypt/johntheripper-jumbo/Manifest
index 8cbf1da13e7c..c83e74caf289 100644
--- a/app-crypt/johntheripper-jumbo/Manifest
+++ b/app-crypt/johntheripper-jumbo/Manifest
@@ -2,11 +2,7 @@ AUX johntheripper-jumbo-1.9.0-fix-bashism.patch 939 BLAKE2B e3e4a45a7cba373203d6
 AUX johntheripper-jumbo-1.9.0-gcc11.patch 1713 BLAKE2B b1f3aaf0c76f1c0fc6ad0d498dce4722994ed11a6f0547bb4ff7683083b9c9d59ce817133189853380378121515aa12db1cf08699c40b39e2fdec667045da88d SHA512 d341eeb291b5bf5721b781272ac66aa56e7d38db305f0272e65a0b77bad05ffc631cfe5fe8093f94a8545cc09020d639dfebb1b903585248bd57933661571b4f
 AUX johntheripper-jumbo-1.9.0-opencl-fix.patch 333 BLAKE2B 248ad5ecba48908a982c27c9d8162c22031cfc29f0becb05209f56c837bb850f6032c847a60d8cd05ba88a0f73ad35f27a08fefb734c6bd87f458b22f77db0ab SHA512 81f9dabc6d8ad54944be7eb9b3c7204ce426db842325c31662038e213775c0a86288c860712e6d3c24f7a9d0b7a0fd8962126a25242f45e5f242307691a97d38
 AUX johntheripper-jumbo-1.9.0_p20211129-fix-bashism.patch 3933 BLAKE2B cd5d773615f4b239e857b430c35a905be7e0c8bfd83b037f43fe14799340aa6d3a02bf9f3f69c1e69a2b07a4038474c1fc57a8ab056db26fde5aa14b1842df18 SHA512 505cf695a001f22a74998a83eb79ce7b88882eb51a0864833e06bd9344dae36df629ffb6cdcdfaa019b3dfcfdedc8314a30b169d0d5b1f6976408adbaee49023
-DIST john-1.9.0-jumbo-1.tar.xz 33638768 BLAKE2B 2fd6813e234308408d42581705ee8b25f9217a3dfb43f05483156f7bb67d0ce0d6de9c3ce8c2e4a17bb99bb377119dae2897bc08c800e7bc80bc6cf245400df6 SHA512 c5cb5dc739ee4c666f8479cdf10511fddc391b590c59f90c060d3ccd8449b794ac7b831a6d1f7553883892499e709a66578cfa4d62caef9b7e0a831eb827e808
-DIST johntheripper-jumbo-1.9.0_p20210920.tar.gz 47758128 BLAKE2B e85255dc218c43e6358f76eac1e79af01d437a7a1fcddd608a390734fdc4070cbf949b8abc080b82decf4a1f5e32d2baa6d2a09d385a31913d8e988c8732e85e SHA512 5121434ad275921fe6288c51fd9dfd36ed3162387e70e8089bbc266d4a17ea461b72ce26b2004acfb62d95a9ee2d570ef3b3f00c1d031abd8cff2f20c3ab480a
 DIST johntheripper-jumbo-1.9.0_p20211129.tar.gz 47758087 BLAKE2B de57218151fbc3bed79322d065ef73deb99b73fb1ce55924197793a320600cc1189dabae43fe5848014c2e72dcb7e1c2a91f2aaba64bd8c7314ded37e23a34c9 SHA512 f8fc6bf102d900bb32c5714bd595a71f67f73a1f0a237d9f851b2f250046307bf1177f3782023cd1bbcc55f9d54fd7b4946e09c7dc1fd908ba6a6bad90b233d6
-EBUILD johntheripper-jumbo-1.9.0-r3.ebuild 3063 BLAKE2B 7a97ec7f5c5fe7be273081073a3dda2f800a00c2ee0379469b374b6ba43fe147143cfdae91c87969a7c5f86d63adefe8ca489122cb2fe27bd7a3f894b91a9735 SHA512 f2e6cbf3150f15f9d9da51415ca574ba3ae7000d0dfe0a4cd783dff23b4109b1076de6c52889142707e3f3cdeb572d0994826e88494a840d744512a0cca2afc9
-EBUILD johntheripper-jumbo-1.9.0_p20210920.ebuild 3160 BLAKE2B b8ca0a496a9f1cd4cd46353eb61db4fdc75cd879ca187b94c2ee62b4f7d98a2c1969faeae0adf9f882d3ecce029e0f7f21302747fbc1dced9c5dbac2fb1c6928 SHA512 53b8987d7001a42a168caee5e3b616ff7ced5f0b2c97b308334acb4cf4c501fcc827d83796f1bfa2f5258c22217787f67e7d1b8470f3a0a1478880ff09241413
-EBUILD johntheripper-jumbo-1.9.0_p20211129.ebuild 3423 BLAKE2B 95f8d15df163ef04dace243266b15c15f023d9ef549e4694dcd6f9e1183a74a6232e11f1e31ca35d1b95a0e51c4798363d27f0eb2d9cffb1cda1c2890271cf0b SHA512 b9a088870b39fb8d99e8400a5b9d2a6e5598e7fae2da79299b00873f68c966a57172d6864e456b4d428f345548474f1658a822ee926f40ce1a4209e5c79b563e
-EBUILD johntheripper-jumbo-9999.ebuild 3372 BLAKE2B adcdc67282888fc8ffb99d837f3358760db08e0113ca1fb3ba5207449577c1cbc321aebde5a9e7165af1e291cecac63c8e69f2c5cb950947c60a21e886aeff4b SHA512 16f08c8635ad421c049091b35f007d9a164e32f278982bad922d18ad95df1f4e9e63c1f2623925630978b724ff6380403b64039044e801199f80abc1b9b0548b
+EBUILD johntheripper-jumbo-1.9.0_p20211129-r1.ebuild 3471 BLAKE2B 156fa82b68ef34eec7f16302f3657817e041e2bbfbb0b6034bad4a336c0e7f519f1b45a61ab1227b62854ea0c989af38b86eb37e1cef86b48752a8e7fbe109f7 SHA512 3c8d3ca05cfde86bff53ea48b69fffbac80ab334f8e7a4a4b4c8337528da4661b46eb3944c451747ada09a072f1c7d0fce8bd18640c74c0630102bad4c1a4e07
+EBUILD johntheripper-jumbo-9999.ebuild 3420 BLAKE2B cb8f328e15f4e7d3ecf09bc00a8774ed2199e87398b0e7944013ea0bdaf8c731aeacc3aa5c1af2682173d0c284366b9f766dd0eb18deceb1d736e4939306804c SHA512 c19de9be866874b5ee7e4f1b4dc98ea0734fa5a3b08ac2399581b756c3eb16aa81580c7bacb1e7f716974ede404ba5e5680cde3a3b03d8e3eb74da6412b646e8
 MISC metadata.xml 473 BLAKE2B ed1c424492ff052e83ce899d8ea4a805ce5d4a5604da336ad16929594d14307c2e264c4eb6e6ee985d3167b8917e8c80c38ed9f97ba5293a0b8f84f472fd9786 SHA512 f124050eecf17e3c2fa01b6140881349e089840c75cb30bf054286a049026bb372cc70e1ce7be3054fffbe5836be7dc1f7fc9e3918f874443644ea99c5b441ab
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild
deleted file mode 100644
index f17408ea8cf3..000000000000
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs pax-utils
-
-DESCRIPTION="Fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/"
-
-MY_PN="JohnTheRipper"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/magnumripper/${MY_PN}.git"
-	inherit git-r3
-else
-	JUMBO="jumbo-1"
-	MY_PV="${PV}-${JUMBO}"
-	MY_P="john-${MY_PV}"
-	SRC_URI="https://www.openwall.com/john/k/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-#removed rexgen and commoncrypto
-IUSE="custom-cflags kerberos mpi opencl openmp pcap"
-
-DEPEND=">=dev-libs/openssl-1.0.1:0=
-	virtual/libcrypt:=
-	mpi? ( virtual/mpi )
-	opencl? ( virtual/opencl )
-	kerberos? ( virtual/krb5 )
-	pcap? ( net-libs/libpcap )
-	dev-libs/gmp:=
-	sys-libs/zlib
-	app-arch/bzip2"
-
-RDEPEND="${DEPEND}
-		!app-crypt/johntheripper"
-
-PATCHES=(
-	"${FILESDIR}/${P}-opencl-fix.patch"
-	"${FILESDIR}/${P}-gcc11.patch"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	sed -i 's#$prefix/share/john#/etc/john#' src/configure || die
-	default
-}
-
-src_configure() {
-	cd src || die
-
-	use custom-cflags || strip-flags
-	append-cflags -fcommon
-
-	econf \
-		--disable-native-march \
-		--disable-native-tests \
-		--without-commoncrypto \
-		--disable-rexgen \
-		--with-openssl \
-		--with-systemwide \
-		$(use_enable mpi) \
-		$(use_enable opencl) \
-		$(use_enable openmp) \
-		$(use_enable pcap)
-}
-
-src_compile() {
-	emake -C src
-}
-
-src_test() {
-	pax-mark -mr run/john
-	#if use opencl; then
-		#gpu tests fail in portage, so run cpu only tests
-	#	./run/john --device=cpu --test=0 --verbosity=2 || die
-	#else
-		#weak tests
-	#	./run/john --test=0 --verbosity=2 || die
-		#strong tests
-		#./run/john --test=1 --verbosity=2 || die
-	#fi
-	ewarn "When built systemwide, john can't run tests without reading files in /etc."
-	ewarn "Don't bother opening a bug for this unless you include a patch to fix it"
-}
-
-src_install() {
-	# executables
-	dosbin run/john
-	newsbin run/mailer john-mailer
-
-	pax-mark -mr "${ED}/usr/sbin/john"
-
-	# grep '$(LN)' Makefile.in | head -n-3 | tail -n+2 | cut -d' ' -f3 | cut -d/ -f3
-	for s in \
-		unshadow unafs undrop unique ssh2john putty2john pfx2john keepass2john keyring2john \
-		zip2john gpg2john rar2john racf2john keychain2john kwallet2john pwsafe2john dmg2john \
-		hccap2john base64conv truecrypt_volume2john keystore2john
-	do
-		dosym john /usr/sbin/$s
-	done
-
-	# scripts
-	exeinto /usr/share/john
-	doexe run/*.pl
-	doexe run/*.py
-	cd run
-	for s in *.pl *.py ; do
-		dosym ../share/john/$s /usr/bin/$s
-	done
-	cd ..
-
-	if use opencl; then
-		insinto /etc/john
-		doins -r run/kernels
-	fi
-
-	# config files
-	insinto /etc/john
-	doins run/*.chr run/password.lst
-	doins run/*.conf
-	doins -r run/rules run/ztex
-
-	# documentation
-	rm -f doc/README
-	dodoc -r README.md doc/*
-}
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20210920.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20210920.ebuild
deleted file mode 100644
index a77f1fbf4199..000000000000
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20210920.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs pax-utils
-
-DESCRIPTION="Fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/"
-
-MY_PN="JohnTheRipper"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/magnumripper/${MY_PN}.git"
-	inherit git-r3
-else
-	JUMBO="jumbo-1.1"
-	MY_PV="${PV}-${JUMBO}"
-	MY_P="john-${MY_PV}"
-	HASH_COMMIT="43c7f8850736d4ec68bf0a022ae9fb34c274a01d"
-
-	SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/john-${HASH_COMMIT}"
-
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags kerberos mpi opencl openmp pcap"
-
-DEPEND=">=dev-libs/openssl-1.0.1:=
-	virtual/libcrypt:=
-	mpi? ( virtual/mpi )
-	opencl? ( virtual/opencl )
-	kerberos? ( virtual/krb5 )
-	pcap? ( net-libs/libpcap )
-	dev-libs/gmp:=
-	sys-libs/zlib
-	app-arch/bzip2"
-RDEPEND="${DEPEND}
-	!app-crypt/johntheripper"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.0-fix-bashism.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-
-	cd src || die
-	eautoreconf
-
-	sed -i 's#$prefix/share/john#/etc/john#' configure || die
-}
-
-src_configure() {
-	cd src || die
-
-	use custom-cflags || strip-flags
-
-	econf \
-		--enable-pkg-config \
-		--disable-native-march \
-		--disable-native-tests \
-		--disable-rexgen \
-		--with-openssl \
-		--with-systemwide \
-		$(use_enable mpi) \
-		$(use_enable opencl) \
-		$(use_enable openmp) \
-		$(use_enable pcap)
-}
-
-src_compile() {
-	emake -C src
-}
-
-src_test() {
-	pax-mark -mr run/john
-	#if use opencl; then
-		#gpu tests fail in portage, so run cpu only tests
-	#	./run/john --device=cpu --test=0 --verbosity=2 || die
-	#else
-		#weak tests
-	#	./run/john --test=0 --verbosity=2 || die
-		#strong tests
-		#./run/john --test=1 --verbosity=2 || die
-	#fi
-	ewarn "When built systemwide, john can't run tests without reading files in /etc."
-	ewarn "Don't bother opening a bug for this unless you include a patch to fix it"
-}
-
-src_install() {
-	# Executables
-	dosbin run/john
-	newsbin run/mailer john-mailer
-
-	pax-mark -mr "${ED}/usr/sbin/john"
-
-	# grep '$(LN)' Makefile.in | head -n-3 | tail -n+2 | cut -d' ' -f3 | cut -d/ -f3
-	local s
-	for s in \
-		unshadow unafs undrop unique ssh2john putty2john pfx2john keepass2john keyring2john \
-		zip2john gpg2john rar2john racf2john keychain2john kwallet2john pwsafe2john dmg2john \
-		hccap2john base64conv truecrypt_volume2john keystore2john
-	do
-		dosym john /usr/sbin/${s}
-	done
-
-	# Scripts
-	exeinto /usr/share/john
-	doexe run/*.pl
-	doexe run/*.py
-	cd run || die
-
-	local s
-	for s in *.pl *.py; do
-		dosym ../share/john/${s} /usr/bin/${s}
-	done
-	cd .. || die
-
-	if use opencl; then
-		insinto /etc/john
-		doins -r run/opencl
-	fi
-
-	# Config files
-	insinto /etc/john
-	doins run/*.chr run/password.lst
-	doins run/*.conf
-	doins -r run/rules run/ztex
-
-	# dDocumentation
-	rm -f doc/README || die
-	dodoc -r README.md doc/*
-}
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild
index 5143d68af9a3..37c73b4c41d9 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild
@@ -94,8 +94,8 @@ src_compile() {
 	emake LD="$(tc-getCC)" -C src
 }
 
-src_test() {
-	pax-mark -mr run/john
+#src_test() {
+#	pax-mark -mr run/john
 
 	#if use opencl; then
 		# GPU tests fail in portage, so run cpu only tests
@@ -107,9 +107,9 @@ src_test() {
 		#./run/john --test=1 --verbosity=2 || die
 	#fi
 
-	ewarn "When built systemwide, john can't run tests without reading files in /etc."
-	ewarn "Don't bother opening a bug for this unless you include a patch to fix it"
-}
+#	ewarn "When built systemwide, john can't run tests without reading files in /etc."
+#	ewarn "Don't bother opening a bug for this unless you include a patch to fix it"
+#}
 
 src_install() {
 	# Executables
@@ -132,6 +132,8 @@ src_install() {
 	exeinto /usr/share/john
 	doexe run/*.pl
 	doexe run/*.py
+	insinto /usr/share/john
+	doins -r run/lib
 	cd run || die
 
 	local s
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
index 0b2c68d044c4..65429e87891e 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
@@ -90,8 +90,8 @@ src_compile() {
 	emake LD="$(tc-getCC)" -C src
 }
 
-src_test() {
-	pax-mark -mr run/john
+#src_test() {
+#	pax-mark -mr run/john
 
 	#if use opencl; then
 		# GPU tests fail in portage, so run cpu only tests
@@ -103,9 +103,9 @@ src_test() {
 		#./run/john --test=1 --verbosity=2 || die
 	#fi
 
-	ewarn "When built systemwide, john can't run tests without reading files in /etc."
-	ewarn "Don't bother opening a bug for this unless you include a patch to fix it"
-}
+#	ewarn "When built systemwide, john can't run tests without reading files in /etc."
+#	ewarn "Don't bother opening a bug for this unless you include a patch to fix it"
+#}
 
 src_install() {
 	# Executables
@@ -128,6 +128,8 @@ src_install() {
 	exeinto /usr/share/john
 	doexe run/*.pl
 	doexe run/*.py
+	insinto /usr/share/john
+	doins -r run/lib
 	cd run || die
 
 	local s