commit: 15e159c630e112ed3a2e29eacc62e80cdbe5aed0
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 14 11:37:34 2022 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Jan 14 11:39:38 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15e159c6
dev-java/openjdk-bin: remove gentoo-vm warning
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
dev-java/openjdk-bin/openjdk-bin-11.0.13_p8-r1.ebuild | 14 +-------------
dev-java/openjdk-bin/openjdk-bin-11.0.13_p8.ebuild | 14 +-------------
2 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8-r1.ebuild
b/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8-r1.ebuild
index 95bcdeba00a6..dabdb239f42e 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8-r1.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -121,16 +121,4 @@ src_install() {
pkg_postinst() {
java-vm-2_pkg_postinst
-
- if use gentoo-vm ; then
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making
this JDK"
- ewarn "recognised by the system. This will almost certainly
break"
- ewarn "many java ebuilds as they are not ready for openjdk-11"
- else
- ewarn "The experimental gentoo-vm USE flag has not been enabled
so this JDK"
- ewarn "will not be recognised by the system. For example,
simply calling"
- ewarn "\"java\" will launch a different JVM. This is necessary
until Gentoo"
- ewarn "fully supports Java 11. This JDK must therefore be
invoked using its"
- ewarn "absolute location under ${EPREFIX}/opt/${P}."
- fi
}
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8.ebuild
b/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8.ebuild
index 1fd28021ae50..12b3337375bf 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -121,16 +121,4 @@ src_install() {
pkg_postinst() {
java-vm-2_pkg_postinst
-
- if use gentoo-vm ; then
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making
this JDK"
- ewarn "recognised by the system. This will almost certainly
break"
- ewarn "many java ebuilds as they are not ready for openjdk-11"
- else
- ewarn "The experimental gentoo-vm USE flag has not been enabled
so this JDK"
- ewarn "will not be recognised by the system. For example,
simply calling"
- ewarn "\"java\" will launch a different JVM. This is necessary
until Gentoo"
- ewarn "fully supports Java 11. This JDK must therefore be
invoked using its"
- ewarn "absolute location under ${EPREFIX}/opt/${P}."
- fi
}
