From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1062782-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 00BE0138334
	for <garchives@archives.gentoo.org>; Tue, 18 Dec 2018 21:40:39 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 9D435E0ACB;
	Tue, 18 Dec 2018 21:40:37 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 558DFE0B14
	for <gentoo-commits@lists.gentoo.org>; Tue, 18 Dec 2018 21:40:37 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 1FFCE335C3D
	for <gentoo-commits@lists.gentoo.org>; Tue, 18 Dec 2018 21:40:35 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 6E5534EF
	for <gentoo-commits@lists.gentoo.org>; Tue, 18 Dec 2018 21:40:33 +0000 (UTC)
From: "Rick Farina" <zerochaos@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" <zerochaos@gentoo.org>
Message-ID: <1545169228.17af72b66b2392d8bfb976418f11d14a2d72d535.zerochaos@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild net-analyzer/metasploit/metasploit-4.14.16-r2.ebuild net-analyzer/metasploit/metasploit-4.17.21-r3.ebuild net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild net-analyzer/metasploit/metasploit-9999.ebuild
X-VCS-Directories: net-analyzer/metasploit/
X-VCS-Committer: zerochaos
X-VCS-Committer-Name: Rick Farina
X-VCS-Revision: 17af72b66b2392d8bfb976418f11d14a2d72d535
X-VCS-Branch: master
Date: Tue, 18 Dec 2018 21:40:33 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: d2a04e09-f044-4f0d-84f2-1c0b31b920a7
X-Archives-Hash: 7da87000cfea9c8e794d16de2be6873b

commit:     17af72b66b2392d8bfb976418f11d14a2d72d535
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 18 21:38:45 2018 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Dec 18 21:40:28 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17af72b6

net-analyzer/metasploit: update jtr deps

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 .../{metasploit-4.14.16-r1.ebuild => metasploit-4.14.16-r2.ebuild}      | 2 +-
 .../{metasploit-4.17.21-r3.ebuild => metasploit-4.17.21-r4.ebuild}      | 2 +-
 net-analyzer/metasploit/metasploit-9999.ebuild                          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild b/net-analyzer/metasploit/metasploit-4.14.16-r2.ebuild
similarity index 99%
rename from net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild
rename to net-analyzer/metasploit/metasploit-4.14.16-r2.ebuild
index 10055eaae1c..745c9739718 100644
--- a/net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.14.16-r2.ebuild
@@ -115,7 +115,7 @@ ruby_add_bdepend "${RUBY_COMMON_DEPEND}
 ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
 
 COMMON_DEPEND="dev-db/postgresql[server]
-	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
+	|| ( >=app-crypt/johntheripper-1.7.9-r1[-minimal] app-crypt/johntheripper-jumbo )
 	net-analyzer/nmap"
 RDEPEND+=" ${COMMON_DEPEND}
 	>=app-eselect/eselect-metasploit-0.16"

diff --git a/net-analyzer/metasploit/metasploit-4.17.21-r3.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild
similarity index 99%
rename from net-analyzer/metasploit/metasploit-4.17.21-r3.ebuild
rename to net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild
index 32cb686d0d8..2481fa5180b 100644
--- a/net-analyzer/metasploit/metasploit-4.17.21-r3.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild
@@ -123,7 +123,7 @@ ruby_add_bdepend "${RUBY_COMMON_DEPEND}
 ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
 
 COMMON_DEPEND="dev-db/postgresql[server]
-	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
+	|| ( >=app-crypt/johntheripper-1.7.9-r1[-minimal] app-crypt/johntheripper-jumbo )
 	net-analyzer/nmap"
 RDEPEND+=" ${COMMON_DEPEND}
 	>=app-eselect/eselect-metasploit-0.16"

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index c4fc0fdabcd..6b043c85b99 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -123,7 +123,7 @@ ruby_add_bdepend "${RUBY_COMMON_DEPEND}
 ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
 
 COMMON_DEPEND="dev-db/postgresql[server]
-	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
+	|| ( >=app-crypt/johntheripper-1.7.9-r1[-minimal] app-crypt/johntheripper-jumbo )
 	net-analyzer/nmap"
 RDEPEND+=" ${COMMON_DEPEND}
 	>=app-eselect/eselect-metasploit-0.16"