1 |
commit: d1ff6d69a33d8c12ce9edaece3be362e983fa66d |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 22 21:17:11 2022 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 22 21:17:55 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1ff6d69 |
7 |
|
8 |
dev-java/openjdk-bin: fix installation directory |
9 |
|
10 |
Bug: https://bugs.gentoo.org/831780 |
11 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
12 |
|
13 |
...penjdk-bin-11.0.14_p9.ebuild => openjdk-bin-11.0.14_p9-r1.ebuild} | 5 ++++- |
14 |
1 file changed, 4 insertions(+), 1 deletion(-) |
15 |
|
16 |
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild |
17 |
similarity index 97% |
18 |
rename from dev-java/openjdk-bin/openjdk-bin-11.0.14_p9.ebuild |
19 |
rename to dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild |
20 |
index 019ca529d3b6..8a314444f21d 100644 |
21 |
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9.ebuild |
22 |
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild |
23 |
@@ -71,7 +71,7 @@ src_unpack() { |
24 |
} |
25 |
|
26 |
src_install() { |
27 |
- local dest="/opt/${PN}-${SLOT}" |
28 |
+ local dest="/opt/${P}" |
29 |
local ddest="${ED}/${dest#/}" |
30 |
|
31 |
# on macOS if they would exist they would be called .dylib, but most |
32 |
@@ -107,6 +107,9 @@ src_install() { |
33 |
dodir "${dest}" |
34 |
cp -pPR * "${ddest}" || die |
35 |
|
36 |
+ # provide stable symlink |
37 |
+ dosym "${P}" "/opt/${PN}-${SLOT}" |
38 |
+ |
39 |
java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
40 |
java-vm_set-pax-markings "${ddest}" |
41 |
java-vm_revdep-mask |