| 1 |
commit: a3ab71a1e428f4a05eb7ce9c26cebcd3c447bd60 |
| 2 |
Author: Kyle Elbert <kcelbert <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Jan 27 02:30:09 2019 +0000 |
| 4 |
Commit: Alice Ferrazzi <alicef <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 29 14:58:45 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3ab71a1 |
| 7 |
|
| 8 |
dev-util/idea-community: fix custom-jdk useflag in previous versions |
| 9 |
|
| 10 |
Because of the switch to a 64 bit jdk at some point prior to even 2017.2.2 (the |
| 11 |
oldest version in the tree), the directory naming changed and so even without |
| 12 |
the custom-jdk useflag the jdk was being installed, and with the custom-jdk |
| 13 |
useflag the jdk's binaries were not correctly being marked executable |
| 14 |
|
| 15 |
Package-Manager: Portage-2.3.58, Repoman-2.3.12 |
| 16 |
Signed-off-by: Kyle Elbert <kcelbert <AT> gmail.com> |
| 17 |
Signed-off-by: Alice Ferrazzi <alicef <AT> gentoo.org> |
| 18 |
|
| 19 |
.../idea-community/idea-community-2017.2.2.172.3757.52-r1.ebuild | 8 ++++---- |
| 20 |
.../idea-community/idea-community-2018.3.1.183.4588.61-r1.ebuild | 8 ++++---- |
| 21 |
2 files changed, 8 insertions(+), 8 deletions(-) |
| 22 |
|
| 23 |
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 |
| 24 |
index c3da3d3edc2..bfb9c749e70 100644 |
| 25 |
--- a/dev-util/idea-community/idea-community-2017.2.2.172.3757.52-r1.ebuild |
| 26 |
+++ b/dev-util/idea-community/idea-community-2017.2.2.172.3757.52-r1.ebuild |
| 27 |
@@ -41,8 +41,8 @@ src_prepare() { |
| 28 |
rm bin/fsnotifier-arm || die |
| 29 |
fi |
| 30 |
if ! use custom-jdk; then |
| 31 |
- if [[ -d jre ]]; then |
| 32 |
- rm -r jre || die |
| 33 |
+ if [[ -d jre64 ]]; then |
| 34 |
+ rm -r jre64 || die |
| 35 |
fi |
| 36 |
fi |
| 37 |
} |
| 38 |
@@ -55,8 +55,8 @@ src_install() { |
| 39 |
fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}} |
| 40 |
|
| 41 |
if use custom-jdk; then |
| 42 |
- if [[ -d jre ]]; then |
| 43 |
- fperms 755 "${dir}"/jre/jre/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200} |
| 44 |
+ if [[ -d jre64 ]]; then |
| 45 |
+ fperms 755 "${dir}"/jre64/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200} |
| 46 |
fi |
| 47 |
fi |
| 48 |
|
| 49 |
|
| 50 |
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 |
| 51 |
index c3da3d3edc2..bfb9c749e70 100644 |
| 52 |
--- a/dev-util/idea-community/idea-community-2018.3.1.183.4588.61-r1.ebuild |
| 53 |
+++ b/dev-util/idea-community/idea-community-2018.3.1.183.4588.61-r1.ebuild |
| 54 |
@@ -41,8 +41,8 @@ src_prepare() { |
| 55 |
rm bin/fsnotifier-arm || die |
| 56 |
fi |
| 57 |
if ! use custom-jdk; then |
| 58 |
- if [[ -d jre ]]; then |
| 59 |
- rm -r jre || die |
| 60 |
+ if [[ -d jre64 ]]; then |
| 61 |
+ rm -r jre64 || die |
| 62 |
fi |
| 63 |
fi |
| 64 |
} |
| 65 |
@@ -55,8 +55,8 @@ src_install() { |
| 66 |
fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}} |
| 67 |
|
| 68 |
if use custom-jdk; then |
| 69 |
- if [[ -d jre ]]; then |
| 70 |
- fperms 755 "${dir}"/jre/jre/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200} |
| 71 |
+ if [[ -d jre64 ]]; then |
| 72 |
+ fperms 755 "${dir}"/jre64/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200} |
| 73 |
fi |
| 74 |
fi |
Archives