Fixing linking for amd64, thanks to Tony in #167731.

Package-Manager: portage-2.1.2-r9

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index d6b323fcd888ba4b6f858e694e3b5ea8bcff783d..b6edb69c80bf0e760f8bc402c40a2386f489a101 100644 (file)
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/johntheripper
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.51 2006/12/30 21:15:13 grobian Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.52 2007/02/20 21:12:24 phreak Exp $
+
+  20 Feb 2007; Christian Heim <phreak@gentoo.org>
+  johntheripper-1.7.2.ebuild:
+  Fixing linking for amd64, thanks to Tony in #167731.
 
   30 Dec 2006; Fabian Groffen <grobian@gentoo.org>
   johntheripper-1.6.40.ebuild, johntheripper-1.7.0.2.ebuild,

diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index d7224c4d2b517be7125eaac019c8e5d80212c454..4bb7d22a1cec0f062b6be7276f154aea091582f7 100644 (file)
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX clk_tck.patch 2864 RMD160 ffcc335bdff4c609574472e3a947d482e123b13e SHA1 5d1c9ebc7f7d0046be3d164c157c2837fe6b10e8 SHA256 57921f1d742e3a42dd1d9b74f70c2d54b78155bc68bf33cad5ffc241f770f7f8
 MD5 686dc0787082b89b5eb11489e71e4474 files/clk_tck.patch 2864
 RMD160 ffcc335bdff4c609574472e3a947d482e123b13e files/clk_tck.patch 2864
@@ -50,14 +53,14 @@ EBUILD johntheripper-1.7.0.2.ebuild 3446 RMD160 27cb457972825e890ed3cb97f9a42ca5
 MD5 12bb2469f41dabb06d8cae5300e4c177 johntheripper-1.7.0.2.ebuild 3446
 RMD160 27cb457972825e890ed3cb97f9a42ca5a326a3fe johntheripper-1.7.0.2.ebuild 3446
 SHA256 69237fb46daf34f92b79d221e61698729d9fbc6322853bb221c12a0d57f5c8fc johntheripper-1.7.0.2.ebuild 3446
-EBUILD johntheripper-1.7.2.ebuild 3273 RMD160 5fd396a060e3d758bffda0a7ac27e8d633c0f25d SHA1 fa27d4691eda6bba099375dcbba2f7958926f1dd SHA256 5fcc282802695cb2b4ac266d16f78d032269b319f8b0926d92f745bc5049f68f
-MD5 0bb40b525beb631bb96b04dd2c67e52f johntheripper-1.7.2.ebuild 3273
-RMD160 5fd396a060e3d758bffda0a7ac27e8d633c0f25d johntheripper-1.7.2.ebuild 3273
-SHA256 5fcc282802695cb2b4ac266d16f78d032269b319f8b0926d92f745bc5049f68f johntheripper-1.7.2.ebuild 3273
-MISC ChangeLog 9496 RMD160 3561b27d41e48e9855de5e2a2c47d9997b04ccd0 SHA1 93a3cd4665c4f7f0c1ed84b4c4d7bb04e316e1ef SHA256 566842f84d9bd016340706dde715484a7832b86df6fdbc3e2d77580c5f58dbf2
-MD5 f59c8e398db9ab93317453dd6ce82b03 ChangeLog 9496
-RMD160 3561b27d41e48e9855de5e2a2c47d9997b04ccd0 ChangeLog 9496
-SHA256 566842f84d9bd016340706dde715484a7832b86df6fdbc3e2d77580c5f58dbf2 ChangeLog 9496
+EBUILD johntheripper-1.7.2.ebuild 3343 RMD160 9514eee06242f73b2daf62eb9d25cc38df9ae182 SHA1 e8bb62694d724ccd080dee046b0b88508e0d2b9f SHA256 3fcc6f7528b1f5f472d5fe222b5f7c968f934a2a15c22daff99abd5c8e1ad592
+MD5 be45547c1fd53b18695c940050ae2d60 johntheripper-1.7.2.ebuild 3343
+RMD160 9514eee06242f73b2daf62eb9d25cc38df9ae182 johntheripper-1.7.2.ebuild 3343
+SHA256 3fcc6f7528b1f5f472d5fe222b5f7c968f934a2a15c22daff99abd5c8e1ad592 johntheripper-1.7.2.ebuild 3343
+MISC ChangeLog 9631 RMD160 71e4c3a2cdb6ff2039feb16a397543d7b81fa158 SHA1 c3dc2455f9c10226aeedd4201c4f8004eee1c429 SHA256 d06b7de5c76cafc268ef00949d1ad73c5c802d5abe1dbc5f701f942ddf8749a3
+MD5 eaff925ff01bb683827e9a3815d206f8 ChangeLog 9631
+RMD160 71e4c3a2cdb6ff2039feb16a397543d7b81fa158 ChangeLog 9631
+SHA256 d06b7de5c76cafc268ef00949d1ad73c5c802d5abe1dbc5f701f942ddf8749a3 ChangeLog 9631
 MISC metadata.xml 254 RMD160 d0d828a0efad42b4889e61fe5bd1c4abb3f8e0b0 SHA1 5d59fd95cef5bc44213823f07599ab4a3040e659 SHA256 6844bcc162ce000092403ef2e322fe3d20e02b2adc449149babfcc06353265e6
 MD5 873a096e13940bcb1684c3d5f4bdb30b metadata.xml 254
 RMD160 d0d828a0efad42b4889e61fe5bd1c4abb3f8e0b0 metadata.xml 254
@@ -77,3 +80,10 @@ SHA256 a4e635dae315e600b36dd82af86b89a770ccfae1b02000891307ccff33598fdb files/di
 MD5 fa3d5f08df3d277ee771715466395974 files/digest-johntheripper-1.7.2 476
 RMD160 e159515fd92bd054565f086b4749eaacd71b5473 files/digest-johntheripper-1.7.2 476
 SHA256 1f98f59d509b03c8a18445cdf030bb234507f090938041a3e6c7433b8cb80149 files/digest-johntheripper-1.7.2 476
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF22Q/yuNVb5qfaOYRAsUPAJsGHsu7TIOgfnltEofU51J2zmw0VQCguK6K
+Ty9H/slIcbhA/muhtaEyigE=
+=/xjI
+-----END PGP SIGNATURE-----

diff --git a/app-crypt/johntheripper/johntheripper-1.7.2.ebuild b/app-crypt/johntheripper/johntheripper-1.7.2.ebuild
index 1cddf26ee1e358623ef90a17675d7f43afd9a9b7..b386d796e443b04a63745eca25aa1dd76411ceea 100644 (file)
--- a/app-crypt/johntheripper/johntheripper-1.7.2.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.2.ebuild,v 1.11 2006/12/30 21:15:13 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.2.ebuild,v 1.12 2007/02/20 21:12:24 phreak Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -54,6 +54,8 @@ src_compile() {
                else
                        emake ${OPTIONS} linux-x86-any || die "Make failed"
                fi
+       elif use amd64 ; then
+               emake ${OPTIONS} generic || die "Make failed"
        elif use alpha ; then
                emake ${OPTIONS} linux-alpha || die "Make failed"
        elif use sparc; then