Mercurial Mercurial > gentoo-repos / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
android-sdk-update-manager version bump
authorDa Risk <da_risk@geekorum.com>
Sun, 06 Jan 2013 21:46:12 +0100
changeset 59 9ed25873d854
parent 58 98cddfca5dd0
child 60 63e4bfd655cf
child 76 21c63b05449d
android-sdk-update-manager version bump (Portage version: 2.1.11.38/hg/Linux x86_64, unsigned Manifest commit)
dev-util/android-sdk-update-manager/Manifest file | annotate | diff | comparison | revisions
dev-util/android-sdk-update-manager/android-sdk-update-manager-11-r1.ebuild file | annotate | diff | comparison | revisions
dev-util/android-sdk-update-manager/android-sdk-update-manager-11.ebuild file | annotate | diff | comparison | revisions
dev-util/android-sdk-update-manager/android-sdk-update-manager-15.ebuild file | annotate | diff | comparison | revisions
dev-util/android-sdk-update-manager/android-sdk-update-manager-16-r1.ebuild file | annotate | diff | comparison | revisions
dev-util/android-sdk-update-manager/android-sdk-update-manager-16-r2.ebuild file | annotate | diff | comparison | revisions
dev-util/android-sdk-update-manager/android-sdk-update-manager-17-r1.ebuild file | annotate | diff | comparison | revisions
dev-util/android-sdk-update-manager/android-sdk-update-manager-18.ebuild file | annotate | diff | comparison | revisions
dev-util/android-sdk-update-manager/android-sdk-update-manager-21-r1.ebuild file | annotate | diff | comparison | revisions
dev-util/android-sdk-update-manager/android-sdk-update-manager-4.ebuild file | annotate | diff | comparison | revisions
dev-util/android-sdk-update-manager/android-sdk-update-manager-6-r2.ebuild file | annotate | diff | comparison | revisions
dev-util/android-sdk-update-manager/metadata.xml file | annotate | diff | comparison | revisions 
--- a/dev-util/android-sdk-update-manager/Manifest	Sun Jan 06 19:50:23 2013 +0100
+++ b/dev-util/android-sdk-update-manager/Manifest	Sun Jan 06 21:46:12 2013 +0100
@@ -1,19 +1,6 @@
-AUX android-sdk-update-manager-6-swt.patch 1274 RMD160 fc2ceab8c9a3f9525e7f73ab50281a3e8211b534 SHA1 9d047ece9626ecd8cc8ecc26fc46cde8a22fbce2 SHA256 40d6d969cd612b7e3fddcc4d8f0e933ff2fc405f91279a251c36eba461ac1e0e
-DIST android-sdk_r04-linux_86.tgz 15984887 RMD160 370cb158a815f0acc2c1185794ce7fa3ac7daf2a SHA1 3e86b9a6a7420deaa9829c4b3e668c189cd79365 SHA256 61f356de22f8d2069f970b638dfd6a6e23edad13c093a7f20e9f4415e8563a2d
-DIST android-sdk_r06-linux_86.tgz 16971139 RMD160 099b6c613063c9a603e3b283579eeb79f30c144c SHA1 41e656c101e0037c875ce1ef448552312e7a5f46 SHA256 9d1f5e2fff0deac3d39dbb8318c96d54f344e731f3a646a910057c6de38bfc40
-DIST android-sdk_r11-linux_x86.tgz 26984929 RMD160 d202cee6a994cf267b2c420db8d4028de9255239 SHA1 d4266ef77205e4d8a22cda1d01be0a9a449d4b1d SHA256 083a2d49f12f3b5e3512c5d17c23daad6215fdc0c52d4d9616718d7b6eab1e0e
-DIST android-sdk_r15-linux.tgz 26124434 RMD160 80a57a75f41d82937e9414f853ed434585e07196 SHA1 f861b3097fac3f5facb335fe4cc7f6fdbc689f9c SHA256 5e7f56f314355ad5f8d0c4ba6dd94c2d0764ccc0d64986c878464a44129fc474
-DIST android-sdk_r16-linux.tgz 22048174 RMD160 1a0bd9e1e1bd4f1f5abb3d6bee29858547fe21f9 SHA1 c12f2431f243d7f2b7f61168d2839dcd36726176 SHA256 3a3d6a3acbe92c3a31897732d4cf8b0bbb325f3ef317858deec25b47acc912db
-DIST android-sdk_r17-linux.tgz 29706368 RMD160 d5431d4523f261a4c759057c9c86dbe63e49e214 SHA1 8ca6610bba8f58018779f403689df095756cb30b SHA256 4b133a926c95b7fb08b171d8055c0bf632971343f578234c19dfcb5adcb0d6fd
-DIST android-sdk_r18-linux.tgz 29731463 RMD160 a2b4402b59bcf3b5e9df190eeb827df06c7606b2 SHA1 cb2d925a5ab7d30b2853334a0a11e96437b70dd3 SHA256 3690566bf0a12c317560a223891aa1d91bc211bcb528c268e35f702f6e3e0cb3
-DIST android-sdk_r20-linux.tgz 82589455 RMD160 687640fb92fa8dfbb4ab6b6e0bf8f0725c7ec570 SHA1 ab10577d91e5b66e4e40a504b2d1be90d0729767 SHA256 58c0728fe75fd0ef6800bf70d3d030c16364272d5c018ccef38118e6a84cffdb
-EBUILD android-sdk-update-manager-11-r1.ebuild 3000 RMD160 ccdaa8685d83c6b2ce90af36a9ff63896b0e16db SHA1 dfff8ae6432c53aa577909655ef052d7b3503558 SHA256 596b29d56131a4b5a5937679e02f45b7d038f9689204f8b1ac2261112c8f4dae
-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-17-r1.ebuild 3407 RMD160 dff05652682cb17c382c66c0ef4ea2f672d9974f SHA1 b1d34566fef3decfb6a153e3e0207fd8daccdf60 SHA256 b69ab5bcc8f9c0563787242454004c7fb5490d5e375428fa2feba341c4e3b4ed
-EBUILD android-sdk-update-manager-18.ebuild 3368 RMD160 9565f3be22f8d4c4ab9794990691688e9a92c355 SHA1 6da189c7a1ee8f0ed9d387c469151cc90884ab1e SHA256 7f2d56a5f2536d5e2e75150c6efc7ef836d442766426009a2f952281e9b0242c
-EBUILD android-sdk-update-manager-20.ebuild 3373 RMD160 e1403a326b7c451c8c05f75ded23673033326196 SHA1 c864793865dea62dc718a9a965f1be3b6afd45c6 SHA256 39d2bb070b1e613ff34b5e79d819d84c71cf3bf784b023ddf316ddfe88431db6
-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
+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_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
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-11-r1.ebuild	Sun Jan 06 19:50:23 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-# 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-10.ebuild,v 1.2 2011/05/01 00:20:54 halcy0n Exp $
-
-EAPI="3"
-
-inherit eutils
-
-MY_P="android-sdk_r${PV}-linux_x86"
-
-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 )
-		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_x86"
-
-pkg_setup() {
-	enewgroup android || die
-}
-
-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} || die
-	fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp} || die
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	if use X ; then
-		SWT_PATH="`dirname \`java-config -p swt-3.?\``"
-	else
-		SWT_PATH="/tmp"
-	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 "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."
-}
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-11.ebuild	Sun Jan 06 19:50:23 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-# 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-10.ebuild,v 1.2 2011/05/01 00:20:54 halcy0n Exp $
-
-EAPI="3"
-
-inherit eutils
-
-MY_P="android-sdk_r${PV}-linux_x86"
-
-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 )
-		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_x86"
-
-pkg_setup() {
-	enewgroup android || die
-}
-
-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} || die
-	fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp} || die
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	if use X ; then
-		SWT_PATH="`dirname \`java-config -p swt-3.?\``"
-
-		echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-	fi
-
-	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 "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."
-}
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-15.ebuild	Sun Jan 06 19:50:23 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-# 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-14.ebuild,v 1.2 2011/11/02 21:44:03 vapier 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 )
-		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
-
-	if use X ; then
-		SWT_PATH="`dirname \`java-config -p swt-3.?\``"
-	else
-		SWT_PATH="/tmp"
-	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 "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."
-}
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-16-r1.ebuild	Sun Jan 06 19:50:23 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-# 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 )
-		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."
-}
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-16-r2.ebuild	Sun Jan 06 19:50:23 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-# 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."
-}
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-17-r1.ebuild	Sun Jan 06 19:50:23 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-# Copyright 1999-2012 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-17.ebuild,v 1.1 2012/03/24 09:29:59 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."
-}
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-18.ebuild	Sun Jan 06 19:50:23 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-# Copyright 1999-2012 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-17.ebuild,v 1.1 2012/03/24 09:29:59 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
-		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."
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21-r1.ebuild	Sun Jan 06 21:46:12 2013 +0100
@@ -0,0 +1,103 @@
+# Copyright 1999-2012 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."
+}
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-4.ebuild	Sun Jan 06 19:50:23 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-# Copyright 1999-2009 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-3-r1.ebuild,v 1.2 2009/11/19 02:41:03 mr_bones_ Exp $
-
-EAPI="2"
-
-inherit eutils
-
-MY_P="android-sdk_r0${PV}-linux_86"
-
-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 strip"
-
-LICENSE="Apache-2.0 as-is BSD BZIP2 CPL-1.0 EPL-1.0 GPL-2 LGPL-2.1 MIT SPL ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	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_86"
-
-pkg_setup() {
-	enewgroup android || die
-}
-
-src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt" || die
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	insinto "${ANDROID_SDK_DIR}/tools"
-	doins -r tools/lib || die "failed to doins tools/lib"
-	rm -rf tools/lib || die
-
-	exeinto "${ANDROID_SDK_DIR}/tools"
-	doexe tools/* || die "failed to doexe 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} || die
-	fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp} || die
-
-	echo "PATH=\"${ANDROID_SDK_DIR}/tools\"" > "${T}/80${PN}" || die
-	doenvd "${T}/80${PN}" || die
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	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://dev.android.com/sdk/adding-components.html for more information."
-	elog "If you have problems downloading the SDK, see http://code.google.com/p/android/issues/detail?id=4406"
-}
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-6-r2.ebuild	Sun Jan 06 19:50:23 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-# Copyright 1999-2010 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-6-r1.ebuild,v 1.1 2010/08/17 00:38:06 rich0 Exp $
-
-EAPI="2"
-
-inherit eutils
-
-MY_P="android-sdk_r0${PV}-linux_86"
-
-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.5*
-	amd64? ( app-emulation/emul-linux-x86-gtklibs )
-	x86? ( x11-libs/gtk+:2 )"
-
-ANDROID_SDK_DIR="${ROOT}/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_86"
-
-pkg_setup() {
-	enewgroup android || die
-}
-
-src_prepare(){
-	epatch "${FILESDIR}/${PN}-6-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"
-
-	insinto "${ANDROID_SDK_DIR}/tools"
-	doins -r tools/lib || die "failed to doins tools/lib"
-	rm -rf tools/lib || die
-
-	exeinto "${ANDROID_SDK_DIR}/tools"
-	doexe tools/* || die "failed to doexe 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} || die
-	fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp} || die
-
-	echo "PATH=\"${ANDROID_SDK_DIR}/tools\"" > "${T}/80${PN}" || die
-	doenvd "${T}/80${PN}" || die
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	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"
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-util/android-sdk-update-manager/metadata.xml	Sun Jan 06 21:46:12 2013 +0100
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+  <email>rich0@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
gentoo repos