From 465bd5579a7b390257570d55d16b9ed12a9c73b6 Mon Sep 17 00:00:00 2001 From: Rick Farina Date: Fri, 11 Jan 2013 15:24:47 +0000 Subject: add fixes for arm (Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key DD11F94A) --- app-crypt/johntheripper/ChangeLog | 5 ++++- app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'app-crypt/johntheripper') diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog index 490f62f41747..da6c72961ed8 100644 --- a/app-crypt/johntheripper/ChangeLog +++ b/app-crypt/johntheripper/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-crypt/johntheripper # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.149 2013/01/11 10:51:17 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.150 2013/01/11 15:24:47 zerochaos Exp $ + + 11 Jan 2013; Rick Farina johntheripper-1.7.9-r6.ebuild: + add fixes for arm 11 Jan 2013; Agostino Sarubbo johntheripper-1.7.9-r6.ebuild: Stable for x86, wrt bug #450180 diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild index 72d0a09aaa22..12c478baf721 100644 --- a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild +++ b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild,v 1.3 2013/01/11 10:51:17 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild,v 1.4 2013/01/11 15:24:47 zerochaos Exp $ EAPI="4" @@ -19,7 +19,7 @@ SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.bz2 LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos" #Remove AltiVec USE flag. Appears to be an upstream issue. IUSE="cuda custom-cflags -minimal mmx mpi opencl openmp sse2" REQUIRED_USE="openmp? ( !minimal ) @@ -182,7 +182,7 @@ src_compile() { emake -C src/ \ CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \ - CFLAGS="-c -Wall -include \\\"${S}\\\"/config.gentoo ${CFLAGS} ${OMP} ${GPUCFLAGS}" \ + CFLAGS="-c -Wall -include ../config.gentoo ${CFLAGS} ${OMP} ${GPUCFLAGS}" \ LDFLAGS="${LDFLAGS} ${GPULDFLAGS}" \ OPT_NORMAL="" \ OMPFLAGS="${OMP}" \ -- cgit v1.2.3-65-gdbad