From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 finch.gentoo.org (Postfix) with ESMTPS id F3727158088 for ; Thu, 30 Oct 2025 13:38:16 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id CD3973415E7 for ; Thu, 30 Oct 2025 13:38:16 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id CC181110577; Thu, 30 Oct 2025 13:38:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id C2A6B110576 for ; Thu, 30 Oct 2025 13:38:06 +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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 74C70341090 for ; Thu, 30 Oct 2025 13:38:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B70C43BA4 for ; Thu, 30 Oct 2025 13:38:03 +0000 (UTC) From: "Sam James" 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" Message-ID: <1761831422.b4ca3577e4ded65d3cc34c0a3bb56948a02efb09.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.11.4-r1.ebuild sci-libs/gdal/gdal-3.9.3-r1.ebuild X-VCS-Directories: sci-libs/gdal/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b4ca3577e4ded65d3cc34c0a3bb56948a02efb09 X-VCS-Branch: master Date: Thu, 30 Oct 2025 13:38:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 588f15d8-0f72-4445-a737-20cbb96cba58 X-Archives-Hash: 24d4e59da54b84cbaa8b7d5aa7b24564 commit: b4ca3577e4ded65d3cc34c0a3bb56948a02efb09 Author: Alfred Wingate protonmail com> AuthorDate: Thu Oct 30 12:21:39 2025 +0000 Commit: Sam James gentoo org> CommitDate: Thu Oct 30 13:37:02 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4ca3577 sci-libs/gdal: missing EPREFIX handling in java-pkg_doso Closes: https://bugs.gentoo.org/962216 Signed-off-by: Alfred Wingate protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/44385 Signed-off-by: Sam James gentoo.org> sci-libs/gdal/gdal-3.11.4-r1.ebuild | 4 ++-- sci-libs/gdal/gdal-3.9.3-r1.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sci-libs/gdal/gdal-3.11.4-r1.ebuild b/sci-libs/gdal/gdal-3.11.4-r1.ebuild index b60c61190885..8760a1ca590f 100644 --- a/sci-libs/gdal/gdal-3.11.4-r1.ebuild +++ b/sci-libs/gdal/gdal-3.11.4-r1.ebuild @@ -482,9 +482,9 @@ src_install() { if use java; then # Move the native library into the proper place for Gentoo. The - # library in ${D} has already had its RPATH fixed, so we use it + # library in ${ED} has already had its RPATH fixed, so we use it # rather than ${BUILD_DIR}/swig/java/libgdalalljni.so. - java-pkg_doso "${D}/usr/$(get_libdir)/jni/libgdalalljni.so" + java-pkg_doso "${ED}/usr/$(get_libdir)/jni/libgdalalljni.so" rm -rf "${ED}/usr/$(get_libdir)/jni" || die fi diff --git a/sci-libs/gdal/gdal-3.9.3-r1.ebuild b/sci-libs/gdal/gdal-3.9.3-r1.ebuild index cf586c99eb8a..d169c8993189 100644 --- a/sci-libs/gdal/gdal-3.9.3-r1.ebuild +++ b/sci-libs/gdal/gdal-3.9.3-r1.ebuild @@ -280,9 +280,9 @@ src_install() { if use java; then # Move the native library into the proper place for Gentoo. The - # library in ${D} has already had its RPATH fixed, so we use it + # library in ${ED} has already had its RPATH fixed, so we use it # rather than ${BUILD_DIR}/swig/java/libgdalalljni.so. - java-pkg_doso "${D}/usr/$(get_libdir)/jni/libgdalalljni.so" + java-pkg_doso "${ED}/usr/$(get_libdir)/jni/libgdalalljni.so" rm -rf "${ED}/usr/$(get_libdir)/jni" || die fi