gentoo resync : 20.03.2022

5 files changed, 69 insertions, 329 deletions

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index ca53467d1883..894ea4815485 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -2,10 +2,9 @@ AUX gdal-2.2.3-soname.patch 1959 BLAKE2B f6cdba1af819b3416e18be1e584384b3df68581
 AUX gdal-2.3.0-curl.patch 323 BLAKE2B 19a89ac9ffed5716fe2c26234233045022a3bc262d2ec386fdb5bc7a15cafc6472d1264020358223d2505992124177a0ae106cad26b8da671bbd1ece83762ee1 SHA512 5bd2df7712c6487e5968fbef84b4154f20d13ffe88f22886325be3c03fc882e2699e258e11c54eec750225fde1b2001d4dd35ace751a5f3c8ae59a9572241373
 AUX gdal-3.3.0-libdir.patch 19617 BLAKE2B c0fd86a2d79155ee17a8ae69ae59876b76d9a4a35c79b896d838edcd497f17bf35ddfd3ab6de8e792a87ae8c012a91b1d2f0351d47e89f7d7fcf88a72647d38a SHA512 ee74ee86b8249abfbbce6e114f3a5f1c79a30a86aeb45761ca8637ebcae0e0df4c4961b292fdd1f49865da6445a8afaf161d80c28849dde6adf72cc3ed092852
 AUX gdal-3.4.1-poppler-22.01.0-c++17.patch 759 BLAKE2B bfb9cfc97fb56a18eda0f0d20e83f8e48ba44bab80fa7253c3883cac0a6a6460345745aaf4e63c750e4c0d8e3866c2978da382ea9889c9ff638b697e6398ad84 SHA512 bc95a835093b9b8bb3ed44d82a9c4b0fb987f1299d572e05f6791df2bd14c279853cfc877e41a012367bb4089b4e81ea359bc44d1ae11e67048063d2a1105a1a
-DIST gdal-3.3.3.tar.gz 19600111 BLAKE2B 2d4558062b35016372d6964884296878fdcef0afa83fb03b10cd902ce101ec52f551d48014d95b391d19b8db13d7ca1d639575b39e9421780f4212bef02dd51f SHA512 c49e4555e598e4182e6419758c31df08d46b8b061480f08be09d61e840057529bd833338eaa8c1ecfe1c6a0cc8cd6a073bf15fa6cdae003e4475485cf3851145
-DIST gdal-3.4.0.tar.gz 20008930 BLAKE2B b4dad7226d2cfee3bdcab9782d2d35355501c1dd830d247099f6a8030311b86e7620e90f7bba675bf49dc47d166ab586fabe45ba02d9d7e9a73829194da6b360 SHA512 e363258172cff9647804be11f28ebec1614ddfbfc6eed72d44700c23aea674267e413099555d25e784d567ea915b5fb9092ff74b98d890dfcb8aae56b0575eb6
+AUX gdal-3.4.1-poppler-22.03.0.patch 2056 BLAKE2B 119a71daf7d53ee405041b8e7c2bd33e1672aac1883ebdd967a0252cbdc809dea2b993ad630a6c206cb68afe081354c2a56b94b6f9e76a868858aa1de34964cb SHA512 07511f9490a5385271210b140c07096232611a0604618e30cd97e8e737b4d81deaf536438296ad0307cf0f59a5fc7448ed36e3fda6e6faad6a49daac05fb2c54
 DIST gdal-3.4.1.tar.gz 20022859 BLAKE2B fe6da8b3f098839bc5da9e49932a7a8e172b5dcb79f34eaa5f82a336cab3666223ae6f354c7847d1090e312838cc2e121e357c914cca3375541ee8ed31746edc SHA512 dcfd5f5ceac633838db2a92af6f6eb1c9fca55216885f071c7d8df8fc119aa800b2854c6e5ae84cdeea531e7e61296ad4378d798107c19d80d2ba4e1094299bf
