From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 94DCE158021 for ; Thu, 10 Nov 2022 18:17:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B12C9E0A10; Thu, 10 Nov 2022 18:17:33 +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 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 854A9E0A10 for ; Thu, 10 Nov 2022 18:17:33 +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 64F3B340E42 for ; Thu, 10 Nov 2022 18:17:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DC49572B for ; Thu, 10 Nov 2022 18:17:30 +0000 (UTC) From: "Anna Vyalkova" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anna Vyalkova" Message-ID: <1668095249.6b6e5f4bb0c7a31aed89adad2e5bb818a13d10e7.cybertailor@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: net-libs/td/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-libs/td/td-1.8.0.ebuild X-VCS-Directories: net-libs/td/ X-VCS-Committer: cybertailor X-VCS-Committer-Name: Anna Vyalkova X-VCS-Revision: 6b6e5f4bb0c7a31aed89adad2e5bb818a13d10e7 X-VCS-Branch: dev Date: Thu, 10 Nov 2022 18:17:30 +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: 0910ab0f-16a4-459e-a424-e42b76f57d1a X-Archives-Hash: 740d1fc563aaba20354c756b8b069e65 commit: 6b6e5f4bb0c7a31aed89adad2e5bb818a13d10e7 Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Thu Nov 10 15:46:08 2022 +0000 Commit: Anna Vyalkova sysrq in> CommitDate: Thu Nov 10 15:47:29 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6b6e5f4b net-libs/td: java fixup Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> net-libs/td/td-1.8.0.ebuild | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net-libs/td/td-1.8.0.ebuild b/net-libs/td/td-1.8.0.ebuild index 3d6ce62e2..898dbeaa8 100644 --- a/net-libs/td/td-1.8.0.ebuild +++ b/net-libs/td/td-1.8.0.ebuild @@ -21,7 +21,7 @@ DEPEND=" dev-libs/openssl:= sys-libs/zlib:= dotnet? ( virtual/dotnet-sdk:* ) - java? ( virtual/jdk:*[-headless-awt] ) + java? ( >=virtual/jdk-11:*[-headless-awt] ) " RDEPEND="${DEPEND}" BDEPEND=" @@ -65,9 +65,8 @@ src_configure() { ) if use java; then - local JAVA_HOME=$(java-config -O) - local JAVA_AWT_LIBRARY=$(echo "${JAVA_HOME}"/jre/lib/*/libjawt.so) - local JAVA_JVM_LIBRARY=$(echo "${JAVA_HOME}"/jre/lib/*/libjava.so) + local JAVA_AWT_LIBRARY="${JAVA_HOME}/lib/libjawt.so" + local JAVA_JVM_LIBRARY="${JAVA_HOME}/lib/libjava.so" mycmakeargs+=( -DTD_ENABLE_JNI=ON