diff options
author | Richard Freeman <rich0@gentoo.org> | 2012-11-14 01:37:47 +0000 |
---|---|---|
committer | Richard Freeman <rich0@gentoo.org> | 2012-11-14 01:37:47 +0000 |
commit | 254f31ce039601d39f0618f40ccb3f061daf851f (patch) | |
tree | b727847ec953a070363425069606c8c779977884 /dev-util | |
parent | Add ~x86-fbsd wrt #442934 (diff) | |
download | gentoo-2-254f31ce039601d39f0618f40ccb3f061daf851f.tar.gz gentoo-2-254f31ce039601d39f0618f40ccb3f061daf851f.tar.bz2 gentoo-2-254f31ce039601d39f0618f40ccb3f061daf851f.zip |
bump and fix 442722
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0x08C170DE55EC123A)
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/android-sdk-update-manager/ChangeLog | 8 | ||||
-rw-r--r-- | dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild | 98 |
2 files changed, 105 insertions, 1 deletions
diff --git a/dev-util/android-sdk-update-manager/ChangeLog b/dev-util/android-sdk-update-manager/ChangeLog index c572b8d0bef0..dd8866dcd74d 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-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog,v 1.41 2012/09/24 00:43:59 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog,v 1.42 2012/11/14 01:37:47 rich0 Exp $ + +*android-sdk-update-manager-21 (14 Nov 2012) + + 14 Nov 2012; Richard Freeman <rich0@gentoo.org> + +android-sdk-update-manager-21.ebuild: + bump and fix 442722 24 Sep 2012; Mike Frysinger <vapier@gentoo.org> android-sdk-update-manager-17.ebuild, diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild new file mode 100644 index 000000000000..2f53b317f0a2 --- /dev/null +++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2012 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-21.ebuild,v 1.1 2012/11/14 01:37:47 rich0 Exp $ + +EAPI="3" + +inherit eutils user + +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="" +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[cairo] + amd64? ( app-emulation/emul-linux-x86-gtklibs ) + x86? ( x11-libs/gtk+:2 )" + +ANDROID_SDK_DIR="/opt/${PN}" +QA_FLAGS_IGNORED_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_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}" + +S="${WORKDIR}/android-sdk-linux" + +pkg_setup() { + enewgroup android +} + +src_prepare(){ + 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. + 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 + + SWT_PATH= + SWT_VERSIONS="4.2 3.7 3.6 3.5" + for version in $SWT_VERSIONS; do + # redirecting stderr to /dev/null + # not sure if this is best, but avoids misleading error messages + SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`" + if [ $SWT_PATH ]; then + einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT." + break + fi + done + + 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 "Run 'android' to download the full SDK, including some of the platform tools." + 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" + elog "You need to run env-update and source /etc/profile in any open shells" + elog "if you get an SWT error." +} |