-EBUILD gdal-3.3.3.ebuild 7852 BLAKE2B 03a04b87e0099452c748d0400a4c21a9369a04f01948b298a39dd9a938c3b2264e00827b3cf0ca7d7719f35a90974c493fcc5a99efb111789c684249c58dcafd SHA512 28738878e2f1cb78f5ab1a25553e445563a4b17e555bf87808de1ff0d373b6b309ad561d6514e1b9b02f5391bb19c7f0519c31d490d4465f8eccef0f1cbc0945
-EBUILD gdal-3.4.0.ebuild 8033 BLAKE2B cf27f9b230f4fba647892383bd51112a9ba072424a834189569027faea7852476fc2f627837759d99c126d6307deacdf951ddaa2d88dcaf120ef4c8455ef2424 SHA512 9633034b855d9b640de491fc1e9c7d64eb149114787dcebfa76fec083b2772ba45e59cfb87154f35e4ce6544607fff515decc4bd4ce574c237f2ade914498361
-EBUILD gdal-3.4.1.ebuild 8076 BLAKE2B 893b3cee4760a9c85c4c059aae78d29920e0333aef8683c7a27fde9a19306b8ad982c79c52d9c2ec95a067cccc9ca927224878cd863e8cf708d3998d4e844895 SHA512 635722e556c9721e131c9bc1431c8766fcfb4304898c241f8c63be3bb1f2e6421bc641c78e43ec2b90617386daa92ad67434e51f3541e32aff73d1482294ab1c
+DIST gdal-3.4.2.tar.gz 20048761 BLAKE2B e5134d8602d23b9b83f14e02d15cf734dbffeea76504c8d0c96ebfe7e40d7d16911a2f1b5f570458dcbf14aa9a681481409581cc6fc4cd2fe10359be88f20b5a SHA512 7c1e9fd48c57c8e1dde6bff22aa181ce8c5d39c8bb22c51ca592fe453c66178171f51f4a49d3800e51bedb17d0e78692a118e0b16891bb9c7bf66937e3546cfe
+EBUILD gdal-3.4.1.ebuild 8131 BLAKE2B 1be6f00ff6b65525c425b55090036a313b1c8416991ff23b911401455f486d6137e5db4c997b98bd8f0a5f5e9a7e8deddb1855a119b6996a4528999be3b6ee3b SHA512 27e5be8c59d70f8437cbaaab8a205e8b5fa0f27192ccd3fd66f802d01535c38d03538ba7289967ca51351e949ccbe605bbdc8145533d6da933fb6ce64a40664d
+EBUILD gdal-3.4.2.ebuild 8133 BLAKE2B 9b2b7333f9033398195a75a0cc809103b42cd2ca58323191c075783a7d1e2c69242cac5393d56903f81c8aa5762a831d40b1c44c8b76ee0a19dacd2422060b79 SHA512 3e931072e54281887225c2fc8f5d47c31417d10df15a36aa8ed60b53d792217413bf7575c3ce1541667cfae0a93d6a5577eccc6df3d4360169cee075d39ebb51
 MISC metadata.xml 1623 BLAKE2B af7c9d5cc3c16ffef6fa9ef5dd5cf54ffcd34229d1e82b90e310f9eeccf5a5b4fa2119112b5427b520ce6e964e368aef7313edb3837940bed4b960ced7714fc3 SHA512 ed206877adac0b8b190e0edfb04f48c435d698fd523a14d54a14638b908c9e9452b1a2d394046093f5aa86cb48c611790f56ae511807855eb80bfcd4cc1d425c
