[gentoo-commits] proj/lisp:master commit in: dev-lisp/clozurecl/

[José María Alonso]

commit:     6afdddd67bf0974eb913483a9e8f3ff901b0baee
Author:     Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 16:14:42 2016 +0000
Commit:     José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 16:14:42 2016 +0000
URL:        https://gitweb.gentoo.org/proj/lisp.git/commit/?id=6afdddd6

dev-lisp/clozurecl: Updates package to last version (taken from main tree)

 ...recl-1.9-r3.ebuild => clozurecl-1.11-r1.ebuild} | 46 +++++++++++-----------
 dev-lisp/clozurecl/clozurecl-1.9-r3.ebuild         |  1 +
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/dev-lisp/clozurecl/clozurecl-1.9-r3.ebuild 
b/dev-lisp/clozurecl/clozurecl-1.11-r1.ebuild
similarity index 64%
copy from dev-lisp/clozurecl/clozurecl-1.9-r3.ebuild
copy to dev-lisp/clozurecl/clozurecl-1.11-r1.ebuild
index 49b1024..45e02b4 100644
--- a/dev-lisp/clozurecl/clozurecl-1.9-r3.ebuild
+++ b/dev-lisp/clozurecl/clozurecl-1.11-r1.ebuild
@@ -2,18 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
+
 inherit eutils multilib toolchain-funcs
 
 MY_PN=ccl
 MY_P=${MY_PN}-${PV}
 
-DESCRIPTION="ClozureCL is a Common Lisp implementation, derived from 
Digitool's MCL product"
+DESCRIPTION="Common Lisp implementation, derived from Digitool's MCL product"
 HOMEPAGE="http://ccl.clozure.com/";
-SRC_URI="x86?   ( 
ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
-                amd64? ( 
ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )"
-                # ppc?   ( 
ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxppc.tar.gz )
-                # ppc64? ( 
ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxppc.tar.gz )"
+SRC_URI="
+       x86?   ( 
ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
+       amd64? ( 
ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
+       doc? ( http://ccl.clozure.com/docs/ccl.html )"
+       # ppc?   ( 
ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxppc.tar.gz )
+       # ppc64? ( 
ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxppc.tar.gz )"
 
 LICENSE="LLGPL-2.1"
 SLOT="0"
@@ -21,14 +24,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-CDEPEND=">=dev-lisp/asdf-2.33-r3:="
-DEPEND="${CDEPEND}
-               !dev-lisp/openmcl
-               dev-vcs/subversion"
-RDEPEND="${CDEPEND}"
+RDEPEND=">=dev-lisp/asdf-2.33-r3:="
+DEPEND="${RDEPEND}
+               !dev-lisp/openmcl"
 
 S="${WORKDIR}"/${MY_PN}
-
+PATCHES=( "${FILESDIR}"/ccl-format.patch )
 ENVD="${T}"/50ccl
 
 src_configure() {
@@ -44,22 +45,21 @@ src_configure() {
 }
 
 src_prepare() {
-       svn upgrade >/dev/null || die
+       default
        cp /usr/share/common-lisp/source/asdf/build/asdf.lisp tools/ || die
 }
 
 src_compile() {
-       emake -C lisp-kernel/${CCL_KERNEL} clean || die
-       emake -C lisp-kernel/${CCL_KERNEL} all CC="$(tc-getCC)" || die
+       emake -C lisp-kernel/${CCL_KERNEL} clean
+       emake -C lisp-kernel/${CCL_KERNEL} all CC="$(tc-getCC)"
 
        unset CCL_DEFAULT_DIRECTORY
        ./${CCL_RUNTIME} -n -b -Q -e '(ccl:rebuild-ccl :full t)' -e 
'(ccl:quit)' || die "Compilation failed"
 
        # remove non-owner write permissions on the full-image
-       chmod go-w ${CCL_RUNTIME}{,.image}
+       chmod go-w ${CCL_RUNTIME}{,.image} || die
 
-       # remove .svn directories
-       find "${S}" -type d -name .svn -exec rm -rf {} ';' &>/dev/null
+       esvn_clean
 }
 
 src_install() {
@@ -76,10 +76,10 @@ src_install() {
 
        # until we figure out which source files are necessary for runtime
        # optional features and which aren't, we install all sources
-       find . -type f -name '*fsl' -delete
-       rm -f lisp-kernel/${CCL_KERNEL}/*.o
+       find . -type f -name '*fsl' -delete || die
+       rm -f lisp-kernel/${CCL_KERNEL}/*.o || die
        cp -a compiler level-0 level-1 lib library \
-               lisp-kernel scripts tools xdump \
+               lisp-kernel scripts tools xdump contrib \
                "${D}"/${install_dir} || die
        cp -a ${CCL_HEADERS} "${D}"/${install_dir} || die
 
@@ -89,6 +89,6 @@ src_install() {
        doenvd "${ENVD}"
 
        dodoc doc/release-notes.txt
-       dohtml doc/ccl-documentation.html
-       use doc && dohtml -r examples
+       use doc && dodoc "${DISTDIR}"/ccl.html
+       use doc && dodoc -r examples
 }

diff --git a/dev-lisp/clozurecl/clozurecl-1.9-r3.ebuild 
b/dev-lisp/clozurecl/clozurecl-1.9-r3.ebuild
index 49b1024..87376a7 100644
--- a/dev-lisp/clozurecl/clozurecl-1.9-r3.ebuild
+++ b/dev-lisp/clozurecl/clozurecl-1.9-r3.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=5
+
 inherit eutils multilib toolchain-funcs
 
 MY_PN=ccl