From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1158214-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id E12B6138350
for <garchives@archives.gentoo.org>; Wed, 1 Apr 2020 19:19:36 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 31DD7E08A6;
Wed, 1 Apr 2020 19:19:36 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 0B27EE08A6
for <gentoo-commits@lists.gentoo.org>; Wed, 1 Apr 2020 19:19:36 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 085FC34FA0C
for <gentoo-commits@lists.gentoo.org>; Wed, 1 Apr 2020 19:19:35 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id A31C2150
for <gentoo-commits@lists.gentoo.org>; Wed, 1 Apr 2020 19:19:33 +0000 (UTC)
From: "Mart Raudsepp" <leio@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" <leio@gentoo.org>
Message-ID: <1585768753.109b78060800e3658af3ca122b97cd9521a6d3ba.leio@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/android-studio/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-util/android-studio/Manifest dev-util/android-studio/android-studio-3.6.2.0.192.6308749.ebuild
X-VCS-Directories: dev-util/android-studio/
X-VCS-Committer: leio
X-VCS-Committer-Name: Mart Raudsepp
X-VCS-Revision: 109b78060800e3658af3ca122b97cd9521a6d3ba
X-VCS-Branch: master
Date: Wed, 1 Apr 2020 19:19:33 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 0f3acebc-9b28-4bb7-b5ea-ae13e222e6a2
X-Archives-Hash: 520f448676cd04f59f4731a7f7002cd4
commit: 109b78060800e3658af3ca122b97cd9521a6d3ba
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 1 14:25:01 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Apr 1 19:19:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=109b7806
dev-util/android-studio: bump to 3.6.2
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
dev-util/android-studio/Manifest | 1 +
.../android-studio-3.6.2.0.192.6308749.ebuild | 129 +++++++++++++++++++++
2 files changed, 130 insertions(+)
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index 5ce70170b85..ab7f2736519 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,3 +1,4 @@
DIST android-studio-ide-191.6010548-linux.tar.gz 774544822 BLAKE2B eeeed14c8749015f7a0c9235552c04195f81a30a727adfc48d56d2b39ead6d8b017600be801e19fd8eae25ffd2ccbd081b59d464d7ae6bbf14c0a42dd508087d SHA512 95e7befa684b02c5261244a0568f2180a3fd5cee2abe47309f4d183aae1c97b47c08af3cd228462f7db10f3bdb40c591472e74ffb9d89f08301fc25a04f41507
DIST android-studio-ide-192.6200805-linux.tar.gz 803889418 BLAKE2B dcbfb2eef299456023a3c21a006b32a203566f1fa3d7ce9eb2e6863bfdc9db9f462b911f7ae96f4ccd62f602b424932365355a0b3a684909116ae87448111a86 SHA512 430b145f0816c06ddbd9583da9d609db52f807412b23d02d2ec3b67d947c2bc669a17c45378f3f0ed42a28108ad90b412878e0fcaa8189ae802a6cac2b19138b
DIST android-studio-ide-192.6241897-linux.tar.gz 803889879 BLAKE2B 5d2d24de5daa317c53513e2a8985e6998891043b1fe730fadd04c6f8ca9702e8be9f2444d73e47578e4d368951897003170ea7e96c569f038f18b98286478df0 SHA512 7ef878ecbc17f542b2faaf18965a294941424f835c21250ff7fde5e29ddc261b35e5e7391cc50803babdcfc98e25390b806f33d0f7dc0f0bcaf7a94feeeab82e
+DIST android-studio-ide-192.6308749-linux.tar.gz 803133146 BLAKE2B 159192929a0cd526c789d915ad15bcc7f6d92e86f1e09f178548ae1055d3086e31f8fb88ceaff55d514728c755eacc84b2abe3c754542fea9e1f5ea117606df5 SHA512 86ce587c2e997dc623498fcf34060568fe58a26f8d287102fc458d963756ba98a4782709cb45f54e847658f64ad263ae2f59bbe1024a5a20be79be821ba9db00
diff --git a/dev-util/android-studio/android-studio-3.6.2.0.192.6308749.ebuild b/dev-util/android-studio/android-studio-3.6.2.0.192.6308749.ebuild
new file mode 100644
index 00000000000..e9812c3699a
--- /dev/null
+++ b/dev-util/android-studio/android-studio-3.6.2.0.192.6308749.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop eutils java-pkg-2
+
+RESTRICT="strip"
+QA_PREBUILT="
+ opt/${PN}/bin/fsnotifier*
+ opt/${PN}/bin/libdbm64.so
+ opt/${PN}/bin/lldb/*
+ opt/${PN}/custom-jdk/*
+ opt/${PN}/lib/pty4j-native/linux/*/libpty.so
+ opt/${PN}/plugins/android/lib/libwebp_jni*.so
+ opt/${PN}/plugins/android/resources/installer/*
+ opt/${PN}/plugins/android/resources/perfetto/*
+ opt/${PN}/plugins/android/resources/simpleperf/*
+ opt/${PN}/plugins/android/resources/transport/*
+"
+
+VER_CMP=( $(ver_rs 1- ' ') )
+if [[ ${#VER_CMP[@]} -eq 6 ]]; then
+ STUDIO_V=$(ver_cut 1-4)
+ BUILD_V=$(ver_cut 5-6)
+else
+ STUDIO_V=$(ver_cut 1-3)
+ BUILD_V=$(ver_cut 4-5)
+fi
+
+DESCRIPTION="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.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="custom-jdk selinux"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ dev-java/commons-logging:0
+ dev-java/log4j:0"
+
+RDEPEND="${DEPEND}
+ >=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
+ >=media-libs/fontconfig-2.10.92
+ >=media-libs/freetype-2.5.5
+ >=media-libs/libpng-1.2.51
+ >=media-libs/mesa-10.2.8[X(+)]
+ || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
+ sys-libs/ncurses-compat:5[tinfo]
+ >=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"
+BDEPEND="dev-util/patchelf"
+S=${WORKDIR}/${PN}
+PATCHES=( "${FILESDIR}/0001-use-java-home-before-bundled.patch" )
+
+src_prepare() {
+ eapply "${PATCHES[@]}"
+ eapply_user
+
+ # This is really a bundled jdk not a jre
+ # If custom-jdk is not set bundled jre is replaced with system vm/jdk
+ if use custom-jdk; then
+ mv -f "${S}/jre" "${S}/custom-jdk" || die "Could not move bundled jdk"
+ else
+ rm -rf "${S}/jre" || die "Could not remove bundled jdk"
+ fi
+ # Replace bundled jars with system
+ # has problems with newer jdom:0 not updated to jdom:2
+ cd "${S}/lib" || die
+ local JARS="commons-logging log4j"
+ local j
+ for j in ${JARS}; do
+ rm -v ${j/:*/}*.jar || die
+ java-pkg_jar-from ${j}
+ done
+
+ cd "${S}" || die
+
+ # bug 629404
+ echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
+ echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
+}
+
+src_compile() {
+ patchelf --set-rpath '$ORIGIN' bin/lldb/lib/readline.so || die "Failed to fix insecure RPATH"
+}
+
+src_install() {
+ local dir="/opt/${PN}"
+
+ insinto "${dir}"
+ doins -r *
+
+ # This is really a bundled jdk not a jre
+ # If custom-jdk is not set bundled jre is replaced with system vm/jdk
+ if use custom-jdk; then
+ dosym "custom-jdk" "${dir}/jre"
+ else
+ dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre"
+ fi
+
+ fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh}
+ fperms -R 755 "${dir}"/bin/lldb/{android,bin}
+ if use custom-jdk; then
+ fperms -R 755 "${dir}"/jre/{bin,jre/bin}
+ fperms 755 ${dir}/jre/jre/lib/jexec
+ fi
+
+ newicon "bin/studio.png" "${PN}.png"
+ make_wrapper ${PN} ${dir}/bin/studio.sh
+ make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
+}