Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/android-sdk-update-manager/
Date: Thu, 24 Sep 2020 19:53:44
Message-Id: 1600977206.fa3738fe278d8250ae753996eeb4d90295d8c8fd.bman@gentoo
1 commit: fa3738fe278d8250ae753996eeb4d90295d8c8fd
2 Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 24 19:32:52 2020 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 24 19:53:26 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa3738fe
7
8 dev-util/android-sdk-update-manager: drop old EAPI=5
9
10 * Package needs to be last-rited next as upstream has deprecated and the
11 package is severely outdated in ::gentoo
12
13 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
14
15 dev-util/android-sdk-update-manager/Manifest | 11 ---
16 .../android-sdk-update-manager-21.1.ebuild | 99 --------------------
17 .../android-sdk-update-manager-21.ebuild | 99 --------------------
18 .../android-sdk-update-manager-22.0.1-r1.ebuild | 99 --------------------
19 .../android-sdk-update-manager-22.0.1.ebuild | 99 --------------------
20 .../android-sdk-update-manager-22.0.4.ebuild | 99 --------------------
21 .../android-sdk-update-manager-22.0.5-r1.ebuild | 100 --------------------
22 .../android-sdk-update-manager-22.0.5.ebuild | 99 --------------------
23 .../android-sdk-update-manager-22.2.1.ebuild | 100 --------------------
24 .../android-sdk-update-manager-22.3.ebuild | 102 ---------------------
25 .../android-sdk-update-manager-22.6.1.ebuild | 102 ---------------------
26 .../android-sdk-update-manager-22.6.ebuild | 102 ---------------------
27 .../android-sdk-update-manager-22.ebuild | 99 --------------------
28 .../android-sdk-update-manager-23-r1.ebuild | 102 ---------------------
29 .../android-sdk-update-manager-23.ebuild | 102 ---------------------
30 15 files changed, 1414 deletions(-)
31
32 diff --git a/dev-util/android-sdk-update-manager/Manifest b/dev-util/android-sdk-update-manager/Manifest
33 index 5a4fb8ea2af..9b10cdee2a4 100644
34 --- a/dev-util/android-sdk-update-manager/Manifest
35 +++ b/dev-util/android-sdk-update-manager/Manifest
36 @@ -1,12 +1 @@
37 -DIST android-sdk_r21-linux.tgz 91378351 BLAKE2B ed16738d018c3ff8c51bb833ecd329594379280e55e6558a5f5e5731c4e11f6f562675d8a79a252e318b01d5c20f0d13aa2ff6bcd4160a527d85816abb6d94e7 SHA512 3a3338265a2d00f8b7fbb35783d7449498afd8107ddd4ed4c2c34e47582d83eb23f78d02fe01db54c12c48dba0167f60118c1061f1bfeb0048147674fee8d87c
38 -DIST android-sdk_r21.1-linux.tgz 91617112 BLAKE2B 0b566613d0143b0136844a88f3d4f916a79b4e21588d828bc1bbd037f5290c0a6686cae4de1c34adc3b925132627ee7541501019438b659c12ce5158f82f878d SHA512 160cd51f965a23120cf63abe02b9a9ce8913d1239a848bc423b33ad10eff65b30147c6b11ab751aa12154292ce0a7837aa60def1cd31a2ccb5d4fc6fcb6d2c24
39 -DIST android-sdk_r22-linux.tgz 99643077 BLAKE2B 58bf529757a4ff0061961be89b080faf8250a0282354bf7742cde395ab2fa91cafd85a36037c02d04fd9bc230437120f4ce91582c9fa2f539a24dd420bf7f025 SHA512 9beda1ae872dde3ca7884d1c389566ce2c8b511ef74d95bc9ddf53683445cc454f9a5a1871a80d5826083d98713040cb1b8b239a77a8eadf56daf30440c7108d
40 -DIST android-sdk_r22.0.1-linux.tgz 105617062 BLAKE2B 026158fa5be24756f9da3c4dc1258f990d1b04169f6ff88d78da48ebe34e03639b56e77831000ffd805c9057b4d8b561a15ff2919a13b1ae2f4af2b87bbb493f SHA512 7c97ba8daf4a1b8b6e422d8fca21a5e23f3a5e92d769e13ab5e649a967f2662c71ae201a6c1d40202bda98c4fb80eaa60a3ff5e4af9f613cfab1366f63774ac7
41 -DIST android-sdk_r22.0.4-linux.tgz 105640988 BLAKE2B 30e26a4b23cb44a045353b2878f5c9584dcb783860c42203145471c3c5e384dd979b416661050ec2a294d357f9addc6c8592f3ff8c634cd33bbbf881f15d84d2 SHA512 10e047f6b5384d6c2d3f87e883203f2ab384ac826def16c07f1969d59dc79f97ccba36f0185d564fe0dd4811425fe18767c326b3712ee47b5515f0aba47ed612
42 -DIST android-sdk_r22.0.5-linux.tgz 105641005 BLAKE2B 938bafd72bb023bf2ae306944035cc77b34dea843e8fa2d22b27b8e76231aa256b0835bcfb83403ba8168f9e78071c5174054eadcfb025f23573bf9c89e863f1 SHA512 655f709994a8c5f9bd78216d8587bda66f23b7fccd556fd78adc989a835540af89529f2fb4d846e28196952a0a3c5bc919563c83fb73e6ecf7a4ad0560eb7f81
43 -DIST android-sdk_r22.2.1-linux.tgz 100918342 BLAKE2B ddd1bc701c554af04f0c9de995c5f30531a702e5e18eca709265b96210c99afb23092fc975b47c714d26ceb52e8f407b36993405c635be1f6e720f6df4e473f1 SHA512 4eb7087c27db2b2435aa11bba01fccd09617ea58dd84aca8b249d81b3d15c913844d204463a6d83064c6cf8f07e26c0f70130315b281b1bbfd32c01d6e53bfef
44 -DIST android-sdk_r22.3-linux.tgz 100968558 BLAKE2B 41f853635fba6973a0e78465553ac455fa9a995421327a31d554b80aef0f80305237c8ee2da2440ad27513b0e9b263ebed293f898bca13fedd6e5511e25d1654 SHA512 c05e610e0979f61d217b6612bccd48120719123cf80282cca442e81be6e0c4cfd5a4b3f398d1c8835c86bc67b730a7bf5a5e511abe57a1d70b6c1f62940832a3
45 -DIST android-sdk_r22.6-linux.tgz 100992666 BLAKE2B f3dd0d6ab53f7323dd911af4e4271cd2169627bd3ebf11901e1afea942b3f4af4b29a9192c88d6c71887a79762d34109666c1fb922d96871ac9126c8398d5baf SHA512 2e632e31725a7c8c5e99cba70388c928d553d52177a2a0d49abfae125d1ccb57857171f10cd28da57664d0d9ab0f7b6ae409c943ad4d4433b05e0b8fb1bfe322
46 -DIST android-sdk_r22.6.1-linux.tgz 101052129 BLAKE2B b1eb0a3a298bab8f4c4e085831221f795fe0e668ab407d71c2c79778b921d09e57ad393dfe53d34e7d8c49cb05dd655762ca266b82982c898b0eea8f5a0e6035 SHA512 5789a6b11a1a5c18145900042b15707f58afd6db82d345550c33e72cfbaf719c7c16667a7561e4c6ca624c2d2466430db7f8138bf0cd6449762639a63c6cf9ca
47 -DIST android-sdk_r23-linux.tgz 137880977 BLAKE2B 3a0e0d321bf89bddd4f4e3ed4e6b6ef0276623168d482c0d152f7946b93f8ff72ade780e6c5bdd2dc2ef633bc5df446a640bd52062373fdae162aff71c5ed154 SHA512 c6d8de870e8697b31132b25db93d6b494b44240ca421cab6a48bbf53d142ba488d08ac77a9995ed06953e311dd14ea1ecf4d2039428ed31ab255f9aaaf94ad60
48 DIST android-sdk_r24.4.1-linux.tgz 326412652 BLAKE2B 4263a5e942f0ee35069f4fc075504c637381820f40485c9753f5f586f713e614c204b3e5c35968acbc665644aaab4c2e05660e00675d956422cd7d1fc6445ed2 SHA512 96fb71d78a8c2833afeba6df617edcd6cc4e37ecd0c3bec38c39e78204ed3c2bd54b138a56086bf5ccd95e372e3c36e72c1550c13df8232ec19537da93049284
49
50 diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild
51 deleted file mode 100644
52 index 9b40483c021..00000000000
53 --- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild
54 +++ /dev/null
55 @@ -1,99 +0,0 @@
56 -# Copyright 1999-2020 Gentoo Authors
57 -# Distributed under the terms of the GNU General Public License v2
58 -
59 -EAPI=5
60 -
61 -inherit eutils user
62 -
63 -MY_P="android-sdk_r${PV}-linux"
64 -
65 -DESCRIPTION="Open Handset Alliance's Android SDK"
66 -HOMEPAGE="https://developer.android.com"
67 -SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
68 -IUSE=""
69 -RESTRICT="mirror"
70 -
71 -LICENSE="android"
72 -SLOT="0"
73 -KEYWORDS="~amd64 ~x86"
74 -
75 -DEPEND="app-arch/tar
76 - app-arch/gzip"
77 -RDEPEND=">=virtual/jdk-1.5
78 - >=dev-java/ant-core-1.6.5
79 - >=dev-java/swt-3.5[cairo]
80 - >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
81 -"
82 -
83 -ANDROID_SDK_DIR="/opt/${PN}"
84 -QA_FLAGS_IGNORED_x86="
85 - ${ANDROID_SDK_DIR/\/}/tools/emulator
86 - ${ANDROID_SDK_DIR/\/}/tools/adb
87 - ${ANDROID_SDK_DIR/\/}/tools/mksdcard
88 - ${ANDROID_SDK_DIR/\/}/tools/sqlite3
89 - ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
90 - ${ANDROID_SDK_DIR/\/}/tools/zipalign
91 - ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
92 -"
93 -QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
94 -
95 -QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
96 -
97 -S="${WORKDIR}/android-sdk-linux"
98 -
99 -pkg_setup() {
100 - enewgroup android
101 -}
102 -
103 -src_prepare() {
104 - rm -rf tools/lib/x86*
105 -}
106 -
107 -src_install() {
108 - dodoc tools/NOTICE.txt "SDK Readme.txt"
109 - rm -f tools/NOTICE.txt "SDK Readme.txt"
110 -
111 - dodir "${ANDROID_SDK_DIR}/tools"
112 - cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
113 -
114 - # Maybe this is needed for the tools directory too.
115 - dodir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp}
116 -
117 - fowners root:android "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools}
118 - fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools}
119 -
120 - echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
121 -
122 - SWT_PATH=
123 - SWT_VERSIONS="4.2 3.7 3.6 3.5"
124 - for version in $SWT_VERSIONS; do
125 - # redirecting stderr to /dev/null
126 - # not sure if this is best, but avoids misleading error messages
127 - SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
128 - if [ $SWT_PATH ]; then
129 - einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
130 - break
131 - fi
132 - done
133 -
134 - echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
135 -
136 - doenvd "${T}/80${PN}"
137 -
138 - echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
139 -
140 - insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
141 -
142 -}
143 -
144 -pkg_postinst() {
145 - elog "The Android SDK now uses its own manager for the development environment."
146 - elog "Run 'android' to download the full SDK, including some of the platform tools."
147 - elog "You must be in the android group to manage the development environment."
148 - elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
149 - elog "See https://developer.android.com/sdk/adding-components.html for more"
150 - elog "information."
151 - elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
152 - elog "You need to run env-update and source /etc/profile in any open shells"
153 - elog "if you get an SWT error."
154 -}
155
156 diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild
157 deleted file mode 100644
158 index 28f7786e0f2..00000000000
159 --- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild
160 +++ /dev/null
161 @@ -1,99 +0,0 @@
162 -# Copyright 1999-2020 Gentoo Authors
163 -# Distributed under the terms of the GNU General Public License v2
164 -
165 -EAPI=5
166 -
167 -inherit eutils user
168 -
169 -MY_P="android-sdk_r${PV}-linux"
170 -
171 -DESCRIPTION="Open Handset Alliance's Android SDK"
172 -HOMEPAGE="https://developer.android.com"
173 -SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
174 -IUSE=""
175 -RESTRICT="mirror"
176 -
177 -LICENSE="android"
178 -SLOT="0"
179 -KEYWORDS="~amd64 ~x86"
180 -
181 -DEPEND="app-arch/tar
182 - app-arch/gzip"
183 -RDEPEND="
184 - >=virtual/jdk-1.5
185 - >=dev-java/ant-core-1.6.5
186 - >=dev-java/swt-3.5[cairo]
187 - >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
188 -"
189 -
190 -ANDROID_SDK_DIR="/opt/${PN}"
191 -QA_FLAGS_IGNORED_x86="
192 - ${ANDROID_SDK_DIR/\/}/tools/emulator
193 - ${ANDROID_SDK_DIR/\/}/tools/adb
194 - ${ANDROID_SDK_DIR/\/}/tools/mksdcard
195 - ${ANDROID_SDK_DIR/\/}/tools/sqlite3
196 - ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
197 - ${ANDROID_SDK_DIR/\/}/tools/zipalign
198 - ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
199 -"
200 -QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
201 -
202 -QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
203 -
204 -S="${WORKDIR}/android-sdk-linux"
205 -
206 -pkg_setup() {
207 - enewgroup android
208 -}
209 -
210 -src_prepare() {
211 - rm -rf tools/lib/x86*
212 -}
213 -
214 -src_install() {
215 - dodoc tools/NOTICE.txt "SDK Readme.txt"
216 - rm -f tools/NOTICE.txt "SDK Readme.txt"
217 -
218 - dodir "${ANDROID_SDK_DIR}/tools"
219 - cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
220 -
221 - # Maybe this is needed for the tools directory too.
222 - dodir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp}
223 -
224 - fowners root:android "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools}
225 - fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools}
226 -
227 - echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
228 -
229 - SWT_PATH=
230 - SWT_VERSIONS="4.2 3.7 3.6 3.5"
231 - for version in $SWT_VERSIONS; do
232 - # redirecting stderr to /dev/null
233 - # not sure if this is best, but avoids misleading error messages
234 - SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
235 - if [ $SWT_PATH ]; then
236 - einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
237 - break
238 - fi
239 - done
240 -
241 - echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
242 -
243 - doenvd "${T}/80${PN}"
244 -
245 - echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
246 -
247 - insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
248 -}
249 -
250 -pkg_postinst() {
251 - elog "The Android SDK now uses its own manager for the development environment."
252 - elog "Run 'android' to download the full SDK, including some of the platform tools."
253 - elog "You must be in the android group to manage the development environment."
254 - elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
255 - elog "See https://developer.android.com/sdk/adding-components.html for more"
256 - elog "information."
257 - elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
258 - elog "You need to run env-update and source /etc/profile in any open shells"
259 - elog "if you get an SWT error."
260 -}
261
262 diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
263 deleted file mode 100644
264 index b54ac2b090f..00000000000
265 --- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
266 +++ /dev/null
267 @@ -1,99 +0,0 @@
268 -# Copyright 1999-2020 Gentoo Authors
269 -# Distributed under the terms of the GNU General Public License v2
270 -
271 -EAPI="5"
272 -
273 -inherit eutils user
274 -
275 -MY_P="android-sdk_r${PV}-linux"
276 -
277 -DESCRIPTION="Open Handset Alliance's Android SDK"
278 -HOMEPAGE="https://developer.android.com"
279 -SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
280 -IUSE=""
281 -RESTRICT="mirror"
282 -
283 -LICENSE="android"
284 -SLOT="0"
285 -KEYWORDS="~amd64 ~x86"
286 -
287 -DEPEND="app-arch/tar
288 - app-arch/gzip"
289 -RDEPEND=">=virtual/jdk-1.5
290 - >=dev-java/ant-core-1.6.5
291 - dev-java/swt:3.7[cairo]
292 - >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
293 -"
294 -
295 -ANDROID_SDK_DIR="/opt/${PN}"
296 -QA_FLAGS_IGNORED_x86="
297 - ${ANDROID_SDK_DIR/\/}/tools/emulator
298 - ${ANDROID_SDK_DIR/\/}/tools/adb
299 - ${ANDROID_SDK_DIR/\/}/tools/mksdcard
300 - ${ANDROID_SDK_DIR/\/}/tools/sqlite3
301 - ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
302 - ${ANDROID_SDK_DIR/\/}/tools/zipalign
303 - ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
304 -"
305 -QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
306 -
307 -QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
308 -
309 -S="${WORKDIR}/android-sdk-linux"
310 -
311 -pkg_setup() {
312 - enewgroup android
313 -}
314 -
315 -src_prepare() {
316 - rm -rf tools/lib/x86*
317 -}
318 -
319 -src_install() {
320 - dodoc tools/NOTICE.txt "SDK Readme.txt"
321 - rm -f tools/NOTICE.txt "SDK Readme.txt"
322 -
323 - dodir "${ANDROID_SDK_DIR}/tools"
324 - cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
325 -
326 - # Maybe this is needed for the tools directory too.
327 - dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
328 -
329 - fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
330 - fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
331 -
332 - echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
333 -
334 - SWT_PATH=
335 - SWT_VERSIONS="3.7 3.6"
336 - for version in $SWT_VERSIONS; do
337 - # redirecting stderr to /dev/null
338 - # not sure if this is best, but avoids misleading error messages
339 - SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
340 - if [ $SWT_PATH ]; then
341 - einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
342 - break
343 - fi
344 - done
345 -
346 - echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
347 -
348 - doenvd "${T}/80${PN}"
349 -
350 - echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
351 -
352 - insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
353 -
354 -}
355 -
356 -pkg_postinst() {
357 - elog "The Android SDK now uses its own manager for the development environment."
358 - elog "Run 'android' to download the full SDK, including some of the platform tools."
359 - elog "You must be in the android group to manage the development environment."
360 - elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
361 - elog "See https://developer.android.com/sdk/adding-components.html for more"
362 - elog "information."
363 - elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
364 - elog "You need to run env-update and source /etc/profile in any open shells"
365 - elog "if you get an SWT error."
366 -}
367
368 diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild
369 deleted file mode 100644
370 index 1353edbc0ba..00000000000
371 --- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild
372 +++ /dev/null
373 @@ -1,99 +0,0 @@
374 -# Copyright 1999-2020 Gentoo Authors
375 -# Distributed under the terms of the GNU General Public License v2
376 -
377 -EAPI=5
378 -
379 -inherit eutils user
380 -
381 -MY_P="android-sdk_r${PV}-linux"
382 -
383 -DESCRIPTION="Open Handset Alliance's Android SDK"
384 -HOMEPAGE="https://developer.android.com"
385 -SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
386 -IUSE=""
387 -RESTRICT="mirror"
388 -
389 -LICENSE="android"
390 -SLOT="0"
391 -KEYWORDS="~amd64 ~x86"
392 -
393 -DEPEND="app-arch/tar
394 - app-arch/gzip"
395 -RDEPEND=">=virtual/jdk-1.5
396 - >=dev-java/ant-core-1.6.5
397 - >=dev-java/swt-3.5[cairo]
398 - >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
399 -"
400 -
401 -ANDROID_SDK_DIR="/opt/${PN}"
402 -QA_FLAGS_IGNORED_x86="
403 - ${ANDROID_SDK_DIR/\/}/tools/emulator
404 - ${ANDROID_SDK_DIR/\/}/tools/adb
405 - ${ANDROID_SDK_DIR/\/}/tools/mksdcard
406 - ${ANDROID_SDK_DIR/\/}/tools/sqlite3
407 - ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
408 - ${ANDROID_SDK_DIR/\/}/tools/zipalign
409 - ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
410 -"
411 -QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
412 -
413 -QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
414 -
415 -S="${WORKDIR}/android-sdk-linux"
416 -
417 -pkg_setup() {
418 - enewgroup android
419 -}
420 -
421 -src_prepare() {
422 - rm -rf tools/lib/x86*
423 -}
424 -
425 -src_install() {
426 - dodoc tools/NOTICE.txt "SDK Readme.txt"
427 - rm -f tools/NOTICE.txt "SDK Readme.txt"
428 -
429 - dodir "${ANDROID_SDK_DIR}/tools"
430 - cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
431 -
432 - # Maybe this is needed for the tools directory too.
433 - dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
434 -
435 - fowners root:android "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
436 - fperms 0775 "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
437 -
438 - echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
439 -
440 - SWT_PATH=
441 - SWT_VERSIONS="4.2 3.7 3.6 3.5"
442 - for version in $SWT_VERSIONS; do
443 - # redirecting stderr to /dev/null
444 - # not sure if this is best, but avoids misleading error messages
445 - SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
446 - if [ $SWT_PATH ]; then
447 - einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
448 - break
449 - fi
450 - done
451 -
452 - echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
453 -
454 - doenvd "${T}/80${PN}"
455 -
456 - echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
457 -
458 - insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
459 -
460 -}
461 -
462 -pkg_postinst() {
463 - elog "The Android SDK now uses its own manager for the development environment."
464 - elog "Run 'android' to download the full SDK, including some of the platform tools."
465 - elog "You must be in the android group to manage the development environment."
466 - elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
467 - elog "See https://developer.android.com/sdk/adding-components.html for more"
468 - elog "information."
469 - elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
470 - elog "You need to run env-update and source /etc/profile in any open shells"
471 - elog "if you get an SWT error."
472 -}
473
474 diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
475 deleted file mode 100644
476 index b54ac2b090f..00000000000
477 --- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
478 +++ /dev/null
479 @@ -1,99 +0,0 @@
480 -# Copyright 1999-2020 Gentoo Authors
481 -# Distributed under the terms of the GNU General Public License v2
482 -
483 -EAPI="5"
484 -
485 -inherit eutils user
486 -
487 -MY_P="android-sdk_r${PV}-linux"
488 -
489 -DESCRIPTION="Open Handset Alliance's Android SDK"
490 -HOMEPAGE="https://developer.android.com"
491 -SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
492 -IUSE=""
493 -RESTRICT="mirror"
494 -
495 -LICENSE="android"
496 -SLOT="0"
497 -KEYWORDS="~amd64 ~x86"
498 -
499 -DEPEND="app-arch/tar
500 - app-arch/gzip"
501 -RDEPEND=">=virtual/jdk-1.5
502 - >=dev-java/ant-core-1.6.5
503 - dev-java/swt:3.7[cairo]
504 - >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
505 -"
506 -
507 -ANDROID_SDK_DIR="/opt/${PN}"
508 -QA_FLAGS_IGNORED_x86="
509 - ${ANDROID_SDK_DIR/\/}/tools/emulator
510 - ${ANDROID_SDK_DIR/\/}/tools/adb
511 - ${ANDROID_SDK_DIR/\/}/tools/mksdcard
512 - ${ANDROID_SDK_DIR/\/}/tools/sqlite3
513 - ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
514 - ${ANDROID_SDK_DIR/\/}/tools/zipalign
515 - ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
516 -"
517 -QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
518 -
519 -QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
520 -
521 -S="${WORKDIR}/android-sdk-linux"
522 -
523 -pkg_setup() {
524 - enewgroup android
525 -}
526 -
527 -src_prepare() {
528 - rm -rf tools/lib/x86*
529 -}
530 -
531 -src_install() {
532 - dodoc tools/NOTICE.txt "SDK Readme.txt"
533 - rm -f tools/NOTICE.txt "SDK Readme.txt"
534 -
535 - dodir "${ANDROID_SDK_DIR}/tools"
536 - cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
537 -
538 - # Maybe this is needed for the tools directory too.
539 - dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
540 -
541 - fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
542 - fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
543 -
544 - echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
545 -
546 - SWT_PATH=
547 - SWT_VERSIONS="3.7 3.6"
548 - for version in $SWT_VERSIONS; do
549 - # redirecting stderr to /dev/null
550 - # not sure if this is best, but avoids misleading error messages
551 - SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
552 - if [ $SWT_PATH ]; then
553 - einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
554 - break
555 - fi
556 - done
557 -
558 - echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
559 -
560 - doenvd "${T}/80${PN}"
561 -
562 - echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
563 -
564 - insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
565 -
566 -}
567 -
568 -pkg_postinst() {
569 - elog "The Android SDK now uses its own manager for the development environment."
570 - elog "Run 'android' to download the full SDK, including some of the platform tools."
571 - elog "You must be in the android group to manage the development environment."
572 - elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
573 - elog "See https://developer.android.com/sdk/adding-components.html for more"
574 - elog "information."
575 - elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
576 - elog "You need to run env-update and source /etc/profile in any open shells"
577 - elog "if you get an SWT error."
578 -}
579
580 diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
581 deleted file mode 100644
582 index d335afb3378..00000000000
583 --- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
584 +++ /dev/null
585 @@ -1,100 +0,0 @@
586 -# Copyright 1999-2020 Gentoo Authors
587 -# Distributed under the terms of the GNU General Public License v2
588 -
589 -EAPI="5"
590 -
591 -inherit eutils user
592 -
593 -MY_P="android-sdk_r${PV}-linux"
594 -
595 -DESCRIPTION="Open Handset Alliance's Android SDK"
596 -HOMEPAGE="https://developer.android.com"
597 -SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
598 -IUSE=""
599 -RESTRICT="mirror"
600 -
601 -LICENSE="android"
602 -SLOT="0"
603 -KEYWORDS="~amd64 ~x86"
604 -
605 -DEPEND="app-arch/tar
606 - app-arch/gzip"
607 -RDEPEND=">=virtual/jdk-1.5
608 - >=dev-java/ant-core-1.6.5
609 - dev-java/swt:3.7[cairo]
610 - >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
611 -"
612 -
613 -ANDROID_SDK_DIR="/opt/${PN}"
614 -QA_FLAGS_IGNORED_x86="
615 - ${ANDROID_SDK_DIR/\/}/tools/emulator
616 - ${ANDROID_SDK_DIR/\/}/tools/adb
617 - ${ANDROID_SDK_DIR/\/}/tools/mksdcard
618 - ${ANDROID_SDK_DIR/\/}/tools/sqlite3
619 - ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
620 - ${ANDROID_SDK_DIR/\/}/tools/zipalign
621 - ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
622 -"
623 -QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
624 -
625 -QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
626 -
627 -S="${WORKDIR}/android-sdk-linux"
628 -
629 -pkg_setup() {
630 - enewgroup android
631 -}
632 -
633 -src_prepare() {
634 - rm -rf tools/lib/x86*
635 -}
636 -
637 -src_install() {
638 - dodoc tools/NOTICE.txt "SDK Readme.txt"
639 - rm -f tools/NOTICE.txt "SDK Readme.txt"
640 -
641 - dodir "${ANDROID_SDK_DIR}/tools"
642 - cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
643 -
644 - # Maybe this is needed for the tools directory too.
645 - dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
646 -
647 - fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
648 - fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
649 -
650 - echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
651 -
652 - SWT_PATH=
653 - SWT_VERSIONS="3.7 3.6"
654 - for version in $SWT_VERSIONS; do
655 - # redirecting stderr to /dev/null
656 - # not sure if this is best, but avoids misleading error messages
657 - SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
658 - if [ $SWT_PATH ]; then
659 - einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
660 - break
661 - fi
662 - done
663 -
664 - echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
665 - echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
666 -
667 - doenvd "${T}/80${PN}"
668 -
669 - echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
670 -
671 - insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
672 -
673 -}
674 -
675 -pkg_postinst() {
676 - elog "The Android SDK now uses its own manager for the development environment."
677 - elog "Run 'android' to download the full SDK, including some of the platform tools."
678 - elog "You must be in the android group to manage the development environment."
679 - elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
680 - elog "See https://developer.android.com/sdk/adding-components.html for more"
681 - elog "information."
682 - elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
683 - elog "You need to run env-update and source /etc/profile in any open shells"
684 - elog "if you get an SWT error."
685 -}
686
687 diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
688 deleted file mode 100644
689 index b54ac2b090f..00000000000
690 --- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
691 +++ /dev/null
692 @@ -1,99 +0,0 @@
693 -# Copyright 1999-2020 Gentoo Authors
694 -# Distributed under the terms of the GNU General Public License v2
695 -
696 -EAPI="5"
697 -
698 -inherit eutils user
699 -
700 -MY_P="android-sdk_r${PV}-linux"
701 -
702 -DESCRIPTION="Open Handset Alliance's Android SDK"
703 -HOMEPAGE="https://developer.android.com"
704 -SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
705 -IUSE=""
706 -RESTRICT="mirror"
707 -
708 -LICENSE="android"
709 -SLOT="0"
710 -KEYWORDS="~amd64 ~x86"
711 -
712 -DEPEND="app-arch/tar
713 - app-arch/gzip"
714 -RDEPEND=">=virtual/jdk-1.5
715 - >=dev-java/ant-core-1.6.5
716 - dev-java/swt:3.7[cairo]
717 - >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
718 -"
719 -
720 -ANDROID_SDK_DIR="/opt/${PN}"
721 -QA_FLAGS_IGNORED_x86="
722 - ${ANDROID_SDK_DIR/\/}/tools/emulator
723 - ${ANDROID_SDK_DIR/\/}/tools/adb
724 - ${ANDROID_SDK_DIR/\/}/tools/mksdcard
725 - ${ANDROID_SDK_DIR/\/}/tools/sqlite3
726 - ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
727 - ${ANDROID_SDK_DIR/\/}/tools/zipalign
728 - ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
729 -"
730 -QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
731 -
732 -QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
733 -
734 -S="${WORKDIR}/android-sdk-linux"
735 -
736 -pkg_setup() {
737 - enewgroup android
738 -}
739 -
740 -src_prepare() {
741 - rm -rf tools/lib/x86*
742 -}
743 -
744 -src_install() {
745 - dodoc tools/NOTICE.txt "SDK Readme.txt"
746 - rm -f tools/NOTICE.txt "SDK Readme.txt"
747 -
748 - dodir "${ANDROID_SDK_DIR}/tools"
749 - cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
750 -
751 - # Maybe this is needed for the tools directory too.
752 - dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
753 -
754 - fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
755 - fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
756 -
757 - echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
758 -
759 - SWT_PATH=
760 - SWT_VERSIONS="3.7 3.6"
761 - for version in $SWT_VERSIONS; do
762 - # redirecting stderr to /dev/null
763 - # not sure if this is best, but avoids misleading error messages
764 - SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
765 - if [ $SWT_PATH ]; then
766 - einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
767 - break
768 - fi
769 - done
770 -
771 - echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
772 -
773 - doenvd "${T}/80${PN}"
774 -
775 - echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
776 -
777 - insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
778 -
779 -}
780 -
781 -pkg_postinst() {
782 - elog "The Android SDK now uses its own manager for the development environment."
783 - elog "Run 'android' to download the full SDK, including some of the platform tools."
784 - elog "You must be in the android group to manage the development environment."
785 - elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
786 - elog "See https://developer.android.com/sdk/adding-components.html for more"
787 - elog "information."
788 - elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
789 - elog "You need to run env-update and source /etc/profile in any open shells"
790 - elog "if you get an SWT error."
791 -}
792
793 diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
794 deleted file mode 100644
795 index d335afb3378..00000000000
796 --- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
797 +++ /dev/null
798 @@ -1,100 +0,0 @@
799 -# Copyright 1999-2020 Gentoo Authors
800 -# Distributed under the terms of the GNU General Public License v2
801 -
802 -EAPI="5"
803 -
804 -inherit eutils user
805 -
806 -MY_P="android-sdk_r${PV}-linux"
807 -
808 -DESCRIPTION="Open Handset Alliance's Android SDK"
809 -HOMEPAGE="https://developer.android.com"
810 -SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
811 -IUSE=""
812 -RESTRICT="mirror"
813 -
814 -LICENSE="android"
815 -SLOT="0"
816 -KEYWORDS="~amd64 ~x86"
817 -
818 -DEPEND="app-arch/tar
819 - app-arch/gzip"
820 -RDEPEND=">=virtual/jdk-1.5
821 - >=dev-java/ant-core-1.6.5
822 - dev-java/swt:3.7[cairo]
823 - >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
824 -"
825 -
826 -ANDROID_SDK_DIR="/opt/${PN}"
827 -QA_FLAGS_IGNORED_x86="
828 - ${ANDROID_SDK_DIR/\/}/tools/emulator
829 - ${ANDROID_SDK_DIR/\/}/tools/adb
830 - ${ANDROID_SDK_DIR/\/}/tools/mksdcard
831 - ${ANDROID_SDK_DIR/\/}/tools/sqlite3
832 - ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
833 - ${ANDROID_SDK_DIR/\/}/tools/zipalign
834 - ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
835 -"
836 -QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
837 -
838 -QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
839 -
840 -S="${WORKDIR}/android-sdk-linux"
841 -
842 -pkg_setup() {
843 - enewgroup android
844 -}
845 -
846 -src_prepare() {
847 - rm -rf tools/lib/x86*
848 -}
849 -
850 -src_install() {
851 - dodoc tools/NOTICE.txt "SDK Readme.txt"
852 - rm -f tools/NOTICE.txt "SDK Readme.txt"
853 -
854 - dodir "${ANDROID_SDK_DIR}/tools"
855 - cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
856 -
857 - # Maybe this is needed for the tools directory too.
858 - dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
859 -
860 - fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
861 - fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
862 -
863 - echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
864 -
865 - SWT_PATH=
866 - SWT_VERSIONS="3.7 3.6"
867 - for version in $SWT_VERSIONS; do
868 - # redirecting stderr to /dev/null
869 - # not sure if this is best, but avoids misleading error messages
870 - SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
871 - if [ $SWT_PATH ]; then
872 - einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
873 - break
874 - fi
875 - done
876 -
877 - echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
878 - echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
879 -
880 - doenvd "${T}/80${PN}"
881 -
882 - echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
883 -
884 - insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
885 -
886 -}
887 -
888 -pkg_postinst() {
889 - elog "The Android SDK now uses its own manager for the development environment."
890 - elog "Run 'android' to download the full SDK, including some of the platform tools."
891 - elog "You must be in the android group to manage the development environment."
892 - elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
893 - elog "See https://developer.android.com/sdk/adding-components.html for more"
894 - elog "information."
895 - elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
896 - elog "You need to run env-update and source /etc/profile in any open shells"
897 - elog "if you get an SWT error."
898 -}
899
900 diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
901 deleted file mode 100644
902 index 42c6e14d981..00000000000
903 --- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
904 +++ /dev/null
905 @@ -1,102 +0,0 @@
906 -# Copyright 1999-2020 Gentoo Authors
907 -# Distributed under the terms of the GNU General Public License v2
908 -
909 -EAPI="5"
910 -
911 -inherit eutils user udev
912 -
913 -MY_P="android-sdk_r${PV}-linux"
914 -
915 -DESCRIPTION="Open Handset Alliance's Android SDK"
916 -HOMEPAGE="https://developer.android.com"
917 -SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
918 -IUSE=""
919 -RESTRICT="mirror"
920 -
921 -LICENSE="android"
922 -SLOT="0"
923 -KEYWORDS="~amd64 ~x86"
924 -
925 -DEPEND="app-arch/tar
926 - app-arch/gzip"
927 -RDEPEND=">=virtual/jdk-1.5
928 - >=dev-java/ant-core-1.6.5
929 - dev-java/swt:3.7[cairo]
930 - >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
931 -"
932 -
933 -ANDROID_SDK_DIR="/opt/${PN}"
934 -QA_FLAGS_IGNORED_x86="
935 - ${ANDROID_SDK_DIR/\/}/tools/emulator
936 - ${ANDROID_SDK_DIR/\/}/tools/adb
937 - ${ANDROID_SDK_DIR/\/}/tools/mksdcard
938 - ${ANDROID_SDK_DIR/\/}/tools/sqlite3
939 - ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
940 - ${ANDROID_SDK_DIR/\/}/tools/zipalign
941 - ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
942 -"
943 -QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
944 -
945 -QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
946 -
947 -S="${WORKDIR}/android-sdk-linux"
948 -
949 -pkg_setup() {
950 - enewgroup android
951 -}
952 -
953 -src_prepare() {
954 - rm -rf tools/lib/x86*
955 -}
956 -
957 -src_install() {
958 - dodoc tools/NOTICE.txt "SDK Readme.txt"
959 - rm -f tools/NOTICE.txt "SDK Readme.txt"
960 -
961 - dodir "${ANDROID_SDK_DIR}/tools"
962 - cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
963 -
964 - # Maybe this is needed for the tools directory too.
965 - dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
966 -
967 - fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
968 - fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
969 -
970 - echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
971 -
972 - SWT_PATH=
973 - SWT_VERSIONS="3.7 3.6"
974 - for version in $SWT_VERSIONS; do
975 - # redirecting stderr to /dev/null
976 - # not sure if this is best, but avoids misleading error messages
977 - SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
978 - if [ $SWT_PATH ]; then
979 - einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
980 - break
981 - fi
982 - done
983 -
984 - echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
985 - echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
986 -
987 - doenvd "${T}/80${PN}"
988 -
989 - echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
990 -
991 - insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
992 -
993 - udev_dorules "${FILESDIR}"/80-android.rules || die
994 - domenu "${FILESDIR}"/android-sdk-update-manager.desktop
995 -}
996 -
997 -pkg_postinst() {
998 - elog "The Android SDK now uses its own manager for the development environment."
999 - elog "Run 'android' to download the full SDK, including some of the platform tools."
1000 - elog "You must be in the android group to manage the development environment."
1001 - elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
1002 - elog "See https://developer.android.com/sdk/adding-components.html for more"
1003 - elog "information."
1004 - elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
1005 - elog "You need to run env-update and source /etc/profile in any open shells"
1006 - elog "if you get an SWT error."
1007 -}
1008
1009 diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
1010 deleted file mode 100644
1011 index 42c6e14d981..00000000000
1012 --- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
1013 +++ /dev/null
1014 @@ -1,102 +0,0 @@
1015 -# Copyright 1999-2020 Gentoo Authors
1016 -# Distributed under the terms of the GNU General Public License v2
1017 -
1018 -EAPI="5"
1019 -
1020 -inherit eutils user udev
1021 -
1022 -MY_P="android-sdk_r${PV}-linux"
1023 -
1024 -DESCRIPTION="Open Handset Alliance's Android SDK"
1025 -HOMEPAGE="https://developer.android.com"
1026 -SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
1027 -IUSE=""
1028 -RESTRICT="mirror"
1029 -
1030 -LICENSE="android"
1031 -SLOT="0"
1032 -KEYWORDS="~amd64 ~x86"
1033 -
1034 -DEPEND="app-arch/tar
1035 - app-arch/gzip"
1036 -RDEPEND=">=virtual/jdk-1.5
1037 - >=dev-java/ant-core-1.6.5
1038 - dev-java/swt:3.7[cairo]
1039 - >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
1040 -"
1041 -
1042 -ANDROID_SDK_DIR="/opt/${PN}"
1043 -QA_FLAGS_IGNORED_x86="
1044 - ${ANDROID_SDK_DIR/\/}/tools/emulator
1045 - ${ANDROID_SDK_DIR/\/}/tools/adb
1046 - ${ANDROID_SDK_DIR/\/}/tools/mksdcard
1047 - ${ANDROID_SDK_DIR/\/}/tools/sqlite3
1048 - ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
1049 - ${ANDROID_SDK_DIR/\/}/tools/zipalign
1050 - ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
1051 -"
1052 -QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
1053 -
1054 -QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
1055 -
1056 -S="${WORKDIR}/android-sdk-linux"
1057 -
1058 -pkg_setup() {
1059 - enewgroup android
1060 -}
1061 -
1062 -src_prepare() {
1063 - rm -rf tools/lib/x86*
1064 -}
1065 -
1066 -src_install() {
1067 - dodoc tools/NOTICE.txt "SDK Readme.txt"
1068 - rm -f tools/NOTICE.txt "SDK Readme.txt"
1069 -
1070 - dodir "${ANDROID_SDK_DIR}/tools"
1071 - cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
1072 -
1073 - # Maybe this is needed for the tools directory too.
1074 - dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
1075 -
1076 - fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
1077 - fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
1078 -
1079 - echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
1080 -
1081 - SWT_PATH=
1082 - SWT_VERSIONS="3.7 3.6"
1083 - for version in $SWT_VERSIONS; do
1084 - # redirecting stderr to /dev/null
1085 - # not sure if this is best, but avoids misleading error messages
1086 - SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
1087 - if [ $SWT_PATH ]; then
1088 - einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
1089 - break
1090 - fi
1091 - done
1092 -
1093 - echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
1094 - echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
1095 -
1096 - doenvd "${T}/80${PN}"
1097 -
1098 - echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
1099 -
1100 - insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
1101 -
1102 - udev_dorules "${FILESDIR}"/80-android.rules || die
1103 - domenu "${FILESDIR}"/android-sdk-update-manager.desktop
1104 -}
1105 -
1106 -pkg_postinst() {
1107 - elog "The Android SDK now uses its own manager for the development environment."
1108 - elog "Run 'android' to download the full SDK, including some of the platform tools."
1109 - elog "You must be in the android group to manage the development environment."
1110 - elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
1111 - elog "See https://developer.android.com/sdk/adding-components.html for more"
1112 - elog "information."
1113 - elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
1114 - elog "You need to run env-update and source /etc/profile in any open shells"
1115 - elog "if you get an SWT error."
1116 -}
1117
1118 diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild
1119 deleted file mode 100644
1120 index 42c6e14d981..00000000000
1121 --- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild
1122 +++ /dev/null
1123 @@ -1,102 +0,0 @@
1124 -# Copyright 1999-2020 Gentoo Authors
1125 -# Distributed under the terms of the GNU General Public License v2
1126 -
1127 -EAPI="5"
1128 -
1129 -inherit eutils user udev
1130 -
1131 -MY_P="android-sdk_r${PV}-linux"
1132 -
1133 -DESCRIPTION="Open Handset Alliance's Android SDK"
1134 -HOMEPAGE="https://developer.android.com"
1135 -SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
1136 -IUSE=""
1137 -RESTRICT="mirror"
1138 -
1139 -LICENSE="android"
1140 -SLOT="0"
1141 -KEYWORDS="~amd64 ~x86"
1142 -
1143 -DEPEND="app-arch/tar
1144 - app-arch/gzip"
1145 -RDEPEND=">=virtual/jdk-1.5
1146 - >=dev-java/ant-core-1.6.5
1147 - dev-java/swt:3.7[cairo]
1148 - >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
1149 -"
1150 -
1151 -ANDROID_SDK_DIR="/opt/${PN}"
1152 -QA_FLAGS_IGNORED_x86="
1153 - ${ANDROID_SDK_DIR/\/}/tools/emulator
1154 - ${ANDROID_SDK_DIR/\/}/tools/adb
1155 - ${ANDROID_SDK_DIR/\/}/tools/mksdcard
1156 - ${ANDROID_SDK_DIR/\/}/tools/sqlite3
1157 - ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
1158 - ${ANDROID_SDK_DIR/\/}/tools/zipalign
1159 - ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
1160 -"
1161 -QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
1162 -
1163 -QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
1164 -
1165 -S="${WORKDIR}/android-sdk-linux"
1166 -
1167 -pkg_setup() {
1168 - enewgroup android
1169 -}
1170 -
1171 -src_prepare() {
1172 - rm -rf tools/lib/x86*
1173 -}
1174 -
1175 -src_install() {
1176 - dodoc tools/NOTICE.txt "SDK Readme.txt"
1177 - rm -f tools/NOTICE.txt "SDK Readme.txt"
1178 -
1179 - dodir "${ANDROID_SDK_DIR}/tools"
1180 - cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
1181 -
1182 - # Maybe this is needed for the tools directory too.
1183 - dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
1184 -
1185 - fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
1186 - fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
1187 -
1188 - echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
1189 -
1190 - SWT_PATH=
1191 - SWT_VERSIONS="3.7 3.6"
1192 - for version in $SWT_VERSIONS; do
1193 - # redirecting stderr to /dev/null
1194 - # not sure if this is best, but avoids misleading error messages
1195 - SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
1196 - if [ $SWT_PATH ]; then
1197 - einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
1198 - break
1199 - fi
1200 - done
1201 -
1202 - echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
1203 - echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
1204 -
1205 - doenvd "${T}/80${PN}"
1206 -
1207 - echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
1208 -
1209 - insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
1210 -
1211 - udev_dorules "${FILESDIR}"/80-android.rules || die
1212 - domenu "${FILESDIR}"/android-sdk-update-manager.desktop
1213 -}
1214 -
1215 -pkg_postinst() {
1216 - elog "The Android SDK now uses its own manager for the development environment."
1217 - elog "Run 'android' to download the full SDK, including some of the platform tools."
1218 - elog "You must be in the android group to manage the development environment."
1219 - elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
1220 - elog "See https://developer.android.com/sdk/adding-components.html for more"
1221 - elog "information."
1222 - elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
1223 - elog "You need to run env-update and source /etc/profile in any open shells"
1224 - elog "if you get an SWT error."
1225 -}
1226
1227 diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild
1228 deleted file mode 100644
1229 index 1353edbc0ba..00000000000
1230 --- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild
1231 +++ /dev/null
1232 @@ -1,99 +0,0 @@
1233 -# Copyright 1999-2020 Gentoo Authors
1234 -# Distributed under the terms of the GNU General Public License v2
1235 -
1236 -EAPI=5
1237 -
1238 -inherit eutils user
1239 -
1240 -MY_P="android-sdk_r${PV}-linux"
1241 -
1242 -DESCRIPTION="Open Handset Alliance's Android SDK"
1243 -HOMEPAGE="https://developer.android.com"
1244 -SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
1245 -IUSE=""
1246 -RESTRICT="mirror"
1247 -
1248 -LICENSE="android"
1249 -SLOT="0"
1250 -KEYWORDS="~amd64 ~x86"
1251 -
1252 -DEPEND="app-arch/tar
1253 - app-arch/gzip"
1254 -RDEPEND=">=virtual/jdk-1.5
1255 - >=dev-java/ant-core-1.6.5
1256 - >=dev-java/swt-3.5[cairo]
1257 - >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
1258 -"
1259 -
1260 -ANDROID_SDK_DIR="/opt/${PN}"
1261 -QA_FLAGS_IGNORED_x86="
1262 - ${ANDROID_SDK_DIR/\/}/tools/emulator
1263 - ${ANDROID_SDK_DIR/\/}/tools/adb
1264 - ${ANDROID_SDK_DIR/\/}/tools/mksdcard
1265 - ${ANDROID_SDK_DIR/\/}/tools/sqlite3
1266 - ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
1267 - ${ANDROID_SDK_DIR/\/}/tools/zipalign
1268 - ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
1269 -"
1270 -QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
1271 -
1272 -QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
1273 -
1274 -S="${WORKDIR}/android-sdk-linux"
1275 -
1276 -pkg_setup() {
1277 - enewgroup android
1278 -}
1279 -
1280 -src_prepare() {
1281 - rm -rf tools/lib/x86*
1282 -}
1283 -
1284 -src_install() {
1285 - dodoc tools/NOTICE.txt "SDK Readme.txt"
1286 - rm -f tools/NOTICE.txt "SDK Readme.txt"
1287 -
1288 - dodir "${ANDROID_SDK_DIR}/tools"
1289 - cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
1290 -
1291 - # Maybe this is needed for the tools directory too.
1292 - dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
1293 -
1294 - fowners root:android "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
1295 - fperms 0775 "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
1296 -
1297 - echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
1298 -
1299 - SWT_PATH=
1300 - SWT_VERSIONS="4.2 3.7 3.6 3.5"
1301 - for version in $SWT_VERSIONS; do
1302 - # redirecting stderr to /dev/null
1303 - # not sure if this is best, but avoids misleading error messages
1304 - SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
1305 - if [ $SWT_PATH ]; then
1306 - einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
1307 - break
1308 - fi
1309 - done
1310 -
1311 - echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
1312 -
1313 - doenvd "${T}/80${PN}"
1314 -
1315 - echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
1316 -
1317 - insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
1318 -
1319 -}
1320 -
1321 -pkg_postinst() {
1322 - elog "The Android SDK now uses its own manager for the development environment."
1323 - elog "Run 'android' to download the full SDK, including some of the platform tools."
1324 - elog "You must be in the android group to manage the development environment."
1325 - elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
1326 - elog "See https://developer.android.com/sdk/adding-components.html for more"
1327 - elog "information."
1328 - elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
1329 - elog "You need to run env-update and source /etc/profile in any open shells"
1330 - elog "if you get an SWT error."
1331 -}
1332
1333 diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild
1334 deleted file mode 100644
1335 index 4f77f8ba0d6..00000000000
1336 --- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild
1337 +++ /dev/null
1338 @@ -1,102 +0,0 @@
1339 -# Copyright 1999-2020 Gentoo Authors
1340 -# Distributed under the terms of the GNU General Public License v2
1341 -
1342 -EAPI="5"
1343 -
1344 -inherit eutils user udev
1345 -
1346 -MY_P="android-sdk_r${PV}-linux"
1347 -
1348 -DESCRIPTION="Open Handset Alliance's Android SDK"
1349 -HOMEPAGE="https://developer.android.com"
1350 -SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
1351 -IUSE=""
1352 -RESTRICT="mirror"
1353 -
1354 -LICENSE="android"
1355 -SLOT="0"
1356 -KEYWORDS="~amd64 ~x86"
1357 -
1358 -DEPEND="app-arch/tar
1359 - app-arch/gzip"
1360 -RDEPEND=">=virtual/jdk-1.5
1361 - >=dev-java/ant-core-1.6.5
1362 - dev-java/swt:3.7[cairo]
1363 - sys-libs/zlib[abi_x86_32(-)]
1364 -"
1365 -
1366 -ANDROID_SDK_DIR="/opt/${PN}"
1367 -QA_FLAGS_IGNORED_x86="
1368 - ${ANDROID_SDK_DIR/\/}/tools/emulator
1369 - ${ANDROID_SDK_DIR/\/}/tools/adb
1370 - ${ANDROID_SDK_DIR/\/}/tools/mksdcard
1371 - ${ANDROID_SDK_DIR/\/}/tools/sqlite3
1372 - ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
1373 - ${ANDROID_SDK_DIR/\/}/tools/zipalign
1374 - ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
1375 -"
1376 -QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
1377 -
1378 -QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
1379 -
1380 -S="${WORKDIR}/android-sdk-linux"
1381 -
1382 -pkg_setup() {
1383 - enewgroup android
1384 -}
1385 -
1386 -src_prepare() {
1387 - rm -rf tools/lib/x86*
1388 -}
1389 -
1390 -src_install() {
1391 - dodoc tools/NOTICE.txt "SDK Readme.txt"
1392 - rm -f tools/NOTICE.txt "SDK Readme.txt"
1393 -
1394 - dodir "${ANDROID_SDK_DIR}/tools"
1395 - cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
1396 -
1397 - # Maybe this is needed for the tools directory too.
1398 - dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
1399 -
1400 - fowners -R root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
1401 - fperms -R 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
1402 -
1403 - echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
1404 -
1405 - SWT_PATH=
1406 - SWT_VERSIONS="3.7 3.6"
1407 - for version in $SWT_VERSIONS; do
1408 - # redirecting stderr to /dev/null
1409 - # not sure if this is best, but avoids misleading error messages
1410 - SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
1411 - if [ $SWT_PATH ]; then
1412 - einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
1413 - break
1414 - fi
1415 - done
1416 -
1417 - echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
1418 - echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
1419 -
1420 - doenvd "${T}/80${PN}"
1421 -
1422 - echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
1423 -
1424 - insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
1425 -
1426 - udev_dorules "${FILESDIR}"/80-android.rules || die
1427 - domenu "${FILESDIR}"/android-sdk-update-manager.desktop
1428 -}
1429 -
1430 -pkg_postinst() {
1431 - elog "The Android SDK now uses its own manager for the development environment."
1432 - elog "Run 'android' to download the full SDK, including some of the platform tools."
1433 - elog "You must be in the android group to manage the development environment."
1434 - elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
1435 - elog "See https://developer.android.com/sdk/adding-components.html for more"
1436 - elog "information."
1437 - elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
1438 - elog "You need to run env-update and source /etc/profile in any open shells"
1439 - elog "if you get an SWT error."
1440 -}
1441
1442 diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild
1443 deleted file mode 100644
1444 index 895cf67fd7d..00000000000
1445 --- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild
1446 +++ /dev/null
1447 @@ -1,102 +0,0 @@
1448 -# Copyright 1999-2020 Gentoo Authors
1449 -# Distributed under the terms of the GNU General Public License v2
1450 -
1451 -EAPI="5"
1452 -
1453 -inherit eutils user udev
1454 -
1455 -MY_P="android-sdk_r${PV}-linux"
1456 -
1457 -DESCRIPTION="Open Handset Alliance's Android SDK"
1458 -HOMEPAGE="https://developer.android.com"
1459 -SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
1460 -IUSE=""
1461 -RESTRICT="mirror"
1462 -
1463 -LICENSE="android"
1464 -SLOT="0"
1465 -KEYWORDS="~amd64 ~x86"
1466 -
1467 -DEPEND="app-arch/tar
1468 - app-arch/gzip"
1469 -RDEPEND=">=virtual/jdk-1.5
1470 - >=dev-java/ant-core-1.6.5
1471 - dev-java/swt:3.7[cairo]
1472 - sys-libs/zlib[abi_x86_32(-)]
1473 -"
1474 -
1475 -ANDROID_SDK_DIR="/opt/${PN}"
1476 -QA_FLAGS_IGNORED_x86="
1477 - ${ANDROID_SDK_DIR/\/}/tools/emulator
1478 - ${ANDROID_SDK_DIR/\/}/tools/adb
1479 - ${ANDROID_SDK_DIR/\/}/tools/mksdcard
1480 - ${ANDROID_SDK_DIR/\/}/tools/sqlite3
1481 - ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
1482 - ${ANDROID_SDK_DIR/\/}/tools/zipalign
1483 - ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
1484 -"
1485 -QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
1486 -
1487 -QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
1488 -
1489 -S="${WORKDIR}/android-sdk-linux"
1490 -
1491 -pkg_setup() {
1492 - enewgroup android
1493 -}
1494 -
1495 -src_prepare() {
1496 - rm -rf tools/lib/x86*
1497 -}
1498 -
1499 -src_install() {
1500 - dodoc tools/NOTICE.txt "SDK Readme.txt"
1501 - rm -f tools/NOTICE.txt "SDK Readme.txt"
1502 -
1503 - dodir "${ANDROID_SDK_DIR}/tools"
1504 - cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
1505 -
1506 - # Maybe this is needed for the tools directory too.
1507 - dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
1508 -
1509 - fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
1510 - fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
1511 -
1512 - echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
1513 -
1514 - SWT_PATH=
1515 - SWT_VERSIONS="3.7 3.6"
1516 - for version in $SWT_VERSIONS; do
1517 - # redirecting stderr to /dev/null
1518 - # not sure if this is best, but avoids misleading error messages
1519 - SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
1520 - if [ $SWT_PATH ]; then
1521 - einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
1522 - break
1523 - fi
1524 - done
1525 -
1526 - echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
1527 - echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
1528 -
1529 - doenvd "${T}/80${PN}"
1530 -
1531 - echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
1532 -
1533 - insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
1534 -
1535 - udev_dorules "${FILESDIR}"/80-android.rules || die
1536 - domenu "${FILESDIR}"/android-sdk-update-manager.desktop
1537 -}
1538 -
1539 -pkg_postinst() {
1540 - elog "The Android SDK now uses its own manager for the development environment."
1541 - elog "Run 'android' to download the full SDK, including some of the platform tools."
1542 - elog "You must be in the android group to manage the development environment."
1543 - elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
1544 - elog "See https://developer.android.com/sdk/adding-components.html for more"
1545 - elog "information."
1546 - elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
1547 - elog "You need to run env-update and source /etc/profile in any open shells"
1548 - elog "if you get an SWT error."
1549 -}