diff options
| author |   Mike Pagano <mpagano@gentoo.org> | 2020-12-30 18:34:07 -0500 |
|---|---|---|
| committer | Mike Pagano <mpagano@gentoo.org> | 2020-12-30 18:34:07 -0500 |
| commit | 767367e467fa4684f91bad807242b63bd96d2091 (patch) | |
| tree | 187825682a7804f0cbda19c79b05f412d6b6e1de /dev-util | |
| parent | net-misc/electron-cash: Bump to version 4.2.3 (diff) | |
| download | gentoo-767367e467fa4684f91bad807242b63bd96d2091.tar.gz gentoo-767367e467fa4684f91bad807242b63bd96d2091.tar.bz2 gentoo-767367e467fa4684f91bad807242b63bd96d2091.zip | |
dev-util/idea-community: Use jdk-11 on start, jdk-8 not supported
Thanks to Stefan de Konink for reporting
Closes: https://bugs.gentoo.org/762334
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Mike Pagano <mpagano@gentoo.org>
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/idea-community/files/idea-community-jdk.patch | 11 | ||||
| -rw-r--r-- | dev-util/idea-community/idea-community-2020.3.0.203.5981.155-r1.ebuild | 13 |
2 files changed, 23 insertions, 1 deletions
diff --git a/dev-util/idea-community/files/idea-community-jdk.patch b/dev-util/idea-community/files/idea-community-jdk.patch new file mode 100644 index 000000000000..b89e6773fd01 --- /dev/null +++ b/dev-util/idea-community/files/idea-community-jdk.patch @@ -0,0 +1,11 @@ +--- a/bin/idea.sh 2020-12-30 15:51:43.743936660 -0500 ++++ b/bin/idea.sh 2020-12-30 17:58:16.759719538 -0500 +@@ -66,6 +66,8 @@ PATHS_SELECTOR="IdeaIC2020.3" + # shellcheck disable=SC2154 + if [ -n "$IDEA_JDK" ] && [ -x "$IDEA_JDK/bin/java" ]; then + JDK="$IDEA_JDK" ++else ++ JDK="/opt/openjdk-bin-11" && [[ -d "/opt/openjdk-11" ]] && JDK="/usr/lib64/openjdk-bin-11" + fi + + if [ -z "$JDK" ] && [ -s "${XDG_CONFIG_HOME:-$HOME/.config}/${PRODUCT_VENDOR}/${PATHS_SELECTOR}/idea.jdk" ]; then diff --git a/dev-util/idea-community/idea-community-2020.3.0.203.5981.155-r1.ebuild b/dev-util/idea-community/idea-community-2020.3.0.203.5981.155-r1.ebuild index d7ca1fb1c262..7c07043f326c 100644 --- a/dev-util/idea-community/idea-community-2020.3.0.203.5981.155-r1.ebuild +++ b/dev-util/idea-community/idea-community-2020.3.0.203.5981.155-r1.ebuild @@ -44,19 +44,30 @@ DEPEND="!dev-util/${PN}:14 RDEPEND="${DEPEND} dev-java/jansi-native dev-libs/libdbusmenu - =dev-util/lldb-10*" + =dev-util/lldb-10* + || ( + dev-java/openjdk:11 + dev-java/openjdk-bin:11 + )" BDEPEND="dev-util/patchelf" RESTRICT="splitdebug" S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)" QA_PREBUILT="opt/${PN}-${MY_PV}/*" +PATCHES=( + "${FILESDIR}/${PN}-jdk.patch" +) + src_unpack() { default_src_unpack mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz } src_prepare() { + + default_src_prepare + if use amd64; then JRE_DIR=jre64 else |