ebuild cleanups, I think this is better shape

Package-Manager: portage-2.1.3_rc8

3 files changed, 32 insertions, 37 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 7e390f0aa399..65e3fedcfc3f 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.56 2007/07/19 16:21:25 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.57 2007/07/19 18:06:09 alonbl Exp $
+
+  19 Jul 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  johntheripper-1.7.2-r1.ebuild:
+  ebuild cleanups, I think this is better shape
 
   19 Jul 2007; Alon Bar-Lev <alonbl@gentoo.org>
   -files/johntheripper-1.7.0.2-stackdef.S, -files/clk_tck.patch,
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index ed5300c6f725..3b0b2325c2f0 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -21,18 +21,18 @@ SHA256 e2b989facd64aa1634de13df5a76c3c5579ad90d75a4af63f68b5ad970eca0b8 files/jo
 DIST john-1.7-all-4.diff.gz 50311 RMD160 eafed1e75d72beef62664b238adf38ec6e6d4c52 SHA1 6050745204b38a7dd9fc41889de2b87866c8b528 SHA256 cb51be6cb03e952a21ea1a85e60253b932c946959b62f8082665ac2c7a792909
 DIST john-1.7.2-all-7.diff.gz 64450 RMD160 c0adeb226ee75bbc9a875b93a622b99927fb825f SHA1 a0b25e3f9606b5839a4f1a59f896727f0195ba9a SHA256 fb2f42d12ec94be02ad398ac9e823190e518cefcb096a4197c6a37d83d29124c
 DIST john-1.7.2.tar.gz 809308 RMD160 8ab90216401cf5cda7ba50a8bb88f53678e35eac SHA1 c3c4720c2f1446a3349b0307a0522af574d013e4 SHA256 9a94d2417b13d49cb11aeb11186933fe0e0491904987ca47c88bf5710935c3cb
-EBUILD johntheripper-1.7.2-r1.ebuild 3490 RMD160 cc20706bfe038c606e4510c24b8114ffebf71f50 SHA1 436c057004a90832e524d987f306616a10c7d073 SHA256 d5168fadb3f0047f49b233554df9d4b613add06121779c3110732568611bd3c9
-MD5 49c16fe65c9da94f5971c090ce086d6c johntheripper-1.7.2-r1.ebuild 3490
-RMD160 cc20706bfe038c606e4510c24b8114ffebf71f50 johntheripper-1.7.2-r1.ebuild 3490
-SHA256 d5168fadb3f0047f49b233554df9d4b613add06121779c3110732568611bd3c9 johntheripper-1.7.2-r1.ebuild 3490
+EBUILD johntheripper-1.7.2-r1.ebuild 3307 RMD160 4a4ec925c74262fc6708f8812274e68709270f27 SHA1 538b136d3e93ca3941ae6a1db82cd1ef9199caeb SHA256 13f31e6fef0875168b1bafdbd3acea4c703bde62dec6ad822343018ed68cec87
+MD5 636302ffc342199b30fa58da3c62eb05 johntheripper-1.7.2-r1.ebuild 3307
+RMD160 4a4ec925c74262fc6708f8812274e68709270f27 johntheripper-1.7.2-r1.ebuild 3307
+SHA256 13f31e6fef0875168b1bafdbd3acea4c703bde62dec6ad822343018ed68cec87 johntheripper-1.7.2-r1.ebuild 3307
 EBUILD johntheripper-1.7.2.ebuild 3450 RMD160 1645e563b9ad2fb6ded7c74be5fe837f93f956be SHA1 fbcb80c962759491b57f8762e4c4a46d6c45c46d SHA256 a2d9fc20407e7e1b40fc904b07b503b05fccfbe7b3fb2e4bf7be124a981f8750
 MD5 6fc9ea37ab7434784b13035bf1182356 johntheripper-1.7.2.ebuild 3450
 RMD160 1645e563b9ad2fb6ded7c74be5fe837f93f956be johntheripper-1.7.2.ebuild 3450
 SHA256 a2d9fc20407e7e1b40fc904b07b503b05fccfbe7b3fb2e4bf7be124a981f8750 johntheripper-1.7.2.ebuild 3450
-MISC ChangeLog 10480 RMD160 907fd6599936362d59a65a4d9d75cc2c295ad9ad SHA1 4e59555ed008b580e71f6fb6d697d807224ea3b8 SHA256 8f2b535e6d97e3abff9520f018a8d5bb75a1ea9264dd08c196587fd926c68ede
-MD5 30e5d0648e8c7278095ec550e3eccf7b ChangeLog 10480
-RMD160 907fd6599936362d59a65a4d9d75cc2c295ad9ad ChangeLog 10480
-SHA256 8f2b535e6d97e3abff9520f018a8d5bb75a1ea9264dd08c196587fd926c68ede ChangeLog 10480
+MISC ChangeLog 10610 RMD160 65d5e2acbf4464a3c88bcb686a79e8b59e8c6e45 SHA1 9efb2bce45f1fa294f2d09871c255b0af4c52e64 SHA256 bc6b6b01de474875c903dad547cb6c38f27acb3a8af565fef818ff7e7bbd042c
+MD5 6ad6e1461f7ac2013e22fbb1df279bc9 ChangeLog 10610
+RMD160 65d5e2acbf4464a3c88bcb686a79e8b59e8c6e45 ChangeLog 10610
+SHA256 bc6b6b01de474875c903dad547cb6c38f27acb3a8af565fef818ff7e7bbd042c ChangeLog 10610
 MISC metadata.xml 254 RMD160 d0d828a0efad42b4889e61fe5bd1c4abb3f8e0b0 SHA1 5d59fd95cef5bc44213823f07599ab4a3040e659 SHA256 6844bcc162ce000092403ef2e322fe3d20e02b2adc449149babfcc06353265e6
 MD5 873a096e13940bcb1684c3d5f4bdb30b metadata.xml 254
 RMD160 d0d828a0efad42b4889e61fe5bd1c4abb3f8e0b0 metadata.xml 254
