# HG changeset patch
# User Da Risk <da_risk@geekorum.com>
# Date 1446459025 -3600
# Node ID b4a54a5d881d718cb1dc40474506f132e4084f67
# Parent  fa89ae11661da2bf33e9000710bbda163ea8b5cc# Parent  1337913a1663d5b9e5ad2f06ddfd6c5d5bb480bd
Merge dev-util/android-studio in master

diff -r fa89ae11661d -r b4a54a5d881d dev-util/android-studio/Manifest
--- a/dev-util/android-studio/Manifest	Fri Sep 18 17:10:30 2015 +0200
+++ b/dev-util/android-studio/Manifest	Mon Nov 02 11:10:25 2015 +0100
@@ -1,1 +1,1 @@
-DIST android-studio-ide-135.1740770-linux.zip 259336386 SHA256 215bc100b1c94354cece28b4b1692ffc3098f386bf76c1ebc05d393f1acd50e4 SHA512 6c333b30ea9dfa6eae40871401af6c64e34cd4a77e943a1c89cb3edc984e7c6a5895e3600cb936b8ca75d0223aa773f2f5c1983c6066125bc1567353552d1f19 WHIRLPOOL ac28b7b3973e8774f3344dc18ff1772ee8c441c6aad9a2ff44ea11faccbd878f9da4ed375021e6b9cfe2ea0b1ed1f282725a37d236415a5af9b44f42fe0286ab
+
diff -r fa89ae11661d -r b4a54a5d881d dev-util/android-studio/android-studio-1.1.0.135.1740770.ebuild
--- a/dev-util/android-studio/android-studio-1.1.0.135.1740770.ebuild	Fri Sep 18 17:10:30 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit eutils versionator
-
-RESTRICT="strip"
-QA_PREBUILT="opt/${P}/bin/libbreakgen.so"
-STUDIO_V=$(get_version_component_range 1-3)
-BUILD_V=$(get_version_component_range 4-5)
-if [[ $(get_version_component_count) -gt 5 ]]; then
-	STUDIO_V="${STUDIO_V}$-(get_version_component_range 6-)"
-fi
-# preview
-#STUDIO_V="${STUDIO_V}b4"
-
-DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
-HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
-SRC_URI="http://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="selinux"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/zip"
-RDEPEND=">=virtual/jdk-1.7
-	selinux? ( sec-policy/selinux-android )"
-S=${WORKDIR}/${PN}
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}/bin/studio.sh" "${dir}/bin/fsnotifier" "${dir}/bin/fsnotifier64"
-
-	newicon "bin/idea.png" "${PN}.png"
-	make_wrapper ${PN} ${dir}/bin/studio.sh
-	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE"
-}