--- clisp-2.43-r1.ebuild	2008-05-03 17:45:06.000000000 +0200
+++ clisp-2.44.1.ebuild	2008-05-03 18:29:45.000000000 +0200
@@ -6,16 +6,17 @@
 
 DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp"
 HOMEPAGE="http://clisp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/clisp/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/clisp/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="amd64 ~ppc ~ppc64 -sparc x86"
-IUSE="X new-clx fastcgi gdbm gtk pcre postgres readline svm zlib"
+KEYWORDS="~amd64 ~ppc ~ppc64 -sparc ~x86"
+IUSE="hyperspec X new-clx fastcgi gdbm gtk pcre postgres readline svm zlib"
 
 RDEPEND="dev-lisp/gentoo-init
+		 virtual/libiconv
 		 >=dev-libs/libsigsegv-2.4
-		 virtual/tetex
+		 >=dev-libs/ffcall-1.10
 		 fastcgi? ( dev-libs/fcgi )
 		 gdbm? ( sys-libs/gdbm )
 		 gtk? ( >=x11-libs/gtk+-2.10 >=gnome-base/libglade-2.6 )
@@ -24,7 +25,8 @@
 		 pcre? ( dev-libs/libpcre )
 		 svm? ( sci-libs/libsvm )
 		 zlib? ( sys-libs/zlib )
-		 X? ( new-clx? ( x11-libs/libXpm ) )"
+		 X? ( new-clx? ( x11-libs/libXpm ) )
+		 hyperspec? ( dev-lisp/hyperspec )"
 #   * GNU gettext
 #      + Not needed on systems with glibc 2.2 or newer, but recommended on all
 #        other systems: needed if you want clisp with native language support.
@@ -45,10 +47,8 @@
 BUILDDIR="builddir"
 
 src_compile() {
-	CC="$(tc-getCC)"
-
 	# built-in features
-	local myconf="--with-dynamic-ffi"
+	local myconf="--with-ffcall"
 	use readline || myconf="${myconf} --with-noreadline"
 
 	# default modules
@@ -64,7 +64,7 @@
 	fi
 	if use postgres; then
 		enable_modules postgresql
-		CC="${CC} -I $(pg_config --includedir)"
+		CPPFLAGS="-I $(pg_config --includedir)"
 	fi
 	use fastcgi && enable_modules fastcgi
 	use gdbm && enable_modules gdbm
@@ -77,9 +77,15 @@
 	./configure --prefix=/usr --libdir=/usr/$(get_libdir) \
 		${myconf} ${BUILDDIR} || die "./configure failed"
 	cd ${BUILDDIR}
-	./makemake ${myconf} > Makefile
-#	emake config.lisp
-#	sed -i 's,"vi","nano",g' config.lisp
+	sed -i 's,"vi","nano",g' config.lisp
+	if use hyperspec; then
+		CLHSROOT="file:///usr/share/doc/hyperspec/HyperSpec/"
+	else
+		CLHSROOT="http://www.lispworks.com/reference/HyperSpec/"
+	fi
+	sed -i "s,http://www.lisp.org/HyperSpec/,${CLHSROOT},g" config.lisp
+	IMPNOTES="file://${ROOT%/}/usr/share/doc/${PN}-${PVR}/html/impnotes.html"
+	sed -i "s,http://clisp.cons.org/impnotes/,${IMPNOTES},g" config.lisp
 	# parallel build fails
 	emake -j1 || die "emake failed"
 }