commit: 507f82c06c6838305c05b8bc9c77e7ccbeca53b3
Author: Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 8 20:16:19 2017 +0000
Commit: José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Sun Oct 8 20:16:19 2017 +0000
URL: https://gitweb.gentoo.org/proj/lisp.git/commit/?id=507f82c0
dev-lisp/cmucl: Syns with gentoo repository
.../{cmucl-20d-r3.ebuild => cmucl-20e.ebuild} | 37 +++++++++++--------
.../{cmucl-20d-r3.ebuild => cmucl-21a.ebuild} | 32 +++++++++--------
...0e-customize-lisp-implementation-version.patch} | 0
...stack-fixes.patch => 20e-execstack-fixes.patch} | 0
dev-lisp/cmucl/files/21a-build.patch | 22 ++++++++++++
...1a-customize-lisp-implementation-version.patch} | 0
...stack-fixes.patch => 21a-execstack-fixes.patch} | 0
dev-lisp/cmucl/files/cmuclrc | 6 ++--
.../cmucl/files/fix-man-and-doc-installation.patch | 42 ----------------------
dev-lisp/cmucl/files/site-init.lisp.in | 9 +++--
dev-lisp/cmucl/metadata.xml | 39 ++++++++++++++++++++
11 files changed, 110 insertions(+), 77 deletions(-)
diff --git a/dev-lisp/cmucl/cmucl-20d-r3.ebuild
b/dev-lisp/cmucl/cmucl-20e.ebuild
similarity index 82%
copy from dev-lisp/cmucl/cmucl-20d-r3.ebuild
copy to dev-lisp/cmucl/cmucl-20e.ebuild
index a59a9e1d..9e122b9a 100644
--- a/dev-lisp/cmucl/cmucl-20d-r3.ebuild
+++ b/dev-lisp/cmucl/cmucl-20e.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-
-inherit eutils glo-utils toolchain-funcs
+EAPI=5
+inherit eutils toolchain-funcs multilib
MY_PV=${PV:0:3}
@@ -11,12 +10,11 @@ DESCRIPTION="CMU Common Lisp is an implementation of ANSI
Common Lisp"
HOMEPAGE="http://www.cons.org/cmucl/";
SRC_URI="http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-src-${MY_PV}.tar.bz2
http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-${MY_PV}-x86-linux.tar.bz2";
-RESTRICT="mirror"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~x86"
-IUSE="X source sse2"
+KEYWORDS="x86"
+IUSE="X source cpu_flags_x86_sse2"
CDEPEND=">=dev-lisp/asdf-2.33-r3:=
x11-libs/motif:0"
@@ -29,16 +27,27 @@ S="${WORKDIR}"
TARGET=linux-4
src_prepare() {
- eapply "${FILESDIR}"/${MY_PV}-execstack-fixes.patch
- eapply
"${FILESDIR}"/${MY_PV}-customize-lisp-implementation-version.patch
+ epatch "${FILESDIR}"/${MY_PV}-execstack-fixes.patch
+ epatch
"${FILESDIR}"/${MY_PV}-customize-lisp-implementation-version.patch
cp /usr/share/common-lisp/source/asdf/build/asdf.lisp src/contrib/asdf/
|| die
- eapply_user
}
src_compile() {
- local cmufpu=$(glo_usev sse2 sse2 x87)
- local cmuopts="$(glo_usev !X -u) -f ${cmufpu}"
+ local cmufpu cmuopts
+
+ if use cpu_flags_x86_sse2; then
+ cmufpu=sse2
+ else
+ cmufpu=x87
+ fi
+
+ if use X; then
+ cmuopts="-f ${cmufpu}"
+ else
+ cmuopts="-u -f ${cmufpu}"
+ fi
+
local buildimage="bin/lisp -core lib/cmucl/lib/lisp-${cmufpu}.core
-noinit -nositeinit -batch"
env CC="$(tc-getCC)" bin/build.sh -v "-gentoo-${PR}" -C "" -o
"${buildimage}" ${cmuopts} || die "Cannot build the compiler"
@@ -62,7 +71,7 @@ src_install() {
|| die "Cannot build installation archive"
# Necessary otherwise tar will fail
dodir /usr
- pushd "${D}"/usr
+ pushd "${D}"/usr > /dev/null
tar xzpf "${WORKDIR}"/cmucl-${MY_PV}-x86-linux.tar.gz \
|| die "Cannot install main system"
if use X ; then
@@ -76,7 +85,7 @@ src_install() {
tar --strip-components 1 -xzpf
"${WORKDIR}"/cmucl-src-${MY_PV}.tar.gz \
|| die "Cannot install sources"
fi
- popd
+ popd > /dev/null
# Install site config file
sed "s,@PF@,${PF},g ; s,@VERSION@,$(date +%F),g" \
diff --git a/dev-lisp/cmucl/cmucl-20d-r3.ebuild
b/dev-lisp/cmucl/cmucl-21a.ebuild
similarity index 82%
rename from dev-lisp/cmucl/cmucl-20d-r3.ebuild
rename to dev-lisp/cmucl/cmucl-21a.ebuild
index a59a9e1d..f3f9b830 100644
--- a/dev-lisp/cmucl/cmucl-20d-r3.ebuild
+++ b/dev-lisp/cmucl/cmucl-21a.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-
-inherit eutils glo-utils toolchain-funcs
+EAPI=5
+inherit eutils toolchain-funcs multilib
MY_PV=${PV:0:3}
@@ -11,12 +10,11 @@ DESCRIPTION="CMU Common Lisp is an implementation of ANSI
Common Lisp"
HOMEPAGE="http://www.cons.org/cmucl/";
SRC_URI="http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-src-${MY_PV}.tar.bz2
http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-${MY_PV}-x86-linux.tar.bz2";
-RESTRICT="mirror"
LICENSE="public-domain"
SLOT="0"
KEYWORDS="~x86"
-IUSE="X source sse2"
+IUSE="X source"
CDEPEND=">=dev-lisp/asdf-2.33-r3:=
x11-libs/motif:0"
@@ -29,17 +27,23 @@ S="${WORKDIR}"
TARGET=linux-4
src_prepare() {
- eapply "${FILESDIR}"/${MY_PV}-execstack-fixes.patch
- eapply
"${FILESDIR}"/${MY_PV}-customize-lisp-implementation-version.patch
+ epatch "${FILESDIR}"/${MY_PV}-execstack-fixes.patch
+ epatch
"${FILESDIR}"/${MY_PV}-customize-lisp-implementation-version.patch
+ epatch "${FILESDIR}"/${MY_PV}-build.patch
cp /usr/share/common-lisp/source/asdf/build/asdf.lisp src/contrib/asdf/
|| die
- eapply_user
}
src_compile() {
- local cmufpu=$(glo_usev sse2 sse2 x87)
- local cmuopts="$(glo_usev !X -u) -f ${cmufpu}"
- local buildimage="bin/lisp -core lib/cmucl/lib/lisp-${cmufpu}.core
-noinit -nositeinit -batch"
+ local cmuopts buildimage
+
+ if use X; then
+ cmuopts=""
+ else
+ cmuopts="-u"
+ fi
+
+ buildimage="bin/lisp -batch"
env CC="$(tc-getCC)" bin/build.sh -v "-gentoo-${PR}" -C "" -o
"${buildimage}" ${cmuopts} || die "Cannot build the compiler"
@@ -62,7 +66,7 @@ src_install() {
|| die "Cannot build installation archive"
# Necessary otherwise tar will fail
dodir /usr
- pushd "${D}"/usr
+ pushd "${D}"/usr > /dev/null
tar xzpf "${WORKDIR}"/cmucl-${MY_PV}-x86-linux.tar.gz \
|| die "Cannot install main system"
if use X ; then
@@ -76,7 +80,7 @@ src_install() {
tar --strip-components 1 -xzpf
"${WORKDIR}"/cmucl-src-${MY_PV}.tar.gz \
|| die "Cannot install sources"
fi
- popd
+ popd > /dev/null
# Install site config file
sed "s,@PF@,${PF},g ; s,@VERSION@,$(date +%F),g" \
diff --git
a/dev-lisp/cmucl/files/20d-customize-lisp-implementation-version.patch
b/dev-lisp/cmucl/files/20e-customize-lisp-implementation-version.patch
similarity index 100%
copy from dev-lisp/cmucl/files/20d-customize-lisp-implementation-version.patch
copy to dev-lisp/cmucl/files/20e-customize-lisp-implementation-version.patch
diff --git a/dev-lisp/cmucl/files/20d-execstack-fixes.patch
b/dev-lisp/cmucl/files/20e-execstack-fixes.patch
similarity index 100%
copy from dev-lisp/cmucl/files/20d-execstack-fixes.patch
copy to dev-lisp/cmucl/files/20e-execstack-fixes.patch
diff --git a/dev-lisp/cmucl/files/21a-build.patch
b/dev-lisp/cmucl/files/21a-build.patch
new file mode 100644
index 00000000..46423410
--- /dev/null
+++ b/dev-lisp/cmucl/files/21a-build.patch
@@ -0,0 +1,22 @@
+diff -r -U2 21a.orig/bin/build.sh 21a/bin/build.sh
+--- 21a.orig/bin/build.sh 2015-05-19 07:42:40.000000000 +0600
++++ 21a/bin/build.sh 2016-04-03 20:54:08.597016537 +0600
+@@ -40,5 +40,5 @@
+ ENABLE4="yes"
+
+-version=20f
++version=21a
+ SRCDIR=src
+ BINDIR=bin
+@@ -145,10 +145,9 @@
+ $TOOLDIR/load-world.sh $TARGET "$VERSION" || { echo "Failed:
$TOOLDIR/load-world.sh"; exit 1; }
+
+- $TARGET/lisp/lisp -batch -noinit -nositeinit $FPU_MODE < /dev/null || {
echo "Failed: $TARGET/lisp/lisp -batch -noinit $FPU_MODE"; exit 1; }
++ $TARGET/lisp/lisp -batch -noinit -nositeinit < /dev/null || { echo
"Failed: $TARGET/lisp/lisp -batch -noinit"; exit 1; }
+ return 0;
+ fi
+ }
+
+-FPU_MODE=
+ BUILDWORLD="$TOOLDIR/build-world.sh"
+ BUILD_POT="yes"
diff --git
a/dev-lisp/cmucl/files/20d-customize-lisp-implementation-version.patch
b/dev-lisp/cmucl/files/21a-customize-lisp-implementation-version.patch
similarity index 100%
rename from dev-lisp/cmucl/files/20d-customize-lisp-implementation-version.patch
rename to dev-lisp/cmucl/files/21a-customize-lisp-implementation-version.patch
diff --git a/dev-lisp/cmucl/files/20d-execstack-fixes.patch
b/dev-lisp/cmucl/files/21a-execstack-fixes.patch
similarity index 100%
rename from dev-lisp/cmucl/files/20d-execstack-fixes.patch
rename to dev-lisp/cmucl/files/21a-execstack-fixes.patch
diff --git a/dev-lisp/cmucl/files/cmuclrc b/dev-lisp/cmucl/files/cmuclrc
index 18ab5627..e663e92a 100644
--- a/dev-lisp/cmucl/files/cmuclrc
+++ b/dev-lisp/cmucl/files/cmuclrc
@@ -3,5 +3,7 @@
(in-package :common-lisp-user)
-;;; Setup ASDF3
-(load "/etc/common-lisp/gentoo-init.lisp")
+(if (probe-file "/etc/gentoo-init.lisp")
+ (load "/etc/gentoo-init.lisp")
+ (format t "~%;;; Warning: There is no /etc/gentoo-init.lisp file ~
+\(which should be provided by dev-lisp/gentoo-init"))
diff --git a/dev-lisp/cmucl/files/fix-man-and-doc-installation.patch
b/dev-lisp/cmucl/files/fix-man-and-doc-installation.patch
deleted file mode 100644
index 0fe12225..00000000
--- a/dev-lisp/cmucl/files/fix-man-and-doc-installation.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: tools/make-main-dist.sh
-===================================================================
-RCS file: /project/cmucl/cvsroot/src/tools/make-main-dist.sh,v
-retrieving revision 1.18
-diff -u -w -u -r1.18 make-main-dist.sh
---- cmucl/src/tools/make-main-dist.sh 13 Aug 2009 14:22:56 -0000 1.18
-+++ cmucl/src/tools/make-main-dist.sh 30 Sep 2009 14:26:41 -0000
-@@ -29,6 +29,7 @@
- fi
-
- DESTDIR=${INSTALL_DIR:-release-$$}
-+DOCDIR=${DOCDIR:-doc/cmucl}
- MANDIR=${MANDIR:-man/man1}
- TARGET="`echo $1 | sed 's:/*$::'`"
- VERSION=$2
-@@ -81,11 +82,11 @@
- # set -x
- echo Installing main components
- install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/bin
--install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/doc/cmucl
- install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/lib/cmucl
- install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/lib/cmucl/lib
- install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/lib/cmucl/lib/subsystems
- install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/lib/cmucl/lib/ext-formats
-+install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/${DOCDIR}
- install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/${MANDIR}
- install ${GROUP} ${OWNER} -m 0755 $TARGET/lisp/lisp $DESTDIR/bin/
- if [ "$EXECUTABLE" = "true" ]
-@@ -126,11 +127,11 @@
- $DESTDIR/${MANDIR}/
- install ${GROUP} ${OWNER} -m 0644 src/general-info/lisp.1 \
- $DESTDIR/${MANDIR}/
--install ${GROUP} ${OWNER} -m 0644 src/general-info/README $DESTDIR/doc/cmucl/
-+install ${GROUP} ${OWNER} -m 0644 src/general-info/README $DESTDIR/${DOCDIR}
- if [ -f src/general-info/release-$VERSION.txt ]
- then
- install ${GROUP} ${OWNER} -m 0644 src/general-info/release-$VERSION.txt
\
-- $DESTDIR/doc/cmucl/
-+ $DESTDIR/${DOCDIR}
- fi
-
- if [ -z "$INSTALL_DIR" ]; then
diff --git a/dev-lisp/cmucl/files/site-init.lisp.in
b/dev-lisp/cmucl/files/site-init.lisp.in
index bd09645b..1b232166 100644
--- a/dev-lisp/cmucl/files/site-init.lisp.in
+++ b/dev-lisp/cmucl/files/site-init.lisp.in
@@ -7,15 +7,14 @@
;;; Heavy modifications by Peter Van Eynde
-;;; More modifications for Gentoo by Matthew Kennedy and Stelian Ionescu
+;;; More modifications for Gentoo by Matthew Kennedy
;;; <[email protected]>
(in-package "SYSTEM")
-(if (probe-file "/etc/common-lisp/cmuclrc")
- (load "/etc/common-lisp/cmuclrc")
- (format t "~%;;; Warning: There is no /etc/common-lisp/cmuclrc file
-\(which should have been created during emerge"))
+(if (probe-file "/etc/cmuclrc")
+ (load "/etc/cmuclrc")
+ (format t "~%;;; Warning: There is no /etc/cmuclrc file (which should have
been created during emerge"))
;;; If you have sources installed on your system, un-comment the following form
;;; and change it to point to the source location. This will allow the Hemlock
diff --git a/dev-lisp/cmucl/metadata.xml b/dev-lisp/cmucl/metadata.xml
new file mode 100644
index 00000000..005eddef
--- /dev/null
+++ b/dev-lisp/cmucl/metadata.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+<maintainer type="person">
+<email>[email protected]</email>
+<name>Andrey Grozin</name>
+</maintainer>
+<maintainer type="project">
+<email>[email protected]</email>
+<name>Gentoo Common Lisp Project</name>
+</maintainer>
+<longdescription>
+CMUCL is a free implementation of the Common Lisp programming language
+which runs on most major Unix platforms. It mainly conforms to the
+ANSI Common Lisp standard. Here is a summary of its main features:
+
+ * a sophisticated native-code compiler which is capable of powerful
+ type inferences, and generates code competitive in speed with C
+ compilers.
+
+ * generational garbage collection and multiprocessing capability on
+ the x86 ports.
+
+ * a foreign function interface which allows interfacing with C code
+ and system libraries, including shared libraries on most platforms,
+ and direct access to Unix system calls.
+
+ * support for interprocess communication and remote procedure calls.
+
+ * an implementation of CLOS, the Common Lisp Object System, which
+ includes multimethods and a metaobject protocol.
+
+ * a graphical source-level debugger using a Motif interface, and a
+ code profiler.
+</longdescription>
+<use>
+<flag name="source">Include source code for CMUCL in installation</flag>
+</use>
+</pkgmetadata>
