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

[José María Alonso]

commit:     0ac7d79be6c3bf6beaffb94ed280939c9469b309
Author:     Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 29 22:21:57 2018 +0000
Commit:     José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Mon Jan 29 22:21:57 2018 +0000
URL:        https://gitweb.gentoo.org/proj/lisp.git/commit/?id=0ac7d79b

dev-lisp/picolisp: Bumps version to 17.12

 dev-lisp/picolisp/picolisp-16.6.ebuild             | 120 ---------------------
 ...{picolisp-17.6.ebuild => picolisp-17.12.ebuild} |   8 +-
 2 files changed, 4 insertions(+), 124 deletions(-)

diff --git a/dev-lisp/picolisp/picolisp-16.6.ebuild b/dev-lisp/picolisp/picolisp-16.6.ebuild
deleted file mode 100644
index 1564f82d..00000000
--- a/dev-lisp/picolisp/picolisp-16.6.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils bash-completion-r1 toolchain-funcs
-
-URI_FILENAME="picoLisp"
-URI_DOMAIN="http://software-lab.de/"
-URI_PREFIX="${URI_DOMAIN}${URI_FILENAME}"
-URI_SUFFIX=".tgz"
-
-if [[ ${PV} != 9999 ]] ; then
-	SRC_URI="${URI_PREFIX}-${PV}${URI_SUFFIX}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A fast and lightweight Lisp interpreter"
-HOMEPAGE="http://picolisp.com/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="bash-completion doc examples src"
-
-QA_PREBUILT="*"
-
-S="${WORKDIR}/picoLisp"
-
-livefetch() {
-	FILENAME="${1##*/}"
-	einfo "Fetching ${FILENAME}"
-	wget "${1}" || die
-	tar xf "${FILENAME}" || die
-}
-
-pre_src_unpack() {
-	[[ ${PV} == 9999 ]] && livefetch "${URI_PREFIX}${URI_SUFFIX}"
-	use amd64           && livefetch "${URI_DOMAIN}x86-64.linux${URI_SUFFIX}"
-}
-
-src_prepare() {
-	find . -type f -executable -exec sed -i "s#!bin/picolisp lib.l#!/usr/bin/picolisp /usr/lib/picolisp/lib.l#" {} \;
-	sed -i "s# test -x /usr/bin/picolisp# false#" src64/mkAsm || die
-	epatch_user
-}
-
-src_compile() {
-	if use amd64; then
-		cd src64 || die
-		mv ../../src64/*.s . || die
-		einfo "Phase 1: building ${PN} with prebuild *.s files"
-		emake CC="$(tc-getCC)" AS="$(tc-getAS)"
-		einfo 'Phase 2: building ${PN} using ${PN}'
-		emake clean
-		emake CC="$(tc-getCC)" AS="$(tc-getAS)"
-	else
-		cd src || die
-		emake CC="$(tc-getCC)" AS="$(tc-getAS)"
-	fi
-}
-
-src_install() {
-	DLIB=/usr/$(get_libdir)/${PN}
-
-	#FIXME add vimsyntax support
-	rm -rf lib/vim
-
-	for FILE in picolisp pil; do
-		dobin "bin/${FILE}"
-		rm "bin/${FILE}" || die
-	done
-	exeinto $DLIB/bin
-	doexe bin/*
-
-	insinto $DLIB
-	use bash-completion && newbashcomp lib/bash_completion "${PN}"
-	rm -rf lib/bash_completion lib/el
-	doins -r *.l *.css lib loc
-	if use amd64 && use src; then
-		DSRC=${DLIB}/src64
-		insinto $DSRC
-		doins -r src64/*.l src64/lib
-		insinto $DSRC/arch
-		doins -r src64/arch/x86-64.l
-		insinto $DSRC/sys
-		doins -r src64/sys/x86-64.linux.*
-	fi
-	doman man/*/*
-	DSHARE=/usr/share/${PN}
-	insinto $DSHARE
-	doins -r img
-	dosym $DSHARE/img $DLIB/img
-	dodoc CHANGES CREDITS INSTALL README
-	if use doc; then
-		DDOC=/usr/share/doc/${PF}
-		insinto $DDOC
-		doins doc/quine doc/db doc/travel doc/utf8 doc/vim-tsm
-		dohtml doc/*
-		insinto $DDOC/html
-		doins doc/family.l doc/shape.l doc/fun.l doc/hello.l
-		if use amd64; then
-			doins doc/family64.tgz
-			insinto $DDOC
-			doins -r doc64
-		else
-			doins doc/family.tgz
-			insinto $DDOC
-			doins doc/structures
-		fi
-		dosym $DDOC/html $DLIB/doc
-	fi
-	if use examples; then
-		insinto $DSHARE
-		doins -r app games misc opt
-		exeinto $DSHARE/misc
-		doexe misc/bigtest misc/calc misc/chat misc/mailing
-		exeinto $DSHARE/games
-		doexe games/xchess
-	fi
-}

diff --git a/dev-lisp/picolisp/picolisp-17.6.ebuild b/dev-lisp/picolisp/picolisp-17.12.ebuild
similarity index 97%
rename from dev-lisp/picolisp/picolisp-17.6.ebuild
rename to dev-lisp/picolisp/picolisp-17.12.ebuild
index 5c52085b..f7cfbace 100644
--- a/dev-lisp/picolisp/picolisp-17.6.ebuild
+++ b/dev-lisp/picolisp/picolisp-17.12.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit eutils bash-completion-r1 toolchain-funcs
 
@@ -41,7 +41,7 @@ pre_src_unpack() {
 src_prepare() {
 	find . -type f -executable -exec sed -i "s#!bin/picolisp lib.l#!/usr/bin/picolisp /usr/lib/picolisp/lib.l#" {} \;
 	sed -i "s# test -x /usr/bin/picolisp# false#" src64/mkAsm || die
-	epatch_user
+	eapply_user
 }
 
 src_compile() {
@@ -95,7 +95,7 @@ src_install() {
 		DDOC=/usr/share/doc/${PF}
 		insinto $DDOC
 		doins doc/quine doc/travel doc/vim-tsm
-		dohtml doc/*
+		dodoc -r doc/*
 		insinto $DDOC/html
 		doins doc/family.l doc/shape.l doc/fun.l doc/hello.l
 		if use amd64; then