Add dodir to fix installing issue. wrt bug 321375 and some missing files

Package-Manager: portage-2.2_rc67/cvs/Linux i686

5 files changed, 81 insertions, 4 deletions

diff --git a/dev-lisp/cmucl/ChangeLog b/dev-lisp/cmucl/ChangeLog
index 4a308ba4f071..6eb62ac8f2d5 100644
--- a/dev-lisp/cmucl/ChangeLog
+++ b/dev-lisp/cmucl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lisp/cmucl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/ChangeLog,v 1.32 2010/05/12 04:14:47 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/ChangeLog,v 1.33 2010/05/27 00:47:18 chiiph Exp $
+
+  27 May 2010; Tomas Touceda <chiiph@gentoo.org> cmucl-20a.ebuild,
+  +files/cmuclrc, +files/site-init.lisp.in:
+  Add dodir to fix installing issue. wrt bug 321375 and some missing files
 
 *cmucl-20a (12 May 2010)
 
diff --git a/dev-lisp/cmucl/Manifest b/dev-lisp/cmucl/Manifest
index 2cbd52b815e1..8e3c833165db 100644
--- a/dev-lisp/cmucl/Manifest
+++ b/dev-lisp/cmucl/Manifest
@@ -7,7 +7,9 @@ AUX 19d-cmucl-patch-002.patch 1289 RMD160 677e67369392e2d0d77c3e75d50964984897e1
 AUX 19d-gentoo.patch 1331 RMD160 e78cf4588976d363f52959e7f4a8afc9d814b917 SHA1 20de05f939a3ef79243c92b575b3d5c2602b579b SHA256 4c661395dd633c51099ef833f79af868fb8188af1e519c7308182ecf03a5ce30
 AUX 20a-multiplefixes.patch 3990 RMD160 5311892ba7aa33e2dc0cfe82c4c48547000914be SHA1 abe23ea6d0e0da5b890062240191d9590f5db811 SHA256 4894e2088e0745cb8ad55b8ec4852d04d2949837e6f5d7ca2d8fe340ece6f554
 AUX 20a-patch000.patch 679 RMD160 c371ed28a06c652b433e1b2c3c3052650a9c224b SHA1 8a44aa62d96cfc5befe1656db2bc0c6bac87439b SHA256 ab375f40369d0c7e7d7cc8593405ce2b8b88397ec7faf2a6c7035f55a51fe4f3
+AUX cmuclrc 305 RMD160 f3cb3cde18b7c5acc087d278d133a0c4ae0efc82 SHA1 ed3b1cfb3f4e702d1d87584e6a3bf5d4ffe4d080 SHA256 4f1f050f8dcbf261c9ee33075d5546a43fd14f7f0cd0ad486b175081bd4b27d2
 AUX fix-man-and-doc-installation.patch 1671 RMD160 9bbc857219ae45170c41974967bd111c02d8121c SHA1 accb39eb4a9879830ce55dbb9dc6c91102757757 SHA256 77b9844670345e4c79510969b2676db1b0a366ed0f1e5c07ac74c477cdf65819
+AUX site-init.lisp.in 1971 RMD160 a30f444bb6b35623654dbd729bbaa86f6d2215ff SHA1 906a45575872e6e612f0a528930345f8ca3a52dd SHA256 3e0c6a8ed24658a61b39879b5f83915bed211a62b3832f153958530f272bc020
 DIST cmucl-19c-x86-linux.tar.bz2 7305922 RMD160 9731fb0fa5f3b47afb89f16c79378324ca8a79b3 SHA1 098c13a7120499a7ff68d4992a76ef7b9442f8c0 SHA256 4f8e1a819e69be176dd03efbd7cc282261d8ddc70b22ffdba1136853f58a30e7
 DIST cmucl-19d-x86-linux.tar.bz2 7600189 RMD160 43a6d3e2637a74dad3155923f6771c213e09f54a SHA1 3e32c5f204974fdb68570f885cd0ae3ee5de5504 SHA256 5d459213f37dac8f633377d1c64901d1e9fe9c5774a7b1d5f914c306fb48dadc
 DIST cmucl-20a-x86-linux.tar.bz2 16390027 RMD160 5bb559f12fcd78cdc5d0c7cb9d89420094dd0f5d SHA1 f9b3141f9298abe1f69cbb88938ff96a12445eb6 SHA256 920db6d07427fae919b1b936fea88d242bb664d5e1fbbce3b8ee6bbe98744d1a
