[gentoo-commits] repo/gentoo:master commit in: x11-wm/stumpwm/

[José María Alonso]

commit:     f0cbff3814f55bc913c5c522b780eb3ee4f76405
Author:     José María Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 21:56:57 2016 +0000
Commit:     José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 21:58:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0cbff38

x11-wm/stumpwm: Fix ASDF dir

Fixes bug #575874

 x11-wm/stumpwm/stumpwm-0.9.9.ebuild | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/x11-wm/stumpwm/stumpwm-0.9.9.ebuild 
b/x11-wm/stumpwm/stumpwm-0.9.9.ebuild
index 00a90c7..40426cd 100644
--- a/x11-wm/stumpwm/stumpwm-0.9.9.ebuild
+++ b/x11-wm/stumpwm/stumpwm-0.9.9.ebuild
@@ -56,8 +56,6 @@ do_contrib() {
 }
 
 src_prepare() {
-       # Fix ASDF dir
-       sed -i -e "/^STUMPWM_ASDF_DIR/s|\`pwd\`|${CLPKGDIR}|" configure.ac || 
die
        # 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
@@ -74,7 +72,7 @@ src_prepare() {
 src_configure() {
        local moduleconfig
 
-       use contrib && 
moduleconfig="--with-module-dir=${CLSOURCEROOT}/${CLPACKAGE}/contrib"
+       use contrib && moduleconfig="--with-module-dir=${CONTRIBDIR}/contrib"
        econf --with-lisp=$(get_lisp sbcl clisp ecl) "${moduleconfig}"
 }
 
@@ -90,6 +88,9 @@ src_install() {
 
        common-lisp-install-sources *.lisp
        common-lisp-install-asdf ${PN}.asd
+       # Fix ASDF dir
+       sed -i -e "/(:directory/c\   (:directory \"${CLPKGDIR}\")" \
+               "${D}${CLPKGDIR}/load-stumpwm.lisp" || die
        use doc && do_doc
        use contrib && do_contrib
 }