Gentoo Archives: gentoo-commits

From: Alice Ferrazzi <alicef@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/idea-ultimate/
Date: Fri, 29 Dec 2017 18:05:14
Message-Id: 1514570666.9a4799105ff192873dcb28cac194b1a40ab24b80.alicef@gentoo
1 commit: 9a4799105ff192873dcb28cac194b1a40ab24b80
2 Author: Alice Ferrazzi <alicef <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 27 10:43:15 2017 +0000
4 Commit: Alice Ferrazzi <alicef <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 29 18:04:26 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a479910
7
8 dev-util/idea-ultimate: bump
9 updated to EAPI 6
10 src_uri differ with the custom_jdk use flag
11
12 Package-Manager: Portage-2.3.13, Repoman-2.3.3
13
14 dev-util/idea-ultimate/Manifest | 5 ++++-
15 ....52.ebuild => idea-ultimate-2017.3.1.173.3942.27.ebuild} | 13 ++++++++++---
16 ...ebuild => idea-ultimate-2017.3.2.173.4127.17_pre.ebuild} | 13 ++++++++++---
17 3 files changed, 24 insertions(+), 7 deletions(-)
18
19 diff --git a/dev-util/idea-ultimate/Manifest b/dev-util/idea-ultimate/Manifest
20 index 601081ae28d..c81d7a28a3f 100644
21 --- a/dev-util/idea-ultimate/Manifest
22 +++ b/dev-util/idea-ultimate/Manifest
23 @@ -1 +1,4 @@
24 -DIST ideaIU-172.3757.52.tar.gz 625753104 BLAKE2B 5b29df72b66451efc79586d3f61b0efe8c4ab87dfb23a133213f4046eedaf01bcf8f2ea7975d407649bf30ec9155225c75c1cca4165c0c68835a1b306d14cabf SHA512 dd730a34f141f345f0af8fb7ee32c1e7a98ec54dcb5df5a644b49e94b7a6d2eb8b6a134ad3d77010e408299b71137b8bd578d3563200762144a747747bf28c0f
25 +DIST ideaIU-173.3942.27-no-jdk.tar.gz 562044023 BLAKE2B 57da196682db817b175158b9c9913502490c2a692153e5e5b8a4449958c5613469a0060f1260095e9fb70ca54b5adaf59494cd9c0f6b0cb0b9f7c25cc4571335 SHA512 9cc7e687bef5d213f37e2e24aa2464e0d3dc9a40cb683d1d8fd1438efc6ca988134509a96f558ec87960e950336e062d5161ef6cb491f9c1c572ba077dd0a990
26 +DIST ideaIU-173.3942.27.tar.gz 635548505 BLAKE2B e123d731b3516dee3342310b3204dce2247430e81240e4dc729b23146887fef552001bee9aad7528d46c0717654507f16b505f76baf8407609cb9cca7aa9d773 SHA512 1f3586bc2082feec5b986298334445c7b91318f6d5f3d71fe6bfbb1546a63bb33e2bc978ef5fc4438e13d2a3d1dd5abc96fdd4ea5659f64563afbdd3410df8b4
27 +DIST ideaIU-173.4127.17-no-jdk.tar.gz 562765679 BLAKE2B 7d287c2723646b4fa541c314099cee96242c058cd67811ec1633737ce33e90678504d0d0b9af1cf1279dbf7281fb87ec9c2723bdb926d554f5a1f0793e13867c SHA512 a3c0afa388705158f431064223f42a7b0daacaa928ef9bc68df1cd5ace542f22c3648620d56478896f663688ea1bf773dc04d8d0ab962d195ace7b057708a272
28 +DIST ideaIU-173.4127.17.tar.gz 636265697 BLAKE2B b01efe844375b009c03474df362d2a208008a47e14696e816ded1573f591a777e23db393838c8592277d68817b3d7ebd714bb79445cd0cf0653da3d575af5bf2 SHA512 e05dd3986f77d39bb48f12ac6af5ab76d9c67b3502772c2bc16c16f922c90a3e6b8adb24537eb37defea2e3488968a6dff343eeabf4c6c78740895c8ec7c93fd
29
30 diff --git a/dev-util/idea-ultimate/idea-ultimate-2017.2.2.172.3757.52.ebuild b/dev-util/idea-ultimate/idea-ultimate-2017.3.1.173.3942.27.ebuild
31 similarity index 81%
32 copy from dev-util/idea-ultimate/idea-ultimate-2017.2.2.172.3757.52.ebuild
33 copy to dev-util/idea-ultimate/idea-ultimate-2017.3.1.173.3942.27.ebuild
34 index 088e87ce25b..6a53389fc5c 100644
35 --- a/dev-util/idea-ultimate/idea-ultimate-2017.2.2.172.3757.52.ebuild
36 +++ b/dev-util/idea-ultimate/idea-ultimate-2017.3.1.173.3942.27.ebuild
37 @@ -1,7 +1,7 @@
38 # Copyright 1999-2017 Gentoo Foundation
39 # Distributed under the terms of the GNU General Public License v2
40
41 -EAPI=5
42 +EAPI=6
43 inherit eutils versionator
44
45 SLOT="0"
46 @@ -14,11 +14,17 @@ if [[ "$(get_version_component_range 7)x" = "prex" ]]
47 then
48 # upstream EAP
49 KEYWORDS=""
50 - SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz"
51 + SRC_URI="
52 + !custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}-no-jdk.tar.gz )
53 + custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz )
54 + "
55 else
56 # upstream stable
57 KEYWORDS="~amd64 ~x86"
58 - SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz -> ${MY_PN}IU-${PV_STRING}.tar.gz"
59 + SRC_URI="
60 + !custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${MY_PV}-no-jdk.tar.gz -> ${MY_PN}IU-${PV_STRING}-no-jdk.tar.gz )
61 + custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz -> ${MY_PN}IU-${PV_STRING}.tar.gz )
62 + "
63 fi
64
65 DESCRIPTION="A complete toolset for web, mobile and enterprise development"
66 @@ -37,6 +43,7 @@ S="${WORKDIR}/${MY_PN}-IU-${PV_STRING}"
67 QA_PREBUILT="opt/${PN}-${MY_PV}/*"
68
69 src_prepare() {
70 + eapply_user
71 if ! use amd64; then
72 rm -r plugins/tfsIntegration/lib/native/linux/x86_64 || die
73 fi
74
75 diff --git a/dev-util/idea-ultimate/idea-ultimate-2017.2.2.172.3757.52.ebuild b/dev-util/idea-ultimate/idea-ultimate-2017.3.2.173.4127.17_pre.ebuild
76 similarity index 81%
77 rename from dev-util/idea-ultimate/idea-ultimate-2017.2.2.172.3757.52.ebuild
78 rename to dev-util/idea-ultimate/idea-ultimate-2017.3.2.173.4127.17_pre.ebuild
79 index 088e87ce25b..6a53389fc5c 100644
80 --- a/dev-util/idea-ultimate/idea-ultimate-2017.2.2.172.3757.52.ebuild
81 +++ b/dev-util/idea-ultimate/idea-ultimate-2017.3.2.173.4127.17_pre.ebuild
82 @@ -1,7 +1,7 @@
83 # Copyright 1999-2017 Gentoo Foundation
84 # Distributed under the terms of the GNU General Public License v2
85
86 -EAPI=5
87 +EAPI=6
88 inherit eutils versionator
89
90 SLOT="0"
91 @@ -14,11 +14,17 @@ if [[ "$(get_version_component_range 7)x" = "prex" ]]
92 then
93 # upstream EAP
94 KEYWORDS=""
95 - SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz"
96 + SRC_URI="
97 + !custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}-no-jdk.tar.gz )
98 + custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz )
99 + "
100 else
101 # upstream stable
102 KEYWORDS="~amd64 ~x86"
103 - SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz -> ${MY_PN}IU-${PV_STRING}.tar.gz"
104 + SRC_URI="
105 + !custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${MY_PV}-no-jdk.tar.gz -> ${MY_PN}IU-${PV_STRING}-no-jdk.tar.gz )
106 + custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz -> ${MY_PN}IU-${PV_STRING}.tar.gz )
107 + "
108 fi
109
110 DESCRIPTION="A complete toolset for web, mobile and enterprise development"
111 @@ -37,6 +43,7 @@ S="${WORKDIR}/${MY_PN}-IU-${PV_STRING}"
112 QA_PREBUILT="opt/${PN}-${MY_PV}/*"
113
114 src_prepare() {
115 + eapply_user
116 if ! use amd64; then
117 rm -r plugins/tfsIntegration/lib/native/linux/x86_64 || die
118 fi