bump

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x08C170DE55EC123A

3 files changed, 116 insertions, 5 deletions

diff --git a/dev-util/android-sdk-update-manager/ChangeLog b/dev-util/android-sdk-update-manager/ChangeLog
index af0ecb2ee561..03ac6b154b3b 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog,v 1.59 2014/03/19 01:53:22 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog,v 1.60 2014/03/19 17:25:31 rich0 Exp $
+
+*android-sdk-update-manager-22.6.1 (19 Mar 2014)
+
+  19 Mar 2014; Richard Freeman <rich0@gentoo.org>
+  +android-sdk-update-manager-22.6.1.ebuild:
+  bump
 
 *android-sdk-update-manager-22.6 (19 Mar 2014)
 
diff --git a/dev-util/android-sdk-update-manager/Manifest b/dev-util/android-sdk-update-manager/Manifest
index 2272cb7b5199..2f6d1c3ec140 100644
--- a/dev-util/android-sdk-update-manager/Manifest
+++ b/dev-util/android-sdk-update-manager/Manifest
@@ -12,6 +12,7 @@ DIST android-sdk_r22.0.5-linux.tgz 105641005 SHA256 b664d1024b6fcf897e05eb1674c9
 DIST android-sdk_r22.2.1-linux.tgz 100918342 SHA256 17ea4610008985eb1454b3b25ad00c59300cee3141f7ea3deec98f45d862faa5 SHA512 4eb7087c27db2b2435aa11bba01fccd09617ea58dd84aca8b249d81b3d15c913844d204463a6d83064c6cf8f07e26c0f70130315b281b1bbfd32c01d6e53bfef WHIRLPOOL b51611c4000464f2f0872893adea4bf7027f188582081d7beedc2b77700841b7e82ca6415db44603d4c186eda0e00dd4f51e603bf4416963ae80a0b57b617e0a
 DIST android-sdk_r22.3-linux.tgz 100968558 SHA256 4077575c98075480e0156c10e48a1521e31c7952768271a206870e6813057f4f SHA512 c05e610e0979f61d217b6612bccd48120719123cf80282cca442e81be6e0c4cfd5a4b3f398d1c8835c86bc67b730a7bf5a5e511abe57a1d70b6c1f62940832a3 WHIRLPOOL 3a05248c6e784a82dd2eb92de403e6e7634e4d3c472334c7d9d539f41a7d0612c48e6aecbd784081cc5477f22f595c723748ea69d8313c8550c63923a3ce1969
 DIST android-sdk_r22.6-linux.tgz 100992666 SHA256 da4c25536ba7f85cdd37be8636fcc563480410788df30c3fc5b5c876e6220e5f SHA512 2e632e31725a7c8c5e99cba70388c928d553d52177a2a0d49abfae125d1ccb57857171f10cd28da57664d0d9ab0f7b6ae409c943ad4d4433b05e0b8fb1bfe322 WHIRLPOOL 0d83ba871ea5ffd66d8543a563eac351b82f8597b7c8959848247e469c616fe52101c2d825648dbe6361dde3029bc4a8e06c097868eb3edcdeac1337beed9f03
