Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk-bin/
Date: Fri, 14 Jan 2022 11:39:52
Message-Id: 1642160378.15e159c630e112ed3a2e29eacc62e80cdbe5aed0.gyakovlev@gentoo
1 commit: 15e159c630e112ed3a2e29eacc62e80cdbe5aed0
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 14 11:37:34 2022 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 14 11:39:38 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15e159c6
7
8 dev-java/openjdk-bin: remove gentoo-vm warning
9
10 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
11
12 dev-java/openjdk-bin/openjdk-bin-11.0.13_p8-r1.ebuild | 14 +-------------
13 dev-java/openjdk-bin/openjdk-bin-11.0.13_p8.ebuild | 14 +-------------
14 2 files changed, 2 insertions(+), 26 deletions(-)
15
16 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
17 index 95bcdeba00a6..dabdb239f42e 100644
18 --- a/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8-r1.ebuild
19 +++ b/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8-r1.ebuild
20 @@ -1,4 +1,4 @@
21 -# Copyright 1999-2021 Gentoo Authors
22 +# Copyright 1999-2022 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 EAPI=8
26 @@ -121,16 +121,4 @@ src_install() {
27
28 pkg_postinst() {
29 java-vm-2_pkg_postinst
30 -
31 - if use gentoo-vm ; then
32 - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
33 - ewarn "recognised by the system. This will almost certainly break"
34 - ewarn "many java ebuilds as they are not ready for openjdk-11"
35 - else
36 - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
37 - ewarn "will not be recognised by the system. For example, simply calling"
38 - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
39 - ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
40 - ewarn "absolute location under ${EPREFIX}/opt/${P}."
41 - fi
42 }
43
44 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
45 index 1fd28021ae50..12b3337375bf 100644
46 --- a/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8.ebuild
47 +++ b/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8.ebuild
48 @@ -1,4 +1,4 @@
49 -# Copyright 1999-2021 Gentoo Authors
50 +# Copyright 1999-2022 Gentoo Authors
51 # Distributed under the terms of the GNU General Public License v2
52
53 EAPI=6
54 @@ -121,16 +121,4 @@ src_install() {
55
56 pkg_postinst() {
57 java-vm-2_pkg_postinst
58 -
59 - if use gentoo-vm ; then
60 - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
61 - ewarn "recognised by the system. This will almost certainly break"
62 - ewarn "many java ebuilds as they are not ready for openjdk-11"
63 - else
64 - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
65 - ewarn "will not be recognised by the system. For example, simply calling"
66 - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
67 - ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
68 - ewarn "absolute location under ${EPREFIX}/opt/${P}."
69 - fi
70 }