Snapshot of 2.6.8_pre, fixes bug #205803, based on the ebuild from the lisp overlay

Package-Manager: portage-2.2_rc30/cvs/Linux i686

5 files changed, 194 insertions, 13 deletions

diff --git a/dev-lisp/gcl/ChangeLog b/dev-lisp/gcl/ChangeLog
index 4dbc6281c538..228ef59b83a1 100644
--- a/dev-lisp/gcl/ChangeLog
+++ b/dev-lisp/gcl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lisp/gcl
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/ChangeLog,v 1.53 2008/09/03 21:42:59 opfer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/ChangeLog,v 1.54 2009/04/19 19:29:09 grozin Exp $
+
+*gcl-2.6.8_pre20090419 (20 Apr 2009)
+
+  20 Apr 2009; Andrey Grozin <grozin@gentoo.org>
+  +files/gcl-2.6.8_pre20090419-configure.patch, +files/bootstrap-gcl,
+  +gcl-2.6.8_pre20090419.ebuild:
+  Snapshot of 2.6.8_pre, fixes bug #205803, based on the ebuild from
+  the lisp overlay
 
   03 Sep 2008; Christian Faulhammer <opfer@gentoo.org> gcl-2.6.7.ebuild,
   gcl-2.6.7-r1.ebuild, gcl-2.6.7-r2.ebuild, gcl-2.6.7-r3.ebuild:
diff --git a/dev-lisp/gcl/Manifest b/dev-lisp/gcl/Manifest
index c0dc91d1444e..dffb1f606a59 100644
--- a/dev-lisp/gcl/Manifest
+++ b/dev-lisp/gcl/Manifest
@@ -1,10 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.6.7-fix-configure.in-gentoo.patch 1452 RMD160 8c072036a83592782e6d4a8329f996bf0591f734 SHA1 384cc20dcb9950ce5eaf614bc0b141dfab60b66b SHA256 64c31840a4bb3c2484b8556e7f40791b3ffba83dd147a89c44e8838be244711f
+AUX bootstrap-gcl 336 RMD160 eaf7dafe2d4b22eb0e6f9242de059b4c286c667c SHA1 8a865c10a2529a6b6876bebf103eeae876680f5c SHA256 4d9f19e461b5bfc3e570b6812cf35dcf8ae98788b7eb4d4e04368a2f801f4244
 AUX flex-configure-LANG.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd884 SHA1 67ae0deff73689cb39cd6e7451262bdda9c25a39 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea
 AUX gcl-2.6.7-fix-configure.in-bfd.patch 1573 RMD160 619428d6d41ad022d603d56e3e0d7d8704f591a6 SHA1 840d3e1268502d624069415805361db36b16e0c2 SHA256 2d3a7ae93b61c453eade2bbb0a3f0a4be1506e1104324c1a68e710266915df18
+AUX gcl-2.6.8_pre20090419-configure.patch 1616 RMD160 62f7c7eda4f9e50a9819fbcfdf61684bad8aba9f SHA1 8715b88b1c5c3fa0e9c9f6e8fe1c0060b04fe65f SHA256 32ae77911287e9cbcfbbecd62f4b3279e0628ba13a8a3ea98654bbdda27c4550
 DIST gcl-2.6.7.tar.gz 8193901 RMD160 b61b5c8325389c47bc37ae77fa8f99491e5e5d36 SHA1 d54f7db5dbd9f49953f80259a5eb44ade65027b5 SHA256 2aa134bc03f12ad03f40666ad00db78b8b9c195cf2cf0b3db4d176158f722c06
+DIST gcl-2.6.8_pre20090419.tar.bz2 15688731 RMD160 09a815de1bcda7952ac0dd575297c17fc725cbd7 SHA1 e88e207093ef166f7cb7b3dfc52b40ad9f15f18a SHA256 63cf13ca6a9f1d2b1167385f50665d550e0f63dce5a99bb7a88191ae480e8b5b
 DIST gcl.info.tgz 678468 RMD160 16e1f3ffd080a6801f82612ff66789a3ec9e21a7 SHA1 94ff34f1d4a0c3c388e493cf94d4ba4b821f7dbc SHA256 06e60fcc99b09ffb66364569d0331b1f2549804d5d09582c6e18fd27f29bcb57
 DIST gcl_2.6.7-32.diff.gz 14463119 RMD160 fe20465f30c968558edddf493780fb401b7c42a8 SHA1 b45dd81dfb674ec60936a711c5991d215aee4ac9 SHA256 5041b40bd96a0c73b70022831e6a697e00b64f572bca66d5a6c24978a879678e
 DIST gcl_2.6.7-34.diff.gz 14493530 RMD160 cf065a5fa8d6bf09d4903262237050ea28f696ac SHA1 a4c07f5cf29951dbe3ce6067a94617d2e2257ee2 SHA256 f8b57b98348e8c8f303756dea1e02fd9ff6aa2d4308e4e7189ab6fab5f216e65
