sci-libs/gdal: Add fix for poppler-0.20.1, #426584; thanks Andreas Sturmlechner for the backport; use eautoreconf because it seems to work

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 189 insertions, 25 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index c47bae12caa6..36a7bfd7963e 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.129 2012/06/05 21:08:15 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.130 2012/08/10 06:12:37 jlec Exp $
+
+  10 Aug 2012; Justin Lecher <jlec@gentoo.org> gdal-1.9.1.ebuild,
+  +files/gdal-1.9.1-poppler-0.20.1.patch:
+  Add fix for poppler-0.20.1, #426584; thanks Andreas Sturmlechner for the
+  backport; use eautoreconf because it seems to work
 
   05 Jun 2012; Brent Baude <ranger@gentoo.org> gdal-1.8.1-r1.ebuild:
   Marking gdal-1.8.1-r1 ppc64 for bug 413835
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 5831fa428835..2e700fa7e923 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,19 +1,31 @@
-AUX 1.7.2-ruby_cflags.patch 1161 RMD160 5635b016c18a54a45e4f9410028f0a4596b52e5b SHA1 42389f01f14ba57a6337a9a1cdbe889c9fc34d61 SHA256 8a943b69b200e8b926e2ed9ad1861a152731bb829459f402a8024e1137eed754
-AUX gdal-1.4.2-datadir.patch 353 RMD160 a5dec6a5bbe091b6e877ced363507798d0ed47d5 SHA1 eddb7f332ff361cbfb8771cc7496d2428a290d71 SHA256 761e5dc10bb8a0d6a270af62aa67e7ec1259f072db958969ce14812f85004c4e
-AUX gdal-1.5.0-install_name.patch 1731 RMD160 9e6d9d2a8a14bf01de242d889140369d083fd7c4 SHA1 4c46ebb1bb7d5f5ca2f1079e6ad1a1230ef698ef SHA256 da631282e7ee42b3f9c46a4ce76d7b4905caa4a056c8109fce0f661b9aa58abd
-AUX gdal-1.5.0-soname.patch 483 RMD160 4ed5e17c3b1e50a1d0bbb52a1d3a56f5bec52aa4 SHA1 8a98cc52bb1d74a1d45f72f8191cf322ee050682 SHA256 212f6f4cb1ef6051bdd1306cedd2236eada53a9ab650158c3b37577f7cd566e7
-AUX gdal-1.5.1-python-install.patch 493 RMD160 f925c5b902a14f4a75a8c6a7816c3e500a59c24e SHA1 7c02ab132485d1486751d45663af21aa9a04ace1 SHA256 122555483fcb811df1f305b20c9c492c64575321b4e834c75a2805ca8e62f593
-AUX gdal-1.6.0-swig-fix.patch 535 RMD160 a3946ac3897d73d09be2d03f1f8a5facef7301ba SHA1 9b3214e7ffe6aa821d716caf3e984841f6e208fd SHA256 83f4de0287893efbc4528a0e4ecc97e0f174d5a44406a8ab5e94e66e51286db1
-AUX gdal-1.6.1-ruby-make.patch 1150 RMD160 8e5b8397a86506d968cbf1a5a04616303df26fc8 SHA1 80c9844bfa4374879cc01af8ac90674c251e1034 SHA256 33d213226ad831ea43df8e7d78e56cd6704dc6089320ac63a4eb3d369b920dea
-AUX gdal-1.6.3-libpng15.patch 1392 RMD160 dfa674f506ca48c8e34d5c795829a78d13f2666a SHA1 18e56da5315590a0c0d97e8a95adab653a962a8c SHA256 dd730790ccbc72131f92d78d130b160b6db30b43688bd67e404932ecd6b57ebd
-AUX gdal-1.8.1-zlib_header_fix.patch 253 RMD160 0c2f1483ea373f596a6bbf0c86ba0f11094ef232 SHA1 04df59a10d1ad719742dd40b0d0225bad053a78d SHA256 019d7a858670aa4651b5c887db4f951d906fd3395e12f3f3a570295fcc171b89
-AUX gdal-1.9.1-opencl.patch 1267 RMD160 f01e826f356d41c079857174363a31effc318556 SHA1 c90954f3662261fe303463a767135efd4d696c74 SHA256 3a09ce25b77444b16edc60b64f44cae2e5961034b1f3f7070479652175470013
-AUX gdal-1.9.1-ruby-makefile.patch 1384 RMD160 5df27b8c9b4f18ed1a6a096598e1be2ee7eb2c9b SHA1 bd96fc10095b54554f6a052af6b2ee4cb04efc5b SHA256 0588d23d027a716b6a75364abba7222bc15e7f9b4d3546c85c0aaf2d970a8c37
-DIST gdal-1.6.3.tar.gz 7007613 RMD160 aab37ae4b7a98f9af6c10511e2ce5205505b9769 SHA1 b8fc53f562dd253c0c75e9ea4d4398f9548c1f1f SHA256 bf946aa229eef28f3d95c8bbf75913aa2d89dd93a03c5cc769cd7c8b98890c67
-DIST gdal-1.8.1.tar.gz 8852355 RMD160 4ac1cd59979464bd37b4d2aa588092ee0c34d45c SHA1 b2f8b12ebdd00c05bc7f1ab7b761d9ac335c470c SHA256 d5d76b85b4a7a0e28ead6c92be0eba9e2b2361a06db0a60ef0fb85db63e7a5df
-DIST gdal-1.9.1.tar.gz 9487505 RMD160 c4d77975b753fae75c634662e5e572fc2308456e SHA1 c1eae556398ff7b9332afe9d3022dcd931130808 SHA256 5b829e91c5d6c6c9af23fe6322e51bae9339e8805d52724cb0ad0b741aef7fa9
-EBUILD gdal-1.6.3-r1.ebuild 6787 RMD160 6a587d3f3f6580f037d4e24535e4482d051e8dd5 SHA1 5eca4f493b479c02e5a9f14ec03c2cf4eacaa54b SHA256 fa637b105c2d1289bf2f671128c9b57c8038463f79f6b018ad6933a63d5b2093
-EBUILD gdal-1.8.1-r1.ebuild 6841 RMD160 23773bca147cab5f63d7161b977de5e801cf4010 SHA1 8fa5e76b30f3fbdd0aba888ef9a32089e20b502a SHA256 80a9cb48c1de30a447ed7d4512f368b30eeb5e9ad64250b9863369f309d7bbba
-EBUILD gdal-1.9.1.ebuild 7845 RMD160 c3b9eaa9a16624b3077783a332878b7519ed3b0f SHA1 5817e0692b91f665b7a20fda48294a56ede512fd SHA256 80e4f104a15d9444faacfddea0157a101f52ba7c121af4b2d4e3b88f93c485a7
-MISC ChangeLog 23865 RMD160 5ad0de41abb560615d313b06e9ae05288f3ad577 SHA1 24f034784031891a0ffbff7d9449b4d72d4df43c SHA256 e47fc7476855022df46abda31f46be17372feab80dff99524e813c10b88cc710
-MISC metadata.xml 1572 RMD160 1088e92594a056905dc479a997415fc6f4e58a88 SHA1 cf9c406464eee430444ad20eb09e33f284177bf4 SHA256 a8fe59507f9e4082756f8fee9ecc40b1fd6d23fa7a589e5a056b71af76724814
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 1.7.2-ruby_cflags.patch 1161 SHA256 8a943b69b200e8b926e2ed9ad1861a152731bb829459f402a8024e1137eed754 SHA512 86f58c3339116886f51b3ebb79ed8461d959af55982e2e285ce69114c9f4385ee2b26d0695b7d5630e2ba8cc73c8ee2c0630f3902a69c49031f13b4acea9edc2 WHIRLPOOL 47ae960ed93daa4fb0df39c5f83128212d70d6c438f3d1e604ff8b35f7c5e17a029397cd1232a6bcbe50b3df77fee0cb5f8db8510705aad68dbf5dcdc89a8146
+AUX gdal-1.4.2-datadir.patch 353 SHA256 761e5dc10bb8a0d6a270af62aa67e7ec1259f072db958969ce14812f85004c4e SHA512 9d7ed61aef8ff8d951f6d74d915f456dc4c409706b9d7cd9d9ae56465ab25bad80108b8e64f9b0303cd826e4f261b4a382619a924f94319a9d242b8ddbeb13e8 WHIRLPOOL e285c549525716ed152cd50f2c9789ecb6801a6310cf21020819d5df1dee62bd0f81730120117ead68ce82b970f1bc8c480cfdd611864c997d667038122894d4
+AUX gdal-1.5.0-install_name.patch 1731 SHA256 da631282e7ee42b3f9c46a4ce76d7b4905caa4a056c8109fce0f661b9aa58abd SHA512 fa5ecc9e14cbfc282a41d0c55e328c2f56bd92d8fac1897d8e921d59c9705b1291eff66e7f6cf8a1305b2c5f044e0813d28affb398b715d9d207c31af341318e WHIRLPOOL f67a2f307c16d664af34fe26993e74c2a0d1a2b52d43176eb1f03fbd9523533906d1a7df34a0745927f46febdb60e6efe7291bf0e520e0d6c904bcbfe5be928f
+AUX gdal-1.5.0-soname.patch 483 SHA256 212f6f4cb1ef6051bdd1306cedd2236eada53a9ab650158c3b37577f7cd566e7 SHA512 c7c022524fd11de2137e15ec8dc31106887a2d23d583f61f1f9bab1d41a01e558faccc162166150c43903dbcaad14af65afd8ddc090670ebbd15dc57f05f228e WHIRLPOOL 7e2f17ea2c804fa7aded2fc8225091e84c44483c69cbb34818af3b38a7d580adf41daff250006778c6d3aea9175b2162e9add3956594b81eefd23689aed0de68
+AUX gdal-1.5.1-python-install.patch 493 SHA256 122555483fcb811df1f305b20c9c492c64575321b4e834c75a2805ca8e62f593 SHA512 d0d115477763e2c3b5c22e5d4befe56b9c331655431261a508df45a1524e76cfa3a311797dc7ec56f9d7eebcda1ba5ed68f7df148dd4c81089569d74376ca578 WHIRLPOOL ae1aa61e07d7c2f04d856919e2e25c5186efb359d798885ae25e7afd7f2dadf8a19580e6643f1f11ab1eb8ec99ce400ccc4205c59289e14b2c7bb9150545a440
+AUX gdal-1.6.0-swig-fix.patch 535 SHA256 83f4de0287893efbc4528a0e4ecc97e0f174d5a44406a8ab5e94e66e51286db1 SHA512 daf38ad023505894916380efd31e1e654acf7e4f9cd50891a3c5b554303db4eeecd9c73eaa78f4018659da8445637bd2af4e086d9616f233acd90b3e2e2c8faf WHIRLPOOL 078074f8098eabe4bea7c6032dc5eff1ff8c0efb9063b7a683eacf6920ff6edcff8cc779d1cbe0fee0b08f20f2e61b9843fcfa8d9f8ec1e28f29949539763120
+AUX gdal-1.6.1-ruby-make.patch 1150 SHA256 33d213226ad831ea43df8e7d78e56cd6704dc6089320ac63a4eb3d369b920dea SHA512 eb9a955e9ff981fa285872206ee1ae22a56fa0c8762e5c1dfebbc40e31ce593c9d298ba7883d5b17e86701038bca5cc2ab959e5046dc4bd1ced2309e24296b6d WHIRLPOOL f7470c2c1b63d564a4fce22128e9ce095a66fc99a666f1b1ae42678d148915f39ad3cfa019c4a4a58b2f6782606a080892ddc76512c7e907501490711b433e80
+AUX gdal-1.6.3-libpng15.patch 1392 SHA256 dd730790ccbc72131f92d78d130b160b6db30b43688bd67e404932ecd6b57ebd SHA512 69b3165cb08964e9fce1d67ba43f82f5a65760e2ce10189de8f212136861d86d34e55731abc3549c84b5977fc198e443639d539f6b72bdefe9c95f14f060de4a WHIRLPOOL af84f901aeb65fc93fcf1390f113e283e78819999bf863e8e85f49d4990225bd2c5ce39f0ce66a114e59be69090ea01b10724acccd812281caec5a32dcbd2d4c
+AUX gdal-1.8.1-zlib_header_fix.patch 253 SHA256 019d7a858670aa4651b5c887db4f951d906fd3395e12f3f3a570295fcc171b89 SHA512 ee9a5fbef309dabe5014ca0a9e1cd32864af8a8939dd445782afd00c6e6aaf83ec5dcff5e0fd66c10661eafa41f4c5c178a4adfebd09964358127620d89b5f3b WHIRLPOOL 2e2147eb440d6a752676ec5c19656c2939584889478af8976e17c7a1e7ddcd318e3f280cf982abde89b09cbe71ea8134c34b88c4788e94b3b25548928c9ecd78
+AUX gdal-1.9.1-opencl.patch 1267 SHA256 3a09ce25b77444b16edc60b64f44cae2e5961034b1f3f7070479652175470013 SHA512 c6b4ed7a07d2374cc08cc3fd99a42bb0540a295a7ac819f71a9f6597b6890efd6c75d711e4d7ce9c7fe8504a0d0a7d2e7f7fade7771c8d829e728471410ae9bc WHIRLPOOL c0eaae989b7142792047984ce4a7885d1b387288cbf46bc6cbf59ab88a3566ae993e73b6abb14654e0709358a327da0f518541ce8f3d0a7a32f82426ccb86c02
+AUX gdal-1.9.1-poppler-0.20.1.patch 5328 SHA256 313624fa699f910522a01e32f5aba56f0eb1aa317f736382c2868cd6ece39d92 SHA512 2520a4bd55a84e7482988704c44a97ac1526ab8c28e0831380b34d4565c6d06d4fbd69cfef05faa547b11141d3a3c5f98ddf1f7c9b5fc9dbc2734121849a401b WHIRLPOOL 9aa60e5b5395f46bb31b8efecef4b067bd96ad99f30a3f0839133bc3a7e0041b303c343ce355f111d15af7eee6e85420d6867990b437b70fc028608c41e43588
+AUX gdal-1.9.1-ruby-makefile.patch 1384 SHA256 0588d23d027a716b6a75364abba7222bc15e7f9b4d3546c85c0aaf2d970a8c37 SHA512 ca163fd30b35d8d04584ae3627bd0733570c66ea1fc8e56161794f280877267ef33d3e52022eef547ae9b1f57d1b54f2ef03cee1bf412ebaa4c16caeab0d4479 WHIRLPOOL b94a07435afa3e51a8b8fd61b3320969e8ca167a3f4bdc6b7e2205ef83df63bbe6637ac926477a8a23da73cebadc06f5aaf9cbfbb24c169e1f88ef53ac3029d5
+DIST gdal-1.6.3.tar.gz 7007613 SHA256 bf946aa229eef28f3d95c8bbf75913aa2d89dd93a03c5cc769cd7c8b98890c67
+DIST gdal-1.8.1.tar.gz 8852355 SHA256 d5d76b85b4a7a0e28ead6c92be0eba9e2b2361a06db0a60ef0fb85db63e7a5df
+DIST gdal-1.9.1.tar.gz 9487505 SHA256 5b829e91c5d6c6c9af23fe6322e51bae9339e8805d52724cb0ad0b741aef7fa9 SHA512 b3a2752a8bc3b0766b258438373a26e95d763e2fc18617ff88763e07e3f90ccabbc183507b23c24974fc818a16546f10439d83ef80ac7bddc22f6edee1c779a7 WHIRLPOOL e543d6e663d2114b3fd96d1e7c09e9bce97c233a01872fef9dc0f690176cab780cb8c21a90953991d443a97bf88f5b8306ea2908fb325fc851bfd764cacd749d
+EBUILD gdal-1.6.3-r1.ebuild 6787 SHA256 fa637b105c2d1289bf2f671128c9b57c8038463f79f6b018ad6933a63d5b2093 SHA512 3626bcdc1a1340815a903cb7785a156ec7de3278b699739bfd4b276e78da3c8f1d50db0c45f9d87b641f50ff42b130c0dc02b101797ad3d1caf50de633760c22 WHIRLPOOL 04fdd686e4a1c7a3f54a48b7d24d9d976296b8ff7804619f372a735070e66bb116539840e6788a20c279155e993d2c8a719403ba4d9b0516ea14f3848298a057
+EBUILD gdal-1.8.1-r1.ebuild 6841 SHA256 80a9cb48c1de30a447ed7d4512f368b30eeb5e9ad64250b9863369f309d7bbba SHA512 5c70e8167515ebfaf4d8196b2bf8deceeaac3d3857771f0436689f20e29975eb628efab5dd9a733766ac3edb872d1104bc3157fd6dbced64fc2724ff46555b9c WHIRLPOOL 4085935312f72225a67fa726f47a794060bf88037d6631142aa2ba4f5bd4b1e7f6d421c3835be2cf6a57cb15c6907cfd1048154555a5fa08b172ea6f5394c111
+EBUILD gdal-1.9.1.ebuild 7929 SHA256 b7f38d114e092a8ae7f57272de162ec412eaf3b2a136b368ded3e0f346e41988 SHA512 12c147aac00cbcae0b0291772671cf8ab4099a207558d1cf818f28cf6d6d9907c60101696a3f773d239f25fd9f19fc29cbbb75e610c0d244f591b20e6d40d351 WHIRLPOOL ef5b0c759eec33051e8eb5c9be4b54d5bf913aac96056d1e87acd3425fe4c475df1cdd0cd43bb196a04712f84428aec93ff354e6e6ad25cbf27afbef59e26e58
+MISC ChangeLog 24100 SHA256 9488e04c2b9f633908e0b693bfe8496bcb569bd77447ba11d95d1e17aa09d608 SHA512 0520c66a72313b711807867e63621bb0c4f75aa1cc83b18672dfd788edcb5e6688b62c5aeee765b86b85daef370f14b3b6cc353b63984dbeef4d6d33beff38ad WHIRLPOOL 651e58ab39ba2e1329cb8e9fd99f3007d5709e19bf7b4cff5c1f9c3cae351082782caf1912ca055ccf9e92708598c9231ffd2ef656f8cd6f921780d0ad0f8688
+MISC metadata.xml 1572 SHA256 a8fe59507f9e4082756f8fee9ecc40b1fd6d23fa7a589e5a056b71af76724814 SHA512 33bd3099273d81692634811e491af3dec6c8da25668f1f6e2c8e6829d89e290c7167662e9ba3b64255e1d748a56a459225964e80e2dff9632491f228980698be WHIRLPOOL 12fbc3c483c61ec39352c22e53f1ef8192f60707822075f04a51cdff58a78e1261ab6fdc237b6f288be67a82e766041849dc8da8aaab634bfea916b3fe3dbd72
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEAREIAAYFAlAkploACgkQgAnW8HDreRZ6oQCgxqeUp37spm3kqFwFkN+wfH8D
+mmMAnA5IP80DW5+rH1f4fYu6JOnKuRUh
+=rq2l
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/gdal/files/gdal-1.9.1-poppler-0.20.1.patch b/sci-libs/gdal/files/gdal-1.9.1-poppler-0.20.1.patch
new file mode 100644
index 000000000000..3e7f0355a6d8
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-1.9.1-poppler-0.20.1.patch
@@ -0,0 +1,143 @@
+Index: /branches/1.9/gdal/nmake.opt

