gentoo resync : 18.11.2018

3 files changed, 304 insertions, 1 deletions

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 6df23c34f961..6fcaf4eb5a20 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -6,8 +6,9 @@ AUX gdal-2.3.0-changeset_38658.patch 3281 BLAKE2B 3939df03e8ceba4c3615a70003bfa6
 AUX gdal-2.3.0-curl.patch 471 BLAKE2B 551c9fba5cd49afef45ae271f20b8440214b06f569893cf8dfba73bd5682a9494e8ff1d3c81c1784019e49149d56aa4a4f4ced77db2d1a29f12eaec3f4fbce72 SHA512 a23a7df486ed2fe0c000a87405ad56ed48107a957ce29bd6692df26ef93e493b2221b856720721cafeba9646c4c959e154549c87e1012a8a65389343d267dbe6
 AUX gdal-2.3.0-frmts-nitf38234.patch 421 BLAKE2B d32592e440b459a57a25de39658224db5a871a82955620140a209bab0f84872dd5c67414df16d64cf24d7ad7a180eeaff7eed7e4aef8e6a70f550575538d93ec SHA512 ffcd68e4fc277f37540a81cf200a597da0f3ee42284107724a3b6bdb44ca54459dceefd52e9d946c8b3d8fd9c5153bcdcc30dacf3ebef46180a9d22280e62c2d
 AUX gdal-2.3.0-libtiff.patch 306 BLAKE2B 8f2b39c812ceeee94b95102638885d0ff25086dec8196eaf9ae50378abe88809414da370d9b626b05d2daecfd762bf56938e35fd566952fddc18f1c614dfb4c4 SHA512 b793b1f2631a5944a79be58eab530f3cd248b25858f810515875adc71abb8e4abb1c9f9cf87ec45282bf9eca2e3932706110099a330664aadba3724954ca7297
+AUX gdal-2.3.1-poppler-0.69.0.patch 12775 BLAKE2B 27fe38cb5db58961e1f9f4aef9eddbf396dd364dd1c14bb61fefe4eb16397b75a56edd1b7e3225ccb30ecb2da1f5a5ddc669c9dd984807d5e92fb76c9b83e0b5 SHA512 84eb0107abc9030e34bd953d1b8218a15c35432c0dc687e4d52b97c66cda44e842b53d2819cd998921fe5e90830ce063aa242fe933f0675b1c649fb1c5e44ecc
 DIST gdal-2.3.0.tar.gz 14423820 BLAKE2B 6c67c66b2f68699249ccd4df2cb1e3b7042e94003b730e64bd8b8eec726a32da9485cab29552bd34c23831686ec3e879edd1848a2339c8289580ce282a287992 SHA512 b37e433be0b7a587ea9f9e5e720295e4cd1406f6c8ca770f5fedcd7fdc797e01e576eb887034b38f93f04a4e76c0ce84792bc7d91a49fea4122231a37ace812f
 DIST gdal-2.3.1.tar.gz 14450452 BLAKE2B 226ddf80ff8b9e3d420ac717b245a09fe3daa0331931f4d371b62ab9fa9bb0735ca11e1e045398de92d61b68815aa1dc3e7b6568f4853964cf42d188e46e6eb7 SHA512 0c5bb515dd2a9ad3110421b39bd680ce7e9de68e969cf35a7e63118965dbe193d25a7720a525e53af153de3e78f76ccc6983f4dcdfa6ba429d732a7a47a35d57
 EBUILD gdal-2.3.0-r2.ebuild 8138 BLAKE2B f11f4a5110a63b6eacac015ce16d05c235776a365d8328ce2046494ec560f6653f9dee26b8c99b536c6452d25e0fb600bfaed4b849b5dea87dea2bf5c0d5752b SHA512 a2cbe076456ad3b151c554b7f72da5fdf52637278b2e06816aede1e5150ee6c8aaf6441fd1be10a90b3bba380d99262c33430df10dfc7a524ea6001feca7bcab
