From a978c074e4272bb901fbe4a10de0a7b2af574f17 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 4 May 2021 22:28:33 +0100 Subject: gentoo resync : 04.05.2021 --- dev-util/idea-community/Manifest | 8 +- .../idea-community/files/idea-community-jdk.patch | 10 +- .../idea-community-2021.3.1.203.6682.168-r3.ebuild | 137 -------------------- .../idea-community-2021.3.1.211.6693.111.ebuild | 138 +++++++++++++++++++++ 4 files changed, 147 insertions(+), 146 deletions(-) delete mode 100644 dev-util/idea-community/idea-community-2021.3.1.203.6682.168-r3.ebuild create mode 100644 dev-util/idea-community/idea-community-2021.3.1.211.6693.111.ebuild (limited to 'dev-util/idea-community') diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest index 496c2892e6bf..0566ddd818ca 100644 --- a/dev-util/idea-community/Manifest +++ b/dev-util/idea-community/Manifest @@ -1,5 +1,5 @@ -AUX idea-community-jdk.patch 485 BLAKE2B 3ccbddf308b1cb1af020086e7568e05b4a60b28d77e995194e622aa229340b82069bcdce0e5f05152ce626cdd574c3d891f494fdead59354223e96b0347036a6 SHA512 156f05a7f78c48e9ef9d0ed991d1fb390c5d40f7b32f41c02f51805fa2a6f523a255576fa4033ec98192f8626edd31d20259b0a37660506331ea8060826ffd4b -DIST ideaIC-3.1.203.6682.168.tar.gz 577542631 BLAKE2B d47d017b76fa9106a55805b558bd49d6d45dd216ac28151f03cc2a7f3a751707b62fa49623bb04b426d90cfd1cce4e04b2490bb91ec01dfeccdf4a80f1694f7e SHA512 71849f9440c34359a23af1f4735c3b0ac6378f6ab8ddf5799ad7e26036dc87b4abbc234043bd368a7698daf91f83cf989539054db7e1fb9ea95ebf7d756ac068 -DIST jbr-11_0_8-linux-x64-b1098.1.tar.gz 191689225 BLAKE2B 0da0f0e834709c89820f2e7e1c447dc33ea1c59c7dfb573aa47bc205f7920ccf485454f79931d42d4e6eb4de1017589bb908808d6a80cc586659757abc9958d3 SHA512 a455d8bd3332622592186cd7ae3995a9148a47717a81c274497f5408f1e89ef637c7478321b4ccd5dbe97c2e246a16ac8956c5ce475f8a4156232647f0ea7737 -EBUILD idea-community-2021.3.1.203.6682.168-r3.ebuild 4051 BLAKE2B 128eb44396642a71f35535a26d1b9e183ed077765ec044eaf22095dd56f2c461be99b3c3a6b037680d0ea3c6d6057013ed9a1c4e6d5204c17e6521fb4a27a209 SHA512 216b53ba4007a6f97ba8291dfc9a3455f1ed17fd4f4dcc4c6d811b09debee6aa2fd6e25c96e7f22dd1586ae304f9f5d18426d196911cf5eb0b8ce0e7497fee25 +AUX idea-community-jdk.patch 379 BLAKE2B ac892a7e52d5c592b193d80a7933529f15e21982feb4c4a4b5c8286c7479a342a0121e5b464922cac68e9b7c8e3f7a4293df42d30e6907365116e736d9c862b6 SHA512 f984855440d2d4b495d8bf1b1c3172c9842c096e8fda148d8b2d1980bc3d03061954db06f73513998e52bc161c35abdcec2b88e3b31b4e36605714cb85a66fa4 +DIST ideaIC-3.1.211.6693.111.tar.gz 652142239 BLAKE2B 7ce39420fd42c829ce1e742be20f37a255c3452740e77ee276495932dcab2db50aad1ce43a27aff6d02821a5e9d9c69d782c6a35ce7621d6b2abf14e29c45808 SHA512 cb7e8bf31f7ce87ab29483086ed3cbb5bd2a638c9179f9131de0344d97947950abecd5aec1d98e881434bb2f72aafd440cafc358829db3516d0e960eae722da0 +DIST jbr-11_0_10-linux-x64-b1304.4.tar.gz 201507596 BLAKE2B aa83f396dd37a96c769806c3f95a4c78bcc31e9c8eda047903cbee932a84029ad7133fc03496a248c017795ec45ff42f30f3860780a00d9d766ac7b262019905 SHA512 0de75baac30dad42927fa0cef3b78dc183f4dd317f8426021dd51cf1288680bbc65ed934e867dfa3ca9397d9bd5cff4b4d6896eb4878323c8b0aaa2b39d33d82 +EBUILD idea-community-2021.3.1.211.6693.111.ebuild 4163 BLAKE2B 44b21c905764e910a07c75d978f82f1de51b0ad4e39c1122f34cc8749bf108ce6c0a94738ec0873e8762d3d6f1732862a742e00bfbfd52831bbe8d645183afa8 SHA512 6b894d679f8de2ce536e4f051b3246e51e922d643a6536f890938c3d4861747a13e2ecd92cfa315337547204589395af2f32e56f4a8c2002f31b6600579afd03 MISC metadata.xml 453 BLAKE2B f244aa814b9eb5c6b00f6fea725a344a7413710b1fae03edc4590dfa9c102872e0e4d1cdb669f739854d7fac351002f7819aec371f3bd0eeef2fdd4aa2c8f60b SHA512 e6c5f1094ca8ba70b9bfd5b028f11542c8150cea0b543b939da144887043e4ee20ddf6cc89641329bde7456492d6def6f0e72092b7fa21095463a20aba9e0b03 diff --git a/dev-util/idea-community/files/idea-community-jdk.patch b/dev-util/idea-community/files/idea-community-jdk.patch index b89e6773fd01..5556729fdd49 100644 --- a/dev-util/idea-community/files/idea-community-jdk.patch +++ b/dev-util/idea-community/files/idea-community-jdk.patch @@ -1,11 +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" +--- 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 - JDK="$IDEA_JDK" + JRE="$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 + BITS="" diff --git a/dev-util/idea-community/idea-community-2021.3.1.203.6682.168-r3.ebuild b/dev-util/idea-community/idea-community-2021.3.1.203.6682.168-r3.ebuild deleted file mode 100644 index 9fa39d4d83fb..000000000000 --- a/dev-util/idea-community/idea-community-2021.3.1.203.6682.168-r3.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit eutils desktop - -SLOT="0" -PV_STRING="$(ver_cut 2-6)" -MY_PV="$(ver_cut 1-3)" -MY_PN="idea" -# Using the most recent Jetbrains Runtime binaries available at the time of writing -# ( jre 11.0.8 build 1098.1 ) -JRE11_BASE="11_0_8" -JRE11_VER="1098.1" - -# distinguish settings for official stable releases and EAP-version releases -if [[ "$(ver_cut 7)"x = "prex" ]] -then - # upstream EAP - SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz" -else - # upstream stable - KEYWORDS="~amd64 ~arm64" - SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz - amd64? ( https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz )" -fi - -DESCRIPTION="A complete toolset for web, mobile and enterprise development" -HOMEPAGE="https://www.jetbrains.com/idea" - -LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1 - codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 - GPL-2 GPL-2-with-classpath-exception ISC - JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT - MPL-1.0 MPL-1.1 OFL ZLIB" - -DEPEND=" - || ( - >=dev-java/openjdk-11.0.11_p9-r1:11 - >=dev-java/openjdk-bin-11.0.11_p9-r1:11 - )" -RDEPEND="${DEPEND} - dev-java/jansi-native - dev-libs/libdbusmenu - media-libs/harfbuzz - =dev-util/lldb-10*" - -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 - JRE_DIR=jre - fi - - PLUGIN_DIR="${S}/${JRE_DIR}/lib/" - - rm -vf ${PLUGIN_DIR}/libavplugin* - rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi* - rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le - rm -vf "${S}"/bin/libdbm64* - rm -vf "${S}"/lib/pty4j-native/linux/mips64el/libpty.so - - if [[ -d "${S}"/"${JRE_DIR}" ]]; then - for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so} - do - if [[ -f "$file" ]]; then - patchelf --set-rpath '$ORIGIN' $file || die - fi - done - fi - - patchelf --replace-needed liblldb.so liblldb.so.10 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb" - if use arm64; then - patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/aarch64/libpty.so || die "Unable to patch libpty for libc" - else - rm -vf "${S}"/lib/pty4j-native/linux/aarch64/libpty.so - fi - - sed -i \ - -e "\$a\\\\" \ - -e "\$a#-----------------------------------------------------------------------" \ - -e "\$a# Disable automatic updates as these are handled through Gentoo's" \ - -e "\$a# package manager. See bug #704494" \ - -e "\$a#-----------------------------------------------------------------------" \ - -e "\$aide.no.platform.update=Gentoo" bin/idea.properties - - eapply_user -} - -src_install() { - local dir="/opt/${PN}-${MY_PV}" - - insinto "${dir}" - doins -r * - fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}} - if use amd64; then - JRE_DIR=jre64 - else - JRE_DIR=jre - fi - - JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200" - if [[ -d ${JRE_DIR} ]]; then - for jrebin in $JRE_BINARIES; do - fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}" - done - fi - - make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh" - newicon "bin/${MY_PN}.png" "${PN}.png" - make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;" - - # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit - mkdir -p "${D}/etc/sysctl.d/" || die - 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 -} diff --git a/dev-util/idea-community/idea-community-2021.3.1.211.6693.111.ebuild b/dev-util/idea-community/idea-community-2021.3.1.211.6693.111.ebuild new file mode 100644 index 000000000000..35a6a1bcf8ed --- /dev/null +++ b/dev-util/idea-community/idea-community-2021.3.1.211.6693.111.ebuild @@ -0,0 +1,138 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit eutils desktop + +SLOT="0" +PV_STRING="$(ver_cut 2-6)" +MY_PV="$(ver_cut 1-1).$(ver_cut 3-3)" +MY_PN="idea" +# Using the most recent Jetbrains Runtime binaries available at the time of writing +# ( jre 11.0.10 build 1304.4 ) +JRE11_BASE="11_0_10" +JRE11_VER="1304.4" +IDEA_VER="2.111705284.1737970125.1619718960-2104634719.1619551776" + +# distinguish settings for official stable releases and EAP-version releases +if [[ "$(ver_cut 7)"x = "prex" ]] +then + # upstream EAP + SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}.tar.gz?_ga=${IDEA_VER}" +else + # upstream stable + KEYWORDS="~amd64 ~arm64" + SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz?_ga=${IDEA_VER} -> ${MY_PN}IC-${PV_STRING}.tar.gz + amd64? ( https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz )" +fi + +DESCRIPTION="A complete toolset for web, mobile and enterprise development" +HOMEPAGE="https://www.jetbrains.com/idea" + +LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1 + codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 + GPL-2 GPL-2-with-classpath-exception ISC + JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT + MPL-1.0 MPL-1.1 OFL ZLIB" + +DEPEND=" + || ( + >=dev-java/openjdk-11.0.11_p9-r1:11 + >=dev-java/openjdk-bin-11.0.11_p9-r1:11 + )" +RDEPEND="${DEPEND} + dev-java/jansi-native + dev-libs/libdbusmenu + media-libs/harfbuzz + =dev-util/lldb-10*" + +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 + JRE_DIR=jre + fi + + PLUGIN_DIR="${S}/${JRE_DIR}/lib/" + + rm -vf ${PLUGIN_DIR}/libavplugin* + rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi* + rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le + rm -vf "${S}"/bin/libdbm64* + rm -vf "${S}"/lib/pty4j-native/linux/mips64el/libpty.so + + if [[ -d "${S}"/"${JRE_DIR}" ]]; then + for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so} + do + if [[ -f "$file" ]]; then + patchelf --set-rpath '$ORIGIN' $file || die + fi + done + fi + + patchelf --replace-needed liblldb.so liblldb.so.10 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb" + if use arm64; then + patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/aarch64/libpty.so || die "Unable to patch libpty for libc" + else + rm -vf "${S}"/lib/pty4j-native/linux/aarch64/libpty.so + fi + + sed -i \ + -e "\$a\\\\" \ + -e "\$a#-----------------------------------------------------------------------" \ + -e "\$a# Disable automatic updates as these are handled through Gentoo's" \ + -e "\$a# package manager. See bug #704494" \ + -e "\$a#-----------------------------------------------------------------------" \ + -e "\$aide.no.platform.update=Gentoo" bin/idea.properties + + eapply_user +} + +src_install() { + local dir="/opt/${PN}-${MY_PV}" + + insinto "${dir}" + doins -r * + fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}} + if use amd64; then + JRE_DIR=jre64 + else + JRE_DIR=jre + fi + + JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200" + if [[ -d ${JRE_DIR} ]]; then + for jrebin in $JRE_BINARIES; do + fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}" + done + fi + + make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh" + newicon "bin/${MY_PN}.png" "${PN}.png" + make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;" + + # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit + mkdir -p "${D}/etc/sysctl.d/" || die + 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 +} -- cgit v1.2.3