[gentoo-commits] repo/gentoo:master commit in: dev-util/idea-community/files/, dev-util/idea-community/

[gentoo-commits] repo/gentoo:master commit in: dev-util/idea-community/files/, dev-util/idea-community/

[Mike Pagano]

commit:     e014d8ac4fdcd61536e1633a0368c631634ca698
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 12:59:03 2022 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> 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 <mpagano <AT> 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"
+
 }

[gentoo-commits] repo/gentoo:master commit in: dev-util/idea-community/files/, dev-util/idea-community/

[Mike Pagano]

commit:     ffb2ede06368ce99a558de1717b3e9bbededf681
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 23:40:58 2023 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 23:40:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffb2ede0

dev-util/idea-community: Remove patch causing breakage setting JRE

Closes: https://bugs.gentoo.org/892253

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 dev-util/idea-community/files/idea-community-jdk.patch | 11 -----------
 dev-util/idea-community/idea-community-2022.3.2.ebuild |  4 ----
 2 files changed, 15 deletions(-)

diff --git a/dev-util/idea-community/files/idea-community-jdk.patch b/dev-util/idea-community/files/idea-community-jdk.patch
deleted file mode 100644
index d99f8125e51c..000000000000
--- a/dev-util/idea-community/files/idea-community-jdk.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/bin/idea.sh	2021-04-29 14:52:57.173162184 -0400
-+++ b/bin/idea.sh	2021-04-29 14:54:40.733748978 -0400
-@@ -52,6 +52,8 @@ PATHS_SELECTOR="IdeaIC2021.1"
- # shellcheck disable=SC2154
- if [ -n "$IDEA_JDK" ] && [ -x "$IDEA_JDK/bin/java" ]; then
-   JRE="$IDEA_JDK"
-+else
-+  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.3.2.ebuild b/dev-util/idea-community/idea-community-2022.3.2.ebuild
index 0e2764406d3e..0a1132b3b38a 100644
--- a/dev-util/idea-community/idea-community-2022.3.2.ebuild
+++ b/dev-util/idea-community/idea-community-2022.3.2.ebuild
@@ -35,10 +35,6 @@ S="${WORKDIR}/idea-IC-${PV}"
 
 QA_PREBUILT="opt/${PN}/*"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-jdk.patch"
-)
-
 src_unpack() {
 
 	default_src_unpack