boo-ya ka-sha!

5 files changed, 34 insertions, 30 deletions

diff --git a/dev-lisp/cl-bouquet/ChangeLog b/dev-lisp/cl-bouquet/ChangeLog
index ff2e7ca54e77..8186ec95a642 100644
--- a/dev-lisp/cl-bouquet/ChangeLog
+++ b/dev-lisp/cl-bouquet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lisp/cl-bouquet
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-bouquet/ChangeLog,v 1.3 2004/06/24 23:41:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-bouquet/ChangeLog,v 1.4 2004/08/07 05:22:07 mkennedy Exp $
+
+  07 Aug 2004; <mkennedy@gentoo.org> +files/0.1-package-lock-gentoo.patch,
+  -files/cl-bouquet-0.1-clisp-package-lock-gentoo.patch,
+  cl-bouquet-0.1.ebuild:
+  Fix package lock failure
 
   19 May 2004; <mkennedy@gentoo.org>
   +files/cl-bouquet-0.1-clisp-package-lock-gentoo.patch,
diff --git a/dev-lisp/cl-bouquet/Manifest b/dev-lisp/cl-bouquet/Manifest
index f8c21d0652f9..27e6a0f0f304 100644
--- a/dev-lisp/cl-bouquet/Manifest
+++ b/dev-lisp/cl-bouquet/Manifest
@@ -1,5 +1,6 @@
-MD5 cbd18d85bc084dac989f01bde84d4d79 cl-bouquet-0.1.ebuild 822
+MD5 cbd18d85bc084dac989f01bde84d4d79 cl-bouquet-0.1.ebuild.~1.5.~ 822
 MD5 17642427ea3b27e0e59a61a719b789e5 ChangeLog 691
+MD5 6126226b1296e510b73fdd5e5ad8b0d6 cl-bouquet-0.1.ebuild 817
 MD5 09550cbfcc213daad260827408043ccd metadata.xml 379
 MD5 be4bc91e4615ba8378b928d0fbf6049a files/digest-cl-bouquet-0.1 62
-MD5 bb0088f162051bf06e30c177a9a1a79c files/cl-bouquet-0.1-clisp-package-lock-gentoo.patch 932
+MD5 1b4691acd730193c56c64acc71bc9f24 files/0.1-package-lock-gentoo.patch 744
diff --git a/dev-lisp/cl-bouquet/cl-bouquet-0.1.ebuild b/dev-lisp/cl-bouquet/cl-bouquet-0.1.ebuild
index c7c3beefbef9..38ca24776a97 100644
--- a/dev-lisp/cl-bouquet/cl-bouquet-0.1.ebuild
+++ b/dev-lisp/cl-bouquet/cl-bouquet-0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-bouquet/cl-bouquet-0.1.ebuild,v 1.5 2004/07/14 15:23:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-bouquet/cl-bouquet-0.1.ebuild,v 1.6 2004/08/07 05:22:07 mkennedy Exp $
 
 inherit common-lisp eutils
 
@@ -20,7 +20,7 @@ S=${WORKDIR}/bouquet
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${P}-clisp-package-lock-gentoo.patch
+	epatch ${FILESDIR}/${PV}-package-lock-gentoo.patch
 }
 
 src_install() {
diff --git a/dev-lisp/cl-bouquet/files/0.1-package-lock-gentoo.patch b/dev-lisp/cl-bouquet/files/0.1-package-lock-gentoo.patch
new file mode 100644
index 000000000000..0f7f6d6d2be1
--- /dev/null
+++ b/dev-lisp/cl-bouquet/files/0.1-package-lock-gentoo.patch
@@ -0,0 +1,23 @@
+diff -ur bouquet.orig/bouquet.lisp bouquet/bouquet.lisp
+--- bouquet.orig/bouquet.lisp	2004-05-03 05:06:40.000000000 -0500
++++ bouquet/bouquet.lisp	2004-08-07 00:07:01.863133456 -0500
+@@ -100,8 +100,8 @@
+ 	  :accessor edges)))
+ 
+ (defclass tulip-property ()
+-  ((property-type :initarg :type
+-		  :accessor type)
++  ((property-type :initarg :property-type
++		  :accessor property-type)
+    (cluster :initarg :cluster
+ 	    :accessor cluster
+ 	    :initform nil)
+@@ -189,7 +189,7 @@
+       (format stream
+ 	  "(property ~D ~(~A~) ~S~%(default ~S ~S)~%~{(node ~D ~S)~%~}~{(edge ~D ~S)~%~})"
+ 	  (if cluster (numeric-id cluster) 0)
+-	  (type property)
++	  (property-type property)
+ 	  name
+ 	  (nodes-default property)
+ 	  (edges-default property)
diff --git a/dev-lisp/cl-bouquet/files/cl-bouquet-0.1-clisp-package-lock-gentoo.patch b/dev-lisp/cl-bouquet/files/cl-bouquet-0.1-clisp-package-lock-gentoo.patch
deleted file mode 100644
index ab89b895ed51..000000000000
--- a/dev-lisp/cl-bouquet/files/cl-bouquet-0.1-clisp-package-lock-gentoo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ur bouquet.orig/bouquet.asd bouquet/bouquet.asd
---- bouquet.orig/bouquet.asd	2004-04-30 04:41:02.000000000 -0500
-+++ bouquet/bouquet.asd	2004-05-19 11:25:41.242113070 -0500
-@@ -1,6 +1,12 @@
- (defpackage #:bouquet-system (:use #:asdf #:cl))
- (in-package #:bouquet-system)
- 
-+(defclass possibly-unsafe-file (cl-source-file) ())
-+
-+(defmethod perform :around ((op load-op) (c possibly-unsafe-file))
-+  #+clisp (setf (ext:package-lock "COMMON-LISP") nil)
-+  (call-next-method))
-+
- (asdf:defsystem :bouquet
-     :version "0.3.0"
-     :author "Eugene Zaikonnikov"
-@@ -12,7 +18,7 @@
- 		 ((#:albert #:docbook #:cvs-viewurl) . "http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/bouquet/bouquet/")
- 		 ((#:albert #:docbook #:cvs-tag) . "HEAD"))
-     :components ((:file "package")
--		 (:file "bouquet" :depends-on ("package"))
-+		 (:possibly-unsafe-file "bouquet" :depends-on ("package"))
- 		 (:file "tests" :depends-on ("bouquet"))))
- 
-