Version bump, fixes bug 174356 (thanks to Ed Wiget). Also cleaned out some old versions.

Package-Manager: portage-2.1.2.3

10 files changed, 113 insertions, 185 deletions

diff --git a/app-crypt/ophcrack/ChangeLog b/app-crypt/ophcrack/ChangeLog
index 488d16e4cdfa..8d4653bf5bba 100644
--- a/app-crypt/ophcrack/ChangeLog
+++ b/app-crypt/ophcrack/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-crypt/ophcrack
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ophcrack/ChangeLog,v 1.9 2007/03/29 20:27:50 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ophcrack/ChangeLog,v 1.10 2007/04/15 19:52:27 ikelos Exp $
+
+*ophcrack-2.3.4 (15 Apr 2007)
+
+  15 Apr 2007; Mike Auty <ikelos@gentoo.org>
+  -files/ophcrack-2.2-linuxtools-install-path.patch,
+  -files/ophcrack-2.3.1-linuxtools-install-path.patch, -ophcrack-2.2.ebuild,
+  -ophcrack-2.3.1.ebuild, +ophcrack-2.3.4.ebuild:
+  Version bump, fixes bug 174356 (thanks to Ed Wiget). Also cleaned out some
+  old versions.
 
   29 Mar 2007; Peter Weller <welp@gentoo.org> ophcrack-2.3.3.ebuild:
   Keyworded on amd64 wrt bug 171015
diff --git a/app-crypt/ophcrack/Manifest b/app-crypt/ophcrack/Manifest
index 7b0348a0d0a8..6ec94bfed49a 100644
--- a/app-crypt/ophcrack/Manifest
+++ b/app-crypt/ophcrack/Manifest
@@ -1,48 +1,44 @@
-AUX ophcrack-2.2-linuxtools-install-path.patch 1414 RMD160 2e7819adf088f70871860955257356a844c94508 SHA1 9ed67cb482d2bd819621e62116e128dc7df98c89 SHA256 4b63295b80c41a70e0f97abc030ada53493e5f8020204b27f7e86a5d770a1bec
-MD5 0009407a645be025bc75e2a61c5856bf files/ophcrack-2.2-linuxtools-install-path.patch 1414
-RMD160 2e7819adf088f70871860955257356a844c94508 files/ophcrack-2.2-linuxtools-install-path.patch 1414
-SHA256 4b63295b80c41a70e0f97abc030ada53493e5f8020204b27f7e86a5d770a1bec files/ophcrack-2.2-linuxtools-install-path.patch 1414
-AUX ophcrack-2.3.1-linuxtools-install-path.patch 1434 RMD160 52d25ae8e0332d1cafb02e84f6264c21aa71c219 SHA1 a6c45f85f11a7d57a9f725abe059ee215129b531 SHA256 c0815bc2043f3b6c64fb4c159ed6eb1975ed64be225523c6c64e4e4ce972cf2c
-MD5 5d619b8f22fec55ca03bd5466b2e38fc files/ophcrack-2.3.1-linuxtools-install-path.patch 1434
-RMD160 52d25ae8e0332d1cafb02e84f6264c21aa71c219 files/ophcrack-2.3.1-linuxtools-install-path.patch 1434
-SHA256 c0815bc2043f3b6c64fb4c159ed6eb1975ed64be225523c6c64e4e4ce972cf2c files/ophcrack-2.3.1-linuxtools-install-path.patch 1434
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ophcrack-2.3.3-linuxtools-install-path.patch 1320 RMD160 9769d8ea3477c60fa08a90b9d8a44ebc82671964 SHA1 8627f2c5de7c05de6f243b447f46db6ee6777c5f SHA256 62a66b96c8ed62affca40837f51045b4e0e05fcf9216ab5ef9f5f8b85fd8b49a
 MD5 9135b34e522b26295949313543c5fb1a files/ophcrack-2.3.3-linuxtools-install-path.patch 1320
 RMD160 9769d8ea3477c60fa08a90b9d8a44ebc82671964 files/ophcrack-2.3.3-linuxtools-install-path.patch 1320
 SHA256 62a66b96c8ed62affca40837f51045b4e0e05fcf9216ab5ef9f5f8b85fd8b49a files/ophcrack-2.3.3-linuxtools-install-path.patch 1320
 DIST SSTIC04-10k.zip 364228 RMD160 bc0678e1b4a00020993a2c2c7f4beb67a0a985f9 SHA1 dcd3a9cdc5e0fb5f038a8c6fdafe469c3286bff7 SHA256 39ee186b7eca2f13a003e1a471ea083a80af7b657b90e829adee32cb1c875259
 DIST SSTIC04-5k.zip 701900757 RMD160 4ac60e6d7bd8d817e5deeb2d93db7397a8f42279 SHA1 dbd001e5aa0d4fc74b5ea8e2408e82e51c56c243 SHA256 910cfab447d273564a374d62620d50812d0623657905835da152d53c3542552f