@@ -13,12 +13,6 @@ EBUILD gcl-2.6.7-r1.ebuild 4227 RMD160 86f0db9375215249a8136628553dd96a6a5a6da1
 EBUILD gcl-2.6.7-r2.ebuild 2917 RMD160 a203d0ac482db4518a374a4fab8280f01cdd0942 SHA1 b560259ae120024dce1feffe1f32ec07ba032959 SHA256 f3c07e5aa8ecdfe14a8342a3f900ce5acff2ff684256e76c0127cc92ac9e63bf
 EBUILD gcl-2.6.7-r3.ebuild 3050 RMD160 4aef108166e79f2190d4952578143f47d580fd18 SHA1 d8cd510ecf60987ee3da4b18b9e840f0274a3f7b SHA256 985486d38cf828a4cc2b8f09907ed9c7074055d47a4513a93801e0f0b3168976
 EBUILD gcl-2.6.7.ebuild 4151 RMD160 96d55978675106f8bb9e19a48de94d0e9571b887 SHA1 cd182b785c04460b8840e729b0de6d603b87049d SHA256 cadb3fe94e7e4f6a478e7c427818f1b5cda055c4a0dd883e84248cf5540d5e39
-MISC ChangeLog 8153 RMD160 e1cfa7cf0df342281504dfdad55d7c127266a4a4 SHA1 1e662dd1f66d61e170b1ee04d359a1e526ce23c5 SHA256 e5395032afa4eb55af33b3e9cb8410d01cddbbb6105ef5a1128876314769dada
+EBUILD gcl-2.6.8_pre20090419.ebuild 3549 RMD160 b5607d45d62d8aaff26225695f92b940ede31717 SHA1 5aca5f29cad493b4c82642d626dcfd540b358526 SHA256 46f47c175523abdbb52ab3762b78a36ba1438036817c59df758797b465f8cd83
+MISC ChangeLog 8433 RMD160 782c08e4cfa78f26d7b4a736ba48ea2161c4d1c5 SHA1 3042fb4dbf2ccb91067db4c02f724e56a7889791 SHA256 c2f4b2b11fc6cf7672db6d1f7cb6754508be4c74b2e43d3e9015e3674735b5f8
 MISC metadata.xml 746 RMD160 0306dc54612bb2fd7751b8808d53f422afe7dd19 SHA1 703094a6e05edb9467f896ede3cf8c28c6366bfa SHA256 c8e508832751f2160ee27f2c620325f4bef5c33667cf97ab3195f74cf22fc91a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAki/BRcACgkQNQqtfCuFneOvDACfS1Y2a/kQU/DVSLH7QlCgxUTO
