gentoo resync : 28.04.2021

2 files changed, 18 insertions, 33 deletions

diff --git a/dev-util/android-sdk-update-manager/Manifest b/dev-util/android-sdk-update-manager/Manifest
index 0254b4290a10..bc6284a28185 100644
--- a/dev-util/android-sdk-update-manager/Manifest
+++ b/dev-util/android-sdk-update-manager/Manifest
@@ -1,5 +1,5 @@
 AUX 80-android.rules 284 BLAKE2B a45cd541f9812a9657312ae7c83ee36f9d6c3c53d2caa036d1649455389bd7244efa277d41c3e6eec4a0b10d9a97d5e81acd0d17aac8df3bfa3ec72bad5e8d87 SHA512 f78834e2b33afa88f59a636f9fb7804d341847568a638a68beba9ca842e78e40a52a9ad8396ae79d105d87e52f585d523e8f0d847fc7708ddc3351c031571f19
 AUX android-sdk-update-manager.desktop 346 BLAKE2B 6ff5cd618d7816ad5719ed864cc91a83042ac320c2aa1965e5ab95e7f7b6f05f56a8f5401a4ffe17fc5798a82ad02f07f87bf4e3409b0d1866b45b230b34cca4 SHA512 9f97d7d3bf0aa76686be3722b3f686c012c4d627d583275eaaaf91d43f1b355a9d4b7f42412435489b758a3161fd9fcf8c36f5d1777662af3fbcd11bdc0d7aca
 DIST android-sdk_r24.4.1-linux.tgz 326412652 BLAKE2B 4263a5e942f0ee35069f4fc075504c637381820f40485c9753f5f586f713e614c204b3e5c35968acbc665644aaab4c2e05660e00675d956422cd7d1fc6445ed2 SHA512 96fb71d78a8c2833afeba6df617edcd6cc4e37ecd0c3bec38c39e78204ed3c2bd54b138a56086bf5ccd95e372e3c36e72c1550c13df8232ec19537da93049284
-EBUILD android-sdk-update-manager-24.4.1.ebuild 3353 BLAKE2B 05e979a96b88dba1be33559d2b8eb48eb6aec5cfc8a02b53416f809f31e8c7f043e6fafc0b2ca8ae8767656c624757f7f4357433de4e41756fdadc067793fa3e SHA512 7d04b34c7d6364106ff48ec5c79c5d3a4a4bf6f01511a5dbfd18e8ef6331002c0054ff98b86c0f039c27013d4bd755a4623f38a7b7d6c0653dd5015e9cc91423
+EBUILD android-sdk-update-manager-24.4.1-r1.ebuild 2957 BLAKE2B ab3561b6222fe3284f7b06ee7404fb6b4b02e4edb61735e64049bf20eb97a38e84369a02fc626fd6601b06400a60896f30846a4690290ed5151f1396d49b007b SHA512 884a16d8b25cd48b1cfbbe15e2ff3c89f16b3115fb1b91c9735e6fa8e69ed4ae4b66f30f59e0cbec85d108ce3b6d40c5638ca3f284c2b73716c112d53697e286
 MISC metadata.xml 174 BLAKE2B 1738b3b33ef242919964fb6a498f2215dbd528720bd193469bb20020fbedda0e9102ef85539fa9d2c3924bf2e6c0dd560671134200481054111467ba8e88fcb1 SHA512 281aa8b74dd6915f9856e5e70db000388f8b04bd5393871e67b57cec316374c6986124202dfdf4855ba57dd60f1e2cfc323a1f2cc4c6fbe0f634f67f8fb40b17
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-r1.ebuild
index 99065ffc91d6..e88fec54203a 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-r1.ebuild
@@ -1,61 +1,46 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit eutils user udev
+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"
-IUSE=""
-RESTRICT="mirror"
+S="${WORKDIR}/android-sdk-linux"
 
 LICENSE="android"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror"
 
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
+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(-)]
 "
 
-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
-}
+QA_PREBUILT="*"
 
 src_prepare() {
-	rm -rf tools/lib/x86*
+	default
+	rm -rf tools/lib/x86* || die
 }
 
 src_install() {
 	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f 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 "failed to install 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}
@@ -91,7 +76,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
+	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."