commit:     fa3738fe278d8250ae753996eeb4d90295d8c8fd
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 24 19:32:52 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Thu Sep 24 19:53:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa3738fe

dev-util/android-sdk-update-manager: drop old EAPI=5

* Package needs to be last-rited next as upstream has deprecated and the
  package is severely outdated in ::gentoo

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 dev-util/android-sdk-update-manager/Manifest       |  11 ---
 .../android-sdk-update-manager-21.1.ebuild         |  99 --------------------
 .../android-sdk-update-manager-21.ebuild           |  99 --------------------
 .../android-sdk-update-manager-22.0.1-r1.ebuild    |  99 --------------------
 .../android-sdk-update-manager-22.0.1.ebuild       |  99 --------------------
 .../android-sdk-update-manager-22.0.4.ebuild       |  99 --------------------
 .../android-sdk-update-manager-22.0.5-r1.ebuild    | 100 --------------------
 .../android-sdk-update-manager-22.0.5.ebuild       |  99 --------------------
 .../android-sdk-update-manager-22.2.1.ebuild       | 100 --------------------
 .../android-sdk-update-manager-22.3.ebuild         | 102 ---------------------
 .../android-sdk-update-manager-22.6.1.ebuild       | 102 ---------------------
 .../android-sdk-update-manager-22.6.ebuild         | 102 ---------------------
 .../android-sdk-update-manager-22.ebuild           |  99 --------------------
 .../android-sdk-update-manager-23-r1.ebuild        | 102 ---------------------
 .../android-sdk-update-manager-23.ebuild           | 102 ---------------------
 15 files changed, 1414 deletions(-)

diff --git a/dev-util/android-sdk-update-manager/Manifest 
b/dev-util/android-sdk-update-manager/Manifest
index 5a4fb8ea2af..9b10cdee2a4 100644
--- a/dev-util/android-sdk-update-manager/Manifest
+++ b/dev-util/android-sdk-update-manager/Manifest
@@ -1,12 +1 @@
-DIST android-sdk_r21-linux.tgz 91378351 BLAKE2B 
ed16738d018c3ff8c51bb833ecd329594379280e55e6558a5f5e5731c4e11f6f562675d8a79a252e318b01d5c20f0d13aa2ff6bcd4160a527d85816abb6d94e7
 SHA512 
3a3338265a2d00f8b7fbb35783d7449498afd8107ddd4ed4c2c34e47582d83eb23f78d02fe01db54c12c48dba0167f60118c1061f1bfeb0048147674fee8d87c
-DIST android-sdk_r21.1-linux.tgz 91617112 BLAKE2B 
0b566613d0143b0136844a88f3d4f916a79b4e21588d828bc1bbd037f5290c0a6686cae4de1c34adc3b925132627ee7541501019438b659c12ce5158f82f878d
 SHA512 
160cd51f965a23120cf63abe02b9a9ce8913d1239a848bc423b33ad10eff65b30147c6b11ab751aa12154292ce0a7837aa60def1cd31a2ccb5d4fc6fcb6d2c24
-DIST android-sdk_r22-linux.tgz 99643077 BLAKE2B 
58bf529757a4ff0061961be89b080faf8250a0282354bf7742cde395ab2fa91cafd85a36037c02d04fd9bc230437120f4ce91582c9fa2f539a24dd420bf7f025
 SHA512 
9beda1ae872dde3ca7884d1c389566ce2c8b511ef74d95bc9ddf53683445cc454f9a5a1871a80d5826083d98713040cb1b8b239a77a8eadf56daf30440c7108d
-DIST android-sdk_r22.0.1-linux.tgz 105617062 BLAKE2B 
026158fa5be24756f9da3c4dc1258f990d1b04169f6ff88d78da48ebe34e03639b56e77831000ffd805c9057b4d8b561a15ff2919a13b1ae2f4af2b87bbb493f
 SHA512 
7c97ba8daf4a1b8b6e422d8fca21a5e23f3a5e92d769e13ab5e649a967f2662c71ae201a6c1d40202bda98c4fb80eaa60a3ff5e4af9f613cfab1366f63774ac7
-DIST android-sdk_r22.0.4-linux.tgz 105640988 BLAKE2B 
30e26a4b23cb44a045353b2878f5c9584dcb783860c42203145471c3c5e384dd979b416661050ec2a294d357f9addc6c8592f3ff8c634cd33bbbf881f15d84d2
 SHA512 
10e047f6b5384d6c2d3f87e883203f2ab384ac826def16c07f1969d59dc79f97ccba36f0185d564fe0dd4811425fe18767c326b3712ee47b5515f0aba47ed612
-DIST android-sdk_r22.0.5-linux.tgz 105641005 BLAKE2B 
938bafd72bb023bf2ae306944035cc77b34dea843e8fa2d22b27b8e76231aa256b0835bcfb83403ba8168f9e78071c5174054eadcfb025f23573bf9c89e863f1
 SHA512 
