profiles: oracle-java cleanup

Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>

21 files changed, 2 insertions, 128 deletions

diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 6e4e7e3cd1a9..69cf88d03b51 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -226,11 +226,6 @@ sys-boot/grub:2 -grub_platforms_xen-32
 # sys-boot/gnu-efi is not supported on all archs.
 sys-apps/systemd -gnuefi
 
-# James Le Cuirot <chewi@gentoo.org> (2015-07-28)
-# JavaFX and the browser plugin are included on x64 Linux.
-dev-java/oracle-jdk-bin -javafx -nsplugin
-dev-java/oracle-jre-bin -javafx -nsplugin
-
 # Ben de Groot <yngwin@gentoo.org> (2015-03-15)
 # media-libs/libbdplus is keyworded on amd64, so unmask the useflag
 media-libs/libbluray -bdplus
diff --git a/profiles/arch/arm/armv6j/package.mask b/profiles/arch/arm/armv6j/package.mask
index e6d4425270f3..46cb68385f1a 100644
--- a/profiles/arch/arm/armv6j/package.mask
+++ b/profiles/arch/arm/armv6j/package.mask
@@ -8,8 +8,3 @@
 -media-video/rav1e
 -net-news/newsboat
 -net-libs/quiche
-
-# James Le Cuirot <chewi@gentoo.org> (2016-01-09)
-# This is built for armv6 so unmask against the wider arm mask.
--dev-java/oracle-jdk-bin
--dev-java/oracle-jre-bin
diff --git a/profiles/arch/arm/armv7a/package.mask b/profiles/arch/arm/armv7a/package.mask
index 21e261c5adf4..3e820a0a2fc8 100644
--- a/profiles/arch/arm/armv7a/package.mask
+++ b/profiles/arch/arm/armv7a/package.mask
@@ -13,11 +13,6 @@
 # Valgrind works on ARMv7
 -dev-util/valgrind
 
-# James Le Cuirot <chewi@gentoo.org> (2016-01-09)
-# This is built for armv6 so unmask against the wider arm mask.
--dev-java/oracle-jdk-bin
--dev-java/oracle-jre-bin
-
 # James Le Cuirot <chewi@gentoo.org> (2015-05-24)
 # This is built for armv7a so unmask against the wider arm mask.
 -dev-java/icedtea-bin
diff --git a/profiles/arch/arm/package.mask b/profiles/arch/arm/package.mask
index 1857d1bddeb4..4348dc0b782f 100644
--- a/profiles/arch/arm/package.mask
+++ b/profiles/arch/arm/package.mask
@@ -15,11 +15,6 @@ net-libs/quiche
 # https://valgrind.org/info/platforms.html
 dev-util/valgrind
 
-# James Le Cuirot <chewi@gentoo.org> (2016-01-09)
-# This is built for armv6 and will not work on earlier generations.
-dev-java/oracle-jdk-bin
-dev-java/oracle-jre-bin
-
 # James Le Cuirot <chewi@gentoo.org> (2015-05-24)
 # This is built for armv7a and will not work on earlier generations.
 dev-java/icedtea-bin
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 9772a35c0e09..d804d1a26a7a 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -184,10 +184,6 @@ net-misc/bfgminer adl lm-sensors
 # no point in pursuing it right now.
 app-shells/bash-completion test
 
-# James Le Cuirot <chewi@gentoo.org> (2017-04-25)
-# Oracle doesn't include VisualVM on this platform.
-dev-java/oracle-jdk-bin visualvm
-
 # Patrice Clement <monsieurp@gentoo.org> (2017-04-09)
 # Enable MQTT support on supported architectures
 app-metrics/collectd -collectd_plugins_mqtt
diff --git a/profiles/arch/arm64/package.use.force b/profiles/arch/arm64/package.use.force
index 503325f879dd..97e4c149897b 100644
--- a/profiles/arch/arm64/package.use.force
+++ b/profiles/arch/arm64/package.use.force
@@ -22,8 +22,3 @@ dev-lang/rust llvm_targets_AArch64
 dev-ml/llvm-ocaml llvm_targets_AArch64
 sys-devel/clang llvm_targets_AArch64
 sys-devel/llvm llvm_targets_AArch64
-
-# James Le Cuirot <chewi@gentoo.org> (2016-05-16)
-# For reasons best known to themselves, Oracle do not ship the
-# libawt_xawt.so library on arm64 even though they do on arm32.
-dev-java/oracle-jdk-bin headless-awt
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index f3ef3b29d96b..a0f74262bbfc 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -338,10 +338,6 @@ app-crypt/heimdal afs
 # Only available on some architectures.
 dev-java/icedtea -shenandoah
 
