| 1 |
commit: f0cbff3814f55bc913c5c522b780eb3ee4f76405 |
| 2 |
Author: José María Alonso Josa <nimiux <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 28 21:56:57 2016 +0000 |
| 4 |
Commit: José María Alonso <nimiux <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 28 21:58:04 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0cbff38 |
| 7 |
|
| 8 |
x11-wm/stumpwm: Fix ASDF dir |
| 9 |
|
| 10 |
Fixes bug #575874 |
| 11 |
|
| 12 |
x11-wm/stumpwm/stumpwm-0.9.9.ebuild | 7 ++++--- |
| 13 |
1 file changed, 4 insertions(+), 3 deletions(-) |
| 14 |
|
| 15 |
diff --git a/x11-wm/stumpwm/stumpwm-0.9.9.ebuild b/x11-wm/stumpwm/stumpwm-0.9.9.ebuild |
| 16 |
index 00a90c7..40426cd 100644 |
| 17 |
--- a/x11-wm/stumpwm/stumpwm-0.9.9.ebuild |
| 18 |
+++ b/x11-wm/stumpwm/stumpwm-0.9.9.ebuild |
| 19 |
@@ -56,8 +56,6 @@ do_contrib() { |
| 20 |
} |
| 21 |
|
| 22 |
src_prepare() { |
| 23 |
- # Fix ASDF dir |
| 24 |
- sed -i -e "/^STUMPWM_ASDF_DIR/s|\`pwd\`|${CLPKGDIR}|" configure.ac || die |
| 25 |
# Upstream didn't change the version before packaging |
| 26 |
sed -i -e 's/:version "0.9.8"/:version "0.9.9"/' "${PN}.asd" || die |
| 27 |
# Bug 534592. Does not build with asdf:oos, using require to load the package |
| 28 |
@@ -74,7 +72,7 @@ src_prepare() { |
| 29 |
src_configure() { |
| 30 |
local moduleconfig |
| 31 |
|
| 32 |
- use contrib && moduleconfig="--with-module-dir=${CLSOURCEROOT}/${CLPACKAGE}/contrib" |
| 33 |
+ use contrib && moduleconfig="--with-module-dir=${CONTRIBDIR}/contrib" |
| 34 |
econf --with-lisp=$(get_lisp sbcl clisp ecl) "${moduleconfig}" |
| 35 |
} |
| 36 |
|
| 37 |
@@ -90,6 +88,9 @@ src_install() { |
| 38 |
|
| 39 |
common-lisp-install-sources *.lisp |
| 40 |
common-lisp-install-asdf ${PN}.asd |
| 41 |
+ # Fix ASDF dir |
| 42 |
+ sed -i -e "/(:directory/c\ (:directory \"${CLPKGDIR}\")" \ |
| 43 |
+ "${D}${CLPKGDIR}/load-stumpwm.lisp" || die |
| 44 |
use doc && do_doc |
| 45 |
use contrib && do_contrib |
| 46 |
} |
Archives