[gentoo-commits] dev/ikelos:master commit in: app-crypt/ophcrack-tables/

[Mike Auty]

commit:     038b03749a4b74582deafb33bfc4c33c3b95ab92
Author:     layman <layman <AT> localhost>
AuthorDate: Sat Jul 16 17:06:57 2016 +0000
Commit:     Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Sat Jul 16 17:06:57 2016 +0000
URL:        https://gitweb.gentoo.org/dev/ikelos.git/commit/?id=038b0374

Update ophcrack-tables based on the current ophcrack-tables ebuild.

 app-crypt/ophcrack-tables/Manifest                 |  3 --
 .../ophcrack-tables/ophcrack-tables-1.1.ebuild     | 33 +++++++++++-----------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/app-crypt/ophcrack-tables/Manifest 
b/app-crypt/ophcrack-tables/Manifest
index 683518f..b1fa587 100644
--- a/app-crypt/ophcrack-tables/Manifest
+++ b/app-crypt/ophcrack-tables/Manifest
@@ -50,6 +50,3 @@ DIST xpspecial_table2.start 1273719552 SHA256 
cbdd5ba32fe118a8fb2180686fc07e5388
 DIST xpspecial_table3.bin 636844860 SHA256 
43603210e6ad62c9653e3906d2c8dd56feac3dc1d13723707e7659a2325e813a SHA512 
d743c311c58ea8b69670bdb25c664e9ed1e66e9449ebb72bb2b1090a405e50b0beba1ea76d65b0bea9e1b0b572fe5a0a80ad9d046f910d32b62ffe26da42edbd
 WHIRLPOOL 
dc4429b78dc1ed28530c20c27958a57e506ef239eb677d02431509995d600993e52e5a24e5a0589ef50c6dc0ff1a26a2109175c8c719da7a3f113bc3a56a9a49
 DIST xpspecial_table3.index 92001844 SHA256 
f313900a518dea4f391557a1cdadc077b36e8cafcada46c1950a71e17a53a9e2 SHA512 
eb4dc73252eea866b9e0bc75ab19f116c13fdd652377a7d6adf2ebb30cad14a5ce8daae410b4c3638637f3419851a556b0a05feb7b4ce0f643f8281328aacec4
 WHIRLPOOL 
a70fe85116d039aa5bb3688f5625321af77b269c5102fe6fe57796e6850e293488b7679e0c28cbecfaa2c0b00385d3fb8829bfbb2e549043b12ad96eb11e0314
 DIST xpspecial_table3.start 1273689720 SHA256 
17261c4c547a6530fba334c9e3877bb06add7a748091d1aa754e747c04b42fa9 SHA512 
700acbb42dd310e74cee4d57fc2c69ae97b48f1414f9cc2c8dbfbb527d49020189406375d72dc8c2120dd440556013768d70d94a0b7c1f3adedf99306599a751
 WHIRLPOOL 
bd5b555e9cc7b5e28b711add9190e9a5a9d8aabb366880260a562623ff1fa96a2380963b26a70bd7f84fb00395a67f7225250071d5fbf96854d4688fc3ed40a3
-EBUILD ophcrack-tables-1.1.ebuild 7081 SHA256 
cb929c3aa1ff3b9472c90fc9687728415e88390f980c064573b817d7ce59aa24 SHA512 
7a72a0854010a0c63a022ac592787ca47d3775960671cf151946837f38d1a9154f8c3a767f85038214365466d82d4a6d28e86c60ee0f6a2bcd0a4f83089c647d
 WHIRLPOOL 
4e3739b611c426a685cd5a9ccb0ac5f923b3712b7ebaafb501f89808f5f5c2c31e661bd3530a6ac4eec4e4e44ccad3acb5aaef972d30a164bc3b0853a876d077
-MISC ChangeLog 849 SHA256 
1220a5a68b00871edff909b26bf412aad23d6464059947368bb39c0b34676597 SHA512 
3bf4be777794ae97e638d91c172710701a343fd46ae2cafda0e7596cbb34728c62b6061d24ea58a2e8952f2d87d7613db7e8cad9bc4cad543e8c93cd6341b2c9
 WHIRLPOOL 
