From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C48ED139085 for ; Thu, 2 Feb 2017 10:12:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D5F2E0E62; Thu, 2 Feb 2017 10:12:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CED55E0E62 for ; Thu, 2 Feb 2017 10:12:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0B7B334102B for ; Thu, 2 Feb 2017 10:12:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 310403DA2 for ; Thu, 2 Feb 2017 10:12:37 +0000 (UTC) From: "José María Alonso" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "José María Alonso" Message-ID: <1486030354.42d02f34b0e1cdec14fc63eb92fe1243d15f2d58.nimiux@gentoo> Subject: [gentoo-commits] proj/lisp:master commit in: x11-wm/stumpwm/ X-VCS-Repository: proj/lisp X-VCS-Files: x11-wm/stumpwm/stumpwm-9999.ebuild X-VCS-Directories: x11-wm/stumpwm/ X-VCS-Committer: nimiux X-VCS-Committer-Name: José María Alonso X-VCS-Revision: 42d02f34b0e1cdec14fc63eb92fe1243d15f2d58 X-VCS-Branch: master Date: Thu, 2 Feb 2017 10:12:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d21990d8-d795-4d62-810b-b1ad3418356a X-Archives-Hash: 669622f005f8a2ea1343b6283d9ac622 commit: 42d02f34b0e1cdec14fc63eb92fe1243d15f2d58 Author: Chema Alonso Josa gentoo org> AuthorDate: Thu Feb 2 10:12:34 2017 +0000 Commit: José María Alonso gentoo org> CommitDate: Thu Feb 2 10:12:34 2017 +0000 URL: https://gitweb.gentoo.org/proj/lisp.git/commit/?id=42d02f34 x11-wm/stumpwm: Updates live ebuild x11-wm/stumpwm/stumpwm-9999.ebuild | 46 ++++++++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/x11-wm/stumpwm/stumpwm-9999.ebuild b/x11-wm/stumpwm/stumpwm-9999.ebuild index 15c02e8..c87ed2d 100644 --- a/x11-wm/stumpwm/stumpwm-9999.ebuild +++ b/x11-wm/stumpwm/stumpwm-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -inherit autotools common-lisp-3 git-2 +inherit autotools common-lisp-3 git-r3 DESCRIPTION="Stumpwm is a Window Manager written entirely in Common Lisp." HOMEPAGE="https://stumpwm.github.io/" @@ -13,27 +13,44 @@ EGIT_REPO_URI="git://github.com/stumpwm/stumpwm" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc clisp emacs +sbcl" +IUSE="contrib doc emacs clisp ecl +sbcl" -DEPEND="dev-lisp/common-lisp-controller - virtual/commonlisp - dev-lisp/cl-ppcre - doc? ( virtual/texi2dvi )" - -RDEPEND="${DEPEND} - emacs? ( app-emacs/slime ) +RDEPEND="dev-lisp/cl-ppcre !clisp? ( !sbcl? ( !amd64? ( dev-lisp/cmucl ) ) ) clisp? ( >=dev-lisp/clisp-2.38-r2[X,-new-clx] ) - sbcl? ( >=dev-lisp/sbcl-1.1.15 dev-lisp/clx )" + sbcl? ( >=dev-lisp/sbcl-1.1.15 dev-lisp/clx ) + emacs? ( virtual/emacs app-emacs/slime )" + +DEPEND="${RDEPEND} + sys-apps/texinfo + doc? ( virtual/texi2dvi )" + +CLPKGDIR="${CLSOURCEROOT}/${CLPACKAGE}" +CONTRIBDIR="${CLPKGDIR}/contrib" do_doc() { local pdffile="${PN}.pdf" - dodoc AUTHORS NEWS README.md - texi2pdf -o "${pdffile}" "${PN}.texi.in" && dodoc "${pdffile}" || die + texi2pdf -o "${pdffile}" "${PN}.texi" && dodoc "${pdffile}" || die + cp "${FILESDIR}/README.Gentoo" . && sed -i "s:@VERSION@:${PV}:" README.Gentoo || die + dodoc AUTHORS NEWS README.md README.Gentoo + doinfo "${PN}.info" + docinto examples ; dodoc sample-stumpwmrc.lisp +} + +do_contrib() { + emake install-modules + rm -r "${D}${CONTRIBDIR}"/.git* || die } src_prepare() { + default + if use contrib ; then + # Fix contrib directory + sed -i -e "s|@CONTRIB_DIR@|@MODULE_DIR@|" make-image.lisp.in || die + sed -i -e "s|\~\/.${CLPACKAGE}\.d/modules|${D}${CONTRIBDIR}|" Makefile.in || die + sed -i -e "s|\${HOME}/\.${CLPACKAGE}\.d/modules|${CONTRIBDIR}|" configure.ac || die + fi eautoreconf } @@ -46,4 +63,5 @@ src_install() { common-lisp-install-asdf dobin "${PN}" use doc && do_doc + use contrib && do_contrib }