dev-lisp/cmucl: use gentoo-init-1.0 and ASDF2, bump to 20b_p001-r1

4 files changed, 23 insertions, 18 deletions

diff --git a/dev-lisp/cmucl/Manifest b/dev-lisp/cmucl/Manifest
index 172b6b16..4a2d0fe1 100644
--- a/dev-lisp/cmucl/Manifest
+++ b/dev-lisp/cmucl/Manifest
@@ -2,9 +2,9 @@ AUX 20b-customize-lisp-implementation-version.patch 697 RMD160 24c08df29a98eb73a
 AUX 20b-execstack-fixes.patch 3990 RMD160 ffdd6a680f6c81d56c67211bb4506d1424b83226 SHA1 65cd11aba2630db79529719a69e28fe7a4348c58 SHA256 f507d48eef3ae55e9f38ef96964d2179a3a328837420e866be4509c5fdde9131
 AUX 20b-nositeinit-build.patch 772 RMD160 96e5126db63f1b045304ac4507e9f61b54c094f2 SHA1 b44e89b06d6ee563e1c3ab9eccc9b24b4b650d3c SHA256 ab3a1bc613e390097dd08148b3d887aa8c92eab833e2413c1bf440dba082ff17
 AUX 20b-patch001.patch 4252 RMD160 04cde3cef620e88612e6d538242af56d456a41f8 SHA1 834d72d8fad5ab642353b84b76dca04a61f34b0a SHA256 d8f8aa82637234e57aef5d5216789af8adc01ccc799c4e62a6fc448c7cc66da1
-AUX cmuclrc 305 RMD160 f3cb3cde18b7c5acc087d278d133a0c4ae0efc82 SHA1 ed3b1cfb3f4e702d1d87584e6a3bf5d4ffe4d080 SHA256 4f1f050f8dcbf261c9ee33075d5546a43fd14f7f0cd0ad486b175081bd4b27d2
+AUX cmuclrc 109 RMD160 a86b92de011237296eeade744e77d515095c2a4f SHA1 9fa66657fca74b27f5a7e73ac95b50119a5e03a4 SHA256 5cd659abf9f32fe0a82225b455d2be3348ddb753e731c2a8382f8ed62bcd2784
 AUX fix-man-and-doc-installation.patch 1671 RMD160 9bbc857219ae45170c41974967bd111c02d8121c SHA1 accb39eb4a9879830ce55dbb9dc6c91102757757 SHA256 77b9844670345e4c79510969b2676db1b0a366ed0f1e5c07ac74c477cdf65819
-AUX site-init.lisp.in 1839 RMD160 cf5673c06c3e6f63782ab77a5a92377579a853ab SHA1 98a719850fd658a312ab72c7fd0af6d2552ce6e3 SHA256 6164e40b50a0a0e7175089f0b55d549b8f24ef602c1c0c41f9433f5c61c512e7
+AUX site-init.lisp.in 1897 RMD160 e476d3d6cfebca3222fe49dbf4b1f1639d1246e5 SHA1 bdb52eada6365d026d03a8a8e5fed5d94b13a625 SHA256 f0414035234ab2a18ba1a6660fe95ff696a788bab9945c580e2f76e3ec75cc1a
 DIST cmucl-20b-x86-linux.tar.bz2 17612706 RMD160 ecc41c357f0db335d989d07383f3d0046cc20ce8 SHA1 73aca21ec8ee3b8119c34883d884808466de89a2 SHA256 b6c9e1c25abb69fbe08892e3e58e7dc24accb8c0e5a37a7685bfccaf67c800e8
 DIST cmucl-src-20b.tar.bz2 5834128 RMD160 bb0e19437faacbf99dfa0cd087ef89b2c7f5ddee SHA1 ea2fa41bbba3e8b51d55d7c5fc787baa537e8648 SHA256 42dcb9851e692b18d1f544bcdcb3ae18704cc9726ba42780c9677bac700cf5ab
-EBUILD cmucl-20b_p001.ebuild 2367 RMD160 8315e793c16578c8616b71363cc064c11df884d1 SHA1 cb8524576dcc65ef25e0fe71f3edfc5d99df7aca SHA256 54232cea57a6e9ce3974dd3979c6ad534a8dbb14447dd17ce0710eeed16ce398
+EBUILD cmucl-20b_p001-r1.ebuild 2525 RMD160 87ae42a446fc64396355153037072303259b9821 SHA1 371c3e5957dd4ac2e41bc607ea4763a42a36e4c8 SHA256 3b8642319cc36e2536e2b1e39b00df13b3001740a87d0c0bcd8fa075763ab362
diff --git a/dev-lisp/cmucl/cmucl-20b_p001.ebuild b/dev-lisp/cmucl/cmucl-20b_p001-r1.ebuild
index 6b90075c..21cec425 100644
--- a/dev-lisp/cmucl/cmucl-20b_p001.ebuild
+++ b/dev-lisp/cmucl/cmucl-20b_p001-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -16,12 +16,13 @@ RESTRICT="mirror"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="X source sse2"
+IUSE="+asdf X source sse2"
 
-RDEPEND="x11-libs/openmotif"
-DEPEND="${RDEPEND}
+DEPEND="x11-libs/openmotif
 		sys-devel/bc"
-PDEPEND="dev-lisp/gentoo-init"
+
+RDEPEND="x11-libs/openmotif
+		asdf? ( >=dev-lisp/gentoo-init-1.0 )"
 
 S="${WORKDIR}"
 
@@ -67,6 +68,13 @@ src_install() {
 		< "${FILESDIR}"/site-init.lisp.in \
 		> "${D}"/usr/$(get_libdir)/cmucl/site-init.lisp \
 		|| die "Cannot fix site-init.lisp"
-	insinto /etc
-	doins "${FILESDIR}"/cmuclrc || die "Failed to install cmuclrc"
+	cp "${FILESDIR}"/cmuclrc .
+	if use asdf; then
+		cat >> cmuclrc <<EOF
+;;; Setup ASDF2
+(load "/etc/common-lisp/gentoo-init.lisp")
+EOF
+	fi
+	insinto /etc/common-lisp
+	doins cmuclrc || die "Failed to install cmuclrc"
 }
diff --git a/dev-lisp/cmucl/files/cmuclrc b/dev-lisp/cmucl/files/cmuclrc
index e663e92a..ecdad5ad 100644
--- a/dev-lisp/cmucl/files/cmuclrc
+++ b/dev-lisp/cmucl/files/cmuclrc
@@ -3,7 +3,3 @@
 
 (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
index 1b232166..bd09645b 100644
--- a/dev-lisp/cmucl/files/site-init.lisp.in
+++ b/dev-lisp/cmucl/files/site-init.lisp.in
@@ -7,14 +7,15 @@
 
 ;;; Heavy modifications by Peter Van Eynde
 
-;;; More modifications for Gentoo by Matthew Kennedy
+;;; More modifications for Gentoo by Matthew Kennedy and Stelian Ionescu
 ;;; <mkennedy@gentoo.org>
 
 (in-package "SYSTEM")
 
-(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 (probe-file "/etc/common-lisp/cmuclrc")
+    (load "/etc/common-lisp/cmuclrc")
+  (format t "~%;;; Warning: There is no /etc/common-lisp/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