Fix for SWT paths - 349542.

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

3 files changed, 95 insertions, 5 deletions

diff --git a/dev-util/android-sdk-update-manager/ChangeLog b/dev-util/android-sdk-update-manager/ChangeLog
index 9623bc2dc2e3..3cc0b92d231a 100644
--- a/dev-util/android-sdk-update-manager/ChangeLog
+++ b/dev-util/android-sdk-update-manager/ChangeLog
@@ -1,6 +1,12 @@
 # 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.12 2010/12/09 18:19:37 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog,v 1.13 2010/12/31 13:32:24 rich0 Exp $
+
+*android-sdk-update-manager-8-r1 (31 Dec 2010)
+
+  31 Dec 2010; Richard Freeman <rich0@gentoo.org>
+  +android-sdk-update-manager-8-r1.ebuild:
+  Fix for SWT paths - 349542.
 
   09 Dec 2010; Richard Freeman <rich0@gentoo.org>
   -android-sdk-update-manager-3.ebuild,
diff --git a/dev-util/android-sdk-update-manager/Manifest b/dev-util/android-sdk-update-manager/Manifest
index a811e771ae0e..b9e978f769be 100644
--- a/dev-util/android-sdk-update-manager/Manifest
+++ b/dev-util/android-sdk-update-manager/Manifest
@@ -6,13 +6,14 @@ AUX android-sdk-update-manager-8-swt.patch 634 RMD160 2839f1b3b1ab146d2f891b5d5b
 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
 EBUILD android-sdk-update-manager-6-r2.ebuild 2490 RMD160 cc843d1e88ae439569c809611d8e2f8072f32da8 SHA1 9c1c6b8b90402b5c33751a04fa7c5bb2fbf153d6 SHA256 a4fc5be1e990f4e17c6fa5cc2a99b379dc65dbf7e9a7a318287613f2ea1283b5
+EBUILD android-sdk-update-manager-8-r1.ebuild 2569 RMD160 2b120fe6d849d7891c8f8459c6e52fc83bcff8f9 SHA1 7984c5ee22d3dcdfb015ce23749c291811a2ab56 SHA256 03bbe4a99020f9ce66d8f76d751fa21005c3e53fa5dbd77c3269d47f92359bb8
 EBUILD android-sdk-update-manager-8.ebuild 2452 RMD160 7604d45df43a65c6660d9ca47ad841b9e70155dc SHA1 973b8247c12ca5a6ffbfdc7a7a084dc515466216 SHA256 26d1da5bf0d69cb0dd3814f5596df7b57cac154479ca7bea67648f982ab07eb7
-MISC ChangeLog 2759 RMD160 89565c9d6274d26e983dba66b4b255020dad9b51 SHA1 954ac2624dd0583f01868cbe9dd53e70f6848206 SHA256 a7d4f79c571a92fb36fef15f3b6a900292067e66973896cb0ac997fbe15713fb
+MISC ChangeLog 2931 RMD160 3ce15db75fdc9544e3029d406a0e29c394083311 SHA1 59fab83164bfd34a66698ecadea69069185345a6 SHA256 42b7f3e09538be622b61331982e61287f0976008e342977f48931668dc96a141
 MISC metadata.xml 322 RMD160 22dc40ea946cbeee95c87735b057908069170f75 SHA1 997e5629020534aafafa286480ec8e4d4ec24001 SHA256 fb6c6f469d32462b133042fe082a2b98c4c8bac7f0137f0290a04a1bd5f1293f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0BHb4ACgkQG4/rWKZmVWlCjwCdFSq9JQhrHl3aKArus9uVpMO8
-27QAoL2rLBjdQm3MngeNN4EpUGRTVAg0
-=IDv8
+iEYEARECAAYFAk0d23MACgkQG4/rWKZmVWnzdgCdEjqTOc4FWSDP8U/LF9ecJm/h
+K4MAn2AaRrWIN7KH0hmHXUfX4FT0Lx5W
+=wvct
 -----END PGP SIGNATURE-----
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-8-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-8-r1.ebuild
new file mode 100644
index 000000000000..e8946411831f
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-8-r1.ebuild
@@ -0,0 +1,83 @@
+# 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-r1.ebuild,v 1.1 2010/12/31 13:32:24 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
+
+	SWT_PATH="`dirname \`java-config -p swt-3.5\``"
+
+	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${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"
+}