boo-ya ka-sha!

50 files changed, 946 insertions, 90 deletions

diff --git a/dev-lisp/cl-acl-compat/ChangeLog b/dev-lisp/cl-acl-compat/ChangeLog
index f76e58433920..cfba491c76e4 100644
--- a/dev-lisp/cl-acl-compat/ChangeLog
+++ b/dev-lisp/cl-acl-compat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lisp/cl-acl-compat
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-acl-compat/ChangeLog,v 1.13 2004/06/24 23:39:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-acl-compat/ChangeLog,v 1.14 2004/08/07 05:22:07 mkennedy Exp $
+
+*cl-acl-compat-1.2.35.20040804 (06 Aug 2004)
+
+  06 Aug 2004; <mkennedy@gentoo.org> +cl-acl-compat-1.2.35.20040804.ebuild:
+  New upstream version required for package locking support in
+  dev-lisp/cmucl-19a and dev-lisp/sbcl-0.8.13
 
 *cl-acl-compat-1.2.35.20040609 (22 Jun 2004)
 
diff --git a/dev-lisp/cl-acl-compat/Manifest b/dev-lisp/cl-acl-compat/Manifest
index 636cc90fbb71..101953f20ef5 100644
--- a/dev-lisp/cl-acl-compat/Manifest
+++ b/dev-lisp/cl-acl-compat/Manifest
@@ -1,18 +1,20 @@
 MD5 788b349f2fe1da5693dfb2dceedba241 cl-acl-compat-1.2.35.20040426.ebuild 1180
-MD5 3832a10feccab2c43953ae0596e511f3 cl-acl-compat-1.2.35.20040609.ebuild 1180
 MD5 01b371c259166e3ef1b87518cb343c68 cl-acl-compat-1.2.27.2003.09.19.ebuild 1152
-MD5 05b44b25fa4a354e3cd008a5c701c4bf cl-acl-compat-1.2.35.20040316b.ebuild 1176
-MD5 732d435806b07ecc14ae010e50da9ec4 cl-acl-compat-1.2.33.20040118.ebuild 1138
-MD5 f265567a6b282e50ca2009445aa19e6d cl-acl-compat-1.2.12c.ebuild 876
+MD5 3832a10feccab2c43953ae0596e511f3 cl-acl-compat-1.2.35.20040609.ebuild 1180
 MD5 bdb0dc7d1c2c8d86242238e77ff097c1 cl-acl-compat-1.2.33.20031205.ebuild 1085
+MD5 732d435806b07ecc14ae010e50da9ec4 cl-acl-compat-1.2.33.20040118.ebuild 1138
 MD5 5bc1d44ab1308125f328b5e18b9b1990 ChangeLog 2019
+MD5 3832a10feccab2c43953ae0596e511f3 cl-acl-compat-1.2.35.20040804.ebuild 1180
+MD5 f265567a6b282e50ca2009445aa19e6d cl-acl-compat-1.2.12c.ebuild 876
+MD5 05b44b25fa4a354e3cd008a5c701c4bf cl-acl-compat-1.2.35.20040316b.ebuild 1176
 MD5 19a4a5c1772bf21635e0882c459ff60f metadata.xml 398
-MD5 d04be22ec17b2276ee4835ff59e3592d files/1.2.27.2003.09.19-lw-buffering.lisp-gentoo.patch 733
+MD5 e68256e71cb88404a02b40d93c7bd986 files/digest-cl-acl-compat-1.2.35.20040316b 93
 MD5 bfd9d609ea1565b5f02358cef3f6e55f files/digest-cl-acl-compat-1.2.33.20031205 91
-MD5 68b27277ca33c97fa8c9c94b012c8df9 files/digest-cl-acl-compat-1.2.33.20040118 91
 MD5 15d5d16cbcbb9ba7405c40c985cfc2fb files/digest-cl-acl-compat-1.2.12c 92
-MD5 4da1f8fc753c3665b5d79ef7ca196f41 files/digest-cl-acl-compat-1.2.35.20040426 92
+MD5 3853c4f24de84b4a0c57ef6cd39cc8ec files/digest-cl-acl-compat-1.2.35.20040804 92
+MD5 68b27277ca33c97fa8c9c94b012c8df9 files/digest-cl-acl-compat-1.2.33.20040118 91
+MD5 d04be22ec17b2276ee4835ff59e3592d files/1.2.27.2003.09.19-lw-buffering.lisp-gentoo.patch 733
+MD5 55d28579b14e29bf3df0fb0c4ef69d22 files/digest-cl-acl-compat-1.2.27.2003.09.19 91
 MD5 a8e9dff8c1a664a6448d8140c1399bf6 files/digest-cl-acl-compat-1.2.35.20040609 92
-MD5 e68256e71cb88404a02b40d93c7bd986 files/digest-cl-acl-compat-1.2.35.20040316b 93
 MD5 ecfa2dd02bb5a68ecc69740c7f293291 files/acl-compat.asd 7076
