summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé María Alonso Josa <nimiux@gentoo.org>2016-02-28 22:56:57 +0100
committerJosé María Alonso Josa <nimiux@gentoo.org>2016-02-28 22:58:04 +0100
commitf0cbff3814f55bc913c5c522b780eb3ee4f76405 (patch)
tree7c25b443ca12a156125fe0469d4d52ed2654412b
parentsys-kernel/git-sources: Linux patch 4.5_rc6 (diff)
downloadgentoo-f0cbff3814f55bc913c5c522b780eb3ee4f76405.tar.gz
gentoo-f0cbff3814f55bc913c5c522b780eb3ee4f76405.tar.bz2
gentoo-f0cbff3814f55bc913c5c522b780eb3ee4f76405.zip
x11-wm/stumpwm: Fix ASDF dir
Fixes bug #575874
-rw-r--r--x11-wm/stumpwm/stumpwm-0.9.9.ebuild7
1 files 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 00a90c7d1db..40426cd70c2 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
}