Version bump to 20a.

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

6 files changed, 270 insertions, 13 deletions

diff --git a/dev-lisp/cmucl/ChangeLog b/dev-lisp/cmucl/ChangeLog
index c7d35b079e12..4a308ba4f071 100644
--- a/dev-lisp/cmucl/ChangeLog
+++ b/dev-lisp/cmucl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lisp/cmucl
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/ChangeLog,v 1.31 2008/09/04 06:21:19 opfer Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/ChangeLog,v 1.32 2010/05/12 04:14:47 chiiph Exp $
+
+*cmucl-20a (12 May 2010)
+
+  12 May 2010; Tomas Touceda <chiiph@gentoo.org>
+  +files/20a-multiplefixes.patch, +cmucl-20a.ebuild,
+  +files/20a-patch000.patch, +files/fix-man-and-doc-installation.patch:
+  Version bump to 20a.
 
   04 Sep 2008; Christian Faulhammer <opfer@gentoo.org> cmucl-19c.ebuild:
   change dependency from virtual/tetex to virtual/latex-base
diff --git a/dev-lisp/cmucl/Manifest b/dev-lisp/cmucl/Manifest
index 1a88acce5743..2cbd52b815e1 100644
--- a/dev-lisp/cmucl/Manifest
+++ b/dev-lisp/cmucl/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 19c/README.Gentoo 848 RMD160 c4ba0ce6cf147a8b339302856fbac6590609e343 SHA1 16b6415ea63fc546a02c5de99e9e3a789f8efbfc SHA256 99dae09d2159ddf599a39cdc21168c300dd3c56d7ca454565f08076fb83ae064
 AUX 19c/cmucl.sh 2701 RMD160 31cf025b4345e7670b3b895023d1bb00d4f6fc3d SHA1 5789679a4fa1125de61855a3b3447f33dabee3b6 SHA256 61c4084a280e44c86b0d2e915ba79151c44b3934ed894d2256402d850b78dc25
 AUX 19c/herald-save.lisp-gentoo.patch 830 RMD160 7a9da1b5bc5190a9d44f691bd1b5ca433532083b SHA1 1f4484ded58c1a6ce24cc7f352cfe41e5bdf5b7d SHA256 cd6b45f4b981dafd00ca86fd5a76313adc21ffd8d9b30aaadd72819eb40b7a8e
@@ -8,19 +5,18 @@ AUX 19c/install-clc.lisp 1749 RMD160 c336f5ed2e9fd4c75038c445df2630e5ba3cf57b SH
 AUX 19c/site-init.lisp.in 1754 RMD160 a2e1a716ae3882633a01e1880c550a1e1c5b3eb5 SHA1 416502edd9d93aa27f4e88e0ea609116180aff1a SHA256 dda305f291650aba1638c64d6ed7a1b16cf3c7b27728d535eb6bae7f596d9314
 AUX 19d-cmucl-patch-002.patch 1289 RMD160 677e67369392e2d0d77c3e75d50964984897e12a SHA1 2555c4759c089c14c60f18de3c19520fd74f4f60 SHA256 bd5248401903485a92c9546147390d9e753d5aba8dc494ec1c497ec25f2b8bca
 AUX 19d-gentoo.patch 1331 RMD160 e78cf4588976d363f52959e7f4a8afc9d814b917 SHA1 20de05f939a3ef79243c92b575b3d5c2602b579b SHA256 4c661395dd633c51099ef833f79af868fb8188af1e519c7308182ecf03a5ce30
