Added a pointless USE flag instead of requiring users to install a pointless package...

Package-Manager: portage-2.2.0_alpha69/cvs/Linux i686

diff --git a/app-crypt/ophcrack/ChangeLog b/app-crypt/ophcrack/ChangeLog
index 79ce952d79111becef3aedba9982ccb055bbeea7..5d807e8cf0a5413a21785e43a2e507fdd2c20a3b 100644 (file)
--- a/app-crypt/ophcrack/ChangeLog
+++ b/app-crypt/ophcrack/ChangeLog
@@ -1,6 +1,11 @@
 # 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.32 2009/09/30 11:30:17 ikelos Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ophcrack/ChangeLog,v 1.33 2011/10/23 12:52:59 ikelos Exp $
+
+  23 Oct 2011; Mike Auty <ikelos@gentoo.org> ophcrack-3.3.1.ebuild,
+  metadata.xml:
+  Added a pointless USE flag instead of requiring users to install a pointless
+  package. Fixes bug 387023.
 
 *ophcrack-3.3.1 (30 Sep 2009)
 

diff --git a/app-crypt/ophcrack/Manifest b/app-crypt/ophcrack/Manifest
index a5a0061c931dd479db95bcdb05f0430f5f0a55d8..02c0ee0ecfe019ad2c9b7d8442c0723c1c142c3d 100644 (file)
--- a/app-crypt/ophcrack/Manifest
+++ b/app-crypt/ophcrack/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 DIST ophcrack-3.1.0.tar.bz2 238869 RMD160 81da41e980fa885bfc8a3420d93a7151dfed41af SHA1 f4f4665e1a94f9328354a218a23a6c38b15d5de5 SHA256 706bee5d11d246ae16cbca87436a70f0e6f6dbc7d49d14318c1c71e74f5e069d
 DIST ophcrack-3.3.0.tar.bz2 255049 RMD160 fd3d2250304cfc7c4b9e6172261b7416725e2cb3 SHA1 14f27ff05cd92b40e483851597aa013ae324c154 SHA256 4c46f839cc752e6e9c69196574fa1fd17ff4e1bc4c1d1c0faa4b9228a3509a92
 DIST ophcrack-3.3.1.tar.bz2 255238 RMD160 3a4562e861eb90030c68b067a02cc41271ee8c66 SHA1 65982407f0b7738940d5444530492ce1d81899f9 SHA256 4e23bfccde7962a873cd0c44f4da626795aec17fcfb078f4329ec7145b218d18
 EBUILD ophcrack-3.1.0-r2.ebuild 1018 RMD160 6eabd788631a7a6bfe6ddf02d5a14cd9197053dd SHA1 540c2146626b03de273606e0e3f098e2500669d2 SHA256 6e7632701185c496a717ad787914037c5367e136fce35198d63f5788a30c1dfd
 EBUILD ophcrack-3.3.0.ebuild 1015 RMD160 58bbe208a94d1b8ffe6e850869205ecccb99e5d5 SHA1 45ec8ee0dcd8ff6ef26e83fef210f2800226d92f SHA256 ebb30c601de5c74c346301d6be46ae5685b2176c30b144dcd827e571ed9fabb1
