some fixes from Stelian

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.26-gentoo-r1 x86_64

3 files changed, 145 insertions, 12 deletions

diff --git a/dev-lisp/clisp/ChangeLog b/dev-lisp/clisp/ChangeLog
index 6ce070e399b1..4730fa49f042 100644
--- a/dev-lisp/clisp/ChangeLog
+++ b/dev-lisp/clisp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lisp/clisp
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/ChangeLog,v 1.87 2009/01/05 21:44:03 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/ChangeLog,v 1.88 2009/01/07 13:12:02 hkbst Exp $
+
+*clisp-2.47-r1 (07 Jan 2009)
+
+  07 Jan 2009; Marijn Schouten <hkBst@gentoo.org> +clisp-2.47-r1.ebuild:
+  some fixes from Stelian
 
   05 Jan 2009; Markus Meier <maekke@gentoo.org> clisp-2.47.ebuild:
   amd64/x86 stable, bug #246074
diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest
index 173cecbef8e7..418c52b802fb 100644
--- a/dev-lisp/clisp/Manifest
+++ b/dev-lisp/clisp/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.38/README.Gentoo 334 RMD160 c236897c39f4c8e8f75ff9782d2ee7a7b30aece4 SHA1 3d552a225c26e205c01ec4ebc5286f2d3442cf49 SHA256 336e4287ec4cfdbe8fda692bd217431adb4e303d3f5204bdf3df0ea711fbebd6
 AUX 2.38/clisp.sh 2792 RMD160 107eccac30fc373f449d0d252ca82fa400ce0877 SHA1 65b61b10b36cf867491c35c0f3e2ca11a2bc1988 SHA256 5ba7c78f3d99b9264c9cb8909135ccd0bca113d66d5a998acc520fb431dc75ad
 AUX 2.38/fastcgi-Makefile-gentoo.patch 681 RMD160 13eaed6b82c26f47d8e574da4e1c4d5d83696a46 SHA1 57c5b06bdea2ccff3fab97a1119e6d67aa34c25b SHA256 202fe32bc4e1d4cab9e77c2d147822bcdf75cd34cc6e3fe59c2a5c9cc71f40d1
@@ -20,13 +17,9 @@ EBUILD clisp-2.43-r1.ebuild 2845 RMD160 8f0776894c6f7b6da1ca8dc26f7c5f555b2321d0
 EBUILD clisp-2.44.1-r1.ebuild 3401 RMD160 ef4c41fa78890e3699f64bc562ccfb57b2991bfd SHA1 d65d3becb4dfefe110b6b250cff1487f1f1f03de SHA256 a89cd3c3def138f9e4085967cafd1444533d2d1a9db5ab2dc30b8ad418b85c2f
 EBUILD clisp-2.44.1.ebuild 3219 RMD160 39a19cff5646f18449e525b23117fb47c4e1b3b9 SHA1 4fef8483a553f6ad9583380921ba8ffe9ac4afe4 SHA256 9775fdad4fbbdad6ed8c1c5f587442e4219ac5330795adc185e34b2a3f751ad1
 EBUILD clisp-2.46.ebuild 4081 RMD160 394fdeb14dfadcff4603afbbe02f8f8c04e3d732 SHA1 ff2db84971773ec5b235c5e20f7ca7a4ced47fd0 SHA256 f356cb43e89b3357c3023ec1c30d5454a916b4ae436e6870126bc56d8a374b65
+EBUILD clisp-2.47-r1.ebuild 4178 RMD160 7e7a739ec328bdc3de0dad96bba03d68c07bbcc5 SHA1 ab05ee642f510f1baec7dfad7590d3b45410a7c9 SHA256 40a6465377a3cee874bfb5e70908c68494374482e84ce729f0edeb4edde100c3
 EBUILD clisp-2.47.ebuild 4078 RMD160 fa968b5da15acd7f1eeccdc97b61de8d54094e6d SHA1 1ebbbb7d143cb258b68db4ab5d2e1ea3db7b4d4a SHA256 dbcd84f7c01aeca780db8792f157e6453305090fd88b68ac85b1a547a55341fd
