[gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/

[Rick Farina]

commit:     358201d61352b1b840c4721cf02efef7048f8513
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 20 04:08:37 2018 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Dec 20 04:08:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=358201d6

app-crypt/johntheripper-jumbo: fix bug #673414

also don't install opencl kernels in a dir john doesn't read them in

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

 app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild | 7 +++----
 app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild  | 8 ++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild
index 6e8d04dc6d4..a70e6a1c4ca 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild
@@ -96,7 +96,7 @@ src_install() {
        dosbin run/john
        newsbin run/mailer john-mailer
 
-       pax-mark -mr "${ED}usr/sbin/john"
+       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 \
@@ -111,15 +111,14 @@ src_install() {
        doins run/*.py
 
        if use opencl; then
-               insinto /usr/share/john/kernels
-               doins run/kernels/*
+               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/kernels
 
        # documentation
        dodoc doc/*

diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild 
b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
index 1e72fa5104c..a05e2f9da35 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
@@ -93,7 +93,7 @@ src_install() {
        dosbin run/john
        newsbin run/mailer john-mailer
 
-       pax-mark -mr "${ED}usr/sbin/john"
+       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 \
@@ -108,15 +108,15 @@ src_install() {
        doins run/*.py
 
        if use opencl; then
-               insinto /usr/share/john/kernels
-               doins run/kernels/*
+               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/kernels run/ztex
+       doins -r run/rules run/ztex
 
        # documentation
        dodoc doc/*