x11-wm/stumpwm: Fix ASDF directory

diff --git a/x11-wm/stumpwm/stumpwm-0.9.9.ebuild b/x11-wm/stumpwm/stumpwm-0.9.9.ebuild
index d7ebbcf43d99cad2a3b157932962ef7e637f6e94..29808a6e8aa5d411b3bbf0cc3c216f0762ba77b5 100644 (file)
--- a/x11-wm/stumpwm/stumpwm-0.9.9.ebuild
+++ b/x11-wm/stumpwm/stumpwm-0.9.9.ebuild
@@ -29,7 +29,8 @@ DEPEND="${RDEPEND}
                doc? ( virtual/texi2dvi )"
 
 SITEFILE=70${PN}-gentoo.el
-CONTRIBDIR="${CLSOURCEROOT}/${CLPACKAGE}/contrib"
+CLPKGDIR="${CLSOURCEROOT}/${CLPACKAGE}"
+CONTRIBDIR="${CLPKGDIR}/contrib"
 
 get_lisp() {
        local lisp
@@ -55,10 +56,12 @@ 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 "${S}/${PN}.asd" -e 's/:version "0.9.8"/:version "0.9.9"/' || die
+       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 "${S}/load-${PN}.lisp.in" -e "s/asdf:oos 'asdf:load-op/require/" || die
+       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

diff --git a/x11-wm/stumpwm/stumpwm-9999.ebuild b/x11-wm/stumpwm/stumpwm-9999.ebuild
index 5d604d93448b1d039b5b1945505700b86d944f22..cec821a91ec847bfa7f79dae2ccdc61f0b2986f0 100644 (file)
--- a/x11-wm/stumpwm/stumpwm-9999.ebuild
+++ b/x11-wm/stumpwm/stumpwm-9999.ebuild
@@ -33,6 +33,8 @@ do_doc() {
 }
 
 src_prepare() {
+       # Fix ASDF dir
+       sed -i -e "/^STUMPWM_ASDF_DIR/s|\`pwd\`|${CLPKGDIR}|" configure.ac || die
        eautoreconf
 }