655f709994a8c5f9bd78216d8587bda66f23b7fccd556fd78adc989a835540af89529f2fb4d846e28196952a0a3c5bc919563c83fb73e6ecf7a4ad0560eb7f81
-DIST android-sdk_r22.2.1-linux.tgz 100918342 BLAKE2B 
ddd1bc701c554af04f0c9de995c5f30531a702e5e18eca709265b96210c99afb23092fc975b47c714d26ceb52e8f407b36993405c635be1f6e720f6df4e473f1
 SHA512 
4eb7087c27db2b2435aa11bba01fccd09617ea58dd84aca8b249d81b3d15c913844d204463a6d83064c6cf8f07e26c0f70130315b281b1bbfd32c01d6e53bfef
-DIST android-sdk_r22.3-linux.tgz 100968558 BLAKE2B 
41f853635fba6973a0e78465553ac455fa9a995421327a31d554b80aef0f80305237c8ee2da2440ad27513b0e9b263ebed293f898bca13fedd6e5511e25d1654
 SHA512 
c05e610e0979f61d217b6612bccd48120719123cf80282cca442e81be6e0c4cfd5a4b3f398d1c8835c86bc67b730a7bf5a5e511abe57a1d70b6c1f62940832a3
-DIST android-sdk_r22.6-linux.tgz 100992666 BLAKE2B 
f3dd0d6ab53f7323dd911af4e4271cd2169627bd3ebf11901e1afea942b3f4af4b29a9192c88d6c71887a79762d34109666c1fb922d96871ac9126c8398d5baf
 SHA512 
2e632e31725a7c8c5e99cba70388c928d553d52177a2a0d49abfae125d1ccb57857171f10cd28da57664d0d9ab0f7b6ae409c943ad4d4433b05e0b8fb1bfe322
-DIST android-sdk_r22.6.1-linux.tgz 101052129 BLAKE2B 
b1eb0a3a298bab8f4c4e085831221f795fe0e668ab407d71c2c79778b921d09e57ad393dfe53d34e7d8c49cb05dd655762ca266b82982c898b0eea8f5a0e6035
 SHA512 
5789a6b11a1a5c18145900042b15707f58afd6db82d345550c33e72cfbaf719c7c16667a7561e4c6ca624c2d2466430db7f8138bf0cd6449762639a63c6cf9ca
-DIST android-sdk_r23-linux.tgz 137880977 BLAKE2B 
3a0e0d321bf89bddd4f4e3ed4e6b6ef0276623168d482c0d152f7946b93f8ff72ade780e6c5bdd2dc2ef633bc5df446a640bd52062373fdae162aff71c5ed154
 SHA512 
c6d8de870e8697b31132b25db93d6b494b44240ca421cab6a48bbf53d142ba488d08ac77a9995ed06953e311dd14ea1ecf4d2039428ed31ab255f9aaaf94ad60
 DIST android-sdk_r24.4.1-linux.tgz 326412652 BLAKE2B 
4263a5e942f0ee35069f4fc075504c637381820f40485c9753f5f586f713e614c204b3e5c35968acbc665644aaab4c2e05660e00675d956422cd7d1fc6445ed2
 SHA512 
96fb71d78a8c2833afeba6df617edcd6cc4e37ecd0c3bec38c39e78204ed3c2bd54b138a56086bf5ccd95e372e3c36e72c1550c13df8232ec19537da93049284

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
deleted file mode 100644
index 9b40483c021..00000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com";
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz";
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-               app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-       >=dev-java/ant-core-1.6.5
-       >=dev-java/swt-3.5[cairo]
-       >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-       ${ANDROID_SDK_DIR/\/}/tools/emulator
-       ${ANDROID_SDK_DIR/\/}/tools/adb
-       ${ANDROID_SDK_DIR/\/}/tools/mksdcard
-       ${ANDROID_SDK_DIR/\/}/tools/sqlite3
-       ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-       ${ANDROID_SDK_DIR/\/}/tools/zipalign
-       ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-       enewgroup android
-}
-
-src_prepare() {
-       rm -rf tools/lib/x86*
-}
-
-src_install() {
-       dodoc tools/NOTICE.txt "SDK Readme.txt"
-       rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-       dodir "${ANDROID_SDK_DIR}/tools"
-       cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to 
install tools"
-
-       # Maybe this is needed for the tools directory too.
-       dodir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp}
-
-       fowners root:android 
"${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools}
-       fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools}
-
-       echo 
"PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\""
 > "${T}/80${PN}" || die