-EBUILD ophcrack-3.3.1.ebuild 1015 RMD160 9480b078187fa4fc3f375fc29fb43f83cb09d692 SHA1 00ddcf561aaf715c5a0f755aa62c80f0043b7901 SHA256 467f1205e0458a02a161c3b95ece77ecfdefb531bc03239f47cfe0c8d5d43245
-MISC ChangeLog 5535 RMD160 cd8a1979ce676ec35b2258a257ee295920c2239f SHA1 812bcb311214c4ce5a71b20c7e45a5ec7ea62c0d SHA256 d72674f77382a4589b5dffb170f4410a667250e422faa21625eac7ba0d855e5e
-MISC metadata.xml 228 RMD160 0c0f21c7ab70c383b7f97394d12228c73acc1761 SHA1 7244819ba1a8f6f55dd5e4ef9b699077b6149a54 SHA256 5bc9b0863b4032c32c2ee0612a08038a2f595c989254291ac8231bed7aecd8e1
+EBUILD ophcrack-3.3.1.ebuild 1007 RMD160 857c5f2ce399c61585e773b6360d99a300b27c0b SHA1 1031aacbd4696b7f725412c9d72f68e454ec2f64 SHA256 7af5f816add52a3c7761979efa9dafb0d8f3b1d5a4baf9775aac3e01aa7d1b02
+MISC ChangeLog 5728 RMD160 d1d930c2c08b86f83e4f6aeb700c0d09d510da4e SHA1 6cdd494efc5595d11128edf01a83e242f1a97201 SHA256 b0abf26271d19eacc551b9c11dd3b9de20b6fa059625cd9dc9faa69c043674a8
+MISC metadata.xml 366 RMD160 7e3cba8ffd12004f3789bbf630213738e00af595 SHA1 e440cf0742dc074ded093edfbde080ffcf13ddcd SHA256 50219e808dbf9ea6497b19115c7b47ba66aedb2cb4bc6be009a7d4de638d4546
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk58+f8ACgkQfXuS5UK5QB3WYQP/c0AoX7Cwthfpw4nTZIimDGaF
-jivxiHphYLUznhBVCtzNehcuLLXRyqCQF1VUFwgGho+TQT+o5CB9nyPcDjsXykef
-L74eIDqxNrSQyKTcB3ZpNjbb546uDHGIgHbyPohuW2tqbB/veQ41uTIqYSxfMre8
-kJArP+8DijWZtkymlwg=
-=JQvU
+iEYEARECAAYFAk6kDjEACgkQu7rWomwgFXpyAwCgqi/EcyZcJlMZLFuJ3RrDvzEx
+YDgAn3PEO0O0mB8B9fBvB3TLFwanzGdD
+=1i6m
 -----END PGP SIGNATURE-----

diff --git a/app-crypt/ophcrack/metadata.xml b/app-crypt/ophcrack/metadata.xml
index 06d733f618834d60d3cbaafd3c199c4b8f73bbcd..d01d52d783a6234ca0ac4631f865358a661a80de 100644 (file)
--- a/app-crypt/ophcrack/metadata.xml
+++ b/app-crypt/ophcrack/metadata.xml
@@ -5,4 +5,7 @@
   <email>ikelos@gentoo.org</email>
     <name>Mike Auty</name>
 </maintainer>
+<use>
+  <flag name="tables">Require the additional tables used to carry out cracking (<pkg>app-crypt/ophcrack-tables</pkg>)</flag>
+</use>
 </pkgmetadata>

diff --git a/app-crypt/ophcrack/ophcrack-3.3.1.ebuild b/app-crypt/ophcrack/ophcrack-3.3.1.ebuild
index a30f93c9d88b84d5dc30d014e9cd5f29edc0bb3d..c833028f75960e5f7a71730c3ca70ee23342855f 100644 (file)
--- a/app-crypt/ophcrack/ophcrack-3.3.1.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ophcrack/ophcrack-3.3.1.ebuild,v 1.1 2009/09/30 11:30:17 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ophcrack/ophcrack-3.3.1.ebuild,v 1.2 2011/10/23 12:52:59 ikelos Exp $
 
-EAPI="1"
+EAPI="3"
 inherit eutils
 
 DESCRIPTION="A time-memory-trade-off-cracker"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="qt4 debug"
+IUSE="qt4 debug +tables"
 
 CDEPEND="dev-libs/openssl
                 net-libs/netwib
@@ -20,17 +20,17 @@ CDEPEND="dev-libs/openssl
 DEPEND="app-arch/unzip
                >=dev-util/pkgconfig-0.22
                ${CDEPEND}"
-RDEPEND="app-crypt/ophcrack-tables
+RDEPEND="tables? ( app-crypt/ophcrack-tables )
                 ${CDEPEND}"
 
-src_compile() {
+src_configure() {
+
        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() {