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 28C86158003 for ; Thu, 15 Sep 2022 12:59:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40B63E08CA; Thu, 15 Sep 2022 12:59:41 +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 238D3E08CA for ; Thu, 15 Sep 2022 12:59:41 +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 112F4340FB9 for ; Thu, 15 Sep 2022 12:59:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 30C0E576 for ; Thu, 15 Sep 2022 12:59:38 +0000 (UTC) From: "Mike Pagano" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Pagano" Message-ID: <1663246743.e014d8ac4fdcd61536e1633a0368c631634ca698.mpagano@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/idea-community/files/, dev-util/idea-community/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/idea-community/files/idea-community-jdk.patch dev-util/idea-community/idea-community-2022.2.2.ebuild X-VCS-Directories: dev-util/idea-community/files/ dev-util/idea-community/ X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano X-VCS-Revision: e014d8ac4fdcd61536e1633a0368c631634ca698 X-VCS-Branch: master Date: Thu, 15 Sep 2022 12:59:38 +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: 2ebb761d-5993-4d0c-81db-79caf8d8a807 X-Archives-Hash: 86d150d034548e8e0ba75f0e43449ae5 commit: e014d8ac4fdcd61536e1633a0368c631634ca698 Author: Mike Pagano gentoo org> AuthorDate: Thu Sep 15 12:59:03 2022 +0000 Commit: Mike Pagano gentoo org> CommitDate: Thu Sep 15 12:59:03 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e014d8ac dev-util/idea-community: Remove bundled java, fix JAVA vars Closes: https://bugs.gentoo.org/870184 Signed-off-by: Mike Pagano gentoo.org> dev-util/idea-community/files/idea-community-jdk.patch | 2 +- dev-util/idea-community/idea-community-2022.2.2.ebuild | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dev-util/idea-community/files/idea-community-jdk.patch b/dev-util/idea-community/files/idea-community-jdk.patch index 5556729fdd49..d99f8125e51c 100644 --- a/dev-util/idea-community/files/idea-community-jdk.patch +++ b/dev-util/idea-community/files/idea-community-jdk.patch @@ -5,7 +5,7 @@ if [ -n "$IDEA_JDK" ] && [ -x "$IDEA_JDK/bin/java" ]; then JRE="$IDEA_JDK" +else -+ JDK="/opt/openjdk-bin-11" && [[ -d "/opt/openjdk-11" ]] && JDK="/usr/lib64/openjdk-bin-11" ++ JRE="/opt/openjdk-bin-17" && [[ -d "/opt/openjdk-17" ]] && JRE="/usr/lib64/openjdk-bin-17" fi BITS="" diff --git a/dev-util/idea-community/idea-community-2022.2.2.ebuild b/dev-util/idea-community/idea-community-2022.2.2.ebuild index 8a5c03ffc6e3..7003ee45888c 100644 --- a/dev-util/idea-community/idea-community-2022.2.2.ebuild +++ b/dev-util/idea-community/idea-community-2022.2.2.ebuild @@ -126,8 +126,9 @@ src_install() { echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die # remove bundled harfbuzz - rm -f "${D}"/lib/libharfbuzz.so || die + rm -f "${D}"/lib/libharfbuzz.so || die "Unable to remove bundled harfbuzz" # remove bundled java - rm -rf "$dst{jbr,jre{64}}" + rm -r ${dst}/jbr || die "Unable to remove bundled java" + }