+===================================================================

+--- /branches/1.9/gdal/nmake.opt	(revision 23610)

++++ /branches/1.9/gdal/nmake.opt	(revision 24437)

+@@ -469,8 +469,10 @@

+ # Uncomment for PDF support

+ # Uncomment POPPLER_BASE_STREAM_HAS_TWO_ARGS = YES for Poppler >= 0.16.0

++# Uncomment POPPLER_0_20_OR_LATER = YES for Poppler >= 0.20.0

+ #POPPLER_ENABLED = YES

+ #POPPLER_CFLAGS = -Ie:/kde/include -Ie:/kde/include/poppler

+ #POPPLER_HAS_OPTCONTENT = YES

+ #POPPLER_BASE_STREAM_HAS_TWO_ARGS = YES

++#POPPLER_0_20_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

+ 

+Index: /branches/1.9/gdal/configure.in

+===================================================================

+--- /branches/1.9/gdal/configure.in	(revision 24333)

++++ /branches/1.9/gdal/configure.in	(revision 24437)

+@@ -2941,4 +2941,5 @@

+ POPPLER_HAS_OPTCONTENT=no

+ POPPLER_BASE_STREAM_HAS_TWO_ARGS=no

++POPPLER_0_20_OR_LATER=no

+ 

+ AC_MSG_CHECKING([for poppler])

+@@ -3000,4 +3001,17 @@

+             POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes

+             AC_MSG_RESULT([yes])

++

++            # And now we check if we have Poppler >= 0.20.0

++            AC_MSG_CHECKING([if we have Poppler >= 0.20.0])

++            rm -f testpoppler.*

++            echo '#include <poppler/Error.h>' > testpoppler.cpp

++            echo 'int main(int argc, char** argv) { setErrorCallback(0,0); return 0; }' >> testpoppler.cpp

++            if test -z "`${CXX} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then

++                POPPLER_0_20_OR_LATER=yes

++                AC_MSG_RESULT([yes])

++            else

++                AC_MSG_RESULT([no])

++            fi

++

+         else

+             AC_MSG_RESULT([no])

+@@ -3015,4 +3029,5 @@

+ AC_SUBST(POPPLER_HAS_OPTCONTENT, $POPPLER_HAS_OPTCONTENT)

+ 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_INC, $POPPLER_INC)

+ 

+Index: /branches/1.9/gdal/frmts/pdf/pdfdataset.cpp

+===================================================================

+--- /branches/1.9/gdal/frmts/pdf/pdfdataset.cpp	(revision 23986)

++++ /branches/1.9/gdal/frmts/pdf/pdfdataset.cpp	(revision 24437)

+@@ -327,5 +327,9 @@

+         poSplashOut = new SplashOutputDev(splashModeRGB8, 4, gFalse, sColor);

+         PDFDoc* poDoc = poGDS->poDoc;

++#ifdef POPPLER_0_20_OR_LATER

++        poSplashOut->startDoc(poDoc);

++#else

+         poSplashOut->startDoc(poDoc->getXRef());

++#endif

+         double dfDPI = poGDS->dfDPI;

+ 

+@@ -518,4 +522,19 @@

+ 

+ #ifdef USE_POPPLER

++#ifdef POPPLER_0_20_OR_LATER

++static void PDFDatasetErrorFunction(void* userData, ErrorCategory eErrCatagory, int nPos, char *pszMsg)

++{

++    CPLString osError;

++

++    if (nPos >= 0)

++        osError.Printf("Pos = %d, ", nPos);

++    osError += pszMsg;

++

++    if (strcmp(osError.c_str(), "Incorrect password") == 0)

++        return;

++

++    CPLError(CE_Failure, CPLE_AppDefined, "%s", osError.c_str());

++}

++#else

+ static void PDFDatasetErrorFunction(int nPos, char *pszMsg, va_list args)

+ {

+@@ -531,4 +550,5 @@

+     CPLError(CE_Failure, CPLE_AppDefined, "%s", osError.c_str());

+ }

