# HG changeset patch # User Frédéric Barthéléry # Date 1320827967 -3600 # Node ID 8b435e1f15e041e279d890993a04bd2cd7fc9aab # Parent 3d61943fc2117d863fae8bdd7a5ebd8463f5ce06 Add custom ebuild with -X for android-sdk-update-manager-15 diff -r 3d61943fc211 -r 8b435e1f15e0 dev-util/android-sdk-update-manager/Manifest --- a/dev-util/android-sdk-update-manager/Manifest Mon Oct 03 18:13:08 2011 +0200 +++ b/dev-util/android-sdk-update-manager/Manifest Wed Nov 09 09:39:27 2011 +0100 @@ -2,9 +2,9 @@ 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 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-4.ebuild 2405 RMD160 e2cf70bd803c4e41594726f46505d7fed53c9750 SHA1 bc727ef342952e32340e38ac607b83c593cd12bc SHA256 cefc086ef6306bc975455390b5d3cd7cb0b10c5a1735b4c4586fcba087a05b90 EBUILD android-sdk-update-manager-6-r2.ebuild 2492 RMD160 2cfc9eca24cae8448220c1bd8bb8351e93e81dfe SHA1 76b0a9a0c347b2480fc379837089944a2a98f038 SHA256 c7a4e8d3778c5252ccca8f796a01951cccead17f9c3c7b61cddccf1b6d0cbe00 -MISC ddms 3041 RMD160 c73091ce6d91901788475a0e7a3bb028156ea763 SHA1 a4b2fde70a0dc571a7297bad3130431f9993734c SHA256 104ffdfdca9641cdcacaff7ff987efd3fed97670982b99c627b3a9435fc7593f -MISC ddms-swt.patch 640 RMD160 1f6123ccf75ac8c7f272d2f29488137b26ef6211 SHA1 76f68162ff200edbba836c07977b6aa374a16c63 SHA256 18e8e9d666ae9f626d8d6b96f5c27c3d6cbd10a4810def1fc683fc0047447b79 diff -r 3d61943fc211 -r 8b435e1f15e0 dev-util/android-sdk-update-manager/android-sdk-update-manager-15.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-15.ebuild Wed Nov 09 09:39:27 2011 +0100 @@ -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-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 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." +} diff -r 3d61943fc211 -r 8b435e1f15e0 dev-util/android-sdk-update-manager/ddms --- a/dev-util/android-sdk-update-manager/ddms Mon Oct 03 18:13:08 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,102 +0,0 @@ -#!/bin/bash -# Copyright 2005-2007, The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Set up prog to be the path of this script, including following symlinks, -# and set up progdir to be the fully-qualified pathname of its directory. -prog="$0" -while [ -h "${prog}" ]; do - newProg=`/bin/ls -ld "${prog}"` - newProg=`expr "${newProg}" : ".* -> \(.*\)$"` - if expr "x${newProg}" : 'x/' >/dev/null; then - prog="${newProg}" - else - progdir=`dirname "${prog}"` - prog="${progdir}/${newProg}" - fi -done -oldwd=`pwd` -progdir=`dirname "${prog}"` -cd "${progdir}" -progdir=`pwd` -prog="${progdir}"/`basename "${prog}"` -cd "${oldwd}" - -jarfile=ddms.jar -frameworkdir="$progdir" -libdir="$progdir" -if [ ! -r "$frameworkdir/$jarfile" ] -then - frameworkdir=`dirname "$progdir"`/tools/lib - libdir=`dirname "$progdir"`/tools/lib -fi -if [ ! -r "$frameworkdir/$jarfile" ] -then - frameworkdir=`dirname "$progdir"`/framework - libdir=`dirname "$progdir"`/lib -fi -if [ ! -r "$frameworkdir/$jarfile" ] -then - echo `basename "$prog"`": can't find $jarfile" - exit 1 -fi - - -# Check args. -if [ debug = "$1" ]; then - # add this in for debugging - java_debug=-agentlib:jdwp=transport=dt_socket,server=y,address=8050,suspend=y - shift 1 -else - java_debug= -fi - -javaCmd="java" - -# Mac OS X needs an additional arg, or you get an "illegal thread" complaint. -if [ `uname` = "Darwin" ]; then - os_opts="-XstartOnFirstThread" -else - os_opts= -fi - -if [ `uname` = "Linux" ]; then - export GDK_NATIVE_WINDOWS=true -fi - -jarpath="$frameworkdir/$jarfile" - -# Figure out the path to the swt.jar for the current architecture. -# if ANDROID_SWT is defined, then just use this. -# else, if running in the Android source tree, then look for the correct swt folder in prebuilt -# else, look for the correct swt folder in the SDK under tools/lib/ -swtpath="" -if [ -n "$ANDROID_SWT" ]; then - swtpath="$ANDROID_SWT" -else - swtpath=`dirname \`java-config -p swt-3.5\`` -fi - -# Combine the swtpath and the framework dir path. -if [ -d "$swtpath" ]; then - frameworkdir="${swtpath}:${frameworkdir}" -else - echo "SWT folder '${swtpath}' does not exist." - echo "Please export ANDROID_SWT to point to the folder containing swt.jar for your platform." - exit 1 -fi - -# need to use "java.ext.dirs" because "-jar" causes classpath to be ignored -# might need more memory, e.g. -Xmx128M -exec "$javaCmd" -Xmx256M $os_opts $java_debug -Djava.ext.dirs="$frameworkdir" -Dcom.android.ddms.bindir="$progdir" -jar "$jarpath" "$@" diff -r 3d61943fc211 -r 8b435e1f15e0 dev-util/android-sdk-update-manager/ddms-swt.patch --- a/dev-util/android-sdk-update-manager/ddms-swt.patch Mon Oct 03 18:13:08 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ ---- 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.