Package-Manager: portage-2.0.51.19

35 files changed, 43 insertions, 941 deletions

diff --git a/dev-lisp/cl-chemical-compounds/ChangeLog b/dev-lisp/cl-chemical-compounds/ChangeLog
index fd7d31458730..128306d59657 100644
--- a/dev-lisp/cl-chemical-compounds/ChangeLog
+++ b/dev-lisp/cl-chemical-compounds/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lisp/cl-chemical-compounds
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-chemical-compounds/ChangeLog,v 1.1 2005/02/10 22:22:54 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-chemical-compounds/ChangeLog,v 1.2 2005/04/15 19:12:57 mkennedy Exp $
+
+  15 Apr 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  cl-chemical-compounds-1.0.2.ebuild:
+  Keywording ~ppc
 
 *cl-chemical-compounds-1.0.2 (10 Feb 2005)
 
diff --git a/dev-lisp/cl-chemical-compounds/cl-chemical-compounds-1.0.2.ebuild b/dev-lisp/cl-chemical-compounds/cl-chemical-compounds-1.0.2.ebuild
index b40bf8c88c2c..513828ab4792 100644
--- a/dev-lisp/cl-chemical-compounds/cl-chemical-compounds-1.0.2.ebuild
+++ b/dev-lisp/cl-chemical-compounds/cl-chemical-compounds-1.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-chemical-compounds/cl-chemical-compounds-1.0.2.ebuild,v 1.1 2005/02/10 22:22:54 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-chemical-compounds/cl-chemical-compounds-1.0.2.ebuild,v 1.2 2005/04/15 19:12:57 mkennedy Exp $
 
 inherit common-lisp eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://common-lisp.net/project/chemboy/
 SRC_URI="mirror://gentoo/chemical-compounds-${PV}.tar.gz"
 LICENSE="LLGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE=""
 
 DEPEND="dev-lisp/cl-periodic-table"
