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 20DD7138239 for ; Tue, 29 Jan 2019 14:59:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 19BE1E0C37; Tue, 29 Jan 2019 14:59:06 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 C6EE8E0C34 for ; Tue, 29 Jan 2019 14:59:05 +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 ECBC2335D9C for ; Tue, 29 Jan 2019 14:59:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 655BF523 for ; Tue, 29 Jan 2019 14:59:02 +0000 (UTC) From: "Alice Ferrazzi" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alice Ferrazzi" Message-ID: <1548773925.a3ab71a1e428f4a05eb7ce9c26cebcd3c447bd60.alicef@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/idea-community/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/idea-community/idea-community-2017.2.2.172.3757.52-r1.ebuild dev-util/idea-community/idea-community-2018.3.1.183.4588.61-r1.ebuild X-VCS-Directories: dev-util/idea-community/ X-VCS-Committer: alicef X-VCS-Committer-Name: Alice Ferrazzi X-VCS-Revision: a3ab71a1e428f4a05eb7ce9c26cebcd3c447bd60 X-VCS-Branch: master Date: Tue, 29 Jan 2019 14:59:02 +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: a70e7d3f-a08a-4fda-9805-72bb3dcca226 X-Archives-Hash: 559adf8286bf468bbb942d2d1fd07859 commit: a3ab71a1e428f4a05eb7ce9c26cebcd3c447bd60 Author: Kyle Elbert gmail com> AuthorDate: Sun Jan 27 02:30:09 2019 +0000 Commit: Alice Ferrazzi gentoo org> CommitDate: Tue Jan 29 14:58:45 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3ab71a1 dev-util/idea-community: fix custom-jdk useflag in previous versions Because of the switch to a 64 bit jdk at some point prior to even 2017.2.2 (the oldest version in the tree), the directory naming changed and so even without the custom-jdk useflag the jdk was being installed, and with the custom-jdk useflag the jdk's binaries were not correctly being marked executable Package-Manager: Portage-2.3.58, Repoman-2.3.12 Signed-off-by: Kyle Elbert gmail.com> Signed-off-by: Alice Ferrazzi gentoo.org> .../idea-community/idea-community-2017.2.2.172.3757.52-r1.ebuild | 8 ++++---- .../idea-community/idea-community-2018.3.1.183.4588.61-r1.ebuild | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dev-util/idea-community/idea-community-2017.2.2.172.3757.52-r1.ebuild b/dev-util/idea-community/idea-community-2017.2.2.172.3757.52-r1.ebuild index c3da3d3edc2..bfb9c749e70 100644 --- a/dev-util/idea-community/idea-community-2017.2.2.172.3757.52-r1.ebuild +++ b/dev-util/idea-community/idea-community-2017.2.2.172.3757.52-r1.ebuild @@ -41,8 +41,8 @@ src_prepare() { rm bin/fsnotifier-arm || die fi if ! use custom-jdk; then - if [[ -d jre ]]; then - rm -r jre || die + if [[ -d jre64 ]]; then + rm -r jre64 || die fi fi } @@ -55,8 +55,8 @@ src_install() { fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}} if use custom-jdk; then - if [[ -d jre ]]; then - fperms 755 "${dir}"/jre/jre/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200} + if [[ -d jre64 ]]; then + fperms 755 "${dir}"/jre64/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200} fi fi diff --git a/dev-util/idea-community/idea-community-2018.3.1.183.4588.61-r1.ebuild b/dev-util/idea-community/idea-community-2018.3.1.183.4588.61-r1.ebuild index c3da3d3edc2..bfb9c749e70 100644 --- a/dev-util/idea-community/idea-community-2018.3.1.183.4588.61-r1.ebuild +++ b/dev-util/idea-community/idea-community-2018.3.1.183.4588.61-r1.ebuild @@ -41,8 +41,8 @@ src_prepare() { rm bin/fsnotifier-arm || die fi if ! use custom-jdk; then - if [[ -d jre ]]; then - rm -r jre || die + if [[ -d jre64 ]]; then + rm -r jre64 || die fi fi } @@ -55,8 +55,8 @@ src_install() { fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}} if use custom-jdk; then - if [[ -d jre ]]; then - fperms 755 "${dir}"/jre/jre/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200} + if [[ -d jre64 ]]; then + fperms 755 "${dir}"/jre64/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200} fi fi