From a82b893fa115a2878cdbdea69b256313a313357c Mon Sep 17 00:00:00 2001 From: Mike Pagano Date: Wed, 6 May 2020 12:40:42 -0400 Subject: dev-util/idea-community: Remove old. Bump new. Reorder maintainers Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Mike Pagano --- dev-util/idea-community/Manifest | 2 +- .../idea-community-2019.3.3.193.6494.35.ebuild | 146 --------------------- .../idea-community-2020.1.1.201.7223.91.ebuild | 146 +++++++++++++++++++++ dev-util/idea-community/metadata.xml | 8 +- 4 files changed, 151 insertions(+), 151 deletions(-) delete mode 100644 dev-util/idea-community/idea-community-2019.3.3.193.6494.35.ebuild create mode 100644 dev-util/idea-community/idea-community-2020.1.1.201.7223.91.ebuild diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest index 0d496a769e70..cb2fcd27a367 100644 --- a/dev-util/idea-community/Manifest +++ b/dev-util/idea-community/Manifest @@ -1,5 +1,5 @@ DIST ideaIC-1.0.201.6668.121.tar.gz 524536881 BLAKE2B 645e7c0390d89d0e0f1710682a5608dc226154e83ea7368434cf5da61f73064467fe7884d90c13d0d33b8feb0a237ca83446a155a135e3884bdaeca5254191ae SHA512 e2688788188726e418cddeef2bf46a54e8b1bcf4770d7daf5b2ee0d1de7d5ab9c84fef0078622b17e884d9b9cb5b826873b4c120aaec3c592e18ee2ddca2c7f6 -DIST ideaIC-3.3.193.6494.35.tar.gz 563410584 BLAKE2B 765c22e5cf25f8daf465e14cbaca2803a560fe175ce8bd678c9d3890b033b50301aae6ced5c5e2c3a682158c7b5cce3daa38ace25e178a6be49cee5c51b60305 SHA512 c8593434fc230a9e3214cac6782130c42b5a98aadd2d27811be2bec3dae1a311b1af3995739b8eb198e6641974b55cb993b9505496e2688c8a8a67c210e3d9d8 +DIST ideaIC-1.1.201.7223.91.tar.gz 529101163 BLAKE2B a8f7847c6fb673a58678f02c1933ee1d6a3a89946583c9488d30bbcb320c743694c5bd8a6d53f327ffdce602f93c92e6c17396af3ab4e235b24f28eaa77342ee SHA512 f272cc8ef90fb4c0ac5fba905caeb459e9657a0f4f643c8e19e5330812477acb57e558808d290ad6e9bfe9c5835d700b59546f57733310e629915c88b2533304 DIST ideaIC-3.4.193.6911.18.tar.gz 563415699 BLAKE2B d7f76da2251042c2141c39861b9a737cd7350e4140c6d9ff39182b489e5f14b8cdd033f402cecd08ff367e2a171b2137227813e6bf6d120b97cbf81e3eca3684 SHA512 39fb2aca3da78cf8282beae812662d237eba1ea2f55c30db5ebfcadd74af001d8fe07dc5cbb99794c3723487814eb096e5e70c4f654a6dafd0930432dfa86b83 DIST jbr-11_0_2-linux-x64-b164.tar.gz 131483925 BLAKE2B fb9c55094aeb4a9e6b89ef41699252355895fa4bf55eaa0d3c0a637b6485b5a91a0445b5f4af1872b62cd67b639f7354e05770970d41dcfa58ffeda7ae43c5b6 SHA512 4f32940166cc8ad5a138866e18d4cbfcd07f4326a85c051b7a622c9dcb8ee4b6d493331ef24d0c01999134fa2a9bad901f026982c16780fdc5e6b9308821db34 DIST jbrx-8u202-linux-i586-b1483.37.tar.gz 80726147 BLAKE2B e4e5a076a541fd7153e861193ff4247c02ecbc144396ed28737afa7440f7771569b8d968b7c67b3dac333a89ff0b54cc9e5e76d1651b174cc7c0c21b1deb033c SHA512 53693f2ce994f4891807873ae3fe46ce60bee000b78be03c5d3df06b436328abe5b5d7e75d43e57f35f24187f49915187d034b39589e29806f55deeb14a029f2 diff --git a/dev-util/idea-community/idea-community-2019.3.3.193.6494.35.ebuild b/dev-util/idea-community/idea-community-2019.3.3.193.6494.35.ebuild deleted file mode 100644 index fac1ff804200..000000000000 --- a/dev-util/idea-community/idea-community-2019.3.3.193.6494.35.ebuild +++ /dev/null @@ -1,146 +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="" - SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz" -else - # upstream stable - KEYWORDS="~amd64 ~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" -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() { - if use !jbr11 ; then - default_src_unpack - else - cd "${WORKDIR}" - unpack ${MY_PN}IC-${PV_STRING}.tar.gz - cd "${S}" - 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.1.1.201.7223.91.ebuild b/dev-util/idea-community/idea-community-2020.1.1.201.7223.91.ebuild new file mode 100644 index 000000000000..b394855414db --- /dev/null +++ b/dev-util/idea-community/idea-community-2020.1.1.201.7223.91.ebuild @@ -0,0 +1,146 @@ +# 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-2)" +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="" + SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz" +else + # upstream stable + KEYWORDS="~amd64 ~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" +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() { + if use !jbr11 ; then + default_src_unpack + else + cd "${WORKDIR}" + unpack ${MY_PN}IC-${PV_STRING}.tar.gz + cd "${S}" + 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/metadata.xml b/dev-util/idea-community/metadata.xml index 7800e5a02c1c..5ddfb4646361 100644 --- a/dev-util/idea-community/metadata.xml +++ b/dev-util/idea-community/metadata.xml @@ -1,14 +1,14 @@ - - alicef@gentoo.org - Ferrazzi Alice - mpagano@gentoo.org Mike Pagano + + alicef@gentoo.org + Ferrazzi Alice + 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. -- cgit v1.2.3-65-gdbad