Fixed ebuild so that the patch applies correctly. Also marked stable on ppc, as...

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 58a356b6d82a47e8dbd8c0778defedcf4b7db551..a9c8ad8e4ec4ec911161dee111f83da58f7a94f1 100644 (file)
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/johntheripper
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.20 2004/10/02 23:00:02 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.21 2004/11/01 00:48:50 pylon Exp $
+
+  01 Nov 2004; Lars Weiler <pylon@gentoo.org>
+  johntheripper-1.6.37-r1.ebuild:
+  Fixed ebuild so that the patch applies correctly. Also marked stable on ppc,
+  as requested in Bug #44203.
 
   02 Oct 2004; Aaron Walker <ka0ttic@gentoo.org>
   johntheripper-1.6.37-r1.ebuild:

diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index c32a45738ec13b167f13862cf7df8d651aacae0e..97e8e8885d0c04891591434010155e8cbe323f3e 100644 (file)
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,21 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 0d6d4c0350fc9c755eb97bd83c28e6cf johntheripper-1.6-r1.ebuild 2088
-MD5 ecaec9505b1ba58be077e189270b6c5f johntheripper-1.6.37-r1.ebuild 3128
 MD5 6118ccbd118b5fc883571f45567064a9 johntheripper-1.6-r3.ebuild 2632
 MD5 21db1d2955c07704e9dbcca4ab1b4a17 johntheripper-1.6.ebuild 1326
-MD5 69dd03913bc62b8456a5c20f8385131d ChangeLog 4194
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+MD5 068b3f15ea70c4c91af1667394e79db2 ChangeLog 4382
+MD5 ccc8488cc0daae0af7222ce8a08a1dbe johntheripper-1.6.37-r1.ebuild 3114
+MD5 2a2c77e0b8b4692a9e20de4d68983071 files/digest-johntheripper-1.6 123
 MD5 d2a0df18590c71836e4c423af635353f files/digest-johntheripper-1.6-r1 456
 MD5 c44028343f13bf0e4ff431cca80988d9 files/digest-johntheripper-1.6-r3 126
-MD5 647f92814e453cb358ef2d0df669f026 files/john-ntlm.skey.patch 1168
 MD5 61846869257f883217c0a2afea16acb4 files/digest-johntheripper-1.6.37-r1 138
-MD5 2a2c77e0b8b4692a9e20de4d68983071 files/digest-johntheripper-1.6 123
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBXzL8EZCkKN40op4RAmNKAJ0WydztklI90d3RwchOgVZoAsMx3wCgomvV
-/xOKzS5SQ0P57MYi8m6QXOQ=
-=7uxu
------END PGP SIGNATURE-----
+MD5 647f92814e453cb358ef2d0df669f026 files/john-ntlm.skey.patch 1168

diff --git a/app-crypt/johntheripper/johntheripper-1.6.37-r1.ebuild b/app-crypt/johntheripper/johntheripper-1.6.37-r1.ebuild
index 2cfeba89ee019014835d986d966b81e3e3f5122c..a9890627e241d19f5a27c0498f0e44a3b934220a 100644 (file)
--- a/app-crypt/johntheripper/johntheripper-1.6.37-r1.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.6.37-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.6.37-r1.ebuild,v 1.5 2004/10/02 23:00:02 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.6.37-r1.ebuild,v 1.6 2004/11/01 00:48:50 pylon Exp $
 
 inherit eutils flag-o-matic
 
@@ -24,7 +24,7 @@ SRC_URI="http://www.openwall.com/john/b/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha"
+KEYWORDS="~x86 ~sparc ppc ~alpha"
 #KEYWORDS removed until "generic" target is fixed - "~mips ~hppa"
 IUSE="mmx ntlm skey mysql kerberos"
 
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
        unpack ${A}
-       epatch ${DISTDIR}/${PF/theripper/}-gentoo.patch
+       epatch ${PF/theripper/}-gentoo.patch
 }
 
 src_compile() {