+AUX 20a-multiplefixes.patch 3990 RMD160 5311892ba7aa33e2dc0cfe82c4c48547000914be SHA1 abe23ea6d0e0da5b890062240191d9590f5db811 SHA256 4894e2088e0745cb8ad55b8ec4852d04d2949837e6f5d7ca2d8fe340ece6f554
+AUX 20a-patch000.patch 679 RMD160 c371ed28a06c652b433e1b2c3c3052650a9c224b SHA1 8a44aa62d96cfc5befe1656db2bc0c6bac87439b SHA256 ab375f40369d0c7e7d7cc8593405ce2b8b88397ec7faf2a6c7035f55a51fe4f3
+AUX fix-man-and-doc-installation.patch 1671 RMD160 9bbc857219ae45170c41974967bd111c02d8121c SHA1 accb39eb4a9879830ce55dbb9dc6c91102757757 SHA256 77b9844670345e4c79510969b2676db1b0a366ed0f1e5c07ac74c477cdf65819
 DIST cmucl-19c-x86-linux.tar.bz2 7305922 RMD160 9731fb0fa5f3b47afb89f16c79378324ca8a79b3 SHA1 098c13a7120499a7ff68d4992a76ef7b9442f8c0 SHA256 4f8e1a819e69be176dd03efbd7cc282261d8ddc70b22ffdba1136853f58a30e7
 DIST cmucl-19d-x86-linux.tar.bz2 7600189 RMD160 43a6d3e2637a74dad3155923f6771c213e09f54a SHA1 3e32c5f204974fdb68570f885cd0ae3ee5de5504 SHA256 5d459213f37dac8f633377d1c64901d1e9fe9c5774a7b1d5f914c306fb48dadc
+DIST cmucl-20a-x86-linux.tar.bz2 16390027 RMD160 5bb559f12fcd78cdc5d0c7cb9d89420094dd0f5d SHA1 f9b3141f9298abe1f69cbb88938ff96a12445eb6 SHA256 920db6d07427fae919b1b936fea88d242bb664d5e1fbbce3b8ee6bbe98744d1a
 DIST cmucl-src-19d.tar.bz2 3780254 RMD160 5f691d74f4263e33142f478616a8c09524f2318b SHA1 8fac36916987c37f1092168d56aaf16c562af843 SHA256 027a86d3e2729e14cb8101d088716a61fb62b5197af66a4f80457f13134514bf
+DIST cmucl-src-20a.tar.bz2 6203135 RMD160 27042678cf4653e0a0a7be32dd3cadc9fd7aa118 SHA1 4381905b212678f7953920abb49bf24e822d1ace SHA256 a1821808fb2906a3f6fc7229fd7bc558b0896a08d2a227d1b9e726db09c3777d
 DIST cmucl_19c-release-20051115-1.diff.gz 1506111 RMD160 4b74b89e4deaa1dff1e8d003e06a82f59a0c77a3 SHA1 4c8a131e027fe35503add94adc469942d6e42fa2 SHA256 65ef4018294b6fed388c39643782e6e611ee87bdb944c639da648522a4c2d336
 DIST cmucl_19c-release-20051115.orig.tar.gz 4654304 RMD160 1c6b165a8427839d48639047020ee7c9c368da65 SHA1 4d95482e94b55e93a7efb148c63f1f2fe0a5449e SHA256 4eebac35decc23449f4cf79996c31ea674df7136e08b829210d352c5d20d2407
 EBUILD cmucl-19c.ebuild 4658 RMD160 c0db5d2e490edb195baa14379c8e1834774293d8 SHA1 06b91147d15c4c148dc51bd0536026b2d384f3b0 SHA256 7ea7fcc46094875162a7a8c52b681a664160884c6336aeb601ca756d5dd8b5bc
 EBUILD cmucl-19d_p2.ebuild 1842 RMD160 7bd4da86ac558e22edfca0579b6e693a8ed6597c SHA1 f2224037a7996054766e5e45c1816abb13baa8cf SHA256 db9d59903e6102ed876a6194483c8c4d5f31fe0648d44048b702f8aee88320de
-MISC ChangeLog 6362 RMD160 16e228e2fb3d7da0d3ca07ac868f562f69737c31 SHA1 24f3f595045e705d924518331b30937db5db2eaf SHA256 7b06627d1e9c51468ec51b0ac0ba29af39cd44ba07c3acea5212817fafd86c0c
+EBUILD cmucl-20a.ebuild 2236 RMD160 b87c05a9df288a0621b1fb0f2f5ad917ab0edab1 SHA1 e46d23ca096ece3d4757a9c3f2da45d84dcd64bc SHA256 ffb52a0ef416cd922baf3be87b9000d4cde76447311750c66714b6e5e030d577
+MISC ChangeLog 6587 RMD160 7dc04fef15fcd8a2370984de7d1465069f3dcfdf SHA1 e2d02b7f01d9580e3350938b2c75b64cb9ddd730 SHA256 3bfce6eeda869c239839eef9ffe25bdc57f44a6fec9b2609c2de8a238b194516
 MISC metadata.xml 1201 RMD160 a53109298a26c111b24bccabac8c5fa8084d2756 SHA1 4bc50d74b522f84bfaaec751b935b0cffe872ff1 SHA256 e0d0e5aef67b7b9cb0aae16ac7b92fa8279a5e3a9b658a87ce4d8d20eea94edb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAki/fpIACgkQNQqtfCuFneMzSACgktiYKKZ33jFGFUQWR2GzHpPo
