[gentoo-commits] proj/lisp:master commit in: dev-lisp/gentoo-init/, dev-lisp/gentoo-init/files/

[gentoo-commits] proj/lisp:master commit in: dev-lisp/gentoo-init/, dev-lisp/gentoo-init/files/

[Stelian Ionescu]

commit:     faaa7c7e0c06c37c2117759fbbece22dc83a91d5
Author:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
AuthorDate: Fri Jun 17 14:22:14 2011 +0000
Commit:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
CommitDate: Fri Jun 17 14:22:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=faaa7c7e

dev-lisp/gentoo-init: bump to 1.0, use ASDF2

---
 dev-lisp/gentoo-init/files/gentoo-init.lisp        |   14 +++-----------
 dev-lisp/gentoo-init/files/source-registry.conf    |    5 +++++
 ...ntoo-init-0.4.ebuild => gentoo-init-1.0.ebuild} |   12 +++++++-----
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/dev-lisp/gentoo-init/files/gentoo-init.lisp b/dev-lisp/gentoo-init/files/gentoo-init.lisp
index ba6d10f..263aedd 100644
--- a/dev-lisp/gentoo-init/files/gentoo-init.lisp
+++ b/dev-lisp/gentoo-init/files/gentoo-init.lisp
@@ -1,19 +1,11 @@
 (in-package #:cl-user)
 
-#+(or sbcl ecl allegro) (require :asdf)
-#-(or sbcl ecl allegro)
 (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/asdf.lisp"
+          :print nil :verbose nil)
+    #+ecl
+    (load #p"/usr/share/common-lisp/source/asdf/asdf-ecl.lisp"
           :print nil :verbose nil)))
-
-(push #p"/usr/share/common-lisp/systems/" asdf:*central-registry*)
-
-(let ((*compile-print* nil)
-      (*compile-verbose* nil)
-      #+cmu (ext:*gc-verbose* nil))
-  (handler-bind ((warning #'muffle-warning))
-    (asdf:oos 'asdf:load-op :asdf-binary-locations)))
-(setf asdf:*centralize-lisp-binaries* t)

diff --git a/dev-lisp/gentoo-init/files/source-registry.conf b/dev-lisp/gentoo-init/files/source-registry.conf
new file mode 100644
index 0000000..45e1fdf
--- /dev/null
+++ b/dev-lisp/gentoo-init/files/source-registry.conf
@@ -0,0 +1,5 @@
+;; -*- Mode: Lisp; -*-
+
+(:source-registry
+ (:directory "/usr/share/common-lisp/systems")
+ :inherit-configuration)

diff --git a/dev-lisp/gentoo-init/gentoo-init-0.4.ebuild b/dev-lisp/gentoo-init/gentoo-init-1.0.ebuild
similarity index 50%
rename from dev-lisp/gentoo-init/gentoo-init-0.4.ebuild
rename to dev-lisp/gentoo-init/gentoo-init-1.0.ebuild
index bae7893..916467d 100644
--- a/dev-lisp/gentoo-init/gentoo-init-0.4.ebuild
+++ b/dev-lisp/gentoo-init/gentoo-init-1.0.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-DESCRIPTION="Simple ASDF-BINARY-LOCATIONS configuration for Gentoo Common Lisp ports."
+EAPI=3
+
+DESCRIPTION="Simple ASDF2 configuration for Gentoo Common Lisp ports."
 HOMEPAGE="http://www.gentoo.org/proj/en/lisp/common-lisp/guide.xml"
 
 LICENSE="GPL-2"
@@ -10,11 +12,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lisp/asdf-binary-locations-0.2.3"
+RDEPEND=">=dev-lisp/asdf-2.0.0"
 
 S="${WORKDIR}"
 
 src_install() {
-	insinto /etc
-	doins "${FILESDIR}"/gentoo-init.lisp
+	insinto /etc/common-lisp
+	doins "${FILESDIR}"/gentoo-init.lisp "${FILESDIR}"/source-registry.conf
 }