[gentoo-commits] proj/lisp:master commit in: dev-lisp/sbcl/, dev-lisp/gentoo-init/, dev-lisp/asdf/, ...

["Stelian Ionescu" <sionescu@cddr.org>]

commit:     c70f88fa2b7ec05429c922e324cd1b6cd40ba874
Author:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
AuthorDate: Thu Apr  4 01:04:27 2013 +0000
Commit:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
CommitDate: Thu Apr  4 01:04:27 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=c70f88fa

Use subslots for ASDF, switch SBCL to subslot deps on ASDF

---
 .../asdf/{asdf-2.32.ebuild => asdf-2.32-r1.ebuild} |    4 +++-
 dev-lisp/gentoo-init/files/gentoo-init.lisp        |    4 ++++
 ...o-init-1.1.ebuild => gentoo-init-1.1-r1.ebuild} |    2 +-
 .../{sbcl-1.1.5.ebuild => sbcl-1.1.5-r1.ebuild}    |    7 +++++--
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/dev-lisp/asdf/asdf-2.32.ebuild b/dev-lisp/asdf/asdf-2.32-r1.ebuild
similarity index 96%
rename from dev-lisp/asdf/asdf-2.32.ebuild
rename to dev-lisp/asdf/asdf-2.32-r1.ebuild
index 85ef872..9b7a3f1 100644
--- a/dev-lisp/asdf/asdf-2.32.ebuild
+++ b/dev-lisp/asdf/asdf-2.32-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=5
 inherit eutils common-lisp-3
 
 DESCRIPTION="ASDF is Another System Definition Facility for Common Lisp"
@@ -14,6 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
+SLOT="2/${PVR}"
+
 RDEPEND="!dev-lisp/cl-${PN}
 		!dev-lisp/asdf-binary-locations"
 PDEPEND="~dev-lisp/uiop-${PV}

diff --git a/dev-lisp/gentoo-init/files/gentoo-init.lisp b/dev-lisp/gentoo-init/files/gentoo-init.lisp
index 6d82944..e6b9b0a 100644
--- a/dev-lisp/gentoo-init/files/gentoo-init.lisp
+++ b/dev-lisp/gentoo-init/files/gentoo-init.lisp
@@ -1,8 +1,12 @@
 (in-package #:cl-user)
 
+#-(or sbcl)
 (let ((*compile-print* nil)
       (*compile-verbose* nil)
       #+cmu (ext:*gc-verbose* nil))
   (handler-bind ((warning #'muffle-warning))
     (load #p"/usr/share/common-lisp/source/asdf/build/asdf.lisp"
           :print nil :verbose nil)))
+
+#+(or sbcl)
+(require :asdf)

diff --git a/dev-lisp/gentoo-init/gentoo-init-1.1.ebuild b/dev-lisp/gentoo-init/gentoo-init-1.1-r1.ebuild
similarity index 98%
rename from dev-lisp/gentoo-init/gentoo-init-1.1.ebuild
rename to dev-lisp/gentoo-init/gentoo-init-1.1-r1.ebuild
index eacd501..305a704 100644
--- a/dev-lisp/gentoo-init/gentoo-init-1.1.ebuild
+++ b/dev-lisp/gentoo-init/gentoo-init-1.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=5
 
 DESCRIPTION="Simple ASDF2 configuration for Gentoo Common Lisp ports."
 HOMEPAGE="http://www.gentoo.org/proj/en/lisp/common-lisp/guide.xml"

diff --git a/dev-lisp/sbcl/sbcl-1.1.5.ebuild b/dev-lisp/sbcl/sbcl-1.1.5-r1.ebuild
similarity index 97%
rename from dev-lisp/sbcl/sbcl-1.1.5.ebuild
rename to dev-lisp/sbcl/sbcl-1.1.5-r1.ebuild
index a037aff..bf5067a 100644
--- a/dev-lisp/sbcl/sbcl-1.1.5.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.1.5-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=5
 inherit multilib eutils flag-o-matic pax-utils
 
 #same order as http://www.sbcl.org/platform-table.html
@@ -31,7 +31,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="+asdf cobalt debug doc ldb source +threads +unicode"
 
-DEPEND="doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
+DEPEND="doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
+		dev-lisp/asdf:="
 RDEPEND="elibc_glibc? ( >=sys-libs/glibc-2.3 || ( <sys-libs/glibc-2.6[nptl] >=sys-libs/glibc-2.6 ) )
 		asdf? ( >=dev-lisp/gentoo-init-1.1 )"
 
@@ -85,6 +86,8 @@ src_prepare() {
 		epatch "${FILESDIR}"/gentoo-fix_nopie_for_hardened_toolchain.patch
 	fi
 
+	cp /usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+
 	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
 
 	# Some shells(such as dash) don't have "time" as builtin