-MISC ChangeLog 22301 RMD160 5ce338db35c06eafc5955775b4d5759cb9e7dc12 SHA1 3c785b3c9a548fe6356ee16e2e5a1e599c3f0c10 SHA256 53c52567e268024bd067a6f0d3cfe8fc0e3f659daa40471537e671841baaeb20
+MISC ChangeLog 22430 RMD160 5022b85de82f71e41e1a276dceef55d1060ed441 SHA1 09be8d77d65e9b5947766054e7ca91362673f5ee SHA256 771cd288a6a569c5ae4e35a6cb955a3c51d5b1421cfd918f9a1d1c88ac39bd7f
+MISC clisp-2.47-r1.ebuild.orig 4078 RMD160 fa968b5da15acd7f1eeccdc97b61de8d54094e6d SHA1 1ebbbb7d143cb258b68db4ab5d2e1ea3db7b4d4a SHA256 dbcd84f7c01aeca780db8792f157e6453305090fd88b68ac85b1a547a55341fd
+MISC clisp-2.47-r1.ebuild.rej 1268 RMD160 eab37a804c80cf7b83997b9ca9d531e49092444c SHA1 646bff524b68960f9e44bc9abec25a9fe2445a95 SHA256 c81a4bc07d83c4d04cc838f6755d64b429e59aa910cf4b6c2c449a84d3959149
 MISC metadata.xml 1264 RMD160 919dd3d373822e37d5c9c3556eddfa32101c559f SHA1 809e0602f6c76e269a0c0eee612297fdfed389c6 SHA256 971d7ef431c0a5fc95a4366c07220c32db56aa3d22960dc8acb77d7110db10dc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklifyoACgkQkKaRLQcq0GLk0QCbBvnO1wR7d8BLYK9IDo/5+Ymt
-vPYAnjKLmBU133GhDmzhGDBx1jJOm+FN
-=/XoO
------END PGP SIGNATURE-----
diff --git a/dev-lisp/clisp/clisp-2.47-r1.ebuild b/dev-lisp/clisp/clisp-2.47-r1.ebuild
new file mode 100644
index 000000000000..b477b52f0289
--- /dev/null
+++ b/dev-lisp/clisp/clisp-2.47-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.47-r1.ebuild,v 1.1 2009/01/07 13:12:02 hkbst Exp $
+
+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"
+
+# EAPI="1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc -sparc ~x86"
+IUSE="hyperspec X new-clx dbus fastcgi gdbm gtk pari pcre postgres readline svm zlib"
+
+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? ( >=virtual/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 )
+
+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="${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_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# More than -O1 breaks alpha/ia64
+	use alpha || use ia64 && sed -i -e 's/-O2//g' src/makemake.in
+}
+
+src_compile() {
+	# built-in features
+	local myconf="--with-ffcall --with-dynamic-modules"
+	use readline || myconf="${myconf} --with-noreadline"
+
+	# 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
+	# 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
+		CPPFLAGS="-I $(pg_config --includedir)"
+	fi
+# 	if use berkdb; then
+# 		enable_modules berkley-db
+# 		CPPFLAGS="${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 --infodir option
+	local configure="./configure --prefix=/usr --libdir=/usr/$(get_libdir) \
+		${myconf} --hyperspec=${CLHSROOT} ${BUILDDIR}"
+	einfo "${configure}"
+	${configure} || die "./configure failed"
+
+	cd ${BUILDDIR}
+	sed -i 's,"vi","nano",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"
+}
+
+src_install() {
+	pushd ${BUILDDIR}
+	make DESTDIR="${D}" prefix=/usr install-bin || die
+	doman clisp.1
+	dodoc SUMMARY README* NEWS MAGIC.add ANNOUNCE clisp.dvi clisp.html
+	chmod a+x "${D}"/usr/$(get_libdir)/clisp-${PV/_*/}/clisp-link
+	# stripping them removes common symbols (defined but unitialised 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
+	dodoc doc/{editors,CLOS-guide,LISP-tutorial}.txt
+}