Add USE flags for the gui and debugging.

Package-Manager: portage-2.2_rc23/cvs/Linux i686

5 files changed, 55 insertions, 84 deletions

diff --git a/app-crypt/ophcrack/ChangeLog b/app-crypt/ophcrack/ChangeLog
index 6c5782e24b83..87833ef053b5 100644
--- a/app-crypt/ophcrack/ChangeLog
+++ b/app-crypt/ophcrack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/ophcrack
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ophcrack/ChangeLog,v 1.27 2009/02/07 18:52:14 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ophcrack/ChangeLog,v 1.28 2009/02/20 11:20:12 ikelos Exp $
+
+*ophcrack-3.1.0-r2 (20 Feb 2009)
+
+  20 Feb 2009; Mike Auty <ikelos@gentoo.org> -ophcrack-2.4.1.ebuild,
+  +ophcrack-3.1.0-r2.ebuild:
+  Add USE flags for the gui and debugging.
 
 *ophcrack-3.1.0-r1 (07 Feb 2009)
 
diff --git a/app-crypt/ophcrack/Manifest b/app-crypt/ophcrack/Manifest
index 2181aebc7f55..a39946bea6ae 100644
--- a/app-crypt/ophcrack/Manifest
+++ b/app-crypt/ophcrack/Manifest
@@ -2,23 +2,18 @@
 Hash: SHA1
 
 AUX ophcrack-3.0.1-makefile.patch 579 RMD160 b2c5f6cc4d8aef2816489ca80ae2c17d1b27bfd5 SHA1 359a9b4ff1ea197f467043d4c5653904d517b414 SHA256 8280974c5a070c0f07259a0b487a59f13460a7c7358ddd3c9f98318d2a909f7d
-DIST SSTIC04-10k.zip 370847438 RMD160 962b83362ae61cd3ee87b9cc8f355f759ab7ba14 SHA1 7fc0941a846e5ca0b0418d9c1cf004f1f1f480ee SHA256 44391ce526f4a135b54e6ea76a017f56c1aa9dd005354d355e949d261bd9d68a
-DIST SSTIC04-5k.zip 701900757 RMD160 4ac60e6d7bd8d817e5deeb2d93db7397a8f42279 SHA1 dbd001e5aa0d4fc74b5ea8e2408e82e51c56c243 SHA256 9ba2c9e6faeb658a77a342a2d45c47e593daae9e087be3254eb1b050b324cf10
-DIST bkhive-1.1.1.tar.gz 15985 RMD160 90e0a228eec7ceb92bb9fa20b837b7c97fccdcc6 SHA1 558230658dca779939739249f55e3990ebd114e0 SHA256 3f5f85b507d56c09944b394c94551fa27d6fc5ca21ec033e4ebd98ac47417e68
-DIST ophcrack-2.4.1.tar.gz 171256 RMD160 c0aa1ae966593cb025190c84fb5b2ce24b307059 SHA1 1e1925ff3632c00e5d139f033ffa79093825c5b7 SHA256 bb7723e2a3a289a16b7c76f1a6ba4b38007a41e675a437b6ae3e115613f7f355
 DIST ophcrack-3.0.1.tar.bz2 208104 RMD160 5dc3d98002e92e7e3cdd04eb60aab9ae9f26531d SHA1 24861fda71cbd7671699b7158e58c8b6e8c6a879 SHA256 b699fcace0c2dd23e5550262f4d3f81b782afccd820db11c7db08239348d4335
 DIST ophcrack-3.1.0.tar.bz2 238869 RMD160 81da41e980fa885bfc8a3420d93a7151dfed41af SHA1 f4f4665e1a94f9328354a218a23a6c38b15d5de5 SHA256 706bee5d11d246ae16cbca87436a70f0e6f6dbc7d49d14318c1c71e74f5e069d
-DIST samdump2-1.1.1.tar.gz 18888 RMD160 e361b712947b16b87b6f93d2d3a9f53ee4e8f63b SHA1 abd50fa91b1eb21206f202bcffaf5e00eaaf0c0f SHA256 51310babf8f23933a03aba115ae7ac7282d4f16cd6aa96fe3650ff294fb3516e
-EBUILD ophcrack-2.4.1.ebuild 1764 RMD160 69b545b2267c8a33bb2bd77859a2ee6cd1390f03 SHA1 23056b42e6fef54256ca01de7e5ad57c3979bdd9 SHA256 ddff845ebfc4bc36ddd07a6efdd3930c24f4f127b8f92fbaf009926d3ff6f584
 EBUILD ophcrack-3.0.1-r2.ebuild 948 RMD160 7f5d370d5e402176bb9dade76f525e5b77df31ba SHA1 c5dab0d2db47317067918ba2500685116313b1bc SHA256 4b14ac11b52f5237b79bda2a49c378618d2f2c178bf2171d3e795da53433598a
 EBUILD ophcrack-3.1.0-r1.ebuild 805 RMD160 0d6db8cd1e5eb48f1af654e3f65770b7535404d3 SHA1 9f06cc530cc5b95176735f65a60eade0a7712e63 SHA256 f36f4f7e1c00f633e8b0b6901431ee35236d6a1572aa7b41a5a8f4d68e49c1ad