++#endif

+ #endif

+ 

+@@ -567,5 +587,9 @@

+ 

+     /* Set custom error handler for poppler errors */

++#ifdef POPPLER_0_20_OR_LATER

++    setErrorCallback(PDFDatasetErrorFunction, NULL);

++#else

+     setErrorFunction(PDFDatasetErrorFunction);

++#endif

+ 

+     /* poppler global variable */

+Index: /branches/1.9/gdal/frmts/pdf/makefile.vc

+===================================================================

+--- /branches/1.9/gdal/frmts/pdf/makefile.vc	(revision 22493)

++++ /branches/1.9/gdal/frmts/pdf/makefile.vc	(revision 24437)

+@@ -7,5 +7,5 @@

+ 

+ !IFDEF POPPLER_ENABLED

+-EXTRAFLAGS = $(POPPLER_CFLAGS) $(POPPLER_HAS_OPTCONTENT_FLAGS) $(POPPLER_BASE_STREAM_HAS_TWO_ARGS_FLAGS) -DUSE_POPPLER

++EXTRAFLAGS = $(POPPLER_CFLAGS) $(POPPLER_HAS_OPTCONTENT_FLAGS) $(POPPLER_BASE_STREAM_HAS_TWO_ARGS_FLAGS) $(POPPLER_0_20_OR_LATER_FLAGS) -DUSE_POPPLER

