From: Kyle Elbert <kcelbert@gmail.com>
Date: Sun, 27 Jan 2019 02:30:09 +0000 (-0600)
Subject: dev-util/idea-community: fix custom-jdk useflag in previous versions
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a3ab71a1e428f4a05eb7ce9c26cebcd3c447bd60;p=gentoo.git

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 <kcelbert@gmail.com>
Signed-off-by: Alice Ferrazzi <alicef@gentoo.org>
---

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 c3da3d3edc20..bfb9c749e703 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 c3da3d3edc20..bfb9c749e703 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