+EBUILD ophcrack-3.1.0-r2.ebuild 1007 RMD160 554fd910c4d1dcf4bc7dce024e6046d1d464b852 SHA1 a099c607ebd35212c6e84f319ba56c83e2800c17 SHA256 fe7a84785b3493f614180b67f17dd401fc8a3af28c4180e3db091a2ec6354bce
 EBUILD ophcrack-3.1.0.ebuild 794 RMD160 5cd6ea5a0cac689d43f6c005eca91ba9b18c1222 SHA1 075d155a90fff021af86943686b403b77d03dca4 SHA256 8e6254a00f926c32acaf9dd8d8b051dc74edaa6de595cc8548df689b74c375a9
-MISC ChangeLog 4612 RMD160 b0aaad72c1aa373e2bfdf170762b80af45eacf74 SHA1 c8471c30b323b639f3eadc26b31f7978b66d7f37 SHA256 5abf7526c62a86546f4ddcccc335ac13aec1f1d7bc2341b015a0b7189eea8171
-MISC metadata.xml 329 RMD160 388a2482a5d4cf6a59ae5c4f3c432f64899eba99 SHA1 73c3dcc979924075a1067f2aeafee6ec9b496186 SHA256 756e7a15833f8ac75e57700cde86a398c96fc441e01acd92f0ac861336a4cb1c
+MISC ChangeLog 4788 RMD160 13ef5a62232624c7534a3b2c47048256d405caeb SHA1 c677dc0dc94b67cbbbe5bd90dfcbd86aca7df14b SHA256 258d2a1d6b3775ad004be516d60a902e2098705e2bf1bd2738268cceb14c01ac
+MISC metadata.xml 249 RMD160 353e61af2447f71c231fa4d067d93cf5f65071e3 SHA1 6ef8057dae50af74c6e08d8e8eed44e0653a965e SHA256 c1ba1c2c5a2c1bccd2043c19c064ebee83dcfd35983216e3f8374238581b2f9f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmN2GsACgkQu7rWomwgFXq4mACfX3xiY7xLCHHa0ha90PNXtKUX
-MyAAnRKfb/u2Z5Y2qwdJz0bdDVyOGxvO
-=VMwV
+iEYEARECAAYFAkmekfgACgkQu7rWomwgFXpJ8ACgmWeNORkKyt09ZCsni9unA8Gi
+GCIAn35YJvobPTBb3kad46HUFagtFwlx
+=vPxn
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/ophcrack/metadata.xml b/app-crypt/ophcrack/metadata.xml
index ca6b81ee04de..38b05775166b 100644
--- a/app-crypt/ophcrack/metadata.xml
+++ b/app-crypt/ophcrack/metadata.xml
@@ -6,7 +6,4 @@
   <email>ikelos@gentoo.org</email>
     <name>Mike Auty</name>
 </maintainer>
-<use>
-	<flag name='ophsmall'>Makes use of smaller cracking tables</flag>
-</use>
 </pkgmetadata>
diff --git a/app-crypt/ophcrack/ophcrack-2.4.1.ebuild b/app-crypt/ophcrack/ophcrack-2.4.1.ebuild
deleted file mode 100644
index fd86fb716b54..000000000000
--- a/app-crypt/ophcrack/ophcrack-2.4.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ophcrack/ophcrack-2.4.1.ebuild,v 1.2 2008/12/07 18:22:17 ikelos Exp $
-
-inherit toolchain-funcs eutils
-
-BKHIVE_VER="1.1.1"
-SAMDUMP_VER="1.1.1"
-
-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 ~ppc ~x86"
-IUSE="ophsmall"
-
-DEPEND="app-arch/unzip
-		>=dev-util/pkgconfig-0.22
-		dev-libs/openssl
-		net-libs/netwib
-		>=x11-libs/gtk+-2"
-RDEPEND="dev-libs/openssl
-		 net-libs/netwib
-		 >=x11-libs/gtk+-2"
-
-src_compile() {
-	# Make samdump2
-	einfo "Compiling samdump2"
-	cd "${WORKDIR}/samdump2-${SAMDUMP_VER}"
-	emake -j1 || die "Failed to make samdump"
-
-	# Make bkhive2
-	einfo "Compiling bkhive"
-	cd "${WORKDIR}/bkhive-${BKHIVE_VER}"
-	emake -j1 || 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}"
-}
diff --git a/app-crypt/ophcrack/ophcrack-3.1.0-r2.ebuild b/app-crypt/ophcrack/ophcrack-3.1.0-r2.ebuild
new file mode 100644
index 000000000000..1f86ff7130cb
--- /dev/null
+++ b/app-crypt/ophcrack/ophcrack-3.1.0-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ophcrack/ophcrack-3.1.0-r2.ebuild,v 1.1 2009/02/20 11:20:12 ikelos Exp $
+
+inherit eutils
+
+DESCRIPTION="A time-memory-trade-off-cracker"
+HOMEPAGE="http://ophcrack.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="qt4 debug"
+
+CDEPEND="dev-libs/openssl
+		 net-libs/netwib
+		 qt4? ( >=x11-libs/qt-gui-4 )"
+DEPEND="app-arch/unzip
+		>=dev-util/pkgconfig-0.22
+		${CDEPEND}"
+RDEPEND="app-crypt/ophcrack-tables
+		 ${CDEPEND}"
+
+src_compile() {
+	local myconf
+
+	myconf="$(use_enable qt4 gui)"
+	myconf="${myconf} $(use_enable debug)"
+
+	econf ${myconf} || die "Failed to compile"
+	emake || die "Failed to make"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || "Installation failed."
+
+	cd "${S}"
+	newicon src/gui/pixmaps/os.xpm ophcrack.xpm
+	make_desktop_entry "${PN}" OphCrack ophcrack
+}