gentoo resync : 12.05.2022

3 files changed, 11 insertions, 9 deletions

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index b7f48396a58d..0aa1292c7452 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -5,7 +5,8 @@ AUX gdal-3.4.1-poppler-22.01.0-c++17.patch 759 BLAKE2B bfb9cfc97fb56a18eda0f0d20
 AUX gdal-3.4.1-poppler-22.03.0.patch 2056 BLAKE2B 119a71daf7d53ee405041b8e7c2bd33e1672aac1883ebdd967a0252cbdc809dea2b993ad630a6c206cb68afe081354c2a56b94b6f9e76a868858aa1de34964cb SHA512 07511f9490a5385271210b140c07096232611a0604618e30cd97e8e737b4d81deaf536438296ad0307cf0f59a5fc7448ed36e3fda6e6faad6a49daac05fb2c54
 DIST gdal-3.4.1.tar.xz 13257288 BLAKE2B 3b01e8345579c9d46fb3d4ff240f5b97cf13eb4b580ecc93044e0ca3d99e2d19fa2a2a52a2342b3158d67525a1de18a9ba77a2033ad891f73fee682b2c10cade SHA512 a66362996f255cb75116693b4ee398337ec8b9699b5cd7fed90105f72832faa20750b77ebbc3e8d59ab72a23b35c4e4e78513cc803bd93e1b7846711ccfb5bff
 DIST gdal-3.4.2.tar.xz 13273280 BLAKE2B b40e2978d0841386b52de1ad08cec862c52aab8c015aecd58983bb8c5bbf8d86ca8e4ef5d2bbae39f421b3c78eecd0df1b3cd83d6bf25b1469563b4f9f37d8ca SHA512 7b7e2800b2c23ffe6b7739fbf77748e3be2db9e34b061753da5e175f6ad6ed7f9f91856d3838f071a17a6afab96c258d37a15502e254d2008310d3061031af73
+DIST gdal-3.4.3.tar.xz 13275504 BLAKE2B 5b1cc2be9c2af7a326dc532d547b1e7d2f9c4af32d8f16998f09332a88a53305243313711cc24fe5d028b8edc131ebccda6daf08b5c67d9a2c55fd4e04fe9cee SHA512 2b97e44b9bd84eb43b4c4894b7b6e748522b2f5e8b6cbecc8247fe5ea862795dd44ba2b52934a83688a949805cee4eef9f1aa66360fb831fea3eae956ab0bef3
 EBUILD gdal-3.4.1.ebuild 8131 BLAKE2B 49f36d5018cf65bfc92369d4d7e7f8eecfa823fb6ec88069fa7ae605d5c0a57643ddcc690fc5cfd830d45023a75baf6007da7f510174cfe8a4b67ef661a87b37 SHA512 f462eb9247d7f0c9b281e95d7ae69808811fb619973ea785de5061c84b5aaf2b42222b61425e49ac6b614573ec49da72ba35426694731445313f814888240aa5
-EBUILD gdal-3.4.2-r1.ebuild 8166 BLAKE2B 5d8db98d2976f5a5010dba2ca66ceb3496205c4931fe703eec668dae02c80ac40048e7e88c33a47697810e152fbae655429acc1d58adbca7c1d4dc9b506f4ffe SHA512 5b983e33bea3f05b4c84055872a6267202f279eedcae5873cfa28f901da6f1e860fc71f0984a7e01eb0e2f5ef0656b9339a0b155dddbb6798e72787209295300
-EBUILD gdal-3.4.2.ebuild 8133 BLAKE2B d9f24a278b01eaf11c1b58bc8aa9c01335c4e3ec3ac4fa2317d7745dd98d5eb01965686262045b82ec0d770d63ef2d455b6c5459a1b24c491c039889df40509e SHA512 0042eed7df18d29c4209eeeb9cd58afaeb6b5b2feac5f4a1cab1420f6c757357e2f54809fb27d594dcc765f2c3faed571b19233ec847538afd8b6b20e036783a
+EBUILD gdal-3.4.2-r2.ebuild 8171 BLAKE2B dcb8f1836bd8f40c9c6c78a178e7cbe3bd38934345d2d0dc6a7f4e6057ae4e06b9d7a50f8d3c9e5a74013e2ae6068ea9bbc7c38bfa297731136a9662f946f561 SHA512 d47d70febcbaa9b9e3df4a3eb9d1ecf43f006629e1afec4ef1b399fd9a8fb3664d9a99b7af291ac941137b373e86e4c59cfe6eac5620508f251af658bddf242a
+EBUILD gdal-3.4.3-r1.ebuild 8125 BLAKE2B e6c3df82d9d1ccd60d57405d17ccb93ffa31353c1738e6adc67cac1faafe01c3da4650d2f4f0ad413c08c7d1bc8cf20e649978a9ac8d500873aa3c0b171d996c SHA512 0e1f00f7607d9b3b7cc6d64ac7e7c7619a6b4eb9c86a5ce102c087703ba36a8c15016fbcc1f196073126b22d2aa6f201a7ece1cd509244d95060946c34b43c1f
 MISC metadata.xml 1623 BLAKE2B af7c9d5cc3c16ffef6fa9ef5dd5cf54ffcd34229d1e82b90e310f9eeccf5a5b4fa2119112b5427b520ce6e964e368aef7313edb3837940bed4b960ced7714fc3 SHA512 ed206877adac0b8b190e0edfb04f48c435d698fd523a14d54a14638b908c9e9452b1a2d394046093f5aa86cb48c611790f56ae511807855eb80bfcd4cc1d425c
diff --git a/sci-libs/gdal/gdal-3.4.2.ebuild b/sci-libs/gdal/gdal-3.4.2-r2.ebuild
index 97c8af9a4910..be552b0417c5 100644
--- a/sci-libs/gdal/gdal-3.4.2.ebuild
+++ b/sci-libs/gdal/gdal-3.4.2-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.xz"
 
 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"
+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="
@@ -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
@@ -56,7 +56,7 @@ DEPEND="
 	gml? ( >=dev-libs/xerces-c-3.1 )
 	heif? ( media-libs/libheif:= )
 	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
-	jpeg? ( virtual/jpeg:0= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	jpeg2k? ( media-libs/openjpeg:2= )
 	lzma? ( || (
 		app-arch/xz-utils
@@ -149,6 +149,7 @@ src_configure() {
 		--with-libtiff
 		--with-libtool
 		--with-libz="${ESYSROOT}"/usr
+		--with-pcre2
 		--without-blosc
 		--without-charls
 		--without-dods-root
@@ -177,6 +178,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
@@ -295,7 +297,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
diff --git a/sci-libs/gdal/gdal-3.4.2-r1.ebuild b/sci-libs/gdal/gdal-3.4.3-r1.ebuild
index 5a96f300c4d6..0542e701d8c1 100644
--- a/sci-libs/gdal/gdal-3.4.2-r1.ebuild
+++ b/sci-libs/gdal/gdal-3.4.3-r1.ebuild
@@ -56,7 +56,7 @@ DEPEND="
 	gml? ( >=dev-libs/xerces-c-3.1 )
 	heif? ( media-libs/libheif:= )
 	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
-	jpeg? ( virtual/jpeg:0= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	jpeg2k? ( media-libs/openjpeg:2= )
 	lzma? ( || (
 		app-arch/xz-utils
@@ -89,7 +89,6 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.2.3-soname.patch"
-	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
 	"${FILESDIR}/${PN}-3.3.0-libdir.patch"
 )
 
@@ -297,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