Update for latest sdk - thanks to Rajat and Matsuu for contributions.

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

4 files changed, 110 insertions, 5 deletions

diff --git a/dev-util/android-sdk-update-manager/ChangeLog b/dev-util/android-sdk-update-manager/ChangeLog
index ae183c29aae1..8292e0887ece 100644
--- a/dev-util/android-sdk-update-manager/ChangeLog
+++ b/dev-util/android-sdk-update-manager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/android-sdk-update-manager
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog,v 1.10 2010/10/15 17:46:23 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog,v 1.11 2010/12/09 18:17:14 rich0 Exp $
+
+*android-sdk-update-manager-8 (09 Dec 2010)
+
+  09 Dec 2010; Richard Freeman <rich0@gentoo.org>
+  +android-sdk-update-manager-8.ebuild,
+  +files/android-sdk-update-manager-8-swt.patch:
+  Update for latest sdk - thanks to Rajat and Matsuu for contributions.
 
   15 Oct 2010; Christian Faulhammer <fauli@gentoo.org>
   android-sdk-update-manager-6-r2.ebuild:
diff --git a/dev-util/android-sdk-update-manager/Manifest b/dev-util/android-sdk-update-manager/Manifest
index 1988e17c7317..e9c302a63f3d 100644
--- a/dev-util/android-sdk-update-manager/Manifest
+++ b/dev-util/android-sdk-update-manager/Manifest
@@ -2,9 +2,11 @@
 Hash: SHA1
 
 AUX android-sdk-update-manager-6-swt.patch 1274 RMD160 fc2ceab8c9a3f9525e7f73ab50281a3e8211b534 SHA1 9d047ece9626ecd8cc8ecc26fc46cde8a22fbce2 SHA256 40d6d969cd612b7e3fddcc4d8f0e933ff2fc405f91279a251c36eba461ac1e0e
+AUX android-sdk-update-manager-8-swt.patch 634 RMD160 2839f1b3b1ab146d2f891b5d5bc24514df464b6a SHA1 40b98ac385c8b61800e6f8025fce82839b7e341d SHA256 8c12a28a27c922a05d7ddafd9d4306df238ced6330c597e4ae3e5ec77d872732
 DIST android-sdk_r04-linux_86.tgz 15984887 RMD160 370cb158a815f0acc2c1185794ce7fa3ac7daf2a SHA1 3e86b9a6a7420deaa9829c4b3e668c189cd79365 SHA256 61f356de22f8d2069f970b638dfd6a6e23edad13c093a7f20e9f4415e8563a2d
 DIST android-sdk_r05-linux_86.tgz 16208523 RMD160 6234674655ddedebf9991a83ace185de52719370 SHA1 bd6495069950a6373bd9743c26d525a22b3b5d3e SHA256 da1c443f6a1a86db44647be19fae007e9573f9fb792c5738ed5911cedbb8bdb2
 DIST android-sdk_r06-linux_86.tgz 16971139 RMD160 099b6c613063c9a603e3b283579eeb79f30c144c SHA1 41e656c101e0037c875ce1ef448552312e7a5f46 SHA256 9d1f5e2fff0deac3d39dbb8318c96d54f344e731f3a646a910057c6de38bfc40
+DIST android-sdk_r08-linux_86.tgz 26817291 RMD160 4c28ee1d09c576ce5b58a9cddb90d34bb49db04c SHA1 4296facae44911b145f4bebeba828032e14b8de1 SHA256 a9d3d0075de21fb2f871a64d4fa262cf3ecfe4749e4e3a970953dbf70471a764
 DIST android-sdk_r3-linux.tgz 15986291 RMD160 deeb3c92abbc64cba27b843fcbdad7c3bc2b597b SHA1 9ac79f527157df7e9a5cce0fa2a768a70b8a23bf SHA256 3779e41432f60f2b1d0c69ea22da71c84eaf8fc9cc27b5b985dc1f0a9df1e240
 EBUILD android-sdk-update-manager-3-r1.ebuild 2126 RMD160 234575a2cfd60a3f87b641ab2cd6bd1d18220e8a SHA1 b8efa60004074e3eab71d1720a6e4ba795fb90b6 SHA256 584f598464d616f939253f4b357ccaa98ab219d0a6700387b498bb824ce9e0cb
 EBUILD android-sdk-update-manager-3.ebuild 1785 RMD160 ed507de8185f33e17e164cc1ecadeb2abe062cc6 SHA1 9d5c4a55a697006de6ff8484b8777bdc86a4d071 SHA256 5c699c5fc95e4d9bc786ebce4c66f31287994632b302aff243ee2572f5146389
