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