diff --git a/sci-libs/gdal/files/gdal-3.4.1-poppler-22.03.0.patch b/sci-libs/gdal/files/gdal-3.4.1-poppler-22.03.0.patch
new file mode 100644
index 000000000000..94640e046a1b
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.4.1-poppler-22.03.0.patch
@@ -0,0 +1,54 @@
+From 17e98757e78969a199d1d6318f53d088da192191 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Fri, 18 Feb 2022 22:47:01 +0100
+Subject: [PATCH] PDF: fix build against Poppler > 22.2
+
+---
+ frmts/pdf/pdfdataset.cpp | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
+index 22238bd74822..08f8e31c86a7 100644
+--- a/frmts/pdf/pdfdataset.cpp
++++ b/frmts/pdf/pdfdataset.cpp
+@@ -4241,8 +4241,6 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
+ #ifdef HAVE_POPPLER
+   if(bUseLib.test(PDFLIB_POPPLER))
+   {
+-    GooString* poUserPwd = nullptr;
+-
+     static bool globalParamsCreatedByGDAL = false;
+     {
+         CPLMutexHolderD(&hGlobalParamsMutex);
+@@ -4310,9 +4308,6 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
+     while( true )
+     {
+         VSIFSeekL(fp, 0, SEEK_SET);
+-        if (pszUserPwd)
+-            poUserPwd = new GooString(pszUserPwd);
+-
+         g_nPopplerErrors = 0;
+         if( globalParamsCreatedByGDAL )
+             registerErrorCallback();
+@@ -4322,10 +4317,20 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
+         oObj.getObj()->initNull();
+         auto poStream = new VSIPDFFileStream(fp, pszFilename, oObj.getObj());
+ #endif
++#if POPPLER_MAJOR_VERSION > 22 || (POPPLER_MAJOR_VERSION == 22 && POPPLER_MINOR_VERSION > 2)
++        std::optional<GooString> osUserPwd;
++        if (pszUserPwd)
++            osUserPwd = std::optional<GooString>(pszUserPwd);
++        poDocPoppler = new PDFDoc(poStream, std::optional<GooString>(), osUserPwd);
++#else
++        GooString* poUserPwd = nullptr;
++        if (pszUserPwd)
++            poUserPwd = new GooString(pszUserPwd);
+         poDocPoppler = new PDFDoc(poStream, nullptr, poUserPwd);
++        delete poUserPwd;
++#endif
+         if( globalParamsCreatedByGDAL )
+             registerErrorCallback();
+-        delete poUserPwd;
+         if( g_nPopplerErrors >= MAX_POPPLER_ERRORS )
+         {
+             PDFFreeDoc(poDocPoppler);
diff --git a/sci-libs/gdal/gdal-3.3.3.ebuild b/sci-libs/gdal/gdal-3.3.3.ebuild
deleted file mode 100644
index 0759a1e57028..000000000000
--- a/sci-libs/gdal/gdal-3.3.3.ebuild
+++ /dev/null
@@ -1,317 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python3_{8,9,10} )
-DISTUTILS_OPTIONAL=1
-inherit autotools bash-completion-r1 distutils-r1 flag-o-matic java-pkg-opt-2 perl-module 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/3.3"
-LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="armadillo +aux-xml curl cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_ssse3 debug doc fits geos gif gml hdf5 heif 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="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	java? (
-		dev-java/ant-core
-		dev-lang/swig:0
-		>=virtual/jdk-1.8:*
-	)
-	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:2
-	dev-libs/openssl:=
-	media-libs/tiff
-	>=sci-libs/libgeotiff-1.5.1-r1:=
-	>=sci-libs/proj-6.0.0:=
-	sys-libs/zlib[minizip(+)]
-	armadillo? ( sci-libs/armadillo:=[lapack] )
-	curl? ( net-misc/curl )
-	fits? ( sci-libs/cfitsio:= )
-	geos? ( >=sci-libs/geos-3.8.0 )
-	gif? ( media-libs/giflib:= )
-	gml? ( >=dev-libs/xerces-c-3.1 )
-	heif? ( media-libs/libheif:= )
-	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? ( dev-db/oracle-instantclient:= )
-	pdf? ( app-text/poppler:= )
-	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 )
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}
-	java? ( >=virtual/jre-1.8:* )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.3-soname.patch"
-	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
-	"${FILESDIR}/${PN}-3.3.0-libdir.patch"
-)
-
-src_prepare() {
-	default
-
-	# Drop a --prefix hack in the upstream build system
-	# We don't want the line at all, so let's just drop it rather than
-	# trying to put in the right libdir value.
-	# bug #696106
-	sed -e '/\$ADD_PREFIX\/lib/d' \
-		-i configure.ac || die
-
-	sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
-		-i configure.ac || die
-
-	sed -e 's:^ar:$(AR):g' \
-		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
-
-	# SWIG: Use of the include path to find the input file is deprecated and will not work with ccache.
-	sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
-		-i swig/python/GNUmakefile || die "sed python makefile failed"
-
-	# autoconf 2.70+
-	# bug #775209
-	config_rpath_update .
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		# charls - not packaged in Gentoo ebuild repository
-		# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
-		# bsb - legal issues
-		# ingres - same story as oracle oci
-		# jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
-		# podofo - we use poppler instead they are exclusive for each other
-		# tiff is a hard dep
-		--includedir="${EPREFIX}"/usr/include/${PN}
-		--disable-lto
-		--disable-static
-		--disable-driver-bsb
-		--disable-driver-mrf
-		--disable-pdf-plugin
-		--enable-shared
-		--enable-driver-grib
-		--with-bash-completion="$(get_bashcompdir)"
-		--with-cpp14
-		--with-crypto
-		--with-cryptopp=no
-		--with-expat
-		--with-geotiff
-		--with-gnm
-		--with-hide-internal-symbols
-		--with-libjson-c="${EPREFIX}"/usr
-		--with-libtiff
-		--with-libtool
-		--with-libz="${EPREFIX}"/usr
-		--without-charls
-		--without-dods-root
-		--without-ecw
-		--without-fgdb
-		--without-fme
-		--without-gta
-		--without-grass
-		--without-hdf4
-		--without-idb
-		--without-ingres
-		--without-jasper
-		--without-jp2lura
-		--without-jp2mrsid
-		--without-kakadu
-		--without-kea
-		--without-libkml
-		--without-mongocxx
-		--without-mrsid
-		--without-mrsid_lidar
-		--without-msg
-		--without-rasdaman
-		--without-rasterlite2
-		--without-pcraster
-		--without-pdfium
-		--without-perl
-		--without-podofo
-		--without-python
-		--without-qhull
-		--without-sfcgal
-		--without-sosi
-		--without-teigha
-		$(use_enable debug)
-		$(use_with armadillo)
-		$(use_with aux-xml pam)
-		$(use_with curl)
-		$(use_with cpu_flags_x86_avx avx)
-		$(use_with cpu_flags_x86_sse sse)
-		$(use_with cpu_flags_x86_ssse3 ssse3)
-		$(use_with fits cfitsio)
-		$(use_with geos)
-		$(use_with gif)
-		$(use_with gml xerces)
-		$(use_with heif)
-		$(use_with hdf5)
-		$(use_with jpeg pcidsk) # pcidsk is internal, because there is no such library released developer by gdal
-		$(use_with jpeg)
-		$(use_with jpeg2k openjpeg)
-		$(use_with lzma liblzma)
-		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config)
-		$(use_with netcdf)
-		$(use_with oracle oci)
-		$(use_with odbc)
-		$(use_with ogdi ogdi "${EPREFIX}"/usr)
-		$(use_with opencl)
-		$(use_with pdf poppler)
-		$(use_with png)
-		$(use_with postgres pg)
-		$(use_with spatialite)
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
-		$(use_with threads)
-		$(use_with webp)
-		$(use_with xls freexl)
-		$(use_with zstd)
-	)
-
-	tc-export AR RANLIB
-
-	if use java; then
-		myconf+=(
-			--with-java=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-lib=dlopen
-			$(use_with mdb)
-		)
-	else
-		myconf+=( --without-java --without-mdb )
-	fi
-
-	if use sqlite; then
-		append-libs -lsqlite3
-	fi
-
-	# bug #632660
-	if use ogdi; then
-		append-cflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
-		append-cxxflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	# mysql-config puts this in (and boy is it a PITA to get it out)
-	if use mysql; then
-		sed -e "s: -rdynamic : :" \
-			-i GDALmake.opt || die "sed LIBS failed"
-	fi
-}
-
-src_compile() {
-	if use perl; then
-		rm "${S}"/swig/perl/*_wrap.cpp || die
-		emake -C "${S}"/swig/perl generate
-	fi
-
-	# gdal-config needed before generating Python bindings
-	default
-
-	if use java; then
-		pushd "${S}"/swig/java > /dev/null || die
-		emake
-		popd > /dev/null || die
-	fi
-
-	if use perl; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null || die
-	fi
-
-	if use python; then
-		rm -f "${S}"/swig/python/*_wrap.cpp || die
-		emake -C "${S}"/swig/python generate
-		pushd "${S}"/swig/python > /dev/null || die
-		distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-
-	use doc && emake docs
-}
-
-src_install() {
-	local DOCS=( NEWS )
-	use doc && local HTML_DOCS=( html/. )
-
-	default
-
-	# Respect libdir in pkgconfig file
-	sed -i -e "s:\${exec_prefix}/lib:\${exec_prefix}/$(get_libdir):" "${ED}"/usr/$(get_libdir)/pkgconfig/gdal.pc || die
-
-	use java && java-pkg_dojar "${S}"/swig/java/gdal.jar
-
-	if use perl; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		myinst=( DESTDIR="${D}" )
-		perl-module_src_install
-		popd > /dev/null || die
-		perl_delete_localpod
-	fi
-
-	if use python; then
-		# Don't clash with gdal's docs
-		unset DOCS HTML_DOCS
-
-		pushd "${S}"/swig/python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-
-		newdoc swig/python/README.rst README-python.rst
-	fi
-
-	doman "${S}"/man/man*/*
-	find "${ED}" -name '*.la' -type f -delete || die
-}
-
-pkg_postinst() {
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-}
diff --git a/sci-libs/gdal/gdal-3.4.1.ebuild b/sci-libs/gdal/gdal-3.4.1.ebuild
index d78b7ddda904..904b9e2d0280 100644
--- a/sci-libs/gdal/gdal-3.4.1.ebuild
+++ b/sci-libs/gdal/gdal-3.4.1.ebuild
@@ -12,9 +12,8 @@ DESCRIPTION="Translator library for raster geospatial data formats (includes OGR
 HOMEPAGE="https://gdal.org/"
 SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
