dev-util/idea-community: Fetch the custom-jdk seperately

Reduces download size for USE -custom-jdk and fixes USE custom-jdk for x86

Bug: https://bugs.gentoo.org/676370
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Kyle Elbert <kcelbert@gmail.com>
Signed-off-by: Alice Ferrazzi <alicef@gentoo.org>

diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index d7ca90d6bc76400beed7ee409993ebd3829edacd..286ba55f3d26bfce1d3e27162c42ffa33dc0633b 100644 (file)
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,4 +1,6 @@
 DIST ideaIC-172.3757.52.tar.gz 442963100 BLAKE2B e44f924e279a5b8f2bddbe65cffa24306920fa0f5b85e23b823b1e51fd49e2de2c8953a010b66ea325c4b70ae60268639293b67cd6116f4315ded5e5f6130da1 SHA512 a0178c5ef10aeab527bb8064840c53fff97bf9be468a4e5248b83dba96c5114878f5ff1e20436a67ee488580affa3fb3a2ea627407ed57b87949f64fc1a215d2
 DIST ideaIC-183.4588.61.tar.gz 541751086 BLAKE2B 51a5a4dae10d8fd00a0c239f87af3d53b86ffa50f7f9c4f1554265b349d866d60a8994a96f184cc9993fafe12de3dbfa77e3931626436a5f3d3854710b52fb9e SHA512 3e5956353fc0fabbe91b3a946e83b0b3229766a366fdf782c4c017acd7de5a86b3e0cc870a17abe2bdb8b090cb5c58b6c170555f60ba5e6a9a8198073545be87
 DIST ideaIC-183.5153.38.tar.gz 541754349 BLAKE2B 541054736db09c8f0106d5588b224d3033ec21a1e2b566fbc95300fafd39acae5c7f6755082bdb189c5619ed5375ea9fc3e777440d30523a84f864be29e5ad85 SHA512 0bb213da8bffda7d63fa29905d01ee36c3839249dd6e2a58b3941e4317a01bd9315e8bf639f088657938c8197eb2f05fc34fb3e0c49f8c243043cb03f8443f0f
-DIST ideaIC-183.5429.30.tar.gz 541773658 BLAKE2B 305b8a0ccea2faa986af9d74bf5bb1335e656285bfd341883a4f4c78e06ef9c5e57f814e3722bd2498ef9ddcc2464426b61acee71d1ea0dd27bd5e2015562efa SHA512 a84fb954950b6d07555ff92f30106edbcba490fa3f1e80bc2013d562e74d7860cbbb10f1029fa4c869d2b5759bb308a1fa83d556d034cb4740d3a263cfb5ef0b
+DIST ideaIC-183.5429.30.tar.gz 460232784 BLAKE2B 53cd69f5e8927b31a34b23f9e86e0974152cd6282eb4597aa173c06895e1b431360b18c76442094fb9f544bc29f925397242d42943b51840156f8b332e0d5357 SHA512 36c5151410c15e4530af1da5ccfb981ca4fba00577b26fb76fd3470bc3818f2b08b4545ca7ab2979dc87f144712f864811cf73336cf5ff98cb5f63c0e61e1a9c
+DIST jbrx-8u202-linux-i586-b1483.24.tar.gz 80740809 BLAKE2B cc420ac646120c7060a3a7697e2a0f1d8a6f9702b1c2d2730f339e7aed405ccf4bb31d4be389686f57066f6add5e8279912e54fd341873ad2c2d1f5292b4d14f SHA512 90280f8a36fa8f20448c27d344de85ae06412f0b1fc717b77b5fbdcc0a3486e0def510e4ef0aedc1eb210b1e3541b0e37f805821731a285c6e78eb87ad083f2d
+DIST jbrx-8u202-linux-x64-b1483.24.tar.gz 81829687 BLAKE2B b716ca394a1315d8d6c6ebd57fd35cc37db6429380681c6d5e7d05b4a00036c1aca46820b0a17b824c8742e7ba924b4342eedf08999370c7a9fd2675f99d45a3 SHA512 08db0eb7fc2b5ae734120f276f96f21fe9e6c2bcb84a833fe5a1a8bb3b9b1205c3de06e1c1ad94e220c26f092061d5ec99470619240630f7722d1d64d21ace97

diff --git a/dev-util/idea-community/idea-community-2018.3.4.183.5429.30.ebuild b/dev-util/idea-community/idea-community-2018.3.4.183.5429.30.ebuild
index 3811dacddc7efa036c5f281a896d3304ca2e3861..2f0a755fa41658b4fc145855828ccd427ecca4db 100644 (file)
--- a/dev-util/idea-community/idea-community-2018.3.4.183.5429.30.ebuild
+++ b/dev-util/idea-community/idea-community-2018.3.4.183.5429.30.ebuild
@@ -8,6 +8,8 @@ SLOT="0"
 PV_STRING="$(ver_cut 4-6)"
 MY_PV="$(ver_cut 1-3)"
 MY_PN="idea"
+JRE_BASE="8u202"
+JRE_VER="1483.24"
 
 # distinguish settings for official stable releases and EAP-version releases
 if [[ "$(ver_cut 7)"x = "prex" ]]
@@ -18,7 +20,9 @@ then
 else
        # upstream stable
        KEYWORDS="~amd64 ~x86"
-       SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz"
+       SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jdk.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
+       custom-jdk? ( 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 ) )"
 fi
 
 DESCRIPTION="A complete toolset for web, mobile and enterprise development"
@@ -36,14 +40,17 @@ S="${WORKDIR}/${MY_PN}-IC-${PV_STRING}"
 QA_PREBUILT="opt/${PN}-${MY_PV}/*"
 
 src_prepare() {
+       if use amd64; then
+               JRE_DIR=jre64
+       else
+               JRE_DIR=jre
+       fi
+       if use custom-jdk; then
+                       mv "${WORKDIR}/jre" ./"${JRE_DIR}"
+       fi
        if ! use arm; then
                rm bin/fsnotifier-arm || die
        fi
-       if ! use custom-jdk; then
-               if [[ -d jre64 ]]; then
-                       rm -r jre64 || die
-               fi
-       fi
        eapply_user
 }
 
@@ -53,10 +60,14 @@ src_install() {
        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 custom-jdk; then
-               if [[ -d jre64 ]]; then
-               fperms 755 "${dir}"/jre64//bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200}
+               if [[ -d ${JRE_DIR} ]]; then
+               fperms 755 "${dir}"/"${JRE_DIR}"/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200}
                fi
        fi