Change all references to SIMPLE-BASE-STRING to SIMPLE-STRING.

Package-Manager: portage-2.0.51.22-r2

10 files changed, 22 insertions, 318 deletions

diff --git a/dev-lisp/cl-albert/ChangeLog b/dev-lisp/cl-albert/ChangeLog
index 607cc42ef3ea..5e746791100a 100644
--- a/dev-lisp/cl-albert/ChangeLog
+++ b/dev-lisp/cl-albert/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lisp/cl-albert
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-albert/ChangeLog,v 1.10 2005/05/24 18:48:32 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-albert/ChangeLog,v 1.11 2005/09/08 21:55:09 mkennedy Exp $
+
+  08 Sep 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  -files/0.4.10-gentoo.patch, -cl-albert-0.4.6.ebuild,
+  -cl-albert-0.4.9.ebuild, -cl-albert-0.4.9-r1.ebuild,
+  cl-albert-0.4.10.ebuild:
+  Change all references to SIMPLE-BASE-STRING to SIMPLE-STRING.
 
   24 May 2005; <mkennedy@gentoo.org> cl-albert-0.4.6.ebuild,
   cl-albert-0.4.9.ebuild, cl-albert-0.4.9-r1.ebuild:
diff --git a/dev-lisp/cl-albert/Manifest b/dev-lisp/cl-albert/Manifest
index 99682f300614..6736ca155ad2 100644
--- a/dev-lisp/cl-albert/Manifest
+++ b/dev-lisp/cl-albert/Manifest
@@ -1,11 +1,14 @@
-MD5 ffaf471d1f2b4c729cadce2ac7dc55b6 ChangeLog 1192
-MD5 3b482923e3e73a910dc71c12bd1aaf44 cl-albert-0.4.10.ebuild 1373
-MD5 45d592fa280c60900fbdc47e67f28db0 cl-albert-0.4.6.ebuild 1428
-MD5 62dc4902da351d528f965d4ddb0f0cf8 cl-albert-0.4.9-r1.ebuild 1300
-MD5 2e79825462f1e30c53817e39d4bc5ed4 cl-albert-0.4.9.ebuild 1438
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6c804083fd668a283f01d0b295110a8d ChangeLog 1447
+MD5 a9eac61d7441711c19ea98ef931250e8 cl-albert-0.4.10.ebuild 1439
 MD5 9b65b0341efc8f4b29498aad23315229 metadata.xml 164
-MD5 ddb91a4a7f8f57539411e4fe09ef39c7 files/0.4.10-gentoo.patch 5240
 MD5 ecab3ccdbc3efd550f9619840c8c59f8 files/digest-cl-albert-0.4.10 65
-MD5 fbac34ce452adfd67123995fa87d2008 files/digest-cl-albert-0.4.6 64
-MD5 2a0b0dafe8f134e90e37bd72e5a1a137 files/digest-cl-albert-0.4.9 64
-MD5 2a0b0dafe8f134e90e37bd72e5a1a137 files/digest-cl-albert-0.4.9-r1 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDILNpyiNZaEAZA+ARAgVJAJ9QKZxwJ1aSfSHW5u2KTpdS4FGYoQCfa/N9
+XcJOuwQphSjRsBkZyq6KXgs=
+=cVhn
+-----END PGP SIGNATURE-----
diff --git a/dev-lisp/cl-albert/cl-albert-0.4.10.ebuild b/dev-lisp/cl-albert/cl-albert-0.4.10.ebuild
index 1ff081c37561..ea94fe06a732 100644
--- a/dev-lisp/cl-albert/cl-albert-0.4.10.ebuild
+++ b/dev-lisp/cl-albert/cl-albert-0.4.10.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-albert/cl-albert-0.4.10.ebuild,v 1.4 2005/02/08 19:03:04 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-albert/cl-albert-0.4.10.ebuild,v 1.5 2005/09/08 21:55:09 mkennedy Exp $
 
 inherit common-lisp eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://albert.sourceforge.net/"
 SRC_URI="mirror://sourceforge/albert/${P/cl-/}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-*"
+KEYWORDS="~amd64 ~sparc ~x86 ~ppc"
 IUSE=""
 DEPEND="dev-lisp/common-lisp-controller
 	app-text/docbook-dsssl-stylesheets
