Set ANDROID_HOME - bug 484976 - thanks to Florian Schmaus.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x08C170DE55EC123A

3 files changed, 113 insertions, 5 deletions

diff --git a/dev-util/android-sdk-update-manager/ChangeLog b/dev-util/android-sdk-update-manager/ChangeLog
index 32488e60f420..a5c546105725 100644
--- a/dev-util/android-sdk-update-manager/ChangeLog
+++ b/dev-util/android-sdk-update-manager/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/android-sdk-update-manager
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog,v 1.54 2013/08/14 14:40:57 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog,v 1.55 2013/09/16 13:13:59 rich0 Exp $
+
+*android-sdk-update-manager-22.0.5-r1 (16 Sep 2013)
+
+  16 Sep 2013; Richard Freeman <rich0@gentoo.org>
+  +android-sdk-update-manager-22.0.5-r1.ebuild:
+  Set ANDROID_HOME - bug 484976 - thanks to Florian Schmaus.
 
 *android-sdk-update-manager-22.0.5 (14 Aug 2013)
 
diff --git a/dev-util/android-sdk-update-manager/Manifest b/dev-util/android-sdk-update-manager/Manifest
index 74d17a06caf0..bc1971388f08 100644
--- a/dev-util/android-sdk-update-manager/Manifest
+++ b/dev-util/android-sdk-update-manager/Manifest
@@ -12,14 +12,15 @@ EBUILD android-sdk-update-manager-21.ebuild 3175 SHA256 38d8c5f8b0aff7e5cb40d429
 EBUILD android-sdk-update-manager-22.0.1-r1.ebuild 3400 SHA256 823c11578914e57d6e353c3290c49ae7850e43474dcb9482d723b9baa1ccca8b SHA512 9b045b4698e2e76828aca163bcec3449c017f82b4ab479daa93b7331445ccd25dd63af7cd8f06509c479ea2951d85b8be92b66742699b173983569d40d9e4853 WHIRLPOOL 37f07e6a77101c515f5a6dafac433538f700e8499c9839390ed2f65efec87d05dbcaefe650943b1cf41a844597b7b02296453358305e7eb19626d06255078f36
 EBUILD android-sdk-update-manager-22.0.1.ebuild 3369 SHA256 ddb963dbb8d8809ded4cf368b19663774e461ec7f0da54ffec66917c3ef1a66e SHA512 7366b2ebf260bab4b40ad7fcd77d1cd467f8091e3380ec1583a55f4fb8006832c3901f57c3ce06eb0187878147346a44b5a67b9daccac71a60881ad21651d1b8 WHIRLPOOL 20513a283c9acc87949579aab3129bfbeee43c0560e50eb6624c017c38682e490683383ac0b74812bd1a504e8824c8f1c710be897c021738a10bf07bf3a88ab8
 EBUILD android-sdk-update-manager-22.0.4.ebuild 3397 SHA256 da69440b6735eca4f30957e90500a00b0c5c73db70932a59b45885dedac79dff SHA512 ccfb34191e91446d8ae4511ae0d8d206ed5837644855f7265b1c52af158ab94e2a333533bcad1425dfcb9fad20e949f73faae7e0fe44df117305accab9333187 WHIRLPOOL 95224b04057f7232a8b57ad059e945313527e3ebf9b8fa78e143ea5c06609de656c23ab103c6fb7f5a5810d390af81ce25343d444dcf4540df8ef2fbe1e2a830
