dev-lisp/clisp: Adds ${EPREFIX} to all /usr instances not preceded by ${ROOT}

Bug: https://bugs.gentoo.org/641230
Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/dev-lisp/clisp/clisp-2.49.90.ebuild b/dev-lisp/clisp/clisp-2.49.90.ebuild
index e1167a08a895a0242c4135288e3b1c1c36965193..ba1830176a3f581123a644a0f978f84ea40ee874 100644 (file)
--- a/dev-lisp/clisp/clisp-2.49.90.ebuild
+++ b/dev-lisp/clisp/clisp-2.49.90.ebuild
@@ -93,7 +93,7 @@ src_configure() {
        fi
        if use berkdb; then
                enable_modules berkeley-db
-               append-cppflags -I/usr/include/db4.8
+               append-cppflags -I"${EPREFIX}"/usr/include/db4.8
        fi
        use dbus && enable_modules dbus
        use fastcgi && enable_modules fastcgi
@@ -105,14 +105,14 @@ src_configure() {
        use zlib && enable_modules zlib
 
        if use hyperspec; then
-               CLHSROOT="file:///usr/share/doc/hyperspec/HyperSpec/"
+               CLHSROOT="file:///${EPREFIX}/usr/share/doc/hyperspec/HyperSpec/"
        else
                CLHSROOT="http://www.lispworks.com/reference/HyperSpec/"
        fi
 
        # configure chokes on --sysconfdir option
-       local configure="./configure --prefix=/usr --enable-portability \
-                 --libdir=/usr/$(get_libdir) $(use_with readline) $(use_with unicode) \
+       local configure="./configure --prefix=${EPREFIX}/usr --enable-portability \
+                 --libdir=${EPREFIX}/usr/$(get_libdir) $(use_with readline) $(use_with unicode) \
                  ${myconf} --hyperspec=${CLHSROOT} ${BUILDDIR}"
        einfo "${configure}"
        ${configure} || die "./configure failed"
@@ -131,12 +131,12 @@ src_compile() {
 
 src_install() {
        pushd "${BUILDDIR}"
-       make DESTDIR="${D}" prefix=/usr install-bin || die "Installation failed"
+       make DESTDIR="${D}" prefix="${EPREFIX}"/usr install-bin || die "Installation failed"
        doman clisp.1
        dodoc ../SUMMARY README* ../src/NEWS ../unix/MAGIC.add ../ANNOUNCE
        # stripping them removes common symbols (defined but uninitialised variables)
        # which are then needed to build modules...
-       export STRIP_MASK="*/usr/$(get_libdir)/clisp-${PV}/*/*"
+       export STRIP_MASK="*${EPREFIX}/usr/$(get_libdir)/clisp-${PV}/*/*"
        popd
        dohtml doc/impnotes.{css,html} doc/regexp.html doc/clisp.png
        dodoc doc/{CLOS-guide,LISP-tutorial}.txt