*** empty log message ***

5 files changed, 118 insertions, 6 deletions

diff --git a/dev-lisp/cl-pxmlutils/ChangeLog b/dev-lisp/cl-pxmlutils/ChangeLog
index 1eb3bec1c216..5b6b3bfcf795 100644
--- a/dev-lisp/cl-pxmlutils/ChangeLog
+++ b/dev-lisp/cl-pxmlutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lisp/cl-pxmlutils
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-pxmlutils/ChangeLog,v 1.2 2004/02/12 09:13:15 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-pxmlutils/ChangeLog,v 1.3 2004/03/31 08:06:27 mkennedy Exp $
+
+*cl-pxmlutils-0.0.9-r2 (31 Mar 2004)
+
+  31 Mar 2004; <mkennedy@gentoo.org> cl-pxmlutils-0.0.9-r2.ebuild,
+  files/0.0.9-gentoo.patch:
+  Fix to work with latest acl-compat
 
 *cl-pxmlutils-0.0.9-r1 (12 Feb 2004)
 
diff --git a/dev-lisp/cl-pxmlutils/Manifest b/dev-lisp/cl-pxmlutils/Manifest
index 6b5fccef7fcc..3dbb9cb6c284 100644
--- a/dev-lisp/cl-pxmlutils/Manifest
+++ b/dev-lisp/cl-pxmlutils/Manifest
@@ -1,8 +1,12 @@
-MD5 0329a00fe1ea73afb97d93a34d3c91dc files/digest-cl-pxmlutils-0.0.9 67
-MD5 2a4e3bb8f2f281ae7850a1fb2fa2280a files/0.0.9-allegro-declare-gentoo.patch 1242
-MD5 0329a00fe1ea73afb97d93a34d3c91dc files/digest-cl-pxmlutils-0.0.9-r1 67
-MD5 07ea12c04474a79089d7479aeb3dce94 files/pxmlutils.asd 729
-MD5 da78f59f8a966456154248f1e9d60997 cl-pxmlutils-0.0.9.ebuild 1016
 MD5 3f22ec2c437657801d4d40e627a98e7d cl-pxmlutils-0.0.9-r1.ebuild 859
+MD5 3f22ec2c437657801d4d40e627a98e7d cl-pxmlutils-0.0.9-r2.ebuild~ 859
+MD5 da78f59f8a966456154248f1e9d60997 cl-pxmlutils-0.0.9.ebuild 1016
+MD5 c7c9708289120ba346f2cc5d2f463716 cl-pxmlutils-0.0.9-r2.ebuild 843
 MD5 6ad8adfb1062ec949bb2985906a5fb86 ChangeLog 618
 MD5 4a244585c497b40153c4f9c808e061ad metadata.xml 393
