bump to fix ddms swt error - thanks to Frédéric

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

4 files changed, 114 insertions, 7 deletions

diff --git a/dev-util/android-sdk-update-manager/ChangeLog b/dev-util/android-sdk-update-manager/ChangeLog
index 9da60812d116..a3fa7e91ff7d 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.7 2010/08/17 00:38:06 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog,v 1.8 2010/08/27 01:12:22 rich0 Exp $
+
+*android-sdk-update-manager-6-r2 (27 Aug 2010)
+
+  27 Aug 2010; Richard Freeman <rich0@gentoo.org>
+  +android-sdk-update-manager-6-r2.ebuild,
+  files/android-sdk-update-manager-6-swt.patch:
+  bump to fix ddms swt error - thanks to Frédéric
 
 *android-sdk-update-manager-6-r1 (17 Aug 2010)
 
diff --git a/dev-util/android-sdk-update-manager/Manifest b/dev-util/android-sdk-update-manager/Manifest
index 5ea2e3004ee0..c4b6617c9bdd 100644
--- a/dev-util/android-sdk-update-manager/Manifest
+++ b/dev-util/android-sdk-update-manager/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX android-sdk-update-manager-6-swt.patch 634 RMD160 2839f1b3b1ab146d2f891b5d5bc24514df464b6a SHA1 40b98ac385c8b61800e6f8025fce82839b7e341d SHA256 8c12a28a27c922a05d7ddafd9d4306df238ced6330c597e4ae3e5ec77d872732
+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_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
@@ -11,13 +11,14 @@ EBUILD android-sdk-update-manager-3.ebuild 1785 RMD160 ed507de8185f33e17e164cc1e
 EBUILD android-sdk-update-manager-4.ebuild 2390 RMD160 d5af1ea442bfe467fbd0f04718f84d154eca961b SHA1 35cfd2569ff96a07b6497ada3c5e603cf39d24b7 SHA256 980970f137e19b1e3dc5c0226de088fea155be2d45c74453727ce3f875e52855
 EBUILD android-sdk-update-manager-5.ebuild 2390 RMD160 2ed233e6f593b335d26a18669570cb2cd8717e03 SHA1 81cabfd9d0942709f204c126cefb899ce88c5fd3 SHA256 f22bf173b7df0a373db61f1640d579a4beb3a24ae5dfe67a9b14838ef359e9b0
 EBUILD android-sdk-update-manager-6-r1.ebuild 2492 RMD160 2cfc9eca24cae8448220c1bd8bb8351e93e81dfe SHA1 76b0a9a0c347b2480fc379837089944a2a98f038 SHA256 c7a4e8d3778c5252ccca8f796a01951cccead17f9c3c7b61cddccf1b6d0cbe00
+EBUILD android-sdk-update-manager-6-r2.ebuild 2492 RMD160 1cc7e6532d65767ada39982fc2015d4ab98d8b21 SHA1 088edb2ee0b6b7c6cd1c360545272f7e49187451 SHA256 3a45f92627ab0ab58e6845ef0e2f964e07315829bbda25047c767b9e455ebe25
 EBUILD android-sdk-update-manager-6.ebuild 2390 RMD160 123bfc60af4c2b1fcfc14fc11c54181e398e6614 SHA1 3c42e841aac5d2bcd719b2c62000a18dd7a82b61 SHA256 542ef0b7d7e22f7bba95b2ac66fb0668d18fc74197a00b8ed246572a1fb69870
-MISC ChangeLog 1698 RMD160 87624403f83d08f39a2f7d5038c6426feec8b2a0 SHA1 7f2e2a20f7408ab04fb13e8990cbee630f75b917 SHA256 067f0b48474fc21d6cd49158947c968090b16bf17e3987b954f0435f31a87b12
+MISC ChangeLog 1940 RMD160 e196a0fd69b72cd5eb2cba69914b70c418932a41 SHA1 2c690ecaae51b032dfac4380c9ff95fb34348fdf SHA256 eff66e94ac4d159ec842bbea333947a1f49b6755fb58ce81d8dc0c92798edf8b
 MISC metadata.xml 322 RMD160 22dc40ea946cbeee95c87735b057908069170f75 SHA1 997e5629020534aafafa286480ec8e4d4ec24001 SHA256 fb6c6f469d32462b133042fe082a2b98c4c8bac7f0137f0290a04a1bd5f1293f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxp2f0ACgkQG4/rWKZmVWkDxwCfU1qq0e8liQj/cyJrPhvLmgpi
-pTkAn2JxdPskXhw0KIb2es4y4AxPSWTT
-=FWPF
+iEYEARECAAYFAkx3EQAACgkQG4/rWKZmVWnjEwCeLkczTSDFK3ZYdVr7LlhArVnC
+BS0AoJxFmLQRgWUPaG15uJMLjDnaaKxq
+=bprW
 -----END PGP SIGNATURE-----
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-6-r2.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-6-r2.ebuild
new file mode 100644
index 000000000000..556092739909
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-6-r2.ebuild
@@ -0,0 +1,82 @@
+# 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-r2.ebuild,v 1.1 2010/08/27 01:12:23 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"
+}
diff --git a/dev-util/android-sdk-update-manager/files/android-sdk-update-manager-6-swt.patch b/dev-util/android-sdk-update-manager/files/android-sdk-update-manager-6-swt.patch
index 5bd8db2e4110..7a01219cf0a6 100644
--- a/dev-util/android-sdk-update-manager/files/android-sdk-update-manager-6-swt.patch
+++ b/dev-util/android-sdk-update-manager/files/android-sdk-update-manager-6-swt.patch
@@ -15,3 +15,20 @@
  fi
 
  # Combine the swtpath and the framework dir path.
+--- android-sdk-linux_86/tools/ddms.old         2010-08-21 18:25:12.000000000 +0200
++++ android-sdk-linux_86/tools/ddms             2010-08-26 14:44:36.000000000 +0200
+@@ -85,13 +85,7 @@
+ if [ -n "$ANDROID_SWT" ]; then
+     swtpath="$ANDROID_SWT"
+ else
+-    vmarch=`${javaCmd} -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.