diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-01 21:06:00 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-01 21:06:00 +0000 |
| commit | 129160ec854dca4c3fedb5bcfbcb56930371da0f (patch) | |
| tree | 53bf797418ac5e9b99c41ca0382c87b82421e5de /dev-util/idea-community | |
| parent | 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff) | |
gentoo new year resync : 01.01.2021
Diffstat (limited to 'dev-util/idea-community')
| -rw-r--r-- | dev-util/idea-community/Manifest | 3 | ||||
| -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 | 14 |
3 files changed, 25 insertions, 3 deletions
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest index fb1339b38e3b..1dfafdba387d 100644 --- a/dev-util/idea-community/Manifest +++ b/dev-util/idea-community/Manifest @@ -1,4 +1,5 @@ +AUX idea-community-jdk.patch 485 BLAKE2B 3ccbddf308b1cb1af020086e7568e05b4a60b28d77e995194e622aa229340b82069bcdce0e5f05152ce626cdd574c3d891f494fdead59354223e96b0347036a6 SHA512 156f05a7f78c48e9ef9d0ed991d1fb390c5d40f7b32f41c02f51805fa2a6f523a255576fa4033ec98192f8626edd31d20259b0a37660506331ea8060826ffd4b DIST ideaIC-3.0.203.5981.155.tar.gz 582023182 BLAKE2B 671fbba0c2173e3780a99d0d3b106af75c4ef6df4198ced3653c1b74a7bbb055a29b1fc31eb89823bfd56e6737c7788f78a90fe7ef46e52ab410c0dff18868e9 SHA512 35d569c5e13ec620d0a476cc52c005d29ea3c7c3c1ab0614a1a73255309635c84ee00820c50584ca19af634165138c77d8d712cfe0d367b9525956ad33aafe77 DIST jbr-11_0_8-linux-x64-b1098.1.tar.gz 191689225 BLAKE2B 0da0f0e834709c89820f2e7e1c447dc33ea1c59c7dfb573aa47bc205f7920ccf485454f79931d42d4e6eb4de1017589bb908808d6a80cc586659757abc9958d3 SHA512 a455d8bd3332622592186cd7ae3995a9148a47717a81c274497f5408f1e89ef637c7478321b4ccd5dbe97c2e246a16ac8956c5ce475f8a4156232647f0ea7737 -EBUILD idea-community-2020.3.0.203.5981.155-r1.ebuild 3941 BLAKE2B 1c5eff3e15c0fa06e6562c8d7f8bb4b1f97e8c747621795f575c48eb5d2e8488b887b489df1dc9a8ec833126d9e90dca993dd6e23a545cdff1c2208386d50158 SHA512 64f71f6de6cd859a518ee066790221528988f45246bedc7b4d450fc4099961e3b67a0642b1fad8636ace5d411edfad88730d3696d33fe434bd4656a53ea83438 +EBUILD idea-community-2020.3.0.203.5981.155-r1.ebuild 4044 BLAKE2B eb38d68fe69748d403ae5bc113534420722931fcc6f39d2485f788909df8288906e1c1e12e258816e963f5853e08d51f37a6aac09aef76c01e161020e3e1c070 SHA512 8a7ea844919b0fb7bced8a576a752a8ea9114d6f941461a3bd1283da14e08c032157d47484ba914083d1b0dc945205425154207686498832fedd6247a102139a MISC metadata.xml 561 BLAKE2B 511df10fb880b655143aba1063715ffdaaadd232c97f3f957105c1526a7a25ab1019fb13d0d36212799050dda94c1040a82c5219f81e41c4202ba9ae417723d3 SHA512 f1c87b067dc5252c5a9a92070428971472c3bd8102ebaea048aff7eb2783ec4fe485a5a91be4463c808025ea5df150c0c28c34cf5b3094c1aa52f0dd3b9f1db6 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 358d9caaec62..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 @@ -42,22 +42,32 @@ DEPEND="!dev-util/${PN}:14 dev-java/openjdk-bin:11 )" RDEPEND="${DEPEND} - >=virtual/jdk-1.7:* 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 |