Add USE flags for the gui and debugging.

(Portage version: 2.2_rc23/cvs/Linux i686)

4 files changed, 48 insertions, 72 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/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
+}