commit: 44e06b49c3347e6f660d85af4db4fd5d207d551c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 4 23:15:01 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 4 23:17:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44e06b49
sci-libs/gdal: restore missing changes from 3.4.2-r2
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/gdal/{gdal-3.4.3.ebuild => gdal-3.4.3-r1.ebuild} | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/sci-libs/gdal/gdal-3.4.3.ebuild
b/sci-libs/gdal/gdal-3.4.3-r1.ebuild
similarity index 98%
rename from sci-libs/gdal/gdal-3.4.3.ebuild
rename to sci-libs/gdal/gdal-3.4.3-r1.ebuild
index 48c279d2b06e..0542e701d8c1 100644
--- a/sci-libs/gdal/gdal-3.4.3.ebuild
+++ b/sci-libs/gdal/gdal-3.4.3-r1.ebuild
@@ -41,7 +41,7 @@ BDEPEND="
DEPEND="
dev-libs/expat
dev-libs/json-c:=
- dev-libs/libpcre
+ dev-libs/libpcre2
dev-libs/libxml2:2
dev-libs/openssl:=
media-libs/tiff
@@ -148,6 +148,7 @@ src_configure() {
--with-libtiff
--with-libtool
--with-libz="${ESYSROOT}"/usr
+ --with-pcre2
--without-blosc
--without-charls
--without-dods-root
@@ -176,6 +177,7 @@ src_configure() {
--without-rasterlite2
# Revisit when OpenEXR 3 / ilmmath migration is more complete
in tree
--without-exr
+ --without-pcre
--without-pcraster
--without-pdfium
--without-perl
@@ -294,7 +296,7 @@ src_install() {
if use java; then
# bug #752399
java-pkg_dojar "${S}"/swig/java/gdal.jar
- dolib.so "${S}"/swig/java/.libs/libgdalalljni.so.*
+ dolib.so "${S}"/swig/java/.libs/libgdalalljni.so*
fi
if use perl; then
