*** empty log message ***

5 files changed, 189 insertions, 29 deletions

diff --git a/dev-lisp/clisp/ChangeLog b/dev-lisp/clisp/ChangeLog
index 0bd34c7785b5..bebd55529c0c 100644
--- a/dev-lisp/clisp/ChangeLog
+++ b/dev-lisp/clisp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lisp/clisp
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/ChangeLog,v 1.24 2004/06/27 20:55:05 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/ChangeLog,v 1.25 2004/09/08 02:39:01 mkennedy Exp $
+
+*clisp-2.33.2-r1 (07 Sep 2004)
+
+  07 Sep 2004; <mkennedy@gentoo.org>
+  +files/2.33.2/glibc-linux.lisp-sigpause-gentoo.patch,
+  +clisp-2.33.2-r1.ebuild:
+  GLIBC related compilation fix contributed by Matthew Schulkind
+  <mschulkind@gmail.com>.  Resolves Bug #57155
 
   27 Jun 2004; <mkennedy@gentoo.org> files/clisp.sh:
   Compile source with ISO-8859-1, not UTF-8.
diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest
index 1ca31769cc42..f926148b6119 100644
--- a/dev-lisp/clisp/Manifest
+++ b/dev-lisp/clisp/Manifest
@@ -1,42 +1,46 @@
-MD5 2f650ea6cb64556c586dc21277b13c5f clisp-2.33-r2.ebuild 4119
-MD5 7fbe736b19c5a723e49951309d082ac0 clisp-2.33.1.ebuild 4122
-MD5 a728f8364a969e22a4a59e74f44601bf clisp-2.32.ebuild 3788
-MD5 d30c58eb606d1697ee9a7cd018f53037 clisp-2.28.ebuild 1195
 MD5 06c63b00df414c368ae3467766a18719 clisp-2.30-r1.ebuild 2158
-MD5 de46df1ab30e6391089f0e24380e5690 clisp-2.33-r1.ebuild 4219
-MD5 49e5eb654b722e6b01af89db9664528e clisp-2.31.ebuild 2904
+MD5 a728f8364a969e22a4a59e74f44601bf clisp-2.32.ebuild 3788
+MD5 7fbe736b19c5a723e49951309d082ac0 clisp-2.33.1.ebuild 4122
 MD5 02bad54136a782a49b1ebea18e55cc1b clisp-2.32-r1.ebuild 3699
-MD5 00c823917b6a3897235602ebc5fd8aee clisp-2.33.2.ebuild 4122
-MD5 17fb50c17071dc190e13cb47508b55c0 clisp-2.33.ebuild 4060
+MD5 2f650ea6cb64556c586dc21277b13c5f clisp-2.33-r2.ebuild 4119
 MD5 a657b7ad6a59b8db8a3b1ea37dfda24c clisp-2.29.ebuild 1267
-MD5 db79a57a7410c1e2e2dda683890a639a ChangeLog 6146
-MD5 485cde76397408cf913fc6d4c7a45a67 metadata.xml 882
+MD5 de46df1ab30e6391089f0e24380e5690 clisp-2.33-r1.ebuild 4219
+MD5 00c823917b6a3897235602ebc5fd8aee clisp-2.33.2.ebuild 4122
+MD5 49e5eb654b722e6b01af89db9664528e clisp-2.31.ebuild 2904
 MD5 fc1b329239b46272f593df766e201888 clisp-2.31-r1.ebuild 3825
 MD5 36d396e39520f0d4bedae13307b86eee clisp-2.30.ebuild 1405
+MD5 db79a57a7410c1e2e2dda683890a639a ChangeLog 6146
+MD5 487f2d96b46f59dfa09bcb16b8b33354 clisp-2.33.2-r1.ebuild~ 4169
+MD5 17fb50c17071dc190e13cb47508b55c0 clisp-2.33.ebuild 4060
+MD5 0a032620e103e789b0b9d3f12a3ac04b clisp-2.33.2-r1.ebuild 4187
+MD5 485cde76397408cf913fc6d4c7a45a67 metadata.xml 882
+MD5 d30c58eb606d1697ee9a7cd018f53037 clisp-2.28.ebuild 1195
 MD5 bf978d68f0161bacd6772c07dfade6fa files/install-clc.lisp 484