+DIST bkhive-1.1.0.tar.gz 15986 RMD160 d288a3978488ad42b829e070b7071cc92391e035 SHA1 5d2f990cb3e0686b7499c3b4cad3c3d6d324577b SHA256 89d25a4655d87726a8ab513c2604faecd52df1b8dc8a7c53e447eed1bf0e9b86
 DIST bkhive2.tar.gz 3283 RMD160 08ed260fa1d2605e9ac9f25fe6fbb5fe0e7a92f8 SHA1 736c26b5da4a2c2892d7c0eb7c98c0bc218f1e4b SHA256 13f44f8e85ca0a5ae9a6c630780ada17fc1f31cf5f0181826784ebf0a85520bf
-DIST ophcrack-2.2.tar.gz 148443 RMD160 47af8b59460b28b617e99946e33bd453723bda44 SHA1 479ba3269e9214ecfc335565bc711b274ef4b173 SHA256 cb30073eb982f149478ca2923b6412d1a4a8db1ae4f0ba9a632fb7b62598d91b
-DIST ophcrack-2.3.1.tar.gz 164484 RMD160 e8eee53e8a49a55270161ee9b86332b129c6a468 SHA1 91d15c319f364d05aca0de108fbab0ac4a128948 SHA256 b8ad977b2c1835f6ce705ef6c2faf13a0dbf98445b72b60c7697fb5077503a3d
 DIST ophcrack-2.3.3.tar.gz 176184 RMD160 6cc9317f6c24c4d1bfa3a7b348eb759a8b0cac81 SHA1 dc83eb2a3d016eee272192e258c860e733538a8e SHA256 210db7499b76e41a89ac0930f98250aa04fef530f3f29253b42390e658eff6c3
+DIST ophcrack-2.3.4.tar.gz 168131 RMD160 f3a92b559a3f054dd55a8fbe20897e6728e9ab22 SHA1 ae6fa555e098b0233e685e7e16e183eda35d1920 SHA256 b5ee4b550d47f13858f81a0957e1630a0a4690242670a781b5bdd6fa30af0cc0
+DIST samdump2-1.1.0.tar.gz 18897 RMD160 a2e5916899e69897cd504fa8e1672f11b90b5e7d SHA1 8ac689a32b7c034942b1069ec8c247f9fa1bc17c SHA256 b08fbd80ef6960f56dbb67c5a59addff08d6ea7d5b34ccc7ccf004b5820f1d1e
 DIST samdump2_linux.tgz 144901 RMD160 525f1656285783ed951d6b9a1430eddc1c46426f SHA1 0a27c7d7fbf40451a9ee74e44d11592033e8f258 SHA256 fefe3b495de5a9901c96736ab85c88b981bd7ce6318dd90bbd68b1747e945d26
