*** empty log message ***

7 files changed, 101 insertions, 37 deletions

diff --git a/dev-lisp/cl-phtml/ChangeLog b/dev-lisp/cl-phtml/ChangeLog
index ee27efca3e4c..981c2e621175 100644
--- a/dev-lisp/cl-phtml/ChangeLog
+++ b/dev-lisp/cl-phtml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lisp/cl-phtml
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-phtml/ChangeLog,v 1.1 2003/06/10 04:53:04 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-phtml/ChangeLog,v 1.2 2003/10/16 14:59:59 mkennedy Exp $
+
+  16 Oct 2003; Matthew Kennedy <mkennedy@gentoo.org> cl-phtml-20030325.ebuild,
+  metadata.xml, files/phtml-20030325-gentoo.patch, files/phtml-gentoo.patch,
+  files/phtml.asd:
+  ported to clisp, sbcl, sbcl-mt from upstream. added preinst, postrm. added
+  cl-acl-compat dep.
 
 *cl-phtml-20030325 (07 Jul 2003)
 
diff --git a/dev-lisp/cl-phtml/Manifest b/dev-lisp/cl-phtml/Manifest
index 0a8cc23942d1..66c92f1ce9f6 100644
--- a/dev-lisp/cl-phtml/Manifest
+++ b/dev-lisp/cl-phtml/Manifest
@@ -1,5 +1,6 @@
-MD5 e88b7e1e5185e36abcafa7b660061744 ChangeLog 324
-MD5 93b2582d8306022bbbeff6270ba50dd4 cl-phtml-20030325.ebuild 910
+MD5 9b65b0341efc8f4b29498aad23315229 metadata.xml 164
+MD5 4171f1ac18a8a4e9749da1cd464f59b7 cl-phtml-20030325.ebuild 985
+MD5 e1dc3f309951bde9a2cf662d8ef42e3b ChangeLog 598
 MD5 f63cd1b313a37c1b83b1f3683ea80deb files/digest-cl-phtml-20030325 68
-MD5 5af4f2dc69eafb90e45559b4847b66c7 files/phtml-gentoo.patch 619
-MD5 1c0183a9b2accef6ebd379b80cf37567 files/phtml.asd 111
+MD5 2f52f9618fe70342b67b58c88a38c6e8 files/phtml-20030325-gentoo.patch 1654
+MD5 7aa2ff915c16a96d1aa324c9a3373828 files/phtml.asd 352
diff --git a/dev-lisp/cl-phtml/cl-phtml-20030325.ebuild b/dev-lisp/cl-phtml/cl-phtml-20030325.ebuild
index 3eeead1632eb..06794a17825b 100644
--- a/dev-lisp/cl-phtml/cl-phtml-20030325.ebuild
+++ b/dev-lisp/cl-phtml/cl-phtml-20030325.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-phtml/cl-phtml-20030325.ebuild,v 1.2 2003/09/06 22:35:54 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-phtml/cl-phtml-20030325.ebuild,v 1.3 2003/10/16 14:59:59 mkennedy Exp $
 
 inherit common-lisp
 
-DESCRIPTION="Common Lisp HTML parser which can be used with cl-htmlgen."
+DESCRIPTION="Common Lisp HTML parser from Franz, Inc. which can be used with cl-htmlgen."
 HOMEPAGE="http://opensource.franz.com/xmlutils/index.html"
 SRC_URI="mirror://gentoo/xmlutils-${PV}.tar.gz"
 LICENSE="LLGPL-2.1"
@@ -21,14 +21,19 @@ S=${WORKDIR}/xmlutils
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	patch -p1 <${FILESDIR}/phtml-gentoo.patch || die
-	for i in *.cl ; do mv $i ${i/.cl/.lisp} ; done
+	epatch ${FILESDIR}/phtml-${PV}-gentoo.patch
 }
 
 src_install() {
-	common-lisp-install phtml.lisp ${FILESDIR}/phtml.asd
-	# phtml-test.lisp
+	common-lisp-install phtml.cl ${FILESDIR}/phtml.asd
 	common-lisp-system-symlink
 	dodoc ChangeLog phtml.txt phtml.htm
 }