-EBUILD gdal-2.3.1.ebuild 8013 BLAKE2B 8b4b8c647241b9828a6860327c2e58165882417945998029c811a4008c5f12770d811448a993f46bcf5681d7911af63986c9cb4bbcb985e972659db415ecf0db SHA512 fd61d52be4f9529c50b0b6ab6d62fff932cc5e57ef69572d2d4ef6a1ef88cafcc6ef5a59a53e8b0fe663197f60379b0a3665fc756be619a546d1eed0a0faa1ef
+EBUILD gdal-2.3.1.ebuild 8061 BLAKE2B e8ae8cb8b04b1699e6b03f3f314cb6ea8f328570481834fe9c8db8fc45981a11a9a6ad80284f14fb698cef3a0bd87c48131a2dd4d2e8b9c5a4533e28e1d1ef69 SHA512 5a5d1521960ed475bb50a7a8547bdbb70f9476f5eae056975ae9d2aaf80ebe0336a21321412d76ca3c94dcb11a685a38bd67e193d65607dd94ded883879b02d7
 MISC metadata.xml 1616 BLAKE2B 7167165623c93e069ce77ef80e68e6339fc38354c0db343564ce8ecf3566e0d61b8b5aeb4e6b69e66bf1e8932d18de54b528bf1a2148767efe3b5cf985a31748 SHA512 dca0cb7a8c94a5313aed09f8c28ae35a55de4b0ff8198469b7f9adc8220b29cbd8c3f92db121b944b03c169b302ac8aa95f4342b76510590aff63a5f122c74c1
