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

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

[Stelian Ionescu]

commit:     96252daad7ebd1751f1b3ff0549ed6fea250a966
Author:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
AuthorDate: Thu Apr  4 14:31:59 2013 +0000
Commit:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
CommitDate: Thu Apr  4 14:31:59 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=96252daa

Move gentoo-init functionality to ASDF

dev-lisp/gentoo-init is now a dummy ebuild and it should be removed as
soon as all CL implementations are changed to depend directly on ASDF

---
 .../asdf/{asdf-2.33.ebuild => asdf-2.33-r1.ebuild} |    9 ++++++---
 .../{gentoo-init => asdf}/files/gentoo-init.lisp   |    0
 .../files/source-registry.conf                     |    0
 ...nit-1.1-r1.ebuild => gentoo-init-1.1-r2.ebuild} |   10 +++-------
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/dev-lisp/asdf/asdf-2.33.ebuild b/dev-lisp/asdf/asdf-2.33-r1.ebuild
similarity index 77%
rename from dev-lisp/asdf/asdf-2.33.ebuild
rename to dev-lisp/asdf/asdf-2.33-r1.ebuild
index f1c51cb..fc34009 100644
--- a/dev-lisp/asdf/asdf-2.33.ebuild
+++ b/dev-lisp/asdf/asdf-2.33-r1.ebuild
@@ -17,9 +17,9 @@ IUSE=""
 SLOT="2/${PVR}"
 
 RDEPEND="!dev-lisp/cl-${PN}
-		!dev-lisp/asdf-binary-locations"
-PDEPEND="~dev-lisp/uiop-${PV}
-		 >=dev-lisp/gentoo-init-1.1"
+		 !dev-lisp/asdf-binary-locations
+		 !<dev-lisp/gentoo-init-1.1-r2"
+PDEPEND="~dev-lisp/uiop-${PV}"
 
 S="${WORKDIR}"
 
@@ -32,4 +32,7 @@ src_install() {
 	common-lisp-install-asdf asdf.asd
 	dodoc README TODO
 	dohtml doc/*.{html,css,ico,png}
+
+	insinto /etc/common-lisp
+	doins "${FILESDIR}"/gentoo-init.lisp "${FILESDIR}"/source-registry.conf
 }

diff --git a/dev-lisp/gentoo-init/files/gentoo-init.lisp b/dev-lisp/asdf/files/gentoo-init.lisp
similarity index 100%
rename from dev-lisp/gentoo-init/files/gentoo-init.lisp
rename to dev-lisp/asdf/files/gentoo-init.lisp

diff --git a/dev-lisp/gentoo-init/files/source-registry.conf b/dev-lisp/asdf/files/source-registry.conf
similarity index 100%
rename from dev-lisp/gentoo-init/files/source-registry.conf
rename to dev-lisp/asdf/files/source-registry.conf

diff --git a/dev-lisp/gentoo-init/gentoo-init-1.1-r1.ebuild b/dev-lisp/gentoo-init/gentoo-init-1.1-r2.ebuild
similarity index 67%
rename from dev-lisp/gentoo-init/gentoo-init-1.1-r1.ebuild
rename to dev-lisp/gentoo-init/gentoo-init-1.1-r2.ebuild
index 305a704..a4dbadc 100644
--- a/dev-lisp/gentoo-init/gentoo-init-1.1-r1.ebuild
+++ b/dev-lisp/gentoo-init/gentoo-init-1.1-r2.ebuild
@@ -12,11 +12,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lisp/asdf-2.32"
+RDEPEND=">=dev-lisp/asdf-2.32-r1"
 
-S="${WORKDIR}"
-
-src_install() {
-	insinto /etc/common-lisp
-	doins "${FILESDIR}"/gentoo-init.lisp "${FILESDIR}"/source-registry.conf
-}
+# Dummy ebuild. All functionality has been moved to ASDF
+# Remove as soon as all CL implementations are migrated to ASDF3 directly