-q0MAn3aLes4dCfZJnINbwUm0m7QH2MJE
-=1KQp
------END PGP SIGNATURE-----
diff --git a/dev-lisp/cmucl/cmucl-20a.ebuild b/dev-lisp/cmucl/cmucl-20a.ebuild
new file mode 100644
index 000000000000..bccfc4455e7b
--- /dev/null
+++ b/dev-lisp/cmucl/cmucl-20a.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-20a.ebuild,v 1.1 2010/05/12 04:14:47 chiiph Exp $
+
+EAPI="3"
+
+inherit eutils toolchain-funcs
+
+MY_PV=${PV:0:3}
+
+DESCRIPTION="CMU Common Lisp is an implementation of ANSI Common Lisp"
+HOMEPAGE="http://www.cons.org/cmucl/"
+SRC_URI="http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-src-${MY_PV}.tar.bz2
+	http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-${MY_PV}-x86-linux.tar.bz2"
+RESTRICT="mirror"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="X source sse2"
+
+RDEPEND="x11-libs/openmotif"
+DEPEND="${RDEPEND}
+		sys-devel/bc"
+PDEPEND="dev-lisp/gentoo-init"
+
+PROVIDE="virtual/commonlisp"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/fix-man-and-doc-installation.patch
+	epatch "${FILESDIR}"/${MY_PV}-patch000.patch
+	epatch "${FILESDIR}"/${MY_PV}-multiplefixes.patch
+}
+
+src_compile() {
+	local cfpu="sse2"
+	if ! use sse2; then
+		cfpu="x87"
+	fi
+
+	einfo ${cfpu}
+
+	local copts="-u"
+
+	if use X; then
+		copts=""
+	fi
+
+	copts+=" -f ${cfpu}"
+
+	local buildimage="bin/lisp -core lib/cmucl/lib/lisp-${cfpu}.core -batch -noinit -nositeinit"
+	env CC="$(tc-getCC)" src/tools/build.sh -C "" -o "${buildimage}" ${copts} || die "Cannot build the compiler"
+}
+
+src_install() {
+	env MANDIR=share/man/man1 DOCDIR=share/doc/${PF} \
+		src/tools/make-dist.sh -S -g -G root -O root build-4 ${MY_PV} x86 linux || die "Cannot build installation archive"
+
+	tar xzpf cmucl-${MY_PV}-x86-linux.tar.gz -C "${D}"/usr || die "Cannot install main system"
+	if use X ; then
+		tar xzpf cmucl-${MY_PV}-x86-linux.extra.tar.gz -C "${D}"/usr || die "Cannot install extra files"
+	fi
+	if use source; then
+		dodir /usr/share/common-lisp/source/${PN} || die "dodir failed"
+		tar --strip-components 1 -xzpf cmucl-src-${MY_PV}.tar.gz \
+			-C "${D}"/usr/share/common-lisp/source/${PN} \
+			|| die "tar failed"
+	fi
+
+	# Install site config file
+	sed "s,@PF@,${PF},g ; s,@VERSION@,$(date +%F),g" \
+		< "${FILESDIR}"/site-init.lisp.in \
+		> "${D}"/usr/$(get_libdir)/cmucl/site-init.lisp || die "sed failed"
+	insinto /etc
+	doins "${FILESDIR}"/cmuclrc || die "doins failed"
+}
diff --git a/dev-lisp/cmucl/files/20a-multiplefixes.patch b/dev-lisp/cmucl/files/20a-multiplefixes.patch
new file mode 100644
index 000000000000..ef2d66ff818e
--- /dev/null
+++ b/dev-lisp/cmucl/files/20a-multiplefixes.patch
@@ -0,0 +1,118 @@
+diff -Naur work.old/src/lisp/alpha-assem.S work/src/lisp/alpha-assem.S
+--- work.old/src/lisp/alpha-assem.S	2003-03-06 11:13:09.000000000 -0300
++++ work/src/lisp/alpha-assem.S	2010-05-10 00:06:34.000000000 -0300
+@@ -297,3 +297,7 @@
+ function_end_breakpoint_end:
+ 
+ 
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff -Naur work.old/src/lisp/amd64-assem.S work/src/lisp/amd64-assem.S
+--- work.old/src/lisp/amd64-assem.S	2004-07-27 19:03:53.000000000 -0300
++++ work/src/lisp/amd64-assem.S	2010-05-10 00:06:34.000000000 -0300
+@@ -1051,3 +1051,7 @@
+ 	.end
+ 
+ #endif /* LINKAGE_TABLE */
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff -Naur work.old/src/lisp/backtrace.c work/src/lisp/backtrace.c
+--- work.old/src/lisp/backtrace.c	2009-06-11 13:04:01.000000000 -0300
++++ work/src/lisp/backtrace.c	2010-05-10 00:06:22.000000000 -0300
+@@ -3,6 +3,8 @@
+  * Simple backtrace facility.  More or less from Rob's lisp version.
+  */
+ 
++#include "os-common.h"
++
+ #include <stdio.h>
+ #include <signal.h>
+ #include "lisp.h"
+diff -Naur work.old/src/lisp/hppa-assem.S work/src/lisp/hppa-assem.S
+--- work.old/src/lisp/hppa-assem.S	2002-08-23 14:05:35.000000000 -0300
++++ work/src/lisp/hppa-assem.S	2010-05-10 00:06:34.000000000 -0300
+@@ -460,3 +460,7 @@
+ 
+ 	.export	function_end_breakpoint_end
+ function_end_breakpoint_end
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff -Naur work.old/src/lisp/linux-stubs.S work/src/lisp/linux-stubs.S
+--- work.old/src/lisp/linux-stubs.S	2005-08-17 00:40:16.000000000 -0300
++++ work/src/lisp/linux-stubs.S	2010-05-10 00:06:34.000000000 -0300
+@@ -995,3 +995,7 @@
+ /*  doe(yperr_string) */
+ /*  doe(ypprot_err) */
+ #endif /* defined(LINKAGE_TABLE) && !defined(__FreeBSD__) */
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff -Naur work.old/src/lisp/lisp.c work/src/lisp/lisp.c
+--- work.old/src/lisp/lisp.c	2009-07-13 16:41:54.000000000 -0300
++++ work/src/lisp/lisp.c	2010-05-10 00:05:55.000000000 -0300
+@@ -5,6 +5,9 @@
+  *
+  */
+ 
++#include "os-common.h"
++#include <time.h>
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <limits.h>
+diff -Naur work.old/src/lisp/mips-assem.S work/src/lisp/mips-assem.S
+--- work.old/src/lisp/mips-assem.S	2002-08-23 14:01:02.000000000 -0300
++++ work/src/lisp/mips-assem.S	2010-05-10 00:06:34.000000000 -0300
+@@ -402,3 +402,7 @@
+ 	move	v0, a1
+ 	j	_restore_state
+ 	.end	save_state
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff -Naur work.old/src/lisp/os-common.h work/src/lisp/os-common.h
+--- work.old/src/lisp/os-common.h	1969-12-31 21:00:00.000000000 -0300
++++ work/src/lisp/os-common.h	2010-05-10 00:06:22.000000000 -0300
+@@ -0,0 +1 @@
++char* convert_lisp_string(char* c_string, void* lisp_string, int len);
+diff -Naur work.old/src/lisp/ppc-assem.S work/src/lisp/ppc-assem.S
+--- work.old/src/lisp/ppc-assem.S	2006-02-25 01:35:58.000000000 -0300
++++ work/src/lisp/ppc-assem.S	2010-05-10 00:06:34.000000000 -0300
+@@ -721,3 +721,7 @@
+ 	SET_SIZE(fpu_restore)
+ 	
+ #endif
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff -Naur work.old/src/lisp/sparc-assem.S work/src/lisp/sparc-assem.S
+--- work.old/src/lisp/sparc-assem.S	2003-10-23 23:57:00.000000000 -0300
++++ work/src/lisp/sparc-assem.S	2010-05-10 00:06:34.000000000 -0300
+@@ -837,3 +837,7 @@
+  * End:
+  */						
+ 		
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff -Naur work.old/src/lisp/x86-assem.S work/src/lisp/x86-assem.S
+--- work.old/src/lisp/x86-assem.S	2008-12-24 02:36:40.000000000 -0200
++++ work/src/lisp/x86-assem.S	2010-05-10 00:06:34.000000000 -0300
+@@ -798,3 +798,7 @@
+ ENDFUNC(undefined_foreign_symbol_trap)
+ 
+ #endif /* LINKAGE_TABLE */
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
diff --git a/dev-lisp/cmucl/files/20a-patch000.patch b/dev-lisp/cmucl/files/20a-patch000.patch
new file mode 100644
index 000000000000..e11c11ca37f8
--- /dev/null
+++ b/dev-lisp/cmucl/files/20a-patch000.patch
@@ -0,0 +1,16 @@
+diff -ur cmucl.orig/src/code/print.lisp cmucl/src/code/print.lisp
+--- cmucl.orig/src/code/print.lisp	2009-07-06 17:42:34.000000000 +0200
++++ cmucl/src/code/print.lisp	2009-11-09 01:47:01.000000000 +0100
+@@ -2190,8 +2190,11 @@
+     (set-bit #\_ extension-attribute)
+     (set-bit #\. dot-attribute)
+     (set-bit #\/ slash-attribute)
++    (set-bit #\` funny-attribute)
++    (set-bit #\| funny-attribute)
+ 
+-    ;; Make anything not explicitly allowed funny...
++    ;; For everything else, derive the attribute from the Unicode
++    ;; properties of the character.
+     (dotimes (i char-code-limit)
+       (when (zerop (aref character-attributes i))
+ 	(let* ((char (code-char i)))
diff --git a/dev-lisp/cmucl/files/fix-man-and-doc-installation.patch b/dev-lisp/cmucl/files/fix-man-and-doc-installation.patch
new file mode 100644
index 000000000000..0fe122255c90
--- /dev/null
+++ b/dev-lisp/cmucl/files/fix-man-and-doc-installation.patch
@@ -0,0 +1,42 @@
+Index: tools/make-main-dist.sh
+===================================================================
+RCS file: /project/cmucl/cvsroot/src/tools/make-main-dist.sh,v
+retrieving revision 1.18
+diff -u -w -u -r1.18 make-main-dist.sh
+--- cmucl/src/tools/make-main-dist.sh	13 Aug 2009 14:22:56 -0000	1.18
++++ cmucl/src/tools/make-main-dist.sh	30 Sep 2009 14:26:41 -0000
+@@ -29,6 +29,7 @@
+ fi
+ 
+ DESTDIR=${INSTALL_DIR:-release-$$}
++DOCDIR=${DOCDIR:-doc/cmucl}
+ MANDIR=${MANDIR:-man/man1}
+ TARGET="`echo $1 | sed 's:/*$::'`"
+ VERSION=$2
+@@ -81,11 +82,11 @@
+ # set -x
+ echo Installing main components
+ install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/bin
+-install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/doc/cmucl
+ install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/lib/cmucl
+ install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/lib/cmucl/lib
+ install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/lib/cmucl/lib/subsystems
+ install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/lib/cmucl/lib/ext-formats
++install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/${DOCDIR}
+ install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/${MANDIR}
+ install ${GROUP} ${OWNER} -m 0755 $TARGET/lisp/lisp $DESTDIR/bin/
+ if [ "$EXECUTABLE" = "true" ]
+@@ -126,11 +127,11 @@
+ 	$DESTDIR/${MANDIR}/
+ install ${GROUP} ${OWNER} -m 0644 src/general-info/lisp.1 \
+ 	$DESTDIR/${MANDIR}/
+-install ${GROUP} ${OWNER} -m 0644 src/general-info/README $DESTDIR/doc/cmucl/
++install ${GROUP} ${OWNER} -m 0644 src/general-info/README $DESTDIR/${DOCDIR}
+ if [ -f src/general-info/release-$VERSION.txt ] 
+ then
+ 	install ${GROUP} ${OWNER} -m 0644 src/general-info/release-$VERSION.txt \
+-		$DESTDIR/doc/cmucl/
++		$DESTDIR/${DOCDIR}
+ fi
+ 
+ if [ -z "$INSTALL_DIR" ]; then