From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1388798-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 62B7A15808D
	for <garchives@archives.gentoo.org>; Sat, 23 Apr 2022 01:55:53 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 659E7E0841;
	Sat, 23 Apr 2022 01:55:52 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 3700FE0841
	for <gentoo-commits@lists.gentoo.org>; Sat, 23 Apr 2022 01:55:51 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 61FD7341799
	for <gentoo-commits@lists.gentoo.org>; Sat, 23 Apr 2022 01:55:48 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id EC21435A
	for <gentoo-commits@lists.gentoo.org>; Sat, 23 Apr 2022 01:55:46 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1650678936.d29631d70863c157bc34c1474cd63e8da5541b43.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-libs/gdal/gdal-3.4.2-r1.ebuild sci-libs/gdal/gdal-3.4.2-r2.ebuild
X-VCS-Directories: sci-libs/gdal/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: d29631d70863c157bc34c1474cd63e8da5541b43
X-VCS-Branch: master
Date: Sat, 23 Apr 2022 01:55:46 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: f1ff8b19-9300-4a53-ac4b-e106ece94c2d
X-Archives-Hash: 3dd733bc62bf19ef212eee173afd2e7f

commit:     d29631d70863c157bc34c1474cd63e8da5541b43
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 23 01:55:06 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 01:55:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d29631d7

sci-libs/gdal: fix Java library installation

Closes: https://bugs.gentoo.org/752399
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/gdal/{gdal-3.4.2-r1.ebuild => gdal-3.4.2-r2.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/gdal/gdal-3.4.2-r1.ebuild b/sci-libs/gdal/gdal-3.4.2-r2.ebuild
similarity index 98%
rename from sci-libs/gdal/gdal-3.4.2-r1.ebuild
rename to sci-libs/gdal/gdal-3.4.2-r2.ebuild
index 5a96f300c4d6..1f67ad0f0c80 100644
--- a/sci-libs/gdal/gdal-3.4.2-r1.ebuild
+++ b/sci-libs/gdal/gdal-3.4.2-r2.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
@@ -297,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