Package-Manager: portage-2.0.51-r15

6 files changed, 45 insertions, 45 deletions

diff --git a/dev-lisp/cl-rsm-modal/ChangeLog b/dev-lisp/cl-rsm-modal/ChangeLog
index bd3d24c6a489..563266690ec8 100644
--- a/dev-lisp/cl-rsm-modal/ChangeLog
+++ b/dev-lisp/cl-rsm-modal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lisp/cl-rsm-modal
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-rsm-modal/ChangeLog,v 1.3 2004/06/24 23:53:08 agriffis Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-rsm-modal/ChangeLog,v 1.4 2005/02/05 21:39:42 mkennedy Exp $
+
+  05 Feb 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/1.0-defconstant-gentoo.patch, cl-rsm-modal-1.0-r1.ebuild,
+  -cl-rsm-modal-1.0.ebuild:
+  Removed old ebuilds; Include DEFCONSTANT fix.
 
 *cl-rsm-modal-1.0-r1 (12 Feb 2004)
 
diff --git a/dev-lisp/cl-rsm-modal/Manifest b/dev-lisp/cl-rsm-modal/Manifest
index 5980a2840606..fd315fd5d288 100644
--- a/dev-lisp/cl-rsm-modal/Manifest
+++ b/dev-lisp/cl-rsm-modal/Manifest
@@ -1,6 +1,5 @@
-MD5 b2d81ade303b17a7b9afa21a04d44c72 cl-rsm-modal-1.0-r1.ebuild 757
-MD5 f99e8bbfb87d8c16a0d75068c27e20b1 ChangeLog 555
-MD5 c10e7b3fd383bee51757a44d4565d2bc cl-rsm-modal-1.0.ebuild 884
+MD5 214494344eb18c29e8308e3584ef380f cl-rsm-modal-1.0-r1.ebuild 817
+MD5 55fb601ea6122e63434e1bb92490f2c3 ChangeLog 752
 MD5 9b65b0341efc8f4b29498aad23315229 metadata.xml 164
-MD5 6daa9610da06241d8457fd44b6219a97 files/digest-cl-rsm-modal-1.0 66
 MD5 6daa9610da06241d8457fd44b6219a97 files/digest-cl-rsm-modal-1.0-r1 66
+MD5 f96d76dbc8e562f60c1856a901e0e138 files/1.0-defconstant-gentoo.patch 907
diff --git a/dev-lisp/cl-rsm-modal/cl-rsm-modal-1.0-r1.ebuild b/dev-lisp/cl-rsm-modal/cl-rsm-modal-1.0-r1.ebuild
index 08c876fdca6e..81f601e95095 100644
--- a/dev-lisp/cl-rsm-modal/cl-rsm-modal-1.0-r1.ebuild
+++ b/dev-lisp/cl-rsm-modal/cl-rsm-modal-1.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-rsm-modal/cl-rsm-modal-1.0-r1.ebuild,v 1.3 2004/07/14 16:05:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-rsm-modal/cl-rsm-modal-1.0-r1.ebuild,v 1.4 2005/02/05 21:39:42 mkennedy Exp $
 
-inherit common-lisp
+inherit common-lisp eutils
 
 DESCRIPTION="R. Scott McIntire's Common Lisp Modal Logic Library"
 HOMEPAGE="http://packages.debian.org/unstable/devel/cl-rsm-modal.html"
@@ -11,11 +11,15 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
-DEPEND="dev-lisp/common-lisp-controller
-	virtual/commonlisp "
+DEPEND="dev-lisp/cl-plus"
 
 CLPACKAGE=rsm-modal
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PV}-defconstant-gentoo.patch || die
+}
+
 src_install() {
 	common-lisp-install *.lisp *.asd
 	common-lisp-system-symlink
diff --git a/dev-lisp/cl-rsm-modal/cl-rsm-modal-1.0.ebuild b/dev-lisp/cl-rsm-modal/cl-rsm-modal-1.0.ebuild
deleted file mode 100644
index 7042d23cd527..000000000000
--- a/dev-lisp/cl-rsm-modal/cl-rsm-modal-1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-rsm-modal/cl-rsm-modal-1.0.ebuild,v 1.3 2004/07/14 16:05:38 agriffis Exp $
-
-inherit common-lisp
-
-DESCRIPTION="McIntire's Common Lisp Modal Logic Library"
-HOMEPAGE="http://packages.debian.org/unstable/devel/cl-rsm-modal.html"
-SRC_URI="http://ftp.debian.org/debian/pool/main/c/cl-rsm-modal/cl-rsm-modal_1.0.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND="dev-lisp/common-lisp-controller
-	virtual/commonlisp "
-
-CLPACKAGE=rsm-modal
-
-src_install() {
-	common-lisp-install *.lisp *.asd
-	common-lisp-system-symlink
-	dodoc copying copyright
-	dohtml *.html *.jpg
-	do-debian-credits
-}
-
-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-rsm-modal/files/1.0-defconstant-gentoo.patch b/dev-lisp/cl-rsm-modal/files/1.0-defconstant-gentoo.patch
new file mode 100644
index 000000000000..41280991a1bc
--- /dev/null
+++ b/dev-lisp/cl-rsm-modal/files/1.0-defconstant-gentoo.patch
@@ -0,0 +1,26 @@
+diff -ur cl-rsm-modal-1.0.orig/modal.lisp cl-rsm-modal-1.0/modal.lisp
+--- cl-rsm-modal-1.0.orig/modal.lisp	2005-02-05 15:14:10.000000000 -0600
++++ cl-rsm-modal-1.0/modal.lisp	2005-02-05 15:25:21.685439300 -0600
+@@ -34,7 +34,7 @@
+     (make-hash-table :test #'equalp)
+   "Stores modal systems by name.")
+ 
+-(defconstant +primitive-truth-function+
++(cl+:defconst +primitive-truth-function+
+     #'(lambda (world prop)
+         (declare (ignore world prop))
+         nil)
+diff -ur cl-rsm-modal-1.0.orig/rsm-modal.asd cl-rsm-modal-1.0/rsm-modal.asd
+--- cl-rsm-modal-1.0.orig/rsm-modal.asd	2005-02-05 15:14:10.000000000 -0600
++++ cl-rsm-modal-1.0/rsm-modal.asd	2005-02-05 15:34:00.938969207 -0600
+@@ -27,8 +27,8 @@
+     
+   :components
+   ((:file "package")
+-   (:file "modal" :depends-on ("package"))
+-   ))
++   (:file "modal" :depends-on ("package")))
++  :depends-on (cl-plus))
+ 
+ 
+ (defsystem :rsm-modal-test
diff --git a/dev-lisp/cl-rsm-modal/files/digest-cl-rsm-modal-1.0 b/dev-lisp/cl-rsm-modal/files/digest-cl-rsm-modal-1.0
deleted file mode 100644
index 4b4fae8b864c..000000000000
--- a/dev-lisp/cl-rsm-modal/files/digest-cl-rsm-modal-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4a41531c66b0583fce1aaac58cd29690 cl-rsm-modal_1.0.tar.gz 7947