(Portage version: 2.0.51-r15)

7 files changed, 42 insertions, 94 deletions

diff --git a/dev-lisp/cl-odcl/ChangeLog b/dev-lisp/cl-odcl/ChangeLog
index 6f0f16c347e6..4d4ff591343e 100644
--- a/dev-lisp/cl-odcl/ChangeLog
+++ b/dev-lisp/cl-odcl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lisp/cl-odcl
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-odcl/ChangeLog,v 1.7 2004/08/07 22:06:21 slarti Exp $
+# 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 $
+
+  04 Feb 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/1.3.5-package-lock-gentoo.patch, -cl-odcl-1.3.3.ebuild,
+  -cl-odcl-1.3.4.ebuild, cl-odcl-1.3.5.ebuild:
+  Tag stable keywords for x86; Removed old ebuilds; Include fix for package
+  locking (CMUCL)
 
   07 Aug 2004; Tom Martin <slarti@gentoo.org> :
   Typo in DESCRIPTION: implimentation -> implementation. Bug 59717.
diff --git a/dev-lisp/cl-odcl/cl-odcl-1.3.3.ebuild b/dev-lisp/cl-odcl/cl-odcl-1.3.3.ebuild
deleted file mode 100644
index 3fc491674547..000000000000
--- a/dev-lisp/cl-odcl/cl-odcl-1.3.3.ebuild
+++ /dev/null
@@ -1,36 +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-odcl/cl-odcl-1.3.3.ebuild,v 1.6 2004/08/07 22:05:14 slarti Exp $
-
-inherit common-lisp
-
-DESCRIPTION="A Common Lisp library of utility functions. This package contains a number of useful utility functions for Lisp developers.  Include are editing contexts, a transaction system, a filesystem database with indexing, a LRU cache algorithm, time functions, simple i18n/l10n, developer diagnostics, a test regression system, SMTP mailer, object property sets and utility functions related to lists, strings and numbers."
-HOMEPAGE="http://alpha.onshored.com/lisp-software/#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"
-IUSE=""
-DEPEND="dev-lisp/common-lisp-controller
-	virtual/commonlisp"
-
-CLPACKAGE=odcl
-
-src_unpack() {
-	unpack ${A}
-	# some tests die on clisp
-	cd ${S} && patch -p0 <${FILESDIR}/clisp-tests-gentoo.patch || die
-}
-
-src_install() {
-	common-lisp-install *.lisp odcl.asd odcl.system
-	dodir /usr/share/common-lisp/systems
-	dosym /usr/share/common-lisp/source/odcl/odcl.asd \
-		/usr/share/common-lisp/systems/odcl.asd
-	dosym /usr/share/common-lisp/source/odcl/odcl.system \
-		/usr/share/common-lisp/systems/odcl.system
-
-	insinto /usr/share/common-lisp/source/odcl/tests
-	doins tests/*.lisp
-	dodoc COPYING ChangeLog NEWS README VERSION
-}
diff --git a/dev-lisp/cl-odcl/cl-odcl-1.3.4.ebuild b/dev-lisp/cl-odcl/cl-odcl-1.3.4.ebuild
deleted file mode 100644
index 689c756b5bb0..000000000000
--- a/dev-lisp/cl-odcl/cl-odcl-1.3.4.ebuild
+++ /dev/null
@@ -1,46 +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-odcl/cl-odcl-1.3.4.ebuild,v 1.5 2004/08/07 22:05:14 slarti Exp $
-
-inherit common-lisp eutils
-
-DESCRIPTION="A Common Lisp library of utility functions. This package contains a number of useful utility functions for Lisp developers.  Include are editing contexts, a transaction system, a filesystem database with indexing, a LRU cache algorithm, time functions, simple i18n/l10n, developer diagnostics, a test regression system, SMTP mailer, object property sets and utility functions related to lists, strings and numbers."
-HOMEPAGE="http://alpha.onshored.com/lisp-software/#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"
-IUSE=""
-
-DEPEND="dev-lisp/common-lisp-controller
-	virtual/commonlisp"
-
-CLPACKAGE=odcl
-
-src_unpack() {
-	unpack ${A}
-	# some tests die on clisp
-	cd ${S} && epatch ${FILESDIR}/clisp-tests-gentoo.patch || die
-}
-
-src_install() {
-	common-lisp-install *.lisp odcl.asd odcl.system
-	dodir /usr/share/common-lisp/systems
-	dosym /usr/share/common-lisp/source/odcl/odcl.asd \
-		/usr/share/common-lisp/systems/odcl.asd
-	dosym /usr/share/common-lisp/source/odcl/odcl.system \
-		/usr/share/common-lisp/systems/odcl.system
-
-	insinto /usr/share/common-lisp/source/odcl/tests
-	doins tests/*.lisp
-	dodoc COPYING ChangeLog NEWS README VERSION
-}
-
-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-odcl/cl-odcl-1.3.5.ebuild b/dev-lisp/cl-odcl/cl-odcl-1.3.5.ebuild
index 6466b409c151..3266a9fede0e 100644
--- a/dev-lisp/cl-odcl/cl-odcl-1.3.5.ebuild
+++ b/dev-lisp/cl-odcl/cl-odcl-1.3.5.ebuild
@@ -1,18 +1,16 @@
-# 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-odcl/cl-odcl-1.3.5.ebuild,v 1.5 2004/08/07 22:05:14 slarti Exp $
+# $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 $
 
 inherit common-lisp eutils
 
 DESCRIPTION="A Common Lisp library of utility functions."
-HOMEPAGE="http://alpha.onshored.com/lisp-software/#odcl"
+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"
 IUSE=""
-
 DEPEND="dev-lisp/common-lisp-controller
 	virtual/commonlisp"
 
@@ -20,8 +18,9 @@ CLPACKAGE=odcl
 
 src_unpack() {
 	unpack ${A}
-	# some tests die on clisp
-	cd ${S} && epatch ${FILESDIR}/clisp-tests-gentoo.patch || die
+	epatch ${FILESDIR}/${PV}-package-lock-gentoo.patch || die
+	cd ${S}
+	epatch ${FILESDIR}/clisp-tests-gentoo.patch || die
 }
 
 src_install() {
diff --git a/dev-lisp/cl-odcl/files/1.3.5-package-lock-gentoo.patch b/dev-lisp/cl-odcl/files/1.3.5-package-lock-gentoo.patch
new file mode 100644
index 000000000000..aa39fcbba9ad
--- /dev/null
+++ b/dev-lisp/cl-odcl/files/1.3.5-package-lock-gentoo.patch
@@ -0,0 +1,27 @@
+diff -ur cl-odcl-1.3.5.orig/odcl.asd cl-odcl-1.3.5/odcl.asd
+--- cl-odcl-1.3.5.orig/odcl.asd	2005-02-04 16:46:56.586578149 -0600
++++ cl-odcl-1.3.5/odcl.asd	2005-02-04 17:05:26.734827463 -0600
+@@ -6,6 +6,14 @@
+ (defpackage :odcl-system (:use #:asdf #:cl))
+ (in-package :odcl-system)
+ 
++(defclass unlocked-file (cl-source-file)
++  ())
++
++(defmethod perform ((o load-op) (c unlocked-file))
++  (#+cmu ext:without-package-locks
++   #-cmu progn
++     (call-next-method)))
++
+ #+sbcl (setf asdf::*compile-file-warnings-behaviour* :ignore)
+ 
+ (defsystem :odcl
+@@ -50,7 +58,7 @@
+      (:file "persistence")
+      (:file "time")
+      (:file "iso-8601")
+-     #+cmu (:file "profile")
++     #+cmu (:unlocked-file "profile")
+      #+cmu (:file "log")
+      (:module "tests"
+               :components ((:file "test-avl")
diff --git a/dev-lisp/cl-odcl/files/digest-cl-odcl-1.3.3 b/dev-lisp/cl-odcl/files/digest-cl-odcl-1.3.3
deleted file mode 100644
index 062791cb1b60..000000000000
--- a/dev-lisp/cl-odcl/files/digest-cl-odcl-1.3.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 235fa207f3ae6ed5ab58871ead87582a cl-odcl_1.3.3.orig.tar.gz 100875
diff --git a/dev-lisp/cl-odcl/files/digest-cl-odcl-1.3.4 b/dev-lisp/cl-odcl/files/digest-cl-odcl-1.3.4
deleted file mode 100644
index c0d9a80b8f04..000000000000
--- a/dev-lisp/cl-odcl/files/digest-cl-odcl-1.3.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c0890c2c9835f212b850d6f294b91c96 cl-odcl_1.3.4.orig.tar.gz 101027