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