-EBUILD ophcrack-2.2.ebuild 902 RMD160 54df32714353e014342267876d249fec430765ca SHA1 9cb9f5bb8f205c3fa612e139b3ae72a404e7b280 SHA256 2c0583827fb9b2225a1bd0fb84dc457d633a8a60bbbf0405f945288851fb942e
-MD5 c2c718bfbceeb234b8262f4110d25006 ophcrack-2.2.ebuild 902
-RMD160 54df32714353e014342267876d249fec430765ca ophcrack-2.2.ebuild 902
-SHA256 2c0583827fb9b2225a1bd0fb84dc457d633a8a60bbbf0405f945288851fb942e ophcrack-2.2.ebuild 902
-EBUILD ophcrack-2.3.1.ebuild 904 RMD160 921059db27a394a46ab19829f787e1102866bcca SHA1 316059971b8b5f57071af6ff34ee916f940df67c SHA256 cd9b572d8ff6c0e67ebe0f080fab11a0e33f262a108ea1df869998ffc4a77296
-MD5 61e0ea8067e10bf0cd9ad5a7648ca096 ophcrack-2.3.1.ebuild 904
-RMD160 921059db27a394a46ab19829f787e1102866bcca ophcrack-2.3.1.ebuild 904
-SHA256 cd9b572d8ff6c0e67ebe0f080fab11a0e33f262a108ea1df869998ffc4a77296 ophcrack-2.3.1.ebuild 904
 EBUILD ophcrack-2.3.3.ebuild 1690 RMD160 e27f8cbf0f5c2334574a6ad3c2b398e5629c54d5 SHA1 239dd09b897ea4a8c1adb98deebb8a1fe5fbc3d5 SHA256 051b7cf8648645b076ae2a204fe00007c39419ca10c34d5395a81b06d3448db5
 MD5 1881e48e8ea1dc29ede97cb7b43bcebf ophcrack-2.3.3.ebuild 1690
 RMD160 e27f8cbf0f5c2334574a6ad3c2b398e5629c54d5 ophcrack-2.3.3.ebuild 1690
 SHA256 051b7cf8648645b076ae2a204fe00007c39419ca10c34d5395a81b06d3448db5 ophcrack-2.3.3.ebuild 1690
-MISC ChangeLog 1458 RMD160 5150db13bf6864427a9feedc4688eed99f12ac48 SHA1 2d701b0062cf0184234e4bd16a19d4a3c7e8be6f SHA256 a8bef8ca9e1677b20c4c8b0162fc04f198bcd19436bd1f55fa08f42a275c0938
-MD5 65d5d551c059b176658c03406ca2ed11 ChangeLog 1458
-RMD160 5150db13bf6864427a9feedc4688eed99f12ac48 ChangeLog 1458
-SHA256 a8bef8ca9e1677b20c4c8b0162fc04f198bcd19436bd1f55fa08f42a275c0938 ChangeLog 1458
+EBUILD ophcrack-2.3.4.ebuild 1653 RMD160 f1182dbceb083963a939388a95fc2d802996ff2b SHA1 b29a2c3b5f731d6e33116e15953ad17ee918da6f SHA256 ad92c4a18980b341a6acebc40981f1e949a5a465adf351fb2ee51f220a3798e1
+MD5 5ce7b52e8d777d66e774ca4c5544c076 ophcrack-2.3.4.ebuild 1653
+RMD160 f1182dbceb083963a939388a95fc2d802996ff2b ophcrack-2.3.4.ebuild 1653
+SHA256 ad92c4a18980b341a6acebc40981f1e949a5a465adf351fb2ee51f220a3798e1 ophcrack-2.3.4.ebuild 1653
+MISC ChangeLog 1811 RMD160 f0eaaef176af39337600c70ddf85dfbd89bb3ffa SHA1 116c00a2b0588e52f73bbdfb0b6c51c6b3ee77db SHA256 164aa63aca241c631bd92b8db8979cb8ccb6d65d1ff1837320d8a7b553f5680e
+MD5 0177c7e58481f176e05e4736886fd92d ChangeLog 1811
+RMD160 f0eaaef176af39337600c70ddf85dfbd89bb3ffa ChangeLog 1811
+SHA256 164aa63aca241c631bd92b8db8979cb8ccb6d65d1ff1837320d8a7b553f5680e ChangeLog 1811
 MISC metadata.xml 228 RMD160 0c0f21c7ab70c383b7f97394d12228c73acc1761 SHA1 7244819ba1a8f6f55dd5e4ef9b699077b6149a54 SHA256 5bc9b0863b4032c32c2ee0612a08038a2f595c989254291ac8231bed7aecd8e1
 MD5 2435c886331c5f67eadc6ccbe10d5314 metadata.xml 228
 RMD160 0c0f21c7ab70c383b7f97394d12228c73acc1761 metadata.xml 228
 SHA256 5bc9b0863b4032c32c2ee0612a08038a2f595c989254291ac8231bed7aecd8e1 metadata.xml 228
