| 1 |
commit: 1dbb79f225cc68b8837d82e37f05778043c374ef |
| 2 |
Author: Chema Alonso Josa <nimiux <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 2 22:23:48 2017 +0000 |
| 4 |
Commit: José María Alonso <nimiux <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 2 22:23:48 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/lisp.git/commit/?id=1dbb79f2 |
| 7 |
|
| 8 |
dev-lisp/stumpwm: Adds dependency on stumpwm-contrib |
| 9 |
|
| 10 |
x11-wm/stumpwm/stumpwm-1.0.0.ebuild | 23 ++++------------------- |
| 11 |
1 file changed, 4 insertions(+), 19 deletions(-) |
| 12 |
|
| 13 |
diff --git a/x11-wm/stumpwm/stumpwm-1.0.0.ebuild b/x11-wm/stumpwm/stumpwm-1.0.0.ebuild |
| 14 |
index b3c7548..c01e80b 100644 |
| 15 |
--- a/x11-wm/stumpwm/stumpwm-1.0.0.ebuild |
| 16 |
+++ b/x11-wm/stumpwm/stumpwm-1.0.0.ebuild |
| 17 |
@@ -4,7 +4,7 @@ |
| 18 |
|
| 19 |
EAPI=6 |
| 20 |
|
| 21 |
-inherit common-lisp-3 eutils elisp-common autotools xdg-utils |
| 22 |
+inherit common-lisp-3 autotools elisp-common xdg-utils |
| 23 |
|
| 24 |
DESCRIPTION="Stumpwm is a Window Manager written entirely in Common Lisp." |
| 25 |
HOMEPAGE="https://stumpwm.github.io/" |
| 26 |
@@ -23,14 +23,14 @@ RDEPEND="dev-lisp/cl-ppcre |
| 27 |
!sbcl? ( !clisp? ( !ecl? ( >=dev-lisp/sbcl-1.0.32 ) ) ) |
| 28 |
!sbcl? ( !clisp? ( ecl? ( >=dev-lisp/ecls-10.4.1 ) ) ) |
| 29 |
!sbcl? ( clisp? ( >=dev-lisp/clisp-2.44[X,new-clx] ) ) |
| 30 |
- emacs? ( virtual/emacs app-emacs/slime )" |
| 31 |
+ emacs? ( virtual/emacs app-emacs/slime ) |
| 32 |
+ contrib? ( x11-wm/stumpwm-contrib )" |
| 33 |
DEPEND="${RDEPEND} |
| 34 |
sys-apps/texinfo |
| 35 |
doc? ( virtual/texi2dvi )" |
| 36 |
|
| 37 |
SITEFILE=70${PN}-gentoo.el |
| 38 |
CLPKGDIR="${CLSOURCEROOT}/${CLPACKAGE}" |
| 39 |
-CONTRIBDIR="${CLPKGDIR}/contrib" |
| 40 |
|
| 41 |
get_lisp() { |
| 42 |
local lisp |
| 43 |
@@ -50,32 +50,18 @@ do_doc() { |
| 44 |
docinto examples ; dodoc sample-stumpwmrc.lisp |
| 45 |
} |
| 46 |
|
| 47 |
-do_contrib() { |
| 48 |
- emake install-modules |
| 49 |
- rm -r "${D}${CONTRIBDIR}"/.git* || die |
| 50 |
-} |
| 51 |
- |
| 52 |
src_prepare() { |
| 53 |
default |
| 54 |
# Upstream didn't change the version before packaging |
| 55 |
sed -i -e 's/:version "0.9.8"/:version "0.9.9"/' "${PN}.asd" || die |
| 56 |
# Bug 534592. Does not build with asdf:oos, using require to load the package |
| 57 |
sed -i "load-${PN}.lisp.in" -e "s/asdf:oos 'asdf:load-op/require/" || die |
| 58 |
- if use contrib ; then |
| 59 |
- # Fix contrib directory |
| 60 |
- sed -i -e "s|@CONTRIB_DIR@|@MODULE_DIR@|" make-image.lisp.in || die |
| 61 |
- sed -i -e "s|\~\/.${CLPACKAGE}\.d/modules|${D}${CONTRIBDIR}|" Makefile.in || die |
| 62 |
- sed -i -e "s|\${HOME}/\.${CLPACKAGE}\.d/modules|${CONTRIBDIR}|" configure.ac || die |
| 63 |
- fi |
| 64 |
eautoreconf |
| 65 |
} |
| 66 |
|
| 67 |
src_configure() { |
| 68 |
- local moduleconfig |
| 69 |
- |
| 70 |
xdg_environment_reset |
| 71 |
- use contrib && moduleconfig="--with-module-dir=${CONTRIBDIR}/contrib" |
| 72 |
- econf --with-lisp=$(get_lisp sbcl clisp ecl) "${moduleconfig}" |
| 73 |
+ econf --with-lisp=$(get_lisp sbcl clisp ecl) |
| 74 |
} |
| 75 |
|
| 76 |
src_compile() { |
| 77 |
@@ -93,7 +79,6 @@ src_install() { |
| 78 |
sed -i -e "/(:directory/c\ (:directory \"${CLPKGDIR}\")" \ |
| 79 |
"${D}${CLPKGDIR}/load-stumpwm.lisp" || die |
| 80 |
use doc && do_doc |
| 81 |
- use contrib && do_contrib |
| 82 |
} |
| 83 |
|
| 84 |
pkg_postinst() { |
Archives