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@gentoo.org>

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 6e8d04dc6d4f2e2e2bdb9b9f42399591e4ec0cce..a70e6a1c4cad7c31d871250b08ec1d6be507c41e 100644 (file)
--- 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 1e72fa5104cbd1af9b0ae106d1ec716d105a4dfc..a05e2f9da3554e1d1ba8585b1970ca1dc30a0e73 100644 (file)
--- 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/*