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 A77DF138334 for ; Sat, 29 Sep 2018 10:21:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D4578E088A; Sat, 29 Sep 2018 10:21:13 +0000 (UTC) Received: from smtp.gentoo.org (unknown [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 ACDD3E088A for ; Sat, 29 Sep 2018 10:21:13 +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 C9C49335CF9 for ; Sat, 29 Sep 2018 10:20:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 22A62429 for ; Sat, 29 Sep 2018 10:20:50 +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: <1538216422.8b026d59bb6900697f39255c45e5033572b25c24.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.2.0.26.181.5014246.ebuild X-VCS-Directories: dev-util/android-studio/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 8b026d59bb6900697f39255c45e5033572b25c24 X-VCS-Branch: master Date: Sat, 29 Sep 2018 10:20:50 +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-Archives-Salt: 1b77ca89-0b12-446a-9874-993c50c05265 X-Archives-Hash: 749b1c5b594e116a5ad02deb6b7d0340 commit: 8b026d59bb6900697f39255c45e5033572b25c24 Author: Jason Zaman gentoo org> AuthorDate: Fri Sep 28 17:40:49 2018 +0000 Commit: Jason Zaman gentoo org> CommitDate: Sat Sep 29 10:20:22 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b026d59 dev-util/android-studio: bump to 3.2.0 Closes: https://bugs.gentoo.org/667028 Package-Manager: Portage-2.3.49, Repoman-2.3.10 Signed-off-by: Jason Zaman gentoo.org> dev-util/android-studio/Manifest | 1 + .../android-studio-3.2.0.26.181.5014246.ebuild | 115 +++++++++++++++++++++ 2 files changed, 116 insertions(+) diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest index 38833aa6b92..25521ef88d3 100644 --- a/dev-util/android-studio/Manifest +++ b/dev-util/android-studio/Manifest @@ -1 +1,2 @@ DIST android-studio-ide-173.4907809-linux.zip 897596053 BLAKE2B 6142cfc21d41a23d93ff064be457a28879ce80830bec79a38f6862d0f5b9de7b552d7175d7bf3e3ddfc70b10e0f7313e7ebcb7a3cdf16511c070551a27193775 SHA512 3fc01ffef5dd88dce088cc67fde03c62dadce7a700aace17ebd414ad0b1125b8370b5f132349424ff65ffc721ff383e6793737a0021826f08e35c893e33535be +DIST android-studio-ide-181.5014246-linux.zip 1054392038 BLAKE2B 455ce3455710d0709746dc9c18caf61fd347f6c157873de54821601846be6e086646d6261d2c9bdd6986d8f2874e7a90c37b0db820326d2eb17afe438954e240 SHA512 37c622cab6d21e8a0e6d38e0f8c29e22910647df3e6d93ee86c71a39f171b1b51952a13eae2660e209c2eb7a093a9f7d2177562ea287353a30507b22c2617bd0 diff --git a/dev-util/android-studio/android-studio-3.2.0.26.181.5014246.ebuild b/dev-util/android-studio/android-studio-3.2.0.26.181.5014246.ebuild new file mode 100644 index 00000000000..ec9300dae61 --- /dev/null +++ b/dev-util/android-studio/android-studio-3.2.0.26.181.5014246.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit eutils java-pkg-2 eapi7-ver + +RESTRICT="strip" +QA_PREBUILT="opt/${PN}/bin/libbreakgen*.so + opt/${PN}/bin/fsnotifier* + opt/${PN}/bin/lldb/* + opt/${PN}/lib/libpty/linux/x86*/libpty.so + opt/${PN}/plugins/android/lib/libwebp_jni*.so + opt/${PN}/plugins/android/resources/perfa/*/libperfa.so + opt/${PN}/plugins/android/resources/perfd/*/perfd + opt/${PN}/plugins/android/resources/simpleperf/*/simpleperf" + +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="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 + >=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" +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 + rm -rf "${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" || 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() { + : +} + +src_install() { + local dir="/opt/${PN}" + + insinto "${dir}" + doins -r * + + # Replaced bundled jre with system vm/jdk + # This is really a bundled jdk not a jre + rm -rf "${ED%/}${dir}/jre" || die + dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre" + + fperms 755 "${dir}/bin/studio.sh" "${dir}"/bin/fsnotifier{,64} + fperms 755 "${dir}"/bin/*.py "${dir}"/bin/*.sh + chmod -R 755 "${ED%/}${dir}"/bin/lldb/{android,bin} || die + 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" +}