Version bump and add Jesse's SWT patch.

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

diff --git a/dev-util/android-sdk-update-manager/ChangeLog b/dev-util/android-sdk-update-manager/ChangeLog
index f521de1a263254688d6164fb6f5799080a05581b..0c5a53bab3853dde83b38eb1ee0d40a595ea16c7 100644 (file)
--- 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog,v 1.29 2011/11/29 20:01:01 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog,v 1.30 2011/11/29 20:05:22 rich0 Exp $
+
+*android-sdk-update-manager-15 (29 Nov 2011)
+
+  29 Nov 2011; Richard Freeman <rich0@gentoo.org>
+  +android-sdk-update-manager-15.ebuild:
+  Version bump and add Jesse's SWT patch.
 
   29 Nov 2011; Richard Freeman <rich0@gentoo.org>
   -android-sdk-update-manager-10.ebuild,

diff --git a/dev-util/android-sdk-update-manager/Manifest b/dev-util/android-sdk-update-manager/Manifest
index 91e4a68eab5290575650f775fb26988fecf3173e..fe35769d7ed38e72f4147fdd9a8ceaa78095d8b1 100644 (file)
--- a/dev-util/android-sdk-update-manager/Manifest
+++ b/dev-util/android-sdk-update-manager/Manifest
@@ -3,14 +3,16 @@ Hash: SHA256
 
 DIST android-sdk_r13-linux_x86.tgz 30034328 RMD160 e530529ed2e3a4587a4f82fe5089074dc3717ba2 SHA1 f5ddb7a399e985434f516ff32b140a4a79db760d SHA256 0edd4478f9dbd882322995c161c49396ffd542daaf180ecf38f347ff8fc17d6b
 DIST android-sdk_r14-linux.tgz 26075938 RMD160 b86f89a98376e913822dfe2e3084456bdb63450b SHA1 ab504aaf912fb98f13007c7600ba207535c43775 SHA256 bd38cf72f482256c3996c9611ca78269acb0fdeaf3f65b6b3d682fca69a3019e
+DIST android-sdk_r15-linux.tgz 26124434 RMD160 80a57a75f41d82937e9414f853ed434585e07196 SHA1 f861b3097fac3f5facb335fe4cc7f6fdbc689f9c SHA256 5e7f56f314355ad5f8d0c4ba6dd94c2d0764ccc0d64986c878464a44129fc474
 EBUILD android-sdk-update-manager-13.ebuild 2918 RMD160 1f583d99cf047878d3bed34f85606a1cf8ec559b SHA1 3f50e49e84eed1eb161eed99a26be58b95341e47 SHA256 ae262032bb820b9860e9c52d605138b6a52a2dc9572c964ec6ea00634787fd9f
 EBUILD android-sdk-update-manager-14.ebuild 2910 RMD160 96c9bba2a14fb6b4d3f1720b0d37024bd47d811b SHA1 9c4abb47087b783a224d5503cf41fbba3e24d814 SHA256 1e4ce5eb58505b06aae5f2dc9756f57116fbe7c3b5273a61524bfd26278c578d
-MISC ChangeLog 5956 RMD160 6dfae2462fcacb873bec6be61088ea0822c5cedd SHA1 96e40dd0359e408486fa6bc5ccc6a3a90972b082 SHA256 d92288129904458282a2388ddc53fff0c3d5238034dfcd419076d48fafe6eab9
+EBUILD android-sdk-update-manager-15.ebuild 3226 RMD160 1acd2d66d3696efb9323d674dd1c8f6e9a03cece SHA1 dcc15598ab6214d3dacc91e82c9f403c8b8ef398 SHA256 032891598100735d9803d5f39b17cd17196ca8ba376f53c36484bf58a83a2f58
+MISC ChangeLog 6136 RMD160 de8f25f17c1d3149b4300e5d58dc1c4f991d200d SHA1 60b3ad25127aeaabc066a75c82d3f452cd371c30 SHA256 c9727198964cb5d8ab08de70f00b42825e551d4c44757d19106a3ee5332b4223
 MISC metadata.xml 237 RMD160 c1fb37d90302321b3d091154718f7444ac9bd00a SHA1 b4fbccd4396827e29df9045b21ab94a12a920865 SHA256 750cd2dceb72a3eb165fecfb21c1dbdd2736a92fc9b0b43fccd5910f1f9508fc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk7VOg4ACgkQCMFw3lXsEjo4LwD/aq8Fexp9ElmuosxPv8E4gakP
-3zk4u52wk9SP2eObQYkA/Ru0PDRmFlxH3yfUFzgTtiIwPMhQ+XJgIvxPlc946AmM
-=S3Oh
+iF4EAREIAAYFAk7VOwgACgkQCMFw3lXsEjqHewD+O9A7FxB/FLUxsPn0/ayiVmW5
+s2WWVOVyBUbBHUzbNAUA/jUZgHCYqbQhXCAWdc60uA4yccUOJ6AjUIVe+X/JJZ/p
+=4nUo
 -----END PGP SIGNATURE-----

diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-15.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-15.ebuild
new file mode 100644 (file)
index 0000000..fa5412f
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-15.ebuild
@@ -0,0 +1,101 @@
+# 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-15.ebuild,v 1.1 2011/11/29 20:05:22 rich0 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=""
+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"
+
+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
+
+       SWT_PATH=
+       SWT_VERSIONS="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."
+}