commit: 0901302bdd3b40f6012a96618e393d0bbeb8a632 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> AuthorDate: Tue Dec 8 18:47:53 2020 +0000 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> CommitDate: Tue Dec 8 18:47:53 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0901302b
dev-util/idea-community: Update lldb dependency to v10. Remove old. Closes: https://bugs.gentoo.org/735756 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> dev-util/idea-community/Manifest | 4 - .../idea-community-2020.2.4.202.8194.7.ebuild | 142 --------------------- ...idea-community-2020.3.0.203.5981.155-r1.ebuild} | 4 +- dev-util/idea-community/metadata.xml | 4 - 4 files changed, 2 insertions(+), 152 deletions(-) diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest index 7f1dccaa0b5..43064fc9e25 100644 --- a/dev-util/idea-community/Manifest +++ b/dev-util/idea-community/Manifest @@ -1,6 +1,2 @@ -DIST ideaIC-2.4.202.8194.7.tar.gz 529563361 BLAKE2B 1f792d1ff8b1246d5ccaf4324d6c85dbe2491f6585c126ef38594709358512766f7ed3cbb2128b6b8db71286ef1a5c6cf8ac21bc0293b0ac9b373e55e6cae3d9 SHA512 f603416c829f1f2b47e371c18dc8706bb6b9df9d87ee6056ac7e4786d7f9c029246195c2fb3b63bb7d0c1c7bfee99911b2c0d686232aa243087e4a17c0f559d7 DIST ideaIC-3.0.203.5981.155.tar.gz 582023182 BLAKE2B 671fbba0c2173e3780a99d0d3b106af75c4ef6df4198ced3653c1b74a7bbb055a29b1fc31eb89823bfd56e6737c7788f78a90fe7ef46e52ab410c0dff18868e9 SHA512 35d569c5e13ec620d0a476cc52c005d29ea3c7c3c1ab0614a1a73255309635c84ee00820c50584ca19af634165138c77d8d712cfe0d367b9525956ad33aafe77 -DIST jbr-11_0_2-linux-x64-b164.tar.gz 131483925 BLAKE2B fb9c55094aeb4a9e6b89ef41699252355895fa4bf55eaa0d3c0a637b6485b5a91a0445b5f4af1872b62cd67b639f7354e05770970d41dcfa58ffeda7ae43c5b6 SHA512 4f32940166cc8ad5a138866e18d4cbfcd07f4326a85c051b7a622c9dcb8ee4b6d493331ef24d0c01999134fa2a9bad901f026982c16780fdc5e6b9308821db34 DIST jbr-11_0_8-linux-x64-b1098.1.tar.gz 191689225 BLAKE2B 0da0f0e834709c89820f2e7e1c447dc33ea1c59c7dfb573aa47bc205f7920ccf485454f79931d42d4e6eb4de1017589bb908808d6a80cc586659757abc9958d3 SHA512 a455d8bd3332622592186cd7ae3995a9148a47717a81c274497f5408f1e89ef637c7478321b4ccd5dbe97c2e246a16ac8956c5ce475f8a4156232647f0ea7737 -DIST jbrx-8u202-linux-i586-b1483.37.tar.gz 80726147 BLAKE2B e4e5a076a541fd7153e861193ff4247c02ecbc144396ed28737afa7440f7771569b8d968b7c67b3dac333a89ff0b54cc9e5e76d1651b174cc7c0c21b1deb033c SHA512 53693f2ce994f4891807873ae3fe46ce60bee000b78be03c5d3df06b436328abe5b5d7e75d43e57f35f24187f49915187d034b39589e29806f55deeb14a029f2 -DIST jbrx-8u202-linux-x64-b1483.37.tar.gz 81812743 BLAKE2B 86ddf0c8dc992a27e680caa821f54fa4d647a8bff78b9fdbef82996bfbba828a2f68f1a00ed64bd92ce24a62bfc6c0240837c396644c6e91244cb0d980b6c704 SHA512 cd31a3c4da7b8c65e9ae89326c2c8b260b51890258d30f64b1e8a7c6c1442bb2cb68ea2aa80387ce0c1a8f50e3533e8231f72c5935b639e3cf82bc1ffedee8e9 diff --git a/dev-util/idea-community/idea-community-2020.2.4.202.8194.7.ebuild b/dev-util/idea-community/idea-community-2020.2.4.202.8194.7.ebuild deleted file mode 100644 index 97ec35a8801..00000000000 --- a/dev-util/idea-community/idea-community-2020.2.4.202.8194.7.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2020 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 -# As the exact bundled versions ( jre 11 build 159.30 and jre 8 build 1483.39 ) aren't -# available separately -JRE11_BASE="11_0_2" -JRE11_VER="164" -JRE_BASE="8u202" -JRE_VER="1483.37" - -# distinguish settings for official stable releases and EAP-version releases -if [[ "$(ver_cut 7)"x = "prex" ]] -then - # upstream EAP - KEYWORDS="~arm64" - SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"; -else - # upstream stable - KEYWORDS="~amd64 ~arm64 ~x86" - SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz - jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz ) - amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz ) ) - jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/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 jbr8? ( GPL-2 ) - jbr11? ( GPL-2 ) 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" - -#Splitting custom-jdk into jbr8 and jbr11 as upstream now offers downloads with -#either (or neither) bundled -#Defaulting to jbr8 to match upstream -IUSE="+jbr8 -jbr11" -REQUIRED_USE="jbr8? ( !jbr11 )" - -DEPEND="!dev-util/${PN}:14 - !dev-util/${PN}:15" -RDEPEND="${DEPEND} - >=virtual/jdk-1.7:* - dev-java/jansi-native - dev-libs/libdbusmenu - =dev-util/lldb-9*" -BDEPEND="dev-util/patchelf" -RESTRICT="splitdebug" -S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)" - -QA_PREBUILT="opt/${PN}-${MY_PV}/*" - -# jbr11 binary doesn't unpack nicely into a single folder -src_unpack() { - default_src_unpack - if use jbr11 ; then - mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz - fi -} - -src_prepare() { - if use amd64; then - JRE_DIR=jre64 - else - JRE_DIR=jre - fi - - if use jbr8; then - mv "${WORKDIR}/jre" ./"${JRE_DIR}" - PLUGIN_DIR="${S}/${JRE_DIR}/lib/${ARCH}" - else - PLUGIN_DIR="${S}/${JRE_DIR}/lib/" - fi - - 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* - - 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.9 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb" - - 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 - if use jbr8 || use jbr11 ; then - if use jbr8; then - JRE_BINARIES="java jjs keytool orbd pack200 policytool rmid rmiregistry servertool tnameserv unpack200" - else - JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200" - fi - if [[ -d ${JRE_DIR} ]]; then - for jrebin in $JRE_BINARIES; do - fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}" - done - fi - 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 -} diff --git a/dev-util/idea-community/idea-community-2020.3.0.203.5981.155.ebuild b/dev-util/idea-community/idea-community-2020.3.0.203.5981.155-r1.ebuild similarity index 95% rename from dev-util/idea-community/idea-community-2020.3.0.203.5981.155.ebuild rename to dev-util/idea-community/idea-community-2020.3.0.203.5981.155-r1.ebuild index 675066ef9b5..358d9caaec6 100644 --- a/dev-util/idea-community/idea-community-2020.3.0.203.5981.155.ebuild +++ b/dev-util/idea-community/idea-community-2020.3.0.203.5981.155-r1.ebuild @@ -45,7 +45,7 @@ RDEPEND="${DEPEND} >=virtual/jdk-1.7:* dev-java/jansi-native dev-libs/libdbusmenu - =dev-util/lldb-9*" + =dev-util/lldb-10*" BDEPEND="dev-util/patchelf" RESTRICT="splitdebug" S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)" @@ -81,7 +81,7 @@ src_prepare() { done fi - patchelf --replace-needed liblldb.so liblldb.so.9 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb" + 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 diff --git a/dev-util/idea-community/metadata.xml b/dev-util/idea-community/metadata.xml index 5ddfb464636..3642c1e6927 100644 --- a/dev-util/idea-community/metadata.xml +++ b/dev-util/idea-community/metadata.xml @@ -12,8 +12,4 @@ <longdescription lang="en"> Excel at enterprise, mobile and web development with Java, Scala and Groovy, with all the latest modern technologies and frameworks available out of the box. </longdescription> - <use> - <flag name="jbr8">Install and use the Java 8 based version of JetBrains Runtime.</flag> - <flag name="jbr11">Install and use the Java 11 based version of JetBrains Runtime.</flag> - </use> </pkgmetadata>