diff --git a/dev-lisp/cl-clx/cl-clx-0.6.ebuild b/dev-lisp/cl-clx/cl-clx-0.6.ebuild
deleted file mode 100644
index d57ccb1c254a..000000000000
--- a/dev-lisp/cl-clx/cl-clx-0.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-clx/cl-clx-0.6.ebuild,v 1.2 2005/03/18 07:22:47 mkennedy Exp $
-
-inherit common-lisp eutils
-
-DESCRIPTION="Portable CLX"
-HOMEPAGE="http://ftp.linux.org.uk/pub/lisp/sbcl/ http://www.cliki.net/CLX"
-SRC_URI="http://ftp.linux.org.uk/pub/lisp/sbcl/clx_${PV}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE=""
-
-DEPEND="dev-lisp/common-lisp-controller"
-
-CLPACKAGE=clx
-
-S=${WORKDIR}/clx_${PV}
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${PV}-gentoo.patch || die
-}
-
-src_install() {
-	for i in . demo test debug; do
-		insinto /usr/share/common-lisp/source/clx/${i}
-		doins ${S}/${i}/*.lisp
-	done
-	insinto /usr/share/common-lisp/source/clx
-	doins clx.asd
-	common-lisp-system-symlink
-	dodoc CHANGES NEWS README*
-}
diff --git a/dev-lisp/cl-clx/files/0.6-gentoo.patch b/dev-lisp/cl-clx/files/0.6-gentoo.patch
deleted file mode 100644
index 17b133ebb36d..000000000000
--- a/dev-lisp/cl-clx/files/0.6-gentoo.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff -ur clx_0.6.orig/clx.asd clx_0.6/clx.asd
---- clx_0.6.orig/clx.asd	2004-11-16 07:08:26.000000000 -0600
-+++ clx_0.6/clx.asd	2004-12-21 23:24:20.147725033 -0600
-@@ -35,7 +35,7 @@
- (defclass legacy-file (static-file) ())
- 
- (defsystem CLX
--    :depends-on (sb-bsd-sockets)
-+    :depends-on (#+sbcl sb-bsd-sockets)
-     :version "0.6"
-     :serial t
-     :default-component-class clx-source-file
-@@ -89,23 +89,6 @@
- 	      ((:file "image")
- 	       ;; KLUDGE: again, this depends on "zoid"
- 	       (:file "trapezoid")))
--     (:static-file "NEWS")
--     (:static-file "CHANGES")
--     (:static-file "README")
--     (:static-file "README-R5")
--     (:legacy-file "exclMakefile")
--     (:legacy-file "exclREADME")
--     (:legacy-file "exclcmac" :pathname "exclcmac.lisp")
--     (:legacy-file "excldepc" :pathname "excldep.c")
--     (:legacy-file "excldep" :pathname "excldep.lisp")
--     (:legacy-file "sockcl" :pathname "sockcl.lisp")
--     (:legacy-file "socket" :pathname "socket.c")
--     (:legacy-file "defsystem" :pathname "defsystem.lisp")
--     (:legacy-file "provide" :pathname "provide.lisp")
--     (:legacy-file "cmudep" :pathname "cmudep.lisp")
--     (:module manual
--	      ;; TODO: teach asdf how to process texinfo files
--	      :components ((:static-file "clx.texinfo")))
-      (:module debug
- 	      :default-component-class legacy-file
- 	      :components
-diff -ur clx_0.6.orig/depdefs.lisp clx_0.6/depdefs.lisp
---- clx_0.6.orig/depdefs.lisp	2003-06-05 15:18:22.000000000 -0500
-+++ clx_0.6/depdefs.lisp	2004-12-21 23:24:20.149724837 -0600
-@@ -400,10 +400,10 @@
- (eval-when (:compile-toplevel :load-toplevel :execute)
-   ;; FIXME: maybe we should reevaluate this?
-   (defvar *def-clx-class-use-defclass*
--    #+Genera t
-+    #+(or Genera sbcl) t
-     #+(and cmu pcl) '(XLIB:DRAWABLE XLIB:WINDOW XLIB:PIXMAP)
-     #+(and cmu (not pcl)) nil
--    #-(or Genera cmu) nil
-+    #-(or Genera cmu sbcl) nil
-     "Controls whether DEF-CLX-CLASS uses DEFCLASS.
- 
- If it is a list, it is interpreted by DEF-CLX-CLASS to be a list of
-diff -ur clx_0.6.orig/dependent.lisp clx_0.6/dependent.lisp
---- clx_0.6.orig/dependent.lisp	2004-06-11 07:18:17.000000000 -0500
-+++ clx_0.6/dependent.lisp	2004-12-21 23:42:41.387986779 -0600
-@@ -1511,11 +1511,16 @@
- 						  (cdr (host-address host)))
- 			  :foreign-port (+ *x-tcp-port* display)))
- 
--#+(or sbcl ecl)
-+#+(or sbcl ecl CMU)
- (defconstant +X-unix-socket-path+
-   "/tmp/.X11-unix/X"
-   "The location of the X socket")
- 
-+#+(or sbcl ecl CMU)
-+(defconstant +X-tcp-port+
-+  6000
-+  "The TCP port number for X")
-+
- #+sbcl
- (defun open-x-stream (host display protocol)  
-   (declare (ignore protocol)
-@@ -1528,11 +1533,21 @@
-        (let ((host (car (host-ent-addresses (get-host-by-name host)))))
- 	 (when host
- 	   (let ((s (make-instance 'inet-socket :type :stream :protocol :tcp)))
--	     (socket-connect s host (+ 6000 display))
-+	     (socket-connect s host (+ +X-tcp-port+ display))
- 	     s))))
-    :element-type '(unsigned-byte 8)
-    :input t :output t :buffering :none))
- 
-+#+CMU
-+(defun open-x-stream (host display protocol)
-+  (declare (ignore protocol)
-+	   (type (integer 0) display))
-+  (system:make-fd-stream
-+   (if (or (string= host "") (string= host "unix"))
-+       (ext:connect-to-unix-socket (format nil "~A~D" +X-unix-socket-path+ display))
-+       (ext:connect-to-inet-socket host (+ +X-tcp-port+ display)))
-+   :input t :output t :element-type '(unsigned-byte 8)))
-+
- #+ecl
- (defun open-x-stream (host display protocol)
-   (declare (ignore protocol)
-@@ -1541,7 +1556,7 @@
-     (if (or (string= host "") (string= host "unix")) ; AF_UNIX doamin socket
- 	(sys::open-unix-socket-stream
- 	 (format nil "~A~D" +X-unix-socket-path+ display))
--	(si::open-client-stream host (+ 6000 display)))))
-+	(si::open-client-stream host (+ +X-tcp-port+ display)))))
- 
- ;;; BUFFER-READ-DEFAULT - read data from the X stream
- 
-@@ -3092,7 +3107,7 @@
- (defmacro with-underlying-simple-vector 
-     ((variable element-type pixarray) &body body)
-   (declare (ignore element-type))
--  `(#+cmu kernel::with-array-data #+sbcl sb-kernel:with-array-data
-+  `(#+cmu lisp::with-array-data #+sbcl sb-kernel:with-array-data
-     ((,variable ,pixarray) (start) (end))
-     (declare (ignore start end))
-     ,@body))
-@@ -3505,11 +3520,11 @@
- 			     height width)
-   (declare (type array-index source-width sx sy dest-width dx dy height width))
-   #.(declare-buffun)
--  (kernel::with-array-data ((sdata source)
-+  (lisp::with-array-data ((sdata source)
- 				 (sstart)
- 				 (send))
-     (declare (ignore send))
--    (kernel::with-array-data ((ddata dest)
-+    (lisp::with-array-data ((ddata dest)
- 				   (dstart)
- 				   (dend))
-       (declare (ignore dend))
diff --git a/dev-lisp/cl-clx/files/digest-cl-clx-0.6 b/dev-lisp/cl-clx/files/digest-cl-clx-0.6
deleted file mode 100644
index 8bc824de0d3c..000000000000
--- a/dev-lisp/cl-clx/files/digest-cl-clx-0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5aeceafdbf727ba99c5b02cb3156021b clx_0.6.tar.gz 378268
diff --git a/dev-lisp/cl-csv/ChangeLog b/dev-lisp/cl-csv/ChangeLog
index 8a9df45a9209..df721ec614de 100644
--- a/dev-lisp/cl-csv/ChangeLog
+++ b/dev-lisp/cl-csv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lisp/cl-csv
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-csv/ChangeLog,v 1.4 2005/03/18 07:54:06 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-csv/ChangeLog,v 1.5 2005/04/15 19:16:23 mkennedy Exp $
+
+  15 Apr 2005; Matthew Kennedy <mkennedy@gentoo.org> cl-csv-1.8.1.ebuild:
+  Keywording stable x86
 
   18 Mar 2005; Matthew Kennedy <mkennedy@gentoo.org> cl-csv-1.8.1.ebuild:
   Keywording for ~amd64
diff --git a/dev-lisp/cl-csv/cl-csv-1.8.1.ebuild b/dev-lisp/cl-csv/cl-csv-1.8.1.ebuild
index d7b7ef651fc2..5dd8793dd9be 100644
--- a/dev-lisp/cl-csv/cl-csv-1.8.1.ebuild
+++ b/dev-lisp/cl-csv/cl-csv-1.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-csv/cl-csv-1.8.1.ebuild,v 1.5 2005/03/18 07:54:06 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-csv/cl-csv-1.8.1.ebuild,v 1.6 2005/04/15 19:16:23 mkennedy Exp $
 
 inherit common-lisp
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://packages.debian.org/unstable/devel/cl-csv"
 SRC_URI="http://ftp.debian.org/debian/pool/main/c/cl-csv/cl-csv_${PV}.orig.tar.gz"
 LICENSE="No-Problem-Bugroff"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ~ppc ~amd64"
 IUSE=""
 DEPEND="dev-lisp/common-lisp-controller
 	virtual/commonlisp"
diff --git a/dev-lisp/cl-defsystem3/ChangeLog b/dev-lisp/cl-defsystem3/ChangeLog
index 2504f66ce79a..5b664c81496a 100644
--- a/dev-lisp/cl-defsystem3/ChangeLog
+++ b/dev-lisp/cl-defsystem3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lisp/cl-defsystem3
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-defsystem3/ChangeLog,v 1.15 2005/03/18 07:56:22 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-defsystem3/ChangeLog,v 1.16 2005/04/15 19:18:29 mkennedy Exp $
+
+  15 Apr 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  -cl-defsystem3-3.3i.ebuild, -cl-defsystem3-3.3i-r1.ebuild,
+  -cl-defsystem3-3.3i-r2.ebuild, -cl-defsystem3-3.3i-r3.ebuild,
+  -cl-defsystem3-3.3i-r4.ebuild, cl-defsystem3-3.3i-r5.ebuild:
+  Keywording stable x86; Removed old ebuilds
 
   18 Mar 2005; Matthew Kennedy <mkennedy@gentoo.org>
   cl-defsystem3-3.3i-r5.ebuild:
diff --git a/dev-lisp/cl-defsystem3/cl-defsystem3-3.3i-r1.ebuild b/dev-lisp/cl-defsystem3/cl-defsystem3-3.3i-r1.ebuild
deleted file mode 100644
index fb4568cbba4e..000000000000
--- a/dev-lisp/cl-defsystem3/cl-defsystem3-3.3i-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-defsystem3/cl-defsystem3-3.3i-r1.ebuild,v 1.4 2005/02/10 09:18:30 mkennedy Exp $
-
-inherit common-lisp-common
-
-DESCRIPTION="Another System Definition Facility for Common Lisp"
-HOMEPAGE="http://packages.debian.org/unstable/devel/cl-defsystem3.html"
-SRC_URI="http://ftp.debian.org/debian/pool/main/c/cl-defsystem3/${PN}_${PV}+cvs.2003.04.30.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc ~mips"
-IUSE=""
-
-S=${WORKDIR}/${P}+cvs.2003.04.30
-
-src_unpack() {
-	unpack ${A}
-	mv ${S}/docs/defsystem.text ${S}/docs/defsystem.txt
-}
-
-src_install() {
-	insinto /usr/share/common-lisp/source/defsystem
-	doins defsystem.lisp
-
-	dodoc ChangeLog README docs/defsystem.txt
-	dohtml docs/defsystem.html
-}
-
-pkg_postinst() {
-	reregister-all-common-lisp-implementations
-}
diff --git a/dev-lisp/cl-defsystem3/cl-defsystem3-3.3i-r2.ebuild b/dev-lisp/cl-defsystem3/cl-defsystem3-3.3i-r2.ebuild
deleted file mode 100644
index 24ecc11021d5..000000000000
--- a/dev-lisp/cl-defsystem3/cl-defsystem3-3.3i-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-defsystem3/cl-defsystem3-3.3i-r2.ebuild,v 1.4 2005/02/10 09:18:30 mkennedy Exp $
-
-inherit common-lisp-common
-
-DESCRIPTION="Another System Definition Facility for Common Lisp"
-HOMEPAGE="http://packages.debian.org/unstable/devel/cl-defsystem3.html"
-SRC_URI="http://ftp.debian.org/debian/pool/main/c/cl-defsystem3/${PN}_${PV}+cvs.2003.12.05.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc ~mips"
-IUSE=""
-
-S=${WORKDIR}/${P}+cvs.2003.12.05
-
-src_unpack() {
-	unpack ${A}
-	mv ${S}/docs/defsystem.text ${S}/docs/defsystem.txt
-}
-
-src_install() {
-	insinto /usr/share/common-lisp/source/defsystem
-	doins defsystem.lisp
-
-	dodoc ChangeLog README docs/defsystem.txt
-	dohtml docs/defsystem.html
-}
-
-pkg_postinst() {
-	reregister-all-common-lisp-implementations
-}
diff --git a/dev-lisp/cl-defsystem3/cl-defsystem3-3.3i-r3.ebuild b/dev-lisp/cl-defsystem3/cl-defsystem3-3.3i-r3.ebuild
deleted file mode 100644
index f71a5d528b2c..000000000000
--- a/dev-lisp/cl-defsystem3/cl-defsystem3-3.3i-r3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-defsystem3/cl-defsystem3-3.3i-r3.ebuild,v 1.4 2005/02/10 09:18:30 mkennedy Exp $
-
-inherit common-lisp-common
-
-DEB_CVS=2004.04.20
-
-DESCRIPTION="Another System Definition Facility for Common Lisp"
-HOMEPAGE="http://packages.debian.org/unstable/devel/cl-defsystem3.html"
-SRC_URI="http://ftp.debian.org/debian/pool/main/c/cl-defsystem3/${PN}_${PV}+cvs.${DEB_CVS}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc ~mips"
-IUSE=""
-
-S=${WORKDIR}/${P}+cvs.${DEB_CVS}
-
-src_unpack() {
-	unpack ${A}
-	mv ${S}/docs/defsystem.text ${S}/docs/defsystem.txt
-}
-
-src_install() {
-	insinto /usr/share/common-lisp/source/defsystem
-	doins defsystem.lisp
-
-	dodoc ChangeLog README docs/defsystem.txt
-	dohtml docs/defsystem.html
-}
-
-pkg_postinst() {
-	reregister-all-common-lisp-implementations
-}
diff --git a/dev-lisp/cl-defsystem3/cl-defsystem3-3.3i-r4.ebuild b/dev-lisp/cl-defsystem3/cl-defsystem3-3.3i-r4.ebuild
deleted file mode 100644
index 93f87707a7fd..000000000000
--- a/dev-lisp/cl-defsystem3/cl-defsystem3-3.3i-r4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-defsystem3/cl-defsystem3-3.3i-r4.ebuild,v 1.7 2005/03/05 05:34:48 mr_bones_ Exp $
-
-inherit common-lisp-common
-
-DEB_CVS=2004.07.18.1
-
-DESCRIPTION="Another System Definition Facility for Common Lisp"
-HOMEPAGE="http://packages.debian.org/unstable/devel/cl-defsystem3.html"
-# SRC_URI="http://ftp.debian.org/debian/pool/main/c/cl-defsystem3/${PN}_${PV}+cvs.${DEB_CVS}.tar.gz"
-SRC_URI="mirror://gentoo/${PN}_${PV}+cvs.${DEB_CVS}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 ~sparc ppc ~mips"
-IUSE=""
-
-S=${WORKDIR}/${P}+cvs.${DEB_CVS}
-
-DEPEND="dev-lisp/common-lisp-controller"
-
-src_unpack() {
-	unpack ${A}
-	mv ${S}/docs/defsystem.text ${S}/docs/defsystem.txt
-}
-
-src_install() {
-	insinto /usr/share/common-lisp/source/defsystem
-	doins defsystem.lisp
-	dodoc ChangeLog README docs/defsystem.txt
-	dohtml docs/defsystem.html
-}
-
-pkg_postinst() {
-	reregister-all-common-lisp-implementations
-}
diff --git a/dev-lisp/cl-defsystem3/cl-defsystem3-3.3i-r5.ebuild b/dev-lisp/cl-defsystem3/cl-defsystem3-3.3i-r5.ebuild
index c043271f4851..56bc3dddda79 100644
--- a/dev-lisp/cl-defsystem3/cl-defsystem3-3.3i-r5.ebuild
+++ b/dev-lisp/cl-defsystem3/cl-defsystem3-3.3i-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-defsystem3/cl-defsystem3-3.3i-r5.ebuild,v 1.3 2005/03/18 07:56:22 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-defsystem3/cl-defsystem3-3.3i-r5.ebuild,v 1.4 2005/04/15 19:18:29 mkennedy Exp $
 
 inherit common-lisp
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://packages.debian.org/unstable/devel/cl-defsystem3.html"
 SRC_URI="mirror://gentoo/${PN}_${PV}+cvs.${DEB_CVS}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~mips ~amd64"
+KEYWORDS="x86 ~sparc ~ppc ~mips ~amd64"
 IUSE=""
 
 S=${WORKDIR}/${P}+cvs.${DEB_CVS}
diff --git a/dev-lisp/cl-defsystem3/cl-defsystem3-3.3i.ebuild b/dev-lisp/cl-defsystem3/cl-defsystem3-3.3i.ebuild
deleted file mode 100644
index d97aef19f748..000000000000
--- a/dev-lisp/cl-defsystem3/cl-defsystem3-3.3i.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-defsystem3/cl-defsystem3-3.3i.ebuild,v 1.7 2005/02/10 09:18:30 mkennedy Exp $
-
-DESCRIPTION="Another System Definition Facility for Common Lisp"
-HOMEPAGE="http://packages.debian.org/unstable/devel/cl-defsystem3.html"
-SRC_URI="http://ftp.debian.org/debian/pool/main/c/cl-defsystem3/${PN}_${PV}+cvs.2003.04.30.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 ~sparc"
-IUSE=""
-DEPEND=""
-
-S=${WORKDIR}/${P}+cvs.2003.04.30
-
-src_unpack() {
-	unpack ${A}
-	mv ${S}/docs/defsystem.text ${S}/docs/defsystem.txt
-}
-
-src_install() {
-	insinto /usr/share/common-lisp/source/defsystem
-	doins defsystem.lisp
-
-	dodoc ChangeLog README docs/defsystem.txt
-	dohtml docs/defsystem.html
-}
-
-pkg_postinst() {
-	if [ -x /usr/sbin/clc-reregister-all-impl ]; then
-		/usr/sbin/clc-reregister-all-impl
-	fi
-}
diff --git a/dev-lisp/cl-defsystem3/files/digest-cl-defsystem3-3.3i b/dev-lisp/cl-defsystem3/files/digest-cl-defsystem3-3.3i
deleted file mode 100644
index 2768d70f2864..000000000000
--- a/dev-lisp/cl-defsystem3/files/digest-cl-defsystem3-3.3i
+++ /dev/null
@@ -1 +0,0 @@
-MD5 94939b3ccf0a2faefd1d77d178c617ba cl-defsystem3_3.3i+cvs.2003.04.30.tar.gz 69359
diff --git a/dev-lisp/cl-defsystem3/files/digest-cl-defsystem3-3.3i-r1 b/dev-lisp/cl-defsystem3/files/digest-cl-defsystem3-3.3i-r1
deleted file mode 100644
index 2768d70f2864..000000000000
--- a/dev-lisp/cl-defsystem3/files/digest-cl-defsystem3-3.3i-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 94939b3ccf0a2faefd1d77d178c617ba cl-defsystem3_3.3i+cvs.2003.04.30.tar.gz 69359
diff --git a/dev-lisp/cl-defsystem3/files/digest-cl-defsystem3-3.3i-r2 b/dev-lisp/cl-defsystem3/files/digest-cl-defsystem3-3.3i-r2
deleted file mode 100644
index 378306e7d2ad..000000000000
--- a/dev-lisp/cl-defsystem3/files/digest-cl-defsystem3-3.3i-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3f83bfcc5247c0d9f2bd14759260bb53 cl-defsystem3_3.3i+cvs.2003.12.05.tar.gz 68833
diff --git a/dev-lisp/cl-defsystem3/files/digest-cl-defsystem3-3.3i-r3 b/dev-lisp/cl-defsystem3/files/digest-cl-defsystem3-3.3i-r3
deleted file mode 100644
index 6db686724948..000000000000
--- a/dev-lisp/cl-defsystem3/files/digest-cl-defsystem3-3.3i-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d38d12af00f8f398b3dd95f19835d0fe cl-defsystem3_3.3i+cvs.2004.04.20.tar.gz 71459
diff --git a/dev-lisp/cl-defsystem3/files/digest-cl-defsystem3-3.3i-r4 b/dev-lisp/cl-defsystem3/files/digest-cl-defsystem3-3.3i-r4
deleted file mode 100644
index 435cd8439744..000000000000
--- a/dev-lisp/cl-defsystem3/files/digest-cl-defsystem3-3.3i-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 07622698648453794ff4d955db07af94 cl-defsystem3_3.3i+cvs.2004.07.18.1.tar.gz 75862
diff --git a/dev-lisp/cl-diff/ChangeLog b/dev-lisp/cl-diff/ChangeLog
index 69f18b05c2ca..b590523ce381 100644
--- a/dev-lisp/cl-diff/ChangeLog
+++ b/dev-lisp/cl-diff/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lisp/cl-diff
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-diff/ChangeLog,v 1.2 2005/03/22 15:29:46 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-diff/ChangeLog,v 1.3 2005/04/15 19:23:15 mkennedy Exp $
+
+  15 Apr 2005; Matthew Kennedy <mkennedy@gentoo.org> cl-diff-0.3.ebuild:
+  Keywording stable x86, ~ppc
 
   22 Mar 2005; Matthew Kennedy <mkennedy@gentoo.org> cl-diff-0.3.ebuild:
   Keywording for ~amd64
diff --git a/dev-lisp/cl-diff/cl-diff-0.3.ebuild b/dev-lisp/cl-diff/cl-diff-0.3.ebuild
index 7ac7c60081f3..ce8672018ff7 100644
--- a/dev-lisp/cl-diff/cl-diff-0.3.ebuild
+++ b/dev-lisp/cl-diff/cl-diff-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-diff/cl-diff-0.3.ebuild,v 1.2 2005/03/22 15:29:46 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-diff/cl-diff-0.3.ebuild,v 1.3 2005/04/15 19:23:15 mkennedy Exp $
 
 inherit common-lisp
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.cliki.net/DIFF"
 SRC_URI="http://www.cs.rice.edu/~froydnj/lisp/diff-${PV}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64 ~ppc"
 IUSE=""
 
 DEPEND="dev-lisp/common-lisp-controller
diff --git a/dev-lisp/cl-periodic-table/ChangeLog b/dev-lisp/cl-periodic-table/ChangeLog
index 66fe86544bf5..3382172a77d1 100644
--- a/dev-lisp/cl-periodic-table/ChangeLog
+++ b/dev-lisp/cl-periodic-table/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lisp/cl-periodic-table
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-periodic-table/ChangeLog,v 1.2 2005/03/18 08:04:59 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-periodic-table/ChangeLog,v 1.3 2005/04/15 19:12:35 mkennedy Exp $
+
+  15 Apr 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  cl-periodic-table-1.0.ebuild:
+  Keywording stable ~ppc
 
   18 Mar 2005; Matthew Kennedy <mkennedy@gentoo.org>
   cl-periodic-table-1.0.ebuild:
diff --git a/dev-lisp/cl-periodic-table/cl-periodic-table-1.0.ebuild b/dev-lisp/cl-periodic-table/cl-periodic-table-1.0.ebuild
index 9404651e58b5..65132a00d5e3 100644
--- a/dev-lisp/cl-periodic-table/cl-periodic-table-1.0.ebuild
+++ b/dev-lisp/cl-periodic-table/cl-periodic-table-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-periodic-table/cl-periodic-table-1.0.ebuild,v 1.2 2005/03/18 08:04:59 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-periodic-table/cl-periodic-table-1.0.ebuild,v 1.3 2005/04/15 19:12:35 mkennedy Exp $
 
 inherit common-lisp eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://common-lisp.net/project/chemboy/
 SRC_URI="mirror://gentoo/periodic-table-${PV}.tar.gz"
 LICENSE="LLGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE=""
 
 DEPEND="dev-lisp/common-lisp-controller
diff --git a/dev-lisp/cmucl/ChangeLog b/dev-lisp/cmucl/ChangeLog
index d2e128a74d39..fca7ad9ef355 100644
--- a/dev-lisp/cmucl/ChangeLog
+++ b/dev-lisp/cmucl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lisp/cmucl
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/ChangeLog,v 1.15 2005/02/13 03:44:44 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/ChangeLog,v 1.16 2005/04/15 19:27:16 mkennedy Exp $
+
+  15 Apr 2005; Matthew Kennedy <mkennedy@gentoo.org> -cmucl-18e.ebuild,
+  -cmucl-18e-r1.ebuild, -cmucl-18e-r2.ebuild, -cmucl-18e-r3.ebuild,
+  -cmucl-19a.ebuild, cmucl-19a-r1.ebuild:
+  Keywording stable x86; Removed old ebuilds
 
   12 Feb 2005; Matthew Kennedy <mkennedy@gentoo.org> cmucl-19a-r1.ebuild:
   Refine dependency on Common Lisp Controller to
diff --git a/dev-lisp/cmucl/cmucl-18e-r1.ebuild b/dev-lisp/cmucl/cmucl-18e-r1.ebuild
deleted file mode 100644
index 9cbbd9631461..000000000000
--- a/dev-lisp/cmucl/cmucl-18e-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-18e-r1.ebuild,v 1.6 2005/02/13 03:44:44 mkennedy Exp $
-
-inherit eutils
-
-# This package is a port of the Debian package of the same name.
-DEB_PV=7
-
-DESCRIPTION="CMUCL Lisp. This conforms to the ANSI Common Lisp Standard"
-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_${PV}.orig.tar.gz
-	http://ftp.debian.org/debian/pool/main/c/cmucl/cmucl_${PV}-${DEB_PV}.diff.gz
-	http://cmucl.cons.org/ftp-area/cmucl/release/18e/cmucl-${PV}-x86-linux.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="doc X"
-
-DEPEND="dev-lisp/common-lisp-controller
-	x11-libs/lesstif
-	doc? ( virtual/tetex )"
-#	X? ( x11-libs/lesstif )"
-PROVIDE="virtual/commonlisp"
-
-S=${WORKDIR}/${P}.orig
-
-src_unpack() {
-	unpack ${A}
-	epatch cmucl_${PV}-${DEB_PV}.diff
-	epatch ${FILESDIR}/${PV}/herald-save.lisp-gentoo.patch
-}
-
-src_compile() {
-	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 own-work/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
-
-	if use X; then
-		exeinto /usr/lib/cmucl
-		doexe target/motif/server/motifd
-		insinto /usr/lib/cmucl/subsystems/
-		doins target/interface/clm-library.x86f
-	fi
-
-	keepdir /usr/lib/common-lisp/cmucl
-
-	# BIG FAT HACK
-	#
-	# Since the Portage emerge step kills file timestamp information,
-	# we need to compensate by ensuring all .x86f files are more
-	# recent than their .lisp source.
-
-	dodir /usr/share/${PN}
-	tar cpvzf ${D}/usr/share/${PN}/portage-timestamp-compensate -C ${D}/usr/lib/${PN} .
-}
-
-pkg_postinst() {
-	chown cl-builder:cl-builder /usr/lib/common-lisp/cmucl
-	tar xvpzf /usr/share/${PN}/portage-timestamp-compensate -C /usr/lib/${PN}
-	rm -rf /usr/lib/common-lisp/${PN}/*
-	/usr/bin/clc-autobuild-impl ${PN} yes
-	/usr/sbin/register-common-lisp-implementation ${PN}
-
-}
-
-pkg_prerm() {
-	# Since we keep our own time stamps we must manually remove them
-	# here.
-	if [ ! -x /usr/bin/lisp ]; then
-		rm -rf /usr/lib/${PN}
-	fi
-	rm -rf /usr/lib/common-lisp/${PN}/*
-}
diff --git a/dev-lisp/cmucl/cmucl-18e-r2.ebuild b/dev-lisp/cmucl/cmucl-18e-r2.ebuild
deleted file mode 100644
index 5e6b2edbbdf5..000000000000
--- a/dev-lisp/cmucl/cmucl-18e-r2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-18e-r2.ebuild,v 1.5 2005/02/13 03:44:44 mkennedy Exp $
-
-inherit common-lisp-common eutils
-
-DEB_PV=8
-
-DESCRIPTION="CMUCL Lisp. This conforms to the ANSI Common Lisp Standard"
-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_${PV}-${DEB_PV}.tar.gz
-	http://cmucl.cons.org/ftp-area/cmucl/release/18e/cmucl-${PV}-x86-linux.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="doc X"
-
-DEPEND="dev-lisp/common-lisp-controller
-	x11-libs/lesstif
-	doc? ( virtual/tetex )"
-#	X? ( x11-libs/lesstif )"
-PROVIDE="virtual/commonlisp"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${PV}/herald-save.lisp-gentoo.patch
-	epatch ${FILESDIR}/${PV}/install-clc.lisp-gentoo.patch
-}
-
-src_compile() {
-	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 own-work/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
-
-	if use X; then
-		exeinto /usr/lib/cmucl
-		doexe target/motif/server/motifd
-		insinto /usr/lib/cmucl/subsystems/
-		doins target/interface/clm-library.x86f
-	fi
-
-	keepdir /usr/lib/common-lisp/cmucl
-
-	# BIG FAT HACK
-	#
-	# Since the Portage emerge step kills file timestamp information,
-	# we need to compensate by ensuring all .x86f files are more
-	# recent than their .lisp source.
-
-	dodir /usr/share/${PN}
-	tar cpvzf ${D}/usr/share/${PN}/portage-timestamp-compensate -C ${D}/usr/lib/${PN} .
-}
-
-pkg_postinst() {
-	chown cl-builder:cl-builder /usr/lib/common-lisp/cmucl
-	tar xvpzf /usr/share/${PN}/portage-timestamp-compensate -C /usr/lib/${PN}
-	rm -rf /usr/lib/common-lisp/${PN}/*
-	/usr/bin/clc-autobuild-impl ${PN} yes
-	register-common-lisp-implementation ${PN}
-
-}
-
-pkg_prerm() {
-	# Since we keep our own time stamps we must manually remove them
-	# here.
-	if [ ! -x /usr/bin/lisp ]; then
-		rm -rf /usr/lib/${PN}
-	fi
-	rm -rf /usr/lib/common-lisp/${PN}/*
-}
diff --git a/dev-lisp/cmucl/cmucl-18e-r3.ebuild b/dev-lisp/cmucl/cmucl-18e-r3.ebuild
deleted file mode 100644
index 6107ab8583d4..000000000000
--- a/dev-lisp/cmucl/cmucl-18e-r3.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-18e-r3.ebuild,v 1.6 2005/02/13 03:44:44 mkennedy Exp $
-
-inherit common-lisp-common eutils
-
-DEB_PV=8
-
-DESCRIPTION="CMUCL Lisp. This conforms to the ANSI Common Lisp Standard"
-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_${PV}-${DEB_PV}.tar.gz
-	http://cmucl.cons.org/ftp-area/cmucl/release/18e/cmucl-${PV}-x86-linux.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="X doc lesstif"
-
-DEPEND="dev-lisp/common-lisp-controller
-	doc? ( virtual/tetex )
-	X? ( lesstif? ( x11-libs/lesstif ) !lesstif? ( x11-libs/openmotif ) )"
-PROVIDE="virtual/commonlisp"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${PV}/herald-save.lisp-gentoo.patch
-	epatch ${FILESDIR}/${PV}/install-clc.lisp-gentoo.patch
-}
-
-src_compile() {
-	# non-x86 maintainers, add to the the following and verify
-
-	if use lesstif; then
-		sed -i 's,CFLAGS = ,CFLAGS = -I/usr/X11R6/include/lesstif/ ,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 own-work/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
-
-	if use X; then
-		exeinto /usr/lib/cmucl
-		doexe target/motif/server/motifd
-		insinto /usr/lib/cmucl/subsystems/
-		doins target/interface/clm-library.x86f
-	fi
-
-	keepdir /usr/lib/common-lisp/cmucl
-
-	# BIG FAT HACK
-	#
-	# Since the Portage emerge step kills file timestamp information,
-	# we need to compensate by ensuring all .x86f files are more
-	# recent than their .lisp source.
-
-	dodir /usr/share/${PN}
-	tar cpvzf ${D}/usr/share/${PN}/portage-timestamp-compensate -C ${D}/usr/lib/${PN} .
-}
-
-pkg_postinst() {
-	chown cl-builder:cl-builder /usr/lib/common-lisp/cmucl
-	tar xvpzf /usr/share/${PN}/portage-timestamp-compensate -C /usr/lib/${PN}
-	rm -rf /usr/lib/common-lisp/${PN}/*
-	/usr/bin/clc-autobuild-impl ${PN} yes
-	register-common-lisp-implementation ${PN}
-
-}
-
-pkg_prerm() {
-	# Since we keep our own time stamps we must manually remove them
-	# here.
-	if [ ! -x /usr/bin/lisp ]; then
-		rm -rf /usr/lib/${PN}
-	fi
-	rm -rf /usr/lib/common-lisp/${PN}/*
-}
diff --git a/dev-lisp/cmucl/cmucl-18e.ebuild b/dev-lisp/cmucl/cmucl-18e.ebuild
deleted file mode 100644
index ff56babb61cf..000000000000
--- a/dev-lisp/cmucl/cmucl-18e.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-18e.ebuild,v 1.5 2005/02/13 03:44:44 mkennedy Exp $
-
-inherit eutils
-
-# This package is a port of the Debian package of the same name.
-DEB_PV=7
-
-DESCRIPTION="CMUCL Lisp. This conforms to the ANSI Common Lisp Standard"
-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_${PV}.orig.tar.gz
-	http://ftp.debian.org/debian/pool/main/c/cmucl/cmucl_${PV}-${DEB_PV}.diff.gz
-	http://cmucl.cons.org/ftp-area/cmucl/release/18e/cmucl-${PV}-x86-linux.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc X"
-
-DEPEND="dev-lisp/common-lisp-controller
-	x11-libs/lesstif
-	doc? ( virtual/tetex )"
-#	X? ( x11-libs/lesstif )" 
-PROVIDE="virtual/commonlisp"
-
-S=${WORKDIR}/${P}.orig
-
-src_unpack() {
-	unpack ${A}
-	epatch cmucl_${PV}-${DEB_PV}.diff
-	epatch ${FILESDIR}/${PV}/herald-save.lisp-gentoo.patch
-}
-
-src_compile() {
-	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 own-work/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
-
-	if use X; then
-		exeinto /usr/lib/cmucl
-		doexe target/motif/server/motifd
-		insinto /usr/lib/cmucl/subsystems/
-		doins target/interface/clm-library.x86f
-	fi
-}
-
-pkg_postinst() {
-	/usr/sbin/register-common-lisp-implementation cmucl
-}
-
-pkg_prerm() {
-	/usr/sbin/unregister-common-lisp-implementation cmucl
-}
diff --git a/dev-lisp/cmucl/cmucl-19a-r1.ebuild b/dev-lisp/cmucl/cmucl-19a-r1.ebuild
index 8f41bb8172bb..658ba045f003 100644
--- a/dev-lisp/cmucl/cmucl-19a-r1.ebuild
+++ b/dev-lisp/cmucl/cmucl-19a-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-19a-r1.ebuild,v 1.2 2005/02/13 03:44:44 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-19a-r1.ebuild,v 1.3 2005/04/15 19:27:16 mkennedy Exp $
 
 inherit common-lisp-common-2 eutils
 
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.debian.org/debian/pool/main/c/cmucl/cmucl_${MY_PV}.orig.tar.
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="doc lesstif nosource"
 
 DEPEND="=dev-lisp/common-lisp-controller-4*
diff --git a/dev-lisp/cmucl/cmucl-19a.ebuild b/dev-lisp/cmucl/cmucl-19a.ebuild
deleted file mode 100644
index a311d363dc7d..000000000000
--- a/dev-lisp/cmucl/cmucl-19a.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2005 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.5 2005/02/13 03:44:44 mkennedy Exp $
-
-inherit common-lisp-common eutils
-
-DEB_PV=2
-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
-	>=dev-lisp/cl-defsystem3-3.3i-r3
-	>=dev-lisp/cl-asdf-1.84
-	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
-	doexe ${FILESDIR}/${PV}/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/digest-cmucl-18e b/dev-lisp/cmucl/files/digest-cmucl-18e
deleted file mode 100644
index d0cf150eb9d4..000000000000
--- a/dev-lisp/cmucl/files/digest-cmucl-18e
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d834f9fa8539309bcc7ebc41c8b124e6 cmucl_18e.orig.tar.gz 4420172
-MD5 49d8ec3c68cb3f0f9c736644ba5d16cf cmucl_18e-7.diff.gz 1911127
-MD5 695f4a6abc5af6276f776a9739c2c7e7 cmucl-18e-x86-linux.tar.bz2 6404635
diff --git a/dev-lisp/cmucl/files/digest-cmucl-18e-r1 b/dev-lisp/cmucl/files/digest-cmucl-18e-r1
deleted file mode 100644
index d0cf150eb9d4..000000000000
--- a/dev-lisp/cmucl/files/digest-cmucl-18e-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d834f9fa8539309bcc7ebc41c8b124e6 cmucl_18e.orig.tar.gz 4420172
-MD5 49d8ec3c68cb3f0f9c736644ba5d16cf cmucl_18e-7.diff.gz 1911127
-MD5 695f4a6abc5af6276f776a9739c2c7e7 cmucl-18e-x86-linux.tar.bz2 6404635
diff --git a/dev-lisp/cmucl/files/digest-cmucl-18e-r2 b/dev-lisp/cmucl/files/digest-cmucl-18e-r2
deleted file mode 100644
index 755469c77d76..000000000000
--- a/dev-lisp/cmucl/files/digest-cmucl-18e-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 79384e120d128e8ea48dd414bfbff4cc cmucl_18e-8.tar.gz 6305420
-MD5 695f4a6abc5af6276f776a9739c2c7e7 cmucl-18e-x86-linux.tar.bz2 6404635
diff --git a/dev-lisp/cmucl/files/digest-cmucl-18e-r3 b/dev-lisp/cmucl/files/digest-cmucl-18e-r3
deleted file mode 100644
index 755469c77d76..000000000000
--- a/dev-lisp/cmucl/files/digest-cmucl-18e-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 79384e120d128e8ea48dd414bfbff4cc cmucl_18e-8.tar.gz 6305420
-MD5 695f4a6abc5af6276f776a9739c2c7e7 cmucl-18e-x86-linux.tar.bz2 6404635
diff --git a/dev-lisp/cmucl/files/digest-cmucl-19a b/dev-lisp/cmucl/files/digest-cmucl-19a
deleted file mode 100644
index f0944c7823b9..000000000000
--- a/dev-lisp/cmucl/files/digest-cmucl-19a
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6b37fe4815935af73f0efd1312e6a969 cmucl_19a-release-20040728.orig.tar.gz 4456803
-MD5 f4b9605ca8a7e2bb3b3030df0f597102 cmucl_19a-release-20040728-2.diff.gz 1499700
-MD5 8d2afba837c28149944d3edd02af8b86 cmucl-19a-x86-linux.tar.bz2 7237512