@@ -17,6 +19,6 @@ DIST cmucl_19c-release-20051115-1.diff.gz 1506111 RMD160 4b74b89e4deaa1dff1e8d00
 DIST cmucl_19c-release-20051115.orig.tar.gz 4654304 RMD160 1c6b165a8427839d48639047020ee7c9c368da65 SHA1 4d95482e94b55e93a7efb148c63f1f2fe0a5449e SHA256 4eebac35decc23449f4cf79996c31ea674df7136e08b829210d352c5d20d2407
 EBUILD cmucl-19c.ebuild 4658 RMD160 c0db5d2e490edb195baa14379c8e1834774293d8 SHA1 06b91147d15c4c148dc51bd0536026b2d384f3b0 SHA256 7ea7fcc46094875162a7a8c52b681a664160884c6336aeb601ca756d5dd8b5bc
 EBUILD cmucl-19d_p2.ebuild 1842 RMD160 7bd4da86ac558e22edfca0579b6e693a8ed6597c SHA1 f2224037a7996054766e5e45c1816abb13baa8cf SHA256 db9d59903e6102ed876a6194483c8c4d5f31fe0648d44048b702f8aee88320de
-EBUILD cmucl-20a.ebuild 2236 RMD160 b87c05a9df288a0621b1fb0f2f5ad917ab0edab1 SHA1 e46d23ca096ece3d4757a9c3f2da45d84dcd64bc SHA256 ffb52a0ef416cd922baf3be87b9000d4cde76447311750c66714b6e5e030d577
-MISC ChangeLog 6587 RMD160 7dc04fef15fcd8a2370984de7d1465069f3dcfdf SHA1 e2d02b7f01d9580e3350938b2c75b64cb9ddd730 SHA256 3bfce6eeda869c239839eef9ffe25bdc57f44a6fec9b2609c2de8a238b194516
+EBUILD cmucl-20a.ebuild 2271 RMD160 56dafcf7b321cb13883c94e21833707da53db8e4 SHA1 b49af5540b7712d0222cee1c85aacbdc7c0e553d SHA256 a5ff927ab3df79b65d27760c2f25c31ac06046b397e385cd78c5acb00d18000a
+MISC ChangeLog 6774 RMD160 501563d6e8167ba4c57f79ce35f9207bb5badf1d SHA1 75e35e1534a2791c61c7f283d05d38897927b39b SHA256 6600fc99c30fa12618e56b9e71c7eb7edbf79f913dcbcc30ed8244506bb2413f
 MISC metadata.xml 1201 RMD160 a53109298a26c111b24bccabac8c5fa8084d2756 SHA1 4bc50d74b522f84bfaaec751b935b0cffe872ff1 SHA256 e0d0e5aef67b7b9cb0aae16ac7b92fa8279a5e3a9b658a87ce4d8d20eea94edb
diff --git a/dev-lisp/cmucl/cmucl-20a.ebuild b/dev-lisp/cmucl/cmucl-20a.ebuild
index bccfc4455e7b..111e7833f8ac 100644
--- a/dev-lisp/cmucl/cmucl-20a.ebuild
+++ b/dev-lisp/cmucl/cmucl-20a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-20a.ebuild,v 1.1 2010/05/12 04:14:47 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-20a.ebuild,v 1.2 2010/05/27 00:47:18 chiiph Exp $
 
 EAPI="3"
 
