dev-lisp/clisp: bump to version 2.49

3 files changed, 159 insertions, 9 deletions

diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest
index 77392efb..a869398e 100644
--- a/dev-lisp/clisp/Manifest
+++ b/dev-lisp/clisp/Manifest
@@ -1,2 +1,4 @@
-EBUILD clisp-9999.ebuild 4454 RMD160 b08738069e3b829d444db4ca94dd543d761649f4 SHA1 e8b467e9ec4c4ae8383a8b3d74503b8a45c19874 SHA256 9f27bd50ff6369308ccc7db6f86e0c3fc9da82ecc6155813e6b987d4bfad9dd6
+DIST clisp-2.49.tar.bz2 8091011 RMD160 bfb81abf942b07bbb8d83505f287d546b1bbdacc SHA1 7e8d585ef8d0d6349ffe581d1ac08681e6e670d4 SHA256 8132ff353afaa70e6b19367a25ae3d5a43627279c25647c220641fed00f8e890
+EBUILD clisp-2.49.ebuild 4432 RMD160 a1fd476b68e063cd9c35aadbaab75d4629a4e80d SHA1 54b2f54570646aa5edc817545d38df49600e261a SHA256 942d372752c6369364ad30f8c423902f9bd7682822a67c791852da018f4a4121
+EBUILD clisp-9999.ebuild 4398 RMD160 849fce8f39146c4a4d43b4698b90c558241ebb5a SHA1 6f5b761e0a453e584dd83959d027f74df9b56ce0 SHA256 c4625839588ee94a1a8fd9280ba305f90de81611dc2faa7c341d62a1be0dabad
 MISC metadata.xml 1332 RMD160 e1a0df2a3cf22fb665c1b9cd9282cb59c600f669 SHA1 62d15417aa382f9948e0d2aee394f9588e5d0a1a SHA256 cc7ba4e4541976929ea114d05ba08006e2f78dc40c78568c55c4379effd13c24
