From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1571349-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 2AADB15823F
	for <garchives@archives.gentoo.org>; Sat, 18 Nov 2023 14:54:21 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 5FAF32BC015;
	Sat, 18 Nov 2023 14:54:20 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.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 418F32BC015
	for <gentoo-commits@lists.gentoo.org>; Sat, 18 Nov 2023 14:54:20 +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) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 7CE0C335D0E
	for <gentoo-commits@lists.gentoo.org>; Sat, 18 Nov 2023 14:54:19 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id B0FE71356
	for <gentoo-commits@lists.gentoo.org>; Sat, 18 Nov 2023 14:54:17 +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: <1700319063.eaba53e271124f87b161a0ad9ee2092ca58b2539.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.8.0.ebuild
X-VCS-Directories: sci-libs/gdal/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: eaba53e271124f87b161a0ad9ee2092ca58b2539
X-VCS-Branch: master
Date: Sat, 18 Nov 2023 14:54:17 +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: d968e9c7-2b43-4d18-a6b3-904fc125b60d
X-Archives-Hash: d6756ce3bec792ade551ffe57596126d

commit:     eaba53e271124f87b161a0ad9ee2092ca58b2539
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 18 14:51:03 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 18 14:51:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaba53e2

sci-libs/gdal: fix java-pkg_doso path

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

 sci-libs/gdal/gdal-3.8.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/gdal/gdal-3.8.0.ebuild b/sci-libs/gdal/gdal-3.8.0.ebuild
index 2b6b0407a6ed..8c8c20bcd12e 100644
--- a/sci-libs/gdal/gdal-3.8.0.ebuild
+++ b/sci-libs/gdal/gdal-3.8.0.ebuild
@@ -267,8 +267,8 @@ src_install() {
 		# Move the native library into the proper place for Gentoo.  The
 		# library in ${D} has already had its RPATH fixed, so we use it
 		# rather than ${BUILD_DIR}/swig/java/libgdalalljni.so.
-		java-pkg_doso "${D}/usr/share/java/libgdalalljni.so"
-		rm "${D}/usr/share/java/libgdalalljni.so" || die
+		java-pkg_doso "${D}/usr/$(get_libdir)/jni/libgdalalljni.so"
+		rm -rf "${ED}/usr/$(get_libdir)/jni" || die
 	fi
 
 	# TODO: install docs?