@@ -13,12 +15,13 @@ EBUILD android-sdk-update-manager-5.ebuild 2390 RMD160 2ed233e6f593b335d26a18669
 EBUILD android-sdk-update-manager-6-r1.ebuild 2492 RMD160 2cfc9eca24cae8448220c1bd8bb8351e93e81dfe SHA1 76b0a9a0c347b2480fc379837089944a2a98f038 SHA256 c7a4e8d3778c5252ccca8f796a01951cccead17f9c3c7b61cddccf1b6d0cbe00
 EBUILD android-sdk-update-manager-6-r2.ebuild 2490 RMD160 cc843d1e88ae439569c809611d8e2f8072f32da8 SHA1 9c1c6b8b90402b5c33751a04fa7c5bb2fbf153d6 SHA256 a4fc5be1e990f4e17c6fa5cc2a99b379dc65dbf7e9a7a318287613f2ea1283b5
 EBUILD android-sdk-update-manager-6.ebuild 2390 RMD160 123bfc60af4c2b1fcfc14fc11c54181e398e6614 SHA1 3c42e841aac5d2bcd719b2c62000a18dd7a82b61 SHA256 542ef0b7d7e22f7bba95b2ac66fb0668d18fc74197a00b8ed246572a1fb69870
-MISC ChangeLog 2181 RMD160 42321e1fffe9bf165d67f50f57f3ffd5701c6c6c SHA1 57985f93b505adf8e73e08049659f07fc657958d SHA256 55c97e5a97150af51a1ba740304ee69259ac9907f61c9c6474e7be7ed386d500
+EBUILD android-sdk-update-manager-8.ebuild 2452 RMD160 7604d45df43a65c6660d9ca47ad841b9e70155dc SHA1 973b8247c12ca5a6ffbfdc7a7a084dc515466216 SHA256 26d1da5bf0d69cb0dd3814f5596df7b57cac154479ca7bea67648f982ab07eb7
+MISC ChangeLog 2438 RMD160 629b7e86a4664fb74c0444b491b8e68ea82230a2 SHA1 e24ee6e40e51579f28b4c52d8140e28f10e73d6b SHA256 3d32b5031c6a1da171168de53a0a2fb307b61f558c64e414eb4ffd7743116820
 MISC metadata.xml 322 RMD160 22dc40ea946cbeee95c87735b057908069170f75 SHA1 997e5629020534aafafa286480ec8e4d4ec24001 SHA256 fb6c6f469d32462b133042fe082a2b98c4c8bac7f0137f0290a04a1bd5f1293f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEUEARECAAYFAky4k/AACgkQNQqtfCuFneOXQACXUA7KsOD9bKntWwfK+4DksODz
-bgCfWXipbaxpO9zQedP5NjPFKmw1O64=
-=q3bT
+iEYEARECAAYFAk0BHTMACgkQG4/rWKZmVWnHYwCcDWUkjw/GcjL0VjiT1FMvQCm1
+BWgAoKsI/yHYm3NeO0FgKPcX82/RPdfx
+=jA6u
 -----END PGP SIGNATURE-----
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-8.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-8.ebuild
new file mode 100644
index 000000000000..2cc82ddc16ab
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-8.ebuild
@@ -0,0 +1,78 @@
+# 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-8.ebuild,v 1.1 2010/12/09 18:17:14 rich0 Exp $
+
+EAPI="3"
+
+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="/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}-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
+	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"
+}
diff --git a/dev-util/android-sdk-update-manager/files/android-sdk-update-manager-8-swt.patch b/dev-util/android-sdk-update-manager/files/android-sdk-update-manager-8-swt.patch
new file mode 100644
index 000000000000..5bd8db2e4110
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/files/android-sdk-update-manager-8-swt.patch
@@ -0,0 +1,17 @@
+--- android-sdk-linux_86/tools/android.old      2010-08-16 19:56:17.522813374 -0400
++++ android-sdk-linux_86/tools/android  2010-08-16 19:56:57.876813929 -0400
+@@ -93,13 +93,7 @@
+ if [ -n "$ANDROID_SWT" ]; then
+     swtpath="$ANDROID_SWT"
+ else
+-    vmarch=`"${java_cmd}" -jar "${frameworkdir}/archquery.jar"`
+-    if [ -n "$ANDROID_BUILD_TOP" ]; then
+-        osname=`uname -s | tr A-Z a-z`
+-        swtpath="${ANDROID_BUILD_TOP}/prebuilt/${osname}-${vmarch}/swt"
+-    else
+-        swtpath="${frameworkdir}/${vmarch}"
+-    fi
++    swtpath=`dirname \`java-config -p swt-3.5\``
+ fi
+
+ # Combine the swtpath and the framework dir path.