From 1e1a923b4f7482bab022cdbe6b0afe46a8f86245 Mon Sep 17 00:00:00 2001 From: Zero_Chaos Date: Mon, 5 Mar 2012 04:54:12 +0000 Subject: [PATCH] johntheripper: minor fix to USE=minimal so it works, but I can't build this no matter what so removing keywords till it compiles --- app-crypt/johntheripper/Manifest | 2 +- app-crypt/johntheripper/johntheripper-1.7.9.ebuild | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest index f54efa7d7..8764f503c 100644 --- a/app-crypt/johntheripper/Manifest +++ b/app-crypt/johntheripper/Manifest @@ -16,4 +16,4 @@ EBUILD johntheripper-1.7.6-r2.ebuild 4793 RMD160 9c558bb77b61c9cc2f7dd2fcd17d629 EBUILD johntheripper-1.7.6-r5.ebuild 4652 RMD160 6370c468a2ec16fafbb81b88b5db4c28c7271610 SHA1 0827ded477278cc009e71947ac0fae165c8a8adf SHA256 d3c6fc55d6e3a2343be26ebdb585d4ac15a856dd6e5e59351aa627db821827ea EBUILD johntheripper-1.7.8-r1.ebuild 5079 RMD160 b8219170a9484a32a5a8843530e408fd1e0994dc SHA1 b48eec23ce53ca9dbfb412fecc031fd307434155 SHA256 6478cd1b3f5252771975202d03d948a25764a3e5276277cb9411830a7ef36da3 EBUILD johntheripper-1.7.8-r3.ebuild 4992 RMD160 148f7b7cbc690a47f1e53f90877a4e4eee23140f SHA1 9b028389b26d23bef6f70736bb32ed13a1827a1a SHA256 35240ef5a0d7150b84b93517acc1f2879ddd127c8e163fbd47326ea8a4267e8b -EBUILD johntheripper-1.7.9.ebuild 5089 RMD160 2a7d5bf467444193d5007a280fbb698b4d255ca3 SHA1 41b62405375bab2ced371df815ca745fc3f99a9c SHA256 8ceae47c75ec58a9fbc8bcb5b1b57c2caafcd4c35156a7c88c33be2ad6982853 +EBUILD johntheripper-1.7.9.ebuild 4997 RMD160 bb18f867b63eb2dc92c1f5953960566345858562 SHA1 8d9cbeff2e1373de25f334250ce6a4bacc870c2e SHA256 4b61ae5b36776b699f68083e4b516ef79c802a6cf66f84f6792284d10cc44b41 diff --git a/app-crypt/johntheripper/johntheripper-1.7.9.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9.ebuild index ce7481210..c7231645d 100644 --- a/app-crypt/johntheripper/johntheripper-1.7.9.ebuild +++ b/app-crypt/johntheripper/johntheripper-1.7.9.ebuild @@ -20,7 +20,7 @@ SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.gz LICENSE="GPL-2" SLOT="0" # This package can't be marked stable for ppc or ppc64 before bug 327211 is closed. -KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="-*" #Remove AltiVec USE flag. Appears to be an upstream issue. IUSE="custom-cflags dict -minimal mmx mpi openmp sse2" REQUIRED_USE="openmp? ( !minimal )" @@ -111,10 +111,11 @@ src_prepare() { epatch "${FILESDIR}/${PN}-${p}.patch" done - #the relevant patch for 1.7.9 jumbo5 - epatch "${FILESDIR}/${P}-jumbo-5-NT-performance-02.diff" if ! use minimal; then + #the relevant patch for 1.7.9 jumbo5 + epatch "${FILESDIR}/${P}-jumbo-5-NT-performance-02.diff" + sed -e "s/LDFLAGS *= */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" \ -e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g" \ -i Makefile || die "sed Makefile failed"