--- a/dev-util/android-sdk-update-manager/Manifest	Wed Jul 03 23:40:43 2013 +0200
+++ b/dev-util/android-sdk-update-manager/Manifest	Fri May 24 18:33:16 2013 +0200
@@ -1,6 +1,3 @@
-AUX android-sdk-update-manager-6-swt.patch 1274 SHA256 40d6d969cd612b7e3fddcc4d8f0e933ff2fc405f91279a251c36eba461ac1e0e SHA512 2cb109c6fbdb6656c20fca689073ab47d25c42b3d1d7413f92a271ab6fa61ded0563b5a01becc138ef8431603fa8f0e28ead66c3ee8856f71bd140ff61f768af WHIRLPOOL ba1ebfef4293d36e1c1a3c0fb7100d10333dbc3babb4a45899a9d73b1c2494dc080b16810d6e02444f63817c6defa4126de33a58613de4b7308c0de3608c55cd
-DIST android-sdk_r20-linux.tgz 82589455 SHA256 58c0728fe75fd0ef6800bf70d3d030c16364272d5c018ccef38118e6a84cffdb
+DIST android-sdk_r20-linux.tgz 82589455 SHA256 58c0728fe75fd0ef6800bf70d3d030c16364272d5c018ccef38118e6a84cffdb SHA512 8186e5a90b67d6230ab976e1f429228fe7545b4d4624be239586f9aebf58d145fafcd5436675a071b4883d6fdb794b2ac0fa94d86cbbf06d7e219d47fc9e5945 WHIRLPOOL d1de01561884f8516bb8cea8bff67a286451277c2be89e796f075f0e9cf888c9340f95726118e5db43fa59be157f1f09c25bebeb3f6f428b3fb0acdf9e0e9fa6
 DIST android-sdk_r21-linux.tgz 91378351 SHA256 ad3e642626407b78d0fafe7ff89d1ee388b1f5c6f2eba83ce9364957a038ab9d SHA512 3a3338265a2d00f8b7fbb35783d7449498afd8107ddd4ed4c2c34e47582d83eb23f78d02fe01db54c12c48dba0167f60118c1061f1bfeb0048147674fee8d87c WHIRLPOOL feeb9d060a460ec2738a612ae90689791edf54deabcb1b1c37ddec22fb8bfaa13fc4dd53aecfbd5ac70309ce299a88ed84080ef7a2e1a14a6959d4ecf21fbfc9
-EBUILD android-sdk-update-manager-20.ebuild 3373 SHA256 39d2bb070b1e613ff34b5e79d819d84c71cf3bf784b023ddf316ddfe88431db6 SHA512 6ea8ea23a02f2d29a949f6a119d1d18427647e5a0b30eb28ad702539a8b415e36548bcb56a4d33846acf122e36e356afe260d5607a16d0b255176963355b0de1 WHIRLPOOL 48e445e02c1c6ee57adf99f3e72e8921e59695ece95aea2cb2682551ee47b45d13273bd9fc163fe235f0dfe7cd7063964fb4c0e596efef1a570fad4b051854a1
-EBUILD android-sdk-update-manager-21-r1.ebuild 3266 SHA256 894f9bb500e4aab3af161a4d217e750a41e0a847ac116bbfe454a4ba3734336d SHA512 19cc498d16dd13d28fc78f7b398e7cf2a8dd29d9bb3ffb0b44038e4a830b0328b1d906f7f72b2203e925ccf758e4ee9bcd02bb826c6d35daf5cf4159248a3399 WHIRLPOOL e871feacab56ef10fb6694a0672dd1c54604aa900899b3bbbabbc9c227f81fb1fb4bd0715f5b379c81c91068b2ca065e552cfd6a9d9ebfd5e52c9f4cafff2ec9
-MISC metadata.xml 200 SHA256 98e80d4c2848c87ef9f4b295ac60b27acca3a53380008166b7016a02d4e9526b SHA512 03a8813863af4f9620e6e5564604482e9664ffd576ff24f6ab667484d826482907ece3849b08af3db904d4de9397a8712ed2462773c42c66c59c645192fc9c48 WHIRLPOOL dab7569da9c0b95379db908ed69102239f42e80cab6c6106ac401eb5ef314a1e7056fe3e2a451c2a80dd878df328cdb3f385bfcf4254070e3a9eff6519f8fb81
+DIST android-sdk_r22-linux.tgz 99643077 SHA256 fd75de430bd83f90fbeb0d15ae017cccf998a87286188232cfeab27a6d89bd32 SHA512 9beda1ae872dde3ca7884d1c389566ce2c8b511ef74d95bc9ddf53683445cc454f9a5a1871a80d5826083d98713040cb1b8b239a77a8eadf56daf30440c7108d WHIRLPOOL e5c39b61d8f9f3f72420af21d7329f04492787543e4693c4eee010b9ec4d48c04bd4eb8d1d202c32552e46e220b2e3e973fe5248602b5d147f0788f89ed23e88

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild	Fri May 24 18:33:16 2013 +0200
@@ -0,0 +1,103 @@
+# 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-21.ebuild,v 1.1 2012/11/14 01:37:47 rich0 Exp $
+
+EAPI="3"
+
+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="+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[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}"
+
+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,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=
+	if use X ; then
+		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
+	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."
+}