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