summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-01-12 17:27:11 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2019-01-12 21:07:04 +0100
commit864b528b1db3f4e946a21c7badac1448f13feaea (patch)
treeef838317bb70fdeca18b43e764c65520622fd49b /sci-libs/gdal/gdal-2.3.1.ebuild
parentprofiles: arm: Drop obsolete sci-chemistry/gromacs[mpi] stable mask (diff)
downloadgentoo-864b528b1db3f4e946a21c7badac1448f13feaea.tar.gz
gentoo-864b528b1db3f4e946a21c7badac1448f13feaea.tar.bz2
gentoo-864b528b1db3f4e946a21c7badac1448f13feaea.zip
sci-libs/gdal: Fix build with poppler-0.71 and poppler-0.72
Bug: https://bugs.gentoo.org/674556 Package-Manager: Portage-2.3.55, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'sci-libs/gdal/gdal-2.3.1.ebuild')
-rw-r--r--sci-libs/gdal/gdal-2.3.1.ebuild7
1 files changed, 6 insertions, 1 deletions
diff --git a/sci-libs/gdal/gdal-2.3.1.ebuild b/sci-libs/gdal/gdal-2.3.1.ebuild
index 317b386da9e5..7af0dee08518 100644
--- a/sci-libs/gdal/gdal-2.3.1.ebuild
+++ b/sci-libs/gdal/gdal-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -83,6 +83,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.2.3-bashcomp-path.patch" # bug 641866
"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
"${FILESDIR}/${PN}-2.3.1-poppler-0.69.0.patch"
+ "${FILESDIR}/${PN}-2.3.1-poppler-0.71.0.patch" # bug 674556
)
src_prepare() {
@@ -119,6 +120,9 @@ src_prepare() {
default
+ # not upstreamable, not fixed in 2.4.0 or master as of 2019-01-12:
+ has_version ">=app-text/poppler-0.72.0" && eapply "${FILESDIR}/${PN}-2.3.1-poppler-0.72.0.patch"
+
eautoreconf
}
@@ -311,6 +315,7 @@ src_install() {
fi
doman "${S}"/man/man*/*
+ find "${ED}" -name '*.la' -delete || die
}
pkg_postinst() {