| 1 |
commit: ae56fb886389e50167ba9c5a6804a7a0721014b4 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 2 21:50:24 2022 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 2 23:14:28 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae56fb88 |
| 7 |
|
| 8 |
dev-java/openjdk: update 17.0.2_p8 EAPI 6 -> 7 |
| 9 |
|
| 10 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-java/openjdk/openjdk-17.0.2_p8.ebuild | 16 ++++++++-------- |
| 13 |
1 file changed, 8 insertions(+), 8 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild |
| 16 |
index e4b23887e890..8f6a2ebb74a4 100644 |
| 17 |
--- a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild |
| 18 |
+++ b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild |
| 19 |
@@ -1,9 +1,9 @@ |
| 20 |
# Copyright 1999-2022 Gentoo Authors |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
|
| 23 |
-EAPI=6 |
| 24 |
+EAPI=7 |
| 25 |
|
| 26 |
-inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs |
| 27 |
+inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs |
| 28 |
|
| 29 |
# variable name format: <UPPERCASE_KEYWORD>_XPAK |
| 30 |
ARM64_XPAK="17.0.2_p8" # musl bootstrap install |
| 31 |
@@ -31,7 +31,7 @@ SLOT="$(ver_cut 1)" |
| 32 |
DESCRIPTION="Open source implementation of the Java programming language" |
| 33 |
HOMEPAGE="https://openjdk.java.net" |
| 34 |
SRC_URI=" |
| 35 |
- https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz |
| 36 |
+ https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz |
| 37 |
-> ${P}.tar.gz |
| 38 |
!system-bootstrap? ( |
| 39 |
$(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl) |
| 40 |
@@ -148,14 +148,14 @@ pkg_setup() { |
| 41 |
fi |
| 42 |
done |
| 43 |
|
| 44 |
- if has_version --host-root dev-java/openjdk:${SLOT}; then |
| 45 |
+ if has_version dev-java/openjdk:${SLOT}; then |
| 46 |
export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} |
| 47 |
elif use !system-bootstrap ; then |
| 48 |
local xpakvar="${ARCH^^}_XPAK" |
| 49 |
export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" |
| 50 |
else |
| 51 |
if [[ ${MERGE_TYPE} != "binary" ]]; then |
| 52 |
- JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT}) |
| 53 |
+ JDK_HOME=$(best_version dev-java/openjdk-bin:${SLOT}) |
| 54 |
[[ -n ${JDK_HOME} ]] || die "Build VM not found!" |
| 55 |
JDK_HOME=${JDK_HOME#*/} |
| 56 |
JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} |
| 57 |
@@ -214,7 +214,7 @@ src_configure() { |
| 58 |
) |
| 59 |
|
| 60 |
if use javafx; then |
| 61 |
- local zip="${EPREFIX%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" |
| 62 |
+ local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" |
| 63 |
if [[ -r ${zip} ]]; then |
| 64 |
myconf+=( --with-import-modules="${zip}" ) |
| 65 |
else |
| 66 |
@@ -249,7 +249,7 @@ src_compile() { |
| 67 |
|
| 68 |
src_install() { |
| 69 |
local dest="/usr/$(get_libdir)/${PN}-${SLOT}" |
| 70 |
- local ddest="${ED}${dest#/}" |
| 71 |
+ local ddest="${ED}/${dest#/}" |
| 72 |
|
| 73 |
cd "${S}"/build/*-release/images/jdk || die |
| 74 |
|
| 75 |
@@ -277,7 +277,7 @@ src_install() { |
| 76 |
dodir "${dest}" |
| 77 |
cp -pPR * "${ddest}" || die |
| 78 |
|
| 79 |
- dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts |
| 80 |
+ dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts |
| 81 |
|
| 82 |
# must be done before running itself |
| 83 |
java-vm_set-pax-markings "${ddest}" |
Archives