app-text/ghostscript-gpl: fix zlib include path usage

The ghostscript-gpl-9.12-sys-zlib.patch attempts to change the include
path from the local copy in the src to the common includedir flag set
by configure flags.  This generally works for native builds, but breaks
when cross-compiling.  Drop the patch and set the zlib src dir to the
temp dir instead.

diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild
index 46321ba50eb772fc95f8557124e3219cf93db393..002dd92be0826760918e4188c4b67cd06eb362ad 100644 (file)
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild
@@ -89,6 +89,9 @@ src_prepare() {
        # http://pkgs.fedoraproject.org/cgit/ghostscript.git
        EPATCH_SUFFIX="patch" EPATCH_FORCE="yes"
        EPATCH_SOURCE="${WORKDIR}/patches/"
+       EPATCH_EXCLUDE="
+               ghostscript-gpl-9.12-sys-zlib.patch
+       "
        epatch
 
        if use djvu ; then
@@ -112,6 +115,11 @@ src_prepare() {
                        "${S}"/base/unix-dll.mak || die "sed failed"
        fi
 
+       # Force the include dirs to a neutral location.
+       sed -i \
+               -e "/^ZLIBDIR=/s:=.*:=${T}:" \
+               configure.ac || die
+
        # search path fix
        # put LDFLAGS after BINDIR, bug #383447
        sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \

diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild
index 13e873ca3d53c74df2de9cc3f16c2e9fb830c251..2bd0afe9a505fc708043d83f1b08ff4c2c8c59db 100644 (file)
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild
@@ -89,9 +89,12 @@ src_prepare() {
        # http://pkgs.fedoraproject.org/cgit/ghostscript.git
        EPATCH_SUFFIX="patch" EPATCH_FORCE="yes"
        EPATCH_SOURCE="${WORKDIR}/patches/"
-       EPATCH_EXCLUDE="ghostscript-gpl-8.64-noopt.patch
-                       ghostscript-gpl-9.07-wrf-snprintf.patch
-                       ghostscript-gpl-9.12-icc-missing-check.patch"
+       EPATCH_EXCLUDE="
+               ghostscript-gpl-8.64-noopt.patch
+               ghostscript-gpl-9.07-wrf-snprintf.patch
+               ghostscript-gpl-9.12-icc-missing-check.patch
+               ghostscript-gpl-9.12-sys-zlib.patch
+       "
        epatch
 
        epatch "${FILESDIR}"/${P}-gserrors.h-backport.patch
@@ -117,6 +120,11 @@ src_prepare() {
                        "${S}"/base/unix-dll.mak || die "sed failed"
        fi
 
+       # Force the include dirs to a neutral location.
+       sed -i \
+               -e "/^ZLIBDIR=/s:=.*:=${T}:" \
+               configure.ac || die
+
        # search path fix
        # put LDFLAGS after BINDIR, bug #383447
        sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \