[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/

2024-05-13 Thread Andreas Sturmlechner 
commit: 6db9200aefab8f1d62f87d4a0ef20adc20bc4c12
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon May 13 22:04:29 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon May 13 23:14:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6db9200a

sci-libs/gdal: Fix build with Poppler 24.05

Upstream commit 60dcddbf5fab917338caf433b3e7dca283cf9720

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../gdal/files/gdal-3.8.5-poppler-24.05.0.patch| 23 ++
 sci-libs/gdal/gdal-3.8.5.ebuild|  1 +
 2 files changed, 24 insertions(+)

diff --git a/sci-libs/gdal/files/gdal-3.8.5-poppler-24.05.0.patch 
b/sci-libs/gdal/files/gdal-3.8.5-poppler-24.05.0.patch
new file mode 100644
index ..837a50f6b825
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.8.5-poppler-24.05.0.patch
@@ -0,0 +1,23 @@
+From 60dcddbf5fab917338caf433b3e7dca283cf9720 Mon Sep 17 00:00:00 2001
+From: Even Rouault 
+Date: Thu, 4 Apr 2024 17:48:33 +0200
+Subject: [PATCH] Fix build with Poppler 24.05 (unreleased yet)
+
+---
+ frmts/pdf/CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/frmts/pdf/CMakeLists.txt b/frmts/pdf/CMakeLists.txt
+index 9b9a1898a730..bcb19c3aa24c 100644
+--- a/frmts/pdf/CMakeLists.txt
 b/frmts/pdf/CMakeLists.txt
+@@ -54,6 +54,9 @@ if (GDAL_USE_POPPLER)
+   if ("${Poppler_VERSION_MINOR}" MATCHES "0?[0-9]+")
+ string(REGEX REPLACE "0?([0-9]+)" "\\1" Poppler_VERSION_MINOR 
${Poppler_VERSION_MINOR})
+   endif ()
++  if (Poppler_VERSION_STRING VERSION_GREATER_EQUAL "24.05")
++target_compile_features(gdal_PDF PRIVATE cxx_std_20)
++  endif ()
+   target_compile_definitions(gdal_PDF PRIVATE -DHAVE_POPPLER 
-DPOPPLER_MAJOR_VERSION=${Poppler_VERSION_MAJOR}
+   
-DPOPPLER_MINOR_VERSION=${Poppler_VERSION_MINOR})
+ endif ()

diff --git a/sci-libs/gdal/gdal-3.8.5.ebuild b/sci-libs/gdal/gdal-3.8.5.ebuild
index bb1c2e0bde5e..3b40e02bfefc 100644
--- a/sci-libs/gdal/gdal-3.8.5.ebuild
+++ b/sci-libs/gdal/gdal-3.8.5.ebuild
@@ -101,6 +101,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 PATCHES=(
"${FILESDIR}"/${PN}-3.8.0-java21.patch
"${FILESDIR}"/${PN}-3.6.4-abseil-cpp-20230125.2-c++17.patch
+   "${FILESDIR}"/${P}-poppler-24.05.0.patch # in 3.9.0
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/

2024-04-11 Thread Andrew Ammerlaan 
commit: 36d365c38a240d902e66c944296e730ab20c21e4
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Feb  3 08:25:07 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Apr 11 10:01:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36d365c3

sci-libs/gdal: gdal-3.8.0-java21.patch

also no longer depends on deprecated dev-java/ant-core

Bug: https://bugs.gentoo.org/916787
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/gdal/files/gdal-3.8.0-java21.patch  | 20 
 .../gdal/{gdal-3.8.0.ebuild => gdal-3.8.0-r1.ebuild} |  3 ++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/sci-libs/gdal/files/gdal-3.8.0-java21.patch 
b/sci-libs/gdal/files/gdal-3.8.0-java21.patch
new file mode 100644
index ..3e924c5206c1
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.8.0-java21.patch
@@ -0,0 +1,20 @@
+--- a/swig/java/build.xml
 b/swig/java/build.xml
+@@ -21,7 +21,7 @@
+   
+   
+   
+   
+   compilation complete
+@@ -38,7 +38,7 @@
+   
+   
+   
+   
+   compilation of tests complete

diff --git a/sci-libs/gdal/gdal-3.8.0.ebuild 
b/sci-libs/gdal/gdal-3.8.0-r1.ebuild
similarity index 99%
rename from sci-libs/gdal/gdal-3.8.0.ebuild
rename to sci-libs/gdal/gdal-3.8.0-r1.ebuild
index 5a47aad92bfa..1a8dd8a1059a 100644
--- a/sci-libs/gdal/gdal-3.8.0.ebuild
+++ b/sci-libs/gdal/gdal-3.8.0-r1.ebuild
@@ -27,7 +27,7 @@ BDEPEND="
virtual/pkgconfig
doc? ( app-text/doxygen )
java? (
-   dev-java/ant-core
+   >=dev-java/ant-1.10.14-r3:0
dev-lang/swig
)
python? (
@@ -99,6 +99,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 )
 
 PATCHES=(
+   "${FILESDIR}/gdal-3.8.0-java21.patch"
"${FILESDIR}"/${PN}-3.6.4-abseil-cpp-20230125.2-c++17.patch
"${FILESDIR}"/${PN}-3.7.0-zlib-OF.patch
"${FILESDIR}"/${P}-libxml2-2.12-{1,2}.patch # bug 917564

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/

2023-05-10 Thread Sam James 
commit: 9010ab474517d315954b99b5fc604a37ee55ec21
Author: Sam James  gentoo  org>
AuthorDate: Wed May 10 19:27:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 10 19:27:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9010ab47

sci-libs/gdal: add 3.7.0

Signed-off-by: Sam James  gentoo.org>

 sci-libs/gdal/Manifest   |   2 +
 sci-libs/gdal/files/gdal-3.7.0-zlib-OF.patch |  51 +
 sci-libs/gdal/gdal-3.7.0.ebuild  | 266 +++
 3 files changed, 319 insertions(+)

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 085551233d50..cff14a75a5d7 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,6 +1,8 @@
 DIST gdal-3.5.3.tar.xz 9504740 BLAKE2B 
7054df4c7ea6d8d3e6e9cf2544fc5c7a9149dea94ed882723ec82c61268100c2f5330f28a8d9d44e1296511eb2a204c64dfe41f135fadb44db380aa331d9c731
 SHA512 
b7bac9dd568e9db49d1fa5be8cd48df37f37196b0cacce44f738a981f0c43a77b5750312cd0c3385fdd881a6b525a5ceac56bcd08284d76071bd508d01781f49
 DIST gdal-3.6.2.tar.xz 8635724 BLAKE2B 
c90606b642c632dd5ec224d63aa80c158c9ee04c6ca0341815f7449b319bf9442d65c2f9b981aedd242713ef6909a30f620b448ba26baf6cd8a31e2a9ae0dd8a
 SHA512 
d404335d37ef4916b6098fa8dc7a5e1579ecdd958b37ce73bb08855fa226d3a7b488eee52db17364ef1c0697d59805d495a734f21dad2ad2f0b27e7b1f253e50
 DIST gdal-3.6.4.tar.xz 8648032 BLAKE2B 
d6abdbcc87029bf230dae5586f06cbd329e5e43be37d8f5e9a72c67c93a6769458cc9c693b498e3f697b1ee1b68c9f9dbf7545ff9819fceb8fdde81b8d4ac882
 SHA512 
a8f69158d44ea456c44cfcb8937892697a28d2e4a4c28db8fb9e81c51436a6edcb7a392b8c7ef63cd7453be6350a938bc4ba910720d9d5d9a1f32c57c558
+DIST gdal-3.7.0.tar.xz 8604724 BLAKE2B 
400cc17fc636c637f7c40e93aed8e2db7bfbbe73741da4135cfeec8dbcda24ce0c8035214edf038afc29a916012da86a78d789729540f870231dfa6aa27e424a
 SHA512 
4a3262d75ffbb58ec0821cd266843e28ca64c34383fb2bfaf30c984bf01c6d012381892a31a2ebc7c27a58b058fb44389cd45b05b619579b6178feb192f37bc6
 DIST gdalautotest-3.5.3.tar.gz 12374523 BLAKE2B 
3f8e2ba8b49d7bb870a49bde4ec95f807ff79cf23d36504cf7beeccff104364d8fc8e287184a0239cd2c4bf5e26c900cfb29bda3beb615504e588519385a322c
 SHA512 
3b18c94d0b0e1d6d2d38ca82cddc8e69f2acf800fa1b4e7fbabaf112e9ad69fa807b92e652b43ebd122e3b5e8d6cc0d5644e92127a673676bc7df396720dab5e
 DIST gdalautotest-3.6.2.tar.gz 12586870 BLAKE2B 
28b6ae04d68964705dfe370bf189343c76fa63e358ce1c7362604743c92130c8e93ec826170a7adfd95aad8a05a5ae7a006b35cf487a81eb0c6695353ab7ef20
 SHA512 
63dd6f185b766cea9a200190428f2791c99f2d4032e7503404199833fa63cd31bc3b56e198a7d145cd954aace767d16d1d75c602880e9bee962dea98e9cf1859
 DIST gdalautotest-3.6.4.tar.gz 12614090 BLAKE2B 
d2c33b56790c1cb030a102ff48bec33c3d187c5be6e13d56da8d6cb8e9393734c2144274cbe08cf82b2a023ffb75df9fd01bcfd9f3d73076c95c4b213823f64e
 SHA512 
2a7704e57f8bc0687c759d047b5a8fb290b2959eb058e02b08edf12e9cca17d6a9121213ef48e8b616c94c8cbe321531612700c6db52cb47fbcc5893c1c1c1c1
+DIST gdalautotest-3.7.0.tar.gz 13785892 BLAKE2B 
cac18436ad2acb558e27e8ba3f1f2c22aa6c7ba258abe25118acf65fb2cb8a3d5f132ccb8315912a54d07f035b5ff331cf6a66bdf51a54c8275c5203e844eb82
 SHA512 
81e80c799a8a910a861182480e8306c8583cdffe7cb62f47fbaddf031e1c4d1d3fb341edf0daddbb8c934e5f2d547b380feb2f5a9f22cd50db14e43c2b02737b

diff --git a/sci-libs/gdal/files/gdal-3.7.0-zlib-OF.patch 
b/sci-libs/gdal/files/gdal-3.7.0-zlib-OF.patch
new file mode 100644
index ..5f6dafeab525
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.7.0-zlib-OF.patch
@@ -0,0 +1,51 @@
+--- a/frmts/zlib/contrib/infback9/minified_zutil.c
 b/frmts/zlib/contrib/infback9/minified_zutil.c
+@@ -8,9 +8,9 @@
+ #include "minified_zutil.h"
+ 
+ #ifndef STDC
+-extern voidp  malloc OF((uInt size));
+-extern voidp  calloc OF((uInt items, uInt size));
+-extern void   free   OF((voidpf ptr));
++extern voidp  malloc (uInt size);
++extern voidp  calloc (uInt items, uInt size);
++extern void   free   (voidpf ptr);
+ #endif
+ 
+ voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size)
+--- a/frmts/zlib/contrib/infback9/minified_zutil.h
 b/frmts/zlib/contrib/infback9/minified_zutil.h
+@@ -191,9 +191,9 @@ extern z_const char * const z_errmsg[10]; /* indexed by 
2-zlib_error */
+ /* provide prototypes for these when building zlib without LFS */
+ #if !defined(_WIN32) && \
+ (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
+-ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+-ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+-ZEXTERN uLong ZEXPORT crc32_combine_gen64 OF((z_off_t));
++ZEXTERN uLong ZEXPORT adler32_combine64 (uLong, uLong, z_off_t);
++ZEXTERN uLong ZEXPORT crc32_combine64 (uLong, uLong, z_off_t);
++ZEXTERN uLong ZEXPORT crc32_combine_gen64 (z_off_t);
+ #endif
+ 
+ /* common defaults */
+@@ -232,16 +232,16 @@ extern z_const char * const z_errmsg[10]; /* indexed by 
2-zlib_error */
+ #define zmemzero(dest, len) memset(dest, 0, len)
+ #  endif
+ #else
+-

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/

2023-04-23 Thread Sam James 
commit: a196821e2f3783c1e40e318505c5c92d336237a7
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 23 06:03:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 23 06:03:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a196821e

sci-libs/gdal: add 3.6.4

Closes: https://bugs.gentoo.org/900106
Closes: https://bugs.gentoo.org/904534
Thanks-to: Michael Uleysky  gmail.com> (abseil patch)
Signed-off-by: Sam James  gentoo.org>

 sci-libs/gdal/Manifest |   2 +
 .../gdal-3.6.4-abseil-cpp-20230125.2-c++17.patch   |  12 +
 sci-libs/gdal/gdal-3.6.4.ebuild| 249 +
 3 files changed, 263 insertions(+)

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index f39eae1fba87..47738d3855d4 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -2,7 +2,9 @@ DIST gdal-3.5.3.tar.xz 9504740 BLAKE2B 
7054df4c7ea6d8d3e6e9cf2544fc5c7a9149dea94
 DIST gdal-3.6.1.tar.xz 8685072 BLAKE2B 
84f707085e77317f2e6577afe594eb01aae777d2863454bfc873ba170f1254094946f02301079d9cce66f8e64848b2b97f03651b114b283c7910d46da1507430
 SHA512 
07138bdd66a0259cffed3a1587904760b734fffa546f5cdf7ca9ee472c77676e5694f6c92d57f03f9cdb94cc3992a0404688f248b79e263eb0c1e3ab6025f6bb
 DIST gdal-3.6.2.tar.xz 8635724 BLAKE2B 
c90606b642c632dd5ec224d63aa80c158c9ee04c6ca0341815f7449b319bf9442d65c2f9b981aedd242713ef6909a30f620b448ba26baf6cd8a31e2a9ae0dd8a
 SHA512 
d404335d37ef4916b6098fa8dc7a5e1579ecdd958b37ce73bb08855fa226d3a7b488eee52db17364ef1c0697d59805d495a734f21dad2ad2f0b27e7b1f253e50
 DIST gdal-3.6.3.tar.xz 8645148 BLAKE2B 
c9d6817e74d0ec377979a060db231ec989e676f9aa0c1c04a8bcd6913c271eaccbb43a59b8bd52f0e297844759a3925039b83c73c4e0773943eeec8af656bb8a
 SHA512 
296901ea667b7d419638fafd9a3ef3cb8bfb1753223048660c463b18e510cb840ae99fdcdb860495782003376c9fb8c24ca3be3699dc31497bd324a09e2abec9
+DIST gdal-3.6.4.tar.xz 8648032 BLAKE2B 
d6abdbcc87029bf230dae5586f06cbd329e5e43be37d8f5e9a72c67c93a6769458cc9c693b498e3f697b1ee1b68c9f9dbf7545ff9819fceb8fdde81b8d4ac882
 SHA512 
a8f69158d44ea456c44cfcb8937892697a28d2e4a4c28db8fb9e81c51436a6edcb7a392b8c7ef63cd7453be6350a938bc4ba910720d9d5d9a1f32c57c558
 DIST gdalautotest-3.5.3.tar.gz 12374523 BLAKE2B 
3f8e2ba8b49d7bb870a49bde4ec95f807ff79cf23d36504cf7beeccff104364d8fc8e287184a0239cd2c4bf5e26c900cfb29bda3beb615504e588519385a322c
 SHA512 
3b18c94d0b0e1d6d2d38ca82cddc8e69f2acf800fa1b4e7fbabaf112e9ad69fa807b92e652b43ebd122e3b5e8d6cc0d5644e92127a673676bc7df396720dab5e
 DIST gdalautotest-3.6.1.tar.gz 12577286 BLAKE2B 
5215db1c39ee1b6d923da9503a2220d8862cf262d3f92605902e6a8e7272fbae156c306a8172f7ef75ad110fc6a82a06873c8420d5d1f2a3a8d4600430932a79
 SHA512 
a91ba311840b98d16df1918752bb5a629bdbe68b98e3ca9f00e2a8ee49f9f68021081700eb39cce7cf5b09fc3fafed987ea067c8135ab2469b91c34338ba7ef2
 DIST gdalautotest-3.6.2.tar.gz 12586870 BLAKE2B 
28b6ae04d68964705dfe370bf189343c76fa63e358ce1c7362604743c92130c8e93ec826170a7adfd95aad8a05a5ae7a006b35cf487a81eb0c6695353ab7ef20
 SHA512 
63dd6f185b766cea9a200190428f2791c99f2d4032e7503404199833fa63cd31bc3b56e198a7d145cd954aace767d16d1d75c602880e9bee962dea98e9cf1859
 DIST gdalautotest-3.6.3.tar.gz 12613287 BLAKE2B 
a4548ccf7bd4a8de9fd093514afbd3d6de453ca6a1bb0c4b6e50f6f37ac5ec321f7b80943f32fcf4164442d2d63b09458c1d0ebad76ee76a53b681e2b07ee388
 SHA512 
2967c07a0c5cb426048ead60b6428e8ebb5c5f4bd1ff7409991537575b5a1eabd1d4da2d65607894e16153fd4ce8a31a501788b938a155ddf8cec581fddac1d4
+DIST gdalautotest-3.6.4.tar.gz 12614090 BLAKE2B 
d2c33b56790c1cb030a102ff48bec33c3d187c5be6e13d56da8d6cb8e9393734c2144274cbe08cf82b2a023ffb75df9fd01bcfd9f3d73076c95c4b213823f64e
 SHA512 
2a7704e57f8bc0687c759d047b5a8fb290b2959eb058e02b08edf12e9cca17d6a9121213ef48e8b616c94c8cbe321531612700c6db52cb47fbcc5893c1c1c1c1

diff --git a/sci-libs/gdal/files/gdal-3.6.4-abseil-cpp-20230125.2-c++17.patch 
b/sci-libs/gdal/files/gdal-3.6.4-abseil-cpp-20230125.2-c++17.patch
new file mode 100644
index ..2ddc39db8b36
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.6.4-abseil-cpp-20230125.2-c++17.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/904534
+--- a/ogr/ogrsf_frmts/flatgeobuf/CMakeLists.txt
 b/ogr/ogrsf_frmts/flatgeobuf/CMakeLists.txt
+@@ -8,6 +8,7 @@
+   ogrflatgeobufeditablelayer.cpp
+   PLUGIN_CAPABLE
+   NO_DEPS)
++set_property(TARGET ogr_FlatGeobuf PROPERTY CXX_STANDARD 17)
+ gdal_standard_includes(ogr_FlatGeobuf)
+ target_include_directories(ogr_FlatGeobuf PRIVATE 
$
+   
$)
+

diff --git a/sci-libs/gdal/gdal-3.6.4.ebuild b/sci-libs/gdal/gdal-3.6.4.ebuild
new file mode 100644
index ..bce013c8d745
--- /dev/null
+++ b/sci-libs/gdal/gdal-3.6.4.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake java-pkg-opt-2 python-single-r1
+
+DESCRIPTION="Translator library for

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/

2021-03-09 Thread Sam James 
commit: a2df5bcead58163828cde20535e4b4f4204f4ecf
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar  9 20:38:45 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar  9 20:43:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2df5bce

sci-libs/gdal: respect libdir

To be upstreamed.

Unfortunately, we can't do *everything* required in Gentoo
in the patch, as there's a --with-local argument which I'd
prefer to get rid of, but is a bit too invasive of a change
for me to want to push upstream for now.

So, we settle on a single sed in the ebuild, which is an
improvement!

Closes: https://bugs.gentoo.org/696106
Signed-off-by: Sam James  gentoo.org>

 sci-libs/gdal/files/gdal-3.2.1-libdir.patch | 407 
 sci-libs/gdal/gdal-3.2.1-r1.ebuild  |  11 +-
 2 files changed, 416 insertions(+), 2 deletions(-)

diff --git a/sci-libs/gdal/files/gdal-3.2.1-libdir.patch 
b/sci-libs/gdal/files/gdal-3.2.1-libdir.patch
new file mode 100644
index 000..89bc87489e9
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.2.1-libdir.patch
@@ -0,0 +1,407 @@
+--- a/configure.ac
 b/configure.ac
+@@ -1133,11 +1133,11 @@ if test "$with_libz" = "external" -o "$with_libz" = "" 
-o "$with_libz" = "yes" ;
+ 
+ elif test "$with_libz" != "no" -a "$with_libz" != "internal" ; then
+ 
+-  LIBS="-L$with_libz -L$with_libz/lib $LIBS"
++  LIBS="-L$with_libz -L$with_libz/${libdir} $LIBS"
+ 
+-  
AC_CHECK_LIB(z,deflateInit_,LIBZ_SETTING=external,LIBZ_SETTING=internal,-L$with_libz
 -L$with_libz/lib -lz)
++  
AC_CHECK_LIB(z,deflateInit_,LIBZ_SETTING=external,LIBZ_SETTING=internal,-L$with_libz
 -L$with_libz/${libdir} -lz)
+   if test "$LIBZ_SETTING" = "external" ; then
+-
AC_CHECK_LIB(z,inflateCopy,LIBZ_SETTING=external,LIBZ_SETTING=internal,-L$with_libz
 -L$with_libz/lib -lz)
++
AC_CHECK_LIB(z,inflateCopy,LIBZ_SETTING=external,LIBZ_SETTING=internal,-L$with_libz
 -L$with_libz/${libdir} -lz)
+  if test "$LIBZ_SETTING" = "external" ; then
+ AC_MSG_RESULT([using libz library from $with_libz])
+ else
+@@ -1178,7 +1178,7 @@ AC_ARG_WITH(libdeflate,
+ if test "$with_libdeflate" != "no" ; then
+ 
+   if test "$with_libdeflate" != "" -a "$with_libdeflate" != "yes"; then
+-AC_CHECK_LIB(deflate, libdeflate_zlib_decompress, [libdeflate_lib=yes], 
[libdeflate_lib=no],-L$with_libdeflate/lib)
++AC_CHECK_LIB(deflate, libdeflate_zlib_decompress, [libdeflate_lib=yes], 
[libdeflate_lib=no],-L$with_libdeflate/${libdir})
+   else
+ AC_CHECK_LIB(deflate, libdeflate_zlib_decompress, [libdeflate_lib=yes], 
[libdeflate_lib=no])
+   fi
+@@ -1209,7 +1209,7 @@ fi
+ if test "$LIBDEFLATE_SETTING" = "yes" ; then
+   if test "$with_libdeflate" != "" -a "$with_libdeflate" != "yes"; then
+ EXTRA_INCLUDES="-I$with_libdeflate/include $EXTRA_INCLUDES"
+-LIBS="-L$with_libdeflate/lib -ldeflate $LIBS"
++LIBS="-L$with_libdeflate/${libdir} -ldeflate $LIBS"
+   else
+ LIBS="-ldeflate $LIBS"
+   fi
+@@ -1302,7 +1302,7 @@ else
+ LIBS="-L$with_libtiff -ltiff $LIBS"
+ EXTRA_INCLUDES="-I$with_libtiff $EXTRA_INCLUDES"
+   else
+-LIBS="-L$with_libtiff/lib -ltiff $LIBS"
++LIBS="-L$with_libtiff/${libdir} -ltiff $LIBS"
+ EXTRA_INCLUDES="-I$with_libtiff/include $EXTRA_INCLUDES"
+   fi
+ 
+@@ -1426,19 +1426,12 @@ else
+ fi
+   else
+ ORIG_LIBS="$LIBS"
+-LIBS="-L$with_proj/lib -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
++LIBS="-L$with_proj/${libdir} -lproj $with_proj_extra_lib_for_test 
$ORIG_LIBS"
+ AC_LANG_PUSH([C++])
+ AC_CHECK_LIB(proj,proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
+ AC_LANG_POP([C++])
+ if test "$PROJ_FOUND" = "no"; then
+-LIBS="-L$with_proj/lib -lproj $with_proj_extra_lib_for_test 
$ORIG_LIBS"
+-unset ac_cv_lib_proj_proj_create_from_wkt
+-AC_LANG_PUSH([C++])
+-AC_CHECK_LIB(proj,proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
+-AC_LANG_POP([C++])
+-fi
+-if test "$PROJ_FOUND" = "no"; then
+-LIBS="-L$with_proj/lib64 -lproj $with_proj_extra_lib_for_test 
$ORIG_LIBS"
++LIBS="-L$with_proj/${libdir} -lproj $with_proj_extra_lib_for_test 
$ORIG_LIBS"
+ unset ac_cv_lib_proj_proj_create_from_wkt
+ AC_LANG_PUSH([C++])
+ AC_CHECK_LIB(proj,proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
+@@ -1460,22 +1453,6 @@ else
+ PROJ_INCLUDE="-DPROJ_RENAME_SYMBOLS"
+ fi
+ fi
+-if test "$PROJ_FOUND" = "no"; then
+-LIBS="-L$with_proj/lib -linternalproj $with_proj_extra_lib_for_test 
$ORIG_LIBS"
+-AC_LANG_PUSH([C++])
+-
AC_CHECK_LIB(internalproj,internal_proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
+-AC_LANG_POP([C++])
+-if test "$PROJ_FOUND" = "no"; then
+-LIBS="-L$with_proj/lib -linternalproj 
$with_proj_extra_lib_for_test $ORIG_LIBS"
+-unset ac_cv_lib_internal_proj_internal_proj_create_from_wkt
+-

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/

2020-08-05 Thread Andreas Sturmlechner 
commit: fca144ebd963f6e5a6144c499c419ecadfaae3f0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Aug  4 19:46:08 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Aug  5 08:26:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fca144eb

sci-libs/gdal: Fix build against poppler-20.08

Thanks-to: PhobosK  fastmail.fm>
Closes: https://bugs.gentoo.org/735828
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/gdal/files/gdal-3.0.4-poppler-20.08.patch | 42 ++
 sci-libs/gdal/gdal-3.0.4-r1.ebuild |  1 +
 2 files changed, 43 insertions(+)

diff --git a/sci-libs/gdal/files/gdal-3.0.4-poppler-20.08.patch 
b/sci-libs/gdal/files/gdal-3.0.4-poppler-20.08.patch
new file mode 100644
index 000..0fd8051c365
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.0.4-poppler-20.08.patch
@@ -0,0 +1,42 @@
+From 2b863dbabdc2a7d724f9fdf3e6ff20a142b619f6 Mon Sep 17 00:00:00 2001
+From: Even Rouault 
+Date: Mon, 3 Aug 2020 14:52:25 +0200
+Subject: [PATCH] Unix build: fix detection of minor version number of Poppler
+ with the new YY.MM.X numbering scheme (fixes #2823) (#2825)
+
+Authored-by: @chris2553
+---
+ a/configure| 4 ++--
+ b/configure.ac | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index 4d618db8149..69d46182a26 100755
+--- a/configure
 b/configure
+@@ -40824,8 +40824,8 @@ $as_echo "yes" >&6; }
+ fi
+ if test "$POPPLER_VERSION" != ""; then
+ HAVE_POPPLER=yes
+-POPPLER_MAJOR_VERSION=`expr $POPPLER_VERSION : '\([0-9]*\)'`
+-POPPLER_MINOR_VERSION=`expr $POPPLER_VERSION : '[0-9]*\.\([0-9]*\)'`
++POPPLER_MAJOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f1`
++POPPLER_MINOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f2 | sed -e 
's/^0//'`
+ POPPLER_CFLAGS=`echo $POPPLER_CFLAGS $POPPLER_CFLAGS | sed 
"s/include\/poppler/include/"`
+ fi
+ else
+diff --git a/configure.ac b/configure.ac
+index 0f4124e6431..7f337e77c1d 100644
+--- a/configure.ac
 b/configure.ac
+@@ -4966,8 +4966,8 @@ if test "$with_poppler" != "no" -a "$with_poppler" != 
""; then
+ [POPPLER_VERSION=`$PKG_CONFIG --modversion poppler`], 
[POPPLER_VERSION=])
+ if test "$POPPLER_VERSION" != ""; then
+ HAVE_POPPLER=yes
+-POPPLER_MAJOR_VERSION=`expr $POPPLER_VERSION : '\([[0-9]]*\)'`
+-POPPLER_MINOR_VERSION=`expr $POPPLER_VERSION : 
'[[0-9]]*\.\([[0-9]]*\)'`
++POPPLER_MAJOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f1`
++POPPLER_MINOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f2 | sed -e 
's/^0//'`
+ POPPLER_CFLAGS=`echo $POPPLER_CFLAGS $POPPLER_CFLAGS | sed 
"s/include\/poppler/include/"`
+ fi
+ else

diff --git a/sci-libs/gdal/gdal-3.0.4-r1.ebuild 
b/sci-libs/gdal/gdal-3.0.4-r1.ebuild
index b8e390e8e00..c7591678764 100644
--- a/sci-libs/gdal/gdal-3.0.4-r1.ebuild
+++ b/sci-libs/gdal/gdal-3.0.4-r1.ebuild
@@ -89,6 +89,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
"${FILESDIR}/${PN}-3.0.2-complete.patch"
"${FILESDIR}/${PN}-3.0.2-datadir.patch"
+   "${FILESDIR}/${P}-poppler-20.08.patch" # bug 735828
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/

2020-01-29 Thread Andreas Sturmlechner 
commit: 1ae8b7c7c3790f0a866e57eb44b06a8c014c3c51
Author: Chris Mayo  gmail  com>
AuthorDate: Fri Jan 10 19:38:40 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan 29 21:32:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ae8b7c7

sci-libs/gdal: version bump 3.0.2

Bug: https://bugs.gentoo.org/686732
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Chris Mayo  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14061
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/gdal/Manifest|   1 +
 sci-libs/gdal/files/gdal-3.0.2-complete.patch |  84 +++
 sci-libs/gdal/files/gdal-3.0.2-datadir.patch  |  69 ++
 sci-libs/gdal/gdal-3.0.2.ebuild   | 305 ++
 4 files changed, 459 insertions(+)

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index a3f4832ec81..06a7010fbf8 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,2 +1,3 @@
 DIST gdal-2.4.1.tar.gz 14546610 BLAKE2B 
92404336339c6f46877f3e6599af6fc67a53714888ff66fc0142efa8ddf185ad34d9ec337dcbad67f059041da31e70073a9e41872a7332fd9977552d79fcbc61
 SHA512 
b25e49f343986af6f37e0bec6dc3084cbcf1a0080da5cfd91d1a58c1d9ffd2ac355299d66534e63e89358cbb15ecd0f2ae934d91bbd2a3749889dadaf266e483
 DIST gdal-2.4.3.tar.gz 14726748 BLAKE2B 
104c29912a96b03d0913be40f91a844b2f04f1e972b1ae8764bd277e7d51960b45d4a67a8f9240130de7ce8752f69f4172ca9a54bb11e70635aa55b6c6924cb5
 SHA512 
e532ce86c92724300ab443c42dd8cec0e74e41411a54d30222f98faa10623b31e616eda44da8f406ed01f3fc3c72c76e8ceb80c1dff733f8efcaa2e2e18132f6
+DIST gdal-3.0.2.tar.gz 14348856 BLAKE2B 
a52b3c5f1177b85ca991fd5dd27e4238a6ff066fa28842ffbddea8617a3f897d9525035a1cf9237365dbc4657037b3eb0a740cd0e65fe4c83b0c76ffe23c0e56
 SHA512 
eb35e28106f2f422fd5021261ef44864574f6a6be23e679cc5ae44be910f978769fc24fa15367ad4058fb3170cdd2985a6c4caedc3510dde8a6d163091cf3ab0

diff --git a/sci-libs/gdal/files/gdal-3.0.2-complete.patch 
b/sci-libs/gdal/files/gdal-3.0.2-complete.patch
new file mode 100644
index 000..5d6716c7280
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.0.2-complete.patch
@@ -0,0 +1,84 @@
+diff --git a/GDALmake.opt.in b/GDALmake.opt.in
+index fd8e8f374d..655c004c56 100644
+--- a/GDALmake.opt.in
 b/GDALmake.opt.in
+@@ -63,6 +63,7 @@ INST_INCLUDE =   @includedir@
+ INST_DATA =   @datadir@
+ INST_LIB  =   @libdir@
+ INST_BIN  =   @bindir@
++INST_BASH_COMPLETION  =   @bashcompdir@
+ INST_PYMOD  =   @pymoddir@
+ INST_DOCS =   @exec_prefix@/doc
+ INST_MAN  =   @mandir@
+diff --git a/GNUmakefile b/GNUmakefile
+index 92467d6cf6..6d5e7d9fc0 100644
+--- a/GNUmakefile
 b/GNUmakefile
+@@ -229,7 +229,9 @@ endif
+ ifneq ($(BINDINGS),)
+   (cd swig; $(MAKE) install)
+ endif
++ifdef INST_BASH_COMPLETION
+   (cd scripts; $(MAKE) install)
++endif
+   for f in LICENSE.TXT data/*.* ; do $(INSTALL_DATA) $$f 
$(DESTDIR)$(INST_DATA) ; done
+   $(LIBTOOL_FINISH) $(DESTDIR)$(INST_LIB)
+   $(INSTALL_DIR) $(DESTDIR)$(INST_LIB)/pkgconfig
+diff --git a/configure.ac b/configure.ac
+index 93ddca84d9..5d0e7ab8be 100644
+--- a/configure.ac
 b/configure.ac
+@@ -1187,6 +1187,24 @@ if test "$am_func_iconv" = "yes"; then
+ AC_DEFINE_UNQUOTED(ICONV_CPP_CONST,$ICONV_CPP_CONST, [For.cpp files, 
define as const if the declaration of iconv() needs const.])
+ fi
+ 
++dnl 
---
++dnl Bash completions
++dnl 
---
++
++AC_ARG_WITH([bash-completion],
++  AS_HELP_STRING([--with-bash-completion[=ARG]],
++[Install Bash completions (ARG=yes or path)]),,)
++
++if test "x$with_bash_completion" = "xno" -o "x$with_bash_completion" = "x"; 
then
++  AC_MSG_NOTICE([Bash completions not requested])
++elif test "x$with_bash_completion" = "xyes"; then
++  PKG_CHECK_VAR(bashcompdir, [bash-completion], [completionsdir], ,
++bashcompdir="${sysconfdir}/bash_completion.d")
++  AC_SUBST(bashcompdir)
++else
++  AC_SUBST(bashcompdir, $with_bash_completion)
++fi
++
+ dnl 
---
+ dnl PROJ.6 related stuff
+ dnl 
---
+diff --git a/scripts/GNUmakefile b/scripts/GNUmakefile
+index 8f039e469a..511fbb499c 100644
+--- a/scripts/GNUmakefile
 b/scripts/GNUmakefile
+@@ -1,10 +1,20 @@
+ include  ../GDALmake.opt
+ 
++PROGRAMS := gdal2tiles.py gdal2xyz.py gdaladdo gdalbuildvrt gdal_calc.py \
++gdalchksum.py gdalcompare.py gdal-config gdal_contour gdaldem \
++gdal_edit.py gdalenhance gdal_fillnodata.py gdal_grid \
++gdalident.py gdalimport.py gdallocationinfo gdalmanage \
++gdal_merge.py gdalmove.py gdal_polygonize.py gdal_proximity.py \
++gdal_rasterize gdal_retile.py gdalserver

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/

2020-01-01 Thread Andreas Sturmlechner 
commit: 015c2605dae2b7e8dc0b700d49d7ed5b5e0be983
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Dec 28 18:14:40 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan  1 15:19:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=015c2605

sci-libs/gdal: 2.4.3 version bump

- Drop python2_7 and python3_5
- Drop poppler-0.75.patch and poppler-0.76.patch, supported upstream
- Drop 2.3.0-curl.patch, --with-curl --without-threads was fixed, see also:
  https://github.com/OSGeo/gdal/issues/1386

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/gdal/Manifest  |   1 +
 sci-libs/gdal/files/gdal-2.2.3-soname.patch |   8 +-
 sci-libs/gdal/gdal-2.4.3.ebuild | 319 
 3 files changed, 324 insertions(+), 4 deletions(-)

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index a20b22bcb90..a3f4832ec81 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1 +1,2 @@
 DIST gdal-2.4.1.tar.gz 14546610 BLAKE2B 
92404336339c6f46877f3e6599af6fc67a53714888ff66fc0142efa8ddf185ad34d9ec337dcbad67f059041da31e70073a9e41872a7332fd9977552d79fcbc61
 SHA512 
b25e49f343986af6f37e0bec6dc3084cbcf1a0080da5cfd91d1a58c1d9ffd2ac355299d66534e63e89358cbb15ecd0f2ae934d91bbd2a3749889dadaf266e483
+DIST gdal-2.4.3.tar.gz 14726748 BLAKE2B 
104c29912a96b03d0913be40f91a844b2f04f1e972b1ae8764bd277e7d51960b45d4a67a8f9240130de7ce8752f69f4172ca9a54bb11e70635aa55b6c6924cb5
 SHA512 
e532ce86c92724300ab443c42dd8cec0e74e41411a54d30222f98faa10623b31e616eda44da8f406ed01f3fc3c72c76e8ceb80c1dff733f8efcaa2e2e18132f6

diff --git a/sci-libs/gdal/files/gdal-2.2.3-soname.patch 
b/sci-libs/gdal/files/gdal-2.2.3-soname.patch
index f2746bdf5e3..4cceee5ec92 100644
--- a/sci-libs/gdal/files/gdal-2.2.3-soname.patch
+++ b/sci-libs/gdal/files/gdal-2.2.3-soname.patch
@@ -3,8 +3,8 @@ Set SONAME and unbreak compilation on Darwin
 Author: Fabian Groffen 
 Author: Dennis Schridde 
 
 old/GDALmake.opt.in.orig   2008-02-02 18:25:48.0 -0800
-+++ new/GDALmake.opt.in2008-02-02 18:54:53.0 -0800
+--- a/GDALmake.opt.in  2008-02-02 18:25:48.0 -0800
 b/GDALmake.opt.in  2008-02-02 18:54:53.0 -0800
 @@ -97,6 +97,14 @@
  GDAL_SLIB =   $(GDAL_ROOT)/libgdal.$(SO_EXT)
  GDAL_SLIB_LINK=   -L$(GDAL_ROOT) -lgdal
@@ -20,8 +20,8 @@ Author: Dennis Schridde 
  # Mac OS X Framework definition
  MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@
  
 gdal-2.0.3.old/GNUmakefile
-+++ gdal-2.0.3/GNUmakefile
+--- a/GNUmakefile
 b/GNUmakefile
 @@ -208,7 +208,7 @@ else
  
  ifeq ($(HAVE_LD_SHARED),yes)

diff --git a/sci-libs/gdal/gdal-2.4.3.ebuild b/sci-libs/gdal/gdal-2.4.3.ebuild
new file mode 100644
index 000..0f880af5e68
--- /dev/null
+++ b/sci-libs/gdal/gdal-2.4.3.ebuild
@@ -0,0 +1,319 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_OPTIONAL=1
+inherit autotools perl-module distutils-r1 flag-o-matic java-pkg-opt-2 
toolchain-funcs
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes 
OGR support)"
+HOMEPAGE="https://gdal.org/;
+SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz;
+
+SLOT="0/2.3"
+LICENSE="BSD Info-ZIP MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos"
+IUSE="armadillo +aux-xml curl debug doc fits geos gif gml hdf5 java jpeg 
jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres 
python spatialite sqlite threads webp xls zstd"
+
+REQUIRED_USE="
+   mdb? ( java )
+   python? ( ${PYTHON_REQUIRED_USE} )
+   spatialite? ( sqlite )
+"
+
+BDEPEND="
+   doc? ( app-doc/doxygen )
+   java? ( >=virtual/jdk-1.7:* )
+   perl? ( dev-lang/swig:0 )
+   python? (
+   dev-lang/swig:0
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   )"
+
+DEPEND="
+   dev-libs/expat
+   dev-libs/json-c:=
+   dev-libs/libpcre
+   dev-libs/libxml2:=
+   media-libs/tiff:0=
+   sci-libs/libgeotiff:=
+   sys-libs/zlib[minizip(+)]
+   armadillo? ( sci-libs/armadillo:=[lapack] )
+   curl? ( net-misc/curl )
+   fits? ( sci-libs/cfitsio:= )
+   geos? ( >=sci-libs/geos-2.2.1 )
+   gif? ( media-libs/giflib:= )
+   gml? ( >=dev-libs/xerces-c-3.1 )
+   hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
+   jpeg? ( virtual/jpeg:0= )
+   jpeg2k? ( media-libs/openjpeg:2= )
+   lzma? ( || (
+   app-arch/xz-utils
+   app-arch/lzma
+   ) )
+   mdb? ( dev-java/jackcess:1 )
+   mysql? ( virtual/mysql )
+   netcdf? ( sci-libs/netcdf:= )
+   odbc? ( dev-db/unixODBC )
+   ogdi? ( sci-libs/ogdi )
+   opencl? ( virtual/opencl )
+   oracle? (

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/

2019-03-02 Thread Andreas Sturmlechner 
commit: 936fdfe7d0cbbc1fa31f612cc3dbf21156f4bd83
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Mar  2 20:24:38 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Mar  2 20:24:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=936fdfe7

sci-libs/gdal: Drop 2.3.0-r2

Does not build against poppler versions in tree.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/gdal/Manifest |   1 -
 sci-libs/gdal/files/gdal-2.2.3-goocast.patch   |  11 -
 .../gdal/files/gdal-2.3.0-changeset_38658.patch|  80 --
 .../gdal/files/gdal-2.3.0-frmts-nitf38234.patch|  12 -
 sci-libs/gdal/files/gdal-2.3.0-libtiff.patch   |  12 -
 sci-libs/gdal/gdal-2.3.0-r2.ebuild | 318 -
 6 files changed, 434 deletions(-)

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 3d0114321d5..3e3fe719104 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,2 +1 @@
-DIST gdal-2.3.0.tar.gz 14423820 BLAKE2B 
6c67c66b2f68699249ccd4df2cb1e3b7042e94003b730e64bd8b8eec726a32da9485cab29552bd34c23831686ec3e879edd1848a2339c8289580ce282a287992
 SHA512 
b37e433be0b7a587ea9f9e5e720295e4cd1406f6c8ca770f5fedcd7fdc797e01e576eb887034b38f93f04a4e76c0ce84792bc7d91a49fea4122231a37ace812f
 DIST gdal-2.3.1.tar.gz 14450452 BLAKE2B 
226ddf80ff8b9e3d420ac717b245a09fe3daa0331931f4d371b62ab9fa9bb0735ca11e1e045398de92d61b68815aa1dc3e7b6568f4853964cf42d188e46e6eb7
 SHA512 
0c5bb515dd2a9ad3110421b39bd680ce7e9de68e969cf35a7e63118965dbe193d25a7720a525e53af153de3e78f76ccc6983f4dcdfa6ba429d732a7a47a35d57

diff --git a/sci-libs/gdal/files/gdal-2.2.3-goocast.patch 
b/sci-libs/gdal/files/gdal-2.2.3-goocast.patch
deleted file mode 100644
index a25a524c253..000
--- a/sci-libs/gdal/files/gdal-2.2.3-goocast.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/frmts/pdf/pdfobject.cpp  2018-05-29 11:23:00.980957371 +0300
-+++ b/frmts/pdf/pdfobject.cpp  2018-05-29 11:23:44.378955265 +0300
-@@ -1055,7 +1055,7 @@
- {
- if (GetType() == PDFObjectType_String)
- {
--GooString* gooString = m_po->getString();
-+GooString* gooString =(GooString*) m_po->getString();
- return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast(gooString->getCString()),
-   
static_cast(gooString->getLength(;
- }

diff --git a/sci-libs/gdal/files/gdal-2.3.0-changeset_38658.patch 
b/sci-libs/gdal/files/gdal-2.3.0-changeset_38658.patch
deleted file mode 100644
index 3f681836989..000
--- a/sci-libs/gdal/files/gdal-2.3.0-changeset_38658.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Index: /trunk/gdal/frmts/nitf/nitfrasterband.cpp
-===
 a/frmts/nitf/nitfrasterband.cpp(revision 38657)
-+++ b/frmts/nitf/nitfrasterband.cpp(revision 38658)
-@@ -824,4 +826,20 @@
- pUnpackData[i+7] = ((pDataSrc[k+2]) & 0x7);
-   }
-+  if( i < n )
-+  {
-+pUnpackData[i+0] = ((pDataSrc[k+0] >> 5));
-+if( i + 1 < n )
-+pUnpackData[i+1] = ((pDataSrc[k+0] >> 2) & 0x07);
-+if( i + 2 < n )
-+pUnpackData[i+2] = ((pDataSrc[k+0] << 1) & 0x07) | (pDataSrc[k+1] 
>> 7);
-+if( i + 3 < n )
-+pUnpackData[i+3] = ((pDataSrc[k+1] >> 4) & 0x07);
-+if( i + 4 < n )
-+pUnpackData[i+4] = ((pDataSrc[k+1] >> 1) & 0x07);
-+if( i + 5 < n )
-+pUnpackData[i+5] = ((pDataSrc[k+1] << 2) & 0x07) | (pDataSrc[k+2] 
>> 6);
-+if( i + 6 < n )
-+pUnpackData[i+6] = ((pDataSrc[k+2] >> 3) & 0x07);
-+  }
- 
-   memcpy(pData, pUnpackData, n);
-@@ -842,4 +862,20 @@
- pUnpackData[i+7] = ((pDataSrc[k+4]) & 0x1f);
-   }
-+  if( i < n )
-+  {
-+pUnpackData[i+0] = ((pDataSrc[k+0] >> 3));
-+if( i + 1 < n )
-+pUnpackData[i+1] = ((pDataSrc[k+0] << 2) & 0x1f) | (pDataSrc[k+1] 
>> 6);
-+if( i + 2 < n )
-+pUnpackData[i+2] = ((pDataSrc[k+1] >> 1) & 0x1f);
-+if( i + 3 < n )
-+pUnpackData[i+3] = ((pDataSrc[k+1] << 4) & 0x1f) | (pDataSrc[k+2] 
>> 4);
-+if( i + 4 < n )
-+pUnpackData[i+4] = ((pDataSrc[k+2] << 1) & 0x1f) | (pDataSrc[k+3] 
>> 7);
-+if( i + 5 < n )
-+pUnpackData[i+5] = ((pDataSrc[k+3] >> 2) & 0x1f);
-+if( i + 6 < n )
-+pUnpackData[i+6] = ((pDataSrc[k+3] << 3) & 0x1f) | (pDataSrc[k+4] 
>> 5);
-+  }
- 
-   memcpy(pData, pUnpackData, n);
-@@ -856,4 +894,12 @@
- pUnpackData[i+3] = ((pDataSrc[k+2]) & 0x3f);
-   }
-+  if( i < n )
-+  {
-+pUnpackData[i+0] = ((pDataSrc[k+0] >> 2));
-+if( i + 1 < n )
-+pUnpackData[i+1] = ((pDataSrc[k+0] << 4) & 0x3f) | (pDataSrc[k+1] 
>> 4);
-+if( i + 2 < n )
-+pUnpackData[i+2] =

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/

2019-01-12 Thread Andreas Sturmlechner 
commit: 864b528b1db3f4e946a21c7badac1448f13feaea
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jan 12 16:27:11 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan 12 20:07:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=864b528b

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  gentoo.org>

 .../gdal/files/gdal-2.3.1-poppler-0.71.0.patch | 82 ++
 .../gdal/files/gdal-2.3.1-poppler-0.72.0.patch | 58 +++
 sci-libs/gdal/gdal-2.3.1.ebuild|  7 +-
 3 files changed, 146 insertions(+), 1 deletion(-)

diff --git a/sci-libs/gdal/files/gdal-2.3.1-poppler-0.71.0.patch 
b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.71.0.patch
new file mode 100644
index 000..90ee94d0621
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.71.0.patch
@@ -0,0 +1,82 @@
+Description: Add support for Poppler 0.71.0.
+Author: Even Rouault 
+Origin: 
https://github.com/OSGeo/gdal/commit/4cc0215b8f2cef3582265cdfaf16589390697706
+Bug: https://github.com/OSGeo/gdal/issues/1121
+Bug-Debian: https://bugs.debian.org/915722
+
+--- a/frmts/pdf/pdfdataset.cpp
 b/frmts/pdf/pdfdataset.cpp
+@@ -2593,18 +2593,25 @@ static void PDFDatasetErrorFunctionCommo
+ }
+ 
+ #ifdef POPPLER_0_20_OR_LATER
+-static void PDFDatasetErrorFunction(CPL_UNUSED void* userData, CPL_UNUSED 
ErrorCategory eErrCategory,
++
++static void PDFDatasetErrorFunction(void* /* userData*/,
++ErrorCategory /* eErrCategory */,
+ #ifdef POPPLER_0_23_OR_LATER
+ Goffset nPos,
+ #else
+ int nPos,
+ #endif
+-char *pszMsg)
++#ifdef POPPLER_0_71_OR_LATER
++const char *pszMsg
++#else
++char *pszMsg
++#endif
++   )
+ {
+ CPLString osError;
+ 
+ if (nPos >= 0)
+-osError.Printf("Pos = %d, ", (int)nPos);
++osError.Printf("Pos = " CPL_FRMT_GUIB ", ", 
static_cast(nPos));
+ osError += pszMsg;
+ PDFDatasetErrorFunctionCommon(osError);
+ }
+@@ -4442,7 +4449,7 @@ GDALDataset *PDFDataset::Open( GDALOpenI
+ #ifdef HAVE_POPPLER
+ if (bUseLib.test(PDFLIB_POPPLER))
+ {
+-PDFRectangle* psMediaBox = poPagePoppler->getMediaBox();
++const auto* psMediaBox = poPagePoppler->getMediaBox();
+ dfX1 = psMediaBox->x1;
+ dfY1 = psMediaBox->y1;
+ dfX2 = psMediaBox->x2;
+@@ -4780,14 +4787,12 @@ GDALDataset *PDFDataset::Open( GDALOpenI
+ GooString* poMetadata = poCatalogPoppler->readMetadata();
+ if (poMetadata)
+ {
+-char* pszContent = poMetadata->getCString();
++const char* pszContent = poMetadata->getCString();
+ if (pszContent != nullptr &&
+ STARTS_WITH(pszContent, "SetMetadata(apszMDList, "xml:XMP");
++const char * const apszMDList[2] = { pszContent, nullptr };
++poDS->SetMetadata(const_cast(apszMDList), "xml:XMP");
+ }
+ delete poMetadata;
+ }
+--- a/frmts/pdf/pdfio.h
 b/frmts/pdf/pdfio.h
+@@ -58,6 +58,15 @@
+ #define makeSubStream_object_type Object*
+ #endif
+ 
++// Detect Poppler 0.71 that no longer defines GBool
++#ifdef POPPLER_0_69_OR_LATER
++#ifndef initObj
++#define POPPLER_0_71_OR_LATER
++#define GBool bool
++#define gFalse false
++#endif
++#endif
++
+ class VSIPDFFileStream: public BaseStream
+ {
+ public:

diff --git a/sci-libs/gdal/files/gdal-2.3.1-poppler-0.72.0.patch 
b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.72.0.patch
new file mode 100644
index 000..3302df9100d
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.72.0.patch
@@ -0,0 +1,58 @@
+From b471814ef406582f2b1bc0aabbe430c0026608c7 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sat, 12 Jan 2019 17:21:54 +0100
+Subject: [PATCH] Fix build with poppler-0.72.0
+
+Non-upstreamable patch that breaks backward compatibility.
+---
+ frmts/pdf/pdfdataset.cpp | 4 ++--
+ frmts/pdf/pdfobject.cpp  | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
+index 84fe1fe..38b8c30 100644
+--- a/frmts/pdf/pdfdataset.cpp
 b/frmts/pdf/pdfdataset.cpp
+@@ -3459,7 +3459,7 @@ void PDFDataset::FindLayersPoppler()
+ #endif
+ if( ocg != nullptr && ocg->getName() != nullptr )
+ {
+-const char* pszLayerName = (const 
char*)ocg->getName()->getCString();
++const char* pszLayerName = (const 
char*)ocg->getName()->c_str();
+ AddLayer(pszLayerName);
+ oLayerOCGMapPoppler[pszLayerName] = ocg;
+ }
+@@ -4787,7 +4787,7 @@ GDALDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo 
)
+

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/

2018-11-03 Thread Andreas Sturmlechner 
commit: e9aced03ab6c5b8c5697f02a4f69b6bc68188a60
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Nov  3 22:50:29 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Nov  3 22:51:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9aced03

sci-libs/gdal: Fix build with app-text/poppler-0.69.0

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../gdal/files/gdal-2.3.1-poppler-0.69.0.patch | 301 +
 sci-libs/gdal/gdal-2.3.1.ebuild|   1 +
 2 files changed, 302 insertions(+)

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 000..a89970074b0
--- /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 
+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 ' > 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 ' > 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
++

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/

2018-08-12 Thread Amy Liffey 
commit: 89993d3fc3cba6e559905b758f691b157b589fcf
Author: Amy Liffey  gentoo  org>
AuthorDate: Sun Aug 12 18:33:12 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sun Aug 12 19:15:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89993d3f

sci-libs/gdal: add security patches

Bug: https://bugs.gentoo.org/621712
Bug: https://bugs.gentoo.org/621720
Bug: https://bugs.gentoo.org/623028
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../gdal/files/gdal-2.3.0-changeset_38658.patch| 80 ++
 .../gdal/files/gdal-2.3.0-frmts-nitf38234.patch| 12 
 sci-libs/gdal/files/gdal-2.3.0-libtiff.patch   | 12 
 .../{gdal-2.3.0-r1.ebuild => gdal-2.3.0-r2.ebuild} |  5 ++
 4 files changed, 109 insertions(+)

diff --git a/sci-libs/gdal/files/gdal-2.3.0-changeset_38658.patch 
b/sci-libs/gdal/files/gdal-2.3.0-changeset_38658.patch
new file mode 100644
index 000..3f681836989
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.3.0-changeset_38658.patch
@@ -0,0 +1,80 @@
+Index: /trunk/gdal/frmts/nitf/nitfrasterband.cpp
+===
+--- a/frmts/nitf/nitfrasterband.cpp(revision 38657)
 b/frmts/nitf/nitfrasterband.cpp(revision 38658)
+@@ -824,4 +826,20 @@
+ pUnpackData[i+7] = ((pDataSrc[k+2]) & 0x7);
+   }
++  if( i < n )
++  {
++pUnpackData[i+0] = ((pDataSrc[k+0] >> 5));
++if( i + 1 < n )
++pUnpackData[i+1] = ((pDataSrc[k+0] >> 2) & 0x07);
++if( i + 2 < n )
++pUnpackData[i+2] = ((pDataSrc[k+0] << 1) & 0x07) | (pDataSrc[k+1] 
>> 7);
++if( i + 3 < n )
++pUnpackData[i+3] = ((pDataSrc[k+1] >> 4) & 0x07);
++if( i + 4 < n )
++pUnpackData[i+4] = ((pDataSrc[k+1] >> 1) & 0x07);
++if( i + 5 < n )
++pUnpackData[i+5] = ((pDataSrc[k+1] << 2) & 0x07) | (pDataSrc[k+2] 
>> 6);
++if( i + 6 < n )
++pUnpackData[i+6] = ((pDataSrc[k+2] >> 3) & 0x07);
++  }
+ 
+   memcpy(pData, pUnpackData, n);
+@@ -842,4 +862,20 @@
+ pUnpackData[i+7] = ((pDataSrc[k+4]) & 0x1f);
+   }
++  if( i < n )
++  {
++pUnpackData[i+0] = ((pDataSrc[k+0] >> 3));
++if( i + 1 < n )
++pUnpackData[i+1] = ((pDataSrc[k+0] << 2) & 0x1f) | (pDataSrc[k+1] 
>> 6);
++if( i + 2 < n )
++pUnpackData[i+2] = ((pDataSrc[k+1] >> 1) & 0x1f);
++if( i + 3 < n )
++pUnpackData[i+3] = ((pDataSrc[k+1] << 4) & 0x1f) | (pDataSrc[k+2] 
>> 4);
++if( i + 4 < n )
++pUnpackData[i+4] = ((pDataSrc[k+2] << 1) & 0x1f) | (pDataSrc[k+3] 
>> 7);
++if( i + 5 < n )
++pUnpackData[i+5] = ((pDataSrc[k+3] >> 2) & 0x1f);
++if( i + 6 < n )
++pUnpackData[i+6] = ((pDataSrc[k+3] << 3) & 0x1f) | (pDataSrc[k+4] 
>> 5);
++  }
+ 
+   memcpy(pData, pUnpackData, n);
+@@ -856,4 +894,12 @@
+ pUnpackData[i+3] = ((pDataSrc[k+2]) & 0x3f);
+   }
++  if( i < n )
++  {
++pUnpackData[i+0] = ((pDataSrc[k+0] >> 2));
++if( i + 1 < n )
++pUnpackData[i+1] = ((pDataSrc[k+0] << 4) & 0x3f) | (pDataSrc[k+1] 
>> 4);
++if( i + 2 < n )
++pUnpackData[i+2] = ((pDataSrc[k+1] << 2) & 0x3f) | (pDataSrc[k+2] 
>> 6);
++  }
+ 
+   memcpy(pData, pUnpackData, n);
+@@ -873,4 +921,20 @@
+ pUnpackData[i+6] = ((pDataSrc[k+5] << 1) & 0x7f) | (pDataSrc[k+6] >> 
7);
+ pUnpackData[i+7] = ((pDataSrc[k+6]) & 0x7f);
++  }
++  if( i < n )
++  {
++pUnpackData[i+0] = ((pDataSrc[k+0] >> 1));
++if( i + 1 < n )
++pUnpackData[i+1] = ((pDataSrc[k+0] << 6) & 0x7f) | (pDataSrc[k+1] 
>> 2);
++if( i + 2 < n )
++pUnpackData[i+2] = ((pDataSrc[k+1] << 5) & 0x7f) | (pDataSrc[k+2] 
>> 3) ;
++if( i + 3 < n )
++pUnpackData[i+3] = ((pDataSrc[k+2] << 4) & 0x7f) | (pDataSrc[k+3] 
>> 4);
++if( i + 4 < n )
++pUnpackData[i+4] = ((pDataSrc[k+3] << 3) & 0x7f) | (pDataSrc[k+4] 
>> 5);
++if( i + 5 < n )
++pUnpackData[i+5] = ((pDataSrc[k+4] << 2) & 0x7f) | (pDataSrc[k+5] 
>> 6);
++if( i + 6 < n )
++pUnpackData[i+6] = ((pDataSrc[k+5] << 1) & 0x7f) | (pDataSrc[k+6] 
>> 7);
+   }
+ 

diff --git a/sci-libs/gdal/files/gdal-2.3.0-frmts-nitf38234.patch 
b/sci-libs/gdal/files/gdal-2.3.0-frmts-nitf38234.patch
new file mode 100644
index 000..783752e0efa
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.3.0-frmts-nitf38234.patch
@@ -0,0 +1,12 @@
+Index: trunk/gdal/frmts/nitf/nitffile.c
+===
+--- a/frmts/nitf/nitffile.c(revision 38085)
 b/frmts/nitf/nitffile.c(revision 38234)
+@@ -350,5 +350,6 @@
+ if (nOffset != -1)
+ nOffset = NITFCollectSegmentInfo( psFile, nHeaderLen, nOffset, "RE", 
4, 7, );
+-else
++
++if( nOffset < 0 )
+

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/

2018-08-04 Thread Amy Liffey 
commit: 24b142ee7181dd03692bd636d3ffc2e787dc5202
Author: Amy Liffey  gentoo  org>
AuthorDate: Sat Aug  4 12:03:05 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sat Aug  4 12:03:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24b142ee

sci-libs/gdal: fix curl undefined reference

Submitted-by: Michael Uleysky  gmail.com>
Closes: https://bugs.gentoo.org/659840
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sci-libs/gdal/files/gdal-2.3.0-curl.patch | 15 +++
 sci-libs/gdal/gdal-2.3.0-r1.ebuild|  1 +
 2 files changed, 16 insertions(+)

diff --git a/sci-libs/gdal/files/gdal-2.3.0-curl.patch 
b/sci-libs/gdal/files/gdal-2.3.0-curl.patch
new file mode 100644
index 000..1cd33243f42
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.3.0-curl.patch
@@ -0,0 +1,15 @@
+diff -urNd gdal-2.3.1/port/cpl_vsil_curl.cpp 
gdal-2.3.1-curl/port/cpl_vsil_curl.cpp
+--- gdal-2.3.1/port/cpl_vsil_curl.cpp  2018-06-24 01:10:23.0 +1000
 gdal-2.3.1-curl/port/cpl_vsil_curl.cpp 2018-07-13 01:29:31.326347717 
+1000
+@@ -8617,8 +8617,10 @@
+ if( poFSHandler )
+ poFSHandler->ClearCache();
+ }
+-
++#if !defined(HAVE_CURL) || defined(CPL_MULTIPROC_STUB)
++#else
+ VSICurlStreamingClearCache();
++#endif
+ }
+ 
+ #endif /* HAVE_CURL */

diff --git a/sci-libs/gdal/gdal-2.3.0-r1.ebuild 
b/sci-libs/gdal/gdal-2.3.0-r1.ebuild
index 8aacbcb83c7..2ddaa49d414 100644
--- a/sci-libs/gdal/gdal-2.3.0-r1.ebuild
+++ b/sci-libs/gdal/gdal-2.3.0-r1.ebuild
@@ -81,6 +81,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.2.3-soname.patch"
"${FILESDIR}/${PN}-2.2.3-bashcomp-path.patch" # bug 641866
"${FILESDIR}/${PN}-2.2.3-goocast.patch" # bug 656252
+   "${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/

2018-06-19 Thread Amy Liffey 
commit: d2fd2e5c98f0a2f84a519ff1b9f659991a704a82
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Mon Jun 18 22:05:37 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Tue Jun 19 09:08:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2fd2e5c

sci-libs/gdal: fix compilation with >=app-text/poppler-0.64.0

Closes: https://bugs.gentoo.org/656252
Closes: https://github.com/gentoo/gentoo/pull/8895
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sci-libs/gdal/files/gdal-2.2.3-goocast.patch |  11 +
 sci-libs/gdal/gdal-2.2.3-r2.ebuild   | 291 +++
 2 files changed, 302 insertions(+)

diff --git a/sci-libs/gdal/files/gdal-2.2.3-goocast.patch 
b/sci-libs/gdal/files/gdal-2.2.3-goocast.patch
new file mode 100644
index 000..a25a524c253
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.2.3-goocast.patch
@@ -0,0 +1,11 @@
+--- a/frmts/pdf/pdfobject.cpp  2018-05-29 11:23:00.980957371 +0300
 b/frmts/pdf/pdfobject.cpp  2018-05-29 11:23:44.378955265 +0300
+@@ -1055,7 +1055,7 @@
+ {
+ if (GetType() == PDFObjectType_String)
+ {
+-GooString* gooString = m_po->getString();
++GooString* gooString =(GooString*) m_po->getString();
+ return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast(gooString->getCString()),
+   
static_cast(gooString->getLength(;
+ }

diff --git a/sci-libs/gdal/gdal-2.2.3-r2.ebuild 
b/sci-libs/gdal/gdal-2.2.3-r2.ebuild
new file mode 100644
index 000..9db81229486
--- /dev/null
+++ b/sci-libs/gdal/gdal-2.2.3-r2.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools perl-module distutils-r1 toolchain-funcs flag-o-matic 
java-pkg-opt-2
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes 
OGR support)"
+HOMEPAGE="http://www.gdal.org/;
+SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz;
+
+SLOT="0/2.2"
+LICENSE="BSD Info-ZIP MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x86-macos"
+IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg 
jpeg2k mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python 
spatialite sqlite threads webp xls"
+
+COMMON_DEPEND="
+   dev-libs/expat
+   dev-libs/json-c:=
+   dev-libs/libpcre
+   dev-libs/libxml2:=
+   media-libs/tiff:0=
+   sci-libs/libgeotiff
+   sys-libs/zlib:=[minizip(+)]
+   armadillo? ( sci-libs/armadillo:=[lapack] )
+   curl? ( net-misc/curl )
+   fits? ( sci-libs/cfitsio:= )
+   geos? ( >=sci-libs/geos-2.2.1 )
+   gif? ( media-libs/giflib:= )
+   gml? ( >=dev-libs/xerces-c-3.1 )
+   hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
+   jpeg? ( virtual/jpeg:0 )
+   jpeg2k? ( media-libs/openjpeg:2= )
+   mdb? ( dev-java/jackcess:1 )
+   mysql? ( virtual/mysql )
+   netcdf? ( sci-libs/netcdf:= )
+   odbc? ( dev-db/unixODBC )
+   ogdi? ( sci-libs/ogdi )
+   opencl? ( virtual/opencl )
+   oracle? ( dev-db/oracle-instantclient:= )
+   pdf? ( >=app-text/poppler-0.24.3:= )
+   perl? ( dev-lang/perl:= )
+   png? ( media-libs/libpng:0= )
+   postgres? ( >=dev-db/postgresql-8.4:= )
+   python? (
+   ${PYTHON_DEPS}
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
+   spatialite? ( dev-db/spatialite )
+   sqlite? ( dev-db/sqlite:3 )
+   webp? ( media-libs/libwebp:= )
+   xls? ( dev-libs/freexl )"
+
+RDEPEND="${COMMON_DEPEND}
+   java? ( >=virtual/jre-1.7:* )"
+
+DEPEND="${COMMON_DEPEND}
+   app-shells/bash-completion
+   doc? ( app-doc/doxygen )
+   java? ( >=virtual/jdk-1.7:* )
+   perl? ( dev-lang/swig:0 )
+   python? (
+   dev-lang/swig:0
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   )"
+
+REQUIRED_USE="
+   mdb? ( java )
+   python? ( ${PYTHON_REQUIRED_USE} )
+   spatialite? ( sqlite )
+"
+
+PATCHES=(
+   "${FILESDIR}/${P}-soname.patch"
+   "${FILESDIR}/${P}-json-c-0.13.patch" # bug 641658
+   "${FILESDIR}/${P}-bashcomp-path.patch" # bug 641866
+   "${FILESDIR}/${P}-goocast.patch" # bug 656252
+)
+
+src_prepare() {
+   # fix datadir and docdir placement
+   sed -e "s:@datadir@:@datadir@/gdal:" \
+   -e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
+   -i "${S}"/GDALmake.opt.in || die
+
+   # the second sed expression should fix bug 371075
+   sed -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
+   -e "s:--prefix=\$(DESTDIR):--prefix=:" \
+   -i "${S}"/swig/python/GNUmakefile || die
+
+   # Fix spatialite/sqlite include issue
+   sed -e

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/

2018-02-04 Thread Andreas Sturmlechner 
commit: 1b2289888f129d28cc0238e38f41fffdf5b55353
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb  4 00:43:49 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb  4 10:15:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b228988

sci-libs/gdal: Drop old

Closes: https://bugs.gentoo.org/643996
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sci-libs/gdal/Manifest |   1 -
 sci-libs/gdal/files/gdal-1.5.0-soname-r1.patch |  13 -
 .../gdal-2.0.3-add-dlopen-support-for-jvm.patch| 232 
 sci-libs/gdal/files/gdal-2.0.3-install_name.patch  |  49 
 sci-libs/gdal/gdal-2.0.3.ebuild| 291 -
 5 files changed, 586 deletions(-)

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index b105313f67a..17fbd88fc85 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,2 +1 @@
-DIST gdal-2.0.3.tar.gz 11589011 BLAKE2B 
2b9d319be24e377aff751c7ae4d6c89812c47fe2a0b9476936b2f3423e4f5593034a6303346e05709c9a7cffd71703ae80f72c689218ae0337794d35afcb3a1d
 SHA512 
3ed2a084fa146fab8d5f5e039480ab935edaefebe9e55f85bf637a4487a3f56951c93055395850e7bf35d5a6d6e901f741ae01ad64be87597aabfad52f1c5e90
 DIST gdal-2.2.3.tar.gz 13754766 BLAKE2B 
d9482e7ee40bb5558fbbb43b750dfb95344abe45142c19e1f767535d3fc127fa9d6ed4496d730a25cb4132980efbffb4685e8663798fa05515b8548edb689e42
 SHA512 
841e5ba3c1a442b678dcaabac719ea7707b817f3dc717a34430dc7ba1f2c27fa88e27b7a8645075fae6e16373b36e6c50f674bdd6b70d10059e6bc4be7a72046

diff --git a/sci-libs/gdal/files/gdal-1.5.0-soname-r1.patch 
b/sci-libs/gdal/files/gdal-1.5.0-soname-r1.patch
deleted file mode 100644
index ec35018868d..000
--- a/sci-libs/gdal/files/gdal-1.5.0-soname-r1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
 old/GDALmake.opt.in.orig   2008-02-02 18:25:48.0 -0800
-+++ new/GDALmake.opt.in2008-02-02 18:54:53.0 -0800
-@@ -97,6 +97,10 @@
- GDAL_SLIB =   $(GDAL_ROOT)/libgdal.$(SO_EXT)
- GDAL_SLIB_LINK=   -L$(GDAL_ROOT) -lgdal
- 
-+# for building without libtool
-+GDAL_SLIB_SO_VER =
$(GDAL_VERSION_MAJOR).$(LIBGDAL_CURRENT).$(LIBGDAL_REVISION)
-+GDAL_SLIB_SONAME =-Wl,-soname,libgdal.$(SO_EXT).$(GDAL_VERSION_MAJOR)
-+
- # Mac OS X Framework definition
- MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@
- 

diff --git a/sci-libs/gdal/files/gdal-2.0.3-add-dlopen-support-for-jvm.patch 
b/sci-libs/gdal/files/gdal-2.0.3-add-dlopen-support-for-jvm.patch
deleted file mode 100644
index 7c35d1cb124..000
--- a/sci-libs/gdal/files/gdal-2.0.3-add-dlopen-support-for-jvm.patch
+++ /dev/null
@@ -1,232 +0,0 @@
-From baba2c213770972e79be6be4902716278f351fb4 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot 
-Date: Wed, 24 Aug 2016 23:32:13 +0100
-Subject: [PATCH 1/2] Allow libjvm.so to be dlopen'd with --with-jvm-lib=dlopen
-
-Having to set LD_LIBRARY_PATH is a pain and relying on the rpath can
-be problematic when libjvm.so lives in a versioned directory. Some
-distributions even allow per-user JVM selection so checking the value
-of JAVA_HOME at runtime allows this choice to be respected.
-
-libjvm.so's location is hard to predict (amd64 vs i386, jre or not?)
-so ${JAVA_HOME}/bin/java -XshowSettings is executed to find its
-location. If JAVA_HOME is not set then java is executed from the PATH
-instead.

- gdal/configure  | 11 +-
- gdal/configure.in   |  7 +++-
- gdal/ogr/ogrsf_frmts/mdb/ogrmdbjackcess.cpp | 57 +++--
- gdal/port/cpl_config.h.in   |  3 ++
- 4 files changed, 71 insertions(+), 7 deletions(-)
-
-diff --git a/configure b/configure
-index 75e4e279de..acdfa439de 100755
 a/configure
-+++ b/configure
-@@ -1753,7 +1753,7 @@ Optional Packages:
-   --with-python=ARG   Enable python bindings (ARG=yes, no, or path to python 
binary)
-   --with-java   Include Java support (ARG=yes, no or JDK home path)  
[default=no]
-   --with-mdb   Include MDB driver
--  --with-jvm-lib=ARGARG points to Java libjvm path
-+  --with-jvm-lib=ARGARG is dlopen or points to Java libjvm path
-   --with-jvm-lib-add-rpathAdd the libjvm path to the RPATH (no by default)
-   --with-rasdaman=DIRInclude rasdaman support (DIR is rasdaman's 
install dir).
-   --with-armadillo=ARG   Include Armadillo support for faster TPS 
transform computation (ARG=yes/no/path to armadillo install root) [default=no]
-@@ -29491,7 +29491,14 @@ if test "${with_jvm_lib_add_rpath+set}" = set; then :
- fi
- 
- 
--if test "x$with_jvm_lib" != "x"; then
-+if test "x$with_jvm_lib" = "xdlopen"; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define JVM_LIB_DLOPEN 1
-+_ACEOF
-+
-+JVM_LIB="-ldl"
-+elif test "x$with_jvm_lib" != "x"; then
- if test -d "$with_jvm_lib"; then
- saved_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -L$with_jvm_lib"
-diff

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/

2018-01-16 Thread Andreas Sturmlechner 
commit: bbe66af667f540c766d7cf77b19f24497488c823
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan 16 20:57:53 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan 16 21:06:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbe66af6

sci-libs/gdal: Drop old

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-libs/gdal/Manifest|   1 -
 sci-libs/gdal/files/gdal-1.5.0-install_name.patch |  45 
 sci-libs/gdal/files/gdal-1.5.0-soname.patch   |  13 -
 sci-libs/gdal/files/gdal-2.0.2-jasper.patch   |  13 -
 sci-libs/gdal/files/gdal-2.0.2-jasper2.patch  |  62 -
 sci-libs/gdal/gdal-2.0.2-r3.ebuild| 286 -
 sci-libs/gdal/gdal-2.2.3.ebuild   | 289 --
 7 files changed, 709 deletions(-)

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 0570d7e9127..b105313f67a 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,3 +1,2 @@
-DIST gdal-2.0.2.tar.gz 11643726 BLAKE2B 
aac80990d800acb8b0881caf84229a3c73b57aad1acbd05adb911c9c2ca56fff145eae5a77dcaa934003a22188178883381db5a4c10e7fc082b8f4d98aa146c6
 SHA512 
b3fedc8d1d0522d2a6fd22fbc722c551ebf2e4326f64b76c9c43cd3848f7c97a0636c691ee383b3f3c872dc79cd0e216527d3985c6aac3103395fde657db1266
 DIST gdal-2.0.3.tar.gz 11589011 BLAKE2B 
2b9d319be24e377aff751c7ae4d6c89812c47fe2a0b9476936b2f3423e4f5593034a6303346e05709c9a7cffd71703ae80f72c689218ae0337794d35afcb3a1d
 SHA512 
3ed2a084fa146fab8d5f5e039480ab935edaefebe9e55f85bf637a4487a3f56951c93055395850e7bf35d5a6d6e901f741ae01ad64be87597aabfad52f1c5e90
 DIST gdal-2.2.3.tar.gz 13754766 BLAKE2B 
d9482e7ee40bb5558fbbb43b750dfb95344abe45142c19e1f767535d3fc127fa9d6ed4496d730a25cb4132980efbffb4685e8663798fa05515b8548edb689e42
 SHA512 
841e5ba3c1a442b678dcaabac719ea7707b817f3dc717a34430dc7ba1f2c27fa88e27b7a8645075fae6e16373b36e6c50f674bdd6b70d10059e6bc4be7a72046

diff --git a/sci-libs/gdal/files/gdal-1.5.0-install_name.patch 
b/sci-libs/gdal/files/gdal-1.5.0-install_name.patch
deleted file mode 100644
index e17575267d6..000
--- a/sci-libs/gdal/files/gdal-1.5.0-install_name.patch
+++ /dev/null
@@ -1,45 +0,0 @@
 GDALmake.opt.in.orig   2008-02-02 18:25:48.0 -0800
-+++ GDALmake.opt.in2008-02-02 18:54:53.0 -0800
-@@ -97,6 +97,10 @@
- GDAL_SLIB =   $(GDAL_ROOT)/libgdal.$(SO_EXT)
- GDAL_SLIB_LINK=   -L$(GDAL_ROOT) -lgdal
- 
-+# for building without libtool
-+GDAL_SLIB_SO_VER =
$(GDAL_VERSION_MAJOR).$(LIBGDAL_CURRENT).$(LIBGDAL_REVISION)
-+GDAL_SLIB_SONAME =-install_name 
$(INST_LIB)/libgdal.$(GDAL_VERSION_MAJOR).$(SO_EXT)
-+
- # Mac OS X Framework definition
- MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@
- 
 GNUmakefile.orig   2010-03-09 14:03:08 +0100
-+++ GNUmakefile2010-03-09 14:05:29 +0100
-@@ -218,7 +218,7 @@
- 
- ifeq ($(HAVE_LD_SHARED),yes)
- 
--GDAL_SLIB_B   =   $(notdir $(GDAL_SLIB))
-+GDAL_SLIB_B   =   libgdal
- 
- install-lib:
- 
-@@ -226,14 +226,14 @@
- ifeq ($(MACOSX_FRAMEWORK),yes)
-   $(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/GDAL
- else
--  rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B)
--  rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR)
--  rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
--  $(INSTALL_LIB) $(GDAL_SLIB) 
$(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
-+  rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).dylib
-+  rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).dylib
-+  rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER).dylib
-+  $(INSTALL_LIB) $(GDAL_SLIB) 
$(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER).dylib
-   (cd $(DESTDIR)$(INST_LIB) ; \
--   ln -s $(GDAL_SLIB_B).$(GDAL_VER) $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR))
-+   ln -s $(GDAL_SLIB_B).$(GDAL_VER).dylib 
$(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).dylib)
-   (cd $(DESTDIR)$(INST_LIB) ; \
--   ln -s $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR) $(GDAL_SLIB_B))
-+   ln -s $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).dylib $(GDAL_SLIB_B).dylib)
- endif
- 
- else

diff --git a/sci-libs/gdal/files/gdal-1.5.0-soname.patch 
b/sci-libs/gdal/files/gdal-1.5.0-soname.patch
deleted file mode 100644
index f784536316c..000
--- a/sci-libs/gdal/files/gdal-1.5.0-soname.patch
+++ /dev/null
@@ -1,13 +0,0 @@
 GDALmake.opt.in.orig   2008-02-02 18:25:48.0 -0800
-+++ GDALmake.opt.in2008-02-02 18:54:53.0 -0800
-@@ -97,6 +97,10 @@
- GDAL_SLIB =   $(GDAL_ROOT)/libgdal.$(SO_EXT)
- GDAL_SLIB_LINK=   -L$(GDAL_ROOT) -lgdal
- 
-+# for building without libtool
-+GDAL_SLIB_SO_VER =
$(GDAL_VERSION_MAJOR).$(LIBGDAL_CURRENT).$(LIBGDAL_REVISION)
-+GDAL_SLIB_SONAME =-Wl,-soname,libgdal.$(SO_EXT).$(GDAL_VERSION_MAJOR)
-+
- # Mac OS X Framework definition
- MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@
- 

diff --git a/sci-libs/gdal/files/gdal-2.0.2-jasper.patch

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/

2016-11-07 Thread Amy Winston 
commit: 33c636fd5f8adad1a38696dcc01252b29a77c616
Author: Amy Winston  gentoo  org>
AuthorDate: Mon Nov  7 13:43:44 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Mon Nov  7 13:55:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33c636fd

sci-libs/gdal: fix jasper bug #598597

Package-Manager: portage-2.3.0

 sci-libs/gdal/files/gdal-2.0.2-jasper.patch |  13 ++
 sci-libs/gdal/gdal-2.0.2-r2.ebuild  | 317 
 2 files changed, 330 insertions(+)

diff --git a/sci-libs/gdal/files/gdal-2.0.2-jasper.patch 
b/sci-libs/gdal/files/gdal-2.0.2-jasper.patch
new file mode 100644
index ..00cf5c1
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.0.2-jasper.patch
@@ -0,0 +1,13 @@
+diff -urpN gdal-2.0.2.orig/frmts/jpeg2000/jpeg2000_vsil_io.h 
gdal-2.0.2/frmts/jpeg2000/jpeg2000_vsil_io.h
+--- gdal-2.0.2.orig/frmts/jpeg2000/jpeg2000_vsil_io.h  2016-01-26 
07:21:48.0 -0800
 gdal-2.0.2/frmts/jpeg2000/jpeg2000_vsil_io.h   2016-10-31 
23:45:28.939407322 -0700
+@@ -29,7 +29,8 @@
+ 
+ #ifndef JPEG2000_VSIL_IO_H
+ #define JPEG2000_VSIL_IO_H
+- 
++
++#include 
+ #include 
+ 
+ jas_stream_t *JPEG2000_VSIL_fopen(const char *filename, const char *mode);

diff --git a/sci-libs/gdal/gdal-2.0.2-r2.ebuild 
b/sci-libs/gdal/gdal-2.0.2-r2.ebuild
new file mode 100644
index ..ff4d810
--- /dev/null
+++ b/sci-libs/gdal/gdal-2.0.2-r2.ebuild
@@ -0,0 +1,317 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WANT_AUTOCONF="2.5"
+
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python2_7 python3_4 )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools eutils libtool perl-module distutils-r1 python-r1 
toolchain-funcs java-pkg-opt-2
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes 
OGR support)"
+HOMEPAGE="http://www.gdal.org/;
+SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz;
+
+SLOT="0/2"
+LICENSE="BSD Info-ZIP MIT"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
+IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg 
jpeg2k mdb mysql netcdf odbc ogdi opencl pdf perl png postgres python 
spatialite sqlite threads xls"
+
+RDEPEND="
+   dev-libs/expat
+   dev-libs/json-c
+   dev-libs/libpcre
+   dev-libs/libxml2
+   media-libs/tiff:0=
+   sci-libs/libgeotiff
+   sys-libs/zlib[minizip(+)]
+   armadillo? ( sci-libs/armadillo[lapack] )
+   curl? ( net-misc/curl )
+   fits? ( sci-libs/cfitsio )
+   geos?   ( >=sci-libs/geos-2.2.1 )
+   gif? ( media-libs/giflib:= )
+   gml? ( >=dev-libs/xerces-c-3 )
+   hdf5? ( >=sci-libs/hdf5-1.6.4[szip] )
+   java? ( >=virtual/jre-1.6:* )
+   jpeg? ( virtual/jpeg:0= )
+   jpeg2k? ( media-libs/jasper:= )
+   mysql? ( virtual/mysql )
+   netcdf? ( sci-libs/netcdf )
+   odbc?   ( dev-db/unixODBC )
+   ogdi? ( sci-libs/ogdi )
+   opencl? ( virtual/opencl )
+   pdf? ( >=app-text/poppler-0.24.3:= )
+   perl? ( dev-lang/perl:= )
+   png? ( media-libs/libpng:0= )
+   postgres? ( >=dev-db/postgresql-8.4:= )
+   python? (
+   ${PYTHON_DEPS}
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
+   sqlite? ( dev-db/sqlite:3 )
+   spatialite? ( dev-db/spatialite )
+   xls? ( dev-libs/freexl )
+"
+
+DEPEND="${RDEPEND}
+   doc? ( app-doc/doxygen )
+   java? ( >=virtual/jdk-1.6 )
+   perl? ( dev-lang/swig:0 )
+   python? ( dev-lang/swig:0 )"
+
+AT_M4DIR="${S}/m4"
+
+REQUIRED_USE="
+   spatialite? ( sqlite )
+   mdb? ( java )
+"
+
+pkg_setup() {
+   java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+   java-pkg-opt-2_src_prepare
+
+   # fix datadir and docdir placement
+   sed -i \
+   -e "s:@datadir@:@datadir@/gdal:" \
+   -e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
+   "${S}"/GDALmake.opt.in || die
+
+   # the second sed expression should fix bug 371075
+   sed -i \
+   -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
+   -e "s:--prefix=\$(DESTDIR):--prefix=:" \
+   "${S}"/swig/python/GNUmakefile || die
+
+   if use jpeg2k; then
+   epatch "${FILESDIR}"/${P}-jasper.patch
+   fi
+
+   # -soname is only accepted by GNU ld/ELF
+   [[ ${CHOST} == *-darwin* ]] \
+   && epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \
+   || epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch
+
+   # Fix spatialite/sqlite include issue
+   sed -i \
+   -e 's:spatialite/sqlite3.h:sqlite3.h:g' \
+   ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
+
+   # Fix freexl configure check
+   sed -i \
+   -e

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/

2015-10-24 Thread Justin Lecher 
commit: 26928529bd50baa3f6a6ef0a77eb4012c82a0fd1
Author: Justin Lecher  gentoo  org>
AuthorDate: Sat Oct 24 17:22:40 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Oct 24 17:23:02 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26928529

sci-libs/gdal: Backport patch for glibc-2.22

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=563608

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/gdal/files/gdal-2.0.0-glibc-2.22-backport.patch | 14 ++
 sci-libs/gdal/gdal-2.0.0-r1.ebuild   |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/sci-libs/gdal/files/gdal-2.0.0-glibc-2.22-backport.patch 
b/sci-libs/gdal/files/gdal-2.0.0-glibc-2.22-backport.patch
new file mode 100644
index 000..f23ff76
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.0.0-glibc-2.22-backport.patch
@@ -0,0 +1,14 @@
+Index: /branches/2.0/gdal/apps/gdalserver.c
+===
+--- /branches/2.0/gdal/apps/gdalserver.c   (revision 29667)
 /branches/2.0/gdal/apps/gdalserver.c   (revision 29668)
+@@ -28,7 +28,6 @@
+  /
+ 
+-#if defined(__STDC_VERSION__)
+-#define _XOPEN_SOURCE
+-#endif
++// So that __USE_XOPEN2K is defined to have getaddrinfo
++#define _XOPEN_SOURCE 600
+ 
+ #include "cpl_port.h"

diff --git a/sci-libs/gdal/gdal-2.0.0-r1.ebuild 
b/sci-libs/gdal/gdal-2.0.0-r1.ebuild
index 8f44889..6a34452 100644
--- a/sci-libs/gdal/gdal-2.0.0-r1.ebuild
+++ b/sci-libs/gdal/gdal-2.0.0-r1.ebuild
@@ -80,6 +80,8 @@ pkg_setup() {
 src_prepare() {
java-pkg-opt-2_src_prepare
 
+   epatch "${FILESDIR}"/${P}-glibc-2.22-backport.patch
+
# fix datadir and docdir placement
sed -i \
-e "s:@datadir@:@datadir@/gdal:" \