diff options
| author |   Mike Pagano <mpagano@gentoo.org> | 2022-09-15 08:59:03 -0400 |
|---|---|---|
| committer | Mike Pagano <mpagano@gentoo.org> | 2022-09-15 08:59:03 -0400 |
| commit | e014d8ac4fdcd61536e1633a0368c631634ca698 (patch) | |
| tree | 4bbfb7c2d33c274edfb23c34ccf8895128e98dd2 /dev-util/idea-community | |
| parent | sys-process/btop: Hard-depend on sys-devel/gcc (diff) | |
| download | gentoo-e014d8ac4fdcd61536e1633a0368c631634ca698.tar.gz gentoo-e014d8ac4fdcd61536e1633a0368c631634ca698.tar.bz2 gentoo-e014d8ac4fdcd61536e1633a0368c631634ca698.zip | |
dev-util/idea-community: Remove bundled java, fix JAVA vars
Closes: https://bugs.gentoo.org/870184
Signed-off-by: Mike Pagano <mpagano@gentoo.org>
Diffstat (limited to 'dev-util/idea-community')
| -rw-r--r-- | dev-util/idea-community/files/idea-community-jdk.patch | 2 | ||||
| -rw-r--r-- | 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" + } |