| 1 |
commit: eabb513a9e31d0c5f12742fd8183527a6a7cc766 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 4 17:17:57 2021 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 4 17:17:57 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=eabb513a |
| 7 |
|
| 8 |
eclass/java-utils-2: sync with gx86 |
| 9 |
|
| 10 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/java-utils-2.eclass | 13 +++++-------- |
| 13 |
1 file changed, 5 insertions(+), 8 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass |
| 16 |
index c4d980c607..cef79405bf 100644 |
| 17 |
--- a/eclass/java-utils-2.eclass |
| 18 |
+++ b/eclass/java-utils-2.eclass |
| 19 |
@@ -1,4 +1,4 @@ |
| 20 |
-# Copyright 2004-2020 Gentoo Authors |
| 21 |
+# Copyright 2004-2021 Gentoo Authors |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
# @ECLASS: java-utils-2.eclass |
| 25 |
@@ -1484,7 +1484,6 @@ java-pkg_ensure-vm-version-sufficient() { |
| 26 |
|
| 27 |
# @FUNCTION: java-pkg_is-vm-version-sufficient |
| 28 |
# @INTERNAL |
| 29 |
-# @DESCRIPTION: |
| 30 |
# @RETURN: zero - VM is sufficient; non-zero - VM is not sufficient |
| 31 |
java-pkg_is-vm-version-sufficient() { |
| 32 |
debug-print-function ${FUNCNAME} $* |
| 33 |
@@ -2194,8 +2193,6 @@ use_doc() { |
| 34 |
java-pkg_init() { |
| 35 |
debug-print-function ${FUNCNAME} $* |
| 36 |
|
| 37 |
- [[ ${CHOST} == *-winnt* ]] && return |
| 38 |
- |
| 39 |
# Don't set up build environment if installing from binary. #206024 #258423 |
| 40 |
[[ "${MERGE_TYPE}" == "binary" ]] && return |
| 41 |
# Also try Portage's nonstandard EMERGE_FROM for old EAPIs, if it doesn't |
| 42 |
@@ -2600,14 +2597,14 @@ java-pkg_needs-vm() { |
| 43 |
|
| 44 |
# @FUNCTION: java-pkg_get-current-vm |
| 45 |
# @INTERNAL |
| 46 |
-# @RETURN - The current VM being used |
| 47 |
+# @RETURN: The current VM being used |
| 48 |
java-pkg_get-current-vm() { |
| 49 |
java-config -f |
| 50 |
} |
| 51 |
|
| 52 |
# @FUNCTION: java-pkg_get-vm-vendor |
| 53 |
# @INTERNAL |
| 54 |
-# @RETURN - The vendor of the current VM |
| 55 |
+# @RETURN: The vendor of the current VM |
| 56 |
java-pkg_get-vm-vendor() { |
| 57 |
debug-print-function ${FUNCNAME} $* |
| 58 |
|
| 59 |
@@ -2618,7 +2615,7 @@ java-pkg_get-vm-vendor() { |
| 60 |
|
| 61 |
# @FUNCTION: java-pkg_get-vm-version |
| 62 |
# @INTERNAL |
| 63 |
-# @RETURN - The version of the current VM |
| 64 |
+# @RETURN: The version of the current VM |
| 65 |
java-pkg_get-vm-version() { |
| 66 |
debug-print-function ${FUNCNAME} $* |
| 67 |
|
| 68 |
@@ -2627,12 +2624,12 @@ java-pkg_get-vm-version() { |
| 69 |
|
| 70 |
# @FUNCTION: java-pkg_build-vm-from-handle |
| 71 |
# @INTERNAL |
| 72 |
+# @RETURN: VM handle of an available JDK |
| 73 |
# @DESCRIPTION: |
| 74 |
# Selects a build vm from a list of vm handles. First checks for the system-vm |
| 75 |
# beeing usable, then steps through the listed handles till a suitable vm is |
| 76 |
# found. |
| 77 |
# |
| 78 |
-# @RETURN - VM handle of an available JDK |
| 79 |
java-pkg_build-vm-from-handle() { |
| 80 |
debug-print-function ${FUNCNAME} "$*" |
Archives