1 |
commit: aaa6caa7112f1ff082a01f72f208bda0e5124efe |
2 |
Author: Matthew Brewer <tomboy64 <AT> sina <DOT> cn> |
3 |
AuthorDate: Wed Jan 27 13:57:18 2016 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 27 14:28:45 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaa6caa7 |
7 |
|
8 |
dev-util/idea-ultimate: version bump to 15.0.3 (stable) and new EAP v16 |
9 |
|
10 |
dev-util/idea-ultimate/Manifest | 6 +-- |
11 |
.../idea-ultimate-15.0.1.143.382.35-r1.ebuild | 62 ---------------------- |
12 |
...uild => idea-ultimate-15.0.3.143.1821.5.ebuild} | 11 ++-- |
13 |
... => idea-ultimate-16.0.0.144.3143.6_pre.ebuild} | 10 ++-- |
14 |
4 files changed, 12 insertions(+), 77 deletions(-) |
15 |
|
16 |
diff --git a/dev-util/idea-ultimate/Manifest b/dev-util/idea-ultimate/Manifest |
17 |
index 62fb289..aa7532f 100644 |
18 |
--- a/dev-util/idea-ultimate/Manifest |
19 |
+++ b/dev-util/idea-ultimate/Manifest |
20 |
@@ -1,4 +1,4 @@ |
21 |
DIST idea-ultimate-14.1.5.141.2735.5.tar.gz 318054935 SHA256 6912902ec97a57f5553247367d6dd5b8e3041e99faf32c48b672cd31413dab73 SHA512 7ab3a45593c2324957455b254ae0257a36e8ecbc63014e18feba813413432dccb25d18971840f43cf22174c3338738eec44304091eb30c6ba2d0119b73cc6fa0 WHIRLPOOL 44a4bef99fdb638cf3cb0f24559b7765b7a4c7cb94aed5c3b8e503cbdf9fa1354f6d6026a9650fc58faec037b95482190891681f41219c61fc7d67a40e71f168 |
22 |
-DIST ideaIU-143.1184.17.tar.gz 390459277 SHA256 5a3f6d8ba6d5ce8c505f13564c04cf2f674f1c022b9a33871013acb0ebe10fe5 SHA512 bc42244554ed0e533c95b65b1518ffb20ad1407fab22afff0ff3711245d15d97456599bebfcf654553b91a24dcf9042ac769041be3bfc14af76fa48b70f29d94 WHIRLPOOL 48ba83f0254e027a8f78d070dd55a63d97225ae763107149db8820d22ceb4dc72d080704bb6ea2ccf0673af77ec9cda9fa13b226c0c885f7336f2e7d50b52ae2 |
23 |
-DIST ideaIU-143.382.35.tar.gz 379524583 SHA256 1f4c6f55eeb0ce08f697008935c5b7356e74a85dfaad00f6521670b8f5c6862f SHA512 cd3fe075be726695144a70b8f6477a7d547ca6c67bfacdf91d64f352066305d18ad0696608ac54d316adb95b3ae7d4d1218d34b28875a084de35dc03da77b91f WHIRLPOOL 99ba3fb796f40bd8cf22c42302fec7e279dc749b681952066d49f6a079ca06e532cc10274bc19a6b12a81cb6f15ebcde8450f774109a6d21a9a8c9b9ea235710 |
24 |
-DIST ideaIU-144.2608.2.tar.gz 442803534 SHA256 4407049fe9b38d72dcd3540de237aef5528a5e52724d123c7392cefff685ee71 SHA512 f73db0f68b4570faa879f7a411349b21fdf12e4306e81d439bdfe34c0fb8e1baa9f2789c1f6223ca9588a3de6fedb7a52fc89ddbfc2445e1a041db393999a1c4 WHIRLPOOL 1c3da7ff4a85d63f15daed4d8f7e6a7ae52ebc3a42ec8b776312b19c17c7bab2ff1d383734430b105247ed62d998874fd7496c0378d59ff99c17b769b75ed712 |
25 |
+DIST ideaIU-143.1821.5.tar.gz 392844742 SHA256 90c2a880c03bc1213c41be05e56d50a5104175e2589e492ba140987b94d8680b SHA512 0841c3ea509500949358f826405d5c62d84f51657ce4ad621d3b33100a1966d8d85b793286cd4b85c6d2d6d0ca99c4b6a2f84cf5d596538cf530abf73fe8be21 WHIRLPOOL d59367e7671121619d0f787f585a4be436027e4ff39f10849566e441b407295166131cda8af506a7ecf5c34c21231bedd1419c4ee1e2657a38fa3b70a6b424dc |
26 |
+DIST ideaIU-144.3143.6-custom-jdk-linux.tar.gz 444026233 SHA256 7d43fef31ec373fa700c1bcf6408429abf5549314f134e458335f52feb44772b SHA512 86ef4f9d89184acfcbaee8fbce67be8e226ab363df9892f803bb61fe61c50972bcf1ec260c9a9652998fc3f73cc72311950df3ae23bf01ae4a45336b7830ca01 WHIRLPOOL 9dee3db866fa55f2ddd3fa28120def4455ff4e7bc0a3a86289c6cb46f7a8a48c5fa0c6e9f35753b52cf66848831c3de2540d41673239130529c8848dba914aa6 |
27 |
+DIST ideaIU-144.3143.6-no-jdk.tar.gz 399209252 SHA256 c11de6c199c90873976958c4e319176647fb4458370a041b8611007277a057d3 SHA512 6c4b8224901be58b0d41ca59dc6d8215510617470ed15b25c9d84074d4f660e335d6bb450062e353df3bb217a4892eb8783fc9086d2f4e4addada5aa7c5c7e85 WHIRLPOOL 2ea6bfc95c47fb20008c6503a2158a5a6d677e072cb9db41fba198d4dfda0df57db784b3289ecccd64849d1dc59fdb0f3b35aa3490323a7f40df383547cf940f |
28 |
|
29 |
diff --git a/dev-util/idea-ultimate/idea-ultimate-15.0.1.143.382.35-r1.ebuild b/dev-util/idea-ultimate/idea-ultimate-15.0.1.143.382.35-r1.ebuild |
30 |
deleted file mode 100644 |
31 |
index db2d725..0000000 |
32 |
--- a/dev-util/idea-ultimate/idea-ultimate-15.0.1.143.382.35-r1.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,62 +0,0 @@ |
35 |
-# Copyright 1999-2015 Gentoo Foundation |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
-# $Id$ |
38 |
- |
39 |
-EAPI=5 |
40 |
-inherit eutils versionator |
41 |
- |
42 |
-SLOT="0" |
43 |
-PV_STRING="$(get_version_component_range 4-6)" |
44 |
-MY_PV="$(get_version_component_range 1-3)" |
45 |
-MY_PN="idea" |
46 |
- |
47 |
-DESCRIPTION="A complete toolset for web, mobile and enterprise development" |
48 |
-HOMEPAGE="http://www.jetbrains.com/idea" |
49 |
-SRC_URI="http://download-cf.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz -> ${MY_PN}IU-${PV_STRING}.tar.gz" |
50 |
- |
51 |
-LICENSE="IDEA |
52 |
- || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )" |
53 |
-IUSE="" |
54 |
-KEYWORDS="amd64 x86" |
55 |
- |
56 |
-DEPEND="!dev-util/${PN}:14 |
57 |
- !dev-util/${PN}:15" |
58 |
-RDEPEND="${DEPEND} |
59 |
- >=virtual/jdk-1.7:*" |
60 |
-S="${WORKDIR}/${MY_PN}-IU-${PV_STRING}" |
61 |
- |
62 |
-QA_PREBUILT="opt/${PN}-${MY_PV}/*" |
63 |
- |
64 |
-src_prepare() { |
65 |
- if ! use amd64; then |
66 |
- rm -r plugins/tfsIntegration/lib/native/linux/x86_64 || die |
67 |
- fi |
68 |
- if ! use arm; then |
69 |
- rm bin/fsnotifier-arm || die |
70 |
- rm -r plugins/tfsIntegration/lib/native/linux/arm || die |
71 |
- fi |
72 |
- if ! use ppc; then |
73 |
- rm -r plugins/tfsIntegration/lib/native/linux/ppc || die |
74 |
- fi |
75 |
- if ! use x86; then |
76 |
- rm -r plugins/tfsIntegration/lib/native/linux/x86 || die |
77 |
- fi |
78 |
- rm -r plugins/tfsIntegration/lib/native/solaris || die |
79 |
- rm -r plugins/tfsIntegration/lib/native/hpux || die |
80 |
-} |
81 |
- |
82 |
-src_install() { |
83 |
- local dir="/opt/${PN}-${MY_PV}" |
84 |
- |
85 |
- insinto "${dir}" |
86 |
- doins -r * |
87 |
- fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}} |
88 |
- |
89 |
- make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh" |
90 |
- newicon "bin/${MY_PN}.png" "${PN}.png" |
91 |
- make_desktop_entry "${PN}" "IntelliJ Idea Ultimate" "${PN}" "Development;IDE;" |
92 |
- |
93 |
- # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit |
94 |
- mkdir -p "${D}/etc/sysctl.d/" || die |
95 |
- echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die |
96 |
-} |
97 |
|
98 |
diff --git a/dev-util/idea-ultimate/idea-ultimate-16.0.0.144.2608.2_pre.ebuild b/dev-util/idea-ultimate/idea-ultimate-15.0.3.143.1821.5.ebuild |
99 |
similarity index 84% |
100 |
rename from dev-util/idea-ultimate/idea-ultimate-16.0.0.144.2608.2_pre.ebuild |
101 |
rename to dev-util/idea-ultimate/idea-ultimate-15.0.3.143.1821.5.ebuild |
102 |
index ea272d8..771e6e9 100644 |
103 |
--- a/dev-util/idea-ultimate/idea-ultimate-16.0.0.144.2608.2_pre.ebuild |
104 |
+++ b/dev-util/idea-ultimate/idea-ultimate-15.0.3.143.1821.5.ebuild |
105 |
@@ -1,4 +1,4 @@ |
106 |
-# Copyright 1999-2015 Gentoo Foundation |
107 |
+# Copyright 1999-2016 Gentoo Foundation |
108 |
# Distributed under the terms of the GNU General Public License v2 |
109 |
# $Id$ |
110 |
|
111 |
@@ -15,16 +15,16 @@ if [[ "$(get_version_component_range 7)x" = "prex" ]] |
112 |
then |
113 |
# upstream EAP |
114 |
KEYWORDS="~amd64 ~x86" |
115 |
- MY_FILENAME="${MY_PN}IU-${PV_STRING}-custom-jdk-linux.tar.gz" |
116 |
+ SRC_URI="custom-jdk? ( http://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}-custom-jdk-linux.tar.gz ) |
117 |
+ !custom-jdk? ( http://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}-no-jdk.tar.gz )" |
118 |
else |
119 |
# upstream stable |
120 |
KEYWORDS="amd64 x86" |
121 |
- MY_FILENAME="${MY_PN}IU-${MY_PV}.tar.gz" |
122 |
+ SRC_URI="http://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz -> ${MY_PN}IU-${PV_STRING}.tar.gz" |
123 |
fi |
124 |
|
125 |
DESCRIPTION="A complete toolset for web, mobile and enterprise development" |
126 |
HOMEPAGE="http://www.jetbrains.com/idea" |
127 |
-SRC_URI="http://download.jetbrains.com/idea/${MY_FILENAME} -> ${MY_PN}IU-${PV_STRING}.tar.gz" |
128 |
|
129 |
LICENSE="IDEA |
130 |
|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )" |
131 |
@@ -54,9 +54,6 @@ src_prepare() { |
132 |
fi |
133 |
rm -r plugins/tfsIntegration/lib/native/solaris || die |
134 |
rm -r plugins/tfsIntegration/lib/native/hpux || die |
135 |
- if ! use custom-jdk; then |
136 |
- rm -r jre || die |
137 |
- fi |
138 |
} |
139 |
|
140 |
src_install() { |
141 |
|
142 |
diff --git a/dev-util/idea-ultimate/idea-ultimate-15.0.2.143.1184.17.ebuild b/dev-util/idea-ultimate/idea-ultimate-16.0.0.144.3143.6_pre.ebuild |
143 |
similarity index 83% |
144 |
rename from dev-util/idea-ultimate/idea-ultimate-15.0.2.143.1184.17.ebuild |
145 |
rename to dev-util/idea-ultimate/idea-ultimate-16.0.0.144.3143.6_pre.ebuild |
146 |
index ef380e4..771e6e9 100644 |
147 |
--- a/dev-util/idea-ultimate/idea-ultimate-15.0.2.143.1184.17.ebuild |
148 |
+++ b/dev-util/idea-ultimate/idea-ultimate-16.0.0.144.3143.6_pre.ebuild |
149 |
@@ -1,4 +1,4 @@ |
150 |
-# Copyright 1999-2015 Gentoo Foundation |
151 |
+# Copyright 1999-2016 Gentoo Foundation |
152 |
# Distributed under the terms of the GNU General Public License v2 |
153 |
# $Id$ |
154 |
|
155 |
@@ -15,20 +15,20 @@ if [[ "$(get_version_component_range 7)x" = "prex" ]] |
156 |
then |
157 |
# upstream EAP |
158 |
KEYWORDS="~amd64 ~x86" |
159 |
- MY_FILENAME="${MY_PN}IU-${PV_STRING}.tar.gz" |
160 |
+ SRC_URI="custom-jdk? ( http://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}-custom-jdk-linux.tar.gz ) |
161 |
+ !custom-jdk? ( http://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}-no-jdk.tar.gz )" |
162 |
else |
163 |
# upstream stable |
164 |
KEYWORDS="amd64 x86" |
165 |
- MY_FILENAME="${MY_PN}IU-${MY_PV}.tar.gz" |
166 |
+ SRC_URI="http://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz -> ${MY_PN}IU-${PV_STRING}.tar.gz" |
167 |
fi |
168 |
|
169 |
DESCRIPTION="A complete toolset for web, mobile and enterprise development" |
170 |
HOMEPAGE="http://www.jetbrains.com/idea" |
171 |
-SRC_URI="http://download-cf.jetbrains.com/idea/${MY_FILENAME} -> ${MY_PN}IU-${PV_STRING}.tar.gz" |
172 |
|
173 |
LICENSE="IDEA |
174 |
|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )" |
175 |
-IUSE="" |
176 |
+IUSE="-custom-jdk" |
177 |
|
178 |
DEPEND="!dev-util/${PN}:14 |
179 |
!dev-util/${PN}:15" |