diff --git a/app-crypt/johntheripper/johntheripper-1.7.2-r1.ebuild b/app-crypt/johntheripper/johntheripper-1.7.2-r1.ebuild
index 7e716fd4a4c7..bc6cae2a0982 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.1 2007/07/19 16:16:49 alonbl Exp $
+# $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 $
 
 inherit eutils flag-o-matic toolchain-funcs pax-utils
 
@@ -28,69 +28,60 @@ src_unpack() {
 	cd "${S}"
 	epatch "${WORKDIR}"/${MY_PNBASE}-1.7.2-all-7.diff
 
-	for p in params.h sha1-memset stackdef.S stackdef-2.S stripping; do
+	for p in sha1-memset stackdef.S stackdef-2.S stripping; do
 		epatch "${FILESDIR}/${P}-${p}.patch"
 	done
-
-	ebegin "Applying ${P}-Makefile.patch"
-	sed -i -e "s|^CFLAGS.*|CFLAGS= -c -Wall ${CFLAGS}|" \
-		-e 's|^LDFLAGS.*|LDFLAGS= -lm|' "${S}"/src/Makefile
-	eend $?
-
-	ebegin "Applying ${P}-john.conf.patch"
-	sed -i -e 's:$JOHN:/usr/share/john:g' "${S}"/run/john.conf
-	eend $?
 }
 
 src_compile() {
 	cd "${S}"/src
 	# Note this program uses AS and LD incorrectly
 	OPTIONS="CPP=$(tc-getCXX) CC=$(tc-getCC) AS=$(tc-getCC) LD=$(tc-getCC) \
-		OPT_NORMAL= OPT_INLINE= JOHN_SYSTEMWIDE=1
-		CFG_FULL_NAME=/etc/john/john.conf
-		CFG_ALT_NAME=/etc/john/john.ini"
+		CFLAGS=\"-c -Wall ${CFLAGS} -DJOHN_SYSTEMWIDE \
+		-DJOHN_SYSTEMWIDE_HOME=\\\"\\\\\\\"/etc/john\\\\\\\"\\\"\" \
+		LDFLAGS=\"${LDFLAGS}\""
 
 	if use x86 ; then
 		if use sse2 ; then
-			emake ${OPTIONS} linux-x86-sse2 || die "Make failed"
+			eval emake ${OPTIONS} linux-x86-sse2 || die "Make failed"
 		elif use mmx ; then
-			emake ${OPTIONS} linux-x86-mmx || die "Make failed"
+			eval emake ${OPTIONS} linux-x86-mmx || die "Make failed"
 		else
-			emake ${OPTIONS} linux-x86-any || die "Make failed"
+			eval emake ${OPTIONS} linux-x86-any || die "Make failed"
 		fi
 	elif use alpha ; then
-		emake ${OPTIONS} linux-alpha || die "Make failed"
+		eval emake ${OPTIONS} linux-alpha || die "Make failed"
 	elif use sparc; then
-		emake ${OPTIONS} linux-sparc  || die "Make failed"
+		eval emake ${OPTIONS} linux-sparc  || die "Make failed"
 	elif use amd64; then
-		emake ${OPTIONS} linux-x86-64  || die "Make failed"
+		eval emake ${OPTIONS} linux-x86-64  || die "Make failed"
 	elif use ppc-macos; then
 		if use altivec; then
-			emake ${OPTIONS} macosx-ppc32-altivec || die "Make failed"
+			eval emake ${OPTIONS} macosx-ppc32-altivec || die "Make failed"
 		else
-			emake ${OPTIONS} macosx-ppc32 || die "Make failed"
+			eval emake ${OPTIONS} macosx-ppc32 || die "Make failed"
 		fi
 		# for Tiger this can be macosx-ppc64
 	elif use ppc64; then
 		if use altivec; then
-			emake ${OPTIONS} linux-ppc32-altivec  || die "Make failed"
+			eval emake ${OPTIONS} linux-ppc32-altivec  || die "Make failed"
 		else
-			emake ${OPTIONS} linux-ppc64  || die "Make failed"
+			eval emake ${OPTIONS} linux-ppc64  || die "Make failed"
 		fi
 		# linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types.
 		# as per the Makefile comments
 	elif use ppc; then
 		if use altivec; then
-			emake ${OPTIONS} linux-ppc32-altivec  || die "Make failed"
+			eval emake ${OPTIONS} linux-ppc32-altivec  || die "Make failed"
 		else
-			emake ${OPTIONS} linux-ppc32 || die "Make failed"
+			eval emake ${OPTIONS} linux-ppc32 || die "Make failed"
 		fi
 	else
-		emake ${OPTIONS} generic || die "Make failed"
+		eval emake ${OPTIONS} generic || die "Make failed"
 	fi
 
 	# currently broken
-	#emake bench || die "make failed"
+	#eval emake bench || die "make failed"
 }
 
 src_test() {