| 1 |
commit: 42d02f34b0e1cdec14fc63eb92fe1243d15f2d58 |
| 2 |
Author: Chema Alonso Josa <nimiux <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 2 10:12:34 2017 +0000 |
| 4 |
Commit: José María Alonso <nimiux <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 2 10:12:34 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/lisp.git/commit/?id=42d02f34 |
| 7 |
|
| 8 |
x11-wm/stumpwm: Updates live ebuild |
| 9 |
|
| 10 |
x11-wm/stumpwm/stumpwm-9999.ebuild | 46 ++++++++++++++++++++++++++------------ |
| 11 |
1 file changed, 32 insertions(+), 14 deletions(-) |
| 12 |
|
| 13 |
diff --git a/x11-wm/stumpwm/stumpwm-9999.ebuild b/x11-wm/stumpwm/stumpwm-9999.ebuild |
| 14 |
index 15c02e8..c87ed2d 100644 |
| 15 |
--- a/x11-wm/stumpwm/stumpwm-9999.ebuild |
| 16 |
+++ b/x11-wm/stumpwm/stumpwm-9999.ebuild |
| 17 |
@@ -1,10 +1,10 @@ |
| 18 |
-# Copyright 1999-2016 Gentoo Foundation |
| 19 |
+# Copyright 1999-2017 Gentoo Foundation |
| 20 |
# Distributed under the terms of the GNU General Public License v2 |
| 21 |
# $Id$ |
| 22 |
|
| 23 |
-EAPI=5 |
| 24 |
+EAPI=6 |
| 25 |
|
| 26 |
-inherit autotools common-lisp-3 git-2 |
| 27 |
+inherit autotools common-lisp-3 git-r3 |
| 28 |
|
| 29 |
DESCRIPTION="Stumpwm is a Window Manager written entirely in Common Lisp." |
| 30 |
HOMEPAGE="https://stumpwm.github.io/" |
| 31 |
@@ -13,27 +13,44 @@ EGIT_REPO_URI="git://github.com/stumpwm/stumpwm" |
| 32 |
LICENSE="GPL-2" |
| 33 |
SLOT="0" |
| 34 |
KEYWORDS="~amd64 ~x86" |
| 35 |
-IUSE="doc clisp emacs +sbcl" |
| 36 |
+IUSE="contrib doc emacs clisp ecl +sbcl" |
| 37 |
|
| 38 |
-DEPEND="dev-lisp/common-lisp-controller |
| 39 |
- virtual/commonlisp |
| 40 |
- dev-lisp/cl-ppcre |
| 41 |
- doc? ( virtual/texi2dvi )" |
| 42 |
- |
| 43 |
-RDEPEND="${DEPEND} |
| 44 |
- emacs? ( app-emacs/slime ) |
| 45 |
+RDEPEND="dev-lisp/cl-ppcre |
| 46 |
!clisp? ( !sbcl? ( !amd64? ( dev-lisp/cmucl ) ) ) |
| 47 |
clisp? ( >=dev-lisp/clisp-2.38-r2[X,-new-clx] ) |
| 48 |
- sbcl? ( >=dev-lisp/sbcl-1.1.15 dev-lisp/clx )" |
| 49 |
+ sbcl? ( >=dev-lisp/sbcl-1.1.15 dev-lisp/clx ) |
| 50 |
+ emacs? ( virtual/emacs app-emacs/slime )" |
| 51 |
+ |
| 52 |
+DEPEND="${RDEPEND} |
| 53 |
+ sys-apps/texinfo |
| 54 |
+ doc? ( virtual/texi2dvi )" |
| 55 |
+ |
| 56 |
+CLPKGDIR="${CLSOURCEROOT}/${CLPACKAGE}" |
| 57 |
+CONTRIBDIR="${CLPKGDIR}/contrib" |
| 58 |
|
| 59 |
do_doc() { |
| 60 |
local pdffile="${PN}.pdf" |
| 61 |
|
| 62 |
- dodoc AUTHORS NEWS README.md |
| 63 |
- texi2pdf -o "${pdffile}" "${PN}.texi.in" && dodoc "${pdffile}" || die |
| 64 |
+ texi2pdf -o "${pdffile}" "${PN}.texi" && dodoc "${pdffile}" || die |
| 65 |
+ cp "${FILESDIR}/README.Gentoo" . && sed -i "s:@VERSION@:${PV}:" README.Gentoo || die |
| 66 |
+ dodoc AUTHORS NEWS README.md README.Gentoo |
| 67 |
+ doinfo "${PN}.info" |
| 68 |
+ docinto examples ; dodoc sample-stumpwmrc.lisp |
| 69 |
+} |
| 70 |
+ |
| 71 |
+do_contrib() { |
| 72 |
+ emake install-modules |
| 73 |
+ rm -r "${D}${CONTRIBDIR}"/.git* || die |
| 74 |
} |
| 75 |
|
| 76 |
src_prepare() { |
| 77 |
+ default |
| 78 |
+ if use contrib ; then |
| 79 |
+ # Fix contrib directory |
| 80 |
+ sed -i -e "s|@CONTRIB_DIR@|@MODULE_DIR@|" make-image.lisp.in || die |
| 81 |
+ sed -i -e "s|\~\/.${CLPACKAGE}\.d/modules|${D}${CONTRIBDIR}|" Makefile.in || die |
| 82 |
+ sed -i -e "s|\${HOME}/\.${CLPACKAGE}\.d/modules|${CONTRIBDIR}|" configure.ac || die |
| 83 |
+ fi |
| 84 |
eautoreconf |
| 85 |
} |
| 86 |
|
| 87 |
@@ -46,4 +63,5 @@ src_install() { |
| 88 |
common-lisp-install-asdf |
| 89 |
dobin "${PN}" |
| 90 |
use doc && do_doc |
| 91 |
+ use contrib && do_contrib |
| 92 |
} |
Archives