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 197B4138330 for ; Tue, 4 Oct 2016 15:33:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 74A53E0C14; Tue, 4 Oct 2016 15:33:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 49E64E0C14 for ; Tue, 4 Oct 2016 15:33:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2512733D3C2 for ; Tue, 4 Oct 2016 15:33:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AF335248A for ; Tue, 4 Oct 2016 15:33:23 +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: <1475595149.844ff714334633a5ae03ac348cee75ae78423c3b.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/android-studio-2.2.0.12.145.3276617-r1.ebuild dev-util/android-studio/android-studio-2.2.0.12.145.3276617.ebuild X-VCS-Directories: dev-util/android-studio/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 844ff714334633a5ae03ac348cee75ae78423c3b X-VCS-Branch: master Date: Tue, 4 Oct 2016 15:33:23 +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: d9bce32b-7cbf-4d35-921d-1a2c482a91a4 X-Archives-Hash: a1a3cf4a4a252b6a1f4cce501907adbc commit: 844ff714334633a5ae03ac348cee75ae78423c3b Author: William L. Thomson Jr o-sinc com> AuthorDate: Fri Sep 23 23:05:20 2016 +0000 Commit: Jason Zaman gentoo org> CommitDate: Tue Oct 4 15:32:29 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=844ff714 dev-util/android-studio: Unbundled some stuff, fixed bug 1. Unbundled jdk posing as a jre, replaced with symlink to system vm/jdk 2. Unbundled a few jars for system installed, more can be done, as usually several deps in gentoo are outdated so need to be updated 3. Unbundling jre/jdk fixes bug #594584, otherwise that directory needs to be added to the list of fperms. Using system should be a better approach, and will be updated with security updates, etc. 4. chmod gradle/gradle-*/bin/gradle because fperms does not work with globs. Package-Manager: portage-2.3.1 Signed-off-by: Jason Zaman gentoo.org> ... android-studio-2.2.0.12.145.3276617-r1.ebuild} | 39 ++++++++++++++++++++-- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/dev-util/android-studio/android-studio-2.2.0.12.145.3276617.ebuild b/dev-util/android-studio/android-studio-2.2.0.12.145.3276617-r1.ebuild similarity index 66% rename from dev-util/android-studio/android-studio-2.2.0.12.145.3276617.ebuild rename to dev-util/android-studio/android-studio-2.2.0.12.145.3276617-r1.ebuild index 857b4d3..f2de707 100644 --- a/dev-util/android-studio/android-studio-2.2.0.12.145.3276617.ebuild +++ b/dev-util/android-studio/android-studio-2.2.0.12.145.3276617-r1.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=6 -inherit eutils versionator +inherit eutils java-pkg-2 versionator RESTRICT="strip" QA_PREBUILT="opt/${PN}/bin/libbreakgen*.so opt/${PN}/bin/fsnotifier*" @@ -24,10 +24,16 @@ SLOT="0" IUSE="selinux" KEYWORDS="~amd64 ~x86" -DEPEND="app-arch/zip" +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 @@ -49,12 +55,39 @@ RDEPEND=">=virtual/jdk-1.7 >=x11-libs/libxshmfence-1.1" S=${WORKDIR}/${PN} +java_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 * - fperms 755 "${dir}/bin/studio.sh" "${dir}/bin/fsnotifier" "${dir}/bin/fsnotifier64" + + 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