+DIST android-sdk_r22.6.1-linux.tgz 101052129 SHA256 4ee7bb43fe6f20faf755b0988ecf818312392be52780db13ab4792a0b1627388 SHA512 5789a6b11a1a5c18145900042b15707f58afd6db82d345550c33e72cfbaf719c7c16667a7561e4c6ca624c2d2466430db7f8138bf0cd6449762639a63c6cf9ca WHIRLPOOL 09d6d11c08489d07b5b0da32734d70be8da65e949359b1155c9b59f3c07cbd21eed87c15f509e95604b7ed404f99b289700a10373268af132208b3e99178a113
 EBUILD android-sdk-update-manager-21.1.ebuild 3177 SHA256 d5a3252cdbac1f2f0a0808db97884bc321be50c2ddfc893b35ca895af45476dc SHA512 b5917569cb0a85360e03a320faf9156268d3534316e96940be74d7b8c670ecb94bf69c856b0071a7019e0e07be478d0299d738831ef831e1c2af1e384cd05a50 WHIRLPOOL 8da377fa2ccef98ebb97cd00edcf5b20066a46048f53e0469bc3ca92105c6b85e360a25abfc3776e7503498524522844fc505b285de56945ae6076e390abfb55
 EBUILD android-sdk-update-manager-21.ebuild 3175 SHA256 38d8c5f8b0aff7e5cb40d42980f81c2a5cbb1cb65ba8e2c185a89ddd46d48c59 SHA512 c0278c9a478af2a83b64b7cd328dd82e51863c6578b51ceaddace5b41471fb05eb6143fb0bf6b8c7f37d2909bb9c4230ed60440b4fd0daf67f6aed02350730fc WHIRLPOOL 7893ba373de5989cc2af4dd043ca37e8a4325d1b0c19871873da377459eed41650de6b6758004d78f002ab9a01b61a34e9f9f2058d4696c8da760681be676cfb
 EBUILD android-sdk-update-manager-22.0.1-r1.ebuild 3400 SHA256 823c11578914e57d6e353c3290c49ae7850e43474dcb9482d723b9baa1ccca8b SHA512 9b045b4698e2e76828aca163bcec3449c017f82b4ab479daa93b7331445ccd25dd63af7cd8f06509c479ea2951d85b8be92b66742699b173983569d40d9e4853 WHIRLPOOL 37f07e6a77101c515f5a6dafac433538f700e8499c9839390ed2f65efec87d05dbcaefe650943b1cf41a844597b7b02296453358305e7eb19626d06255078f36
@@ -21,14 +22,15 @@ EBUILD android-sdk-update-manager-22.0.5-r1.ebuild 3479 SHA256 53f6b954976455f54
 EBUILD android-sdk-update-manager-22.0.5.ebuild 3397 SHA256 72392583628464aa0132800ed920239dd1068ec4ea06d6ae914ba944fee96a35 SHA512 c5a8e92524a3889182723a5c1218c95dce814799982c0e4ee8c1946ce77be8adda887a9f1f835479cf734791f3228e4df2b3db3ca67ea308d4cca53c323e55c2 WHIRLPOOL 515009157e79ee6e8b70f8cca85883dfb42e5656215053253c04b6c15a29db4cd6e897306d7ceff3a0f44fd1bd7d99d87566268e201864abf66d3b6d43c956f3
 EBUILD android-sdk-update-manager-22.2.1.ebuild 3476 SHA256 f1f083e4df41640268bf9a517d42777ff6d2bed5d2edc528ecbc96abcf6c7b0e SHA512 96baafc428e7eedf62b78db51cf925d19f139e597298d3647742ee95bead225756fec9187c3687bdca2ab5d9ca4b2a65d994b03cb969fa7cf33d826bcd3907d6 WHIRLPOOL 2673d2c28970433a8e26c9720efcf668cfb0308daf9923ad6149ac0fba9a74754a7e2e731fbbc831f58e2169df75644c7a14fa48ded4cb58faf01d7d2924e9aa
 EBUILD android-sdk-update-manager-22.3.ebuild 3595 SHA256 2a5db3d4e860ce7719f44783844851f1e92dd3e9ed39d686e7c586f3e03fbb27 SHA512 bbf710bc6e6e22be26df35f863481427079ad22eb3c4f9561e815ea6954de26918d93d7a4925fed9515b58fd3493c09ada073546ec590cb58a0db8645850b943 WHIRLPOOL 283beb6f2aa11b1f5fdc656e6f7b7b48e50fec7773b940b4dcda9fbb12cae3e11ec4e0121f90eb815c88882309898471dd0f386d12c11a7e4bb8e3db7c45388e