+EBUILD android-sdk-update-manager-22.0.5-r1.ebuild 3479 SHA256 53f6b954976455f54db3974488b86b88b19ef556e102c09ad857f53b902469c9 SHA512 bc7ca51b1a4015cf72a6cf0c2e8f8eff5a7666b803677ce539717e9551a6c17d5fc942e5934df844301a99c8bca7b4bf148c95d8ff4f79a25f4d99ebeaae185c WHIRLPOOL 0ffd4ad6ad7c9bc482eff1c21b7e33ad1adc5f301a382992a4b31de9566606f81f4f63981156f2b291669617df1553ab5fa0519c9b3b8ba745aeda93dd6996c6
 EBUILD android-sdk-update-manager-22.0.5.ebuild 3397 SHA256 72392583628464aa0132800ed920239dd1068ec4ea06d6ae914ba944fee96a35 SHA512 c5a8e92524a3889182723a5c1218c95dce814799982c0e4ee8c1946ce77be8adda887a9f1f835479cf734791f3228e4df2b3db3ca67ea308d4cca53c323e55c2 WHIRLPOOL 515009157e79ee6e8b70f8cca85883dfb42e5656215053253c04b6c15a29db4cd6e897306d7ceff3a0f44fd1bd7d99d87566268e201864abf66d3b6d43c956f3
 EBUILD android-sdk-update-manager-22.ebuild 3365 SHA256 f86aaae14f90bbdecc7959ce02e60a87f4fcae0279a6ca491681e184bf6c3bf4 SHA512 b5c93a752f955b7a83b6458f3b49b8dc84d62a6a78c4bdc72348be0f8b09882b54a2781735ecdbbf98f0196762fdef2c7de114c13666b07c116306f80c387d44 WHIRLPOOL a1d0231a5b8ff0fee7b60fb28d59c3339f1e50955863658c7c65214da1123601f42fed21c2564438afe1c96e00215cc9d228ef738b036a87da2bca2b4557f659
-MISC ChangeLog 9716 SHA256 a2bd006aef5a7c3328afc5f121bdbefdfdf29065d3b847e23e8e16771fa3c28f SHA512 ad2210e64f87940e95bbeae50bb2dc0e4b974386c41be58888f6289256a74086fd945ba8a73c45b934d76aae0ed175d2cdad3d6ef7c4b06563ff0cf246353ebd WHIRLPOOL 61af430ec646b2451337a441000733afed8774f86ca26f6f557f030602d273a34182c74fffcecab69d18484a0373ea27988200cb987b811ea12dc5db18ab47bb
+MISC ChangeLog 9929 SHA256 c165df520c1f9fc2e294c310997d4f7cb71866b0abb3b9e3b260d2dd05b0b9df SHA512 9bcc0b185de3faa7de7f535f886610b6bf92615eced3d9e28a6f4d802a9bc8edc58d5d5cf60d5b13ba6556cd16ae0c1098da76d7d7590abc2e66e54c74f12ccf WHIRLPOOL 46899b7d4da1c29b4e1c716c81fa1b3e6ee8b84283621af81071a05c47dd640511efecf524515e6fbbe30a172c2ac45e553352962aa09de50b66cfe0e04417c5
 MISC metadata.xml 200 SHA256 98e80d4c2848c87ef9f4b295ac60b27acca3a53380008166b7016a02d4e9526b SHA512 03a8813863af4f9620e6e5564604482e9664ffd576ff24f6ab667484d826482907ece3849b08af3db904d4de9397a8712ed2462773c42c66c59c645192fc9c48 WHIRLPOOL dab7569da9c0b95379db908ed69102239f42e80cab6c6106ac401eb5ef314a1e7056fe3e2a451c2a80dd878df328cdb3f385bfcf4254070e3a9eff6519f8fb81
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlILlwAACgkQCMFw3lXsEjonGwD/Tgq5ECKCQvOQ8CJiIDeUJCeP
-B+gC+nYfPwXDfBBgBe4BAJeDch5qnisPBBZpFKAQko/URI9WJxDonBcQIYF9A3wx
-=2jNw
+iF4EAREIAAYFAlI3BBwACgkQCMFw3lXsEjpFNwD+P9NZg8DwHFFkbMG9DBkw64OG
+jTClUq5p33EOAmW0ddIA/A3C+0MtVXIdC69oLtNbJ+bPwNl/fVbKVpFTXji59Nx6
+=f68V
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..7dc709e60435
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild,v 1.1 2013/09/16 13:13:59 rich0 Exp $
+
+EAPI="5"
+
+inherit eutils user
+
+MY_P="android-sdk_r${PV}-linux"
+
+DESCRIPTION="Open Handset Alliance's Android SDK"
+HOMEPAGE="http://developer.android.com"
+SRC_URI="http://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] )
+	amd64? ( app-emulation/emul-linux-x86-gtklibs:= )
+	x86? ( x11-libs/gtk+:2= )"
+
+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" || die
+	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} || die "failed to dodir"
+
+	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
+	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
+
+	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}" || die
+
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
+
+	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}" || die
+
+}
+
+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 http://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."
+}