From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1062780-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 A8E63138335
for <garchives@archives.gentoo.org>; Tue, 18 Dec 2018 21:40:38 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 62674E0B65;
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 377D9E0ACB
for <gentoo-commits@lists.gentoo.org>; Tue, 18 Dec 2018 21:40:36 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 55965335C78
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 5AA9B4EE
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: <1545169226.5c709711434c65390363fd1689cb0ffb33d0f698.zerochaos@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild app-crypt/johntheripper/johntheripper-1.8.0.ebuild
X-VCS-Directories: app-crypt/johntheripper/
X-VCS-Committer: zerochaos
X-VCS-Committer-Name: Rick Farina
X-VCS-Revision: 5c709711434c65390363fd1689cb0ffb33d0f698
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: 556dcc47-5aa1-48a3-900e-57ff9b4997be
X-Archives-Hash: 4716c0ebcde72d6e1cc087782fe420ae
commit: 5c709711434c65390363fd1689cb0ffb33d0f698
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 18 21:34:31 2018 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Dec 18 21:40:26 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c709711
app-crypt/johntheripper: blocker jtr-jumbo
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild | 3 ++-
app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild | 3 ++-
app-crypt/johntheripper/johntheripper-1.8.0.ebuild | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
index 8cc549fa4bf..49d18cec623 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
@@ -27,7 +27,8 @@ REQUIRED_USE="openmp? ( !minimal )
opencl? ( !minimal )
mozilla? ( !minimal )"
-RDEPEND="sys-libs/zlib
+RDEPEND="!app-crypt/johntheripper-jumbo
+ sys-libs/zlib
!minimal? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
index e3e30d7db42..48f23d519a6 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
@@ -26,7 +26,8 @@ REQUIRED_USE="openmp? ( !minimal )
cuda? ( !minimal )
opencl? ( !minimal )"
-RDEPEND="sys-libs/zlib
+RDEPEND="!app-crypt/johntheripper-jumbo
+ sys-libs/zlib
!minimal? ( >=dev-libs/openssl-0.9.7:0 )
mpi? ( virtual/mpi )
cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit )
diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index d3365af2702..8cd2dafa182 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -20,7 +20,8 @@ CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_
IUSE="custom-cflags openmp ${CPU_FLAGS}"
RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ !app-crypt/johntheripper-jumbo"
S="${WORKDIR}/${MY_P}"