diff --git a/dev-lisp/clisp/clisp-2.49.ebuild b/dev-lisp/clisp/clisp-2.49.ebuild
new file mode 100644
index 00000000..55a01137
--- /dev/null
+++ b/dev-lisp/clisp/clisp-2.49.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+inherit flag-o-matic eutils toolchain-funcs multilib
+
+DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp"
+HOMEPAGE="http://clisp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/clisp/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="hyperspec X new-clx berkdb dbus fastcgi gdbm gtk pari +pcre postgres +readline svm -threads +unicode +zlib"
+# "jit" disabled ATM
+
+RDEPEND="virtual/libiconv
+		 >=dev-libs/libsigsegv-2.4
+		 >=dev-libs/ffcall-1.10
+		 dbus? ( sys-apps/dbus )
+		 fastcgi? ( dev-libs/fcgi )
+		 gdbm? ( sys-libs/gdbm )
+		 gtk? ( >=x11-libs/gtk+-2.10 >=gnome-base/libglade-2.6 )
+		 pari? ( >=sci-mathematics/pari-2.3.0 )
+		 postgres? ( >=dev-db/postgresql-base-8.0 )
+		 readline? ( >=sys-libs/readline-5.0 )
+		 pcre? ( dev-libs/libpcre )
+		 svm? ( sci-libs/libsvm )
+		 zlib? ( sys-libs/zlib )
+		 X? ( new-clx? ( x11-libs/libXpm ) )
+		 hyperspec? ( dev-lisp/hyperspec )
+		 berkdb? ( sys-libs/db:4.5 )"
+#		 jit? ( >=dev-libs/lightning-1.2 )
+
+DEPEND="${RDEPEND}
+	X? ( new-clx? ( x11-misc/imake x11-proto/xextproto ) )"
+
+PDEPEND="dev-lisp/gentoo-init"
+
+PROVIDE="virtual/commonlisp"
+
+enable_modules() {
+	[[ $# = 0 ]] && die "${FUNCNAME[0]} must receive at least one argument"
+	for m in "$@" ; do
+		einfo "enabling module $m"
+		myconf+=" --with-module=${m}"
+	done
+}
+
+BUILDDIR="builddir"
+
+# modules not enabled:
+#  * berkdb: must figure out a way to make the configure script pick up the
+#            currect version of the library and headers
+#  * dirkey: fails to compile, requiring windows.h, possibly wrong #ifdefs
+#  * matlab, netica: not in portage
+#  * oracle: can't install oracle-instantclient
+
+src_prepare() {
+	# More than -O1 breaks alpha/ia64
+	if use alpha || use ia64; then
+		sed -i -e 's/-O2//g' src/makemake.in || die
+	fi
+}
+
+src_configure() {
+	# We need this to build on alpha/ia64
+	if use alpha || use ia64; then
+		replace-flags -O? -O1
+		append-flags '-D NO_MULTIMAP_SHM -D NO_MULTIMAP_FILE -D NO_SINGLEMAP -D NO_TRIVIALMAP'
+	fi
+
+	# QA issue with lisp.run
+	append-flags -Wa,--noexecstack
+
+	# built-in features
+	local myconf="--with-ffcall --without-dynamic-modules"
+#    There's a problem with jit_allocai function
+#    if use jit; then
+#        myconf+=" --with-jitc=lightning"
+#    fi
+	if use threads; then
+		myconf+=" --with-threads=POSIX_THREADS"
+	fi
+
+	# default modules
+	enable_modules wildcard rawsock
+	# optional modules
+	use elibc_glibc && enable_modules bindings/glibc
+	if use X; then
+		if use new-clx; then
+			enable_modules clx/new-clx
+		else
+			enable_modules clx/mit-clx
+		fi
+	fi
+	if use postgres; then
+		enable_modules postgresql
+		append-cppflags -I$(pg_config --includedir)
+	fi
+	if use berkdb; then
+		enable_modules berkeley-db
+		append-cppflags -I/usr/include/db4.5
+	fi
+	use dbus && enable_modules dbus
+	use fastcgi && enable_modules fastcgi
+	use gdbm && enable_modules gdbm
+	use gtk && enable_modules gtk2
+	use pari && enable_modules pari
+	use pcre && enable_modules pcre
+	use svm && enable_modules libsvm
+	use zlib && enable_modules zlib
+
+	if use hyperspec; then
+		CLHSROOT="file:///usr/share/doc/hyperspec/HyperSpec/"
+	else
+		CLHSROOT="http://www.lispworks.com/reference/HyperSpec/"
+	fi
+
+	# configure chokes on --sysconfdir option
+	local configure="./configure --prefix=/usr --libdir=/usr/$(get_libdir) \
+		$(use_with readline) $(use_with unicode) \
+		${myconf} --hyperspec=${CLHSROOT} ${BUILDDIR}"
+	einfo "${configure}"
+	${configure} || die "./configure failed"
+
+	IMPNOTES="file://${ROOT%/}/usr/share/doc/${PN}-${PVR}/html/impnotes.html"
+	sed -i "s,http://clisp.cons.org/impnotes/,${IMPNOTES},g" \
+		"${BUILDDIR}"/config.lisp || die "Cannot fix link to implementation notes"
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}"/fonts
+	cd "${BUILDDIR}"
+	# parallel build fails
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	pushd "${BUILDDIR}"
+	make DESTDIR="${D}" prefix=/usr install-bin || die "Installation failed"
+	doman clisp.1 || die
+	dodoc SUMMARY README* NEWS MAGIC.add ANNOUNCE || die
+	# stripping them removes common symbols (defined but uninitialised variables)
+	# which are then needed to build modules...
+	export STRIP_MASK="*/usr/$(get_libdir)/clisp-${PV}/*/*"
+	popd
+	dohtml doc/impnotes.{css,html} doc/regexp.html doc/clisp.png || die
+	dodoc doc/{CLOS-guide,LISP-tutorial}.txt || die
+}
diff --git a/dev-lisp/clisp/clisp-9999.ebuild b/dev-lisp/clisp/clisp-9999.ebuild
index 511479e7..b23f6c88 100644
--- a/dev-lisp/clisp/clisp-9999.ebuild
+++ b/dev-lisp/clisp/clisp-9999.ebuild
@@ -23,7 +23,7 @@ RDEPEND="virtual/libiconv
 		 gdbm? ( sys-libs/gdbm )
 		 gtk? ( >=x11-libs/gtk+-2.10 >=gnome-base/libglade-2.6 )
 		 pari? ( >=sci-mathematics/pari-2.3.0 )
-		 postgres? ( >=virtual/postgresql-base-8.0 )
+		 postgres? ( >=dev-db/postgresql-base-8.0 )
 		 readline? ( >=sys-libs/readline-5.0 )
 		 pcre? ( dev-libs/libpcre )
 		 svm? ( sci-libs/libsvm )
@@ -97,11 +97,11 @@ src_configure() {
 	fi
 	if use postgres; then
 		enable_modules postgresql
-		append-flags -I$(pg_config --includedir)
+		append-cppflags -I$(pg_config --includedir)
 	fi
 	if use berkdb; then
 		enable_modules berkeley-db
-		append-flags -I/usr/include/db4.5
+		append-cppflags -I/usr/include/db4.5
 	fi
 	use dbus && enable_modules dbus
 	use fastcgi && enable_modules fastcgi
@@ -125,11 +125,9 @@ src_configure() {
 	einfo "${configure}"
 	${configure} || die "./configure failed"
 
-	sed -i 's,"vi","nano",g' "${BUILDDIR}"/config.lisp || die
-
 	IMPNOTES="file://${ROOT%/}/usr/share/doc/${PN}-${PVR}/html/impnotes.html"
 	sed -i "s,http://clisp.cons.org/impnotes/,${IMPNOTES},g" \
-		"${BUILDDIR}"/config.lisp || die
+		"${BUILDDIR}"/config.lisp || die "Cannot fix link to implementation notes"
 }
 
 src_compile() {
@@ -141,10 +139,9 @@ src_compile() {
 
 src_install() {
 	pushd "${BUILDDIR}"
-	make DESTDIR="${D}" prefix=/usr install-bin || die
+	make DESTDIR="${D}" prefix=/usr install-bin || die "Installation failed"
 	doman clisp.1 || die
 	dodoc SUMMARY README* NEWS MAGIC.add ANNOUNCE || die
-	fperms a+x /usr/$(get_libdir)/clisp-${PV/_*/}/clisp-link || die
 	# stripping them removes common symbols (defined but uninitialised variables)
 	# which are then needed to build modules...
 	export STRIP_MASK="*/usr/$(get_libdir)/clisp-${PV}/*/*"