# HG changeset patch # User Da Risk # Date 1307478778 -7200 # Node ID 15f88ae909f18bd42005228564cea1623676ae8d # Parent 08e236c9ebea09a9eb302d83bb0e9df161a2cba0 Fix android-sdk-update-manager to use a fake SWT_PATH if use -X diff -r 08e236c9ebea -r 15f88ae909f1 dev-util/android-sdk-update-manager/Manifest --- a/dev-util/android-sdk-update-manager/Manifest Tue Jun 07 22:12:34 2011 +0200 +++ b/dev-util/android-sdk-update-manager/Manifest Tue Jun 07 22:32:58 2011 +0200 @@ -2,6 +2,7 @@ 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 +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-4.ebuild 2405 RMD160 e2cf70bd803c4e41594726f46505d7fed53c9750 SHA1 bc727ef342952e32340e38ac607b83c593cd12bc SHA256 cefc086ef6306bc975455390b5d3cd7cb0b10c5a1735b4c4586fcba087a05b90 EBUILD android-sdk-update-manager-6-r2.ebuild 2492 RMD160 2cfc9eca24cae8448220c1bd8bb8351e93e81dfe SHA1 76b0a9a0c347b2480fc379837089944a2a98f038 SHA256 c7a4e8d3778c5252ccca8f796a01951cccead17f9c3c7b61cddccf1b6d0cbe00 diff -r 08e236c9ebea -r 15f88ae909f1 dev-util/android-sdk-update-manager/android-sdk-update-manager-11-r1.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-11-r1.ebuild Tue Jun 07 22:32:58 2011 +0200 @@ -0,0 +1,96 @@ +# 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 android', then have 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." +}