+MD5 2a4e3bb8f2f281ae7850a1fb2fa2280a files/0.0.9-allegro-declare-gentoo.patch 1242
+MD5 0329a00fe1ea73afb97d93a34d3c91dc files/digest-cl-pxmlutils-0.0.9-r2 67
+MD5 32d1daec1acf0391c8df87b0e4aa8248 files/0.0.9-gentoo.patch 3242
+MD5 0329a00fe1ea73afb97d93a34d3c91dc files/digest-cl-pxmlutils-0.0.9-r1 67
+MD5 07ea12c04474a79089d7479aeb3dce94 files/pxmlutils.asd 729
+MD5 0329a00fe1ea73afb97d93a34d3c91dc files/digest-cl-pxmlutils-0.0.9 67
diff --git a/dev-lisp/cl-pxmlutils/cl-pxmlutils-0.0.9-r2.ebuild b/dev-lisp/cl-pxmlutils/cl-pxmlutils-0.0.9-r2.ebuild
new file mode 100644
index 000000000000..b6ed590781d0
--- /dev/null
+++ b/dev-lisp/cl-pxmlutils/cl-pxmlutils-0.0.9-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-pxmlutils/cl-pxmlutils-0.0.9-r2.ebuild,v 1.1 2004/03/31 08:06:27 mkennedy Exp $
+
+inherit common-lisp
+
+DESCRIPTION="Portable version of Franz's xmlutils.  Includes XML and HTML parsers."
+HOMEPAGE="http://www.common-lisp.net/project/bese/pxmlutils.html"
+SRC_URI="ftp://ftp.common-lisp.net/pub/project/bese/pxmlutils/pxmlutils_${PV}.tar.gz"
+LICENSE="LLGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86"
+DEPEND="dev-lisp/common-lisp-controller
+	dev-lisp/cl-acl-compat
+	virtual/commonlisp"
+
+S=${WORKDIR}/pxmlutils_${PV}
+
+CLPACKAGE=pxmlutils
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PV}-gentoo.patch
+}
+
+src_install() {
+	common-lisp-install pxmlutils.asd *.cl
+	common-lisp-system-symlink
+	dodoc ChangeLog README *.{htm,txt}
+}
diff --git a/dev-lisp/cl-pxmlutils/files/0.0.9-gentoo.patch b/dev-lisp/cl-pxmlutils/files/0.0.9-gentoo.patch
new file mode 100644
index 000000000000..05899f98219f
--- /dev/null
+++ b/dev-lisp/cl-pxmlutils/files/0.0.9-gentoo.patch
@@ -0,0 +1,71 @@
+diff -ur pxmlutils_0.0.9.orig/pxml1.cl pxmlutils_0.0.9/pxml1.cl
+--- pxmlutils_0.0.9.orig/pxml1.cl	2004-01-15 10:57:53.000000000 -0600
++++ pxmlutils_0.0.9/pxml1.cl	2004-03-31 01:38:49.885715472 -0600
+@@ -109,7 +109,7 @@
+   (declare (optimize (speed 3) (safety 1)))
+   ;; compute the symbol named by what's in the collector
+   (if* (not ns-to-package)
+-     then (excl::intern* (collector-data coll) (collector-next coll) package)
++     then (acl-compat.excl::intern* (collector-data coll) (collector-next coll) package)
+      else
+ 	  (let (new-package (data (collector-data coll)))
+ 	    (if* (and (eq (schar data 0) #\x)
+@@ -122,7 +122,7 @@
+ 	       then ;; putting xmlns: in :none namespace
+ 		    (setf new-package (assoc :none ns-to-package))
+ 		    (when new-package (setf package (rest new-package)))
+-		    (excl::intern* (collector-data coll) (collector-next coll) package)
++		    (acl-compat.excl::intern* (collector-data coll) (collector-next coll) package)
+ 	       else
+ 		    (let ((colon-index -1)
+ 			  (data (collector-data coll)))
+@@ -144,15 +144,15 @@
+ 						       (+ 1 colon-index)))
+ 					  (setf (schar string2 i)
+ 					    (schar data (+ colon-index 1 i))))
+-					(excl::intern string2 (rest new-package))
++					(acl-compat.excl::intern string2 (rest new-package))
+ 				   else
+-					(excl::intern* (collector-data coll)
++					(acl-compat.excl::intern* (collector-data coll)
+ 						       (collector-next coll) package)))
+ 			 else
+ 			      (let ((new-package (assoc :none ns-to-package)))
+ 				(when new-package
+ 				  (setf package (rest new-package))))
+-			      (excl::intern* (collector-data coll)
++			      (acl-compat.excl::intern* (collector-data coll)
+ 					     (collector-next coll) package)))
+ 		    ))
+ 	  ))
+@@ -404,7 +404,7 @@
+ 	  ;; if we have a stream we're reading from set its external-format
+ 	  ;; to the encoding
+ 	  ;; note - tokenbuf is really an iostruct, not a tokenbuf
+-	  (if* (tokenbuf-stream (iostruct-tokenbuf tokenbuf))
++	  #+allegro (if* (tokenbuf-stream (iostruct-tokenbuf tokenbuf))
+ 	     then (setf (stream-external-format 
+ 			 (tokenbuf-stream (iostruct-tokenbuf tokenbuf)))
+ 		    (find-external-format (fifth val))))
+diff -ur pxmlutils_0.0.9.orig/pxml3.cl pxmlutils_0.0.9/pxml3.cl
+--- pxmlutils_0.0.9.orig/pxml3.cl	2004-01-15 10:57:53.000000000 -0600
++++ pxmlutils_0.0.9/pxml3.cl	2004-03-31 01:26:29.311299896 -0600
+@@ -146,7 +146,7 @@
+ 
+ (defun next-dtd-token (tokenbuf
+ 		       external include-count external-callback)
+-  (declare (:fbound parse-default-value) (optimize (speed 3) (safety 1)))
++  (declare #+allegro (:fbound parse-default-value) (optimize (speed 3) (safety 1)))
+   (macrolet ((add-to-entity-buf (entity-symbol p-value)
+ 	       `(progn
+ 		  (push (make-tokenbuf :cur 0 :max (length ,p-value) :data ,p-value)
+@@ -2395,7 +2395,7 @@
+     ))
+ 
+ (defun external-param-reference (tokenbuf old-coll external-callback)
+-  (declare (:fbound next-token) (ignorable old-coll) (optimize (speed 3) (safety 1)))
++  (declare #+allegro (:fbound next-token) (ignorable old-coll) (optimize (speed 3) (safety 1)))
+   (setf (iostruct-seen-parameter-reference tokenbuf) t)
+   (macrolet ((add-to-entity-buf (entity-symbol p-value)
+ 	       `(progn
+Only in pxmlutils_0.0.9: test
diff --git a/dev-lisp/cl-pxmlutils/files/digest-cl-pxmlutils-0.0.9-r2 b/dev-lisp/cl-pxmlutils/files/digest-cl-pxmlutils-0.0.9-r2
new file mode 100644
index 000000000000..31e8096f5273
--- /dev/null
+++ b/dev-lisp/cl-pxmlutils/files/digest-cl-pxmlutils-0.0.9-r2
@@ -0,0 +1 @@
+MD5 c912a48167246d275fdc548f150ccbd4 pxmlutils_0.0.9.tar.gz 124191