-LocAnicfVwNhJbRfkSwfFv7gvtgZFpJA
-=yuol
------END PGP SIGNATURE-----
diff --git a/dev-lisp/gcl/files/bootstrap-gcl b/dev-lisp/gcl/files/bootstrap-gcl
new file mode 100644
index 000000000000..cf964c4b5bea
--- /dev/null
+++ b/dev-lisp/gcl/files/bootstrap-gcl
@@ -0,0 +1,7 @@
+(compiler::emit-fn t)
+(compiler::link nil "bootstrapped_ansi_gcl"
+		(format nil "(progn (let ((*load-path* (cons ~S *load-path*)) 
+		(si::*load-types* ~S))  (compiler::emit-fn t))  (when (fboundp (quote
+		si::sgc-on))  (si::sgc-on t))  (setq compiler::*default-system-p* t))"
+		si::*system-directory* (quote (list ".lsp")))
+		"-lutil")
diff --git a/dev-lisp/gcl/files/gcl-2.6.8_pre20090419-configure.patch b/dev-lisp/gcl/files/gcl-2.6.8_pre20090419-configure.patch
new file mode 100644
index 000000000000..f086500974bd
--- /dev/null
+++ b/dev-lisp/gcl/files/gcl-2.6.8_pre20090419-configure.patch
@@ -0,0 +1,33 @@
+diff -r -U2 gcl-2.6.8_pre20090419.orig/configure gcl-2.6.8_pre20090419/configure
+--- gcl-2.6.8_pre20090419.orig/configure	2009-02-24 04:12:22.000000000 +0100
++++ gcl-2.6.8_pre20090419/configure	2009-04-20 01:26:40.000000000 +0200
+@@ -118,4 +118,14 @@
+ mandir='${prefix}/man'
+ 
++# NLS nuisances.
++# Only set these to C if already set.  These must not be set unconditionally
++# because not all systems understand e.g. LANG=C (notably SCO).
++# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
++# Non-C LC_CTYPE values break the ctype check.
++if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
++if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
++if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
++if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
++
+ # Initialize some other variables.
+ subdirs=
+@@ -506,14 +516,4 @@
+ done
+ 
+-# NLS nuisances.
+-# Only set these to C if already set.  These must not be set unconditionally
+-# because not all systems understand e.g. LANG=C (notably SCO).
+-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
+-# Non-C LC_CTYPE values break the ctype check.
+-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
+-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+-
+ # confdefs.h avoids OS command line length limits that DEFS can exceed.
+ rm -rf conftest* confdefs.h
diff --git a/dev-lisp/gcl/gcl-2.6.8_pre20090419.ebuild b/dev-lisp/gcl/gcl-2.6.8_pre20090419.ebuild
new file mode 100644
index 000000000000..636244a319b0
--- /dev/null
+++ b/dev-lisp/gcl/gcl-2.6.8_pre20090419.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.6.8_pre20090419.ebuild,v 1.1 2009/04/19 19:29:09 grozin Exp $
+
+EAPI=1
+
+#removing flag-o-matic results in make install failing due to a segfault
+inherit elisp-common flag-o-matic
+
+DESCRIPTION="GNU Common Lisp"
+HOMEPAGE="http://www.gnu.org/software/gcl/gcl.html"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="+ansi debug doc emacs +readline tk X"
+
+# See bug #205803
+RESTRICT="strip"
+
+RDEPEND="emacs? ( virtual/emacs )
+	readline? ( sys-libs/readline )
+	>=dev-libs/gmp-4.1
+	tk? ( dev-lang/tk )
+	X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw )
+	virtual/latex-base"
+DEPEND="${RDEPEND}
+	doc? ( virtual/texi2dvi )
+	>=app-text/texi2html-1.64
+	>=sys-devel/autoconf-2.52"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in
+	# option parsing, it may break.
+	epatch "${FILESDIR}"/${P}-configure.patch
+}
+
+src_compile() {
+	local myconfig=""
+	if use tk; then
+		myconfig="${myconfig} --enable-tkconfig=/usr/lib --enable-tclconfig=/usr/lib"
+	fi
+	myconfig="${myconfig} \
+		--enable-emacsdir=/usr/share/emacs/site-lisp/gcl \
+		--enable-dynsysgmp \
+		--disable-xdr
+		$(use_enable readline) \
+		$(use_with X x) \
+		$(use_enable debug) \
+		$(use_enable ansi)"
+
+	einfo "Configuring with the following:
+${myconfig}"
+	econf ${myconfig}
+	make || die "make failed"
+	sed -e 's,@EXT@,,g' debian/in.gcl.1 >gcl.1
+}
+
+src_test() {
+	local make_ansi_tests_clean="rm -f test.out *.fasl *.o \
+	*.so *~ *.fn *.x86f *.fasl *.ufsl"
+	if use ansi; then
+		cd ansi-tests
+
+		( make clean && make test-unixport ) \
+		|| die "make ansi-tests failed!"
+
+		cat "${FILESDIR}/bootstrap-gcl" \
+		| ../unixport/saved_ansi_gcl
+
+		cat "${FILESDIR}/bootstrap-gcl" \
+		|sed s/bootstrapped_ansi_gcl/bootstrapped_r_ansi_gcl/g \
+		| ./bootstrapped_ansi_gcl
+
+		( ${make_ansi_tests_clean} && \
+		echo "(load \"gclload.lsp\")" \
+		| ./bootstrapped_r_ansi_gcl ) \
+		|| die "Phase 2, bootstraped compiler failed in tests"
+
+	else
+
+		ewarn "Upstream provides tests only for ansi-gcl."
+		ewarn "Please emerge with ansi USE flag enabled"
+		ewarn "if you wnat to run the ansi tests."
+
+		cat "${FILESDIR}/bootstrap-gcl" \
+		| sed s/bootstrapped_ansi_gcl/bootstrapped_gcl/g \
+		| unixport/saved_gcl
+
+		cat "${FILESDIR}/bootstrap-gcl" \
+		| sed s/bootstrapped_ansi_gcl/bootstrapped_r_gcl/g \
+		| ./bootstrapped_gcl
+
+		for x in "./bootstrapped_r_gcl" "unixport/saved_gcl" ; do
+			echo "(compiler::emit-fn t)" \
+				| ${x} \
+				|| die "Phase 2, bootstraped compiler failed in tests"
+		done
+	fi
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	rm -rf "${D}"usr/share/doc/${PN}-si "${D}"usr/share/doc/${PN}-tk
+
+	dosed /usr/bin/gcl
+	fperms 0755 /usr/bin/gcl
+
+	dodoc readme* RELEASE* ChangeLog* doc/*
+	doman gcl.1
+	doinfo info/*.info*
+
+	if use emacs; then
+		mv "${D}"usr/share/emacs/site-lisp/${PN}/add-default.el "${T}"/50${PN}-gentoo.el
+		elisp-site-file-install "${T}"/50${PN}-gentoo.el
+		elisp-install ${PN} elisp/*
+		fperms 0644 /usr/share/emacs/site-lisp/gcl/*
+	else
+		rm -rf "${D}"usr/share/emacs
+	fi
+
+	if use doc; then
+		mv "${D}"usr/share/doc/*.dvi "${D}"usr/share/doc/dwdoc* "${D}"usr/share/doc/${PF}/
+	else
+		rm -rf "${D}"usr/share/doc/*.dvi "${D}"usr/share/doc/dwdoc*
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}