-MD5 55d28579b14e29bf3df0fb0c4ef69d22 files/digest-cl-acl-compat-1.2.27.2003.09.19 91
+MD5 4da1f8fc753c3665b5d79ef7ca196f41 files/digest-cl-acl-compat-1.2.35.20040426 92
diff --git a/dev-lisp/cl-acl-compat/cl-acl-compat-1.2.35.20040804.ebuild b/dev-lisp/cl-acl-compat/cl-acl-compat-1.2.35.20040804.ebuild
new file mode 100644
index 000000000000..4230dab92a20
--- /dev/null
+++ b/dev-lisp/cl-acl-compat/cl-acl-compat-1.2.35.20040804.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-acl-compat/cl-acl-compat-1.2.35.20040804.ebuild,v 1.1 2004/08/07 05:22:07 mkennedy Exp $
+
+inherit common-lisp eutils
+
+MY_PV=${PV:0:6}
+CVS_PV=${PV:7:4}.${PV:11:2}.${PV:13}
+
+DESCRIPTION="Compatibility layer for Allegro Common Lisp"
+HOMEPAGE="http://packages.debian.org/unstable/web/cl-acl-compat.html"
+SRC_URI="http://ftp.debian.org/debian/pool/main/c/cl-portable-aserve/cl-portable-aserve_${MY_PV}+cvs.${CVS_PV}.tar.gz"
+LICENSE="LLGPL-2.1"
+SLOT="0"
+KEYWORDS="x86 ~ppc"
+IUSE=""
+DEPEND="dev-lisp/common-lisp-controller
+	dev-lisp/cmucl-source
+	virtual/commonlisp
+	dev-lisp/cl-puri
+	dev-lisp/cl-ppcre"
+
+CLPACKAGE=acl-compat
+
+S=${WORKDIR}/cl-portable-aserve-${MY_PV}+cvs.${CVS_PV}
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PV}-sbcl-package-locks-gentoo.patch
+}
+
+src_install() {
+	dodir /usr/share/common-lisp/source/
+	cp -r acl-compat/ ${D}/usr/share/common-lisp/source/
+	common-lisp-install acl-compat/acl-compat.asd
+	# with the last set of common-lisp-controller changes, this is no
+	# longer necessary
+#	common-lisp-install ${FILESDIR}/acl-compat.asd
+	common-lisp-system-symlink
+	do-debian-credits
+	dodoc ChangeLog
+}
diff --git a/dev-lisp/cl-acl-compat/files/1.2.35.20040804-sbcl-package-locks-gentoo.patch b/dev-lisp/cl-acl-compat/files/1.2.35.20040804-sbcl-package-locks-gentoo.patch
new file mode 100644
index 000000000000..828f0ab43ed3
--- /dev/null
+++ b/dev-lisp/cl-acl-compat/files/1.2.35.20040804-sbcl-package-locks-gentoo.patch
@@ -0,0 +1,13 @@
+diff -ur cl-portable-aserve-1.2.35+cvs.2004.08.04.orig/acl-compat/sbcl/acl-excl.lisp cl-portable-aserve-1.2.35+cvs.2004.08.04/acl-compat/sbcl/acl-excl.lisp
+--- cl-portable-aserve-1.2.35+cvs.2004.08.04.orig/acl-compat/sbcl/acl-excl.lisp	2004-04-26 13:18:37.000000000 -0500
++++ cl-portable-aserve-1.2.35+cvs.2004.08.04/acl-compat/sbcl/acl-excl.lisp	2004-08-06 02:03:38.274313776 -0500
+@@ -25,9 +25,6 @@
+   (declare (ignore signal pid))
+   (error "unix-signal not implemented in acl-excl-sbcl.lisp"))
+ 
+-(defmacro without-package-locks (&body forms)
+-  `(progn ,@forms))
+-
+ (defun filesys-inode (path)
+   (multiple-value-bind (found ign inode)
+       (sb-unix::unix-lstat path)
diff --git a/dev-lisp/cl-acl-compat/files/digest-cl-acl-compat-1.2.35.20040804 b/dev-lisp/cl-acl-compat/files/digest-cl-acl-compat-1.2.35.20040804
new file mode 100644
index 000000000000..17c3e2b95d4c
--- /dev/null
+++ b/dev-lisp/cl-acl-compat/files/digest-cl-acl-compat-1.2.35.20040804
@@ -0,0 +1 @@
+MD5 ac1c2cfa21e47686e419c2df0f904162 cl-portable-aserve_1.2.35+cvs.2004.08.04.tar.gz 775511
diff --git a/dev-lisp/cl-aserve/ChangeLog b/dev-lisp/cl-aserve/ChangeLog
index 2718157d9370..ce3a7b9e59f9 100644
--- a/dev-lisp/cl-aserve/ChangeLog
+++ b/dev-lisp/cl-aserve/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lisp/cl-aserve
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-aserve/ChangeLog,v 1.11 2004/06/24 23:41:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-aserve/ChangeLog,v 1.12 2004/08/07 05:22:07 mkennedy Exp $
+
+*cl-aserve-1.2.35.20040804 (06 Aug 2004)
+
+  06 Aug 2004; <mkennedy@gentoo.org> +files/1.2.35.20040804-gentoo.patch,
+  +cl-aserve-1.2.35.20040804.ebuild:
+  New upstream version
 
 *cl-aserve-1.2.35.20040609 (22 Jun 2004)
 
diff --git a/dev-lisp/cl-aserve/Manifest b/dev-lisp/cl-aserve/Manifest
index 8232f394593b..9304f985af83 100644
--- a/dev-lisp/cl-aserve/Manifest
+++ b/dev-lisp/cl-aserve/Manifest
@@ -1,18 +1,21 @@
-MD5 35e1d7b4a99d1e823e37cebe35aa17e9 cl-aserve-1.2.27.20030919.ebuild 1162
 MD5 ec6451088881a5f99b281cf7236d2817 cl-aserve-1.2.12c.ebuild 977
-MD5 a23a61ae851ec90c75c49f3029bf33c6 cl-aserve-1.2.33.20031205.ebuild 1162
-MD5 736438f83a8b3d49ea23e36569c0e329 cl-aserve-1.2.35.20040426.ebuild 1140
 MD5 0d3b40285cfacaffd3a3bac9b16752e1 cl-aserve-1.2.35.20040609.ebuild 1140
+MD5 3250f1603330f69508818f229e2b9310 cl-aserve-1.2.33.20040118.ebuild 1058
+MD5 a23a61ae851ec90c75c49f3029bf33c6 cl-aserve-1.2.33.20031205.ebuild 1162
 MD5 a3223779b4183cd4cd5dc8d537ad368c cl-aserve-1.2.35.20040316b.ebuild 1059
+MD5 0d3b40285cfacaffd3a3bac9b16752e1 cl-aserve-1.2.35.20040804.ebuild~ 1140
+MD5 736438f83a8b3d49ea23e36569c0e329 cl-aserve-1.2.35.20040426.ebuild 1140
 MD5 4c810428c7cca05863751a0982e3a8e4 ChangeLog 1696
+MD5 7f0db78f4992933680b7546b5d3d889e cl-aserve-1.2.35.20040804.ebuild 1070
+MD5 35e1d7b4a99d1e823e37cebe35aa17e9 cl-aserve-1.2.27.20030919.ebuild 1162
 MD5 9b65b0341efc8f4b29498aad23315229 metadata.xml 164
-MD5 3250f1603330f69508818f229e2b9310 cl-aserve-1.2.33.20040118.ebuild 1058
-MD5 b2198128e185120afd2422e9ba6bf7e0 files/1.2.35.20040609-gentoo.patch 877
 MD5 bfd9d609ea1565b5f02358cef3f6e55f files/digest-cl-aserve-1.2.33.20031205 91
-MD5 68b27277ca33c97fa8c9c94b012c8df9 files/digest-cl-aserve-1.2.33.20040118 91
-MD5 e68256e71cb88404a02b40d93c7bd986 files/digest-cl-aserve-1.2.35.20040316b 93
-MD5 15d5d16cbcbb9ba7405c40c985cfc2fb files/digest-cl-aserve-1.2.12c 92
-MD5 55d28579b14e29bf3df0fb0c4ef69d22 files/digest-cl-aserve-1.2.27.20030919 91
+MD5 3853c4f24de84b4a0c57ef6cd39cc8ec files/digest-cl-aserve-1.2.35.20040804 92
 MD5 decf5c4fc509aaf82ececbab6fe3dd0a files/1.2.35.20040426-gentoo.patch 942
-MD5 4da1f8fc753c3665b5d79ef7ca196f41 files/digest-cl-aserve-1.2.35.20040426 92
 MD5 a8e9dff8c1a664a6448d8140c1399bf6 files/digest-cl-aserve-1.2.35.20040609 92
+MD5 e68256e71cb88404a02b40d93c7bd986 files/digest-cl-aserve-1.2.35.20040316b 93
+MD5 4da1f8fc753c3665b5d79ef7ca196f41 files/digest-cl-aserve-1.2.35.20040426 92
+MD5 55d28579b14e29bf3df0fb0c4ef69d22 files/digest-cl-aserve-1.2.27.20030919 91
+MD5 b2198128e185120afd2422e9ba6bf7e0 files/1.2.35.20040609-gentoo.patch 877
+MD5 68b27277ca33c97fa8c9c94b012c8df9 files/digest-cl-aserve-1.2.33.20040118 91
+MD5 15d5d16cbcbb9ba7405c40c985cfc2fb files/digest-cl-aserve-1.2.12c 92
diff --git a/dev-lisp/cl-aserve/cl-aserve-1.2.35.20040804.ebuild b/dev-lisp/cl-aserve/cl-aserve-1.2.35.20040804.ebuild
new file mode 100644
index 000000000000..2da2dc357aed
--- /dev/null
+++ b/dev-lisp/cl-aserve/cl-aserve-1.2.35.20040804.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-aserve/cl-aserve-1.2.35.20040804.ebuild,v 1.1 2004/08/07 05:22:07 mkennedy Exp $
+
+inherit common-lisp eutils
+
+MY_PV=${PV:0:6}
+CVS_PV=${PV:7:4}.${PV:11:2}.${PV:13}
+
+DESCRIPTION="A portable version of AllegroServe which is a web application server for Common Lisp programs."
+HOMEPAGE="http://packages.debian.org/unstable/web/cl-aserve.html"
+SRC_URI="http://ftp.debian.org/debian/pool/main/c/cl-portable-aserve/cl-portable-aserve_${MY_PV}+cvs.${CVS_PV}.tar.gz"
+LICENSE="LLGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+DEPEND="dev-lisp/common-lisp-controller
+	virtual/commonlisp
+	=dev-lisp/cl-acl-compat-${PV}
+	=dev-lisp/cl-htmlgen-${PV}"
+
+CLPACKAGE=aserve
+
+S=${WORKDIR}/cl-portable-aserve-${MY_PV}+cvs.${CVS_PV}
+
+src_unpack () {
+	unpack ${A}
+	epatch ${FILESDIR}/${PV}-gentoo.patch
+}
+
+src_install() {
+	common-lisp-install aserve/*.cl aserve/*.asd
+	common-lisp-system-symlink
+	dodoc ChangeLog README README.cmucl INSTALL.lisp logical-hostnames.lisp
+	docinto examples
+	dodoc contrib/*.lisp
+}
diff --git a/dev-lisp/cl-aserve/files/1.2.35.20040804-gentoo.patch b/dev-lisp/cl-aserve/files/1.2.35.20040804-gentoo.patch
new file mode 100644
index 000000000000..4ae7c8e35b0a
--- /dev/null
+++ b/dev-lisp/cl-aserve/files/1.2.35.20040804-gentoo.patch
@@ -0,0 +1,22 @@
+diff -ur cl-portable-aserve-1.2.35+cvs.2004.08.04.orig/aserve/main.cl cl-portable-aserve-1.2.35+cvs.2004.08.04/aserve/main.cl
+--- cl-portable-aserve-1.2.35+cvs.2004.08.04.orig/aserve/main.cl	2004-03-16 14:37:42.000000000 -0600
++++ cl-portable-aserve-1.2.35+cvs.2004.08.04/aserve/main.cl	2004-05-08 17:48:37.633431960 -0500
+@@ -221,7 +221,10 @@
+   (defun getpid () (sb-posix:getpid))
+   (defun setuid (uid) (sb-posix:setuid uid))
+   (defun setgid (gid) (sb-posix:setgid gid))
+-  (defun unix-fork () (sb-unix:unix-fork)))
++  ;; the following does not work in SBCL 0.8.10 (it didn't work in
++  ;; SBCL prior to that either)
++  #+nil (defun unix-fork () (sb-unix:unix-fork))
++  (sb-alien:define-alien-routine ("fork" unix-fork) integer))
+ 
+ 
+ 
+@@ -2943,5 +2946,3 @@
+     (if* (null obj)
+        then (push (setq obj (make-resp code "unknown code")) *responses*))
+     obj))
+-  
+-
+
diff --git a/dev-lisp/cl-aserve/files/digest-cl-aserve-1.2.35.20040804 b/dev-lisp/cl-aserve/files/digest-cl-aserve-1.2.35.20040804
new file mode 100644
index 000000000000..17c3e2b95d4c
--- /dev/null
+++ b/dev-lisp/cl-aserve/files/digest-cl-aserve-1.2.35.20040804
@@ -0,0 +1 @@
+MD5 ac1c2cfa21e47686e419c2df0f904162 cl-portable-aserve_1.2.35+cvs.2004.08.04.tar.gz 775511
diff --git a/dev-lisp/cl-bouquet/ChangeLog b/dev-lisp/cl-bouquet/ChangeLog
index ff2e7ca54e77..8186ec95a642 100644
--- a/dev-lisp/cl-bouquet/ChangeLog
+++ b/dev-lisp/cl-bouquet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lisp/cl-bouquet
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-bouquet/ChangeLog,v 1.3 2004/06/24 23:41:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-bouquet/ChangeLog,v 1.4 2004/08/07 05:22:07 mkennedy Exp $
+
+  07 Aug 2004; <mkennedy@gentoo.org> +files/0.1-package-lock-gentoo.patch,
+  -files/cl-bouquet-0.1-clisp-package-lock-gentoo.patch,
+  cl-bouquet-0.1.ebuild:
+  Fix package lock failure
 
   19 May 2004; <mkennedy@gentoo.org>
   +files/cl-bouquet-0.1-clisp-package-lock-gentoo.patch,
diff --git a/dev-lisp/cl-bouquet/Manifest b/dev-lisp/cl-bouquet/Manifest
index f8c21d0652f9..27e6a0f0f304 100644
--- a/dev-lisp/cl-bouquet/Manifest
+++ b/dev-lisp/cl-bouquet/Manifest
@@ -1,5 +1,6 @@
-MD5 cbd18d85bc084dac989f01bde84d4d79 cl-bouquet-0.1.ebuild 822
+MD5 cbd18d85bc084dac989f01bde84d4d79 cl-bouquet-0.1.ebuild.~1.5.~ 822
 MD5 17642427ea3b27e0e59a61a719b789e5 ChangeLog 691
+MD5 6126226b1296e510b73fdd5e5ad8b0d6 cl-bouquet-0.1.ebuild 817
 MD5 09550cbfcc213daad260827408043ccd metadata.xml 379
 MD5 be4bc91e4615ba8378b928d0fbf6049a files/digest-cl-bouquet-0.1 62
-MD5 bb0088f162051bf06e30c177a9a1a79c files/cl-bouquet-0.1-clisp-package-lock-gentoo.patch 932
+MD5 1b4691acd730193c56c64acc71bc9f24 files/0.1-package-lock-gentoo.patch 744
diff --git a/dev-lisp/cl-bouquet/cl-bouquet-0.1.ebuild b/dev-lisp/cl-bouquet/cl-bouquet-0.1.ebuild
index c7c3beefbef9..38ca24776a97 100644
--- a/dev-lisp/cl-bouquet/cl-bouquet-0.1.ebuild
+++ b/dev-lisp/cl-bouquet/cl-bouquet-0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-bouquet/cl-bouquet-0.1.ebuild,v 1.5 2004/07/14 15:23:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-bouquet/cl-bouquet-0.1.ebuild,v 1.6 2004/08/07 05:22:07 mkennedy Exp $
 
 inherit common-lisp eutils
 
@@ -20,7 +20,7 @@ S=${WORKDIR}/bouquet
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${P}-clisp-package-lock-gentoo.patch
+	epatch ${FILESDIR}/${PV}-package-lock-gentoo.patch
 }
 
 src_install() {
diff --git a/dev-lisp/cl-bouquet/files/0.1-package-lock-gentoo.patch b/dev-lisp/cl-bouquet/files/0.1-package-lock-gentoo.patch
new file mode 100644
index 000000000000..0f7f6d6d2be1
--- /dev/null
+++ b/dev-lisp/cl-bouquet/files/0.1-package-lock-gentoo.patch
@@ -0,0 +1,23 @@
+diff -ur bouquet.orig/bouquet.lisp bouquet/bouquet.lisp
+--- bouquet.orig/bouquet.lisp	2004-05-03 05:06:40.000000000 -0500
++++ bouquet/bouquet.lisp	2004-08-07 00:07:01.863133456 -0500
+@@ -100,8 +100,8 @@
+ 	  :accessor edges)))
+ 
+ (defclass tulip-property ()
+-  ((property-type :initarg :type
+-		  :accessor type)
++  ((property-type :initarg :property-type
++		  :accessor property-type)
+    (cluster :initarg :cluster
+ 	    :accessor cluster
+ 	    :initform nil)
+@@ -189,7 +189,7 @@
+       (format stream
+ 	  "(property ~D ~(~A~) ~S~%(default ~S ~S)~%~{(node ~D ~S)~%~}~{(edge ~D ~S)~%~})"
+ 	  (if cluster (numeric-id cluster) 0)
+-	  (type property)
++	  (property-type property)
+ 	  name
+ 	  (nodes-default property)
+ 	  (edges-default property)
diff --git a/dev-lisp/cl-bouquet/files/cl-bouquet-0.1-clisp-package-lock-gentoo.patch b/dev-lisp/cl-bouquet/files/cl-bouquet-0.1-clisp-package-lock-gentoo.patch
deleted file mode 100644
index ab89b895ed51..000000000000
--- a/dev-lisp/cl-bouquet/files/cl-bouquet-0.1-clisp-package-lock-gentoo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ur bouquet.orig/bouquet.asd bouquet/bouquet.asd
---- bouquet.orig/bouquet.asd	2004-04-30 04:41:02.000000000 -0500
-+++ bouquet/bouquet.asd	2004-05-19 11:25:41.242113070 -0500
-@@ -1,6 +1,12 @@
- (defpackage #:bouquet-system (:use #:asdf #:cl))
- (in-package #:bouquet-system)
- 
-+(defclass possibly-unsafe-file (cl-source-file) ())
-+
-+(defmethod perform :around ((op load-op) (c possibly-unsafe-file))
-+  #+clisp (setf (ext:package-lock "COMMON-LISP") nil)
-+  (call-next-method))
-+
- (asdf:defsystem :bouquet
-     :version "0.3.0"
-     :author "Eugene Zaikonnikov"
-@@ -12,7 +18,7 @@
- 		 ((#:albert #:docbook #:cvs-viewurl) . "http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/bouquet/bouquet/")
- 		 ((#:albert #:docbook #:cvs-tag) . "HEAD"))
-     :components ((:file "package")
--		 (:file "bouquet" :depends-on ("package"))
-+		 (:possibly-unsafe-file "bouquet" :depends-on ("package"))
- 		 (:file "tests" :depends-on ("bouquet"))))
- 
- 
diff --git a/dev-lisp/cl-htmlgen/ChangeLog b/dev-lisp/cl-htmlgen/ChangeLog
index a47395c2068a..0b3f84ec6190 100644
--- a/dev-lisp/cl-htmlgen/ChangeLog
+++ b/dev-lisp/cl-htmlgen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lisp/cl-htmlgen
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-htmlgen/ChangeLog,v 1.10 2004/06/24 23:43:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-htmlgen/ChangeLog,v 1.11 2004/08/07 05:22:07 mkennedy Exp $
+
+*cl-htmlgen-1.2.35.20040804 (06 Aug 2004)
+
+  06 Aug 2004; <mkennedy@gentoo.org> +cl-htmlgen-1.2.35.20040804.ebuild:
+  New upstream version required for package locking support in
+  dev-lisp/cmucl-19a and dev-lisp/sbcl-0.8.13
 
 *cl-htmlgen-1.2.35.20040609 (22 Jun 2004)
 
diff --git a/dev-lisp/cl-htmlgen/Manifest b/dev-lisp/cl-htmlgen/Manifest
index c16b4b70bfca..c0181731b4df 100644
--- a/dev-lisp/cl-htmlgen/Manifest
+++ b/dev-lisp/cl-htmlgen/Manifest
@@ -1,16 +1,18 @@
-MD5 3a83cb73c6492f2cccde58f787928e4c cl-htmlgen-1.2.27.20030919.ebuild 977
-MD5 9c011d51d090d4503a47cbc3f6cadb4d cl-htmlgen-1.2.33.20031205.ebuild 977
-MD5 298d6eb1cbd712a0b8ce12c9e5f3f6d8 cl-htmlgen-1.2.12c.ebuild 810
-MD5 89bdc6e6a54aad460dec09e4ea39fdba cl-htmlgen-1.2.35.20040426.ebuild 945
-MD5 bfd863c89a614c123c4fbd67c4ed0e0c cl-htmlgen-1.2.35.20040316b.ebuild 941
 MD5 873aa6af102faa04e1f8e7535e554c1e cl-htmlgen-1.2.35.20040609.ebuild 945
 MD5 7f036d2c57f3a5fa31715a4106bd7dfd cl-htmlgen-1.2.33.20040118.ebuild 940
+MD5 3a83cb73c6492f2cccde58f787928e4c cl-htmlgen-1.2.27.20030919.ebuild 977
+MD5 89bdc6e6a54aad460dec09e4ea39fdba cl-htmlgen-1.2.35.20040426.ebuild 945
+MD5 873aa6af102faa04e1f8e7535e554c1e cl-htmlgen-1.2.35.20040804.ebuild 945
+MD5 9c011d51d090d4503a47cbc3f6cadb4d cl-htmlgen-1.2.33.20031205.ebuild 977
 MD5 fd24c3b5763d833b9de227c934abfa1f ChangeLog 1373
+MD5 bfd863c89a614c123c4fbd67c4ed0e0c cl-htmlgen-1.2.35.20040316b.ebuild 941
+MD5 298d6eb1cbd712a0b8ce12c9e5f3f6d8 cl-htmlgen-1.2.12c.ebuild 810
 MD5 9b65b0341efc8f4b29498aad23315229 metadata.xml 164
-MD5 4da1f8fc753c3665b5d79ef7ca196f41 files/digest-cl-htmlgen-1.2.35.20040426 92
-MD5 a8e9dff8c1a664a6448d8140c1399bf6 files/digest-cl-htmlgen-1.2.35.20040609 92
-MD5 15d5d16cbcbb9ba7405c40c985cfc2fb files/digest-cl-htmlgen-1.2.12c 92
-MD5 bfd9d609ea1565b5f02358cef3f6e55f files/digest-cl-htmlgen-1.2.33.20031205 91
-MD5 68b27277ca33c97fa8c9c94b012c8df9 files/digest-cl-htmlgen-1.2.33.20040118 91
 MD5 e68256e71cb88404a02b40d93c7bd986 files/digest-cl-htmlgen-1.2.35.20040316b 93
+MD5 bfd9d609ea1565b5f02358cef3f6e55f files/digest-cl-htmlgen-1.2.33.20031205 91
+MD5 a8e9dff8c1a664a6448d8140c1399bf6 files/digest-cl-htmlgen-1.2.35.20040609 92
 MD5 55d28579b14e29bf3df0fb0c4ef69d22 files/digest-cl-htmlgen-1.2.27.20030919 91
+MD5 4da1f8fc753c3665b5d79ef7ca196f41 files/digest-cl-htmlgen-1.2.35.20040426 92
+MD5 68b27277ca33c97fa8c9c94b012c8df9 files/digest-cl-htmlgen-1.2.33.20040118 91
+MD5 3853c4f24de84b4a0c57ef6cd39cc8ec files/digest-cl-htmlgen-1.2.35.20040804 92
+MD5 15d5d16cbcbb9ba7405c40c985cfc2fb files/digest-cl-htmlgen-1.2.12c 92
diff --git a/dev-lisp/cl-htmlgen/cl-htmlgen-1.2.35.20040804.ebuild b/dev-lisp/cl-htmlgen/cl-htmlgen-1.2.35.20040804.ebuild
new file mode 100644
index 000000000000..4af91298ec48
--- /dev/null
+++ b/dev-lisp/cl-htmlgen/cl-htmlgen-1.2.35.20040804.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-htmlgen/cl-htmlgen-1.2.35.20040804.ebuild,v 1.1 2004/08/07 05:22:07 mkennedy Exp $
+
+inherit common-lisp
+
+MY_PV=${PV:0:6}
+CVS_PV=${PV:7:4}.${PV:11:2}.${PV:13}
+
+DESCRIPTION="Franz's library for generating HTML from Common Lisp programs"
+HOMEPAGE="http://packages.debian.org/unstable/web/cl-htmlgen.html"
+SRC_URI="http://ftp.debian.org/debian/pool/main/c/cl-portable-aserve/cl-portable-aserve_${MY_PV}+cvs.${CVS_PV}.tar.gz"
+LICENSE="LLGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+DEPEND="dev-lisp/common-lisp-controller
+	virtual/commonlisp
+	=dev-lisp/cl-acl-compat-${PV}"
+
+CLPACKAGE=htmlgen
+
+S=${WORKDIR}/cl-portable-aserve-${MY_PV}+cvs.${CVS_PV}
+
+src_install() {
+	common-lisp-install aserve/htmlgen/*.cl aserve/htmlgen/*.asd
+	common-lisp-system-symlink
+	do-debian-credits
+	dodoc ChangeLog
+}
diff --git a/dev-lisp/cl-htmlgen/files/digest-cl-htmlgen-1.2.35.20040804 b/dev-lisp/cl-htmlgen/files/digest-cl-htmlgen-1.2.35.20040804
new file mode 100644
index 000000000000..17c3e2b95d4c
--- /dev/null
+++ b/dev-lisp/cl-htmlgen/files/digest-cl-htmlgen-1.2.35.20040804
@@ -0,0 +1 @@
+MD5 ac1c2cfa21e47686e419c2df0f904162 cl-portable-aserve_1.2.35+cvs.2004.08.04.tar.gz 775511
diff --git a/dev-lisp/cl-rsm-fuzzy/ChangeLog b/dev-lisp/cl-rsm-fuzzy/ChangeLog
index 05882ae155a4..b0559d92265c 100644
--- a/dev-lisp/cl-rsm-fuzzy/ChangeLog
+++ b/dev-lisp/cl-rsm-fuzzy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lisp/cl-rsm-fuzzy
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-rsm-fuzzy/ChangeLog,v 1.3 2004/06/24 23:52:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-rsm-fuzzy/ChangeLog,v 1.4 2004/08/07 05:22:07 mkennedy Exp $
+
+*cl-rsm-fuzzy-1.2-r2 (06 Aug 2004)
+
+  06 Aug 2004; <mkennedy@gentoo.org> +files/1.2-format-args-gentoo.patch,
+  +cl-rsm-fuzzy-1.2-r2.ebuild:
+  Add format argument count fix
 
 *cl-rsm-fuzzy-1.2-r1 (12 Feb 2004)
 
diff --git a/dev-lisp/cl-rsm-fuzzy/Manifest b/dev-lisp/cl-rsm-fuzzy/Manifest
index b856a437b7f1..d4182c2532ea 100644
--- a/dev-lisp/cl-rsm-fuzzy/Manifest
+++ b/dev-lisp/cl-rsm-fuzzy/Manifest
@@ -1,6 +1,10 @@
+MD5 98143d1b4c482d0749e2e8990ec56628 cl-rsm-fuzzy-1.2-r2.ebuild 846
 MD5 b42a564cb6c795b6365f7211acc8cf9c cl-rsm-fuzzy-1.2-r1.ebuild 757
+MD5 b42a564cb6c795b6365f7211acc8cf9c cl-rsm-fuzzy-1.2-r2.ebuild~ 757
 MD5 46fe26454ba674194b69761e3c8b5adf cl-rsm-fuzzy-1.2.ebuild 884
 MD5 0eda22b345256ec594a0d608f170c9af ChangeLog 555
 MD5 9b65b0341efc8f4b29498aad23315229 metadata.xml 164
 MD5 f2cf50c6edec9c52df2c8f01004700b4 files/digest-cl-rsm-fuzzy-1.2 67
+MD5 cc6f5f5e1d5aa1fb27238bfb2fedc6bc files/1.2-format-args-gentoo.patch 587
 MD5 f2cf50c6edec9c52df2c8f01004700b4 files/digest-cl-rsm-fuzzy-1.2-r1 67
+MD5 f2cf50c6edec9c52df2c8f01004700b4 files/digest-cl-rsm-fuzzy-1.2-r2 67
diff --git a/dev-lisp/cl-rsm-fuzzy/cl-rsm-fuzzy-1.2-r2.ebuild b/dev-lisp/cl-rsm-fuzzy/cl-rsm-fuzzy-1.2-r2.ebuild
new file mode 100644
index 000000000000..8c99db1d0608
--- /dev/null
+++ b/dev-lisp/cl-rsm-fuzzy/cl-rsm-fuzzy-1.2-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-rsm-fuzzy/cl-rsm-fuzzy-1.2-r2.ebuild,v 1.1 2004/08/07 05:22:07 mkennedy Exp $
+
+inherit common-lisp eutils
+
+DESCRIPTION="R. Scott McIntire's Common Lisp Fuzzy Logic Library"
+HOMEPAGE="http://packages.debian.org/unstable/devel/cl-rsm-fuzzy.html"
+SRC_URI="http://ftp.debian.org/debian/pool/main/c/cl-rsm-fuzzy/cl-rsm-fuzzy_${PV}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+DEPEND="dev-lisp/common-lisp-controller
+	virtual/commonlisp "
+
+CLPACKAGE=rsm-fuzzy
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PV}-format-args-gentoo.patch
+}
+
+src_install() {
+	common-lisp-install *.lisp *.asd
+	common-lisp-system-symlink
+	dodoc copying copyright
+	dohtml *.html *.jpg
+	do-debian-credits
+}
diff --git a/dev-lisp/cl-rsm-fuzzy/files/1.2-format-args-gentoo.patch b/dev-lisp/cl-rsm-fuzzy/files/1.2-format-args-gentoo.patch
new file mode 100644
index 000000000000..7b89e0702329
--- /dev/null
+++ b/dev-lisp/cl-rsm-fuzzy/files/1.2-format-args-gentoo.patch
@@ -0,0 +1,13 @@
+diff -u cl-rsm-fuzzy-1.2.orig/check.lisp cl-rsm-fuzzy-1.2/check.lisp
+--- cl-rsm-fuzzy-1.2.orig/check.lisp	2003-09-11 12:29:29.000000000 -0500
++++ cl-rsm-fuzzy-1.2/check.lisp	2004-08-06 11:27:33.632557472 -0500
+@@ -31,7 +31,7 @@
+           (unless (and (>= y 0.0)
+                        (<= y 1.0))
+             (return (values nil (format nil "~s has a y coordinate that is 
+-not in the range [0,1]."))))))
++not in the range [0,1]." func-spec))))))
+       pairs)))
+ 
+ (defun check-special-func (func-spec)
+Common subdirectories: cl-rsm-fuzzy-1.2.orig/debian and cl-rsm-fuzzy-1.2/debian
diff --git a/dev-lisp/cl-rsm-fuzzy/files/digest-cl-rsm-fuzzy-1.2-r2 b/dev-lisp/cl-rsm-fuzzy/files/digest-cl-rsm-fuzzy-1.2-r2
new file mode 100644
index 000000000000..814e53daba2d
--- /dev/null
+++ b/dev-lisp/cl-rsm-fuzzy/files/digest-cl-rsm-fuzzy-1.2-r2
@@ -0,0 +1 @@
+MD5 ffb9039bfe63bab58474f7ed6fd5179a cl-rsm-fuzzy_1.2.tar.gz 13739
diff --git a/dev-lisp/cl-rsm-string/ChangeLog b/dev-lisp/cl-rsm-string/ChangeLog
index c2d9a68a1172..f956e284dbea 100644
--- a/dev-lisp/cl-rsm-string/ChangeLog
+++ b/dev-lisp/cl-rsm-string/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lisp/cl-rsm-string
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-rsm-string/ChangeLog,v 1.3 2004/06/24 23:54:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-rsm-string/ChangeLog,v 1.4 2004/08/07 05:22:07 mkennedy Exp $
+
+  06 Aug 2004; <mkennedy@gentoo.org> +files/1.3-ftype-gentoo.patch,
+  cl-rsm-string-1.3.ebuild:
+  Resolves build error due to invalid ftype declaimations
 
 *cl-rsm-string-1.3 (12 Feb 2004)
 
diff --git a/dev-lisp/cl-rsm-string/cl-rsm-string-1.3.ebuild b/dev-lisp/cl-rsm-string/cl-rsm-string-1.3.ebuild
index d0606a7036c0..1710025a1321 100644
--- a/dev-lisp/cl-rsm-string/cl-rsm-string-1.3.ebuild
+++ b/dev-lisp/cl-rsm-string/cl-rsm-string-1.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-rsm-string/cl-rsm-string-1.3.ebuild,v 1.3 2004/07/14 16:07:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-rsm-string/cl-rsm-string-1.3.ebuild,v 1.4 2004/08/07 05:22:07 mkennedy Exp $
 
-inherit common-lisp
+inherit common-lisp eutils
 
 DESCRIPTION="R. Scott McIntire's Common Lisp String Library"
 HOMEPAGE="http://packages.debian.org/unstable/devel/cl-rsm-string.html"
@@ -16,6 +16,11 @@ DEPEND="dev-lisp/common-lisp-controller
 
 CLPACKAGE=rsm-string
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PV}-ftype-gentoo.patch
+}
+
 src_install() {
 	common-lisp-install *.lisp *.asd
 	common-lisp-system-symlink
diff --git a/dev-lisp/cl-rsm-string/files/1.3-ftype-gentoo.patch b/dev-lisp/cl-rsm-string/files/1.3-ftype-gentoo.patch
new file mode 100644
index 000000000000..aae3b62e1e79
--- /dev/null
+++ b/dev-lisp/cl-rsm-string/files/1.3-ftype-gentoo.patch
@@ -0,0 +1,27 @@
+Common subdirectories: cl-rsm-string-1.3.orig/debian and cl-rsm-string-1.3/debian
+Only in cl-rsm-string-1.3: package.x86f
+Only in cl-rsm-string-1.3: semantic.cache
+diff -u cl-rsm-string-1.3.orig/string.lisp cl-rsm-string-1.3/string.lisp
+--- cl-rsm-string-1.3.orig/string.lisp	2003-10-22 21:35:29.000000000 -0500
++++ cl-rsm-string-1.3/string.lisp	2004-08-06 23:02:18.627475008 -0500
+@@ -75,8 +75,7 @@
+                      (concatenate 'string s1 join-string s2)) str-list))))
+ 
+ 
+-(declaim (ftype (function ((list string) (list string) 
+-                                         &key function) list)
++(declaim (ftype (function ((or list string) (or list string) &key (:function function)) list)
+                 contains))
+ 
+ (defun contains (str-list elem-list &key (contain-meaning #'some))
+@@ -92,9 +91,6 @@
+       collect str))
+ 
+ 
+-(declaim (ftype (function (list string &key (:unique t)) list)
+-                does-not-contain))
+-
+ (defun does-not-contain (str-list str-elems &key (unique nil))
+   "Return a list of strings from the string list, <str-list>, that do not
+ contain any of the strings from the list of strings <str-elems.> If unique is
+Only in cl-rsm-string-1.3: string.lisp~
diff --git a/dev-lisp/cl-xmls/ChangeLog b/dev-lisp/cl-xmls/ChangeLog
index b76c29266530..12cc6b34fee1 100644
--- a/dev-lisp/cl-xmls/ChangeLog
+++ b/dev-lisp/cl-xmls/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lisp/cl-xmls
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-xmls/ChangeLog,v 1.4 2004/06/24 23:57:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-xmls/ChangeLog,v 1.5 2004/08/07 05:22:07 mkennedy Exp $
+
+*cl-xmls-1.1 (06 Aug 2004)
+
+  06 Aug 2004; <mkennedy@gentoo.org> +files/1.1-gentoo.patch,
+  +cl-xmls-1.1.ebuild:
+  New upstream version
 
 *cl-xmls-1.0 (12 Feb 2004)
 
diff --git a/dev-lisp/cl-xmls/Manifest b/dev-lisp/cl-xmls/Manifest
index f337b897bea9..7b1f433730be 100644
--- a/dev-lisp/cl-xmls/Manifest
+++ b/dev-lisp/cl-xmls/Manifest
@@ -1,6 +1,8 @@
-MD5 0ff21379f6f6c21e38f37d62db551417 cl-xmls-0.5.ebuild 1107
 MD5 c6e288f5b7a18e2152467cf59d3625cd cl-xmls-1.0.ebuild 803
+MD5 0ff21379f6f6c21e38f37d62db551417 cl-xmls-0.5.ebuild 1107
+MD5 c6e288f5b7a18e2152467cf59d3625cd cl-xmls-1.1.ebuild 803
 MD5 b0a358bb0bb40e0167a0cae90ac754e9 ChangeLog 524
 MD5 9b65b0341efc8f4b29498aad23315229 metadata.xml 164
 MD5 50b382413f1eddb1ca8b761b8a67a191 files/digest-cl-xmls-0.5 59
 MD5 5a23e50e28364947eb383d843e21a0e0 files/digest-cl-xmls-1.0 59
+MD5 54479a35d9599e94ab6bb779ee16e735 files/digest-cl-xmls-1.1 59
diff --git a/dev-lisp/cl-xmls/cl-xmls-1.1.ebuild b/dev-lisp/cl-xmls/cl-xmls-1.1.ebuild
new file mode 100644
index 000000000000..5713cca5f234
--- /dev/null
+++ b/dev-lisp/cl-xmls/cl-xmls-1.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-xmls/cl-xmls-1.1.ebuild,v 1.1 2004/08/07 05:22:07 mkennedy Exp $
+
+inherit common-lisp
+
+DESCRIPTION="XMLS is a small, simple, non-validating XML parser for Common Lisp."
+HOMEPAGE="http://www.common-lisp.net/project/xmls/
+	http://www.cliki.net/xmls"
+SRC_URI="http://www.common-lisp.net/project/xmls/xmls-${PV}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+DEPEND="dev-lisp/common-lisp-controller
+	virtual/commonlisp"
+
+CLPACKAGE=xmls
+
+S=${WORKDIR}/xmls-${PV}
+
+src_install() {
+	common-lisp-install *.lisp *.asd
+	common-lisp-system-symlink
+	dodoc Changelog COPYING
+	dohtml README.html
+	cp -r tests ${D}/usr/share/doc/${P}/
+	dodoc run-tests.sh
+}
diff --git a/dev-lisp/cl-xmls/files/1.1-gentoo.patch b/dev-lisp/cl-xmls/files/1.1-gentoo.patch
new file mode 100644
index 000000000000..bb4724e7944c
--- /dev/null
+++ b/dev-lisp/cl-xmls/files/1.1-gentoo.patch
@@ -0,0 +1,17 @@
+diff -u xmls-1.1.orig/xmls.lisp xmls-1.1/xmls.lisp
+--- xmls-1.1.orig/xmls.lisp	2004-07-16 11:32:10.000000000 -0500
++++ xmls-1.1/xmls.lisp	2004-08-06 23:45:36.448546176 -0500
+@@ -12,7 +12,10 @@
+ (defvar *strip-comments* t)
+ (defvar *compress-whitespace* t)
+ (defvar *test-verbose* nil)
+-(defvar *whitespace* (remove-duplicates '(#\Newline #\Space #\Tab #\Return #\Linefeed)))
++
++(eval-when (:execute :load-toplevel :compile-toplevel)
++  (defvar *whitespace* (remove-duplicates '(#\Newline #\Space #\Tab #\Return #\Linefeed))))
++
+ (defvar *entities*
+   #(("lt;" #\<)
+
+     ("gt;" #\>)
+
diff --git a/dev-lisp/cl-xmls/files/digest-cl-xmls-1.1 b/dev-lisp/cl-xmls/files/digest-cl-xmls-1.1
new file mode 100644
index 000000000000..c1448701dbc4
--- /dev/null
+++ b/dev-lisp/cl-xmls/files/digest-cl-xmls-1.1
@@ -0,0 +1 @@
+MD5 17181ffea88cf9885fcd897eeb8c570d xmls-1.1.tar.gz 58173
diff --git a/dev-lisp/cmucl-source/ChangeLog b/dev-lisp/cmucl-source/ChangeLog
index 9805bc5a5a81..11d7a0db5533 100644
--- a/dev-lisp/cmucl-source/ChangeLog
+++ b/dev-lisp/cmucl-source/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lisp/cmucl-source
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl-source/ChangeLog,v 1.6 2004/06/24 23:58:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl-source/ChangeLog,v 1.7 2004/08/07 05:22:07 mkennedy Exp $
+
+*cmucl-source-19a (04 Aug 2004)
+
+  04 Aug 2004; <mkennedy@gentoo.org> metadata.xml,
+  +files/19a/cmucl-hemlock-dict.asd-gentoo.patch, +cmucl-source-19a.ebuild:
+  New upstream version; Disabled Hemlock build for now
 
   09 May 2004; David Holm <dholm@gentoo.org> cmucl-source-18e-r1.ebuild:
   Added to ~ppc.
diff --git a/dev-lisp/cmucl-source/Manifest b/dev-lisp/cmucl-source/Manifest
index 0a5e12650164..5c783fe02497 100644
--- a/dev-lisp/cmucl-source/Manifest
+++ b/dev-lisp/cmucl-source/Manifest
@@ -1,12 +1,15 @@
-MD5 dc91cdc62673361827b1a528531ba4f1 cmucl-source-18e-r1.ebuild 3719
-MD5 f2f722d896b483ffdcb12245780b0b8d cmucl-source-18e.ebuild 3827
+MD5 7b8709e878f6a74ad156ba2504b0a8c5 cmucl-source-19a.ebuild 3835
 MD5 751a5c6310b5648dd59cd80147b9ea4b ChangeLog 895
+MD5 dc91cdc62673361827b1a528531ba4f1 cmucl-source-19a.ebuild~ 3719
+MD5 f2f722d896b483ffdcb12245780b0b8d cmucl-source-18e.ebuild 3827
 MD5 9b65b0341efc8f4b29498aad23315229 metadata.xml 164
-MD5 55551099176b91bd666738dcc3756567 files/README.Gentoo 101
+MD5 dc91cdc62673361827b1a528531ba4f1 cmucl-source-18e-r1.ebuild 3719
 MD5 3cba8e74f04c00a75fb8e627f8a57cd0 files/digest-cmucl-source-18e-r1 64
+MD5 55551099176b91bd666738dcc3756567 files/README.Gentoo 101
+MD5 a616bd780d0083fd10fd8cf864893922 files/digest-cmucl-source-19a 166
 MD5 cd85f34179d59ca41fd56a14e128a172 files/digest-cmucl-source-18e 132
 MD5 e8fbf46060a4b34c2af436f4d7260659 files/18e/cmucl-hemlock.asd 1172
+MD5 cbfea0df443b7ce766675adad10521ee files/18e/cmucl-graystream.asd 236
 MD5 00e9950079195f32bd8e166ed8ec3d1b files/18e/cmucl-hemlock-base.asd 4797
 MD5 82b830be1f53ddd028474547d38d6c2e files/18e/cmucl-hemlock-dict.asd 1594
 MD5 f163ffcc663ab2dd03957e18f104b9a4 files/18e/cmucl-clx.asd 1183
-MD5 cbfea0df443b7ce766675adad10521ee files/18e/cmucl-graystream.asd 236
diff --git a/dev-lisp/cmucl-source/cmucl-source-19a.ebuild b/dev-lisp/cmucl-source/cmucl-source-19a.ebuild
new file mode 100644
index 000000000000..2634780ebf30
--- /dev/null
+++ b/dev-lisp/cmucl-source/cmucl-source-19a.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl-source/cmucl-source-19a.ebuild,v 1.1 2004/08/07 05:22:07 mkennedy Exp $
+
+inherit common-lisp eutils
+
+DEB_PV=1
+MY_PV=${PV}-release-20040728
+
+DESCRIPTION="Source code for CMUCL, with CLX, Gray Streams and Hemlock for CMUCL"
+HOMEPAGE="http://packages.debian.org/unstable/devel/cmucl-source.html"
+SRC_URI="http://ftp.debian.org/debian/pool/main/c/cmucl/cmucl_${MY_PV}.orig.tar.gz
+	http://ftp.debian.org/debian/pool/main/c/cmucl/cmucl_${MY_PV}-${DEB_PV}.diff.gz"
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+DEPEND="dev-lisp/common-lisp-controller
+	dev-lisp/cl-asdf
+	virtual/commonlisp"
+
+S=${WORKDIR}/cmucl-${MY_PV}.orig
+
+CLPACKAGE="cmucl-clx cmucl-graystream cmucl-hemlock"
+
+ASDF_DIR=${S}/own-work
+
+src_unpack() {
+	unpack ${A}
+	epatch cmucl_${MY_PV}-${DEB_PV}.diff
+	epatch ${FILESDIR}/${PV}/cmucl-hemlock-dict.asd-gentoo.patch
+}
+
+src_install() {
+	dodir /usr/share/common-lisp/source/cmucl
+	(cd src ; find . -name \*.lisp -and -type f | tar --create --file=- --files-from=- ) |\
+		tar --extract --file=- -C ${D}/usr/share/common-lisp/source/cmucl
+	dodir /usr/share/common-lisp/systems
+
+	# CMUCL-GRAYSTREAM
+	insinto /usr/share/common-lisp/source/cmucl-graystream
+	doins src/pcl/gray-streams* ${ASDF_DIR}/cmucl-graystream.asd
+	dosym /usr/share/common-lisp/source/cmucl-graystream/cmucl-graystream.asd \
+		/usr/share/common-lisp/systems/
+
+	# CMUCL-CLX
+	insinto /usr/share/common-lisp/source/cmucl-clx
+	cp -r src/clx/*.lisp ${ASDF_DIR}/cmucl-clx.asd \
+		src/code/clx-ext.lisp \
+		src/hemlock/charmacs.lisp \
+		src/hemlock/key-event.lisp \
+		src/hemlock/keysym-defs.lisp \
+		${D}/usr/share/common-lisp/source/cmucl-clx
+	insinto /usr/share/common-lisp/source/cmucl-clx/debug
+	doins src/clx/debug/*.lisp
+	insinto /usr/share/common-lisp/source/cmucl-clx/demo
+	doins src/clx/demo/*.lisp
+	insinto /usr/share/common-lisp/source/cmucl-clx/test
+	doins src/clx/test/*.lisp
+#	find ${D}/usr/share/common-lisp/source/cmucl-clx -type f -print0 | xargs -0 chmod 644
+#	find ${D}/usr/share/common-lisp/source/cmucl-clx -type d -print0 | xargs -0 chmod 755
+	dosym /usr/share/common-lisp/source/cmucl-clx/cmucl-clx.asd \
+		/usr/share/common-lisp/systems/
+
+#	# CMUCL-HEMLOCK
+#	insinto /usr/share/common-lisp/source/cmucl-hemlock
+#	doins src/hemlock/*.lisp \
+#		src/hemlock/XKeysymDB \
+#		src/hemlock/compilation.order \
+#		src/hemlock/hemlock.log \
+#		src/hemlock/hemlock.upd \
+#		src/hemlock/hemlock11.cursor \
+#		src/hemlock/hemlock11.mask \
+#		src/hemlock/mh-scan \
+#		src/hemlock/notes.txt \
+#		src/hemlock/perq-hemlock.log \
+#		src/hemlock/spell-dictionary.text \
+#		src/hemlock/things-to-do.txt \
+#		${ASDF_DIR}/cmucl-hemlock*.asd
+#	for asdf in hemlock \
+#		hemlock-base \
+#		hemlock-dict; do
+#	  dosym /usr/share/common-lisp/source/cmucl-hemlock/cmucl-${asdf}.asd \
+#		  /usr/share/common-lisp/systems/cmucl-${asdf}.asd
+#	done
+
+	insinto /usr/share/doc/${PF}/clx
+	gzip own-work/clx/*.ps
+	doins own-work/clx/*.{ps.gz,el} own-work/clx/README* # own-work/clx/Makefile
+	insinto /usr/share/doc/${PF}/clx/clxman
+	doins own-work/clx/clxman/*
+	chown -R root:root ${D}/usr/share/common-lisp/source/
+}
+
+pkg_postinst() {
+	/usr/sbin/register-common-lisp-source cmucl-graystream
+	/usr/sbin/register-common-lisp-source cmucl-clx
+#	/usr/sbin/register-common-lisp-source cmucl-hemlock
+}
+
+pkg_prerm() {
+	/usr/sbin/unregister-common-lisp-source cmucl-graystream
+	/usr/sbin/unregister-common-lisp-source cmucl-clx
+#	/usr/sbin/unregister-common-lisp-source cmucl-hemlock
+}
diff --git a/dev-lisp/cmucl-source/files/19a/cmucl-hemlock-dict.asd-gentoo.patch b/dev-lisp/cmucl-source/files/19a/cmucl-hemlock-dict.asd-gentoo.patch
new file mode 100644
index 000000000000..b1aacff984a9
--- /dev/null
+++ b/dev-lisp/cmucl-source/files/19a/cmucl-hemlock-dict.asd-gentoo.patch
@@ -0,0 +1,22 @@
+diff -ur cmucl-19a-release-20040728.orig.orig/own-work/cmucl-hemlock-dict.asd cmucl-19a-release-20040728.orig/own-work/cmucl-hemlock-dict.asd
+--- cmucl-19a-release-20040728.orig.orig/own-work/cmucl-hemlock-dict.asd	2004-08-03 10:49:24.000000000 -0500
++++ cmucl-19a-release-20040728.orig/own-work/cmucl-hemlock-dict.asd	2004-08-03 22:02:01.490752840 -0500
+@@ -7,7 +7,7 @@
+ 
+ #+cmu
+ (eval-when (:load-toplevel :compile-toplevel :execute)
+-  (defun user::hemlock-compile-dictionary (source-file
++  (defun cl-user::hemlock-compile-dictionary (source-file
+                                            &rest rest
+                                            &key
+                                            output-file
+@@ -35,7 +35,7 @@
+ 	(list list)))
+ #+cmu
+ (defmethod perform ((op compile-op) (c dictionary-source-file))
+-  (user::hemlock-compile-dictionary (component-pathname c)
++  (cl-user::hemlock-compile-dictionary (component-pathname c)
+ 				   :output-file (car (output-files op c))))
+ 
+ (defmethod perform ((op load-op) (c dictionary-source-file))
+
diff --git a/dev-lisp/cmucl-source/files/digest-cmucl-source-19a b/dev-lisp/cmucl-source/files/digest-cmucl-source-19a
new file mode 100644
index 000000000000..0902aa2155b5
--- /dev/null
+++ b/dev-lisp/cmucl-source/files/digest-cmucl-source-19a
@@ -0,0 +1,2 @@
+MD5 6b37fe4815935af73f0efd1312e6a969 cmucl_19a-release-20040728.orig.tar.gz 4456803
+MD5 a1b0e25d77646e6f83a0c723f2e46b14 cmucl_19a-release-20040728-1.diff.gz 1500168
diff --git a/dev-lisp/cmucl-source/metadata.xml b/dev-lisp/cmucl-source/metadata.xml
index f418045b09c8..000c0ccd3e5a 100644
--- a/dev-lisp/cmucl-source/metadata.xml
+++ b/dev-lisp/cmucl-source/metadata.xml
@@ -2,4 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>common-lisp</herd>
+<longdescription>
+  These are the CMUCL sources, provided so that the debugger can show
+  useful source information at appropriate times.  This version
+  includes common-lisp-controller compatible replacements for Gray
+  Streams, CLX and Hemlock.
+</longdescription>
 </pkgmetadata>
diff --git a/dev-lisp/cmucl/Manifest b/dev-lisp/cmucl/Manifest
index 8b973b6d0b90..4e47b62765a5 100644
--- a/dev-lisp/cmucl/Manifest
+++ b/dev-lisp/cmucl/Manifest
@@ -1,16 +1,18 @@
-MD5 8f0849ab792a63ef81e036ee02f636e6 cmucl-18e-r2.ebuild 3195
 MD5 b93215965e34d54ca6e9fd5431bac594 cmucl-18e-r4.ebuild 2888
+MD5 4ff684176feb40c39ed5d5929f1422cb cmucl-19a.ebuild 3081
 MD5 637141c1d7519ba02ab16ba8073f86f4 cmucl-18e-r1.ebuild 3327
-MD5 485e34143c90280ddfaacdc2309ffe35 cmucl-18e.ebuild 2669
-MD5 294fa84eedbaa4115ecc5c47200f48cc ChangeLog 1746
 MD5 29904b2e98286ec168bc9c87b0f3b0ac cmucl-18e-r3.ebuild 3411
+MD5 8f0849ab792a63ef81e036ee02f636e6 cmucl-18e-r2.ebuild 3195
+MD5 294fa84eedbaa4115ecc5c47200f48cc ChangeLog 1746
+MD5 485e34143c90280ddfaacdc2309ffe35 cmucl-18e.ebuild 2669
 MD5 929688a2167434e2a4f0169de47e7428 metadata.xml 1107
-MD5 3e3791768309ef2b15c4e342b300980b files/digest-cmucl-18e 205
-MD5 3e3791768309ef2b15c4e342b300980b files/digest-cmucl-18e-r1 205
-MD5 df309c5d109052b9c57d79bb4aac5871 files/digest-cmucl-18e-r2 137
 MD5 df309c5d109052b9c57d79bb4aac5871 files/digest-cmucl-18e-r3 137
+MD5 3e3791768309ef2b15c4e342b300980b files/digest-cmucl-18e 205
 MD5 df309c5d109052b9c57d79bb4aac5871 files/digest-cmucl-18e-r4 137
+MD5 e42b98430cb83b99c437195f3667196d files/digest-cmucl-19a 239
+MD5 df309c5d109052b9c57d79bb4aac5871 files/digest-cmucl-18e-r2 137
+MD5 3e3791768309ef2b15c4e342b300980b files/digest-cmucl-18e-r1 205
+MD5 997a2bfdcd98bc978f6c3b79ba8f2264 files/18e/README.Gentoo 848
+MD5 190f38f6f6f33f3e1ceee848d2583573 files/18e/site-init.lisp.in 1935
 MD5 379cf3aca883a7097c0410f96be55378 files/18e/install-clc.lisp-gentoo.patch 1294
 MD5 306ba9e5615290fb688a46f7c0efdc07 files/18e/herald-save.lisp-gentoo.patch 751
-MD5 190f38f6f6f33f3e1ceee848d2583573 files/18e/site-init.lisp.in 1935
-MD5 997a2bfdcd98bc978f6c3b79ba8f2264 files/18e/README.Gentoo 848
diff --git a/dev-lisp/cmucl/cmucl-19a.ebuild b/dev-lisp/cmucl/cmucl-19a.ebuild
new file mode 100644
index 000000000000..d5604f24da21
--- /dev/null
+++ b/dev-lisp/cmucl/cmucl-19a.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-19a.ebuild,v 1.1 2004/08/07 05:22:07 mkennedy Exp $
+
+inherit common-lisp-common eutils
+
+DEB_PV=1
+MY_PV=${PV}-release-20040728
+
+DESCRIPTION="CMU Common Lisp is an implementation of ANSI Common Lisp"
+HOMEPAGE="http://www.cons.org/cmucl/
+	http://packages.debian.org/unstable/devel/cmucl.html"
+SRC_URI="http://ftp.debian.org/debian/pool/main/c/cmucl/cmucl_${MY_PV}.orig.tar.gz
+	http://ftp.debian.org/debian/pool/main/c/cmucl/cmucl_${MY_PV}-${DEB_PV}.diff.gz
+	ftp://ftp.common-lisp.net/pub/project/cmucl/release/${PV}/${PN}-${PV}-x86-linux.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="doc lesstif"
+
+DEPEND="dev-lisp/common-lisp-controller
+	doc? ( virtual/tetex )
+	lesstif? ( x11-libs/lesstif )
+	!lesstif? ( x11-libs/openmotif )"
+
+PROVIDE="virtual/commonlisp"
+
+S=${WORKDIR}/cmucl-${MY_PV}.orig
+
+src_unpack() {
+	unpack ${A}
+	epatch cmucl_${MY_PV}-${DEB_PV}.diff
+	epatch ${FILESDIR}/${PV}/herald-save.lisp-gentoo.patch
+}
+
+src_compile() {
+	# non-x86 maintainers, add to the the following and verify
+
+	if use lesstif || test -d /usr/X11R6/include/lesstif; then
+		sed -i -e 's,-I/usr/X11R6/include,-I/usr/X11R6/include/lesstif,g' \
+			-e 's,-L/usr/X11R6/lib,-L/usr/X11R6/lib/lesstif -L/usr/X11R6/lib,g' \
+			src/motif/server/Config.x86
+	fi
+
+	PATH=${WORKDIR}/bin:$PATH CMUCLCORE=${WORKDIR}/lib/cmucl/lib/lisp.core make || die
+
+	if use doc; then
+		make -C src/docs
+	fi
+}
+
+src_install() {
+	insinto /usr/lib/cmucl/include
+	doins src/lisp/*.h target/lisp/*.h target/lisp/*.map target/lisp/*.nm
+	insinto /usr/lib/cmucl
+	cp target/lisp/lisp.core lisp-dist.core
+	doins lisp-dist.core
+
+	dodoc target/lisp/lisp.{nm,map}
+	doman src/general-info/{cmucl,lisp}.1
+
+	dobin target/lisp/lisp
+	dobin own-work/Demos/lisp-start
+
+	insinto /usr/lib/cmucl
+	doins ${FILESDIR}/${PV}/install-clc.lisp
+	exeinto /usr/lib/common-lisp/bin
+	cp own-work/cmucl-script.sh cmucl.sh
+	doexe cmucl.sh
+
+	insinto /etc/common-lisp/cmucl
+	sed "s,@PF@,${PF},g" <${FILESDIR}/${PV}/site-init.lisp.in >site-init.lisp
+	doins site-init.lisp
+	dosym /etc/common-lisp/cmucl/site-init.lisp /usr/lib/cmucl/site-init.lisp
+
+	dodir /etc/env.d
+	cat >${D}/etc/env.d/50cmucl <<EOF
+# CMUCLLIB=/usr/lib/cmucl
+EOF
+	[ -f /etc/lisp-config.lisp ] || touch ${D}/etc/lisp-config.lisp
+
+	insinto /usr/share/doc/${P}/html/Basic-tutorial
+	doins own-work/tutorials/Basic-tutorial/*
+	insinto /usr/share/doc/${P}/html/Clos
+	doins own-work/tutorials/Clos/*
+	docinto notes
+	dodoc own-work/tutorials/notes/*
+
+	insinto /usr/lib/cmucl
+	doins own-work/hemlock11.*
+
+	if use doc; then
+		dodoc src/docs/*/*.{ps,pdf}
+	fi
+
+	exeinto /usr/lib/cmucl
+	doexe target/motif/server/motifd
+	insinto /usr/lib/cmucl/subsystems/
+	doins target/interface/clm-library.x86f
+
+	keepdir /usr/lib/common-lisp/cmucl
+	impl-save-timestamp-hack cmucl || die
+}
+
+pkg_postinst() {
+	standard-impl-postinst cmucl
+}
+
+pkg_prerm() {
+	standard-impl-postrm cmucl /usr/bin/lisp
+}
diff --git a/dev-lisp/cmucl/files/19a/README.Gentoo b/dev-lisp/cmucl/files/19a/README.Gentoo
new file mode 100644
index 000000000000..885807587fb5
--- /dev/null
+++ b/dev-lisp/cmucl/files/19a/README.Gentoo
@@ -0,0 +1,31 @@
+
+* README.Gentoo -- Gentoo Specific Notes for dev-lisp/cmucl
+
+** About dev-lisp/cmucl 
+
+The dev-lisp/cmucl ebuild in portage aim to provide a port of
+Debian's package of CMUCL.  Thus the Gentoo CMUCL port should be
+binary compatible with the Debian port.
+
+** Linux Miscellaneous Binary Support
+
+You can have your compiled Lisp .x86f files automatically executed
+like any other binary by executing the following command:
+
+  echo ':lisp:E::x86f::/usr/bin/lisp-start:' \
+    >/proc/sys/fs/binfmt_misc/register
+
+Note: you need kernel support for this.  A good place to put the
+above command is in your /etc/conf.d/localstart.
+
+** Credit
+
+This Gentoo package, like many other Gentoo packages in the dev-lisp
+category, benifit from the Debian Project's work.
+
+  -- Matthew Kennedy <mkennedy@gentoo.org>
+
+
+Local Variables: ***
+mode: outline ***
+End: ***
diff --git a/dev-lisp/cmucl/files/19a/herald-save.lisp-gentoo.patch b/dev-lisp/cmucl/files/19a/herald-save.lisp-gentoo.patch
new file mode 100644
index 000000000000..b1a54bfb3ceb
--- /dev/null
+++ b/dev-lisp/cmucl/files/19a/herald-save.lisp-gentoo.patch
@@ -0,0 +1,19 @@
+diff -ur cmucl-19a-release-20040728.orig.orig/src/code/save.lisp cmucl-19a-release-20040728.orig/src/code/save.lisp
+--- cmucl-19a-release-20040728.orig.orig/src/code/save.lisp	2004-06-29 16:24:46.000000000 -0500
++++ cmucl-19a-release-20040728.orig/src/code/save.lisp	2004-08-03 11:18:05.286348696 -0500
+@@ -289,11 +289,9 @@
+ 	))
+ 
+ (setf (getf *herald-items* :bugs)
+-      '("For support see http://www.cons.org/cmucl/support.html Send bug reports to the debian BTS."
+-        terpri
+-	"or to "
+-	"pvaneynd@debian.org" terpri
+-       "type (help) for help, (quit) to exit, and (demo) to see the demos" terpri
++      '("For support see http://www.cons.org/cmucl/support.html" terpri
++	"Send bug reports to http://bugs.gentoo.org" terpri
++	"Type (help) for help or (quit) to exit." terpri
+         terpri
+ 	"Loaded subsystems:"))
+ 
+Only in cmucl-19a-release-20040728.orig/src/code: save.lisp~
diff --git a/dev-lisp/cmucl/files/19a/install-clc.lisp b/dev-lisp/cmucl/files/19a/install-clc.lisp
new file mode 100644
index 000000000000..23642b16ffee
--- /dev/null
+++ b/dev-lisp/cmucl/files/19a/install-clc.lisp
@@ -0,0 +1,55 @@
+;;; -*- Mode: LISP; Package: CL-USER -*-
+;;;
+;;; Copyright Peter Van Eynde, 2001
+;;;
+;;; License: LGPL v2
+;;;
+(in-package "COMMON-LISP-USER")
+
+(unless (ignore-errors
+          (load "/usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp"))
+  (unix:unix-exit 1))
+
+;; (unless (ignore-errors
+          (common-lisp-controller:init-common-lisp-controller 
+           "/usr/lib/common-lisp/cmucl/"
+           :version 3)
+;;           t)
+;;   (format t "~%Error during init of common-lisp-controller~%")
+;;   (unix:unix-exit 1))
+
+(in-package :common-lisp-controller)
+
+(defun send-clc-command (command package)
+  (let ((process
+         (ext:run-program "/usr/bin/clc-send-command"
+                          (list
+                           (ecase command
+                             (:recompile "recompile")
+                             (:remove "remove"))
+                           (format nil "~A" package)
+			   "cmucl"
+                           "--quiet")
+                          :wait t)))
+    (if (= (ext:process-exit-code process)
+           0)
+        ;; no error
+        (values)
+        (error "An error happend during ~A of ~A for ~A~%Please see /usr/share/doc/common-lisp-controller/REPORTING-BUGS.gz"
+               (ecase command
+                 (:recompile "recompilation")
+                 (:remove "removal"))
+               package
+	       "cmucl"))))
+
+(in-package "COMMON-LISP-USER")
+
+(unless (ignore-errors
+          ;; it loaded, configure it for common-lisp-controller use:
+          (format t "~%Saving to new-lisp.core...")
+          (ext:gc :full t)       
+          (setf ext:*batch-mode* nil)
+          (ext:save-lisp "new-lisp.core" 
+                         :purify t))
+  (unix:unix-exit 1))
+
diff --git a/dev-lisp/cmucl/files/19a/site-init.lisp.in b/dev-lisp/cmucl/files/19a/site-init.lisp.in
new file mode 100644
index 000000000000..ad145414ca43
--- /dev/null
+++ b/dev-lisp/cmucl/files/19a/site-init.lisp.in
@@ -0,0 +1,58 @@
+;;; -*- Mode: Lisp; Package: System -*-
+;;;
+;;; **********************************************************************
+;;; This code was written as part of the CMU Common Lisp project at
+;;; Carnegie Mellon University, and has been placed in the public domain.
+;;;
+
+;;; Heavy modifications by Peter Van Eynde
+
+;;; More modifications for Gentoo by Matthew Kennedy
+;;; <mkennedy@gentoo.org>
+
+(in-package "SYSTEM")
+
+(if (probe-file "/etc/lisp-config.lisp")
+    (load "/etc/lisp-config.lisp")
+  (format t "~%;;; Warning: There is no /etc/lisp-config.lisp file (which should have been created during emerge"))
+
+;;; If you have sources installed on your system, un-comment the following form
+;;; and change it to point to the source location.  This will allow the Hemlock
+;;; "Edit Definition" command and the debugger to find sources for functions in
+;;; the core.
+(setf (ext:search-list "target:")
+      '(
+        "/usr/share/common-lisp/source/cmucl/"      ; object dir
+        ))
+
+(setf (ext:search-list "library:") '("/usr/lib/cmucl/"))
+;;; for safety...
+
+;;; optional extentions to the lisp image: delete if you
+;;; don't like them :-).
+(in-package :common-lisp-user)
+
+;;; newbie functions, delete if you don't like them
+
+(defun help ()
+  (format t "~
+Welcome to the Gentoo GNU/Linux port of CMUCL.
+
+If you aren't running this with ILISP (see: app-emacs/ilisp or
+app-xemacs/ilisp) in Emacs, or don't intend to use Hemlock
+(see: dev-lisp/cmucl-source) then you deserve to lose. :-)
+
+The CMUCL REPL does not have GNU Readline-like support, however
+you may wish to install rlwap (see: app-misc/rlwrap) to achieve
+the same effect.
+
+If you think you found a bug, please use http://bugs.gentoo.org
+
+Read the documentation in /usr/share/doc/@PF@.
+
+(quit)            exit Lisp
+(describe 'foo)   gives information about foo
+(inspect '*foo*)  interactively inspects *foo*
+(apropos \"foo\") briefly describe all symbols which match \"foo\"
+"))
+
diff --git a/dev-lisp/cmucl/files/digest-cmucl-19a b/dev-lisp/cmucl/files/digest-cmucl-19a
new file mode 100644
index 000000000000..02081ab3d5fa
--- /dev/null
+++ b/dev-lisp/cmucl/files/digest-cmucl-19a
@@ -0,0 +1,3 @@
+MD5 6b37fe4815935af73f0efd1312e6a969 cmucl_19a-release-20040728.orig.tar.gz 4456803
+MD5 a1b0e25d77646e6f83a0c723f2e46b14 cmucl_19a-release-20040728-1.diff.gz 1500168
+MD5 8d2afba837c28149944d3edd02af8b86 cmucl-19a-x86-linux.tar.bz2 7237512
diff --git a/dev-lisp/gcl/ChangeLog b/dev-lisp/gcl/ChangeLog
index a3db8bc83449..8158e0025521 100644
--- a/dev-lisp/gcl/ChangeLog
+++ b/dev-lisp/gcl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lisp/gcl
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/ChangeLog,v 1.20 2004/07/12 01:35:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/ChangeLog,v 1.21 2004/08/07 05:22:07 mkennedy Exp $
+
+*gcl-2.6.3 (06 Aug 2004)
+
+  06 Aug 2004; <mkennedy@gentoo.org> gcl-2.6.2.ebuild, +gcl-2.6.3.ebuild:
+  New upstream version; New USE flag: ansi; Support for custreloc on x86 and
+  sparc
 
   11 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> gcl-2.6.2.ebuild:
   fix readline dep
diff --git a/dev-lisp/gcl/Manifest b/dev-lisp/gcl/Manifest
index 9874da1d9c27..e3b3f0ec3a75 100644
--- a/dev-lisp/gcl/Manifest
+++ b/dev-lisp/gcl/Manifest
@@ -1,12 +1,14 @@
-MD5 196cbd87ad6f63e326a284d284f782e4 gcl-2.6.2.ebuild 2054
-MD5 845b5ed2b1a28adf108ab63eecf10058 gcl-2.4.3.ebuild 2122
 MD5 29e92c25f0bc663902efb758e2f7e43d gcl-2.4.0.ebuild 1339
+MD5 e49934a6de2e4499ad1c83eb5e4eed99 gcl-2.6.2.ebuild 1991
+MD5 845b5ed2b1a28adf108ab63eecf10058 gcl-2.4.3.ebuild 2122
 MD5 6e2df427db74fc0608117017db2a77cd gcl-2.5.3.ebuild 1791
+MD5 e49934a6de2e4499ad1c83eb5e4eed99 gcl-2.6.3.ebuild 1991
+MD5 ea024131a545fa4a5fc712bd871b3c42 gcl-2.5.2.ebuild 1570
 MD5 0e1fe4e16eec0552f0ed21d7991b193e ChangeLog 3072
 MD5 9b65b0341efc8f4b29498aad23315229 metadata.xml 164
-MD5 ea024131a545fa4a5fc712bd871b3c42 gcl-2.5.2.ebuild 1570
-MD5 ebf9ac3ed9129b8c967416164e1b8dcf files/digest-gcl-2.4.0 59
+MD5 6d1f14e922df6f4c5dc85add92b3ae45 files/digest-gcl-2.5.3 62
 MD5 156148113705b926d9ef1c4bf5611c80 files/digest-gcl-2.4.3 59
+MD5 56a2d3ad5e0c6efc29def8d13cae414c files/digest-gcl-2.6.3 62
 MD5 0a7011ac48a39981a19619ec9f53e37d files/digest-gcl-2.5.2 62
-MD5 6d1f14e922df6f4c5dc85add92b3ae45 files/digest-gcl-2.5.3 62
+MD5 ebf9ac3ed9129b8c967416164e1b8dcf files/digest-gcl-2.4.0 59
 MD5 7f57744618be8e56d9b86390c5c475c2 files/digest-gcl-2.6.2 62
diff --git a/dev-lisp/gcl/files/digest-gcl-2.6.3 b/dev-lisp/gcl/files/digest-gcl-2.6.3
new file mode 100644
index 000000000000..7418de061b21
--- /dev/null
+++ b/dev-lisp/gcl/files/digest-gcl-2.6.3
@@ -0,0 +1 @@
+MD5 951a6a3ab4431ccf39c068c2201e21e2 gcl-2.6.3.tar.gz 8175908
diff --git a/dev-lisp/gcl/gcl-2.6.2.ebuild b/dev-lisp/gcl/gcl-2.6.2.ebuild
index 25775aaaae40..da599e92acb3 100644
--- a/dev-lisp/gcl/gcl-2.6.2.ebuild
+++ b/dev-lisp/gcl/gcl-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.6.2.ebuild,v 1.2 2004/07/12 01:35:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.6.2.ebuild,v 1.3 2004/08/07 05:22:07 mkennedy Exp $
 
 inherit elisp-common flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.gnu.org/gnu/gcl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-*"					# masked until it is determined app-sci/maxima works with it
+KEYWORDS="-*"
 IUSE="emacs readline debug X tcltk"
 
 DEPEND=">=app-text/texi2html-1.64
@@ -39,7 +39,7 @@ src_compile() {
 		`use_enable debug debug`
 		`use_enable tcltk tkconfig=/usr/lib`
 		`use_enable tcltk tclconfig=/usr/lib`
-		--enable-xdr=no
+		--enable-xdr=yes
 		--enable-ansi
 		--enable-infodir=/usr/share/info
 		--enable-emacsdir=/usr/share/emacs/site-lisp/gcl"
diff --git a/dev-lisp/gcl/gcl-2.6.3.ebuild b/dev-lisp/gcl/gcl-2.6.3.ebuild
new file mode 100644
index 000000000000..44e398d4a939
--- /dev/null
+++ b/dev-lisp/gcl/gcl-2.6.3.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.6.3.ebuild,v 1.1 2004/08/07 05:22:07 mkennedy Exp $
+
+inherit elisp-common flag-o-matic
+
+DESCRIPTION="GNU Common Lisp"
+HOMEPAGE="http://www.gnu.org/software/gcl/gcl.html"
+SRC_URI="ftp://ftp.gnu.org/gnu/gcl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+IUSE="emacs readline debug X tcltk ansi"
+
+DEPEND=">=app-text/texi2html-1.64
+	emacs? ( virtual/emacs )
+	X? ( virtual/x11 )
+	readline? ( sys-libs/readline )
+	>=dev-libs/gmp-4.1
+	virtual/tetex"
+
+src_unpack() {
+	unpack ${A}
+	sed -e "s/gcl-doc/${PF}/g" ${S}/info/makefile > ${T}/makefile
+	mv ${T}/makefile ${S}/info/makefile
+}
+
+src_compile() {
+	local myconfig=""
+
+	# hardened gcc may automatically use PIE building, which does not
+	# work for this package so far
+	filter-flags "-fPIC"
+
+	# See http://www.gnu.org/software/gcl/RELEASE-2.6.2.html
+
+	case ${ARCH} in
+		x86 | sparc)
+			myconfig="${myconfig}
+				--enable-custreloc
+				--disable-dlopen
+				--disable-dynsysbfd
+				--disable-statsysbfd";;
+		*)
+			myconfig="${myconfig}
+				--disable-custreloc
+				--disable-dlopen
+				--enable-dynsysbfd
+				--disable-statsysbfd";;
+	esac
+
+	myconfig="${myconfig}
+		--enable-dynsysgmp
+		`use_enable readline readline`
+		`use_with X x`
+		`use_enable debug debug`
+		`use_enable tcltk tkconfig=/usr/lib`
+		`use_enable tcltk tclconfig=/usr/lib`
+		`use enable ansi ansi`
+		--enable-xdr=no
+		--enable-infodir=/usr/share/info
+		--enable-emacsdir=/usr/share/emacs/site-lisp/gcl"
+	einfo "Configuring with ${myconfig}"
+	econf ${configuration} || die
+	make || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	rm -rf ${D}/usr/lib/${P}/info
+
+	if use emacs ; then
+		mv elisp/add-default.el ${T}/50gcl-gentoo.el
+		elisp-site-file-install ${T}/50gcl-gentoo.el
+		elisp-install ${PN} elisp/*
+	fi
+
+	dosed /usr/bin/gcl
+	fperms 0755 /usr/bin/gcl
+
+	# fix the GCL_TK_DIR=/var/tmp/portage/${P}/image//
+	dosed /usr/lib/${P}/gcl-tk/gcltksrv
+	fperms 0755 /usr/lib/${P}/gcl-tk/gcltksrv
+
+	#repair gcl.exe symlink
+	#rm ${D}/usr/bin/gcl.exe
+	dosym ../lib/${P}/unixport/saved_gcl /usr/bin/gcl.exe
+
+	dodoc readme* RELEASE* ChangeLog* doc/*
+}
+
+pkg_postinst() {
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+
+	use emacs && elisp-site-regen
+}