commit:     8da4f45e959d1c8b7a8d9f40c435760e1c517c61
Author:     Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  2 20:16:07 2017 +0000
Commit:     José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Sun Jul  2 20:16:07 2017 +0000
URL:        https://gitweb.gentoo.org/proj/lisp.git/commit/?id=8da4f45e

dev-lisp/weblocks: Updates to common-lisp-3 eclass

 dev-lisp/weblocks/weblocks-0.8.2.ebuild | 11 +++++------
 dev-lisp/weblocks/weblocks-9999.ebuild  | 27 +++++++++------------------
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/dev-lisp/weblocks/weblocks-0.8.2.ebuild 
b/dev-lisp/weblocks/weblocks-0.8.2.ebuild
index a474fa62..d97abf76 100644
--- a/dev-lisp/weblocks/weblocks-0.8.2.ebuild
+++ b/dev-lisp/weblocks/weblocks-0.8.2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-inherit common-lisp-2
+inherit common-lisp-3
 
 DESCRIPTION="Weblocks is a continuations-based web framework written in Common 
Lisp."
 HOMEPAGE="http://weblocks-framework.info/";
@@ -45,9 +44,9 @@ CLSYSTEMS="${PN} ${PN}-test ${PN}-scripts ${PN}-store-test
 
 src_install() {
        dodir "${CLSOURCEROOT}"/${PN}/scripts
-       cp -a scripts/weblocks-core "${D}/${CLSOURCEROOT}"/${PN}/scripts
+       cp -a scripts/weblocks-core "${D}/${CLSOURCEROOT}"/${PN}/scripts || die
        rm -rf scripts/weblocks-core
-       common-lisp-install *.asd examples pub scripts src test
-       common-lisp-symlink-asdf
+       common-lisp-install-sources examples pub scripts src test
+       common-lisp-install-asdf
        dodoc docs/*
 }

diff --git a/dev-lisp/weblocks/weblocks-9999.ebuild 
b/dev-lisp/weblocks/weblocks-9999.ebuild
index c42c7b09..a437021d 100644
--- a/dev-lisp/weblocks/weblocks-9999.ebuild
+++ b/dev-lisp/weblocks/weblocks-9999.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-WEBLOCKS_BRANCH=stable
-MY_P=${PN}-${WEBLOCKS_BRANCH}
-EHG_REPO_URI=http://bitbucket.org/skypher/${MY_P}/
+EAPI=6
 
-inherit common-lisp-2 mercurial
+inherit common-lisp-3 git-r3
 
 DESCRIPTION="Weblocks is a continuations-based web framework written in Common 
Lisp."
 HOMEPAGE="http://weblocks-framework.info/";
+EGIT_REPO_URI="https://github.com/weblocks-framework/weblocks";
 
 LICENSE="LLGPL-2.1"
 SLOT="0"
@@ -39,22 +37,15 @@ RDEPEND="dev-lisp/closer-mop
                dev-lisp/rt
                dev-lisp/lift"
 
-CLSYSTEMS="${PN} ${PN}-test ${PN}-scripts ${PN}-store-test
-               src/store/clsql/${PN}-clsql
-               src/store/elephant/${PN}-elephant
-               src/store/memory/${PN}-memory
-               src/store/prevalence/${PN}-prevalence
-               examples/${PN}-clsql-demo/${PN}-clsql-demo
-               examples/${PN}-demo/${PN}-demo
-               examples/${PN}-elephant-demo/${PN}-elephant-demo"
+CLSYSTEMS="${PN} ${PN}-test ${PN}-scripts ${PN}-util"
 
-S="${WORKDIR}"/${MY_P}
+S="${WORKDIR}"/${P}
 
 src_install() {
        dodir "${CLSOURCEROOT}"/${PN}/scripts
        cp -a scripts/weblocks-core "${D}/${CLSOURCEROOT}"/${PN}/scripts
        rm -rf scripts/weblocks-core
-       common-lisp-install *.asd examples pub scripts src test
-       common-lisp-symlink-asdf
-       dodoc docs/*
+       common-lisp-install-sources scripts src test
+       common-lisp-install-asdf
+       dodoc -r docs/*
 }

Reply via email to