-# James Le Cuirot <chewi@gentoo.org> (2017-04-25)
-# Oracle doesn't include VisualVM on this platform.
-dev-java/oracle-jdk-bin visualvm
-
 # Markus Meier <maekke@gentoo.org> (2017-03-24)
 # unkeyworded deps, bug #552330
 app-portage/g-sorcery bson
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index e95a85a5d18a..062585692124 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -198,11 +198,6 @@ media-video/ffmpeg mmal
 # sys-boot/gnu-efi is not supported on all archs.
 sys-apps/systemd gnuefi
 
-# James Le Cuirot <chewi@gentoo.org> (2015-07-29)
-# JavaFX and the browser plugin are not included on some platforms.
-dev-java/oracle-jdk-bin javafx nsplugin
-dev-java/oracle-jre-bin javafx nsplugin
-
 # Ben de Groot <yngwin@gentoo.org> (2015-03-15)
 # Mask bdplus support and unmask on arches where libbdplus is keyworded.
 media-libs/libbluray bdplus
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 9c4f8313a32b..131d36706d4d 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -245,11 +245,6 @@ app-emulation/ganeti xen
 # sys-boot/gnu-efi is not supported on all archs.
 sys-apps/systemd -gnuefi
 
-# James Le Cuirot <chewi@gentoo.org> (2015-07-28)
-# JavaFX and the browser plugin are included on x86 Linux.
-dev-java/oracle-jdk-bin -javafx -nsplugin
-dev-java/oracle-jre-bin -javafx -nsplugin
-
 # Ben de Groot <yngwin@gentoo.org> (2015-03-15)
 # media-libs/libbdplus is keyworded on x86, so unmask the useflag
 media-libs/libbluray -bdplus
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 8a7979b19c78..c0a96774cbd9 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -415,7 +415,6 @@ media-video/ffmpeg appkit
 # packages. Those who wish to experiment with it as a fully recognised
 # Gentoo JVM can unmask the flag.
 dev-java/openjdk-jre-bin:11 gentoo-vm
-dev-java/oracle-jdk-bin:11 gentoo-vm
 dev-java/openjdk-bin:11 gentoo-vm
 dev-java/openjdk:11 gentoo-vm
 
diff --git a/profiles/package.deprecated b/profiles/package.deprecated
index 5ff6cf153d82..353af57fa3bf 100644
--- a/profiles/package.deprecated
+++ b/profiles/package.deprecated
@@ -80,14 +80,6 @@ virtual/libffi
 virtual/pypy
 virtual/pypy3
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2019-12-21)
-# Unmaintained, vulnerable oracle java ebuilds, even fetching distfiles
-# requires agreement to restrictive license
-# Most things that still depend on oracle variants require javafx
-# https://bugs.gentoo.org/681828
-dev-java/oracle-jdk-bin
-dev-java/oracle-jre-bin
-
 # Michał Górny <mgorny@gentoo.org> (2019-12-09)
 # Test coverage reporting is not useful for Gentoo ebuilds.  The deps
 # against coverage plugins are either entirely spurious, or the build
diff --git a/profiles/package.mask b/profiles/package.mask
index efdcf911c246..324e817aae9f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -884,19 +884,6 @@ app-office/texmacs
 # Requires >=dev-lang/lua-5.2 which is masked
 >=app-admin/conky-1.11.4
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2019-04-17)
-# The Oracle JDK License has changed for releases starting 2019-04-16
-# While it may be fine to use for some usecases it's not comepletely clear
-# what is considered "personal use" and if we can legally distribute it.
-# License states:
-# "You may not:
-# make the Programs available in any manner to any third party"
-# masking all future versions, removal will follow soon.
-# Alternatives: icedtea, icedtea-bin, openjdk, openjdk-bin, openjdk-jre-bin
-# Bug: https://bugs.gentoo.org/681828
->dev-java/oracle-jdk-bin-1.8.0.202:1.8
->dev-java/oracle-jre-bin-1.8.0.202:1.8
-
 # Robin H. Johnson <robbat2@gentoo.org> (2019-03-25)
 # Requires >=dev-lang/lua-5.3 which is masked
 sys-apps/likwid
@@ -963,9 +950,9 @@ dev-java/eclipse-ecj:4.10
 ~net-libs/rpcsvc-proto-0
 
 # James Le Cuirot <chewi@gentoo.org> (2017-12-17)
-# Java 9+ is not yet fully supported on Gentoo. Packages cannot depend
+# Java 11 is not yet fully supported on Gentoo. Packages cannot depend
 # on it so these virtuals are not yet required. If you wish to use
-# Java 9+ then install oracle-(jdk|jre)-bin or openjdk(-bin) directly.
+# Java 11 then install openjdk-(jdk|jre)-bin directly.
 virtual/jdk:11
 virtual/jre:11
 
