public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-sdk-update-manager/
@ 2018-05-16 22:50 Aaron Bauman
  0 siblings, 0 replies; 17+ messages in thread
From: Aaron Bauman @ 2018-05-16 22:50 UTC (permalink / raw
  To: gentoo-commits

commit:     6eb25167cd9101dfe234bc3d71c898b923c7478c
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed May 16 14:24:57 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed May 16 22:50:22 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eb25167

dev-util/android-sdk-update-manager: use HTTPS

Closes: https://github.com/gentoo/gentoo/pull/8431

 .../android-sdk-update-manager-21.1.ebuild                          | 6 +++---
 .../android-sdk-update-manager/android-sdk-update-manager-21.ebuild | 6 +++---
 .../android-sdk-update-manager-22.0.1-r1.ebuild                     | 6 +++---
 .../android-sdk-update-manager-22.0.1.ebuild                        | 6 +++---
 .../android-sdk-update-manager-22.0.4.ebuild                        | 6 +++---
 .../android-sdk-update-manager-22.0.5-r1.ebuild                     | 6 +++---
 .../android-sdk-update-manager-22.0.5.ebuild                        | 6 +++---
 .../android-sdk-update-manager-22.2.1.ebuild                        | 6 +++---
 .../android-sdk-update-manager-22.3.ebuild                          | 6 +++---
 .../android-sdk-update-manager-22.6.1.ebuild                        | 6 +++---
 .../android-sdk-update-manager-22.6.ebuild                          | 6 +++---
 .../android-sdk-update-manager/android-sdk-update-manager-22.ebuild | 6 +++---
 .../android-sdk-update-manager-23-r1.ebuild                         | 6 +++---
 .../android-sdk-update-manager/android-sdk-update-manager-23.ebuild | 6 +++---
 .../android-sdk-update-manager-24.4.1.ebuild                        | 6 +++---
 15 files changed, 45 insertions(+), 45 deletions(-)

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
index 5f00b9850c8..7403186e3da 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit eutils user
 MY_P="android-sdk_r${PV}-linux"
 
 DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="http://developer.android.com"
+HOMEPAGE="https://developer.android.com"
 SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
 IUSE=""
 RESTRICT="mirror"
@@ -91,7 +91,7 @@ pkg_postinst() {
 	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 http://developer.android.com/sdk/adding-components.html for more"
+	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"

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
index 5a517bb942a..6a654da49cb 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit eutils user
 MY_P="android-sdk_r${PV}-linux"
 
 DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="http://developer.android.com"
+HOMEPAGE="https://developer.android.com"
 SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
 IUSE=""
 RESTRICT="mirror"
@@ -91,7 +91,7 @@ pkg_postinst() {
 	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 http://developer.android.com/sdk/adding-components.html for more"
+	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"

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
index f7afd556077..f812d83f4ed 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ inherit eutils user
 MY_P="android-sdk_r${PV}-linux"
 
 DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="http://developer.android.com"
+HOMEPAGE="https://developer.android.com"
 SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
 IUSE=""
 RESTRICT="mirror"
@@ -91,7 +91,7 @@ pkg_postinst() {
 	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 http://developer.android.com/sdk/adding-components.html for more"
+	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"

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
index b4f3c7e230f..602463fce91 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit eutils user
 MY_P="android-sdk_r${PV}-linux"
 
 DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="http://developer.android.com"
+HOMEPAGE="https://developer.android.com"
 SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
 IUSE=""
 RESTRICT="mirror"
@@ -91,7 +91,7 @@ pkg_postinst() {
 	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 http://developer.android.com/sdk/adding-components.html for more"
+	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"

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
index f7afd556077..f812d83f4ed 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ inherit eutils user
 MY_P="android-sdk_r${PV}-linux"
 
 DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="http://developer.android.com"
+HOMEPAGE="https://developer.android.com"
 SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
 IUSE=""
 RESTRICT="mirror"
@@ -91,7 +91,7 @@ pkg_postinst() {
 	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 http://developer.android.com/sdk/adding-components.html for more"
+	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"

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
index 469b385c8e8..173fd895298 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ inherit eutils user
 MY_P="android-sdk_r${PV}-linux"
 
 DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="http://developer.android.com"
+HOMEPAGE="https://developer.android.com"
 SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
 IUSE=""
 RESTRICT="mirror"
@@ -92,7 +92,7 @@ pkg_postinst() {
 	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 http://developer.android.com/sdk/adding-components.html for more"
+	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"

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
index f7afd556077..f812d83f4ed 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ inherit eutils user
 MY_P="android-sdk_r${PV}-linux"
 
 DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="http://developer.android.com"
+HOMEPAGE="https://developer.android.com"
 SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
 IUSE=""
 RESTRICT="mirror"
@@ -91,7 +91,7 @@ pkg_postinst() {
 	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 http://developer.android.com/sdk/adding-components.html for more"
+	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"

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
index 469b385c8e8..173fd895298 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ inherit eutils user
 MY_P="android-sdk_r${PV}-linux"
 
 DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="http://developer.android.com"
+HOMEPAGE="https://developer.android.com"
 SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
 IUSE=""
 RESTRICT="mirror"
@@ -92,7 +92,7 @@ pkg_postinst() {
 	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 http://developer.android.com/sdk/adding-components.html for more"
+	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"

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
index 5c4a40c1c3a..56e4c80f137 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ inherit eutils user udev
 MY_P="android-sdk_r${PV}-linux"
 
 DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="http://developer.android.com"
+HOMEPAGE="https://developer.android.com"
 SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
 IUSE=""
 RESTRICT="mirror"
@@ -94,7 +94,7 @@ pkg_postinst() {
 	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 http://developer.android.com/sdk/adding-components.html for more"
+	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"

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
index 5c4a40c1c3a..56e4c80f137 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ inherit eutils user udev
 MY_P="android-sdk_r${PV}-linux"
 
 DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="http://developer.android.com"
+HOMEPAGE="https://developer.android.com"
 SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
 IUSE=""
 RESTRICT="mirror"
@@ -94,7 +94,7 @@ pkg_postinst() {
 	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 http://developer.android.com/sdk/adding-components.html for more"
+	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"

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
index 5c4a40c1c3a..56e4c80f137 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ inherit eutils user udev
 MY_P="android-sdk_r${PV}-linux"
 
 DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="http://developer.android.com"
+HOMEPAGE="https://developer.android.com"
 SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
 IUSE=""
 RESTRICT="mirror"
@@ -94,7 +94,7 @@ pkg_postinst() {
 	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 http://developer.android.com/sdk/adding-components.html for more"
+	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"

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
index b4f3c7e230f..602463fce91 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit eutils user
 MY_P="android-sdk_r${PV}-linux"
 
 DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="http://developer.android.com"
+HOMEPAGE="https://developer.android.com"
 SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
 IUSE=""
 RESTRICT="mirror"
@@ -91,7 +91,7 @@ pkg_postinst() {
 	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 http://developer.android.com/sdk/adding-components.html for more"
+	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"

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
index d68d94698d0..5178faa3931 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ inherit eutils user udev
 MY_P="android-sdk_r${PV}-linux"
 
 DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="http://developer.android.com"
+HOMEPAGE="https://developer.android.com"
 SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
 IUSE=""
 RESTRICT="mirror"
@@ -94,7 +94,7 @@ pkg_postinst() {
 	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 http://developer.android.com/sdk/adding-components.html for more"
+	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"

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
index dae7e2366b6..20463eb949f 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ inherit eutils user udev
 MY_P="android-sdk_r${PV}-linux"
 
 DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="http://developer.android.com"
+HOMEPAGE="https://developer.android.com"
 SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
 IUSE=""
 RESTRICT="mirror"
@@ -94,7 +94,7 @@ pkg_postinst() {
 	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 http://developer.android.com/sdk/adding-components.html for more"
+	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"

diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild
index d68d94698d0..5178faa3931 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ inherit eutils user udev
 MY_P="android-sdk_r${PV}-linux"
 
 DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="http://developer.android.com"
+HOMEPAGE="https://developer.android.com"
 SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
 IUSE=""
 RESTRICT="mirror"
@@ -94,7 +94,7 @@ pkg_postinst() {
 	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 http://developer.android.com/sdk/adding-components.html for more"
+	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"


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-sdk-update-manager/
@ 2024-10-17 15:32 Arthur Zamarin
  0 siblings, 0 replies; 17+ messages in thread
From: Arthur Zamarin @ 2024-10-17 15:32 UTC (permalink / raw
  To: gentoo-commits

commit:     c6520b50462355c0ae9c8fe8d73df13d01f5a950
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 17 14:38:06 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 17 15:32:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6520b50

dev-util/android-sdk-update-manager: dekeyword x86

After a message to gentoo-dev ML, and no reply from any user on x86,

we decided to dekeyword most Java packages from x86, and reverse

dependencies of them.

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 .../android-sdk-update-manager-24.4.1-r2.ebuild                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild
index ce91e3256302..6a3fe922894e 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/android-sdk-linux"
 
 LICENSE="android"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 RESTRICT="bindist mirror"
 
 DEPEND="acct-group/android"


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-sdk-update-manager/
@ 2024-04-25  5:51 Joonas Niilola
  0 siblings, 0 replies; 17+ messages in thread
From: Joonas Niilola @ 2024-04-25  5:51 UTC (permalink / raw
  To: gentoo-commits

commit:     1153b35ce8f10d3ffd00a39bb0938dbe793397ba
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Mar 12 15:46:28 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Apr 25 05:51:19 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1153b35c

dev-util/android-sdk-update-manager: switch to dev-java/ant

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35725
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 ...r-24.4.1-r1.ebuild => android-sdk-update-manager-24.4.1-r2.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild
similarity index 98%
rename from dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r1.ebuild
rename to dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild
index bce0a436f973..0ea35b6a873a 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop udev
 
@@ -21,7 +21,7 @@ RESTRICT="bindist mirror"
 DEPEND="acct-group/android"
 RDEPEND="
 	${DEPEND}
-	dev-java/ant-core
+	>=dev-java/ant-1.10.14-r3:0
 	dev-java/swt:3.7[cairo]
 	>=virtual/jdk-1.8
 	sys-libs/ncurses-compat:5[abi_x86_32(-)]


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-sdk-update-manager/
@ 2024-04-25  5:51 Joonas Niilola
  0 siblings, 0 replies; 17+ messages in thread
From: Joonas Niilola @ 2024-04-25  5:51 UTC (permalink / raw
  To: gentoo-commits

commit:     bf284ee4aaebdbdf5e39ab541c2bdb2e55219a46
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 25 05:48:25 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Apr 25 05:51:19 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf284ee4

dev-util/android-sdk-update-manager: add missing deps

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../android-sdk-update-manager-24.4.1-r2.ebuild               | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild
index 0ea35b6a873a..ce91e3256302 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild
@@ -23,9 +23,18 @@ RDEPEND="
 	${DEPEND}
 	>=dev-java/ant-1.10.14-r3:0
 	dev-java/swt:3.7[cairo]
-	>=virtual/jdk-1.8
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libpulse
 	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
+	>=virtual/jdk-1.8
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+
 "
 
 QA_PREBUILT="*"


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-sdk-update-manager/
@ 2024-04-06 14:42 Michał Górny
  0 siblings, 0 replies; 17+ messages in thread
From: Michał Górny @ 2024-04-06 14:42 UTC (permalink / raw
  To: gentoo-commits

commit:     246f604317d7bb903e74aa4f78af6a2fb4ec95bf
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  6 14:41:23 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Apr  6 14:41:46 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=246f6043

dev-util/android-sdk-update-manager: [QA] Add RESTRICT=bindist

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../android-sdk-update-manager-24.4.1-r1.ebuild                       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r1.ebuild
index 2a9d244bfb9a..bce0a436f973 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ S="${WORKDIR}/android-sdk-linux"
 LICENSE="android"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror"
+RESTRICT="bindist mirror"
 
 DEPEND="acct-group/android"
 RDEPEND="


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-sdk-update-manager/
@ 2021-11-16  9:06 Florian Schmaus
  0 siblings, 0 replies; 17+ messages in thread
From: Florian Schmaus @ 2021-11-16  9:06 UTC (permalink / raw
  To: gentoo-commits

commit:     360f2e76ceb9f0ba1879346410d504d4c0600b9c
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Nov 15 14:44:53 2021 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Nov 16 09:05:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=360f2e76

dev-util/android-sdk-update-manager: remove 24.4.1-r2

Since dev-java/swt:4.10 does not support x86 this revbump was unneeded.

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/22958
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 .../android-sdk-update-manager-24.4.1-r2.ebuild    | 89 ----------------------
 1 file changed, 89 deletions(-)

diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild
deleted file mode 100644
index 5451f113cfc7..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop udev
-
-ANDROID_SDK_DIR="/opt/android-sdk-update-manager"
-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"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="mirror"
-
-DEPEND="acct-group/android"
-RDEPEND="
-	${DEPEND}
-	dev-java/ant-core
-	dev-java/swt:4.10[cairo]
-	>=virtual/jdk-1.8
-	sys-libs/ncurses-compat:5[abi_x86_32(-)]
-	sys-libs/zlib[abi_x86_32(-)]
-"
-
-S="${WORKDIR}/android-sdk-linux"
-
-QA_PREBUILT="*"
-
-src_prepare() {
-	default
-	rm -rf tools/lib/x86* || die
-}
-
-src_install() {
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt" || die
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die
-
-	# 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."
-}


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-sdk-update-manager/
@ 2021-05-24 23:37 John Helmert III
  0 siblings, 0 replies; 17+ messages in thread
From: John Helmert III @ 2021-05-24 23:37 UTC (permalink / raw
  To: gentoo-commits

commit:     de8e760526b16baa7c1662b4b99539b5cad3edbb
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Mon May 24 22:41:52 2021 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Mon May 24 23:36:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de8e7605

dev-util/android-sdk-update-manager: drop unused eclass

Closes: https://bugs.gentoo.org/791493
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 .../android-sdk-update-manager-24.4.1-r1.ebuild                         | 2 +-
 .../android-sdk-update-manager-24.4.1-r2.ebuild                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r1.ebuild
index e88fec54203..2a9d244bfb9 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop user udev
+inherit desktop udev
 
 ANDROID_SDK_DIR="/opt/android-sdk-update-manager"
 MY_P="android-sdk_r${PV}-linux"

diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild
index 32fd761b14e..5451f113cfc 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop user udev
+inherit desktop udev
 
 ANDROID_SDK_DIR="/opt/android-sdk-update-manager"
 MY_P="android-sdk_r${PV}-linux"


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-sdk-update-manager/
@ 2021-05-22  9:30 Miroslav Šulc
  0 siblings, 0 replies; 17+ messages in thread
From: Miroslav Šulc @ 2021-05-22  9:30 UTC (permalink / raw
  To: gentoo-commits

commit:     2ebd77a58a9ad14da948a3e190d28661f237a4f8
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue May 18 10:39:29 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat May 22 09:30:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ebd77a5

dev-util/android-sdk-update-manager: swt:4.10 slot update

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20865/commits/66d05e505595627af6b80521591adb2f6b72918b
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../android-sdk-update-manager-24.4.1-r2.ebuild    | 89 ++++++++++++++++++++++
 1 file changed, 89 insertions(+)

diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild
new file mode 100644
index 00000000000..32fd761b14e
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop user udev
+
+ANDROID_SDK_DIR="/opt/android-sdk-update-manager"
+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"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+DEPEND="acct-group/android"
+RDEPEND="
+	${DEPEND}
+	dev-java/ant-core
+	dev-java/swt:4.10[cairo]
+	>=virtual/jdk-1.8
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
+"
+
+S="${WORKDIR}/android-sdk-linux"
+
+QA_PREBUILT="*"
+
+src_prepare() {
+	default
+	rm -rf tools/lib/x86* || die
+}
+
+src_install() {
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
+	rm -f tools/NOTICE.txt "SDK Readme.txt" || die
+
+	dodir "${ANDROID_SDK_DIR}/tools"
+	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die
+
+	# 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."
+}


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-sdk-update-manager/
@ 2021-04-17 17:18 Conrad Kostecki
  0 siblings, 0 replies; 17+ messages in thread
From: Conrad Kostecki @ 2021-04-17 17:18 UTC (permalink / raw
  To: gentoo-commits

commit:     399d6a4f972b38d44b0e6a764996edce4335e59f
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 17 17:16:21 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Apr 17 17:17:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=399d6a4f

dev-util/android-sdk-update-manager: migrate to glep 81

Closes: https://bugs.gentoo.org/729194
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../android-sdk-update-manager-24.4.1-r1.ebuild    | 88 ++++++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r1.ebuild
new file mode 100644
index 00000000000..2a9d244bfb9
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop udev
+
+ANDROID_SDK_DIR="/opt/android-sdk-update-manager"
+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"
+S="${WORKDIR}/android-sdk-linux"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror"
+
+DEPEND="acct-group/android"
+RDEPEND="
+	${DEPEND}
+	dev-java/ant-core
+	dev-java/swt:3.7[cairo]
+	>=virtual/jdk-1.8
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
+"
+
+QA_PREBUILT="*"
+
+src_prepare() {
+	default
+	rm -rf tools/lib/x86* || die
+}
+
+src_install() {
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
+	rm -f tools/NOTICE.txt "SDK Readme.txt" || die
+
+	dodir "${ANDROID_SDK_DIR}/tools"
+	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die
+
+	# 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."
+}


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-sdk-update-manager/
@ 2021-04-17 17:18 Conrad Kostecki
  0 siblings, 0 replies; 17+ messages in thread
From: Conrad Kostecki @ 2021-04-17 17:18 UTC (permalink / raw
  To: gentoo-commits

commit:     47045e8eef354ebb8e7466c8a4e9fdd02ad54f10
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 17 17:17:47 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Apr 17 17:17:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47045e8e

dev-util/android-sdk-update-manager: drop old version

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../android-sdk-update-manager-24.4.1.ebuild       | 103 ---------------------
 1 file changed, 103 deletions(-)

diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild
deleted file mode 100644
index 99065ffc91d..00000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild
+++ /dev/null
@@ -1,103 +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/ncurses-compat:5[abi_x86_32(-)]
-	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."
-}


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-sdk-update-manager/
@ 2020-09-24 19:53 Aaron Bauman
  0 siblings, 0 replies; 17+ messages in thread
From: Aaron Bauman @ 2020-09-24 19:53 UTC (permalink / raw
  To: gentoo-commits

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."
-}


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-sdk-update-manager/
@ 2020-06-23 10:32 Richard Freeman
  0 siblings, 0 replies; 17+ messages in thread
From: Richard Freeman @ 2020-06-23 10:32 UTC (permalink / raw
  To: gentoo-commits

commit:     d824c538a443b92209d529be5b1aacc9dcfd2539
Author:     Richard Freeman <rich0 <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 23 10:29:38 2020 +0000
Commit:     Richard Freeman <rich0 <AT> gentoo <DOT> org>
CommitDate: Tue Jun 23 10:32:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d824c538

dev-util/android-sdk-update-manager: remove maintainer

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Richard Freeman <rich0 <AT> gentoo.org>

 dev-util/android-sdk-update-manager/metadata.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dev-util/android-sdk-update-manager/metadata.xml b/dev-util/android-sdk-update-manager/metadata.xml
index e97c89c421c..942e57aad12 100644
--- a/dev-util/android-sdk-update-manager/metadata.xml
+++ b/dev-util/android-sdk-update-manager/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>rich0@gentoo.org</email>
-</maintainer>
+        <!-- maintainer-needed -->
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-sdk-update-manager/
@ 2019-12-19 17:58 Ben Kohler
  0 siblings, 0 replies; 17+ messages in thread
From: Ben Kohler @ 2019-12-19 17:58 UTC (permalink / raw
  To: gentoo-commits

commit:     d2a078148e53bfc34c672c9ffa3d44d677dfd93a
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 19 15:32:26 2019 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu Dec 19 17:58:01 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2a07814

dev-util/android-sdk-update-manager: add missing ncurses-compat dep

Closes: https://bugs.gentoo.org/574624
Closes: https://bugs.gentoo.org/697472
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 .../android-sdk-update-manager-24.4.1.ebuild                           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild
index 8593117128e..c86665dd911 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -22,6 +22,7 @@ DEPEND="app-arch/tar
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
 	dev-java/swt:3.7[cairo]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 "
 


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-sdk-update-manager/
@ 2018-08-26 11:01 Michał Górny
  0 siblings, 0 replies; 17+ messages in thread
From: Michał Górny @ 2018-08-26 11:01 UTC (permalink / raw
  To: gentoo-commits

commit:     633ccc991a7e04d6f1a827af0db7459a42fc4d5e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 26 10:41:26 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 26 11:01:06 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=633ccc99

dev-util/android-sdk-update-manager: Remove support for non-existent deps

 .../android-sdk-update-manager-22.0.1-r1.ebuild                         | 2 +-
 .../android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild | 2 +-
 .../android-sdk-update-manager-22.0.5-r1.ebuild                         | 2 +-
 .../android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild | 2 +-
 .../android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild | 2 +-
 .../android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild   | 2 +-
 .../android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild | 2 +-
 .../android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild   | 2 +-
 .../android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild  | 2 +-
 .../android-sdk-update-manager/android-sdk-update-manager-23.ebuild     | 2 +-
 .../android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

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
index f812d83f4ed..35615393b47 100644
--- 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
@@ -21,7 +21,7 @@ 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] dev-java/swt:3.6[cairo] )
+	dev-java/swt:3.7[cairo]
 	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 "
 

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
index f812d83f4ed..35615393b47 100644
--- 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
@@ -21,7 +21,7 @@ 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] dev-java/swt:3.6[cairo] )
+	dev-java/swt:3.7[cairo]
 	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 "
 

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
index 173fd895298..86465a22ddb 100644
--- 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
@@ -21,7 +21,7 @@ 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] dev-java/swt:3.6[cairo] )
+	dev-java/swt:3.7[cairo]
 	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 "
 

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
index f812d83f4ed..35615393b47 100644
--- 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
@@ -21,7 +21,7 @@ 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] dev-java/swt:3.6[cairo] )
+	dev-java/swt:3.7[cairo]
 	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 "
 

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
index 173fd895298..86465a22ddb 100644
--- 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
@@ -21,7 +21,7 @@ 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] dev-java/swt:3.6[cairo] )
+	dev-java/swt:3.7[cairo]
 	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 "
 

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
index 56e4c80f137..6db41505494 100644
--- 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
@@ -21,7 +21,7 @@ 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] dev-java/swt:3.6[cairo] )
+	dev-java/swt:3.7[cairo]
 	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 "
 

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
index 56e4c80f137..6db41505494 100644
--- 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
@@ -21,7 +21,7 @@ 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] dev-java/swt:3.6[cairo] )
+	dev-java/swt:3.7[cairo]
 	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 "
 

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
index 56e4c80f137..6db41505494 100644
--- 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
@@ -21,7 +21,7 @@ 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] dev-java/swt:3.6[cairo] )
+	dev-java/swt:3.7[cairo]
 	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 "
 

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
index 5178faa3931..8593117128e 100644
--- 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
@@ -21,7 +21,7 @@ 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] dev-java/swt:3.6[cairo] )
+	dev-java/swt:3.7[cairo]
 	sys-libs/zlib[abi_x86_32(-)]
 "
 

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
index 20463eb949f..92937bbca47 100644
--- 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
@@ -21,7 +21,7 @@ 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] dev-java/swt:3.6[cairo] )
+	dev-java/swt:3.7[cairo]
 	sys-libs/zlib[abi_x86_32(-)]
 "
 

diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild
index 5178faa3931..8593117128e 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild
@@ -21,7 +21,7 @@ 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] dev-java/swt:3.6[cairo] )
+	dev-java/swt:3.7[cairo]
 	sys-libs/zlib[abi_x86_32(-)]
 "
 


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-sdk-update-manager/
@ 2017-12-10 16:04 Michał Górny
  0 siblings, 0 replies; 17+ messages in thread
From: Michał Górny @ 2017-12-10 16:04 UTC (permalink / raw
  To: gentoo-commits

commit:     4627c65c5ffdab4ac5736c183f78de4b17d0264f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 16:02:26 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 16:04:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4627c65c

dev-util/android-sdk-update-manager: Update Manifest hashes

 dev-util/android-sdk-update-manager/Manifest | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/dev-util/android-sdk-update-manager/Manifest b/dev-util/android-sdk-update-manager/Manifest
index f2f0fac5830..5a4fb8ea2af 100644
--- a/dev-util/android-sdk-update-manager/Manifest
+++ b/dev-util/android-sdk-update-manager/Manifest
@@ -1,12 +1,12 @@
-DIST android-sdk_r21-linux.tgz 91378351 SHA256 ad3e642626407b78d0fafe7ff89d1ee388b1f5c6f2eba83ce9364957a038ab9d SHA512 3a3338265a2d00f8b7fbb35783d7449498afd8107ddd4ed4c2c34e47582d83eb23f78d02fe01db54c12c48dba0167f60118c1061f1bfeb0048147674fee8d87c WHIRLPOOL feeb9d060a460ec2738a612ae90689791edf54deabcb1b1c37ddec22fb8bfaa13fc4dd53aecfbd5ac70309ce299a88ed84080ef7a2e1a14a6959d4ecf21fbfc9
-DIST android-sdk_r21.1-linux.tgz 91617112 SHA256 276e3c13a10f37927d4e04d036a94a0cbbf62326981f0ba61a303b76567e3379 SHA512 160cd51f965a23120cf63abe02b9a9ce8913d1239a848bc423b33ad10eff65b30147c6b11ab751aa12154292ce0a7837aa60def1cd31a2ccb5d4fc6fcb6d2c24 WHIRLPOOL a4f413356ac87d4753f8d33bddad737cadf41b2d8246f8971addbec568261212505bef4be3c098c8e21e148960a90b87c2c6952665d1845e0aeee9a307c06b44
-DIST android-sdk_r22-linux.tgz 99643077 SHA256 fd75de430bd83f90fbeb0d15ae017cccf998a87286188232cfeab27a6d89bd32 SHA512 9beda1ae872dde3ca7884d1c389566ce2c8b511ef74d95bc9ddf53683445cc454f9a5a1871a80d5826083d98713040cb1b8b239a77a8eadf56daf30440c7108d WHIRLPOOL e5c39b61d8f9f3f72420af21d7329f04492787543e4693c4eee010b9ec4d48c04bd4eb8d1d202c32552e46e220b2e3e973fe5248602b5d147f0788f89ed23e88
-DIST android-sdk_r22.0.1-linux.tgz 105617062 SHA256 216ae659a53682b97a0e0c2b3dc2c7c3d35011ed10302ae1a5ddbaf52a62459c SHA512 7c97ba8daf4a1b8b6e422d8fca21a5e23f3a5e92d769e13ab5e649a967f2662c71ae201a6c1d40202bda98c4fb80eaa60a3ff5e4af9f613cfab1366f63774ac7 WHIRLPOOL e029de8eaa746796fda38d7716880275d19da5dba08dd514970f7b5b8382a9aaac5415c66529d40f036f717e66f4a7842ebadc3ec323a284a583f0648eac54e0
-DIST android-sdk_r22.0.4-linux.tgz 105640988 SHA256 3eec3c2accfb90d8344d29ed7e80fdf59ea0eecfed3535a7c78116ace5b522e7 SHA512 10e047f6b5384d6c2d3f87e883203f2ab384ac826def16c07f1969d59dc79f97ccba36f0185d564fe0dd4811425fe18767c326b3712ee47b5515f0aba47ed612 WHIRLPOOL 76f21a8d44a7e9c79b8b9c8aea7b46de152577f7526f2d6861eb0c5cabbea20979721d22b2bee9978945ed920898754817f47fafc858a1d90199244b4152274f
-DIST android-sdk_r22.0.5-linux.tgz 105641005 SHA256 b664d1024b6fcf897e05eb1674c998df0ed2e4c9c280469445d914f8fcfa4454 SHA512 655f709994a8c5f9bd78216d8587bda66f23b7fccd556fd78adc989a835540af89529f2fb4d846e28196952a0a3c5bc919563c83fb73e6ecf7a4ad0560eb7f81 WHIRLPOOL acf50cd009107614e13d589d5ca7f956f72a80f462413def2de29aa7f8ee873b146ec391c0cab9fdeca8774ede5666b1c936a20ef44ef28d945bfe6bace3c5c6
-DIST android-sdk_r22.2.1-linux.tgz 100918342 SHA256 17ea4610008985eb1454b3b25ad00c59300cee3141f7ea3deec98f45d862faa5 SHA512 4eb7087c27db2b2435aa11bba01fccd09617ea58dd84aca8b249d81b3d15c913844d204463a6d83064c6cf8f07e26c0f70130315b281b1bbfd32c01d6e53bfef WHIRLPOOL b51611c4000464f2f0872893adea4bf7027f188582081d7beedc2b77700841b7e82ca6415db44603d4c186eda0e00dd4f51e603bf4416963ae80a0b57b617e0a
-DIST android-sdk_r22.3-linux.tgz 100968558 SHA256 4077575c98075480e0156c10e48a1521e31c7952768271a206870e6813057f4f SHA512 c05e610e0979f61d217b6612bccd48120719123cf80282cca442e81be6e0c4cfd5a4b3f398d1c8835c86bc67b730a7bf5a5e511abe57a1d70b6c1f62940832a3 WHIRLPOOL 3a05248c6e784a82dd2eb92de403e6e7634e4d3c472334c7d9d539f41a7d0612c48e6aecbd784081cc5477f22f595c723748ea69d8313c8550c63923a3ce1969
-DIST android-sdk_r22.6-linux.tgz 100992666 SHA256 da4c25536ba7f85cdd37be8636fcc563480410788df30c3fc5b5c876e6220e5f SHA512 2e632e31725a7c8c5e99cba70388c928d553d52177a2a0d49abfae125d1ccb57857171f10cd28da57664d0d9ab0f7b6ae409c943ad4d4433b05e0b8fb1bfe322 WHIRLPOOL 0d83ba871ea5ffd66d8543a563eac351b82f8597b7c8959848247e469c616fe52101c2d825648dbe6361dde3029bc4a8e06c097868eb3edcdeac1337beed9f03
-DIST android-sdk_r22.6.1-linux.tgz 101052129 SHA256 4ee7bb43fe6f20faf755b0988ecf818312392be52780db13ab4792a0b1627388 SHA512 5789a6b11a1a5c18145900042b15707f58afd6db82d345550c33e72cfbaf719c7c16667a7561e4c6ca624c2d2466430db7f8138bf0cd6449762639a63c6cf9ca WHIRLPOOL 09d6d11c08489d07b5b0da32734d70be8da65e949359b1155c9b59f3c07cbd21eed87c15f509e95604b7ed404f99b289700a10373268af132208b3e99178a113
-DIST android-sdk_r23-linux.tgz 137880977 SHA256 2eaab06852ac21b6c79df73c07a667c5da5be57f7ffcbd4f17aef7efeea22ac1 SHA512 c6d8de870e8697b31132b25db93d6b494b44240ca421cab6a48bbf53d142ba488d08ac77a9995ed06953e311dd14ea1ecf4d2039428ed31ab255f9aaaf94ad60 WHIRLPOOL f5fa2012fea5fa8f950626ad7281149c2a40b847514b61c22b8d3eaa0c92c3dfcdd1c7051e0bb990fd5c28babeadaf667228f630e7c19a69280aed06b6ba407b
-DIST android-sdk_r24.4.1-linux.tgz 326412652 SHA256 e16917ad685c1563ccbc5dd782930ee1a700a1b6a6fd3e44b83ac694650435e9 SHA512 96fb71d78a8c2833afeba6df617edcd6cc4e37ecd0c3bec38c39e78204ed3c2bd54b138a56086bf5ccd95e372e3c36e72c1550c13df8232ec19537da93049284 WHIRLPOOL db6747faf3e705d87c5a72efbc80b6ceaa2e81830e3ad5eca4b0db5b16cfcf5f41fa257fe866fd85e80c5e298b1f6bee25c156b83a2a24e3fa4e2b9db9406188
+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


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-sdk-update-manager/
@ 2016-01-30 13:26 Richard Freeman
  0 siblings, 0 replies; 17+ messages in thread
From: Richard Freeman @ 2016-01-30 13:26 UTC (permalink / raw
  To: gentoo-commits

commit:     b20882ec08347ee3ea66cfa876a72ba96c58321e
Author:     Richard Freeman <rich0 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 13:25:58 2016 +0000
Commit:     Richard Freeman <rich0 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 13:25:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b20882ec

dev-util/android-sdk-update-manager: bump

Bug: 521312

Package-Manager: portage-2.2.26

 dev-util/android-sdk-update-manager/Manifest       |   1 +
 .../android-sdk-update-manager-24.4.1.ebuild       | 103 +++++++++++++++++++++
 2 files changed, 104 insertions(+)

diff --git a/dev-util/android-sdk-update-manager/Manifest b/dev-util/android-sdk-update-manager/Manifest
index db0649f..f2f0fac 100644
--- a/dev-util/android-sdk-update-manager/Manifest
+++ b/dev-util/android-sdk-update-manager/Manifest
@@ -9,3 +9,4 @@ DIST android-sdk_r22.3-linux.tgz 100968558 SHA256 4077575c98075480e0156c10e48a15
 DIST android-sdk_r22.6-linux.tgz 100992666 SHA256 da4c25536ba7f85cdd37be8636fcc563480410788df30c3fc5b5c876e6220e5f SHA512 2e632e31725a7c8c5e99cba70388c928d553d52177a2a0d49abfae125d1ccb57857171f10cd28da57664d0d9ab0f7b6ae409c943ad4d4433b05e0b8fb1bfe322 WHIRLPOOL 0d83ba871ea5ffd66d8543a563eac351b82f8597b7c8959848247e469c616fe52101c2d825648dbe6361dde3029bc4a8e06c097868eb3edcdeac1337beed9f03
 DIST android-sdk_r22.6.1-linux.tgz 101052129 SHA256 4ee7bb43fe6f20faf755b0988ecf818312392be52780db13ab4792a0b1627388 SHA512 5789a6b11a1a5c18145900042b15707f58afd6db82d345550c33e72cfbaf719c7c16667a7561e4c6ca624c2d2466430db7f8138bf0cd6449762639a63c6cf9ca WHIRLPOOL 09d6d11c08489d07b5b0da32734d70be8da65e949359b1155c9b59f3c07cbd21eed87c15f509e95604b7ed404f99b289700a10373268af132208b3e99178a113
 DIST android-sdk_r23-linux.tgz 137880977 SHA256 2eaab06852ac21b6c79df73c07a667c5da5be57f7ffcbd4f17aef7efeea22ac1 SHA512 c6d8de870e8697b31132b25db93d6b494b44240ca421cab6a48bbf53d142ba488d08ac77a9995ed06953e311dd14ea1ecf4d2039428ed31ab255f9aaaf94ad60 WHIRLPOOL f5fa2012fea5fa8f950626ad7281149c2a40b847514b61c22b8d3eaa0c92c3dfcdd1c7051e0bb990fd5c28babeadaf667228f630e7c19a69280aed06b6ba407b
+DIST android-sdk_r24.4.1-linux.tgz 326412652 SHA256 e16917ad685c1563ccbc5dd782930ee1a700a1b6a6fd3e44b83ac694650435e9 SHA512 96fb71d78a8c2833afeba6df617edcd6cc4e37ecd0c3bec38c39e78204ed3c2bd54b138a56086bf5ccd95e372e3c36e72c1550c13df8232ec19537da93049284 WHIRLPOOL db6747faf3e705d87c5a72efbc80b6ceaa2e81830e3ad5eca4b0db5b16cfcf5f41fa257fe866fd85e80c5e298b1f6bee25c156b83a2a24e3fa4e2b9db9406188

diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild
new file mode 100644
index 0000000..f5ee877
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils user udev
+
+MY_P="android-sdk_r${PV}-linux"
+
+DESCRIPTION="Open Handset Alliance's Android SDK"
+HOMEPAGE="http://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] dev-java/swt:3.6[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 http://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."
+}


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/android-sdk-update-manager/
@ 2015-12-04 13:47 Richard Freeman
  0 siblings, 0 replies; 17+ messages in thread
From: Richard Freeman @ 2015-12-04 13:47 UTC (permalink / raw
  To: gentoo-commits

commit:     94a62f4a63eedcbb3673d433d6e0e9fb9fda2ecd
Author:     Richard Freeman <rich0 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  4 13:47:16 2015 +0000
Commit:     Richard Freeman <rich0 <AT> gentoo <DOT> org>
CommitDate: Fri Dec  4 13:47:16 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94a62f4a

dev-util/android-sdk-update-manager: Fix install permissions.

Gentoo-bug: 563050

Package-Manager: portage-2.2.20.1

 .../android-sdk-update-manager-23-r1.ebuild        | 103 +++++++++++++++++++++
 1 file changed, 103 insertions(+)

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
new file mode 100644
index 0000000..f5ee877
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils user udev
+
+MY_P="android-sdk_r${PV}-linux"
+
+DESCRIPTION="Open Handset Alliance's Android SDK"
+HOMEPAGE="http://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] dev-java/swt:3.6[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 http://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."
+}


^ permalink raw reply related	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2024-10-17 15:32 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-16 22:50 [gentoo-commits] repo/gentoo:master commit in: dev-util/android-sdk-update-manager/ Aaron Bauman
  -- strict thread matches above, loose matches on Subject: below --
2024-10-17 15:32 Arthur Zamarin
2024-04-25  5:51 Joonas Niilola
2024-04-25  5:51 Joonas Niilola
2024-04-06 14:42 Michał Górny
2021-11-16  9:06 Florian Schmaus
2021-05-24 23:37 John Helmert III
2021-05-22  9:30 Miroslav Šulc
2021-04-17 17:18 Conrad Kostecki
2021-04-17 17:18 Conrad Kostecki
2020-09-24 19:53 Aaron Bauman
2020-06-23 10:32 Richard Freeman
2019-12-19 17:58 Ben Kohler
2018-08-26 11:01 Michał Górny
2017-12-10 16:04 Michał Górny
2016-01-30 13:26 Richard Freeman
2015-12-04 13:47 Richard Freeman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox