dev-util/android-studio: bump 2.2.2.0.145.3360264

* java_prepare is no longer called, define src_prepare instead.

Package-Manager: portage-2.3.0

2 files changed, 97 insertions, 0 deletions

diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index ffeb003240b6..caeab4090d88 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,3 +1,4 @@
 DIST android-studio-ide-143.2915827-linux.zip 305181285 SHA256 baaa0555c96b542d047bce3b03ff41e38f422bed9e1a7f1e55fb1c4b3daac160 SHA512 42f0e6ebd51fc92f64f3bcfa980df3853922e6bff043ae23fbd7564b79cb905b30927bbee534613a52a92d24e60bad89ee577a06e382b301d5f7f773c166ce07 WHIRLPOOL a344331a3b308b2497e68ac5e13f4d1ef224c02e44d2fcf6cd48f0981bd25a4c87c9355f014fda23a5241e76719a5a6f79ed2424387c70fffc7c4cf964e526b9
 DIST android-studio-ide-143.3101438-linux.zip 286664165 SHA256 722f944124c395d0c82565257d23441ebc77775f7fae47099f8cd48c571c9ff6 SHA512 3890dcec1c773732a4b54e6e6dd90f9f9b63c396fb0d2712fa4a5b2b8487a055e910f983a8c4da8e3e5b103021267415eb6065f291bd35a633c4723e5cb648cb WHIRLPOOL f81dbb0c9e4f7a4ac6ff93dbf75022ac9d557503fd89901a24dc9afdf2850cb23c931c52a01101e7fbe87cb5e076f998823a2d7b7e2103d682fdbe7c2b9755b9
 DIST android-studio-ide-145.3276617-linux.zip 449256851 SHA256 b4b6c82c4d60be9887ac219ebc4efd3cba2508d1a2049242cbf1be3ca55dfe0c SHA512 71310d6b9fb071fc6b9810765389a2311a62cc706cbe71b2fe466167fb2ded7ebcc2441fe49d34a2942bb79d516f6acfcba5e214e1af42c9e2bc988a28c6fb79 WHIRLPOOL 19250788e2355fe85a30731da70d89ff7bf62b95afc17dbd18a82eb1e1b80b1d7325b2f57efbd19e107e30aa46b8a164056273aebe2c82f812df4661ed0c2fbd
+DIST android-studio-ide-145.3360264-linux.zip 466765476 SHA256 95014a19786c076b31f0ea980eb42a163e9738356ec08a0878b7d67b6b7ec76e SHA512 446db0013b8d815ee89fa800fb5d610507fdc8b41fc3f09f2b94984ec2918e61cd9296920311f2f394c18521be53e4d7d5b44e6b6f60a617d44a451a61df4a7d WHIRLPOOL 814b227a3b22d6b69a70b7d11fd49c399dc8c45973221d07089ccf94ec07b7aa4c453ce54814d420205eeba203687083d152e81bf2f9a753af4ffb607f47b556
diff --git a/dev-util/android-studio/android-studio-2.2.2.0.145.3360264.ebuild b/dev-util/android-studio/android-studio-2.2.2.0.145.3360264.ebuild
new file mode 100644
index 000000000000..19ffb945dc4d
--- /dev/null
+++ b/dev-util/android-studio/android-studio-2.2.2.0.145.3360264.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils java-pkg-2 versionator
+
+RESTRICT="strip"
+QA_PREBUILT="opt/${PN}/bin/libbreakgen*.so opt/${PN}/bin/fsnotifier*"
+if [[ $(get_version_component_count) -eq 6 ]]; then
+	STUDIO_V=$(get_version_component_range 1-4)
+	BUILD_V=$(get_version_component_range 5-6)
+else
+	STUDIO_V=$(get_version_component_range 1-3)
+	BUILD_V=$(get_version_component_range 4-5)
+fi
+
+DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
+HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
+SRC_URI="https://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
+	dev-java/commons-logging:0
+	dev-java/log4j:0"
+
+#	dev-java/guava:18
+RDEPEND=">=virtual/jdk-1.7
+	selinux? ( sec-policy/selinux-android )
+	>=app-arch/bzip2-1.0.6-r4
+	dev-java/commons-logging:0
+	dev-java/log4j:0
+	>=dev-libs/expat-2.1.0-r3
+	>=dev-libs/libffi-3.0.13-r1
+	gnome-extra/zenity
+	>=media-libs/fontconfig-2.10.92
+	>=media-libs/freetype-2.5.5
+	>=media-libs/libpng-1.2.51
+	>=media-libs/mesa-10.2.8
+	|| ( >=sys-libs/ncurses-5.9-r3:5/5 >=sys-libs/ncurses-5.9-r3:0/5 )
+	>=sys-libs/zlib-1.2.8-r1
+	>=x11-libs/libX11-1.6.2
+	>=x11-libs/libXau-1.0.7-r1
+	>=x11-libs/libXdamage-1.1.4-r1
+	>=x11-libs/libXdmcp-1.1.1-r1
+	>=x11-libs/libXext-1.3.2
+	>=x11-libs/libXfixes-5.0.1
+	>=x11-libs/libXrender-0.9.8
+	>=x11-libs/libXxf86vm-1.1.3
+	>=x11-libs/libdrm-2.4.46
+	>=x11-libs/libxcb-1.9.1
+	>=x11-libs/libxshmfence-1.1"
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	eapply_user
+	# This is really a bundled jdk not a jre
+	rm -R "${S}/jre" || die "Could not remove bundled jdk"
+
+	# Replace bundled jars with system
+	# has problems with newer jdom:0 not updated to jdom:2
+	cd "${S}/lib"
+	local JARS="commons-logging log4j"
+	local j
+	for j in ${JARS}; do
+		rm -v ${j/:*/}*.jar
+		java-pkg_jar-from ${j}
+	done
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local dir="/opt/${PN}"
+
+	insinto "${dir}"
+	# Replaced bundled jre with system vm/jdk
+	# This is really a bundled jdk not a jre
+	doins -r *
+
+	rm -rf "${D}${dir}/jre" || die
+	dosym "/etc/java-config-2/current-system-vm" "${dir}/jre"
+
+	fperms 755 "${dir}/bin/studio.sh" "${dir}"/bin/fsnotifier{,64}
+	chmod 755 "${D}${dir}"/gradle/gradle-*/bin/gradle || die
+
+	newicon "bin/studio.png" "${PN}.png"
+	make_wrapper ${PN} ${dir}/bin/studio.sh
+	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE"
+}