-MD5 f0897129b4ef21d3dafbb2ae57894988 files/digest-ophcrack-2.2 696
-RMD160 d129a0d172c59d30b53a5f3f9e247e1f078cb0c8 files/digest-ophcrack-2.2 696
-SHA256 cdc5a04d234989f880f1b5a58a1dd04d9505bf89c076cae1ea4473463bb53a0b files/digest-ophcrack-2.2 696
-MD5 7031dc44d511eb3dcc7bc64c98e8fef2 files/digest-ophcrack-2.3.1 702
-RMD160 d1c498e211963fb8002904329db8a4e237fd1805 files/digest-ophcrack-2.3.1 702
-SHA256 51a09a1c3f8f44718bcd94775d575092ad80a3f67cbe29ce60eb6164e16acc0c files/digest-ophcrack-2.3.1 702
 MD5 c919599c511bf0e281b543fa7e507979 files/digest-ophcrack-2.3.3 1154
 RMD160 111a4ce7774ef9a4f7f3b6fe805ca0adf54eb679 files/digest-ophcrack-2.3.3 1154
 SHA256 017f7f7806d083479cd43245d249ef752f832dc4b27143343a57071ab6eecbd1 files/digest-ophcrack-2.3.3 1154
+MD5 7374563e34615e8b56811a34cdc4e178 files/digest-ophcrack-2.3.4 1178
+RMD160 3dd1add22592135442c0875d21724851374a6193 files/digest-ophcrack-2.3.4 1178
+SHA256 a7d5ab9b5eb91e1a994b0c0e3b5bb4cfed538cfff6a6908bb2b09e5fcb1d8462 files/digest-ophcrack-2.3.4 1178
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGIoMNu7rWomwgFXoRAgyGAJ46TLtKOMkAstaEcxs4ID9Hw6PggQCfXrkr
++x/no9+b6M2rXtvixT901Iw=
+=yDLC
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/ophcrack/files/digest-ophcrack-2.2 b/app-crypt/ophcrack/files/digest-ophcrack-2.2
deleted file mode 100644
index a143db216a3b..000000000000
--- a/app-crypt/ophcrack/files/digest-ophcrack-2.2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 a5542fc3de4d24ecb62a01154f0f74b9 SSTIC04-10k.zip 364228
-RMD160 bc0678e1b4a00020993a2c2c7f4beb67a0a985f9 SSTIC04-10k.zip 364228
-SHA256 39ee186b7eca2f13a003e1a471ea083a80af7b657b90e829adee32cb1c875259 SSTIC04-10k.zip 364228
-MD5 00181247b0ef30d0fd138341a6f883ff SSTIC04-5k.zip 701900757
-RMD160 4ac60e6d7bd8d817e5deeb2d93db7397a8f42279 SSTIC04-5k.zip 701900757
-SHA256 910cfab447d273564a374d62620d50812d0623657905835da152d53c3542552f SSTIC04-5k.zip 701900757
-MD5 61c131859a483426637b5133bbfe709b ophcrack-2.2.tar.gz 148443
-RMD160 47af8b59460b28b617e99946e33bd453723bda44 ophcrack-2.2.tar.gz 148443
-SHA256 cb30073eb982f149478ca2923b6412d1a4a8db1ae4f0ba9a632fb7b62598d91b ophcrack-2.2.tar.gz 148443
diff --git a/app-crypt/ophcrack/files/digest-ophcrack-2.3.1 b/app-crypt/ophcrack/files/digest-ophcrack-2.3.1
deleted file mode 100644
index a4fa536d7836..000000000000
--- a/app-crypt/ophcrack/files/digest-ophcrack-2.3.1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 a5542fc3de4d24ecb62a01154f0f74b9 SSTIC04-10k.zip 364228
-RMD160 bc0678e1b4a00020993a2c2c7f4beb67a0a985f9 SSTIC04-10k.zip 364228
-SHA256 39ee186b7eca2f13a003e1a471ea083a80af7b657b90e829adee32cb1c875259 SSTIC04-10k.zip 364228
-MD5 00181247b0ef30d0fd138341a6f883ff SSTIC04-5k.zip 701900757
-RMD160 4ac60e6d7bd8d817e5deeb2d93db7397a8f42279 SSTIC04-5k.zip 701900757
-SHA256 910cfab447d273564a374d62620d50812d0623657905835da152d53c3542552f SSTIC04-5k.zip 701900757
-MD5 a4ba5310218f6155d58720ee2e925133 ophcrack-2.3.1.tar.gz 164484
-RMD160 e8eee53e8a49a55270161ee9b86332b129c6a468 ophcrack-2.3.1.tar.gz 164484
-SHA256 b8ad977b2c1835f6ce705ef6c2faf13a0dbf98445b72b60c7697fb5077503a3d ophcrack-2.3.1.tar.gz 164484
diff --git a/app-crypt/ophcrack/files/digest-ophcrack-2.3.4 b/app-crypt/ophcrack/files/digest-ophcrack-2.3.4
new file mode 100644
index 000000000000..5c067e0e4a74
--- /dev/null
+++ b/app-crypt/ophcrack/files/digest-ophcrack-2.3.4
@@ -0,0 +1,15 @@
+MD5 a5542fc3de4d24ecb62a01154f0f74b9 SSTIC04-10k.zip 364228
+RMD160 bc0678e1b4a00020993a2c2c7f4beb67a0a985f9 SSTIC04-10k.zip 364228
+SHA256 39ee186b7eca2f13a003e1a471ea083a80af7b657b90e829adee32cb1c875259 SSTIC04-10k.zip 364228
+MD5 00181247b0ef30d0fd138341a6f883ff SSTIC04-5k.zip 701900757
+RMD160 4ac60e6d7bd8d817e5deeb2d93db7397a8f42279 SSTIC04-5k.zip 701900757
+SHA256 910cfab447d273564a374d62620d50812d0623657905835da152d53c3542552f SSTIC04-5k.zip 701900757
+MD5 241ef8905e168ae6e318835fe45157de bkhive-1.1.0.tar.gz 15986
+RMD160 d288a3978488ad42b829e070b7071cc92391e035 bkhive-1.1.0.tar.gz 15986
+SHA256 89d25a4655d87726a8ab513c2604faecd52df1b8dc8a7c53e447eed1bf0e9b86 bkhive-1.1.0.tar.gz 15986
+MD5 bd4da8109d5f14b168c962b6110be6cc ophcrack-2.3.4.tar.gz 168131
+RMD160 f3a92b559a3f054dd55a8fbe20897e6728e9ab22 ophcrack-2.3.4.tar.gz 168131
+SHA256 b5ee4b550d47f13858f81a0957e1630a0a4690242670a781b5bdd6fa30af0cc0 ophcrack-2.3.4.tar.gz 168131
+MD5 81a9d7ea4daa40bffa5647b38629f2c5 samdump2-1.1.0.tar.gz 18897
+RMD160 a2e5916899e69897cd504fa8e1672f11b90b5e7d samdump2-1.1.0.tar.gz 18897
+SHA256 b08fbd80ef6960f56dbb67c5a59addff08d6ea7d5b34ccc7ccf004b5820f1d1e samdump2-1.1.0.tar.gz 18897
diff --git a/app-crypt/ophcrack/files/ophcrack-2.2-linuxtools-install-path.patch b/app-crypt/ophcrack/files/ophcrack-2.2-linuxtools-install-path.patch
deleted file mode 100644
index 0424f0b9ac6d..000000000000
--- a/app-crypt/ophcrack/files/ophcrack-2.2-linuxtools-install-path.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -uNr ophcrack-2.2/Makefile.am ophcrack-2.1.new/Makefile.am
---- ophcrack-2.2/Makefile.am	2005-03-31 15:09:50.000000000 +0100
-+++ ophcrack-2.2.new/Makefile.am	2005-11-07 17:24:46.000000000 +0000
-@@ -36,10 +36,10 @@
- install-exec-local:
- 	if test -d $(srcdir)/linux_tools; then \
- 	  if test -f $(srcdir)/linux_tools/bkhive; then \
--	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/bkhive $(bindir); \
-+	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/bkhive $(DESTDIR)$(bindir); \
- 	  fi ;\
- 	  if test -f $(srcdir)/linux_tools/samdump2; then \
--	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/samdump2 $(bindir); \
-+	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/samdump2 $(DESTDIR)$(bindir); \
- 	  fi \
- 	fi
- 
-diff -uNr ophcrack-2.2/Makefile.in ophcrack-2.1.new/Makefile.in
---- ophcrack-2.2/Makefile.in	2005-03-31 15:10:16.000000000 +0100
-+++ ophcrack-2.2.new/Makefile.in	2005-11-07 17:25:09.000000000 +0000
-@@ -383,10 +383,10 @@
- install-exec-local:
- 	if test -d $(srcdir)/linux_tools; then \
- 	  if test -f $(srcdir)/linux_tools/bkhive; then \
--	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/bkhive $(bindir); \
-+	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/bkhive $(DESTDIR)$(bindir); \
- 	  fi ;\
- 	  if test -f $(srcdir)/linux_tools/samdump2; then \
--	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/samdump2 $(bindir); \
-+	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/samdump2 $(DESTDIR)$(bindir); \
- 	  fi \
- 	fi
- 
diff --git a/app-crypt/ophcrack/files/ophcrack-2.3.1-linuxtools-install-path.patch b/app-crypt/ophcrack/files/ophcrack-2.3.1-linuxtools-install-path.patch
deleted file mode 100644
index 4d9cdeda1f90..000000000000
--- a/app-crypt/ophcrack/files/ophcrack-2.3.1-linuxtools-install-path.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -uNr ophcrack-2.3.1.orig/Makefile.am ophcrack-2.3.1/Makefile.am
---- ophcrack-2.3.1.orig/Makefile.am	2005-03-31 15:09:50.000000000 +0100
-+++ ophcrack-2.3.1/Makefile.am	2005-11-07 17:24:46.000000000 +0000
-@@ -36,10 +36,10 @@
- install-exec-local:
- 	if test -d $(srcdir)/linux_tools; then \
- 	  if test -f $(srcdir)/linux_tools/bkhive; then \
--	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/bkhive $(bindir); \
-+	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/bkhive $(DESTDIR)$(bindir); \
- 	  fi ;\
- 	  if test -f $(srcdir)/linux_tools/samdump2; then \
--	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/samdump2 $(bindir); \
-+	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/samdump2 $(DESTDIR)$(bindir); \
- 	  fi \
- 	fi
- 
-diff -uNr ophcrack-2.3.1.orig/Makefile.in ophcrack-2.3.1/Makefile.in
---- ophcrack-2.3.1.orig/Makefile.in	2005-03-31 15:10:16.000000000 +0100
-+++ ophcrack-2.3.1/Makefile.in	2005-11-07 17:25:09.000000000 +0000
-@@ -383,10 +383,10 @@
- install-exec-local:
- 	if test -d $(srcdir)/linux_tools; then \
- 	  if test -f $(srcdir)/linux_tools/bkhive; then \
--	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/bkhive $(bindir); \
-+	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/bkhive $(DESTDIR)$(bindir); \
- 	  fi ;\
- 	  if test -f $(srcdir)/linux_tools/samdump2; then \
--	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/samdump2 $(bindir); \
-+	    $(INSTALL_PROGRAM) $(srcdir)/linux_tools/samdump2 $(DESTDIR)$(bindir); \
- 	  fi \
- 	fi
- 
diff --git a/app-crypt/ophcrack/ophcrack-2.2.ebuild b/app-crypt/ophcrack/ophcrack-2.2.ebuild
deleted file mode 100644
index 54427c239ed6..000000000000
--- a/app-crypt/ophcrack/ophcrack-2.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ophcrack/ophcrack-2.2.ebuild,v 1.3 2006/12/20 01:37:44 ikelos Exp $
-
-inherit eutils
-
-DESCRIPTION="A time-memory-trade-off-cracker"
-HOMEPAGE="http://ophcrack.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-		 !ophsmall? ( http://lasecwww.epfl.ch/SSTIC04-5k.zip )
-		 ophsmall? ( http://lasecwww.epfl.ch/SSTIC04-10k.zip )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="ophsmall"
-
-DEPEND="app-arch/unzip
-		dev-libs/openssl
-		net-libs/netwib"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-
-	epatch ${FILESDIR}/${P}-linuxtools-install-path.patch
-}
-
-src_install() {
-	make install DESTDIR=${D}
-
-	TABLENAME="5000"
-	use ophsmall && TABLENAME="10000"
-
-	dodir /usr/share/${PN}/${TABLENAME}
-	mv ${WORKDIR}/table* ${D}/usr/share/${PN}/${TABLENAME}
-}
diff --git a/app-crypt/ophcrack/ophcrack-2.3.1.ebuild b/app-crypt/ophcrack/ophcrack-2.3.1.ebuild
deleted file mode 100644
index d32950661f04..000000000000
--- a/app-crypt/ophcrack/ophcrack-2.3.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ophcrack/ophcrack-2.3.1.ebuild,v 1.2 2006/12/20 01:37:44 ikelos Exp $
-
-inherit eutils
-
-DESCRIPTION="A time-memory-trade-off-cracker"
-HOMEPAGE="http://ophcrack.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-		 !ophsmall? ( http://lasecwww.epfl.ch/SSTIC04-5k.zip )
-		 ophsmall? ( http://lasecwww.epfl.ch/SSTIC04-10k.zip )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="ophsmall"
-
-DEPEND="app-arch/unzip
-		dev-libs/openssl
-		net-libs/netwib"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-
-	epatch ${FILESDIR}/${P}-linuxtools-install-path.patch
-}
-
-src_install() {
-	make install DESTDIR=${D}
-
-	TABLENAME="5000"
-	use ophsmall && TABLENAME="10000"
-
-	dodir /usr/share/${PN}/${TABLENAME}
-	mv ${WORKDIR}/table* ${D}/usr/share/${PN}/${TABLENAME}
-}
diff --git a/app-crypt/ophcrack/ophcrack-2.3.4.ebuild b/app-crypt/ophcrack/ophcrack-2.3.4.ebuild
new file mode 100644
index 000000000000..e9fe98a109bf
--- /dev/null
+++ b/app-crypt/ophcrack/ophcrack-2.3.4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ophcrack/ophcrack-2.3.4.ebuild,v 1.1 2007/04/15 19:52:27 ikelos Exp $
+
+inherit toolchain-funcs eutils
+
+BKHIVE_VER="1.1.0"
+SAMDUMP_VER="1.1.0"
+
+DESCRIPTION="A time-memory-trade-off-cracker"
+HOMEPAGE="http://ophcrack.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://sourceforge/${PN}/bkhive-${BKHIVE_VER}.tar.gz
+	mirror://sourceforge/${PN}/samdump2-${SAMDUMP_VER}.tar.gz
+	!ophsmall? ( http://lasecwww.epfl.ch/SSTIC04-5k.zip )
+	ophsmall? ( http://lasecwww.epfl.ch/SSTIC04-10k.zip )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ophsmall"
+
+DEPEND="app-arch/unzip
+		dev-libs/openssl
+		net-libs/netwib"
+RDEPEND=""
+
+src_compile() {
+	# Make samdump2
+	einfo "Compiling samdump2"
+	cd ${WORKDIR}/samdump2-${SAMDUMP_VER}
+	MAKEOPTS="-j1" emake || die "Failed to make samdump"
+
+	# Make bkhive2
+	einfo "Compiling bkhive"
+	cd ${WORKDIR}/bkhive-${BKHIVE_VER}
+	MAKEOPTS="-j1" emake || die "Failed to make bkhive2"
+
+	# Make the program
+	einfo "Compiling ophcrack"
+	cd ${S}
+	econf
+	emake || die "Failed to make ophcrack"
+
+	# Don't try to install the prebuilt binaries,
+	# they'll cause an access violation
+	rm -fr ${S}/linux_tools
+}
+
+src_install() {
+	make install DESTDIR=${D}
+
+	cd ${WORKDIR}/bkhive-${BKHIVE_VER}
+	make install DESTDIR=${D} PREFIX=/usr/
+
+	cd ${WORKDIR}/samdump2-${SAMDUMP_VER}
+	make install DESTDIR=${D} PREFIX=/usr/
+
+	TABLENAME="5000"
+	use ophsmall && TABLENAME="10000"
+
+	dodir /usr/share/${PN}/${TABLENAME}
+	mv ${WORKDIR}/table* ${D}/usr/share/${PN}/${TABLENAME}
+}