13ea8c170b18cfb64530fb7ad729240d8f8eaa349b9c2cff197845b3052c5c96d99a9ad82fcec76e1008d18eca6fc78f5d6cc4a3e29c324e3c3ff4ea52b845ad
-MISC metadata.xml 449 SHA256 
0829ef645ede1a8c73bb4b1c0420a2b176227b5c729b1553e75f24f112f7debd SHA512 
baafc2aefa99517ac1b667b2e601ca30fc000c3750b246b8a52f661616c4a9bdd164b5a9acfd955ba85cae90d6e24924f3a7edca67ddfb8260224b9a4779e508
 WHIRLPOOL 
7d71e1a9fb4403e99ca643d3ee35fd86f29af24f072d7f67257cbf500b609f3769a79bb24170411f52ed360eeecbb334d15173f53b442af46a3af1425442271f

diff --git a/app-crypt/ophcrack-tables/ophcrack-tables-1.1.ebuild 
b/app-crypt/ophcrack-tables/ophcrack-tables-1.1.ebuild
index e742af1..f0decf7 100644
--- a/app-crypt/ophcrack-tables/ophcrack-tables-1.1.ebuild
+++ b/app-crypt/ophcrack-tables/ophcrack-tables-1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/app-crypt/ophcrack-tables/ophcrack-tables-1.0-r1.ebuild,v
 1.2 2009/10/31 00:38:46 ikelos Exp $
+# $Id$
 
 EAPI="5"
 
@@ -65,11 +65,12 @@ SRC_URI="xpfast? ( 
mirror://sourceforge/project/ophcrack/tables/XP%20free/tables
                 
mirror://sourceforge/project/ophcrack/tables/Vista%20special/table3.start -> 
vistaspecial_table3.start
                 )"
 
-IUSE="xpsmall +xpfast +vistafree +vistaprobafree xpspecial xpgerman vistanum 
vistaspecial"
-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="xpsmall +xpfast +vistafree +vistaprobafree xpspecial xpgerman vistanum 
vistaspecial"
+
+REQUIRED_USE="|| ( xpfast xpsmall vistafree vistaprobafree xpspecial xpgerman 
vistanum vistaspecial )"
 
 DEPEND="app-arch/unzip"
 RDEPEND=""
@@ -113,22 +114,22 @@ src_unpack() {
        for i in ${A};
        do
            if [ "${i:(-4)}" == ".zip" ]; then
-               table=${i#tables_}
-                       table=${table%.zip}
-                       mkdir "${S}/${table}"
-                       cd "${S}/${table}"
-                       unpack "${i}"
-               else
-                       filename=${i##/}
-                   useflag=${filename%%_*}
-                       [ -d "${S}/${useflag}" ] || mkdir "${S}/${useflag}"
-                       use ${useflag} && cp -L "${DISTDIR}/${i}" 
"${S}/${useflag}/${filename#_}"
-               fi
+               table=${i#tables_}
+               table=${table%.zip}
+               mkdir "${S}/${table}"
+               cd $_ || die
+               unpack "${i}"
+           else
+               filename=${i##/}
+               useflag=${filename%%_*}
+               [ -d "${S}/${useflag}" ] || mkdir "${S}/${useflag}"
+               use ${useflag} && cp -L "${DISTDIR}/${i}" 
"${S}/${useflag}/${filename#_}"
+           fi
        done
 }
 
 src_install() {
        dodir /usr/share/ophcrack/
        use vistaprobafree && mv vista_proba_free/vista_proba_free/* 
vista_proba_free/ && rmdir vista_proba_free/vista_proba_free
-       cp -r "${S}"/* "${D}/usr/share/ophcrack"
+       cp -r "${S}"/* "${ED}"/usr/share/ophcrack/ || die
 }