+
+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-phtml/files/phtml-20030325-gentoo.patch b/dev-lisp/cl-phtml/files/phtml-20030325-gentoo.patch
new file mode 100644
index 000000000000..120d76463a08
--- /dev/null
+++ b/dev-lisp/cl-phtml/files/phtml-20030325-gentoo.patch
@@ -0,0 +1,59 @@
+diff -u xmlutils.orig/phtml.cl xmlutils/phtml.cl
+--- xmlutils.orig/phtml.cl	2003-04-01 00:41:00.000000000 -0600
++++ xmlutils/phtml.cl	2003-10-16 09:40:42.226740320 -0500
+@@ -1,3 +1,4 @@
++#+allegro
+ (sys:defpatch "phtml" 1
+   "parse-html close tag closes consecutive identical open tags."
+   :type :system
+@@ -48,7 +49,7 @@
+ ;
+ 
+ (defpackage net.html.parser
+-  (:use :lisp :clos :excl)
++  (:use :common-lisp #+allegro :clos :acl-compat-mp :acl-compat.excl)
+   (:export
+    #:phtml-internal
+    #:parse-html))
+@@ -103,7 +104,7 @@
+ (defun get-collector ()
+   (declare (optimize (speed 3) (safety 1)))
+   (let (col)
+-    (mp::without-scheduling
++    (acl-compat.mp:without-scheduling
+       (do* ((cols *collectors* (cdr cols))
+ 	    (this (car cols) (car cols)))
+ 	  ((null cols))
+@@ -121,7 +122,7 @@
+ 
+ (defun put-back-collector (col)
+   (declare (optimize (speed 3) (safety 1)))
+-  (mp::without-scheduling 
++  (acl-compat.mp:without-scheduling 
+     (do ((cols *collectors* (cdr cols)))
+ 	((null cols)
+ 	 ; toss it away
+@@ -533,7 +534,7 @@
+ (defun get-tokenbuf ()
+   (declare (optimize (speed 3) (safety 1)))
+   (let (buf)
+-    (mp::without-scheduling
++    (acl-compat.mp:without-scheduling
+       (do* ((bufs *tokenbufs* (cdr bufs))
+ 	    (this (car bufs) (car bufs)))
+ 	  ((null bufs))
+@@ -552,7 +553,7 @@
+ 
+ (defun put-back-tokenbuf (buf)
+   (declare (optimize (speed 3) (safety 1)))
+-  (mp::without-scheduling 
++  (acl-compat.mp:without-scheduling 
+     (do ((bufs *tokenbufs* (cdr bufs)))
+ 	((null bufs)
+ 	 ; toss it away
+@@ -1390,4 +1391,4 @@
+ ;;;	  (parse-response
+ ;;;	   (simple-get host path)))))
+ 
+-(provide :phtml)
++#+allegro (provide :phtml)
diff --git a/dev-lisp/cl-phtml/files/phtml-gentoo.patch b/dev-lisp/cl-phtml/files/phtml-gentoo.patch
deleted file mode 100644
index c0052057c7d4..000000000000
--- a/dev-lisp/cl-phtml/files/phtml-gentoo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -u xmlutils.orig/phtml.cl xmlutils/phtml.cl
---- xmlutils.orig/phtml.cl	2003-04-01 00:41:00.000000000 -0600
-+++ xmlutils/phtml.cl	2003-06-09 19:25:13.000000000 -0500
-@@ -1,8 +1,3 @@
--(sys:defpatch "phtml" 1
--  "parse-html close tag closes consecutive identical open tags."
--  :type :system
--  :post-loadable t)
--
- ;; copyright (c) 1986-2000 Franz Inc, Berkeley, CA 
- ;;
- ;; This code is free software; you can redistribute it and/or
-@@ -48,7 +43,7 @@
- ;
- 
- (defpackage net.html.parser
--  (:use :lisp :clos :excl)
-+  (:use :lisp :excl)
-   (:export
-    #:phtml-internal
-    #:parse-html))
-Only in xmlutils: phtml.cl~
diff --git a/dev-lisp/cl-phtml/files/phtml.asd b/dev-lisp/cl-phtml/files/phtml.asd
index b2147e33e925..0b7d49887db6 100644
--- a/dev-lisp/cl-phtml/files/phtml.asd
+++ b/dev-lisp/cl-phtml/files/phtml.asd
@@ -1,6 +1,16 @@
+;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp -*-
 
-(in-package "CL-USER")
+(defpackage #:phtml-system
+  (:use #:cl #:asdf))
+(in-package #:phtml-system)
 
-(asdf:defsystem phtml
+(in-package :phtml-system)
+
+(defclass acl-file (cl-source-file) ())
+
+(defmethod asdf::source-file-type ((c acl-file) (s module)) 
+  "cl")
+
+(defsystem phtml
     :depends-on (acl-compat)
-    :components ((:file "phtml")))
+    :components ((:acl-file "phtml")))
diff --git a/dev-lisp/cl-phtml/metadata.xml b/dev-lisp/cl-phtml/metadata.xml
new file mode 100644
index 000000000000..f418045b09c8
--- /dev/null
+++ b/dev-lisp/cl-phtml/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>common-lisp</herd>
+</pkgmetadata>