sci-libs/gdal: poppler-0.73 support was upstreamed

Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

diff --git a/sci-libs/gdal/gdal-2.3.1.ebuild b/sci-libs/gdal/gdal-2.3.1.ebuild
index 9f81394be0262b84dd094e3df2683a747867d100..1e486dbbe8a3b26000e81d958f1f1d304016e6a3 100644 (file)
--- a/sci-libs/gdal/gdal-2.3.1.ebuild
+++ b/sci-libs/gdal/gdal-2.3.1.ebuild
@@ -82,8 +82,9 @@ PATCHES=(
        "${FILESDIR}/${PN}-2.2.3-soname.patch"
        "${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
+       # fixed in 2.4.0:
+       "${FILESDIR}/${P}-poppler-0.69.0.patch"
+       "${FILESDIR}/${P}-poppler-0.71.0.patch" # bug 674556
 )
 
 src_prepare() {
@@ -120,10 +121,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"
-       # not upstreamable, not fixed in 2.4.0 or master as of 2019-01-16:
-       has_version ">=app-text/poppler-0.73.0" && eapply "${FILESDIR}/${PN}-2.3.1-poppler-0.73.0.patch"
+       # fixed in git master or what will become 2.4.1:
+       has_version ">=app-text/poppler-0.72.0" && eapply "${FILESDIR}/${P}-poppler-0.72.0.patch"
+       has_version ">=app-text/poppler-0.73.0" && eapply "${FILESDIR}/${P}-poppler-0.73.0.patch"
 
        eautoreconf
 }