summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Bar-Lev <alonbl@gentoo.org>2007-07-20 14:28:08 +0000
committerAlon Bar-Lev <alonbl@gentoo.org>2007-07-20 14:28:08 +0000
commit70b00a50a3c4e7aca80a1bf72e30448acf3dbdec (patch)
tree48098a543d11714ceb6960887be6234d132f5c19
parentStable on ppc wrt bug 180713 (diff)
downloadgentoo-2-70b00a50a3c4e7aca80a1bf72e30448acf3dbdec.tar.gz
gentoo-2-70b00a50a3c4e7aca80a1bf72e30448acf3dbdec.tar.bz2
gentoo-2-70b00a50a3c4e7aca80a1bf72e30448acf3dbdec.zip
Strip flags, as upstream requested
(Portage version: 2.1.3_rc8)
-rw-r--r--app-crypt/johntheripper/ChangeLog6
-rw-r--r--app-crypt/johntheripper/johntheripper-1.7.2-r1.ebuild25
2 files changed, 20 insertions, 11 deletions
diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 65e3fedcfc3f..f0b6fe289db5 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-crypt/johntheripper
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.57 2007/07/19 18:06:09 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.58 2007/07/20 14:28:08 alonbl Exp $
+
+ 20 Jul 2007; Alon Bar-Lev <alonbl@gentoo.org>
+ johntheripper-1.7.2-r1.ebuild:
+ Strip flags, as upstream requested
19 Jul 2007; Alon Bar-Lev <alonbl@gentoo.org>
johntheripper-1.7.2-r1.ebuild:
diff --git a/app-crypt/johntheripper/johntheripper-1.7.2-r1.ebuild b/app-crypt/johntheripper/johntheripper-1.7.2-r1.ebuild
index bc6cae2a0982..849ff262f4b6 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.2-r1.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.2-r1.ebuild
@@ -1,6 +1,6 @@
# 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-r1.ebuild,v 1.2 2007/07/19 18:06:09 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.2-r1.ebuild,v 1.3 2007/07/20 14:28:08 alonbl Exp $
inherit eutils flag-o-matic toolchain-funcs pax-utils
@@ -20,20 +20,26 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="mmx altivec sse2"
-RDEPEND="virtual/libc
- >=dev-libs/openssl-0.9.7"
+RDEPEND=">=dev-libs/openssl-0.9.7"
src_unpack() {
unpack ${A}
cd "${S}"
epatch "${WORKDIR}"/${MY_PNBASE}-1.7.2-all-7.diff
- for p in sha1-memset stackdef.S stackdef-2.S stripping; do
+ for p in sha1-memset stackdef.S stackdef-2.S; do
epatch "${FILESDIR}/${P}-${p}.patch"
done
}
src_compile() {
+ #
+ # upstream request to strip
+ # any flags, as he optimize the
+ # outputs
+ #
+ strip-flags
+
cd "${S}"/src
# Note this program uses AS and LD incorrectly
OPTIONS="CPP=$(tc-getCXX) CC=$(tc-getCC) AS=$(tc-getCC) LD=$(tc-getCC) \
@@ -86,8 +92,7 @@ src_compile() {
src_test() {
cd run
- if [[ -f /etc/john/john.conf || -f /etc/john/john.ini ]]
- then
+ if [ -f /etc/john/john.conf -o -f /etc/john/john.ini ]; then
./john --test || die 'self test failed'
else
ewarn "selftest requires /etc/john/john.conf or /etc/john/john.ini"
@@ -95,10 +100,6 @@ src_test() {
}
src_install() {
- # config files
- insinto /etc/john
- doins run/john.conf
-
# executables
dosbin run/john
newsbin run/mailer john-mailer
@@ -114,6 +115,10 @@ src_install() {
#newsbin src/bench john-bench
+ # config files
+ insinto /etc/john
+ doins run/john.conf
+
# share
insinto /usr/share/john/
doins run/*.chr run/password.lst