Package-Manager: portage-2.0.51.19

4 files changed, 77 insertions, 6 deletions

diff --git a/dev-lisp/cl-odcl/ChangeLog b/dev-lisp/cl-odcl/ChangeLog
index 4d4ff591343e..9ad49642b0fe 100644
--- a/dev-lisp/cl-odcl/ChangeLog
+++ b/dev-lisp/cl-odcl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lisp/cl-odcl
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-odcl/ChangeLog,v 1.8 2005/02/04 23:14:09 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-odcl/ChangeLog,v 1.9 2005/04/11 08:33:24 mkennedy Exp $
+
+  11 Apr 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/1.3.5-gentoo.patch, cl-odcl-1.3.5.ebuild:
+  Keywording for ~amd64
 
   04 Feb 2005; Matthew Kennedy <mkennedy@gentoo.org>
   +files/1.3.5-package-lock-gentoo.patch, -cl-odcl-1.3.3.ebuild,
diff --git a/dev-lisp/cl-odcl/Manifest b/dev-lisp/cl-odcl/Manifest
index ff5dd4d39985..6611ca102046 100644
--- a/dev-lisp/cl-odcl/Manifest
+++ b/dev-lisp/cl-odcl/Manifest
@@ -1,6 +1,7 @@
-MD5 7cd52d8b9353d581fb83d7cccde45c0f cl-odcl-1.3.5.ebuild 1154
-MD5 48cfff4a3476ce4988e0cfcd0bd7db38 ChangeLog 1225
+MD5 6fac81eed7457442dd5f499c99eee2b9 ChangeLog 1354
+MD5 e1aa4212dd5b47be8dd98766eed48a06 cl-odcl-1.3.5.ebuild 1207
 MD5 2fbabdd1de915ec0c6cae311c1c0a33e metadata.xml 596
 MD5 8dc619bd165d3aec6e97a0e5e2a4231f files/1.3.5-package-lock-gentoo.patch 807
-MD5 4ae94c8da5ffefff9294edb1e963a3c1 files/digest-cl-odcl-1.3.5 70
 MD5 f123d753710b35e6ad767e2075f1da8b files/clisp-tests-gentoo.patch 400
+MD5 4ae94c8da5ffefff9294edb1e963a3c1 files/digest-cl-odcl-1.3.5 70
+MD5 5f8bc1dbfab84820f07552e937c266fa files/1.3.5-gentoo.patch 2449
diff --git a/dev-lisp/cl-odcl/cl-odcl-1.3.5.ebuild b/dev-lisp/cl-odcl/cl-odcl-1.3.5.ebuild
index 3266a9fede0e..bae9b840228a 100644
--- a/dev-lisp/cl-odcl/cl-odcl-1.3.5.ebuild
+++ b/dev-lisp/cl-odcl/cl-odcl-1.3.5.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-odcl/cl-odcl-1.3.5.ebuild,v 1.6 2005/02/04 23:14:09 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-odcl/cl-odcl-1.3.5.ebuild,v 1.7 2005/04/11 08:33:24 mkennedy Exp $
 
 inherit common-lisp eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://packages.debian.org/unstable/devel/cl-odcl"
 SRC_URI="http://ftp.debian.org/debian/pool/main/c/cl-odcl/${PN}_${PV}.orig.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="x86 ~ppc ~amd64"
 IUSE=""
 DEPEND="dev-lisp/common-lisp-controller
 	virtual/commonlisp"
@@ -19,6 +19,7 @@ CLPACKAGE=odcl
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${PV}-package-lock-gentoo.patch || die
+	epatch ${FILESDIR}/${PV}-gentoo.patch || die
 	cd ${S}
 	epatch ${FILESDIR}/clisp-tests-gentoo.patch || die
 }
diff --git a/dev-lisp/cl-odcl/files/1.3.5-gentoo.patch b/dev-lisp/cl-odcl/files/1.3.5-gentoo.patch
new file mode 100644
index 000000000000..2e7b65321e67
--- /dev/null
+++ b/dev-lisp/cl-odcl/files/1.3.5-gentoo.patch
@@ -0,0 +1,65 @@
+diff -ur cl-odcl-1.3.5.orig/numbers.lisp cl-odcl-1.3.5/numbers.lisp
+--- cl-odcl-1.3.5.orig/numbers.lisp	2005-04-11 03:22:10.000000000 -0500
++++ cl-odcl-1.3.5/numbers.lisp	2005-04-11 03:24:08.000000000 -0500
+@@ -6,10 +6,10 @@
+ (in-package :odcl)
+ 
+ (defun parse-integer-insensitively (string)
+-  (flet ((digit-char-p (char)
++  (flet ((char->digit (char)
+            (position char "1234567890")))
+-    (let ((start (position-if #'digit-char-p string))
+-          (end   (position-if #'digit-char-p string :from-end t)))
++    (let ((start (position-if #'char->digit string))
++          (end   (position-if #'char->digit string :from-end t)))
+       (when (and start end)
+         (parse-integer (subseq string start (1+ end)) :junk-allowed t)))))
+ 
+diff -ur cl-odcl-1.3.5.orig/tree.lisp cl-odcl-1.3.5/tree.lisp
+--- cl-odcl-1.3.5.orig/tree.lisp	2005-04-11 03:22:10.000000000 -0500
++++ cl-odcl-1.3.5/tree.lisp	2005-04-11 03:28:50.000000000 -0500
+@@ -172,7 +172,7 @@
+ 
+ (defmethod c-add ((tree avl-tree) item &aux result-data)
+   (assert (not (null item)))
+-  (flet ((merge (data &optional existing-node)
++  (flet ((merge* (data &optional existing-node)
+            (unless existing-node
+              (setf existing-node (avl/create)))
+            (setf result-data (avl/data existing-node)
+@@ -186,7 +186,7 @@
+            (q nil)
+            (r nil))
+       (unless p
+-        (setf (avl/right _t) (merge item))
++        (setf (avl/right _t) (merge* item))
+         (return-from c-add result-data))
+       (loop
+        ;; A2 [Compare.]
+@@ -194,7 +194,7 @@
+               ;; A3 [Move left.]
+               (setq q (avl/left p))
+               (when (null q)
+-                (setf q (merge item)
++                (setf q (merge* item)
+                       (avl/left p) q)
+                 (return))
+               (unless (= 0 (avl/balance q))
+@@ -205,7 +205,7 @@
+               ;; A4 [Move right.]
+               (setq q (avl/right p))
+               (when (null q)
+-                (setf q (merge item)
++                (setf q (merge* item)
+                       (avl/right p) q)
+                 (return))
+               (unless (= 0 (avl/balance q))
+@@ -213,7 +213,7 @@
+                       s q))
+               (setf p q))
+              (t
+-              (merge item p)
++              (merge* item p)
+               (return-from c-add result-data))))
+       ;; A5 [Insert.] (initialization done above)
+       ;; A6 [Adjust balance factors.]