6 files changed, 17 insertions, 14 deletions
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.3.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.3.ebuild
index fdc8bf9b8adf..92005d2ae03b 100644
--- a/dev-java/javatoolkit/javatoolkit-0.6.3.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 python_prepare_all() {
 	hprefixify src/py/buildparser src/py/findclass setup.py
diff --git a/dev-java/jbitcollider-core/jbitcollider-core-0.8.ebuild b/dev-java/jbitcollider-core/jbitcollider-core-0.8.ebuild
index 375a67d1da15..d31beb8157bc 100644
--- a/dev-java/jbitcollider-core/jbitcollider-core-0.8.ebuild
+++ b/dev-java/jbitcollider-core/jbitcollider-core-0.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 JAVA_PKG_IUSE="doc source"
 
 MY_PN="jBitcollider"
@@ -17,14 +17,16 @@ SRC_URI="mirror://sourceforge/bitcollider/${MY_P}.zip"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
+BDEPEND="app-arch/unzip"
 DEPEND=">=virtual/jdk-1.5"
 RDEPEND=">=virtual/jre-1.5"
 
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	default
+
 	rm -v lib/*.jar || die
 	rm -v plugins/*/lib/*.jar || die
 	rm -v plugins/org.bitpedia.collider.*/bin/org/bitpedia/collider/*/*.class || die
diff --git a/dev-java/openjdk/openjdk-8.272_p10.ebuild b/dev-java/openjdk/openjdk-8.272_p10.ebuild
index 82f0a4f2070b..fadb48667424 100644
--- a/dev-java/openjdk/openjdk-8.272_p10.ebuild
+++ b/dev-java/openjdk/openjdk-8.272_p10.ebuild
@@ -43,7 +43,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
 IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap +pch selinux source"
 
 COMMON_DEPEND="
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild
index 4f855652925b..3f72ad589e46 100644
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://java.net/projects/javamail/downloads/download/source/javamail-$
 # either of these
 LICENSE="CDDL GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild b/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
index ccd56c490105..3e646068dfa8 100644
--- a/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
+++ b/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 JAVA_PKG_IUSE="doc examples"
 
@@ -15,8 +15,8 @@ SRC_URI="${MY_P}-ri.zip"
 LICENSE="Oracle-BCLA-JavaSE"
 SLOT="0"
 KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
 
+BDEPEND="app-arch/unzip"
 DEPEND=">=virtual/jdk-1.4
 	app-arch/unzip"
 RDEPEND=">=virtual/jre-1.4"
@@ -42,9 +42,11 @@ pkg_nofetch() {
 
 src_install() {
 	java-pkg_dojar lib/*.jar
+
 	if use doc; then
 		java-pkg_dojavadoc doc/api
 		java-pkg_dohtml -r doc/doc doc/index.html
 	fi
+
 	use examples && java-pkg_doexamples examples
 }
diff --git a/dev-java/tagsoup/tagsoup-1.2.1.ebuild b/dev-java/tagsoup/tagsoup-1.2.1.ebuild
index d2be28fb5374..d0dd9cc40892 100644
--- a/dev-java/tagsoup/tagsoup-1.2.1.ebuild
+++ b/dev-java/tagsoup/tagsoup-1.2.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 
@@ -14,14 +14,13 @@ SRC_URI="http://mercury.ccil.org/~cowan/XML/tagsoup/${P}-src.zip"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
 
+BDEPEND="app-arch/unzip"
 RDEPEND="
 	>=virtual/jre-1.4"
 DEPEND="
-	>=virtual/jdk-1.4
 	dev-java/saxon:9
-	app-arch/unzip"
+	>=virtual/jdk-1.4"
 
 EANT_BUILD_TARGET="dist"
 EANT_DOC_TARGET="docs-api"