-MD5 c112ebf612bf8e262c4285fd4c7e9553 files/clisp-2.30-gentoo.patch 1301
-MD5 2ce1383673bccf5309622a0c11c0aca0 files/digest-clisp-2.28 64
-MD5 7642efead569d6dbdd43a8d5a89df0a8 files/digest-clisp-2.29 64
-MD5 4408eb96e1169c101473012aee6c87ca files/digest-clisp-2.30 64
-MD5 27760908e107e35ff838560fb5381d5b files/digest-clisp-2.31 64
 MD5 da9eb2a136566bdce0620c950df941b2 files/digest-clisp-2.32 64
-MD5 ec706829fc32d6d1aa4c4acc56e755a7 files/digest-clisp-2.33 64
-MD5 a9cfca152741adf66c83f97408c735fd files/digest-clisp-2.33.1 66
-MD5 9a2df7725b74af8b8b9f3db39b350e79 files/digest-clisp-2.33.2 66
-MD5 ec015c64b7aca6f6721123c27d7d921c files/clisp-2.30-linux.lisp-upstream.patch 4712
+MD5 ec706829fc32d6d1aa4c4acc56e755a7 files/digest-clisp-2.33-r1 64
+MD5 27760908e107e35ff838560fb5381d5b files/digest-clisp-2.31 64
+MD5 2ce1383673bccf5309622a0c11c0aca0 files/digest-clisp-2.28 64
 MD5 4408eb96e1169c101473012aee6c87ca files/digest-clisp-2.30-r1 64
-MD5 27760908e107e35ff838560fb5381d5b files/digest-clisp-2.31-r1 64
 MD5 da9eb2a136566bdce0620c950df941b2 files/digest-clisp-2.32-r1 64
-MD5 ec706829fc32d6d1aa4c4acc56e755a7 files/digest-clisp-2.33-r1 64
 MD5 ec706829fc32d6d1aa4c4acc56e755a7 files/digest-clisp-2.33-r2 64
+MD5 a9cfca152741adf66c83f97408c735fd files/digest-clisp-2.33.1 66
+MD5 9a2df7725b74af8b8b9f3db39b350e79 files/digest-clisp-2.33.2-r1 66
+MD5 9a2df7725b74af8b8b9f3db39b350e79 files/digest-clisp-2.33.2 66
+MD5 ec706829fc32d6d1aa4c4acc56e755a7 files/digest-clisp-2.33 64
 MD5 7a720fb7b329a505c3cdb556b166aba7 files/clisp.sh 2810
-MD5 9b76ca10cf785d54c75803e8fddc91cb files/2.31/bindings-glibc-linux.lisp-gentoo.patch 1292
-MD5 9db8f3ac2974a7d9725148ecc0709cc8 files/2.31/bindings-wildcard-fnmatch.c-gentoo.patch 1248
-MD5 ff3506766c1fc9216e04f650f39c0e94 files/2.31/fastcgi-Makefile.in-gentoo.patch 654
-MD5 ed4100707b93b34a7825b915690e9ccd files/2.32/format.lisp-gentoo.patch 651
-MD5 83877a7508037b3286d37fc12f09650c files/2.32/fastcgi-Makefile.in-gentoo.patch 663
+MD5 ec015c64b7aca6f6721123c27d7d921c files/clisp-2.30-linux.lisp-upstream.patch 4712
+MD5 27760908e107e35ff838560fb5381d5b files/digest-clisp-2.31-r1 64
+MD5 c112ebf612bf8e262c4285fd4c7e9553 files/clisp-2.30-gentoo.patch 1301
+MD5 7642efead569d6dbdd43a8d5a89df0a8 files/digest-clisp-2.29 64
+MD5 4408eb96e1169c101473012aee6c87ca files/digest-clisp-2.30 64
+MD5 2e3ac08aeb220af54163a8b41026e355 files/2.33.1/fastcgi-Makefile.in-gentoo.patch 670
+MD5 e4c6fe13416cfc355e04ae4fc2a01d50 files/2.33/berkely-db-configure-gentoo.patch.gz 3765
 MD5 d0bf00200c853600adc899f2cb1fb907 files/2.33/format.lisp-gentoo.patch 651
 MD5 4e46c2b7e0788acfbbee8e3b25ae782b files/2.33/fastcgi-Makefile.in-gentoo.patch 710