diff --git a/sci-libs/gdal/files/gdal-2.3.1-poppler-0.69.0.patch b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.69.0.patch
new file mode 100644
index 000000000000..a89970074b06
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.69.0.patch
@@ -0,0 +1,301 @@
+From 0c0b9ea5a5d6bbef938de8a77c5b00cb228b902d Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Fri, 12 Oct 2018 19:02:40 +0200
+Subject: [PATCH] Add support for Poppler 0.69 (fixes #1004)
+
+---
+ GDALmake.opt.in          |  1 +
+ configure                | 61 ++++++++++++++++++++++++++---------
+ configure.ac             | 56 +++++++++++++++++++++++---------
+ frmts/pdf/GNUmakefile    |  4 +++
+ frmts/pdf/makefile.vc    |  6 +++-
+ frmts/pdf/pdfdataset.cpp | 12 +++++++
+ nmake.opt                |  2 ++
+ 7 files changed, 111 insertions(+), 31 deletions(-)
+
+diff --git a/GDALmake.opt.in b/GDALmake.opt.in
+index 30749ae982a..f9ab41fd124 100644
+--- a/GDALmake.opt.in
++++ b/GDALmake.opt.in
+@@ -481,6 +481,7 @@ POPPLER_BASE_STREAM_HAS_TWO_ARGS = @POPPLER_BASE_STREAM_HAS_TWO_ARGS@
+ POPPLER_0_20_OR_LATER = @POPPLER_0_20_OR_LATER@
+ POPPLER_0_23_OR_LATER = @POPPLER_0_23_OR_LATER@
+ POPPLER_0_58_OR_LATER = @POPPLER_0_58_OR_LATER@
++POPPLER_0_69_OR_LATER = @POPPLER_0_69_OR_LATER@
+ POPPLER_INC = @POPPLER_INC@
+ POPPLER_PLUGIN_LIB = @POPPLER_PLUGIN_LIB@
+ 
+diff --git a/configure b/configure
+index 050bc79ac97..a8472ba8c2d 100755
+--- a/configure
++++ b/configure
+@@ -669,6 +669,7 @@ PODOFO_INC
+ HAVE_PODOFO
+ POPPLER_PLUGIN_LIB
+ POPPLER_INC
++POPPLER_0_69_OR_LATER
+ POPPLER_0_58_OR_LATER
+ POPPLER_0_23_OR_LATER
+ POPPLER_0_20_OR_LATER
+@@ -34798,6 +34799,7 @@ POPPLER_BASE_STREAM_HAS_TWO_ARGS=no
+ POPPLER_0_20_OR_LATER=no
+ POPPLER_0_23_OR_LATER=no
+ POPPLER_0_58_OR_LATER=no
++POPPLER_0_69_OR_LATER=no
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for poppler" >&5
+ $as_echo_n "checking for poppler... " >&6; }
+@@ -34840,24 +34842,51 @@ $as_echo "yes" >&6; }
+ 
+         CHECK_OTHER_POPPLER_VERSION=yes
+ 
+-        # And now we check if we have Poppler >= 0.58.0
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Object does have new API (>= 0.58.0)" >&5
++        if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
++            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if OptionalContent has API >= 0.69.0" >&5
++$as_echo_n "checking if OptionalContent has API >= 0.69.0... " >&6; }
++            rm -f testpoppler.*
++            echo '#include <poppler/OptionalContent.h>' > testpoppler.cpp
++            echo 'int main(int argc, char** argv) {' >> testpoppler.cpp
++            echo 'OCGs ocg(nullptr, nullptr);' >> testpoppler.cpp
++            echo 'ocg.getOCGs().size();' >> testpoppler.cpp
++            echo 'return 0; }' >> testpoppler.cpp
++            if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
++                POPPLER_0_69_OR_LATER=yes
++                POPPLER_0_58_OR_LATER=yes
++                POPPLER_0_23_OR_LATER=yes
++                POPPLER_0_20_OR_LATER=yes
++                POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
++                POPPLER_HAS_OPTCONTENT=yes
++                CHECK_OTHER_POPPLER_VERSION=no
++                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++            else
++                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++            fi
++        fi
++
++        if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
++            # And now we check if we have Poppler >= 0.58.0
++            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Object does have new API (>= 0.58.0)" >&5
+ $as_echo_n "checking if Object does have new API (>= 0.58.0)... " >&6; }
+-        rm -f testpoppler.*
+-        echo '#include <poppler/Object.h>' > testpoppler.cpp
+-        echo 'int main(int argc, char** argv) { Object o(objNull); return 0; }' >> testpoppler.cpp
+-        if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
+-            POPPLER_0_58_OR_LATER=yes
+-            POPPLER_0_23_OR_LATER=yes
+-            POPPLER_0_20_OR_LATER=yes
+-            POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
+-            POPPLER_HAS_OPTCONTENT=yes
+-            CHECK_OTHER_POPPLER_VERSION=no
+-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++            rm -f testpoppler.*
++            echo '#include <poppler/Object.h>' > testpoppler.cpp
++            echo 'int main(int argc, char** argv) { Object o(objNull); return 0; }' >> testpoppler.cpp
++            if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
++                POPPLER_0_58_OR_LATER=yes
++                POPPLER_0_23_OR_LATER=yes
++                POPPLER_0_20_OR_LATER=yes
++                POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
++                POPPLER_HAS_OPTCONTENT=yes
++                CHECK_OTHER_POPPLER_VERSION=no
++                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-        else
+-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++            else
++                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
++            fi
+         fi
+ 
+         if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
+@@ -34962,6 +34991,8 @@ POPPLER_0_23_OR_LATER=$POPPLER_0_23_OR_LATER
+ 
+ POPPLER_0_58_OR_LATER=$POPPLER_0_58_OR_LATER
+ 
++POPPLER_0_69_OR_LATER=$POPPLER_0_69_OR_LATER
++
+ POPPLER_INC=$POPPLER_INC
+ 
+ POPPLER_PLUGIN_LIB=$POPPLER_PLUGIN_LIB
+diff --git a/configure.ac b/configure.ac
+index 4b8ab911cec..0c588e04f03 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4496,6 +4496,7 @@ POPPLER_BASE_STREAM_HAS_TWO_ARGS=no
+ POPPLER_0_20_OR_LATER=no
+ POPPLER_0_23_OR_LATER=no
+ POPPLER_0_58_OR_LATER=no
++POPPLER_0_69_OR_LATER=no
+ 
+ AC_MSG_CHECKING([for poppler])
+ 
+@@ -4536,21 +4537,45 @@ if test "$with_poppler" != "no" -a "$with_poppler" != ""; then
+ 
+         CHECK_OTHER_POPPLER_VERSION=yes
+ 
+-        # And now we check if we have Poppler >= 0.58.0
+-        AC_MSG_CHECKING([if Object does have new API (>= 0.58.0)])
+-        rm -f testpoppler.*
+-        echo '#include <poppler/Object.h>' > testpoppler.cpp
+-        echo 'int main(int argc, char** argv) { Object o(objNull); return 0; }' >> testpoppler.cpp
+-        if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
+-            POPPLER_0_58_OR_LATER=yes
+-            POPPLER_0_23_OR_LATER=yes
+-            POPPLER_0_20_OR_LATER=yes
+-            POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
+-            POPPLER_HAS_OPTCONTENT=yes
+-            CHECK_OTHER_POPPLER_VERSION=no
+-            AC_MSG_RESULT([yes])
+-        else
+-            AC_MSG_RESULT([no])
++        if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
++            AC_MSG_CHECKING([if OptionalContent has API >= 0.69.0])
++            rm -f testpoppler.*
++            echo '#include <poppler/OptionalContent.h>' > testpoppler.cpp
++            echo 'int main(int argc, char** argv) {' >> testpoppler.cpp
++            echo 'OCGs ocg(nullptr, nullptr);' >> testpoppler.cpp
++            echo 'ocg.getOCGs().size();' >> testpoppler.cpp
++            echo 'return 0; }' >> testpoppler.cpp
++            if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
++                POPPLER_0_69_OR_LATER=yes
++                POPPLER_0_58_OR_LATER=yes
++                POPPLER_0_23_OR_LATER=yes
++                POPPLER_0_20_OR_LATER=yes
++                POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
++                POPPLER_HAS_OPTCONTENT=yes
++                CHECK_OTHER_POPPLER_VERSION=no
++                AC_MSG_RESULT([yes])
++            else
++                AC_MSG_RESULT([no])
++            fi
++        fi
++
++        if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
++            # And now we check if we have Poppler >= 0.58.0
++            AC_MSG_CHECKING([if Object does have new API (>= 0.58.0)])
++            rm -f testpoppler.*
++            echo '#include <poppler/Object.h>' > testpoppler.cpp
++            echo 'int main(int argc, char** argv) { Object o(objNull); return 0; }' >> testpoppler.cpp
++            if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
++                POPPLER_0_58_OR_LATER=yes
++                POPPLER_0_23_OR_LATER=yes
++                POPPLER_0_20_OR_LATER=yes
++                POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
++                POPPLER_HAS_OPTCONTENT=yes
++                CHECK_OTHER_POPPLER_VERSION=no
++                AC_MSG_RESULT([yes])
++            else
++                AC_MSG_RESULT([no])
++            fi
+         fi
+ 
+         if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
+@@ -4635,6 +4660,7 @@ AC_SUBST(POPPLER_BASE_STREAM_HAS_TWO_ARGS, $POPPLER_BASE_STREAM_HAS_TWO_ARGS)
+ AC_SUBST(POPPLER_0_20_OR_LATER, $POPPLER_0_20_OR_LATER)
+ AC_SUBST(POPPLER_0_23_OR_LATER, $POPPLER_0_23_OR_LATER)
+ AC_SUBST(POPPLER_0_58_OR_LATER, $POPPLER_0_58_OR_LATER)
++AC_SUBST(POPPLER_0_69_OR_LATER, $POPPLER_0_69_OR_LATER)
+ AC_SUBST(POPPLER_INC, $POPPLER_INC)
+ AC_SUBST(POPPLER_PLUGIN_LIB, $POPPLER_PLUGIN_LIB)
+ 
+diff --git a/frmts/pdf/GNUmakefile b/frmts/pdf/GNUmakefile
+index 2c332d2798f..6a267f529b2 100644
+--- a/frmts/pdf/GNUmakefile
++++ b/frmts/pdf/GNUmakefile
+@@ -34,6 +34,10 @@ ifeq ($(POPPLER_0_58_OR_LATER),yes)
+ CPPFLAGS +=  -DPOPPLER_0_58_OR_LATER
+ endif
+ 
++ifeq ($(POPPLER_0_69_OR_LATER),yes)
++CPPFLAGS +=  -DPOPPLER_0_69_OR_LATER
++endif
++
+ ifeq ($(HAVE_PODOFO),yes)
+ CPPFLAGS +=  -DHAVE_PODOFO
+ endif
+diff --git a/frmts/pdf/makefile.vc b/frmts/pdf/makefile.vc
+index b4fa14d0a18..ad76d3de70c 100644
+--- a/frmts/pdf/makefile.vc
++++ b/frmts/pdf/makefile.vc
+@@ -14,7 +14,7 @@ OBJ = $(OBJ) ..\..\ogr\ogrsf_frmts\mem\ogrmemdatasource.obj ..\..\ogr\ogrsf_frmt
+ EXTRAFLAGS =  -I..\vrt -I..\mem -I..\..\ogr\ogrsf_frmts\mem $(POPPLER_EXTRAFLAGS) $(PODOFO_EXTRAFLAGS) $(PDFIUM_EXTRAFLAGS)
+ 
+ !IFDEF POPPLER_ENABLED
+-POPPLER_EXTRAFLAGS = $(POPPLER_CFLAGS) $(POPPLER_HAS_OPTCONTENT_FLAGS) $(POPPLER_BASE_STREAM_HAS_TWO_ARGS_FLAGS) $(POPPLER_0_20_OR_LATER_FLAGS) $(POPPLER_0_23_OR_LATER_FLAGS) $(POPPLER_0_58_OR_LATER_FLAGS) -DHAVE_POPPLER
++POPPLER_EXTRAFLAGS = $(POPPLER_CFLAGS) $(POPPLER_HAS_OPTCONTENT_FLAGS) $(POPPLER_BASE_STREAM_HAS_TWO_ARGS_FLAGS) $(POPPLER_0_20_OR_LATER_FLAGS) $(POPPLER_0_23_OR_LATER_FLAGS) $(POPPLER_0_58_OR_LATER_FLAGS) $(POPPLER_0_69_OR_LATER_FLAGS) -DHAVE_POPPLER
+ 
+ !IFDEF POPPLER_HAS_OPTCONTENT
+ POPPLER_HAS_OPTCONTENT_FLAGS = -DPOPPLER_HAS_OPTCONTENT
+@@ -36,6 +36,10 @@ POPPLER_0_23_OR_LATER_FLAGS = -DPOPPLER_0_23_OR_LATER
+ POPPLER_0_58_OR_LATER_FLAGS = -DPOPPLER_0_58_OR_LATER
+ !ENDIF
+ 
++!IFDEF POPPLER_0_69_OR_LATER
++POPPLER_0_69_OR_LATER_FLAGS = -DPOPPLER_0_69_OR_LATER
++!ENDIF
++
+ !ENDIF
+ 
+ !IFDEF PODOFO_ENABLED
+diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
+index ee89fd07564..1a56f57ee06 100644
+--- a/frmts/pdf/pdfdataset.cpp
++++ b/frmts/pdf/pdfdataset.cpp
+@@ -3440,10 +3440,16 @@ void PDFDataset::FindLayersPoppler()
+     }
+     else
+     {
++#ifdef POPPLER_0_69_OR_LATER
++        for( const auto& refOCGPair: optContentConfig->getOCGs() )
++        {
++            auto ocg = refOCGPair.second.get();
++#else
+         GooList* ocgList = optContentConfig->getOCGs();
+         for(int i=0;i<ocgList->getLength();i++)
+         {
+             OptionalContentGroup* ocg = (OptionalContentGroup*) ocgList->get(i);
++#endif
+             if( ocg != nullptr && ocg->getName() != nullptr )
+             {
+                 const char* pszLayerName = (const char*)ocg->getName()->getCString();
+@@ -3472,10 +3478,16 @@ void PDFDataset::TurnLayersOnOffPoppler()
+     {
+         int i;
+         int bAll = EQUAL(pszLayers, "ALL");
++#ifdef POPPLER_0_69_OR_LATER
++        for( const auto& refOCGPair: optContentConfig->getOCGs() )
++        {
++            auto ocg = refOCGPair.second.get();
++#else
+         GooList* ocgList = optContentConfig->getOCGs();
+         for(i=0;i<ocgList->getLength();i++)
+         {
+             OptionalContentGroup* ocg = (OptionalContentGroup*) ocgList->get(i);
++#endif
+             ocg->setState( (bAll) ? OptionalContentGroup::On : OptionalContentGroup::Off );
+         }
+ 
+diff --git a/nmake.opt b/nmake.opt
+index 682d766d93e..1eb049038c8 100644
+--- a/nmake.opt
++++ b/nmake.opt
+@@ -639,6 +639,7 @@ OCI_INCLUDE =	-I$(ORACLE_HOME)\oci\include
+ # Uncomment POPPLER_0_20_OR_LATER = YES for Poppler >= 0.20.0
+ # Uncomment POPPLER_0_23_OR_LATER = YES for Poppler >= 0.23.0
+ # Uncomment POPPLER_0_58_OR_LATER = YES for Poppler >= 0.58.0
++# Uncomment POPPLER_0_69_OR_LATER = YES for Poppler >= 0.69.0
+ #POPPLER_ENABLED = YES
+ #POPPLER_CFLAGS = -Ie:/kde/include -Ie:/kde/include/poppler
+ #POPPLER_HAS_OPTCONTENT = YES
+@@ -646,6 +647,7 @@ OCI_INCLUDE =	-I$(ORACLE_HOME)\oci\include
+ #POPPLER_0_20_OR_LATER = YES
+ #POPPLER_0_23_OR_LATER = YES
+ #POPPLER_0_58_OR_LATER = YES
++#POPPLER_0_69_OR_LATER = YES
+ #POPPLER_LIBS = e:/kde/lib/poppler.lib e:/kde/lib/freetype.lib e:/kde/lib/liblcms-1.lib advapi32.lib gdi32.lib
+ 
+ # Uncomment for PDF support
diff --git a/sci-libs/gdal/gdal-2.3.1.ebuild b/sci-libs/gdal/gdal-2.3.1.ebuild
index 65af4595613d..317b386da9e5 100644
--- a/sci-libs/gdal/gdal-2.3.1.ebuild
+++ b/sci-libs/gdal/gdal-2.3.1.ebuild
@@ -82,6 +82,7 @@ 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"
 )
 
 src_prepare() {