diff --git a/profiles/prefix/darwin/macos/10.10/package.unmask b/profiles/prefix/darwin/macos/10.10/package.unmask
deleted file mode 100644
index 95faafa5dd8a..000000000000
--- a/profiles/prefix/darwin/macos/10.10/package.unmask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# James Le Cuirot <chewi@gentoo.org> (2015-07-29)
-# Recent releases are supported in 10.10.
-dev-java/oracle-jdk-bin
-dev-java/oracle-jre-bin
diff --git a/profiles/prefix/darwin/macos/10.11/package.unmask b/profiles/prefix/darwin/macos/10.11/package.unmask
deleted file mode 100644
index 003ec524a20b..000000000000
--- a/profiles/prefix/darwin/macos/10.11/package.unmask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# James Le Cuirot <chewi@gentoo.org> (2015-07-29)
-# Recent releases are supported in >10.10.
-dev-java/oracle-jdk-bin
-dev-java/oracle-jre-bin
diff --git a/profiles/prefix/darwin/macos/10.12/package.unmask b/profiles/prefix/darwin/macos/10.12/package.unmask
deleted file mode 100644
index 6f1df312f197..000000000000
--- a/profiles/prefix/darwin/macos/10.12/package.unmask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# James Le Cuirot <chewi@gentoo.org> (2015-07-29)
-# Recent releases are supported in >10.10.
-dev-java/oracle-jdk-bin
-dev-java/oracle-jre-bin
diff --git a/profiles/prefix/darwin/macos/10.13/package.unmask b/profiles/prefix/darwin/macos/10.13/package.unmask
deleted file mode 100644
index 6f1df312f197..000000000000
--- a/profiles/prefix/darwin/macos/10.13/package.unmask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# James Le Cuirot <chewi@gentoo.org> (2015-07-29)
-# Recent releases are supported in >10.10.
-dev-java/oracle-jdk-bin
-dev-java/oracle-jre-bin
diff --git a/profiles/prefix/darwin/macos/10.14/package.unmask b/profiles/prefix/darwin/macos/10.14/package.unmask
deleted file mode 100644
index 6f1df312f197..000000000000
--- a/profiles/prefix/darwin/macos/10.14/package.unmask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# James Le Cuirot <chewi@gentoo.org> (2015-07-29)
-# Recent releases are supported in >10.10.
-dev-java/oracle-jdk-bin
-dev-java/oracle-jre-bin
diff --git a/profiles/prefix/darwin/macos/10.8/package.unmask b/profiles/prefix/darwin/macos/10.8/package.unmask
deleted file mode 100644
index eb289573a058..000000000000
--- a/profiles/prefix/darwin/macos/10.8/package.unmask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# James Le Cuirot <chewi@gentoo.org> (2015-07-29)
-# Recent releases are supported in 10.8.
-dev-java/oracle-jdk-bin
-dev-java/oracle-jre-bin
diff --git a/profiles/prefix/darwin/macos/10.9/package.unmask b/profiles/prefix/darwin/macos/10.9/package.unmask
deleted file mode 100644
index d6315beb6e8a..000000000000
--- a/profiles/prefix/darwin/macos/10.9/package.unmask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# James Le Cuirot <chewi@gentoo.org> (2015-07-29)
-# Recent releases are supported in 10.9.
-dev-java/oracle-jdk-bin
-dev-java/oracle-jre-bin
diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask
index da6fc41ad25e..13dff7f7a416 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -20,9 +20,3 @@ sys-libs/darwin-libc-headers:10.14
 # -lSystem as looked for by clang/llvm.  If your system got this
 # package, you have to emerge -C cmake and re-emerge it.
 >=dev-util/cmake-3.14
-
-# James Le Cuirot <chewi@gentoo.org> (2015-07-29)
-# Recent Oracle releases only support recent Mac OS releases. We can't
-# keep old versions due to vulnerabilities.
-dev-java/oracle-jdk-bin
-dev-java/oracle-jre-bin
diff --git a/profiles/prefix/darwin/macos/package.use.mask b/profiles/prefix/darwin/macos/package.use.mask
index 9060605d4173..71cd464991f3 100644
--- a/profiles/prefix/darwin/macos/package.use.mask
+++ b/profiles/prefix/darwin/macos/package.use.mask
@@ -13,12 +13,6 @@ sys-libs/ncurses-compat tinfo
 # hence it is masked in base profile. Bug #637482
 media-video/ffmpeg -appkit
 
-# James Le Cuirot <chewi@gentoo.org> (2015-07-29)
-# JavaFX is included on Mac OS. I think a browser plugin is too but as
-# libjvm rather than libnpjp2 like on Linux so keep nsplugin masked.
-dev-java/oracle-jdk-bin -javafx
-dev-java/oracle-jre-bin -javafx
-
 # Fabian Groffen <grobian@gentoo.org> (2009-10-30)
 # X and linux only
 media-video/mplayer xv dga X xinerama xscreensaver