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 9E3B015800A for ; Wed, 14 Jun 2023 04:17:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C46E7E0887; Wed, 14 Jun 2023 04:17: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 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AA31DE0887 for ; Wed, 14 Jun 2023 04:17: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 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 856BB340A7F for ; Wed, 14 Jun 2023 04:17:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BBC16A8B for ; Wed, 14 Jun 2023 04:17: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: <1686716189.5855b9cfa8abd0d3b45a06e226070b98259af207.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/i2p/i2p-2.1.0-r2.ebuild X-VCS-Directories: net-vpn/i2p/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5855b9cfa8abd0d3b45a06e226070b98259af207 X-VCS-Branch: master Date: Wed, 14 Jun 2023 04:17: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: 3ba52408-16c7-4587-9924-3021cfe15ddd X-Archives-Hash: e0a3f72d67126eccbb4c9acfb3ce5145 commit: 5855b9cfa8abd0d3b45a06e226070b98259af207 Author: Valérian Rousset users noreply github com> AuthorDate: Sat Jun 3 16:38:43 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Jun 14 04:16:29 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5855b9cf net-vpn/i2p: widen pkg_pretend to all JDK for 2.1.0 Closes: https://bugs.gentoo.org/847304 Signed-off-by: Valérian Rousset users.noreply.github.com> Signed-off-by: Sam James gentoo.org> net-vpn/i2p/i2p-2.1.0-r2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-vpn/i2p/i2p-2.1.0-r2.ebuild b/net-vpn/i2p/i2p-2.1.0-r2.ebuild index 2883493999e5..b83e479db886 100644 --- a/net-vpn/i2p/i2p-2.1.0-r2.ebuild +++ b/net-vpn/i2p/i2p-2.1.0-r2.ebuild @@ -73,8 +73,8 @@ DOCS=( README.md history.txt ) pkg_pretend() { # see https://bugs.gentoo.org/831290 - if [[ "`java-config --show-active-vm`" = openjdk*-8 ]] && - [[ "`java-config --query MERGE_VM --package=ant-core`" != openjdk*-8 ]] + if [[ "`java-config --show-active-vm`" = *-8 ]] && + [[ "`java-config --query MERGE_VM --package=ant-core`" != *-8 ]] then eerror "dev-java/ant-core was emerged with a newer version of the JDK." eerror "It will fail to build with virtual/jdk:1.8 due to #831290."