--- scm-5.5.4.ebuild	2009-01-08 18:20:23.000000000 -0500
+++ scm-5.5.4-r1.ebuild	2009-01-10 11:10:54.000000000 -0500
@@ -21,42 +21,46 @@
 IUSE=""
 
 #unzip for unpacking
-RDEPEND=""
-DEPEND="app-arch/unzip
-		>=dev-scheme/slib-3.1.5"
+DEPEND="\
+	app-arch/unzip
+	>=dev-scheme/slib-3.1.5
+	sys-libs/ncurses
+	sys-libs/readline
+	sys-libs/libtermcap-compat"
+RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}; cd "${S}"
-
-#	cp Makefile Makefile.old
-
-	sed "s#local/##" -i Makefile
 
-	#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
-
-#	diff -u Makefile.old Makefile
+src_unpack() {
+	unpack ${A} 
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
 }
 
 src_compile() {
+	# SLIB is required to build SCM.
+	slibpath="/usr/share/slib"
+	if [ -n "$SCHEME_LIBRARY_PATH" ]; then
+		einfo using SLIB $SCHEME_LIBRARY_PATH
+	elif [ -d ${slibpath} ]; then
+		export SCHEME_LIBRARY_PATH=${slibpath}/
+	fi
+
 	einfo "Making scmlit"
-	#parallel make fails sometimes
-	emake -j1 scmlit
-	einfo "Creating script to build scm"
-	echo "srcdir=/usr/share/scm/" > srcdir.mk
-	./build --compiler-options="${CFLAGS}" --linker-options="${LDFLAGS}" -F macro -F inexact &> _compile.sh || die
+	emake scmlit || die "faild to build scmlit"
 	einfo "Building scm"
-	sh _compile.sh || die
+	emake scm5 || die "failed to build scm"
+	einfo "Building DLLs"
+	emake mydlls || die "failed to build DLLs"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
+	einfo "Install done"
 }
 
 pkg_postinst() {
 	[ "${ROOT}" == "/" ] && pkg_config
+	einfo "Postinstall done"
 }
 
 pkg_config() {