+ 

+ !IFDEF POPPLER_HAS_OPTCONTENT

+@@ -15,4 +15,8 @@

+ !IFDEF POPPLER_BASE_STREAM_HAS_TWO_ARGS

+ POPPLER_BASE_STREAM_HAS_TWO_ARGS_FLAGS = -DPOPPLER_BASE_STREAM_HAS_TWO_ARGS

++!ENDIF

++

++!IFDEF POPPLER_0_20_OR_LATER

++POPPLER_0_20_OR_LATER_FLAGS = -DPOPPLER_0_20_OR_LATER

+ !ENDIF

+ 

+Index: /branches/1.9/gdal/frmts/pdf/GNUmakefile

+===================================================================

+--- /branches/1.9/gdal/frmts/pdf/GNUmakefile	(revision 22491)

++++ /branches/1.9/gdal/frmts/pdf/GNUmakefile	(revision 24437)

+@@ -16,4 +16,9 @@

+ endif

+ 

++ifeq ($(POPPLER_0_20_OR_LATER),yes)

++CPPFLAGS +=  -DPOPPLER_0_20_OR_LATER

++endif

++

++

+ CPPFLAGS	:=	$(GDAL_INCLUDE) $(CPPFLAGS) $(POPPLER_INC) $(PODOFO_INC)