-MD5 e4c6fe13416cfc355e04ae4fc2a01d50 files/2.33/berkely-db-configure-gentoo.patch.gz 3765
-MD5 2e3ac08aeb220af54163a8b41026e355 files/2.33.1/fastcgi-Makefile.in-gentoo.patch 670
+MD5 3eb393d2fbfe2e395744f45ce0d3e4f0 files/2.33.2/glibc-linux.lisp-sigpause-gentoo.patch 622
 MD5 a9325cfeff703a21e63dbd2b3aad34c1 files/2.33.2/fastcgi-Makefile.in-gentoo.patch 670
+MD5 ed4100707b93b34a7825b915690e9ccd files/2.32/format.lisp-gentoo.patch 651
+MD5 83877a7508037b3286d37fc12f09650c files/2.32/fastcgi-Makefile.in-gentoo.patch 663
+MD5 9b76ca10cf785d54c75803e8fddc91cb files/2.31/bindings-glibc-linux.lisp-gentoo.patch 1292
+MD5 ff3506766c1fc9216e04f650f39c0e94 files/2.31/fastcgi-Makefile.in-gentoo.patch 654
+MD5 9db8f3ac2974a7d9725148ecc0709cc8 files/2.31/bindings-wildcard-fnmatch.c-gentoo.patch 1248
diff --git a/dev-lisp/clisp/clisp-2.33.2-r1.ebuild b/dev-lisp/clisp/clisp-2.33.2-r1.ebuild
new file mode 100644
index 000000000000..668be4f7adfe
--- /dev/null
+++ b/dev-lisp/clisp/clisp-2.33.2-r1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.33.2-r1.ebuild,v 1.1 2004/09/08 02:39:01 mkennedy Exp $
+
+inherit flag-o-matic common-lisp-common eutils gcc
+
+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="x86"
+IUSE="X fastcgi nls pcre postgres readline"
+
+DEPEND="dev-libs/libsigsegv
+	dev-lisp/common-lisp-controller
+	fastcgi? ( dev-libs/fcgi )
+	postgres? ( dev-db/postgresql )
+	X? ( virtual/x11 )
+	readline? ( sys-libs/readline )
+	nls? ( sys-devel/gettext )
+	pcre? ( dev-libs/libpcre )"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PV}/fastcgi-Makefile.in-gentoo.patch
+	epatch ${FILESDIR}/${PV}/glibc-linux.lisp-sigpause-gentoo.patch
+}
+
+src_compile() {
+	# Handle the case where the user has some other -falign-functions
+	# option set.  Bug 34630.
+	if ! is-flag '-falign-functions=4' \
+		&& expr "$CFLAGS" : '.*\(-falign-functions=[[:digit:]]\+\)' >/dev/null; then
+		CFLAGS=${CFLAGS/\
+		$(expr "$CFLAGS" : '.*\(-falign-functions=[[:digit:]]\+\)')/\
+		-falign-functions=4}
+	fi
+
+	# Fails to compile without -falign-functions=4 when -march=pentium4
+	# (or -march=pentium3, sometimes??) is defined.	 Bugs 33425 and 34630.
+	if (is-flag '-march=pentium4' || is-flag '-march=pentium3') \
+		&& ! is-flag '-falign-functions=4'; then
+		append-flags '-falign-functions=4'
+	fi
+
+	# Athlon XP users report problems with -O3 optimization.  In this
+	# block, we remove any optimization flag.  Depending on bug 34497. we
+	# may be able to reduce optimization to -O2.
+	if is-flag '-march=athlon-xp'; then
+		filter-flags '-O*'
+	fi
+
+	# The previous stanza might not be necessary.  Bug 39830.
+	if is-flag '-march=athlon-xp'; then
+		replace-flags '-march=athlon-xp' '-mcpu=athlon-xp'
+	fi
+
+#	einfo "Using CFLAGS: ${CFLAGS}"
+#	export CC="$(gcc-getCC) ${CFLAGS}"
+
+	# Let CLISP use its own set of optimizations
+	unset CFLAGS CXXFLAGS
+	local myconf="--with-dynamic-ffi
+		--with-unicode
+		--with-module=regexp
+		--with-module=syscalls
+		--with-module=wildcard
+		--with-module=bindings/glibc"
+	use readline || myconf="${myconf} --with-noreadline"
+	use nls || myconf="${myconf} --with-nogettext"
+	use X && myconf="${myconf} --with-module=clx/new-clx"
+	if use postgres; then
+		myconf="${myconf} --with-module=postgresql"
+		CC="${CC} -I $(pg_config --includedir)"
+	fi
+	use fastcgi && myconf="${myconf} --with-module=fastcgi"
+	use pcre && myconf="${myconf} --with-module=pcre"
+	./configure --prefix=/usr ${myconf} build || die "./configure failed"
+	cd build
+	./makemake ${myconf} >Makefile
+	emake -j1 config.lisp
+	sed -i 's,"vi","nano",g' config.lisp
+	sed -i 's,http://www.lisp.org/HyperSpec/,http://www.lispworks.com/reference/HyperSpec/,g' config.lisp
+	emake -j1 || die
+}
+
+src_install() {
+	cd build && make DESTDIR=${D} prefix=/usr install-bin || die
+	doman clisp.1
+	dodoc SUMMARY README* NEWS MAGIC.add GNU-GPL COPYRIGHT \
+		ANNOUNCE clisp.dvi clisp.html
+
+	rm -f ${D}/usr/lib/clisp/base/*
+	(cd ${D}/usr/lib/clisp/base && ln -s ../full/* .)
+	chmod a+x ${D}/usr/lib/clisp/clisp-link
+
+	# install common-lisp-controller profile
+	exeinto /usr/lib/common-lisp/bin
+	doexe ${FILESDIR}/clisp.sh
+	insinto /usr/lib/clisp
+	doins ${FILESDIR}/install-clc.lisp
+
+	keepdir /usr/lib/common-lisp/clisp
+}
+
+pkg_preinst() {
+	local clisp_dir=/usr/lib/clisp
+	local old_mem=$clisp_dir/full/lispinit.mem
+	local new_mem=$clisp_dir/full/lispinit-new.mem
+	local clean_mem=$clisp_dir/full/lispinit-clean.mem
+	local lisp_run=$clisp_dir/full/lisp.run
+	rm -f $old_mem $new_mem $clean_mem $lisp_run
+}
+
+pkg_postinst() {
+	standard-impl-postinst clisp
+	while read line; do einfo "${line}"; done <<EOF
+
+PLEASE NOTE: FASL files (.fas) created by versions of CLISP prior to
+2.33 are not compatible with this version of CLISP (${PV}). You will
+need to re-create your FASLs via. recompilation.  FASLs in
+/usr/lib/common-lisp/clisp for Common Lisp Controller-installed Lisp
+packages have aready been recompiled for you.
+
+EOF
+}
+
+pkg_postrm() {
+	standard-impl-postrm clisp /usr/bin/clisp
+}
diff --git a/dev-lisp/clisp/files/2.33.2/glibc-linux.lisp-sigpause-gentoo.patch b/dev-lisp/clisp/files/2.33.2/glibc-linux.lisp-sigpause-gentoo.patch
new file mode 100644
index 000000000000..f1d810f58411
--- /dev/null
+++ b/dev-lisp/clisp/files/2.33.2/glibc-linux.lisp-sigpause-gentoo.patch
@@ -0,0 +1,15 @@
+diff -U4 --recursive clisp-2.33.2-orig/modules/bindings/glibc/linux.lisp clisp-2.33.2/modules/bindings/glibc/linux.lisp
+--- clisp-2.33.2-orig/modules/bindings/glibc/linux.lisp	2004-07-27 11:51:00.403973848 -0400
++++ clisp-2.33.2/modules/bindings/glibc/linux.lisp	2004-07-27 11:51:39.937963768 -0400
+@@ -34,8 +34,11 @@
+ (def-c-type ulonglong uint64)
+ (define-modify-macro orf () logior)
+ (define-modify-macro andf () logand)
+ 
++; Needed to choose sigpause version
++(c-lines "#define __FAVOR_BSD~%~%")
++
+ ; ============================= <stddef.h> ====================================
+ 
+ (c-lines "#include <stddef.h>~%")
+ 
diff --git a/dev-lisp/clisp/files/digest-clisp-2.33.2-r1 b/dev-lisp/clisp/files/digest-clisp-2.33.2-r1
new file mode 100644
index 000000000000..d1380368af9a
--- /dev/null
+++ b/dev-lisp/clisp/files/digest-clisp-2.33.2-r1
@@ -0,0 +1 @@
+MD5 ee4ea316db1e843dcb16094bf500012f clisp-2.33.2.tar.bz2 6091273