Package-Manager: portage-2.0.51-r15

7 files changed, 178 insertions, 17 deletions

diff --git a/dev-lisp/cl-albert/ChangeLog b/dev-lisp/cl-albert/ChangeLog
index 630e00f6570c..2b32e80ead86 100644
--- a/dev-lisp/cl-albert/ChangeLog
+++ b/dev-lisp/cl-albert/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lisp/cl-albert
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-albert/ChangeLog,v 1.8 2004/06/24 23:40:12 agriffis Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-albert/ChangeLog,v 1.9 2005/02/08 19:03:04 mkennedy Exp $
+
+  08 Feb 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/0.4.10-gentoo.patch, cl-albert-0.4.10.ebuild:
+  Type assertion fixes
 
   09 May 2004; David Holm <dholm@gentoo.org> cl-albert-0.4.10.ebuild:
   Added to ~ppc.
diff --git a/dev-lisp/cl-albert/Manifest b/dev-lisp/cl-albert/Manifest
index 443ace1d09f6..b13b5e91e00d 100644
--- a/dev-lisp/cl-albert/Manifest
+++ b/dev-lisp/cl-albert/Manifest
@@ -1,10 +1,11 @@
-MD5 25b74b17cd535b59fa7e5ae3cbc5949c cl-albert-0.4.9-r1.ebuild 1293
-MD5 eae0ec5e7ee801d82c99bb1e70941af7 cl-albert-0.4.6.ebuild 1421
-MD5 7a18cecc19b986d65847af389bd42c7e cl-albert-0.4.10.ebuild 1296
-MD5 12b14ae2ef927edb45bb63bb6649801c ChangeLog 924
+MD5 768804ff3b94233028ac820047eed340 cl-albert-0.4.9-r1.ebuild 1293
+MD5 7bcf0a0a62214511c0fa6f1f12fc9a17 cl-albert-0.4.6.ebuild 1421
+MD5 3b482923e3e73a910dc71c12bd1aaf44 cl-albert-0.4.10.ebuild 1373
+MD5 3118f4584bfedfc89f4f4958563564f0 ChangeLog 1056
 MD5 9b65b0341efc8f4b29498aad23315229 metadata.xml 164
-MD5 5f5c20536407541a7dab20c4d25f66ad cl-albert-0.4.9.ebuild 1431
+MD5 ef1375315ef5c2d2b9bb80c270e84eec cl-albert-0.4.9.ebuild 1431
 MD5 ecab3ccdbc3efd550f9619840c8c59f8 files/digest-cl-albert-0.4.10 65
+MD5 ddb91a4a7f8f57539411e4fe09ef39c7 files/0.4.10-gentoo.patch 5240
 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
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 ff55b38c6de9..1ff081c37561 100644
--- a/dev-lisp/cl-albert/cl-albert-0.4.10.ebuild
+++ b/dev-lisp/cl-albert/cl-albert-0.4.10.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.3 2004/06/24 23:40:12 agriffis Exp $
+# $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 $
 
-inherit common-lisp
+inherit common-lisp eutils
 
 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="~x86 ~ppc"
+KEYWORDS="-*"
 IUSE=""
 DEPEND="dev-lisp/common-lisp-controller
 	app-text/docbook-dsssl-stylesheets
@@ -19,6 +19,11 @@ CLPACKAGE=albert
 
 S=${WORKDIR}/${P/cl-/}
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PV}-gentoo.patch || die
+}
+
 src_compile() {
 	make -C expat all || die
 }
diff --git a/dev-lisp/cl-albert/cl-albert-0.4.6.ebuild b/dev-lisp/cl-albert/cl-albert-0.4.6.ebuild
index b55c0e670a37..8b7bed161d38 100644
--- a/dev-lisp/cl-albert/cl-albert-0.4.6.ebuild
+++ b/dev-lisp/cl-albert/cl-albert-0.4.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.5 2004/06/24 23:40:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-albert/cl-albert-0.4.6.ebuild,v 1.6 2005/02/08 19:03:04 mkennedy Exp $
 
 inherit common-lisp
 
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
index 1a0cabf42c84..fd97cc6ca91b 100644
--- a/dev-lisp/cl-albert/cl-albert-0.4.9-r1.ebuild
+++ b/dev-lisp/cl-albert/cl-albert-0.4.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.2 2004/06/24 23:40:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-albert/cl-albert-0.4.9-r1.ebuild,v 1.3 2005/02/08 19:03:04 mkennedy Exp $
 
 inherit common-lisp
 
diff --git a/dev-lisp/cl-albert/cl-albert-0.4.9.ebuild b/dev-lisp/cl-albert/cl-albert-0.4.9.ebuild
index 00362135fb1a..13540f8452e7 100644
--- a/dev-lisp/cl-albert/cl-albert-0.4.9.ebuild
+++ b/dev-lisp/cl-albert/cl-albert-0.4.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.3 2004/06/24 23:40:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-albert/cl-albert-0.4.9.ebuild,v 1.4 2005/02/08 19:03:04 mkennedy Exp $
 
 inherit common-lisp
 
diff --git a/dev-lisp/cl-albert/files/0.4.10-gentoo.patch b/dev-lisp/cl-albert/files/0.4.10-gentoo.patch
new file mode 100644
index 000000000000..1ca832737cd1
--- /dev/null
+++ b/dev-lisp/cl-albert/files/0.4.10-gentoo.patch
@@ -0,0 +1,151 @@
+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~