-
-       SWT_PATH=
-       SWT_VERSIONS="4.2 3.7 3.6 3.5"
-       for version in $SWT_VERSIONS; do
-               # redirecting stderr to /dev/null
-               # not sure if this is best, but avoids misleading error messages
-               SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 
2>/dev/null`"
-               if [ $SWT_PATH ]; then
-                       einfo "SWT_PATH=$SWT_PATH selecting version $version of 
SWT."
-                       break
-               fi
-       done
-
-       echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
-       doenvd "${T}/80${PN}"
-
-       echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > 
"${T}/80${PN}" || die
-
-       insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
-       elog "The Android SDK now uses its own manager for the development      
environment."
-       elog "Run 'android' to download the full SDK, including some of the 
platform tools."
-       elog "You must be in the android group to manage the development 
environment."
-       elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-       elog "See https://developer.android.com/sdk/adding-components.html for 
more"
-       elog "information."
-       elog "If you have problems downloading the SDK, see 
https://code.google.com/p/android/issues/detail?id=4406";
-       elog "You need to run env-update and source /etc/profile in any open 
shells"
-       elog "if you get an SWT error."
-}

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
deleted file mode 100644
index 28f7786e0f2..00000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com";
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz";
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-               app-arch/gzip"
-RDEPEND="
-       >=virtual/jdk-1.5
-       >=dev-java/ant-core-1.6.5
-       >=dev-java/swt-3.5[cairo]
-       >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-       ${ANDROID_SDK_DIR/\/}/tools/emulator
-       ${ANDROID_SDK_DIR/\/}/tools/adb
-       ${ANDROID_SDK_DIR/\/}/tools/mksdcard
-       ${ANDROID_SDK_DIR/\/}/tools/sqlite3
-       ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-       ${ANDROID_SDK_DIR/\/}/tools/zipalign
-       ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-       enewgroup android
-}
-
-src_prepare() {
-       rm -rf tools/lib/x86*
-}
-
-src_install() {
-       dodoc tools/NOTICE.txt "SDK Readme.txt"
-       rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-       dodir "${ANDROID_SDK_DIR}/tools"
-       cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to 
install tools"
-
-       # Maybe this is needed for the tools directory too.
-       dodir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp}
-
-       fowners root:android 
"${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools}
-       fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools}
-
-       echo 
"PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\""
 > "${T}/80${PN}" || die
-
-       SWT_PATH=
-       SWT_VERSIONS="4.2 3.7 3.6 3.5"
-       for version in $SWT_VERSIONS; do
-               # redirecting stderr to /dev/null
-               # not sure if this is best, but avoids misleading error messages
-               SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 
2>/dev/null`"
-               if [ $SWT_PATH ]; then
-                       einfo "SWT_PATH=$SWT_PATH selecting version $version of 
SWT."
-                       break
-               fi
-       done
-
-       echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
-       doenvd "${T}/80${PN}"
-
-       echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > 
"${T}/80${PN}" || die
-
-       insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-}
-
-pkg_postinst() {
-       elog "The Android SDK now uses its own manager for the development      
environment."
-       elog "Run 'android' to download the full SDK, including some of the 
platform tools."
-       elog "You must be in the android group to manage the development 
environment."
-       elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-       elog "See https://developer.android.com/sdk/adding-components.html for 
more"
-       elog "information."
-       elog "If you have problems downloading the SDK, see 
https://code.google.com/p/android/issues/detail?id=4406";
-       elog "You need to run env-update and source /etc/profile in any open 
shells"
-       elog "if you get an SWT error."
-}

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
deleted file mode 100644
index b54ac2b090f..00000000000
--- 
a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com";
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz";
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-               app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-       >=dev-java/ant-core-1.6.5
-       dev-java/swt:3.7[cairo]
-       >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-       ${ANDROID_SDK_DIR/\/}/tools/emulator
-       ${ANDROID_SDK_DIR/\/}/tools/adb
-       ${ANDROID_SDK_DIR/\/}/tools/mksdcard
-       ${ANDROID_SDK_DIR/\/}/tools/sqlite3
-       ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-       ${ANDROID_SDK_DIR/\/}/tools/zipalign
-       ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-       enewgroup android
-}
-
-src_prepare() {
-       rm -rf tools/lib/x86*
-}
-
-src_install() {
-       dodoc tools/NOTICE.txt "SDK Readme.txt"
-       rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-       dodir "${ANDROID_SDK_DIR}/tools"
-       cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to 
install tools"
-
-       # Maybe this is needed for the tools directory too.
-       dodir 
"${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-       fowners root:android 
"${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-       fperms 0775 
"${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-       echo 
"PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\""
 > "${T}/80${PN}" || die
-
-       SWT_PATH=
-       SWT_VERSIONS="3.7 3.6"
-       for version in $SWT_VERSIONS; do
-               # redirecting stderr to /dev/null
-               # not sure if this is best, but avoids misleading error messages
-               SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 
2>/dev/null`"
-               if [ $SWT_PATH ]; then
-                       einfo "SWT_PATH=$SWT_PATH selecting version $version of 
SWT."
-                       break
-               fi
-       done
-
-       echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
-       doenvd "${T}/80${PN}"
-
-       echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > 
"${T}/80${PN}" || die
-
-       insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
-       elog "The Android SDK now uses its own manager for the development      
environment."
-       elog "Run 'android' to download the full SDK, including some of the 
platform tools."
-       elog "You must be in the android group to manage the development 
environment."
-       elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-       elog "See https://developer.android.com/sdk/adding-components.html for 
more"
-       elog "information."
-       elog "If you have problems downloading the SDK, see 
https://code.google.com/p/android/issues/detail?id=4406";
-       elog "You need to run env-update and source /etc/profile in any open 
shells"
-       elog "if you get an SWT error."
-}

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
deleted file mode 100644
index 1353edbc0ba..00000000000
--- 
a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com";
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz";
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-               app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-       >=dev-java/ant-core-1.6.5
-       >=dev-java/swt-3.5[cairo]
-       >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-       ${ANDROID_SDK_DIR/\/}/tools/emulator
-       ${ANDROID_SDK_DIR/\/}/tools/adb
-       ${ANDROID_SDK_DIR/\/}/tools/mksdcard
-       ${ANDROID_SDK_DIR/\/}/tools/sqlite3
-       ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-       ${ANDROID_SDK_DIR/\/}/tools/zipalign
-       ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-       enewgroup android
-}
-
-src_prepare() {
-       rm -rf tools/lib/x86*
-}
-
-src_install() {
-       dodoc tools/NOTICE.txt "SDK Readme.txt"
-       rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-       dodir "${ANDROID_SDK_DIR}/tools"
-       cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to 
install tools"
-
-       # Maybe this is needed for the tools directory too.
-       dodir 
"${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-       fowners root:android 
"${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-       fperms 0775 
"${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-       echo 
"PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\""
 > "${T}/80${PN}" || die
-
-       SWT_PATH=
-       SWT_VERSIONS="4.2 3.7 3.6 3.5"
-       for version in $SWT_VERSIONS; do
-               # redirecting stderr to /dev/null
-               # not sure if this is best, but avoids misleading error messages
-               SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 
2>/dev/null`"
-               if [ $SWT_PATH ]; then
-                       einfo "SWT_PATH=$SWT_PATH selecting version $version of 
SWT."
-                       break
-               fi
-       done
-
-       echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
-       doenvd "${T}/80${PN}"
-
-       echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > 
"${T}/80${PN}" || die
-
-       insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
-       elog "The Android SDK now uses its own manager for the development      
environment."
-       elog "Run 'android' to download the full SDK, including some of the 
platform tools."
-       elog "You must be in the android group to manage the development 
environment."
-       elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-       elog "See https://developer.android.com/sdk/adding-components.html for 
more"
-       elog "information."
-       elog "If you have problems downloading the SDK, see 
https://code.google.com/p/android/issues/detail?id=4406";
-       elog "You need to run env-update and source /etc/profile in any open 
shells"
-       elog "if you get an SWT error."
-}

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
deleted file mode 100644
index b54ac2b090f..00000000000
--- 
a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com";
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz";
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-               app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-       >=dev-java/ant-core-1.6.5
-       dev-java/swt:3.7[cairo]
-       >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-       ${ANDROID_SDK_DIR/\/}/tools/emulator
-       ${ANDROID_SDK_DIR/\/}/tools/adb
-       ${ANDROID_SDK_DIR/\/}/tools/mksdcard
-       ${ANDROID_SDK_DIR/\/}/tools/sqlite3
-       ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-       ${ANDROID_SDK_DIR/\/}/tools/zipalign
-       ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-       enewgroup android
-}
-
-src_prepare() {
-       rm -rf tools/lib/x86*
-}
-
-src_install() {
-       dodoc tools/NOTICE.txt "SDK Readme.txt"
-       rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-       dodir "${ANDROID_SDK_DIR}/tools"
-       cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to 
install tools"
-
-       # Maybe this is needed for the tools directory too.
-       dodir 
"${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-       fowners root:android 
"${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-       fperms 0775 
"${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-       echo 
"PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\""
 > "${T}/80${PN}" || die
-
-       SWT_PATH=
-       SWT_VERSIONS="3.7 3.6"
-       for version in $SWT_VERSIONS; do
-               # redirecting stderr to /dev/null
-               # not sure if this is best, but avoids misleading error messages
-               SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 
2>/dev/null`"
-               if [ $SWT_PATH ]; then
-                       einfo "SWT_PATH=$SWT_PATH selecting version $version of 
SWT."
-                       break
-               fi
-       done
-
-       echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
-       doenvd "${T}/80${PN}"
-
-       echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > 
"${T}/80${PN}" || die
-
-       insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
-       elog "The Android SDK now uses its own manager for the development      
environment."
-       elog "Run 'android' to download the full SDK, including some of the 
platform tools."
-       elog "You must be in the android group to manage the development 
environment."
-       elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-       elog "See https://developer.android.com/sdk/adding-components.html for 
more"
-       elog "information."
-       elog "If you have problems downloading the SDK, see 
https://code.google.com/p/android/issues/detail?id=4406";
-       elog "You need to run env-update and source /etc/profile in any open 
shells"
-       elog "if you get an SWT error."
-}

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
deleted file mode 100644
index d335afb3378..00000000000
--- 
a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com";
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz";
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-               app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-       >=dev-java/ant-core-1.6.5
-       dev-java/swt:3.7[cairo]
-       >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-       ${ANDROID_SDK_DIR/\/}/tools/emulator
-       ${ANDROID_SDK_DIR/\/}/tools/adb
-       ${ANDROID_SDK_DIR/\/}/tools/mksdcard
-       ${ANDROID_SDK_DIR/\/}/tools/sqlite3
-       ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-       ${ANDROID_SDK_DIR/\/}/tools/zipalign
-       ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-       enewgroup android
-}
-
-src_prepare() {
-       rm -rf tools/lib/x86*
-}
-
-src_install() {
-       dodoc tools/NOTICE.txt "SDK Readme.txt"
-       rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-       dodir "${ANDROID_SDK_DIR}/tools"
-       cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to 
install tools"
-
-       # Maybe this is needed for the tools directory too.
-       dodir 
"${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-       fowners root:android 
"${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-       fperms 0775 
"${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-       echo 
"PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\""
 > "${T}/80${PN}" || die
-
-       SWT_PATH=
-       SWT_VERSIONS="3.7 3.6"
-       for version in $SWT_VERSIONS; do
-               # redirecting stderr to /dev/null
-               # not sure if this is best, but avoids misleading error messages
-               SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 
2>/dev/null`"
-               if [ $SWT_PATH ]; then
-                       einfo "SWT_PATH=$SWT_PATH selecting version $version of 
SWT."
-                       break
-               fi
-       done
-
-       echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-       echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" 
|| die
-
-       doenvd "${T}/80${PN}"
-
-       echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > 
"${T}/80${PN}" || die
-
-       insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
-       elog "The Android SDK now uses its own manager for the development      
environment."
-       elog "Run 'android' to download the full SDK, including some of the 
platform tools."
-       elog "You must be in the android group to manage the development 
environment."
-       elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-       elog "See https://developer.android.com/sdk/adding-components.html for 
more"
-       elog "information."
-       elog "If you have problems downloading the SDK, see 
https://code.google.com/p/android/issues/detail?id=4406";
-       elog "You need to run env-update and source /etc/profile in any open 
shells"
-       elog "if you get an SWT error."
-}

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
deleted file mode 100644
index b54ac2b090f..00000000000
--- 
a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com";
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz";
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-               app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-       >=dev-java/ant-core-1.6.5
-       dev-java/swt:3.7[cairo]
-       >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-       ${ANDROID_SDK_DIR/\/}/tools/emulator
-       ${ANDROID_SDK_DIR/\/}/tools/adb
-       ${ANDROID_SDK_DIR/\/}/tools/mksdcard
-       ${ANDROID_SDK_DIR/\/}/tools/sqlite3
-       ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-       ${ANDROID_SDK_DIR/\/}/tools/zipalign
-       ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-       enewgroup android
-}
-
-src_prepare() {
-       rm -rf tools/lib/x86*
-}
-
-src_install() {
-       dodoc tools/NOTICE.txt "SDK Readme.txt"
-       rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-       dodir "${ANDROID_SDK_DIR}/tools"
-       cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to 
install tools"
-
-       # Maybe this is needed for the tools directory too.
-       dodir 
"${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-       fowners root:android 
"${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-       fperms 0775 
"${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-       echo 
"PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\""
 > "${T}/80${PN}" || die
-
-       SWT_PATH=
-       SWT_VERSIONS="3.7 3.6"
-       for version in $SWT_VERSIONS; do
-               # redirecting stderr to /dev/null
-               # not sure if this is best, but avoids misleading error messages
-               SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 
2>/dev/null`"
-               if [ $SWT_PATH ]; then
-                       einfo "SWT_PATH=$SWT_PATH selecting version $version of 
SWT."
-                       break
-               fi
-       done
-
-       echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
-       doenvd "${T}/80${PN}"
-
-       echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > 
"${T}/80${PN}" || die
-
-       insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
-       elog "The Android SDK now uses its own manager for the development      
environment."
-       elog "Run 'android' to download the full SDK, including some of the 
platform tools."
-       elog "You must be in the android group to manage the development 
environment."
-       elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-       elog "See https://developer.android.com/sdk/adding-components.html for 
more"
-       elog "information."
-       elog "If you have problems downloading the SDK, see 
https://code.google.com/p/android/issues/detail?id=4406";
-       elog "You need to run env-update and source /etc/profile in any open 
shells"
-       elog "if you get an SWT error."
-}

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
deleted file mode 100644
index d335afb3378..00000000000
--- 
a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com";
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz";
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-               app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-       >=dev-java/ant-core-1.6.5
-       dev-java/swt:3.7[cairo]
-       >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-       ${ANDROID_SDK_DIR/\/}/tools/emulator
-       ${ANDROID_SDK_DIR/\/}/tools/adb
-       ${ANDROID_SDK_DIR/\/}/tools/mksdcard
-       ${ANDROID_SDK_DIR/\/}/tools/sqlite3
-       ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-       ${ANDROID_SDK_DIR/\/}/tools/zipalign
-       ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-       enewgroup android
-}
-
-src_prepare() {
-       rm -rf tools/lib/x86*
-}
-
-src_install() {
-       dodoc tools/NOTICE.txt "SDK Readme.txt"
-       rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-       dodir "${ANDROID_SDK_DIR}/tools"
-       cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to 
install tools"
-
-       # Maybe this is needed for the tools directory too.
-       dodir 
"${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-       fowners root:android 
"${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-       fperms 0775 
"${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-       echo 
"PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\""
 > "${T}/80${PN}" || die
-
-       SWT_PATH=
-       SWT_VERSIONS="3.7 3.6"
-       for version in $SWT_VERSIONS; do
-               # redirecting stderr to /dev/null
-               # not sure if this is best, but avoids misleading error messages
-               SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 
2>/dev/null`"
-               if [ $SWT_PATH ]; then
-                       einfo "SWT_PATH=$SWT_PATH selecting version $version of 
SWT."
-                       break
-               fi
-       done
-
-       echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-       echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" 
|| die
-
-       doenvd "${T}/80${PN}"
-
-       echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > 
"${T}/80${PN}" || die
-
-       insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
-       elog "The Android SDK now uses its own manager for the development      
environment."
-       elog "Run 'android' to download the full SDK, including some of the 
platform tools."
-       elog "You must be in the android group to manage the development 
environment."
-       elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-       elog "See https://developer.android.com/sdk/adding-components.html for 
more"
-       elog "information."
-       elog "If you have problems downloading the SDK, see 
https://code.google.com/p/android/issues/detail?id=4406";
-       elog "You need to run env-update and source /etc/profile in any open 
shells"
-       elog "if you get an SWT error."
-}

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
deleted file mode 100644
index 42c6e14d981..00000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user udev
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com";
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz";
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-               app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-       >=dev-java/ant-core-1.6.5
-       dev-java/swt:3.7[cairo]
-       >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-       ${ANDROID_SDK_DIR/\/}/tools/emulator
-       ${ANDROID_SDK_DIR/\/}/tools/adb
-       ${ANDROID_SDK_DIR/\/}/tools/mksdcard
-       ${ANDROID_SDK_DIR/\/}/tools/sqlite3
-       ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-       ${ANDROID_SDK_DIR/\/}/tools/zipalign
-       ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-       enewgroup android
-}
-
-src_prepare() {
-       rm -rf tools/lib/x86*
-}
-
-src_install() {
-       dodoc tools/NOTICE.txt "SDK Readme.txt"
-       rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-       dodir "${ANDROID_SDK_DIR}/tools"
-       cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to 
install tools"
-
-       # Maybe this is needed for the tools directory too.
-       dodir 
"${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-       fowners root:android 
"${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-       fperms 0775 
"${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-       echo 
"PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\""
 > "${T}/80${PN}" || die
-
-       SWT_PATH=
-       SWT_VERSIONS="3.7 3.6"
-       for version in $SWT_VERSIONS; do
-               # redirecting stderr to /dev/null
-               # not sure if this is best, but avoids misleading error messages
-               SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 
2>/dev/null`"
-               if [ $SWT_PATH ]; then
-                       einfo "SWT_PATH=$SWT_PATH selecting version $version of 
SWT."
-                       break
-               fi
-       done
-
-       echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-       echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" 
|| die
-
-       doenvd "${T}/80${PN}"
-
-       echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > 
"${T}/80${PN}" || die
-
-       insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-       udev_dorules "${FILESDIR}"/80-android.rules || die
-       domenu "${FILESDIR}"/android-sdk-update-manager.desktop
-}
-
-pkg_postinst() {
-       elog "The Android SDK now uses its own manager for the development      
environment."
-       elog "Run 'android' to download the full SDK, including some of the 
platform tools."
-       elog "You must be in the android group to manage the development 
environment."
-       elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-       elog "See https://developer.android.com/sdk/adding-components.html for 
more"
-       elog "information."
-       elog "If you have problems downloading the SDK, see 
https://code.google.com/p/android/issues/detail?id=4406";
-       elog "You need to run env-update and source /etc/profile in any open 
shells"
-       elog "if you get an SWT error."
-}

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
deleted file mode 100644
index 42c6e14d981..00000000000
--- 
a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user udev
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com";
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz";
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-               app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-       >=dev-java/ant-core-1.6.5
-       dev-java/swt:3.7[cairo]
-       >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-       ${ANDROID_SDK_DIR/\/}/tools/emulator
-       ${ANDROID_SDK_DIR/\/}/tools/adb
-       ${ANDROID_SDK_DIR/\/}/tools/mksdcard
-       ${ANDROID_SDK_DIR/\/}/tools/sqlite3
-       ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-       ${ANDROID_SDK_DIR/\/}/tools/zipalign
-       ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-       enewgroup android
-}
-
-src_prepare() {
-       rm -rf tools/lib/x86*
-}
-
-src_install() {
-       dodoc tools/NOTICE.txt "SDK Readme.txt"
-       rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-       dodir "${ANDROID_SDK_DIR}/tools"
-       cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to 
install tools"
-
-       # Maybe this is needed for the tools directory too.
-       dodir 
"${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-       fowners root:android 
"${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-       fperms 0775 
"${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-       echo 
"PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\""
 > "${T}/80${PN}" || die
-
-       SWT_PATH=
-       SWT_VERSIONS="3.7 3.6"
-       for version in $SWT_VERSIONS; do
-               # redirecting stderr to /dev/null
-               # not sure if this is best, but avoids misleading error messages
-               SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 
2>/dev/null`"
-               if [ $SWT_PATH ]; then
-                       einfo "SWT_PATH=$SWT_PATH selecting version $version of 
SWT."
-                       break
-               fi
-       done
-
-       echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-       echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" 
|| die
-
-       doenvd "${T}/80${PN}"
-
-       echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > 
"${T}/80${PN}" || die
-
-       insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-       udev_dorules "${FILESDIR}"/80-android.rules || die
-       domenu "${FILESDIR}"/android-sdk-update-manager.desktop
-}
-
-pkg_postinst() {
-       elog "The Android SDK now uses its own manager for the development      
environment."
-       elog "Run 'android' to download the full SDK, including some of the 
platform tools."
-       elog "You must be in the android group to manage the development 
environment."
-       elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-       elog "See https://developer.android.com/sdk/adding-components.html for 
more"
-       elog "information."
-       elog "If you have problems downloading the SDK, see 
https://code.google.com/p/android/issues/detail?id=4406";
-       elog "You need to run env-update and source /etc/profile in any open 
shells"
-       elog "if you get an SWT error."
-}

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
deleted file mode 100644
index 42c6e14d981..00000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user udev
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com";
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz";
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-               app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-       >=dev-java/ant-core-1.6.5
-       dev-java/swt:3.7[cairo]
-       >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-       ${ANDROID_SDK_DIR/\/}/tools/emulator
-       ${ANDROID_SDK_DIR/\/}/tools/adb
-       ${ANDROID_SDK_DIR/\/}/tools/mksdcard
-       ${ANDROID_SDK_DIR/\/}/tools/sqlite3
-       ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-       ${ANDROID_SDK_DIR/\/}/tools/zipalign
-       ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-       enewgroup android
-}
-
-src_prepare() {
-       rm -rf tools/lib/x86*
-}
-
-src_install() {
-       dodoc tools/NOTICE.txt "SDK Readme.txt"
-       rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-       dodir "${ANDROID_SDK_DIR}/tools"
-       cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to 
install tools"
-
-       # Maybe this is needed for the tools directory too.
-       dodir 
"${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-       fowners root:android 
"${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-       fperms 0775 
"${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-       echo 
"PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\""
 > "${T}/80${PN}" || die
-
-       SWT_PATH=
-       SWT_VERSIONS="3.7 3.6"
-       for version in $SWT_VERSIONS; do
-               # redirecting stderr to /dev/null
-               # not sure if this is best, but avoids misleading error messages
-               SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 
2>/dev/null`"
-               if [ $SWT_PATH ]; then
-                       einfo "SWT_PATH=$SWT_PATH selecting version $version of 
SWT."
-                       break
-               fi
-       done
-
-       echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-       echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" 
|| die
-
-       doenvd "${T}/80${PN}"
-
-       echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > 
"${T}/80${PN}" || die
-
-       insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-       udev_dorules "${FILESDIR}"/80-android.rules || die
-       domenu "${FILESDIR}"/android-sdk-update-manager.desktop
-}
-
-pkg_postinst() {
-       elog "The Android SDK now uses its own manager for the development      
environment."
-       elog "Run 'android' to download the full SDK, including some of the 
platform tools."
-       elog "You must be in the android group to manage the development 
environment."
-       elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-       elog "See https://developer.android.com/sdk/adding-components.html for 
more"
-       elog "information."
-       elog "If you have problems downloading the SDK, see 
https://code.google.com/p/android/issues/detail?id=4406";
-       elog "You need to run env-update and source /etc/profile in any open 
shells"
-       elog "if you get an SWT error."
-}

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
deleted file mode 100644
index 1353edbc0ba..00000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com";
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz";
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-               app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-       >=dev-java/ant-core-1.6.5
-       >=dev-java/swt-3.5[cairo]
-       >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-       ${ANDROID_SDK_DIR/\/}/tools/emulator
-       ${ANDROID_SDK_DIR/\/}/tools/adb
-       ${ANDROID_SDK_DIR/\/}/tools/mksdcard
-       ${ANDROID_SDK_DIR/\/}/tools/sqlite3
-       ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-       ${ANDROID_SDK_DIR/\/}/tools/zipalign
-       ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-       enewgroup android
-}
-
-src_prepare() {
-       rm -rf tools/lib/x86*
-}
-
-src_install() {
-       dodoc tools/NOTICE.txt "SDK Readme.txt"
-       rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-       dodir "${ANDROID_SDK_DIR}/tools"
-       cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to 
install tools"
-
-       # Maybe this is needed for the tools directory too.
-       dodir 
"${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-       fowners root:android 
"${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-       fperms 0775 
"${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-       echo 
"PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\""
 > "${T}/80${PN}" || die
-
-       SWT_PATH=
-       SWT_VERSIONS="4.2 3.7 3.6 3.5"
-       for version in $SWT_VERSIONS; do
-               # redirecting stderr to /dev/null
-               # not sure if this is best, but avoids misleading error messages
-               SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 
2>/dev/null`"
-               if [ $SWT_PATH ]; then
-                       einfo "SWT_PATH=$SWT_PATH selecting version $version of 
SWT."
-                       break
-               fi
-       done
-
-       echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
-       doenvd "${T}/80${PN}"
-
-       echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > 
"${T}/80${PN}" || die
-
-       insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
-       elog "The Android SDK now uses its own manager for the development      
environment."
-       elog "Run 'android' to download the full SDK, including some of the 
platform tools."
-       elog "You must be in the android group to manage the development 
environment."
-       elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-       elog "See https://developer.android.com/sdk/adding-components.html for 
more"
-       elog "information."
-       elog "If you have problems downloading the SDK, see 
https://code.google.com/p/android/issues/detail?id=4406";
-       elog "You need to run env-update and source /etc/profile in any open 
shells"
-       elog "if you get an SWT error."
-}

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
deleted file mode 100644
index 4f77f8ba0d6..00000000000
--- 
a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user udev
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com";
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz";
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-               app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-       >=dev-java/ant-core-1.6.5
-       dev-java/swt:3.7[cairo]
-       sys-libs/zlib[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-       ${ANDROID_SDK_DIR/\/}/tools/emulator
-       ${ANDROID_SDK_DIR/\/}/tools/adb
-       ${ANDROID_SDK_DIR/\/}/tools/mksdcard
-       ${ANDROID_SDK_DIR/\/}/tools/sqlite3
-       ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-       ${ANDROID_SDK_DIR/\/}/tools/zipalign
-       ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-       enewgroup android
-}
-
-src_prepare() {
-       rm -rf tools/lib/x86*
-}
-
-src_install() {
-       dodoc tools/NOTICE.txt "SDK Readme.txt"
-       rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-       dodir "${ANDROID_SDK_DIR}/tools"
-       cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to 
install tools"
-
-       # Maybe this is needed for the tools directory too.
-       dodir 
"${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-       fowners -R root:android 
"${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-       fperms -R 0775 
"${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-       echo 
"PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\""
 > "${T}/80${PN}" || die
-
-       SWT_PATH=
-       SWT_VERSIONS="3.7 3.6"
-       for version in $SWT_VERSIONS; do
-               # redirecting stderr to /dev/null
-               # not sure if this is best, but avoids misleading error messages
-               SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 
2>/dev/null`"
-               if [ $SWT_PATH ]; then
-                       einfo "SWT_PATH=$SWT_PATH selecting version $version of 
SWT."
-                       break
-               fi
-       done
-
-       echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-       echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" 
|| die
-
-       doenvd "${T}/80${PN}"
-
-       echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > 
"${T}/80${PN}" || die
-
-       insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-       udev_dorules "${FILESDIR}"/80-android.rules || die
-       domenu "${FILESDIR}"/android-sdk-update-manager.desktop
-}
-
-pkg_postinst() {
-       elog "The Android SDK now uses its own manager for the development      
environment."
-       elog "Run 'android' to download the full SDK, including some of the 
platform tools."
-       elog "You must be in the android group to manage the development 
environment."
-       elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-       elog "See https://developer.android.com/sdk/adding-components.html for 
more"
-       elog "information."
-       elog "If you have problems downloading the SDK, see 
https://code.google.com/p/android/issues/detail?id=4406";
-       elog "You need to run env-update and source /etc/profile in any open 
shells"
-       elog "if you get an SWT error."
-}

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
deleted file mode 100644
index 895cf67fd7d..00000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user udev
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com";
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz";
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-               app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-       >=dev-java/ant-core-1.6.5
-       dev-java/swt:3.7[cairo]
-       sys-libs/zlib[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-       ${ANDROID_SDK_DIR/\/}/tools/emulator
-       ${ANDROID_SDK_DIR/\/}/tools/adb
-       ${ANDROID_SDK_DIR/\/}/tools/mksdcard
-       ${ANDROID_SDK_DIR/\/}/tools/sqlite3
-       ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-       ${ANDROID_SDK_DIR/\/}/tools/zipalign
-       ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-       enewgroup android
-}
-
-src_prepare() {
-       rm -rf tools/lib/x86*
-}
-
-src_install() {
-       dodoc tools/NOTICE.txt "SDK Readme.txt"
-       rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-       dodir "${ANDROID_SDK_DIR}/tools"
-       cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to 
install tools"
-
-       # Maybe this is needed for the tools directory too.
-       dodir 
"${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-       fowners root:android 
"${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-       fperms 0775 
"${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-       echo 
"PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\""
 > "${T}/80${PN}" || die
-
-       SWT_PATH=
-       SWT_VERSIONS="3.7 3.6"
-       for version in $SWT_VERSIONS; do
-               # redirecting stderr to /dev/null
-               # not sure if this is best, but avoids misleading error messages
-               SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 
2>/dev/null`"
-               if [ $SWT_PATH ]; then
-                       einfo "SWT_PATH=$SWT_PATH selecting version $version of 
SWT."
-                       break
-               fi
-       done
-
-       echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-       echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" 
|| die
-
-       doenvd "${T}/80${PN}"
-
-       echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > 
"${T}/80${PN}" || die
-
-       insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-       udev_dorules "${FILESDIR}"/80-android.rules || die
-       domenu "${FILESDIR}"/android-sdk-update-manager.desktop
-}
-
-pkg_postinst() {
-       elog "The Android SDK now uses its own manager for the development      
environment."
-       elog "Run 'android' to download the full SDK, including some of the 
platform tools."
-       elog "You must be in the android group to manage the development 
environment."
-       elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-       elog "See https://developer.android.com/sdk/adding-components.html for 
more"
-       elog "information."
-       elog "If you have problems downloading the SDK, see 
https://code.google.com/p/android/issues/detail?id=4406";
-       elog "You need to run env-update and source /etc/profile in any open 
shells"
-       elog "if you get an SWT error."
-}

Reply via email to