diff options
| author |   Chema Alonso Josa <nimiux@gentoo.org> | 2017-02-03 09:55:11 +0100 |
|---|---|---|
| committer | Chema Alonso Josa <nimiux@gentoo.org> | 2017-02-03 09:55:34 +0100 |
| commit | 373533fa45de74077e47fd8ab9b0be32b389cfae (patch) | |
| tree | 84fac3d8376807768ea8f5ad89a0505d72460094 /x11-wm | |
| parent | app-emulation/lxc: add myself to maintainer (diff) | |
| download | gentoo-373533fa45de74077e47fd8ab9b0be32b389cfae.tar.gz gentoo-373533fa45de74077e47fd8ab9b0be32b389cfae.tar.bz2 gentoo-373533fa45de74077e47fd8ab9b0be32b389cfae.zip | |
x11-wm/stumpwm: Adds dependency on x11-wm/stumpwm-contrib
Package-Manager: portage-2.3.3
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/stumpwm/stumpwm-1.0.0.ebuild | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/x11-wm/stumpwm/stumpwm-1.0.0.ebuild b/x11-wm/stumpwm/stumpwm-1.0.0.ebuild index b3c7548eee00..5ffbe143408d 100644 --- a/x11-wm/stumpwm/stumpwm-1.0.0.ebuild +++ b/x11-wm/stumpwm/stumpwm-1.0.0.ebuild @@ -4,7 +4,7 @@ EAPI=6 -inherit common-lisp-3 eutils elisp-common autotools xdg-utils +inherit common-lisp-3 autotools elisp-common xdg-utils DESCRIPTION="Stumpwm is a Window Manager written entirely in Common Lisp." HOMEPAGE="https://stumpwm.github.io/" @@ -28,9 +28,10 @@ DEPEND="${RDEPEND} sys-apps/texinfo doc? ( virtual/texi2dvi )" +PDEPEND="contrib? ( x11-wm/stumpwm-contrib )" + SITEFILE=70${PN}-gentoo.el CLPKGDIR="${CLSOURCEROOT}/${CLPACKAGE}" -CONTRIBDIR="${CLPKGDIR}/contrib" get_lisp() { local lisp @@ -50,32 +51,18 @@ do_doc() { docinto examples ; dodoc sample-stumpwmrc.lisp } -do_contrib() { - emake install-modules - rm -r "${D}${CONTRIBDIR}"/.git* || die -} - src_prepare() { default # Upstream didn't change the version before packaging sed -i -e 's/:version "0.9.8"/:version "0.9.9"/' "${PN}.asd" || die # Bug 534592. Does not build with asdf:oos, using require to load the package sed -i "load-${PN}.lisp.in" -e "s/asdf:oos 'asdf:load-op/require/" || die - 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 } src_configure() { - local moduleconfig - xdg_environment_reset - use contrib && moduleconfig="--with-module-dir=${CONTRIBDIR}/contrib" - econf --with-lisp=$(get_lisp sbcl clisp ecl) "${moduleconfig}" + econf --with-lisp=$(get_lisp sbcl clisp ecl) } src_compile() { @@ -93,7 +80,6 @@ src_install() { sed -i -e "/(:directory/c\ (:directory \"${CLPKGDIR}\")" \ "${D}${CLPKGDIR}/load-stumpwm.lisp" || die use doc && do_doc - use contrib && do_contrib } pkg_postinst() { |