+ 

+Index: /branches/1.9/gdal/GDALmake.opt.in

+===================================================================

+--- /branches/1.9/gdal/GDALmake.opt.in	(revision 24419)

++++ /branches/1.9/gdal/GDALmake.opt.in	(revision 24437)

+@@ -386,4 +386,5 @@

+ POPPLER_HAS_OPTCONTENT = @POPPLER_HAS_OPTCONTENT@

+ POPPLER_BASE_STREAM_HAS_TWO_ARGS = @POPPLER_BASE_STREAM_HAS_TWO_ARGS@

++POPPLER_0_20_OR_LATER = @POPPLER_0_20_OR_LATER@

+ POPPLER_INC = @POPPLER_INC@

+ 

diff --git a/sci-libs/gdal/gdal-1.9.1.ebuild b/sci-libs/gdal/gdal-1.9.1.ebuild
index 2e0daf6d6ce4..91d0a14102e9 100644
--- a/sci-libs/gdal/gdal-1.9.1.ebuild
+++ b/sci-libs/gdal/gdal-1.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.9.1.ebuild,v 1.4 2012/05/27 07:49:48 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.9.1.ebuild,v 1.5 2012/08/10 06:12:37 jlec Exp $
 
 EAPI=4
 
@@ -120,11 +120,15 @@ src_prepare() {
 		-e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
 		configure.in || die
 
+	epatch "${FILESDIR}"/${P}-poppler-0.20.1.patch
+
 	# autoheader fail
-	eaclocal
-	eautoconf
-	eautomake
-	elibtoolize
+#	eaclocal
+#	eautoconf
+#	eautomake
+#	elibtoolize
+	# Seems to work here.
+	eautoreconf
 }
 
 src_configure() {