1 |
commit: 5c709711434c65390363fd1689cb0ffb33d0f698 |
2 |
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 18 21:34:31 2018 +0000 |
4 |
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 18 21:40:26 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c709711 |
7 |
|
8 |
app-crypt/johntheripper: blocker jtr-jumbo |
9 |
|
10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
11 |
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org> |
12 |
|
13 |
app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild | 3 ++- |
14 |
app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild | 3 ++- |
15 |
app-crypt/johntheripper/johntheripper-1.8.0.ebuild | 3 ++- |
16 |
3 files changed, 6 insertions(+), 3 deletions(-) |
17 |
|
18 |
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild |
19 |
index 8cc549fa4bf..49d18cec623 100644 |
20 |
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild |
21 |
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild |
22 |
@@ -27,7 +27,8 @@ REQUIRED_USE="openmp? ( !minimal ) |
23 |
opencl? ( !minimal ) |
24 |
mozilla? ( !minimal )" |
25 |
|
26 |
-RDEPEND="sys-libs/zlib |
27 |
+RDEPEND="!app-crypt/johntheripper-jumbo |
28 |
+ sys-libs/zlib |
29 |
!minimal? ( |
30 |
!libressl? ( dev-libs/openssl:0= ) |
31 |
libressl? ( dev-libs/libressl:0= ) |
32 |
|
33 |
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild |
34 |
index e3e30d7db42..48f23d519a6 100644 |
35 |
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild |
36 |
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild |
37 |
@@ -26,7 +26,8 @@ REQUIRED_USE="openmp? ( !minimal ) |
38 |
cuda? ( !minimal ) |
39 |
opencl? ( !minimal )" |
40 |
|
41 |
-RDEPEND="sys-libs/zlib |
42 |
+RDEPEND="!app-crypt/johntheripper-jumbo |
43 |
+ sys-libs/zlib |
44 |
!minimal? ( >=dev-libs/openssl-0.9.7:0 ) |
45 |
mpi? ( virtual/mpi ) |
46 |
cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) |
47 |
|
48 |
diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild |
49 |
index d3365af2702..8cd2dafa182 100644 |
50 |
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild |
51 |
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild |
52 |
@@ -20,7 +20,8 @@ CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_ |
53 |
IUSE="custom-cflags openmp ${CPU_FLAGS}" |
54 |
|
55 |
RDEPEND="sys-libs/zlib" |
56 |
-DEPEND="${RDEPEND}" |
57 |
+DEPEND="${RDEPEND} |
58 |
+ !app-crypt/johntheripper-jumbo" |
59 |
|
60 |
S="${WORKDIR}/${MY_P}" |