@@ -58,6 +58,8 @@ src_install() {
 	env MANDIR=share/man/man1 DOCDIR=share/doc/${PF} \
 		src/tools/make-dist.sh -S -g -G root -O root build-4 ${MY_PV} x86 linux || die "Cannot build installation archive"
 
+	dodir /usr || die "dodir failed"
+
 	tar xzpf cmucl-${MY_PV}-x86-linux.tar.gz -C "${D}"/usr || die "Cannot install main system"
 	if use X ; then
 		tar xzpf cmucl-${MY_PV}-x86-linux.extra.tar.gz -C "${D}"/usr || die "Cannot install extra files"
diff --git a/dev-lisp/cmucl/files/cmuclrc b/dev-lisp/cmucl/files/cmuclrc
new file mode 100644
index 000000000000..e663e92af87a
--- /dev/null
+++ b/dev-lisp/cmucl/files/cmuclrc
@@ -0,0 +1,9 @@
+;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; indent-tabs-mode: nil -*-
+;;;
+
+(in-package :common-lisp-user)
+
+(if (probe-file "/etc/gentoo-init.lisp")
+	(load "/etc/gentoo-init.lisp")
+  (format t "~%;;; Warning: There is no /etc/gentoo-init.lisp file ~
+\(which should be provided by dev-lisp/gentoo-init"))
diff --git a/dev-lisp/cmucl/files/site-init.lisp.in b/dev-lisp/cmucl/files/site-init.lisp.in
new file mode 100644
index 000000000000..7a1010102003
--- /dev/null
+++ b/dev-lisp/cmucl/files/site-init.lisp.in
@@ -0,0 +1,60 @@
+;;; -*- Mode: Lisp; Package: System -*-
+;;;
+;;; **********************************************************************
+;;; This code was written as part of the CMU Common Lisp project at
+;;; Carnegie Mellon University, and has been placed in the public domain.
+;;;
+
+;;; Heavy modifications by Peter Van Eynde
+
+;;; More modifications for Gentoo by Matthew Kennedy
+;;; <mkennedy@gentoo.org>
+
+(in-package "SYSTEM")
+
+(ext:without-package-locks
+  (defun lisp-implementation-version ()
+    (format nil "~X-~A" c:byte-fasl-file-version "@VERSION@")))
+
+(if (probe-file "/etc/cmuclrc")
+    (load "/etc/cmuclrc")
+  (format t "~%;;; Warning: There is no /etc/cmuclrc file (which should have been created during emerge"))
+
+;;; If you have sources installed on your system, un-comment the following form
+;;; and change it to point to the source location.  This will allow the Hemlock
+;;; "Edit Definition" command and the debugger to find sources for functions in
+;;; the core.
+(when (probe-file #p"/usr/share/common-lisp/source/cmucl/")
+  (setf (ext:search-list "target:")
+        '(
+          "/usr/share/common-lisp/source/cmucl/" ; object dir
+          )))
+
+;;; (setf (ext:search-list "library:") '("/usr/lib/cmucl/lib/"))
+;;; for safety...
+
+;;; Put your site name here...
+(setq *short-site-name* "Unknown")
+(setq *long-site-name* "Site name not initialized")
+
+(in-package :common-lisp-user)
+
+;;; newbie functions, delete if you don't like them
+
+(defun help ()
+  (format t "~
+Welcome to the Gentoo GNU/Linux port of CMUCL.
+
+The CMUCL REPL does not have GNU Readline-like support, however
+you may wish to install rlwap (see: app-misc/rlwrap) to achieve
+the same effect.
+
+If you think you found a bug, please use http://bugs.gentoo.org/
+
+Read the documentation in /usr/share/doc/@PF@.
+
+\(quit)            exit Lisp
+\(describe 'foo)   gives information about foo
+\(inspect '*foo*)  interactively inspects *foo*
+\(apropos \"foo\") briefly describe all symbols which match \"foo\"
+"))