.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 89 insertions, 7 deletions

diff --git a/dev-lisp/abcl-cvs/ChangeLog b/dev-lisp/abcl-cvs/ChangeLog
index 1a372c2e59cd..661b71532e5c 100644
--- a/dev-lisp/abcl-cvs/ChangeLog
+++ b/dev-lisp/abcl-cvs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lisp/abcl-cvs
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/abcl-cvs/ChangeLog,v 1.1 2005/06/10 15:26:53 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/abcl-cvs/ChangeLog,v 1.2 2005/06/20 21:15:30 mkennedy Exp $
+
+  20 Jun 2005; Matthew Kennedy <mkennedy@gentoo.org> +files/clc-lite.lisp,
+  abcl-cvs-0.ebuild:
+  Updated support; new USE flags: jpty, libabcl; Install clc-lite.lisp
 
 *abcl-cvs-0 (10 Jun 2005)
 
diff --git a/dev-lisp/abcl-cvs/Manifest b/dev-lisp/abcl-cvs/Manifest
index e2f9fef35d36..e07610d8c6fb 100644
--- a/dev-lisp/abcl-cvs/Manifest
+++ b/dev-lisp/abcl-cvs/Manifest
@@ -1,6 +1,7 @@
-MD5 c8256d10959c9fa868921b58fd82f3be abcl-cvs-0.ebuild 955
+MD5 047f88cb78f60cc6331c374d114cc3e9 abcl-cvs-0.ebuild 1220
 MD5 b6a54e50eae430cd07528f6850aaac17 metadata.xml 403
-MD5 d8f6dc6481e92fd68567acc05e5659d6 ChangeLog 411
+MD5 105447a03bc9a6c5396f8bc0ec3f65be ChangeLog 579
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-abcl-cvs-0 0
 MD5 038ee5392e620c54c0973082bd987652 files/j 124
 MD5 ef31c45735e62ba0eb84c62b2509aa38 files/abcl 143
+MD5 0e513373ec8c0af1409abbf3497ad814 files/clc-lite.lisp 2050
diff --git a/dev-lisp/abcl-cvs/abcl-cvs-0.ebuild b/dev-lisp/abcl-cvs/abcl-cvs-0.ebuild
index f1a4d590ddf2..e562afccc937 100644
--- a/dev-lisp/abcl-cvs/abcl-cvs-0.ebuild
+++ b/dev-lisp/abcl-cvs/abcl-cvs-0.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/abcl-cvs/abcl-cvs-0.ebuild,v 1.1 2005/06/10 15:26:53 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/abcl-cvs/abcl-cvs-0.ebuild,v 1.2 2005/06/20 21:15:30 mkennedy Exp $
 
 ECVS_SERVER="cvs.sourceforge.net:/cvsroot/armedbear-j"
 if [ -z "${ECVS_BRANCH}" ]; then
@@ -11,7 +11,7 @@ ECVS_USER="anonymous"
 ECVS_PASS=""
 ECVS_CVS_OPTIONS="-dP"
 
-inherit cvs java-pkg
+inherit cvs java-pkg eutils
 
 DESCRIPTION="Armed Bear Common Lisp is a Common Lisp implementation for the JVM."
 HOMEPAGE="http://armedbear-j.sourceforge.net/"
@@ -19,7 +19,7 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE=""
+IUSE="debug libabcl jpty"
 
 DEPEND="virtual/jdk"
 
@@ -27,7 +27,11 @@ S=${WORKDIR}/${ECVS_MODULE}
 
 src_compile() {
 	chmod +x ${S}/{configure,mkinstalldirs}
-	econf --with-jdk=`java-config -O` || die
+	econf --with-jdk=`java-config -O` \
+		`use_enable debug debug` \
+		`use_enable libabcl libabcl` \
+		`use_enable jpty jpty` \
+		|| die
 	make || die
 }
 
@@ -38,4 +42,11 @@ src_install() {
 	insinto /usr/share/j
 	doins -r themes
 	dobin ${FILESDIR}/{abcl,j}
+	if use jpty; then
+		dobin src/jpty/jpty
+	fi
+	if use libabcl; then
+		exeinto /usr/$(get_libdir)/abcl
+		doexe src/org/armedbear/lisp/libabcl.so
+	fi
 }
diff --git a/dev-lisp/abcl-cvs/files/clc-lite.lisp b/dev-lisp/abcl-cvs/files/clc-lite.lisp
new file mode 100644
index 000000000000..39d347799a7e
--- /dev/null
+++ b/dev-lisp/abcl-cvs/files/clc-lite.lisp
@@ -0,0 +1,66 @@
+;;;; -*- mode: common-lisp; indent-tabs-mode: nil; package: common-lisp-controller -*-
+
+(defpackage #:common-lisp-controller
+  (:use #:common-lisp))
+
+(in-package #:common-lisp-controller)
+
+(defvar *source-root* #p"/usr/share/common-lisp/source/")
+
+(defvar *fasl-root* nil)
+
+(defvar *implementation-name* "abcl")
+
+(eval-when (:load-toplevel :compile-toplevel :execute)
+  (unless (member :asdf *features*)
+    (require 'asdf)))
+
+;; I cut this out of the original Common Lisp Controller v4 from Debian
+
+(defun calculate-fasl-root  ()
+  "Inits common-lisp controller for this user"
+  (unless *fasl-root*
+    (setf *fasl-root*
+	  ;; set it to the username of the user:
+	  (let* (#-cmu
+		 (homedir (pathname-directory
+			   (user-homedir-pathname)))
+		 ;; cmucl has searchlist home (!)
+		 #+cmu
+		 (homedirs (extensions:search-list "home:"))
+		 #+cmu
+		 (homedir (when homedirs
+			    (pathname-directory
+			     (first homedirs)))))
+	    ;; strip off :re or :abs
+	    (when (or (eq (first homedir)
+			  :relative)
+		      (eq (first homedir)
+			  :absolute))
+	      (setf homedir (rest homedir)))
+	    ;; if it starts with home, nuke it
+	    (when (string= (first homedir)
+			   "home")
+	      (setf homedir (rest homedir)))
+	    ;; now append *implementation-name*
+	    (setf homedir (append homedir
+				  (list *implementation-name*)))
+	    ;; this should be able to cope with
+	    ;; homedirs like /home/p/pv/pvaneynd ...
+	    (merge-pathnames
+	     (make-pathname
+	      :directory `(:relative ,@homedir))
+	     #p"/var/cache/common-lisp-controller/")))))
+
+(defun source-root-path-to-fasl-path (source)
+  "Converts a path in the source root into the equivalent path in the fasl root"
+  (calculate-fasl-root)
+  (merge-pathnames 
+   (enough-namestring source (asdf::resolve-symlinks *source-root*))
+   *fasl-root*))
+
+(defmethod asdf:output-files :around ((op asdf:operation) (c asdf:component))
+  (let ((orig (call-next-method)))
+    (mapcar #'source-root-path-to-fasl-path orig)))
+
+(pushnew #p"/usr/share/common-lisp/systems/" asdf:*central-registry*)