+EBUILD android-sdk-update-manager-22.6.1.ebuild 3597 SHA256 b30d5c58660365ca34608b2f60b937307121c46a6e9c1ffd53f43b76a9650914 SHA512 bc67f592c1e1b38b58cbaf18e86c3cf3505fc256fb979f2f94dd0bf4751208b78a32324bb8c92eb1c24f60d8ae05de914094b04e76e14bcf457464ba4216234b WHIRLPOOL 207310952563bb487c5e0df22944a9f0c9c3749eeb88065f9a1f1e293c9fee804707f71a5f397010540008c0458d7fcc29a8e33dd9d6df42d3a1ad65b9804811
 EBUILD android-sdk-update-manager-22.6.ebuild 3595 SHA256 961d1eeb5c3fa9f706b44c5cc6eda53bf13ad59cf75c34766b447c893605d9ad SHA512 9cc9dfd50ee5b1423f1d0b963d53260e662619c924a7566a8ee7f673ce151ccf516de78129a7f37ed7020527295c4a2c45cb41db840915eed85939ead55b4346 WHIRLPOOL c5e842859555a87100a030a5c335c5cd1f9f6546e672781b3950b70522f67bd8153336e38da435fa731e82cd7cc7d8cdbf89c8a339ae023b45d89a247b0b7500
 EBUILD android-sdk-update-manager-22.ebuild 3365 SHA256 f86aaae14f90bbdecc7959ce02e60a87f4fcae0279a6ca491681e184bf6c3bf4 SHA512 b5c93a752f955b7a83b6458f3b49b8dc84d62a6a78c4bdc72348be0f8b09882b54a2781735ecdbbf98f0196762fdef2c7de114c13666b07c116306f80c387d44 WHIRLPOOL a1d0231a5b8ff0fee7b60fb28d59c3339f1e50955863658c7c65214da1123601f42fed21c2564438afe1c96e00215cc9d228ef738b036a87da2bca2b4557f659
-MISC ChangeLog 10619 SHA256 4aa33f4eecd9481b63078d3aef651cd57e46fc8d300ec0d537204233e2857137 SHA512 a3069264e04bfbaf5aa4982ad67efb90dd0636e70f02d4702d19cc1796e099f6750367cf4a739ef635c65bfebc9edef9e1b3b29771ea730b5e5248cec240ef3a WHIRLPOOL a9200b07c7797a86d50cd7bc3eb13917f9e65c37a9c18aaf64dac61a47a85f33dc818eb4089b14c3d8d9e8ed40c7f5bc35ff05f70615bd9903f8eb7c648bc9fb
+MISC ChangeLog 10772 SHA256 e596c5171b770abe543d2ae1cd09dbf11eba5d675dff1dbaead28896ca4cf74d SHA512 763293fd203ed909d761039197158d8ed1f9ba3b7cbe0e5e5237a0411e351c6f3e6dbff4f3550bea35e60be9d5a5996b7cb418f4651165113211b789c2eda288 WHIRLPOOL 747469f5f475a04314c91819c26b7e37d4ac9237b263a1dd4b9ea67603170a906931b8ade4c0c8f71f1134c331fbd6155e6abad57fab60f2fb34b649437495d7
 MISC metadata.xml 200 SHA256 98e80d4c2848c87ef9f4b295ac60b27acca3a53380008166b7016a02d4e9526b SHA512 03a8813863af4f9620e6e5564604482e9664ffd576ff24f6ab667484d826482907ece3849b08af3db904d4de9397a8712ed2462773c42c66c59c645192fc9c48 WHIRLPOOL dab7569da9c0b95379db908ed69102239f42e80cab6c6106ac401eb5ef314a1e7056fe3e2a451c2a80dd878df328cdb3f385bfcf4254070e3a9eff6519f8fb81
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlMo+KEACgkQCMFw3lXsEjoFBAEAiKpIscXwxiC8HjrO93/NqZ6h
-Xsu7f5je3OswcjdoEboA/2r0XOmv8ElKaAHPHxZpsyP3sXXNFlP3MdwWQuXpTnqF
-=2RIm
+iF4EAREIAAYFAlMp0w8ACgkQCMFw3lXsEjrWpgD/Wj6jpZDVwwaWoZtlF4KBH1dA
+609l6RbaTZFE8ppKMSMA/0eD2OIhwxy4P2V5HZQVfE4Dp+mbl9fJSqxPjopSzUyz
+=SMFJ
 -----END PGP SIGNATURE-----
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
new file mode 100644
index 000000000000..fdc2b79b3990
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2014 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-22.6.1.ebuild,v 1.1 2014/03/19 17:25:31 rich0 Exp $
+
+EAPI="5"
+
+inherit eutils user udev
+
+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.7[cairo] dev-java/swt:3.6[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}"
+
+QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
+
+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,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp} || die "failed to dodir"
+
+	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
+	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,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"
+	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
+	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${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
+
+	udev_dorules "${FILESDIR}"/80-android.rules || die
+	domenu "${FILESDIR}"/android-sdk-update-manager.desktop || 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."
+}