--- scm-5.5.4.ebuild.orig	2010-03-12 22:06:21.000000000 +0100
+++ scm-5.5.4.ebuild	2010-03-13 00:10:58.000000000 +0100
@@ -1,4 +1,4 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-scheme/scm/scm-5.5.4.ebuild,v 1.3 2008/11/17 13:40:07 pchrist Exp $
 
@@ -6,17 +6,16 @@
 
 #version magic thanks to masterdriverz and UberLord using bash array instead of tr
 trarr="0abcdefghi"
-MY_PV="$(get_version_component_range 1)${trarr:$(get_version_component_range 2):1}$(get_version_component_range 3)"
 
+MY_PV="$(get_version_component_range 1)${trarr:$(get_version_component_range 2):1}$(get_version_component_range 3)"
 MY_P=${PN}${MY_PV}
-S=${WORKDIR}/${PN}
-DESCRIPTION="Scheme implementation from author of slib"
-SRC_URI="http://swiss.csail.mit.edu/ftpdir/scm/${MY_P}.zip"
 
+DESCRIPTION="Scheme implementation from author of slib"
 HOMEPAGE="http://swiss.csail.mit.edu/~jaffer/SCM"
+SRC_URI="http://swiss.csail.mit.edu/ftpdir/scm/${MY_P}.zip"
 
-SLOT="0"
 LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
@@ -25,29 +24,25 @@
 DEPEND="app-arch/unzip
 		>=dev-scheme/slib-3.1.5"
 
-src_unpack() {
-	unpack ${A}; cd "${S}"
-
-#	cp Makefile Makefile.old
-
-	sed "s#local/##" -i Makefile
+S=${WORKDIR}/${PN}
 
-	#sent upstream again
-	sed "s#mkdir#mkdir -p#" -i Makefile
-	sed "s#-p -p#-p#" -i Makefile
-	sed -i -e 's/mandir = $(prefix)man\//mandir = $(prefix)share\/man\//' Makefile
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
 
-#	diff -u Makefile.old Makefile
+	sed -i -e "s#local/##" \
+		-e '/strip .*/d' \
+		-e "s#mkdir#mkdir -p#" \
+		-e "s#-p -p#-p#" \
+		-e 's/mandir = $(prefix)man\//mandir = $(prefix)share\/man\//' \
+		Makefile || die
 }
 
 src_compile() {
-	einfo "Making scmlit"
 	#parallel make fails sometimes
-	emake -j1 scmlit
-	einfo "Creating script to build scm"
+	emake -j1 scmlit || die
 	echo "srcdir=/usr/share/scm/" > srcdir.mk
 	./build --compiler-options="${CFLAGS}" --linker-options="${LDFLAGS}" -F macro -F inexact &> _compile.sh || die
-	einfo "Building scm"
 	sh _compile.sh || die
 }