--- a/dev-util/android-sdk-update-manager/Manifest	Fri Feb 03 11:42:16 2012 +0100
+++ b/dev-util/android-sdk-update-manager/Manifest	Fri Mar 23 15:15:34 2012 +0100
@@ -8,6 +8,6 @@
 EBUILD android-sdk-update-manager-11.ebuild 2978 RMD160 9ea90b5f43bf4ab000948e9c3ce58b65fcb477a8 SHA1 9b4a1abafa98e6cf17400dc9808c43d9fd80fcea SHA256 0d051e33c8137d0d03d000f8e7938377365426edcfff283e245d0c8c3089c875
 EBUILD android-sdk-update-manager-15.ebuild 2996 RMD160 47e40131c97eb098d5033e281e6cab065895381a SHA1 6b606bd2c814bf66e10932cc8cf8bed625223d17 SHA256 53de794ccb0b16b6455dcd1deadcc398a1111f9e576ec4abdcd759023e176cfc
 EBUILD android-sdk-update-manager-16-r1.ebuild 3390 RMD160 b24a71f0a2c7fd36e7e2a7ad949d92b975cecc6d SHA1 ddc85c8d889680874af722d037792ff43f97059e SHA256 15e38e9b994414ec1e85fb88c1e730bb9badf4e6563a359be35298cac84a70b0
+EBUILD android-sdk-update-manager-16-r2.ebuild 3406 RMD160 5079982314491cab4621df0c86a7d53d695ab872 SHA1 ad6cc0156344f426bd02ba99680913169b7b222e SHA256 f0538776dead34634536528c8e10e9294e72865ac602f364b4c5e44684db13cb
 EBUILD android-sdk-update-manager-4.ebuild 2405 RMD160 e2cf70bd803c4e41594726f46505d7fed53c9750 SHA1 bc727ef342952e32340e38ac607b83c593cd12bc SHA256 cefc086ef6306bc975455390b5d3cd7cb0b10c5a1735b4c4586fcba087a05b90
 EBUILD android-sdk-update-manager-6-r2.ebuild 2492 RMD160 2cfc9eca24cae8448220c1bd8bb8351e93e81dfe SHA1 76b0a9a0c347b2480fc379837089944a2a98f038 SHA256 c7a4e8d3778c5252ccca8f796a01951cccead17f9c3c7b61cddccf1b6d0cbe00
-MISC android-sdk-update-manager-16.ebuild~ 3226 RMD160 f7b398457c9127ac9ba02973c1eaeff6f61705ca SHA1 93d1520606bc0ad71a3c66a4150025cc2cc93e26 SHA256 8fc3b625669893dc9c9a2e90dcd06bc055ac6f12535dd5054eac2a655ec28253

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-16-r2.ebuild	Fri Mar 23 15:15:34 2012 +0100
@@ -0,0 +1,106 @@
+# Copyright 1999-2011 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-16.ebuild,v 1.1 2011/12/26 12:28:40 rich0 Exp $
+
+EAPI="3"
+
+inherit eutils
+
+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="+X"
+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
+	X? (
+		|| ( dev-java/swt:3.5 dev-java/swt:3.6 dev-java/swt:3.7)
+		amd64? ( app-emulation/emul-linux-x86-gtklibs )
+		x86? ( x11-libs/gtk+:2 )
+	)"
+
+ANDROID_SDK_DIR="/opt/${PN}"
+QA_DT_HASH_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_DT_HASH_amd64="${QA_DT_HASH_x86}"
+
+S="${WORKDIR}/android-sdk-linux"
+
+pkg_setup() {
+	enewgroup android
+}
+
+src_prepare(){
+#	epatch "${FILESDIR}/${PN}-8-swt.patch"
+
+	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.
+	#keepdir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp} || die "failed to keepdir"
+	dodir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp} || die "failed to dodir"
+
+	fowners root:android "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools} || die
+	fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools} || die
+
+	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
+
+	SWT_PATH="/tmp"
+	if use X ; then
+		SWT_VERSIONS="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
+	fi
+
+	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${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."
+	use X || ewarn "You specified -X use-flag, the programs emulator and ddms will not work."
+}