-# subslot is libgdal.so.<SONAME>
-SLOT="0/30"
 LICENSE="BSD Info-ZIP MIT"
+SLOT="0/30" # subslot is libgdal.so.<SONAME>
 KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="armadillo +aux-xml curl cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_ssse3 debug doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
 
@@ -92,6 +91,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
 	"${FILESDIR}/${PN}-3.3.0-libdir.patch"
 	"${FILESDIR}/${P}-poppler-22.01.0-c++17.patch"
+	"${FILESDIR}/${P}-poppler-22.03.0.patch" # bug 834536
 )
 
 src_prepare() {
diff --git a/sci-libs/gdal/gdal-3.4.0.ebuild b/sci-libs/gdal/gdal-3.4.2.ebuild
index 55cb5824be6f..7ceb3100de0e 100644
--- a/sci-libs/gdal/gdal-3.4.0.ebuild
+++ b/sci-libs/gdal/gdal-3.4.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 GENTOO_DEPEND_ON_PERL="no"
 PYTHON_COMPAT=( python3_{8,9,10} )
@@ -12,9 +12,8 @@ DESCRIPTION="Translator library for raster geospatial data formats (includes OGR
 HOMEPAGE="https://gdal.org/"
 SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
-# subslot is libgdal.so.<SONAME>
-SLOT="0/30"
 LICENSE="BSD Info-ZIP MIT"
+SLOT="0/30" # subslot is libgdal.so.<SONAME>
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="armadillo +aux-xml curl cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_ssse3 debug doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
 
@@ -22,6 +21,7 @@ REQUIRED_USE="
 	mdb? ( java )
 	python? ( ${PYTHON_REQUIRED_USE} )
 	spatialite? ( sqlite )
+	java? ( threads )
 "
 
 BDEPEND="
@@ -292,7 +292,11 @@ src_install() {
 	# Respect libdir in pkgconfig file
 	sed -i -e "s:\${exec_prefix}/lib:\${exec_prefix}/$(get_libdir):" "${ED}"/usr/$(get_libdir)/pkgconfig/gdal.pc || die
 
-	use java && java-pkg_dojar "${S}"/swig/java/gdal.jar
+	if use java; then
+		# bug #752399
+		java-pkg_dojar "${S}"/swig/java/gdal.jar
+		dolib.so "${S}"/swig/java/.libs/libgdalalljni.so.*
+	fi
 
 	if use perl; then
 		pushd "${S}"/swig/perl > /dev/null || die