1 |
commit: 829730cd56bc754880ef7e716f9b27607bdf9851 |
2 |
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 21 06:23:26 2019 +0000 |
4 |
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 21 06:23:48 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=829730cd |
7 |
|
8 |
dev-util/android-studio: drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.69, Repoman-2.3.16 |
11 |
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org> |
12 |
|
13 |
dev-util/android-studio/Manifest | 2 - |
14 |
.../android-studio-3.3.0.20.182.5199772.ebuild | 115 ------------------ |
15 |
.../android-studio-3.4.0.18.183.5452501.ebuild | 131 --------------------- |
16 |
3 files changed, 248 deletions(-) |
17 |
|
18 |
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest |
19 |
index 35026437dc5..fe8a122557c 100644 |
20 |
--- a/dev-util/android-studio/Manifest |
21 |
+++ b/dev-util/android-studio/Manifest |
22 |
@@ -1,4 +1,2 @@ |
23 |
-DIST android-studio-ide-182.5199772-linux.zip 1059268546 BLAKE2B b5485c444eea49e10b155a763d40a08c09a05e34c151cf21b79bfbb9b039f0bb112fc806b3b8cf4fe7e17127fe89c8651fac7ff83163ff1cf78c24b330273490 SHA512 76647fc50fbe06f93b733962b51dc8fb57d59c1e30364b82bf7a03a7700a0f7835eab240db6bd93ae71f4147408cbe8641b41965c97d40494c2e5fe0fecfba4d |
24 |
-DIST android-studio-ide-183.5452501-linux.tar.gz 1087166186 BLAKE2B 07c17dc854d24c7e96a91346887dfb96067acad330d485c996f13107bf2a92d6b85e791638c1f6d2f08ea9ea47eb0ee45568605b95f6cdefc2fbf4d350bfeb0e SHA512 c686c2dd89a19d9b2fabffff8ce5a7b5b96ff05bb8c9fbf3c1a7a7b78896653114a527b30d2a9795541f5c70dc80f59d7d3b0d2a56141fea48932bfbb51e8b5f |
25 |
DIST android-studio-ide-183.5522156-linux.tar.gz 1087847976 BLAKE2B 6bff44f3d4dd5de1ce65ebc444c5b30d717b92ee34ccdfc268706f1ea07cc6c431ca6a42d361f89fdbe852f347b63afbfb9667acfd80980b869d244e5b957249 SHA512 2d9f10fc53c0d8036e413897c5003b07be106c5108a494d347b8c035b0e8155e13fcd487627b2b4910e918f41b1972b96cd078d09e3469eef2e18ce04a416b05 |
26 |
DIST android-studio-ide-191.5791312-linux.tar.gz 765055716 BLAKE2B f0259adce0d3589a1c54ad16c1f745a10f4291ceb3554c9e6bb7433e6d57cb1fe6e1647df880b381172949a95cc908010977b87e3c34a868ccd00edfb3b7ba7c SHA512 39bc345e57fba7b49074f412db71bf1ecccc62cb2b23189149b8b1a72cbc159c285969708c8859def2d4a589cf8241b9a9cef2d93d72cf410554e469e66c20a6 |
27 |
|
28 |
diff --git a/dev-util/android-studio/android-studio-3.3.0.20.182.5199772.ebuild b/dev-util/android-studio/android-studio-3.3.0.20.182.5199772.ebuild |
29 |
deleted file mode 100644 |
30 |
index 09471fbd560..00000000000 |
31 |
--- a/dev-util/android-studio/android-studio-3.3.0.20.182.5199772.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,115 +0,0 @@ |
34 |
-# Copyright 1999-2019 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=6 |
38 |
-inherit eutils java-pkg-2 eapi7-ver |
39 |
- |
40 |
-RESTRICT="strip" |
41 |
-QA_PREBUILT="opt/${PN}/bin/libbreakgen*.so |
42 |
- opt/${PN}/bin/fsnotifier* |
43 |
- opt/${PN}/bin/lldb/* |
44 |
- opt/${PN}/lib/libpty/linux/x86*/libpty.so |
45 |
- opt/${PN}/plugins/android/lib/libwebp_jni*.so |
46 |
- opt/${PN}/plugins/android/resources/perfa/*/libperfa.so |
47 |
- opt/${PN}/plugins/android/resources/perfd/*/perfd |
48 |
- opt/${PN}/plugins/android/resources/simpleperf/*/simpleperf" |
49 |
- |
50 |
-VER_CMP=( $(ver_rs 1- ' ') ) |
51 |
-if [[ ${#VER_CMP[@]} -eq 6 ]]; then |
52 |
- STUDIO_V=$(ver_cut 1-4) |
53 |
- BUILD_V=$(ver_cut 5-6) |
54 |
-else |
55 |
- STUDIO_V=$(ver_cut 1-3) |
56 |
- BUILD_V=$(ver_cut 4-5) |
57 |
-fi |
58 |
- |
59 |
-DESCRIPTION="A new Android development environment based on IntelliJ IDEA" |
60 |
-HOMEPAGE="http://developer.android.com/sdk/installing/studio.html" |
61 |
-SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip" |
62 |
- |
63 |
-LICENSE="Apache-2.0" |
64 |
-SLOT="0" |
65 |
-IUSE="selinux" |
66 |
-KEYWORDS="amd64 x86" |
67 |
- |
68 |
-DEPEND="app-arch/zip |
69 |
- dev-java/commons-logging:0 |
70 |
- dev-java/log4j:0" |
71 |
- |
72 |
-# dev-java/guava:18 |
73 |
-RDEPEND=">=virtual/jdk-1.7 |
74 |
- selinux? ( sec-policy/selinux-android ) |
75 |
- >=app-arch/bzip2-1.0.6-r4 |
76 |
- dev-java/commons-logging:0 |
77 |
- dev-java/log4j:0 |
78 |
- >=dev-libs/expat-2.1.0-r3 |
79 |
- >=dev-libs/libffi-3.0.13-r1 |
80 |
- >=media-libs/fontconfig-2.10.92 |
81 |
- >=media-libs/freetype-2.5.5 |
82 |
- >=media-libs/libpng-1.2.51 |
83 |
- >=media-libs/mesa-10.2.8[X(+)] |
84 |
- || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) |
85 |
- >=sys-libs/ncurses-5.9-r3:5/5[tinfo] |
86 |
- >=sys-libs/zlib-1.2.8-r1 |
87 |
- >=x11-libs/libX11-1.6.2 |
88 |
- >=x11-libs/libXau-1.0.7-r1 |
89 |
- >=x11-libs/libXdamage-1.1.4-r1 |
90 |
- >=x11-libs/libXdmcp-1.1.1-r1 |
91 |
- >=x11-libs/libXext-1.3.2 |
92 |
- >=x11-libs/libXfixes-5.0.1 |
93 |
- >=x11-libs/libXrender-0.9.8 |
94 |
- >=x11-libs/libXxf86vm-1.1.3 |
95 |
- >=x11-libs/libdrm-2.4.46 |
96 |
- >=x11-libs/libxcb-1.9.1 |
97 |
- >=x11-libs/libxshmfence-1.1" |
98 |
-S=${WORKDIR}/${PN} |
99 |
-PATCHES=( "${FILESDIR}/0001-use-java-home-before-bundled.patch" ) |
100 |
- |
101 |
-src_prepare() { |
102 |
- eapply "${PATCHES[@]}" |
103 |
- eapply_user |
104 |
- |
105 |
- # This is really a bundled jdk not a jre |
106 |
- rm -rf "${S}/jre" || die "Could not remove bundled jdk" |
107 |
- |
108 |
- # Replace bundled jars with system |
109 |
- # has problems with newer jdom:0 not updated to jdom:2 |
110 |
- cd "${S}/lib" || die |
111 |
- local JARS="commons-logging log4j" |
112 |
- local j |
113 |
- for j in ${JARS}; do |
114 |
- rm -v ${j/:*/}*.jar || die |
115 |
- java-pkg_jar-from ${j} |
116 |
- done |
117 |
- |
118 |
- cd "${S}" || die |
119 |
- |
120 |
- # bug 629404 |
121 |
- echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die |
122 |
- echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die |
123 |
-} |
124 |
- |
125 |
-src_compile() { |
126 |
- : |
127 |
-} |
128 |
- |
129 |
-src_install() { |
130 |
- local dir="/opt/${PN}" |
131 |
- |
132 |
- insinto "${dir}" |
133 |
- doins -r * |
134 |
- |
135 |
- # Replaced bundled jre with system vm/jdk |
136 |
- # This is really a bundled jdk not a jre |
137 |
- rm -rf "${ED%/}${dir}/jre" || die |
138 |
- dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre" |
139 |
- |
140 |
- fperms 755 "${dir}/bin/studio.sh" "${dir}"/bin/fsnotifier{,64} |
141 |
- fperms -R 755 "${dir}"/bin/lldb/{android,bin} |
142 |
- chmod 755 "${ED%/}${dir}"/bin/*.py "${ED%/}${dir}"/bin/*.sh || die |
143 |
- chmod 755 "${ED%/}${dir}"/gradle/gradle-*/bin/gradle || die |
144 |
- |
145 |
- newicon "bin/studio.png" "${PN}.png" |
146 |
- make_wrapper ${PN} ${dir}/bin/studio.sh |
147 |
- make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio" |
148 |
-} |
149 |
|
150 |
diff --git a/dev-util/android-studio/android-studio-3.4.0.18.183.5452501.ebuild b/dev-util/android-studio/android-studio-3.4.0.18.183.5452501.ebuild |
151 |
deleted file mode 100644 |
152 |
index 060c081b0e8..00000000000 |
153 |
--- a/dev-util/android-studio/android-studio-3.4.0.18.183.5452501.ebuild |
154 |
+++ /dev/null |
155 |
@@ -1,131 +0,0 @@ |
156 |
-# Copyright 1999-2019 Gentoo Authors |
157 |
-# Distributed under the terms of the GNU General Public License v2 |
158 |
- |
159 |
-EAPI=7 |
160 |
-inherit desktop eutils java-pkg-2 |
161 |
- |
162 |
-RESTRICT="strip" |
163 |
-QA_PREBUILT=" |
164 |
- opt/${PN}/bin/fsnotifier* |
165 |
- opt/${PN}/bin/libdbm64.so |
166 |
- opt/${PN}/bin/lldb/* |
167 |
- opt/${PN}/custom-jdk/* |
168 |
- opt/${PN}/lib/pty4j-native/linux/x86*/libpty.so |
169 |
- opt/${PN}/plugins/android/lib/libwebp_jni*.so |
170 |
- opt/${PN}/plugins/android/resources/installer/*/installer |
171 |
- opt/${PN}/plugins/android/resources/perfa/*/libperfa.so |
172 |
- opt/${PN}/plugins/android/resources/perfd/*/perfd |
173 |
- opt/${PN}/plugins/android/resources/simpleperf/*/simpleperf |
174 |
- opt/${PN}/plugins/android/resources/simpleperf/*/libsimpleperf_report.so |
175 |
-" |
176 |
- |
177 |
-VER_CMP=( $(ver_rs 1- ' ') ) |
178 |
-if [[ ${#VER_CMP[@]} -eq 6 ]]; then |
179 |
- STUDIO_V=$(ver_cut 1-4) |
180 |
- BUILD_V=$(ver_cut 5-6) |
181 |
-else |
182 |
- STUDIO_V=$(ver_cut 1-3) |
183 |
- BUILD_V=$(ver_cut 4-5) |
184 |
-fi |
185 |
- |
186 |
-DESCRIPTION="Android development environment based on IntelliJ IDEA" |
187 |
-HOMEPAGE="http://developer.android.com/sdk/installing/studio.html" |
188 |
-SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.tar.gz" |
189 |
- |
190 |
-LICENSE="Apache-2.0" |
191 |
-SLOT="0" |
192 |
-IUSE="custom-jdk selinux" |
193 |
-KEYWORDS="amd64 x86" |
194 |
- |
195 |
-DEPEND=" |
196 |
- dev-java/commons-logging:0 |
197 |
- dev-java/log4j:0" |
198 |
- |
199 |
-RDEPEND="${DEPEND} |
200 |
- >=virtual/jdk-1.7 |
201 |
- selinux? ( sec-policy/selinux-android ) |
202 |
- >=app-arch/bzip2-1.0.6-r4 |
203 |
- dev-java/commons-logging:0 |
204 |
- dev-java/log4j:0 |
205 |
- >=dev-libs/expat-2.1.0-r3 |
206 |
- >=dev-libs/libffi-3.0.13-r1 |
207 |
- >=media-libs/fontconfig-2.10.92 |
208 |
- >=media-libs/freetype-2.5.5 |
209 |
- >=media-libs/libpng-1.2.51 |
210 |
- >=media-libs/mesa-10.2.8[X(+)] |
211 |
- || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) |
212 |
- >=sys-libs/ncurses-5.9-r3:5/5[tinfo] |
213 |
- >=sys-libs/zlib-1.2.8-r1 |
214 |
- >=x11-libs/libX11-1.6.2 |
215 |
- >=x11-libs/libXau-1.0.7-r1 |
216 |
- >=x11-libs/libXdamage-1.1.4-r1 |
217 |
- >=x11-libs/libXdmcp-1.1.1-r1 |
218 |
- >=x11-libs/libXext-1.3.2 |
219 |
- >=x11-libs/libXfixes-5.0.1 |
220 |
- >=x11-libs/libXrender-0.9.8 |
221 |
- >=x11-libs/libXxf86vm-1.1.3 |
222 |
- >=x11-libs/libdrm-2.4.46 |
223 |
- >=x11-libs/libxcb-1.9.1 |
224 |
- >=x11-libs/libxshmfence-1.1" |
225 |
-BDEPEND="dev-util/patchelf" |
226 |
-S=${WORKDIR}/${PN} |
227 |
-PATCHES=( "${FILESDIR}/0001-use-java-home-before-bundled.patch" ) |
228 |
- |
229 |
-src_prepare() { |
230 |
- eapply "${PATCHES[@]}" |
231 |
- eapply_user |
232 |
- |
233 |
- # This is really a bundled jdk not a jre |
234 |
- # If custom-jdk is not set bundled jre is replaced with system vm/jdk |
235 |
- if use custom-jdk; then |
236 |
- mv -f "${S}/jre" "${S}/custom-jdk" || die "Could not move bundled jdk" |
237 |
- else |
238 |
- rm -rf "${S}/jre" || die "Could not remove bundled jdk" |
239 |
- fi |
240 |
- # Replace bundled jars with system |
241 |
- # has problems with newer jdom:0 not updated to jdom:2 |
242 |
- cd "${S}/lib" || die |
243 |
- local JARS="commons-logging log4j" |
244 |
- local j |
245 |
- for j in ${JARS}; do |
246 |
- rm -v ${j/:*/}*.jar || die |
247 |
- java-pkg_jar-from ${j} |
248 |
- done |
249 |
- |
250 |
- cd "${S}" || die |
251 |
- |
252 |
- # bug 629404 |
253 |
- echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die |
254 |
- echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die |
255 |
-} |
256 |
- |
257 |
-src_compile() { |
258 |
- patchelf --set-rpath '$ORIGIN' bin/lldb/lib/readline.so || die "Failed to fix insecure RPATH" |
259 |
-} |
260 |
- |
261 |
-src_install() { |
262 |
- local dir="/opt/${PN}" |
263 |
- |
264 |
- insinto "${dir}" |
265 |
- doins -r * |
266 |
- |
267 |
- # This is really a bundled jdk not a jre |
268 |
- # If custom-jdk is not set bundled jre is replaced with system vm/jdk |
269 |
- if use custom-jdk; then |
270 |
- dosym "custom-jdk" "${dir}/jre" |
271 |
- else |
272 |
- dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre" |
273 |
- fi |
274 |
- |
275 |
- fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh} |
276 |
- fperms -R 755 "${dir}"/bin/lldb/{android,bin} |
277 |
- if use custom-jdk; then |
278 |
- fperms -R 755 "${dir}"/jre/{bin,jre/bin} |
279 |
- fperms 755 ${dir}/jre/jre/lib/jexec |
280 |
- fi |
281 |
- chmod 755 "${ED%/}${dir}"/gradle/gradle-*/bin/gradle || die |
282 |
- |
283 |
- newicon "bin/studio.png" "${PN}.png" |
284 |
- make_wrapper ${PN} ${dir}/bin/studio.sh |
285 |
- make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio" |
286 |
-} |