1 |
From: "Volkmar W. Pogatzki" <gentoo@××××××××.net> |
2 |
|
3 |
Bug: https://bugs.gentoo.org/786093 |
4 |
|
5 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
6 |
Signed-off-by: Volkmar W. Pogatzki <gentoo@××××××××.net> |
7 |
Closes: https://github.com/gentoo/gentoo/pull/21218 |
8 |
Signed-off-by: Florian Schmaus <flow@g.o> |
9 |
--- |
10 |
eclass/java-utils-2.eclass | 45 +++++++------------------------------- |
11 |
1 file changed, 8 insertions(+), 37 deletions(-) |
12 |
|
13 |
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass |
14 |
index 6303895885df..5b4783f350f2 100644 |
15 |
--- a/eclass/java-utils-2.eclass |
16 |
+++ b/eclass/java-utils-2.eclass |
17 |
@@ -43,21 +43,6 @@ has test ${JAVA_PKG_IUSE} && RESTRICT+=" !test? ( test )" |
18 |
JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.2.0-r3" |
19 |
has source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source? ( app-arch/zip )" |
20 |
|
21 |
-# @ECLASS_VARIABLE: JAVA_PKG_WANT_BOOTCLASSPATH |
22 |
-# @DEFAULT_UNSET |
23 |
-# @DESCRIPTION: |
24 |
-# The version of bootclasspath the package needs to work. Translates to a proper |
25 |
-# dependency. The bootclasspath can then be obtained by java-ant_rewrite-bootclasspath |
26 |
-if [[ -n "${JAVA_PKG_WANT_BOOTCLASSPATH}" ]]; then |
27 |
- if [[ "${JAVA_PKG_WANT_BOOTCLASSPATH}" == "1.5" ]]; then |
28 |
- JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} >=dev-java/gnu-classpath-0.98-r1:0.98" |
29 |
- else |
30 |
- eerror "Unknown value of JAVA_PKG_WANT_BOOTCLASSPATH" |
31 |
- # since die in global scope doesn't work, this will make repoman fail |
32 |
- JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} BAD_JAVA_PKG_WANT_BOOTCLASSPATH" |
33 |
- fi |
34 |
-fi |
35 |
- |
36 |
# @ECLASS_VARIABLE: JAVA_PKG_ALLOW_VM_CHANGE |
37 |
# @DESCRIPTION: |
38 |
# Allow this eclass to change the active VM? |
39 |
@@ -76,9 +61,9 @@ JAVA_PKG_ALLOW_VM_CHANGE=${JAVA_PKG_ALLOW_VM_CHANGE:="yes"} |
40 |
# |
41 |
# Should only be used for testing and debugging. |
42 |
# |
43 |
-# Example: use sun-jdk-1.5 to emerge foo: |
44 |
+# Example: use openjdk-11 to emerge foo: |
45 |
# @CODE |
46 |
-# JAVA_PKG_FORCE_VM=sun-jdk-1.5 emerge foo |
47 |
+# JAVA_PKG_FORCE_VM=openjdk-11 emerge foo |
48 |
# @CODE |
49 |
|
50 |
# @ECLASS_VARIABLE: JAVA_PKG_WANT_BUILD_VM |
51 |
@@ -103,9 +88,9 @@ JAVA_PKG_ALLOW_VM_CHANGE=${JAVA_PKG_ALLOW_VM_CHANGE:="yes"} |
52 |
# |
53 |
# Should generally only be used for testing and debugging. |
54 |
# |
55 |
-# Use 1.4 source to emerge baz |
56 |
+# Use 1.8 source to emerge baz |
57 |
# @CODE |
58 |
-# JAVA_PKG_WANT_SOURCE=1.4 emerge baz |
59 |
+# JAVA_PKG_WANT_SOURCE=1.8 emerge baz |
60 |
# @CODE |
61 |
|
62 |
# @ECLASS_VARIABLE: JAVA_PKG_WANT_TARGET |
63 |
@@ -118,9 +103,9 @@ JAVA_PKG_ALLOW_VM_CHANGE=${JAVA_PKG_ALLOW_VM_CHANGE:="yes"} |
64 |
# |
65 |
# Should generally only be used for testing and debugging. |
66 |
# |
67 |
-# emerge bar to be compatible with 1.3 |
68 |
+# emerge bar to be compatible with 1.8 |
69 |
# @CODE |
70 |
-# JAVA_PKG_WANT_TARGET=1.3 emerge bar |
71 |
+# JAVA_PKG_WANT_TARGET=1.8 emerge bar |
72 |
# @CODE |
73 |
|
74 |
# @ECLASS_VARIABLE: JAVA_TEST_EXTRA_ARGS |
75 |
@@ -1387,7 +1372,7 @@ java-pkg_register-environment-variable() { |
76 |
# @DESCRIPTION: |
77 |
# Returns classpath of a given bootclasspath-providing package version. |
78 |
# |
79 |
-# @param $1 - the version of bootclasspath (e.g. 1.5), 'auto' for bootclasspath |
80 |
+# @param $1 - the version of bootclasspath (e.g. 1.8), 'auto' for bootclasspath |
81 |
# of the current JDK |
82 |
java-pkg_get-bootclasspath() { |
83 |
local version="${1}" |
84 |
@@ -1397,9 +1382,6 @@ java-pkg_get-bootclasspath() { |
85 |
auto) |
86 |
bcp="$(java-config -g BOOTCLASSPATH)" |
87 |
;; |
88 |
- 1.5) |
89 |
- bcp="$(java-pkg_getjars --build-only gnu-classpath-0.98)" |
90 |
- ;; |
91 |
*) |
92 |
eerror "unknown parameter of java-pkg_get-bootclasspath" |
93 |
die "unknown parameter of java-pkg_get-bootclasspath" |
94 |
@@ -2580,20 +2562,9 @@ java-pkg_setup-vm() { |
95 |
debug-print-function ${FUNCNAME} $* |
96 |
|
97 |
local vendor="$(java-pkg_get-vm-vendor)" |
98 |
- if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then |
99 |
- addpredict "/dev/random" |
100 |
- elif [[ "${vendor}" == "ibm" ]]; then |
101 |
- addpredict "/proc/self/maps" |
102 |
- addpredict "/proc/cpuinfo" |
103 |
- addpredict "/proc/self/coredump_filter" |
104 |
- elif [[ "${vendor}" == "oracle" ]]; then |
105 |
+ if [[ "${vendor}" == icedtea* ]] && java-pkg_is-vm-version-ge "1.8" ; then |
106 |
addpredict "/dev/random" |
107 |
addpredict "/proc/self/coredump_filter" |
108 |
- elif [[ "${vendor}" == icedtea* ]] && java-pkg_is-vm-version-ge "1.7" ; then |
109 |
- addpredict "/dev/random" |
110 |
- addpredict "/proc/self/coredump_filter" |
111 |
- elif [[ "${vendor}" == "jrockit" ]]; then |
112 |
- addpredict "/proc/cpuinfo" |
113 |
fi |
114 |
} |
115 |
|
116 |
-- |
117 |
2.35.1 |