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