From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 C5A79138334 for ; Sat, 11 May 2019 22:30:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C8B52E07A7; Sat, 11 May 2019 22:30:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 872CBE07A7 for ; Sat, 11 May 2019 22:30:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 C46533440A8 for ; Sat, 11 May 2019 22:30:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1215A5DE for ; Sat, 11 May 2019 22:30:26 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1557613777.a9316b4996a9bc0ec06c41f1e9a699ef328cc6c4.perfinion@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.4.0.18.183.5452501.ebuild dev-util/android-studio/metadata.xml X-VCS-Directories: dev-util/android-studio/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: a9316b4996a9bc0ec06c41f1e9a699ef328cc6c4 X-VCS-Branch: master Date: Sat, 11 May 2019 22:30:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6273e051-5013-4f2c-a6d4-948b46cf3fb3 X-Archives-Hash: d80da8f418ba23f6b4d53a1462e73a10 commit: a9316b4996a9bc0ec06c41f1e9a699ef328cc6c4 Author: Jason Zaman gentoo org> AuthorDate: Sat May 11 20:39:50 2019 +0000 Commit: Jason Zaman gentoo org> CommitDate: Sat May 11 22:29:37 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9316b49 dev-util/android-studio: bump 3.4.0 Also add custom-jdk Closes: https://bugs.gentoo.org/675734 Package-Manager: Portage-2.3.62, Repoman-2.3.11 Signed-off-by: Jason Zaman gentoo.org> dev-util/android-studio/Manifest | 1 + .../android-studio-3.4.0.18.183.5452501.ebuild | 131 +++++++++++++++++++++ dev-util/android-studio/metadata.xml | 3 + 3 files changed, 135 insertions(+) diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest index 383dfb8c3b1..31afc1ef727 100644 --- a/dev-util/android-studio/Manifest +++ b/dev-util/android-studio/Manifest @@ -1,2 +1,3 @@ DIST android-studio-ide-181.5056338-linux.zip 1055510234 BLAKE2B d22e4455ccbe7c6f12eacbcc2b707d840945586d9824bfbd2b6f093ef986d54eb042ba0ecc5bdca17c74a20b43e73821eaeefdfb28d4e129bebbb885c7b17483 SHA512 d1e225ed97f4737bdc9cddfc40e85ed5cfea7b4f911a088d2a1cc09558f010affe0a0661fb6f6911d47902b49bbde81868eb56363b90bbec70dd87b679850156 DIST android-studio-ide-182.5199772-linux.zip 1059268546 BLAKE2B b5485c444eea49e10b155a763d40a08c09a05e34c151cf21b79bfbb9b039f0bb112fc806b3b8cf4fe7e17127fe89c8651fac7ff83163ff1cf78c24b330273490 SHA512 76647fc50fbe06f93b733962b51dc8fb57d59c1e30364b82bf7a03a7700a0f7835eab240db6bd93ae71f4147408cbe8641b41965c97d40494c2e5fe0fecfba4d +DIST android-studio-ide-183.5452501-linux.tar.gz 1087166186 BLAKE2B 07c17dc854d24c7e96a91346887dfb96067acad330d485c996f13107bf2a92d6b85e791638c1f6d2f08ea9ea47eb0ee45568605b95f6cdefc2fbf4d350bfeb0e SHA512 c686c2dd89a19d9b2fabffff8ce5a7b5b96ff05bb8c9fbf3c1a7a7b78896653114a527b30d2a9795541f5c70dc80f59d7d3b0d2a56141fea48932bfbb51e8b5f diff --git a/dev-util/android-studio/android-studio-3.4.0.18.183.5452501.ebuild b/dev-util/android-studio/android-studio-3.4.0.18.183.5452501.ebuild new file mode 100644 index 00000000000..655d30a45bd --- /dev/null +++ b/dev-util/android-studio/android-studio-3.4.0.18.183.5452501.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2019 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/x86*/libpty.so + opt/${PN}/plugins/android/lib/libwebp_jni*.so + opt/${PN}/plugins/android/resources/installer/*/installer + opt/${PN}/plugins/android/resources/perfa/*/libperfa.so + opt/${PN}/plugins/android/resources/perfd/*/perfd + opt/${PN}/plugins/android/resources/simpleperf/*/simpleperf + opt/${PN}/plugins/android/resources/simpleperf/*/libsimpleperf_report.so +" + +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 + || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) + >=sys-libs/ncurses-5.9-r3:5/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 + chmod 755 "${ED%/}${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" "StartupWMClass=jetbrains-studio" +} diff --git a/dev-util/android-studio/metadata.xml b/dev-util/android-studio/metadata.xml index 35dce41ecd4..46a577ea1cf 100644 --- a/dev-util/android-studio/metadata.xml +++ b/dev-util/android-studio/metadata.xml @@ -4,4 +4,7 @@ perfinion@gentoo.org + + Install and use Android Studio's custom JRE. +