summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Kennedy <mkennedy@gentoo.org>2003-10-16 17:37:13 +0000
committerMatthew Kennedy <mkennedy@gentoo.org>2003-10-16 17:37:13 +0000
commit27c89b84307b06f53b550db0063a680d78157bbe (patch)
tree638598129a4000bc568a8d5d5c8fe6576a1120db /dev-lisp
parentVersion bumped (diff)
downloadgentoo-2-27c89b84307b06f53b550db0063a680d78157bbe.tar.gz
gentoo-2-27c89b84307b06f53b550db0063a680d78157bbe.tar.bz2
gentoo-2-27c89b84307b06f53b550db0063a680d78157bbe.zip
*** empty log message ***
Diffstat (limited to 'dev-lisp')
-rw-r--r--dev-lisp/cl-pxml/ChangeLog6
-rw-r--r--dev-lisp/cl-pxml/Manifest8
-rw-r--r--dev-lisp/cl-pxml/cl-pxml-20030325.ebuild22
-rw-r--r--dev-lisp/cl-pxml/files/pxml-20030325-gentoo.patch84
-rw-r--r--dev-lisp/cl-pxml/files/pxml.asd22
-rw-r--r--dev-lisp/cl-pxml/metadata.xml5
6 files changed, 128 insertions, 19 deletions
diff --git a/dev-lisp/cl-pxml/ChangeLog b/dev-lisp/cl-pxml/ChangeLog
index b859077da919..4272cd4fe0cb 100644
--- a/dev-lisp/cl-pxml/ChangeLog
+++ b/dev-lisp/cl-pxml/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lisp/cl-pxml
# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-pxml/ChangeLog,v 1.1 2003/06/10 04:53:04 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-pxml/ChangeLog,v 1.2 2003/10/16 17:37:11 mkennedy Exp $
+
+ 16 Oct 2003; Matthew Kennedy <mkennedy@gentoo.org> cl-pxml-20030325.ebuild,
+ metadata.xml, files/pxml-20030325-gentoo.patch, files/pxml.asd:
+ masked for now
*cl-pxml-20030325 (07 Jul 2003)
diff --git a/dev-lisp/cl-pxml/Manifest b/dev-lisp/cl-pxml/Manifest
index 8035e2edf908..f9632eb99833 100644
--- a/dev-lisp/cl-pxml/Manifest
+++ b/dev-lisp/cl-pxml/Manifest
@@ -1,5 +1,7 @@
-MD5 fb6d9a0163d89ce6827a2ac8f1fe4a9e ChangeLog 321
-MD5 9f503abedbc5ed1a0c71a9f4df029bc5 cl-pxml-20030325.ebuild 907
+MD5 9b65b0341efc8f4b29498aad23315229 metadata.xml 164
+MD5 f3c276d0d0f8401f457cbcb36e9dcd03 cl-pxml-20030325.ebuild 942
+MD5 e37d3a59f7fa76a4a055f53bd85c2d18 ChangeLog 483
+MD5 4b2a2a9b68656ff431ee8a42a4ab2392 files/pxml.asd 417
MD5 f63cd1b313a37c1b83b1f3683ea80deb files/digest-cl-pxml-20030325 68
+MD5 7c9071a34b1da982b0af9de90a394c55 files/pxml-20030325-gentoo.patch 2929
MD5 bbb59dd54bc4d55b47dc59a45bd238a0 files/pxml-gentoo.patch 1535
-MD5 7dca4766f93a466c0406ee95e16cd7e4 files/pxml.asd 166
diff --git a/dev-lisp/cl-pxml/cl-pxml-20030325.ebuild b/dev-lisp/cl-pxml/cl-pxml-20030325.ebuild
index b12777996bc0..287f8a985a75 100644
--- a/dev-lisp/cl-pxml/cl-pxml-20030325.ebuild
+++ b/dev-lisp/cl-pxml/cl-pxml-20030325.ebuild
@@ -1,15 +1,15 @@
# 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-pxml/cl-pxml-20030325.ebuild,v 1.3 2003/09/11 01:10:52 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-pxml/cl-pxml-20030325.ebuild,v 1.4 2003/10/16 17:37:11 mkennedy Exp $
inherit common-lisp
-DESCRIPTION="Common Lisp XML parser"
+DESCRIPTION="Common Lisp XML parser from Franz, Inc."
HOMEPAGE="http://opensource.franz.com/xmlutils/index.html"
SRC_URI="mirror://gentoo/xmlutils-${PV}.tar.gz"
LICENSE="LLGPL-2.1"
SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="-x86"
IUSE=""
DEPEND="dev-lisp/common-lisp-controller
virtual/commonlisp
@@ -21,15 +21,19 @@ S=${WORKDIR}/xmlutils
src_unpack() {
unpack ${A}
- cd ${S}
- # this is a bit beyond me at this point
- patch -p1 <${FILESDIR}/pxml-gentoo.patch || die
- for i in *.cl ; do mv $i ${i/.cl/.lisp} ; done
+ epatch ${FILESDIR}/pxml-${PV}-gentoo.patch
}
src_install() {
- common-lisp-install pxml?.lisp ${FILESDIR}/pxml.asd
- # pxml-test.lisp
+ common-lisp-install pxml?.cl ${FILESDIR}/pxml.asd
common-lisp-system-symlink
dodoc ChangeLog pxml.txt pxml.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-pxml/files/pxml-20030325-gentoo.patch b/dev-lisp/cl-pxml/files/pxml-20030325-gentoo.patch
new file mode 100644
index 000000000000..a9957c0543af
--- /dev/null
+++ b/dev-lisp/cl-pxml/files/pxml-20030325-gentoo.patch
@@ -0,0 +1,84 @@
+diff -u xmlutils.orig/pxml0.cl xmlutils/pxml0.cl
+--- xmlutils.orig/pxml0.cl 2003-04-01 00:41:01.000000000 -0600
++++ xmlutils/pxml0.cl 2003-10-16 11:29:53.067861096 -0500
+@@ -29,14 +29,14 @@
+ ;;
+
+ (defpackage net.xml.parser
+- (:use :lisp :clos :excl :net.uri)
++ (:use :lisp #+allegro :clos :acl-compat.excl :net.uri)
+ (:export
+ #:parse-xml)
+ )
+
+ (in-package :net.xml.parser)
+
+-(unless (fboundp 'pxml-dribble-bug-hook)
++#+allegro (unless (fboundp 'pxml-dribble-bug-hook)
+ (let ((pxml-version-strings nil))
+ (defun pxml-dribble-bug-hook (stream-or-string)
+ (if (stringp stream-or-string)
+@@ -47,7 +47,7 @@
+
+ (push 'pxml-dribble-bug-hook excl:*dribble-bug-hooks*)))
+
+-(funcall 'pxml-dribble-bug-hook "$Id: pxml-20030325-gentoo.patch,v 1.1 2003/10/16 17:37:11 mkennedy Exp $")
++#+allegro (funcall 'pxml-dribble-bug-hook "$Id: pxml-20030325-gentoo.patch,v 1.1 2003/10/16 17:37:11 mkennedy Exp $")
+
+ (defun xml-char-p (char)
+ (declare (optimize (speed 3) (safety 1)))
+diff -u xmlutils.orig/pxml1.cl xmlutils/pxml1.cl
+--- xmlutils.orig/pxml1.cl 2003-04-01 00:41:01.000000000 -0600
++++ xmlutils/pxml1.cl 2003-10-16 11:41:46.354425056 -0500
+@@ -25,13 +25,13 @@
+
+ (in-package :net.xml.parser)
+
+-(pxml-dribble-bug-hook "$Id: pxml-20030325-gentoo.patch,v 1.1 2003/10/16 17:37:11 mkennedy Exp $")
++#+allegro (pxml-dribble-bug-hook "$Id: pxml-20030325-gentoo.patch,v 1.1 2003/10/16 17:37:11 mkennedy Exp $")
+
+ (defparameter *collectors* (list nil nil nil nil nil nil nil nil))
+
+ (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
+@@ -83,7 +83,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))
+@@ -185,7 +185,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
+@@ -197,7 +197,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))
+@@ -265,7 +265,7 @@
+ (iostruct-read-sequence-func iostruct))))))
+ (if* (and from-stream (eq tmp-char #\return)) then #\newline else tmp-char)))
+
+-(defun unicode-check (p tokenbuf)
++#+allegro (defun unicode-check (p tokenbuf)
+ (declare (ignorable tokenbuf) (optimize (speed 3) (safety 1)))
+ ;; need no-OO check because external format support isn't completely done yet
+ (when (not (typep p 'string-input-simple-stream))
diff --git a/dev-lisp/cl-pxml/files/pxml.asd b/dev-lisp/cl-pxml/files/pxml.asd
index 02337826246d..8a7b0ab31932 100644
--- a/dev-lisp/cl-pxml/files/pxml.asd
+++ b/dev-lisp/cl-pxml/files/pxml.asd
@@ -1,9 +1,19 @@
+;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp -*-
-(in-package "CL-USER")
+(defpackage #:pxml-system
+ (:use #:cl #:asdf))
+(in-package #:pxml-system)
-(asdf:defsystem pxml
+(in-package :pxml-system)
+
+(defclass acl-file (cl-source-file) ())
+
+(defmethod asdf::source-file-type ((c acl-file) (s module))
+ "cl")
+
+(defsystem pxml
:depends-on (acl-compat)
- :components ((:file "pxml0")
- (:file "pxml1")
- (:file "pxml2")
- (:file "pxml3"))) \ No newline at end of file
+ :components ((:acl-file "pxml0")
+ (:acl-file "pxml1")
+ (:acl-file "pxml2")
+ (:acl-file "pxml3")))
diff --git a/dev-lisp/cl-pxml/metadata.xml b/dev-lisp/cl-pxml/metadata.xml
new file mode 100644
index 000000000000..f418045b09c8
--- /dev/null
+++ b/dev-lisp/cl-pxml/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>