@@ -21,7 +21,7 @@ S=${WORKDIR}/${P/cl-/}
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${PV}-gentoo.patch || die
+	find ${S} -type f -print0 | xargs -0 sed -i 's,simple-base-string,simple-string,i' || die
 }
 
 src_compile() {
diff --git a/dev-lisp/cl-albert/cl-albert-0.4.6.ebuild b/dev-lisp/cl-albert/cl-albert-0.4.6.ebuild
deleted file mode 100644
index fbed7a9724e7..000000000000
--- a/dev-lisp/cl-albert/cl-albert-0.4.6.ebuild
+++ /dev/null
@@ -1,53 +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-albert/cl-albert-0.4.6.ebuild,v 1.7 2005/05/24 18:48:32 mkennedy Exp $
-
-inherit common-lisp
-
-DESCRIPTION="Albert is a doc-generator for Common Lisp, comparable to Javadoc and Doxygen. Currently it generates DocBook documentation. It reads an ASDF system definition and documents the system."
-HOMEPAGE="http://albert.sourceforge.net/"
-SRC_URI="mirror://sourceforge/albert/${P/cl-/}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~sparc ~x86"
-IUSE=""
-DEPEND="dev-lisp/common-lisp-controller
-	app-text/docbook-dsssl-stylesheets
-	virtual/commonlisp"
-
-CLPACKAGE=albert
-
-S=${WORKDIR}/${P/cl-/}
-
-src_compile() {
-	make -C expat all || die
-}
-
-src_install() {
-	for p in . apispec base lisp2csf specs spres tools ; do
-		insinto /usr/share/common-lisp/source/${CLPACKAGE}/${p}
-		doins ${p}/*.lisp
-	done
-	insinto /usr/share/common-lisp/source/${CLPACKAGE}
-	doins *.asd
-	common-lisp-system-symlink
-	dodoc COPYING README ChangeLog THANKS
-	dohtml web/*
-	dobin expat/alb_xml2sexp
-	doman expat/alb_xml2sexp.1
-
-	insinto /usr/share/albert
-	doins data/*
-	insinto /usr/share/albert/icons
-	doins data/icons/*
-	insinto /usr/share/albert/apis
-	doins data/apis
-}
-
-pkg_preinst() {
-	rm -rf /usr/lib/common-lisp/*/${CLPACKAGE} || true
-}
-
-pkg_postrm() {
-	rm -rf /usr/lib/common-lisp/*/${CLPACKAGE} || true
-}
diff --git a/dev-lisp/cl-albert/cl-albert-0.4.9-r1.ebuild b/dev-lisp/cl-albert/cl-albert-0.4.9-r1.ebuild
deleted file mode 100644
index 9c6c8c333496..000000000000
--- a/dev-lisp/cl-albert/cl-albert-0.4.9-r1.ebuild
+++ /dev/null
@@ -1,45 +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-albert/cl-albert-0.4.9-r1.ebuild,v 1.4 2005/05/24 18:48:32 mkennedy Exp $
-
-inherit common-lisp
-
-DESCRIPTION="Albert is a documentation-generator for Common Lisp, comparable to Javadoc and Doxygen. Currently it generates DocBook documentation. It reads an ASDF system definition and documents the system."
-HOMEPAGE="http://albert.sourceforge.net/"
-SRC_URI="mirror://sourceforge/albert/${P/cl-/}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~sparc ~x86"
-IUSE=""
-DEPEND="dev-lisp/common-lisp-controller
-	app-text/docbook-dsssl-stylesheets
-	virtual/commonlisp"
-
-CLPACKAGE=albert
-
-S=${WORKDIR}/${P/cl-/}
-
-src_compile() {
-	make -C expat all || die
-}
-
-src_install() {
-	for p in . apispec base lisp2csf specs spres tools ; do
-		insinto /usr/share/common-lisp/source/${CLPACKAGE}/${p}
-		doins ${p}/*.lisp
-	done
-	insinto /usr/share/common-lisp/source/${CLPACKAGE}
-	doins *.asd
-	common-lisp-system-symlink
-	dodoc COPYING README ChangeLog THANKS
-	dohtml web/*
-	dobin expat/alb_xml2sexp
-	doman expat/alb_xml2sexp.1
-
-	insinto /usr/share/albert
-	doins data/*
-	insinto /usr/share/albert/icons
-	doins data/icons/*
-	insinto /usr/share/albert/apis
-	doins data/apis
-}
diff --git a/dev-lisp/cl-albert/cl-albert-0.4.9.ebuild b/dev-lisp/cl-albert/cl-albert-0.4.9.ebuild
deleted file mode 100644
index 948822923471..000000000000
--- a/dev-lisp/cl-albert/cl-albert-0.4.9.ebuild
+++ /dev/null
@@ -1,53 +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-albert/cl-albert-0.4.9.ebuild,v 1.5 2005/05/24 18:48:32 mkennedy Exp $
-
-inherit common-lisp
-
-DESCRIPTION="Albert is a documentation-generator for Common Lisp, comparable to Javadoc and Doxygen. Currently it generates DocBook documentation. It reads an ASDF system definition and documents the system."
-HOMEPAGE="http://albert.sourceforge.net/"
-SRC_URI="mirror://sourceforge/albert/${P/cl-/}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~sparc ~x86"
-IUSE=""
-DEPEND="dev-lisp/common-lisp-controller
-	app-text/docbook-dsssl-stylesheets
-	virtual/commonlisp"
-
-CLPACKAGE=albert
-
-S=${WORKDIR}/${P/cl-/}
-
-src_compile() {
-	make -C expat all || die
-}
-
-src_install() {
-	for p in . apispec base lisp2csf specs spres tools ; do
-		insinto /usr/share/common-lisp/source/${CLPACKAGE}/${p}
-		doins ${p}/*.lisp
-	done
-	insinto /usr/share/common-lisp/source/${CLPACKAGE}
-	doins *.asd
-	common-lisp-system-symlink
-	dodoc COPYING README ChangeLog THANKS
-	dohtml web/*
-	dobin expat/alb_xml2sexp
-	doman expat/alb_xml2sexp.1
-
-	insinto /usr/share/albert
-	doins data/*
-	insinto /usr/share/albert/icons
-	doins data/icons/*
-	insinto /usr/share/albert/apis
-	doins data/apis
-}
-
-pkg_preinst() {
-	rm -rf /usr/lib/common-lisp/*/${CLPACKAGE} || true
-}
-
-pkg_postrm() {
-	rm -rf /usr/lib/common-lisp/*/${CLPACKAGE} || true
-}
diff --git a/dev-lisp/cl-albert/files/0.4.10-gentoo.patch b/dev-lisp/cl-albert/files/0.4.10-gentoo.patch
deleted file mode 100644
index 1ca832737cd1..000000000000
--- a/dev-lisp/cl-albert/files/0.4.10-gentoo.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-diff -ur albert-0.4.10.orig/apispec/helpers.lisp albert-0.4.10/apispec/helpers.lisp
---- albert-0.4.10.orig/apispec/helpers.lisp	2003-11-14 10:03:27.000000000 -0600
-+++ albert-0.4.10/apispec/helpers.lisp	2005-02-08 12:07:21.326910544 -0600
-@@ -20,7 +20,6 @@
-   "creates a method which prints out a warning that it's not written"
-   (let* ((ignorable-args nil)
-          (args (reduce #'(lambda (x y) 
--			   (declare (type simple-base-string x y))
- 			   (strcat x " " y)) 
-                        (mapcar #'(lambda (x) 
-                                    ;; we should ignore non-specialised arguments
-Only in albert-0.4.10/apispec: helpers.lisp~
-diff -ur albert-0.4.10.orig/apispec/xml-base.lisp albert-0.4.10/apispec/xml-base.lisp
---- albert-0.4.10.orig/apispec/xml-base.lisp	2003-10-20 11:43:59.000000000 -0500
-+++ albert-0.4.10/apispec/xml-base.lisp	2005-02-08 12:54:34.828504070 -0600
-@@ -356,13 +356,6 @@
- 	 (element-name (get-element-name xmlobj))
- 	 (subs  (slot-value xmlobj 'sub-info))
- 	 (sublen (length subs)))
--
--    (declare (optimize (safety 0) (speed 3) (debug 0)))
--    (declare (type simple-base-string element-name))
--    (declare (type fixnum indentlevel sublen))
--
--;;    (break)
--    
-     ;; whip out start and any attrs
-     (write-string (get-indent indentlevel) stream)
-     (write-char #\< stream)
-@@ -397,9 +390,6 @@
- 	    (ptr nil)
- 	    (its-type nil)
- 	    (its-name ""))
--	
--	(declare (type simple-base-string its-name))
--	
- 	(loop for curobj across subs do
- 	      (setq lastptr ptr)
- 	      (setq ptr (xml-subelement-info-ptr curobj))
-@@ -414,9 +404,6 @@
- 		  ((=subelement-string= =subelement-stringlist=)
- 		   (let (;;(tag-end (strcat its-name ">"))
- 			 (cur-indent (get-indent (xml-tool.indent xtool))))
--		     
--		     (declare (type simple-base-string cur-indent))
--		     
- 		     (dolist (my-iter (slot-value xmlobj ptr))
- 		       (write-string cur-indent stream)
- 		       (write-char #\< stream)
-@@ -596,62 +583,16 @@
- 
-     retval))
- 
--
--#-sbcl
--(declaim (ftype (function (simple-base-string) simple-base-string) xmlify-string))
--;;(declaim (ftype (function (simple-base-string) simple-base-string) xmlify-string-1))
--
--
--(defvar *tmpres-len* 8192 "keeps the length to avoid recalculation")
--(defvar *tmpres* (make-string 8192) 
--  "temporary array for the xmlify-string function")
--
--(declaim (type fixnum *tmpres-len*))
--(declaim (type simple-base-string *tmpres*))
--
--(defun xmlify-string (str)
--  "I don't know if it is any fast. I hope so. Uses *tmpres* to
--save new string in."
--  (declare (optimize (safety 0) (speed 3) (debug 0)))
--  (declare (type simple-base-string str))
--  
--  (let ((cnt -1)
--	(xlen (- (length str) 1)))
--    
--    (declare (type fixnum xlen cnt))
--  
--    ;; make sure the buffer is at least twice as long as string we
--    ;; want to xmlify.  an educated guess
--    (when (> (* xlen 2) *tmpres-len*)
--      (setf *tmpres-len* (* 2 (if (> xlen *tmpres-len*) 
--				  xlen 
--				*tmpres-len*)))
--      (setf *tmpres* (make-string *tmpres-len*)))
--    
--    (macrolet ((add-new-word (word)
--		 ;; assume word is string
--		 (let ((code nil))
--		   (loop for x of-type base-char across word
--		       do (push `(setf (schar *tmpres* (incf cnt)) ,x) code))
--		   `(progn
--		      ,@(nreverse code)))))
--    
--    
--      (loop 
--	  for i of-type fixnum from 0 to xlen 
--	  for c of-type base-char = (schar str i)
--	  do
--	    (cond 
--	     ((eq c #\&) (add-new-word "&amp;"))
--	     ((eq c #\<) (add-new-word "&lt;"))
--	     ((eq c #\>) (add-new-word "&gt;"))
--	     ((eq c #\") (add-new-word "&quot;"))
--	     (t (setf (schar *tmpres* (incf cnt)) c))))
--      
--      ;; faster way than subseq here?
--      (subseq *tmpres* 0 (1+ cnt))
--      )))
--
-+(defun xmlify-string (string)
-+  (with-output-to-string (stream)
-+    (dotimes (i (length string))
-+      (let ((char (char string i)))
-+	(case char
-+	  (#\& (write-string "&amp;" stream))
-+	  (#\< (write-string "&lt;" stream))
-+	  (#\> (write-string "&gt;" stream))
-+	  (#\" (write-string "&quote;" stream))
-+	  (otherwise (write-char char stream)))))))
- 
- (defmethod print-object ((inst xml-tool) stream)
-   (print-unreadable-object (inst stream :identity t)
-Only in albert-0.4.10/apispec: xml-base.lisp~
-diff -ur albert-0.4.10.orig/apispec/xml-esis.lisp albert-0.4.10/apispec/xml-esis.lisp
---- albert-0.4.10.orig/apispec/xml-esis.lisp	2003-08-06 09:22:34.000000000 -0500
-+++ albert-0.4.10/apispec/xml-esis.lisp	2005-02-08 12:58:36.331952820 -0600
-@@ -18,11 +18,6 @@
- (defun read-esis-file (filename xml-tool)
-   "filename is assumed to be a pathname and xml-tool a real xml-tool inited with 
- a factory"
--  
--  (declare (optimize (safety 0) (speed 3) (debug 0)))
--  
--  ;;  (format t "Read esis file ~a with ~a~%" filename xml-tool)
--  
-   (let* ((attr-stack nil)
- 	 (rest-of-line "")
- 	 (last-pos 0)
-@@ -30,11 +25,6 @@
- 	 ;; this may slow things down and be outright annoying
- 	 (full-file (eat-file filename))
- 	 (len (- (length full-file) 1)))
--    
--    (declare (type fixnum len last-pos))
--    (declare (type simple-base-string full-file rest-of-line))
--
--
-     (loop 
- 	for i of-type fixnum from 1 to len 
- 	for cur-char of-type character = (schar full-file i)
-Only in albert-0.4.10/apispec: xml-esis.lisp~
diff --git a/dev-lisp/cl-albert/files/digest-cl-albert-0.4.6 b/dev-lisp/cl-albert/files/digest-cl-albert-0.4.6
deleted file mode 100644
index c7fc1202e284..000000000000
--- a/dev-lisp/cl-albert/files/digest-cl-albert-0.4.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6eda3b6bb22a8444771494a0e080b7d2 albert-0.4.6.tar.gz 203387
diff --git a/dev-lisp/cl-albert/files/digest-cl-albert-0.4.9 b/dev-lisp/cl-albert/files/digest-cl-albert-0.4.9
deleted file mode 100644
index 57f9b32b3c77..000000000000
--- a/dev-lisp/cl-albert/files/digest-cl-albert-0.4.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 858de35c303c1825cb8e15197977ebc6 albert-0.4.9.tar.gz 225902
diff --git a/dev-lisp/cl-albert/files/digest-cl-albert-0.4.9-r1 b/dev-lisp/cl-albert/files/digest-cl-albert-0.4.9-r1
deleted file mode 100644
index 57f9b32b3c77..000000000000
--- a/dev-lisp/cl-albert/files/digest-cl-albert-0.4.9-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 858de35c303c1825cb8e15197977ebc6 albert-0.4.9.tar.gz 225902