commit: a4c5ac698ab159964ed19ab5cea6fd2aba6479ef Author: Chema Alonso Josa <nimiux <AT> gentoo <DOT> org> AuthorDate: Thu Mar 8 22:29:25 2018 +0000 Commit: José María Alonso <nimiux <AT> gentoo <DOT> org> CommitDate: Fri Mar 9 21:34:22 2018 +0000 URL: https://gitweb.gentoo.org/proj/lisp.git/commit/?id=a4c5ac69
dev-lisp/asdf: Syncs with portage tree dev-lisp/asdf/asdf-3.1.5.ebuild | 49 ------------------------------------- dev-lisp/asdf/asdf-3.3.1.ebuild | 3 +-- dev-lisp/clisp/clisp-2.49.90.ebuild | 12 ++++----- dev-lisp/clisp/metadata.xml | 2 +- 4 files changed, 8 insertions(+), 58 deletions(-) diff --git a/dev-lisp/asdf/asdf-3.1.5.ebuild b/dev-lisp/asdf/asdf-3.1.5.ebuild deleted file mode 100644 index fb037462..00000000 --- a/dev-lisp/asdf/asdf-3.1.5.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils prefix - -DESCRIPTION="ASDF is Another System Definition Facility for Common Lisp" -HOMEPAGE="http://common-lisp.net/project/asdf/"; -SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz"; - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" -IUSE="doc" - -SLOT="0/${PVR}" - -DEPEND="!dev-lisp/cl-${PN} - !dev-lisp/asdf-binary-locations - !dev-lisp/gentoo-init - !<dev-lisp/asdf-2.33-r3 - doc? ( virtual/texi2dvi )" -RDEPEND="" -PDEPEND="~dev-lisp/uiop-${PV}" - -#S="${WORKDIR}" - -src_compile() { - make - use doc && make doc -} - -src_install() { - insinto /usr/share/common-lisp/source/${PN} - doins -r build version.lisp-expr - dodoc README.md TODO - dohtml doc/*.{html,css,ico,png} - if use doc; then - dohtml -r doc/index.html - insinto /usr/share/doc/${PF} - #doins doc/${PN}.pdf - fi - - insinto /etc/common-lisp - cd "${T}" - cp "${FILESDIR}"/gentoo-init.lisp "${FILESDIR}"/source-registry.conf . - eprefixify gentoo-init.lisp source-registry.conf - doins gentoo-init.lisp source-registry.conf -} diff --git a/dev-lisp/asdf/asdf-3.3.1.ebuild b/dev-lisp/asdf/asdf-3.3.1.ebuild index ecced8bc..85880425 100644 --- a/dev-lisp/asdf/asdf-3.3.1.ebuild +++ b/dev-lisp/asdf/asdf-3.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,6 @@ SLOT="0/${PVR}" DEPEND="!dev-lisp/cl-${PN} !dev-lisp/asdf-binary-locations - !dev-lisp/gentoo-init !<dev-lisp/asdf-2.33-r3 doc? ( virtual/texi2dvi )" PDEPEND="virtual/commonlisp diff --git a/dev-lisp/clisp/clisp-2.49.90.ebuild b/dev-lisp/clisp/clisp-2.49.90.ebuild index e1167a08..ba183017 100644 --- a/dev-lisp/clisp/clisp-2.49.90.ebuild +++ b/dev-lisp/clisp/clisp-2.49.90.ebuild @@ -93,7 +93,7 @@ src_configure() { fi if use berkdb; then enable_modules berkeley-db - append-cppflags -I/usr/include/db4.8 + append-cppflags -I"${EPREFIX}"/usr/include/db4.8 fi use dbus && enable_modules dbus use fastcgi && enable_modules fastcgi @@ -105,14 +105,14 @@ src_configure() { use zlib && enable_modules zlib if use hyperspec; then - CLHSROOT="file:///usr/share/doc/hyperspec/HyperSpec/" + CLHSROOT="file:///${EPREFIX}/usr/share/doc/hyperspec/HyperSpec/" else CLHSROOT="http://www.lispworks.com/reference/HyperSpec/"; fi # configure chokes on --sysconfdir option - local configure="./configure --prefix=/usr --enable-portability \ - --libdir=/usr/$(get_libdir) $(use_with readline) $(use_with unicode) \ + local configure="./configure --prefix=${EPREFIX}/usr --enable-portability \ + --libdir=${EPREFIX}/usr/$(get_libdir) $(use_with readline) $(use_with unicode) \ ${myconf} --hyperspec=${CLHSROOT} ${BUILDDIR}" einfo "${configure}" ${configure} || die "./configure failed" @@ -131,12 +131,12 @@ src_compile() { src_install() { pushd "${BUILDDIR}" - make DESTDIR="${D}" prefix=/usr install-bin || die "Installation failed" + make DESTDIR="${D}" prefix="${EPREFIX}"/usr install-bin || die "Installation failed" doman clisp.1 dodoc ../SUMMARY README* ../src/NEWS ../unix/MAGIC.add ../ANNOUNCE # stripping them removes common symbols (defined but uninitialised variables) # which are then needed to build modules... - export STRIP_MASK="*/usr/$(get_libdir)/clisp-${PV}/*/*" + export STRIP_MASK="*${EPREFIX}/usr/$(get_libdir)/clisp-${PV}/*/*" popd dohtml doc/impnotes.{css,html} doc/regexp.html doc/clisp.png dodoc doc/{CLOS-guide,LISP-tutorial}.txt diff --git a/dev-lisp/clisp/metadata.xml b/dev-lisp/clisp/metadata.xml index 256106c8..a78f4156 100644 --- a/dev-lisp/clisp/metadata.xml +++ b/dev-lisp/clisp/metadata.xml @@ -21,7 +21,7 @@ changed at run time. <use> <flag name="hyperspec">Use local hyperspec instead of online version</flag> <flag name="new-clx">Build CLISP with support for the NEW-CLX module which is a -C binding to the Xorg libraries</flag> +-C binding to the Xorg libraries</flag> <flag name="pari">Build CLISP with support for the PARI Computer Algebra System</flag> <flag name="svm">Build CLISP with support for the Support Vector Machine module</flag> </use>
