Adding metadata

51 files changed, 90 insertions, 481 deletions

diff --git a/dev-java/antlr/antlr-3.2.ebuild b/dev-java/antlr/antlr-3.2.ebuild
index 0d962209926f..3efa97660287 100644
--- a/dev-java/antlr/antlr-3.2.ebuild
+++ b/dev-java/antlr/antlr-3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-inherit eutils java-pkg-2 java-pkg-simple
+inherit epatch java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A parser generator for many languages"
 HOMEPAGE="https://www.antlr3.org/"
diff --git a/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r2.ebuild b/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r2.ebuild
index aaee170b76c1..68a1217115d7 100644
--- a/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r2.ebuild
+++ b/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r2.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apple"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 RDEPEND=">=virtual/jre-1.8:*"
 
 S=${WORKDIR}/AppleJavaExtensions
diff --git a/dev-java/batik/batik-1.9.ebuild b/dev-java/batik/batik-1.9.ebuild
index 0582d79cb471..2e905bf8073d 100644
--- a/dev-java/batik/batik-1.9.ebuild
+++ b/dev-java/batik/batik-1.9.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 JAVA_PKG_IUSE="doc"
 
-inherit java-pkg-2 java-ant-2 eutils
+inherit java-pkg-2 java-ant-2 epatch
 
 DESCRIPTION="Java based SVG toolkit"
 HOMEPAGE="https://xmlgraphics.apache.org/batik/"
diff --git a/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild b/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild
index 71269285f564..71622d923c77 100644
--- a/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild
+++ b/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 JAVA_PKG_IUSE="doc source"
 
-inherit versionator eutils java-pkg-2 java-ant-2
+inherit versionator java-pkg-2 java-ant-2
 
 MY_PV="$(replace_all_version_separators _)"
 MY_PN="BrowserLauncher2"
diff --git a/dev-java/bsf/bsf-2.4.0-r2.ebuild b/dev-java/bsf/bsf-2.4.0-r2.ebuild
index 2cb3ea0c4a21..01984239b9f1 100644
--- a/dev-java/bsf/bsf-2.4.0-r2.ebuild
+++ b/dev-java/bsf/bsf-2.4.0-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI="5"
 JAVA_PKG_IUSE="doc examples source"
 
-inherit java-pkg-2 eutils java-ant-2
+inherit java-pkg-2 epatch java-ant-2
 
 DESCRIPTION="Bean Script Framework"
 HOMEPAGE="http://commons.apache.org/bsf/"
diff --git a/dev-java/cdi-api/cdi-api-1.2.ebuild b/dev-java/cdi-api/cdi-api-1.2.ebuild
index 9396af5ff0b5..5d3e5e09d79a 100644
--- a/dev-java/cdi-api/cdi-api-1.2.ebuild
+++ b/dev-java/cdi-api/cdi-api-1.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Contexts and Dependency Injection for the Java EE platform"
 HOMEPAGE="http://www.cdi-spec.org/"
diff --git a/dev-java/colt/colt-1.2.0-r3.ebuild b/dev-java/colt/colt-1.2.0-r3.ebuild
index ce5c2ef0fea4..24cb77f19188 100644
--- a/dev-java/colt/colt-1.2.0-r3.ebuild
+++ b/dev-java/colt/colt-1.2.0-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 JAVA_PKG_IUSE="source doc"
 
-inherit java-pkg-2 java-ant-2 eutils
+inherit java-pkg-2 java-ant-2 epatch
 
 DESCRIPTION="Java Libraries for High Performance Scientific and Technical Computing"
 SRC_URI="http://dsd.lbl.gov/~hoschek/colt-download/releases/${P}.tar.gz"
diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
index 3db3f7201fd2..4b75f2ae4ea1 100644
--- a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit java-pkg-2 java-ant-2 java-utils-2 eutils
+inherit java-pkg-2 java-ant-2 java-utils-2 epatch
 
 DESCRIPTION="Jakarta-Commons Collections Component"
 HOMEPAGE="http://commons.apache.org/collections/"
diff --git a/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild b/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild
index b8d6af15b0dc..4402e78cf004 100644
--- a/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild
+++ b/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit epatch java-pkg-2 java-ant-2
 
 DESCRIPTION="Generic interface for reading configuration data from a variety of sources"
 HOMEPAGE="http://commons.apache.org/configuration/"
diff --git a/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild b/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
index e6cb1b16c607..7fef273f04d0 100644
--- a/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
+++ b/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 JAVA_PKG_IUSE="doc examples source test"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit epatch java-pkg-2 java-ant-2
 
 MY_P="${P}-src"
 DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects"
diff --git a/dev-java/commons-digester/commons-digester-2.1-r1.ebuild b/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
index a6546742511c..242838b96140 100644
--- a/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
+++ b/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 JAVA_PKG_IUSE="doc examples source test"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 MY_P="${P}-src"
 
diff --git a/dev-java/commons-digester/commons-digester-3.2-r2.ebuild b/dev-java/commons-digester/commons-digester-3.2-r2.ebuild
index c818287d257f..f30609298a34 100644
--- a/dev-java/commons-digester/commons-digester-3.2-r2.ebuild
+++ b/dev-java/commons-digester/commons-digester-3.2-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 JAVA_PKG_IUSE="doc examples source test"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 MY_P="${PN}3-${PV}-src"
 
diff --git a/dev-java/commons-el/commons-el-1.0-r3.ebuild b/dev-java/commons-el/commons-el-1.0-r3.ebuild
index a7b3d71f48c2..931d642c470b 100644
--- a/dev-java/commons-el/commons-el-1.0-r3.ebuild
+++ b/dev-java/commons-el/commons-el-1.0-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 JAVA_PKG_IUSE="source"
 
-inherit eutils java-pkg-2 java-ant-2 java-osgi
+inherit epatch java-pkg-2 java-ant-2 java-osgi
 
 DESCRIPTION="EL is the JSP 2.0 Expression Language Interpreter from Apache"
 HOMEPAGE="http://commons.apache.org/el/"
diff --git a/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild b/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild
index c3bb05e55607..b5ddf03cb6a9 100644
--- a/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild
+++ b/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit epatch java-pkg-2 java-ant-2
 
 DESCRIPTION="High-performance file upload capability to your servlets and web applications"
 HOMEPAGE="http://commons.apache.org/fileupload/"
diff --git a/dev-java/commons-net/commons-net-3.2.ebuild b/dev-java/commons-net/commons-net-3.2.ebuild
index 84c210c9adf3..f48d7029ebb5 100644
--- a/dev-java/commons-net/commons-net-3.2.ebuild
+++ b/dev-java/commons-net/commons-net-3.2.ebuild
@@ -7,7 +7,7 @@ EAPI="5"
 RESTRICT="test"
 JAVA_PKG_IUSE="doc examples source" # test
 
-inherit eutils java-pkg-2 java-ant-2 java-osgi
+inherit java-pkg-2 java-ant-2 java-osgi
 
 MY_P="${P}-src"
 
diff --git a/dev-java/commons-pool/commons-pool-1.6.ebuild b/dev-java/commons-pool/commons-pool-1.6.ebuild
index 64c331273099..ad7179cfd030 100644
--- a/dev-java/commons-pool/commons-pool-1.6.ebuild
+++ b/dev-java/commons-pool/commons-pool-1.6.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Provides general purpose object pooling API"
 HOMEPAGE="http://commons.apache.org/pool/"
diff --git a/dev-java/fop/fop-2.0-r3.ebuild b/dev-java/fop/fop-2.0-r3.ebuild
index bd3c03ab2e9d..6265183f67ad 100644
--- a/dev-java/fop/fop-2.0-r3.ebuild
+++ b/dev-java/fop/fop-2.0-r3.ebuild
@@ -9,7 +9,7 @@ EAPI="5"
 
 JAVA_PKG_IUSE="doc examples source test"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
 HOMEPAGE="https://xmlgraphics.apache.org/fop/"
diff --git a/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild b/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild
index e10420f55980..7fa5dd56be35 100644
--- a/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild
+++ b/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ MY_PN="freehep-vectorgraphics"
 MY_P="${MY_PN}-${PV}"
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-pkg-simple
+inherit epatch java-pkg-2 java-pkg-simple
 
 DESCRIPTION="High Energy Physics Java library - FreeHEP Enhanced Metafile Format Driver"
 HOMEPAGE="http://java.freehep.org/"
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild
index 7efae955959b..618fe63fb741 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit eutils java-pkg-2 multilib
+inherit epatch java-pkg-2 multilib
 
 MY_P=${P/gnu-/}
 DESCRIPTION="Free core class libraries for use with Java VMs and compilers"
@@ -109,7 +109,7 @@ src_install() {
 
 	if use doc; then
 		# Strangely the Makefile doesn't install these.
-		insinto "/usr/${PN}-${SLOT}/share/classpath/api"
+		insinto /usr/${PN}-${SLOT}/share/classpath/api
 		doins -r doc/api/html/*
 	fi
 }
diff --git a/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild b/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
index 8baacadd296d..a891e3577f34 100644
--- a/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
+++ b/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 EAPI="5"
 
-inherit eutils java-pkg-2 prefix
+inherit java-pkg-2 prefix
 
 DESCRIPTION="Plugins for javax.sound"
 HOMEPAGE="http://icedtea.classpath.org"
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index a57ea06f01ad..8708f3ed3328 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,14 +1,3 @@
-DIST icedtea-3.17-aarch32-3.17.1.tar.xz 7054944 BLAKE2B 3bbd364f8af7d4aba6f268058ab5e59ad78a8d696a7cf01df9d8b5e49b8a2e4265c93913fe6e696b4017a8d763cf81d45cc511e1fbe41a0e425f78435fbb9bca SHA512 81e149c3afa8678f2e31b2af6c127e49e131ce7f99873dca012bdd83d1cc64fcd9ca6b4d4cd9dded10e8e6e82648a562ee448822bf3aa161aff2e17e11e644cb
-DIST icedtea-3.17-corba-3.17.1.tar.xz 948536 BLAKE2B fce8f3e2ee45326c8eed67b511c74d5d63f38ab5c85b120ce8230b1b1a98a6e6e467e4ee3e935f05bba347ecbaf990494a295b0d2b7e1de7c53d6cbbe39febc8 SHA512 c33886bfa517087e3cf37064fd9dcf1c0b8a9c9ccc4147beac3eb9c07e66c2f8aa3053feb8ab6cbdd42054b073854ed5aaf4a2cfb2888e0a09b7efe3809447c8
-DIST icedtea-3.17-hotspot-3.17.1.tar.xz 7109408 BLAKE2B 902cc0f66c655e9b1754b89430ea092aa04c01fb74f8341a5d66e9f1d7026b23b61e13f5574dafdcfb292a60921b7d1276d36dc5c6110819343aa3a9a9d446db SHA512 e377a2ad481727a1d5218f1bf629690ea5f1b7976307f593505efc07252cc5cd408f7eb0873032ec74ed44a31e5f2cd90747be3e6f709eba5ac9fd90857887ab
-DIST icedtea-3.17-jaxp-3.17.1.tar.xz 2267932 BLAKE2B a38d42d37902deb367ec804771feff7590b4448f11aac012c84880dd8ea8d7acafe204fb8756d2475148e59509b09003ed0edd167ca3798bc67a02f29570d28f SHA512 e690a6c498e2418feaa22713517aefd051524aedd349fbab5c70fbdee3ca0f17a297089e02f1de2a27e318413e5ca6fe7dfd825b49c37e749ff48e9c8981307a
-DIST icedtea-3.17-jaxws-3.17.1.tar.xz 2277028 BLAKE2B 0c78fdd7ad320657cc084db03d2f4917a4cc328bc0d64877ed23cbfe89bbcd445716a3677d769da1cc177da956fcb5d34100528bd837ea4704fc4267b9b0a996 SHA512 99c32483c6f5469c256026be9ee5c2a5654768ceff9d10fa9aa10888640af60d618668ae47880062d1253668e546949fd6ffe94c27d6436088e0a8367e2602fd
-DIST icedtea-3.17-jdk-3.17.1.tar.xz 40596084 BLAKE2B 9a6f636e4630156bf28c65ade834bc027abf094615df117d5e1579427b3c609b9445fcc947f485e0b600c899da0b7bcc8b63c45aaa870c8172babaddb63e663e SHA512 7f5321944cc6c7510db5d6ea6ef189bd15fdf7c904c8ec009576c33ce1e0288e18e51a5dc906e5c7c3beb4daebb161be0c08d1fe8f2ebde81b72a992da919142
-DIST icedtea-3.17-langtools-3.17.1.tar.xz 2080096 BLAKE2B 0a14904a867ccaf016937d1ad806dca11989a0119e5539cc86480ec01e955d91107d21d58748fb667ff8b68af497c87eb7bcfc8fd8f7c3685136ae88218a059d SHA512 68ff7857d180b90a77858505523416bee6102e30af7a394d08ab1581ba65d28b78c30f48c1b5555c30bf8b43adc5497d5530372101dc2e4adbc99e5d9c988def
-DIST icedtea-3.17-nashorn-3.17.1.tar.xz 2319500 BLAKE2B 5748eed107f62f17624c0db99b6ca76bdff4c4deba57f579f50dad36b5e1d055b1a80099be6503ee5897203a20d356050e1974883b46cb1cf892e0100474094d SHA512 088948d01fc6ea627610bbdcf6691a7bcdd34c5715be103297292db54d0e9080f82f395c3b4bb432058615bc04e05c2d4292fc8f31735e3005d4cf16ff1f9af1
-DIST icedtea-3.17-openjdk-3.17.1.tar.xz 364724 BLAKE2B 2e608d47d746cd8702e41b54fbe8984c6887dea3a40b4f28db11fb73b7078d13a41db0ceac73ad70359c89e4d03c1e64a8a41c2e0a7b4747b832d7398d8a89af SHA512 82f2688b018b893cbf583ccc1cd328f6909ebeb4d30655ddb554691f1f0ee38debe57dc91bc8200d6676ad531047ffbf149ce7c1e49b65e67db3254c7d6205ed
-DIST icedtea-3.17-shenandoah-3.17.1.tar.xz 7276688 BLAKE2B 02db748f1b87694fe0995b153211ccfeb8719a0b8e5f32396eff15012e396647294eb809b6561f1ed845cfd0f43a8b297f55f444651020ea42f1a05c2f0d4692 SHA512 a1bdda704f0331ad445143a7bd9fba33090c2cfd1a6d73a6c427378e3685ca40e0d600256c3c678820061e93d5bdc3faf9040bb11e62647d7b3f9218406405a7
-DIST icedtea-3.17.1.tar.xz 1565996 BLAKE2B 36a92826fd7f1cda9b1b90d93b57c4fe63cdcbd3e5d6320f3b6ac9819720156943232b17c9b3a6a5ca796cb2a29ef47426e9f10491af844bfa12a99252312d69 SHA512 eaf66df177f08cf335fe795f816e4f6b70a25a402ff8db4c1a2c545dd129350e1135c45e131eab8820620de2a75fda1d56141583ec1a651218d0a02680eb1df7
 DIST icedtea-3.18-aarch32-3.18.0.tar.xz 7057736 BLAKE2B bd681871da038ee1eaabe5c38e830a9d80fff30f8793b81afb69803107d0ee2ae8f3dad3985ec05c86120f1e3c86101984397476a76bce30a7b1852784175521 SHA512 3bc033bb4256d6a8ee8387998fbb4b1a14d2c6882337366085ca4648eb9b2a34176003e23e420703a075fb5322a1be3547d5ed82188d97e1f12429b4a8b3671d
 DIST icedtea-3.18-corba-3.18.0.tar.xz 948504 BLAKE2B 00deb77d5aebf19ad404bf44ac7367017f8aee6699e11b93d2cb44f7d23f17f13caba8aee9862b25e528bee3d8fbfa728260850d1aa2f66839b079b1111d3af4 SHA512 db71a9fd6288a8217a8338dda70a87eb4b97f1659c7e990eccd2774785bf1da9e35b71e231e108c610784922d1fa01cdaf115941189910ef9c68cf70746296ea
 DIST icedtea-3.18-hotspot-3.18.0.tar.xz 7110964 BLAKE2B ac45a7271f50a93b0ee27e6096820f3f93a02db42c6fde549515c3297590c94fff349a6cec5c9caf7bda31bbe36d6609097b4f73e99cdc1fe46bcfff0330a82e SHA512 abc46441c6ea7f652ee42376425e2fdd34a18de0803a13f38aa002a57a2835f8e2995f9a762fb53f114ad7b1030fc9ab82bd00839fccf57315018519df1c5c5f
diff --git a/dev-java/icedtea/icedtea-3.17.1.ebuild b/dev-java/icedtea/icedtea-3.17.1.ebuild
deleted file mode 100644
index 3facf26dfd28..000000000000
--- a/dev-java/icedtea/icedtea-3.17.1.ebuild
+++ /dev/null
@@ -1,379 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
-EAPI="6"
-SLOT="8"
-
-inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils prefix toolchain-funcs versionator xdg-utils
-
-ICEDTEA_VER=$(get_version_component_range 1-3)
-ICEDTEA_BRANCH=$(get_version_component_range 1-2)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-ICEDTEA_PRE=$(get_version_component_range _)
-
-CORBA_TARBALL="${PV}.tar.xz"
-JAXP_TARBALL="${PV}.tar.xz"
-JAXWS_TARBALL="${PV}.tar.xz"
-JDK_TARBALL="${PV}.tar.xz"
-LANGTOOLS_TARBALL="${PV}.tar.xz"
-OPENJDK_TARBALL="${PV}.tar.xz"
-NASHORN_TARBALL="${PV}.tar.xz"
-HOTSPOT_TARBALL="${PV}.tar.xz"
-SHENANDOAH_TARBALL="${PV}.tar.xz"
-AARCH32_TARBALL="${PV}.tar.xz"
-
-CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
-JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
-
-CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
-JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
-JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
-JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
-LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
-OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
-NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
-HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
-SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}"
-AARCH32_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch32-${AARCH32_TARBALL}"
-
-CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
-
-DROP_URL="https://icedtea.classpath.org/download/drops"
-ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="https://icedtea.classpath.org"
-SRC_PKG="${ICEDTEA_PKG}.tar.xz"
-SRC_URI="
-	https://icedtea.classpath.org/download/source/${SRC_PKG}
-	${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL}
-	${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
-	${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
-	${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
-	${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
-	shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} )
-	arm? ( ${ICEDTEA_URL}/aarch32.tar.xz -> ${AARCH32_GENTOO_TARBALL} )
-	${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
-	${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-IUSE="+alsa cacao +cups doc examples +gtk headless-awt
-	jamvm +jbootstrap kerberos libressl pax_kernel +pch
-	pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test zero"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="gtk? ( !headless-awt )"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.2.12"
-X_COMMON_DEP="
-	>=media-libs/giflib-4.1.6:0=
-	>=media-libs/libpng-1.2:0=
-	>=x11-libs/libX11-1.1.3
-	>=x11-libs/libXext-1.1.1
-	>=x11-libs/libXi-1.1.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.0.3
-	x11-libs/libXcomposite"
-X_DEPEND="
-	x11-base/xorg-proto
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2"
-
-# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
-COMMON_DEP="
-	>=dev-libs/glib-2.26:2=
-	>=dev-util/systemtap-1
-	media-libs/fontconfig:1.0=
-	>=media-libs/freetype-2.5.3:2=
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg:0=
-	kerberos? ( virtual/krb5 )
-	sctp? ( net-misc/lksctp-tools )
-	smartcard? ( sys-apps/pcsc-lite )
-	system-lcms? ( >=media-libs/lcms-2.9:2= )"
-
-# Gtk+ will move to COMMON_DEP in time; PR1982
-# gsettings-desktop-schemas will be needed for native proxy support; PR1976
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea:0
-	!dev-java/icedtea-web:7
-	>=gnome-base/gsettings-desktop-schemas-3.12.2
-	>=sys-apps/baselayout-java-0.1.0-r1
-	virtual/ttf-fonts
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )
-	gtk? (
-		>=dev-libs/atk-1.30.0
-		>=x11-libs/cairo-1.8.8
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.8:2
-		>=x11-libs/pango-1.24.5
-	)
-	!headless-awt? ( ${X_COMMON_DEP} )
-	selinux? ( sec-policy/selinux-java )"
-
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-# perl is needed for running the SystemTap tests and the bootstrap javac
-# lsb-release is used to obtain distro information for the version & crash dump output
-# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
-# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
-# Ant is no longer needed under the new build system
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
-	|| (
-		dev-java/openjdk-bin:8
-		dev-java/openjdk:8
-		dev-java/icedtea-bin:8
-		dev-java/icedtea:8
-	)
-	app-arch/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	dev-lang/perl
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl:0 )
-	sys-apps/attr
-	sys-apps/lsb-release
-	x11-libs/libXt
-	virtual/pkgconfig
-	pax_kernel? ( sys-apps/elfix )"
-
-PDEPEND="pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-icedtea_check_requirements() {
-	local CHECKREQS_DISK_BUILD
-
-	if use doc; then
-		CHECKREQS_DISK_BUILD="9000M"
-	else
-		CHECKREQS_DISK_BUILD="8500M"
-	fi
-
-	check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	icedtea_check_requirements
-}
-
-pkg_setup() {
-	icedtea_check_requirements
-
-	JAVA_PKG_WANT_BUILD_VM="
-		openjdk-8 openjdk-bin-8
-		icedtea-8 icedtea-bin-8"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${SRC_PKG}
-}
-
-src_configure() {
-	# GCC10/-fno-common handling, #723102
-	if [[ $(gcc-major-version) -ge 10 ]]; then
-		append-flags -fcommon
-		append-flags -fno-delete-null-pointer-checks -fno-lifetime-dse
-	fi
-
-	# For bootstrap builds as the sandbox control file might not yet exist.
-	addpredict /proc/self/coredump_filter #nowarn
-
-	# icedtea doesn't like some locales. #330433 #389717
-	export LANG="C" LC_ALL="C"
-
-	local cacao_config config hotspot_port hs_config jamvm_config use_cacao use_jamvm use_zero zero_config
-	local vm=$(java-pkg_get-current-vm)
-
-	# gcj-jdk ensures ecj is present.
-	if use jbootstrap || has "${vm}" gcj-jdk; then
-		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
-		config+=" --enable-bootstrap"
-	else
-		config+=" --disable-bootstrap"
-	fi
-
-	# Use Zero if requested
-	if use zero; then
-		use_zero="yes"
-	fi
-
-	# Use JamVM if requested
-	if use jamvm; then
-		use_jamvm="yes"
-	fi
-
-	# Use CACAO if requested
-	if use cacao; then
-		use_cacao="yes"
-	fi
-
-	# Are we on a architecture with a HotSpot port?
-	# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
-	if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
-		hotspot_port="yes"
-		# Work around stack alignment issue, bug #647954.
-		use x86 && append-flags -mincoming-stack-boundary=2
-	fi
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# Otherwise use Zero for now until alternate VMs are working
-	if test "x${hotspot_port}" != "xyes"; then
-			use_zero="yes"
-	fi
-
-	if use shenandoah; then
-		if { use amd64 || use arm64; }; then
-			hs_config="--with-hotspot-build=shenandoah"
-			hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
-		else
-			eerror "Shenandoah is only supported on arm64 and x86_64. Please re-build with USE="-shenandoah""
-		fi
-	else
-		if use arm ; then
-			hs_config="--with-hotspot-src-zip="${DISTDIR}/${AARCH32_GENTOO_TARBALL}""
-		else
-			hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
-		fi
-	fi
-
-	# Turn on JamVM if needed (non-HS archs) or requested
-	if test "x${use_jamvm}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
-			ewarn 'If so, please rebuild with USE="-jamvm"'
-		fi
-		ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
-		jamvm_config="--enable-jamvm"
-	fi
-
-	# Turn on CACAO if needed (non-HS archs) or requested
-	if test "x${use_cacao}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
-			ewarn 'If so, please rebuild with USE="-cacao"'
-		fi
-		ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
-		cacao_config="--enable-cacao"
-	fi
-
-	# Turn on Zero if needed (non-HS/CACAO archs) or requested
-	if test "x${use_zero}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
-		fi
-		zero_config="--enable-zero"
-	fi
-
-	# PaX breaks pch, bug #601016
-	if use pch && ! host-is-pax; then
-		config+=" --enable-precompiled-headers"
-	else
-		config+=" --disable-precompiled-headers"
-	fi
-
-	config+=" --with-parallel-jobs=$(makeopts_jobs)"
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	# force bash for now https://bugs.gentoo.org/722292
-	CONFIG_SHELL="${EPREFIX}/bin/bash" econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
-		--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
-		--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
-		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
-		--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
-		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
-		--with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
-		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
-		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
-		--mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
-		--with-pkgversion="Gentoo ${PF}" \
-		--disable-ccache \
-		--disable-downloading --disable-Werror --disable-tests \
-		--disable-systemtap-tests --enable-improved-font-rendering \
-		--enable-system-jpeg --enable-system-zlib \
-		$(use_enable headless-awt headless) \
-		$(use_enable !headless-awt system-gif) \
-		$(use_enable !headless-awt system-png) \
-		$(use_enable doc docs) \
-		$(use_enable kerberos system-kerberos) \
-		$(use_enable system-lcms) \
-		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
-		$(use_enable sctp system-sctp) \
-		$(use_enable smartcard system-pcsc) \
-		${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
-}
-
-src_compile() {
-	default
-}
-
-src_test() {
-	default
-}
-
-src_install() {
-	default
-
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}${dest#/}"
-
-	if ! use alsa; then
-		rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	if ! use examples; then
-		rm -r "${ddest}"/demo "${ddest}"/sample || die
-	fi
-
-	if ! use source; then
-		rm -v "${ddest}"/src.zip || die
-	fi
-
-	dosym ../../../usr/share/doc/"${PF}" usr/share/doc/"${PN}${SLOT}"
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
-	java-vm_install-env "${FILESDIR}/icedtea.env.sh"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	java-vm-2_pkg_postinst
-	einfo "JavaWebStart functionality provided by icedtea-web package"
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	java-vm-2_pkg_postrm
-}
diff --git a/dev-java/ini4j/ini4j-0.5.2.ebuild b/dev-java/ini4j/ini4j-0.5.2.ebuild
index be800594b009..326469e272bd 100644
--- a/dev-java/ini4j/ini4j-0.5.2.ebuild
+++ b/dev-java/ini4j/ini4j-0.5.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-pkg-simple
+inherit epatch java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Simple Java API Windows style .ini file handling"
 HOMEPAGE="https://sourceforge.net/projects/ini4j/"
diff --git a/dev-java/j2ssh/j2ssh-0.2.9.ebuild b/dev-java/j2ssh/j2ssh-0.2.9.ebuild
index 7d4dd4ea6d5a..2decfdada51d 100644
--- a/dev-java/j2ssh/j2ssh-0.2.9.ebuild
+++ b/dev-java/j2ssh/j2ssh-0.2.9.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 JAVA_PKG_IUSE="source doc examples"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit epatch java-pkg-2 java-ant-2
 
 DESCRIPTION="Java implementation of the SSH protocol"
 HOMEPAGE="https://sourceforge.net/projects/sshtools/ http://www.sshtools.com/"
diff --git a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
index f8fc00ce233b..8453b509d3c7 100644
--- a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
+++ b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit eutils flag-o-matic multilib java-vm-2 autotools toolchain-funcs
+inherit epatch flag-o-matic multilib java-vm-2 autotools toolchain-funcs
 
 DESCRIPTION="An extremely small and specification-compliant virtual machine"
 HOMEPAGE="https://sourceforge.net/projects/jamvm/"
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
index db759bcfd96d..3357c265306f 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-JAVA_PKG_IUSE="doc source test"
 
-inherit eutils java-pkg-2 java-ant-2 toolchain-funcs
+JAVA_PKG_IUSE="doc source test"
+inherit epatch java-pkg-2 java-ant-2 toolchain-funcs
 
 MY_PN="wrapper"
 MY_P="${MY_PN}_${PV}_src"
@@ -15,7 +15,6 @@ SRC_URI="http://${MY_PN}.tanukisoftware.org/download/${PV}/${MY_P}.tar.gz"
 LICENSE="tanuki-community"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="
 	>=virtual/jre-1.4"
diff --git a/dev-java/javolution/javolution-4.0.2-r1.ebuild b/dev-java/javolution/javolution-4.0.2-r1.ebuild
index 80255b4d8561..70885aa5b247 100644
--- a/dev-java/javolution/javolution-4.0.2-r1.ebuild
+++ b/dev-java/javolution/javolution-4.0.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit epatch java-pkg-2 java-ant-2
 
 DESCRIPTION="Java Solution for Real-Time and Embedded Systems"
 SRC_URI="http://javolution.org/${P}-src.zip"
diff --git a/dev-java/jcmdline/jcmdline-1.0.2-r2.ebuild b/dev-java/jcmdline/jcmdline-1.0.2-r2.ebuild
index 11b2c40b0d9b..09e0d494eb69 100644
--- a/dev-java/jcmdline/jcmdline-1.0.2-r2.ebuild
+++ b/dev-java/jcmdline/jcmdline-1.0.2-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit epatch java-pkg-2 java-ant-2
 
 DESCRIPTION="Library for parsing/handling of command line parameters"
 HOMEPAGE="https://sourceforge.net/projects/jcmdline/"
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
index db996676e75d..0080138b8de1 100644
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
+++ b/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="source"
 JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
 WANT_ANT_TASKS="ant-contrib"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit epatch java-pkg-2 java-ant-2
 
 MY_PN="mysql-connector-java"
 MY_P="${MY_PN}-${PV}"
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild
index 7d5e2a0e06f3..d7200bc01043 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit epatch java-pkg-2 java-ant-2
 
 MY_PN="postgresql-jdbc"
 MY_PV="${PV/_p/-}"
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild
index d15404c14f40..cb6986cc6773 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit epatch java-pkg-2 java-ant-2
 
 MY_PN="postgresql-jdbc"
 MY_PV="${PV/_p/-}"
diff --git a/dev-java/jdom/jdom-2.0.6-r4.ebuild b/dev-java/jdom/jdom-2.0.6-r4.ebuild
index 30bbc1c03e90..8549f9e42e10 100644
--- a/dev-java/jdom/jdom-2.0.6-r4.ebuild
+++ b/dev-java/jdom/jdom-2.0.6-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 MY_P="JDOM-${PV}"
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit epatch java-pkg-2 java-ant-2
 
 DESCRIPTION="Java API to manipulate XML data"
 SRC_URI="https://github.com/hunterhacker/${PN}/archive/${MY_P}.tar.gz"
diff --git a/dev-java/jffi/jffi-1.2.9.ebuild b/dev-java/jffi/jffi-1.2.9.ebuild
index 7f8b0a351a90..4eff1caf02bb 100644
--- a/dev-java/jffi/jffi-1.2.9.ebuild
+++ b/dev-java/jffi/jffi-1.2.9.ebuild
@@ -5,7 +5,7 @@ EAPI="5"
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit eutils java-pkg-2 java-ant-2 versionator
+inherit epatch java-pkg-2 java-ant-2 versionator
 
 DESCRIPTION="An optimized Java interface to libffi"
 HOMEPAGE="https://github.com/jnr/jffi"
diff --git a/dev-java/jflex/jflex-1.6.1.ebuild b/dev-java/jflex/jflex-1.6.1.ebuild
index 6876dc50a7df..32c5d3413238 100644
--- a/dev-java/jflex/jflex-1.6.1.ebuild
+++ b/dev-java/jflex/jflex-1.6.1.ebuild
@@ -5,7 +5,7 @@ EAPI="5"
 
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-pkg-simple
+inherit epatch java-pkg-2 java-pkg-simple
 
 DESCRIPTION="JFlex is a lexical analyzer generator for Java"
 HOMEPAGE="https://www.jflex.de/"
diff --git a/dev-java/jid3/jid3-0.46-r2.ebuild b/dev-java/jid3/jid3-0.46-r2.ebuild
index f50f2e94610f..bfa253213049 100644
--- a/dev-java/jid3/jid3-0.46-r2.ebuild
+++ b/dev-java/jid3/jid3-0.46-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source test"
 # To make sure the javadoc patch doesn't break things
 WANT_SPLIT_WANT="true"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit epatch java-pkg-2 java-ant-2
 
 MY_P="${P/-/_}"
 
diff --git a/dev-java/jinput/jinput-2.0.6-r1.ebuild b/dev-java/jinput/jinput-2.0.6-r1.ebuild
index c4d0b5e00785..ad374628ffc7 100644
--- a/dev-java/jinput/jinput-2.0.6-r1.ebuild
+++ b/dev-java/jinput/jinput-2.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 COMMIT="790b666"
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils toolchain-funcs java-pkg-2 java-ant-2 vcs-snapshot
+inherit epatch toolchain-funcs java-pkg-2 java-ant-2 vcs-snapshot
 
 DESCRIPTION="An implementation of an API for game controller discovery and polled input"
 HOMEPAGE="https://java.net/projects/jinput"
diff --git a/dev-java/jisp/jisp-2.5.1-r3.ebuild b/dev-java/jisp/jisp-2.5.1-r3.ebuild
index 6577ef618f4d..e2e75426f252 100644
--- a/dev-java/jisp/jisp-2.5.1-r3.ebuild
+++ b/dev-java/jisp/jisp-2.5.1-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 JAVA_PKG_IUSE="doc source"
 
-inherit java-pkg-2 java-pkg-simple eutils
+inherit java-pkg-2 java-pkg-simple epatch
 
 DESCRIPTION="Java Indexed Serialization Package: A small, embedded database engine"
 HOMEPAGE="http://www.coyotegulch.com/products/jisp/"
diff --git a/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild b/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild
index 9e20e1fd5e83..d80325c1fae9 100644
--- a/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild
+++ b/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-inherit eutils java-pkg-2 java-ant-2
+inherit epatch java-pkg-2 java-ant-2
 
 DESCRIPTION="Java/Swing GUI components and libraries for building desktop applications"
 HOMEPAGE="http://common.l2fprod.com/"
diff --git a/dev-java/metainf-services/metainf-services-1.6.ebuild b/dev-java/metainf-services/metainf-services-1.6.ebuild
index 28fb9e4748ea..bb7d68cfe2f2 100644
--- a/dev-java/metainf-services/metainf-services-1.6.ebuild
+++ b/dev-java/metainf-services/metainf-services-1.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Generates META-INF/services files automatically"
 HOMEPAGE="http://metainf-services.kohsuke.org/"
diff --git a/dev-java/metainf-services/metainf-services-1.7.ebuild b/dev-java/metainf-services/metainf-services-1.7.ebuild
index 976442a825fb..a10038783c8f 100644
--- a/dev-java/metainf-services/metainf-services-1.7.ebuild
+++ b/dev-java/metainf-services/metainf-services-1.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Generates META-INF/services files automatically"
 HOMEPAGE="http://metainf-services.kohsuke.org/"
diff --git a/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild b/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild
index ba34367eb8e2..ffc9c5dba8c0 100644
--- a/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild
+++ b/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 JAVA_PKG_IUSE="doc examples source test"
 
-inherit java-pkg-2 java-ant-2 eutils
+inherit java-pkg-2 java-ant-2 epatch
 
 DESCRIPTION="A simple HTML scanner and tag balancer using standard XML interfaces"
 
diff --git a/dev-java/sblim-cim-client/sblim-cim-client-2.2.1-r1.ebuild b/dev-java/sblim-cim-client/sblim-cim-client-2.2.1-r1.ebuild
index 821e24e4bf99..a1d75b5f2d87 100644
--- a/dev-java/sblim-cim-client/sblim-cim-client-2.2.1-r1.ebuild
+++ b/dev-java/sblim-cim-client/sblim-cim-client-2.2.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit java-pkg-2 java-ant-2 eutils
+inherit java-pkg-2 java-ant-2 epatch
 
 DESCRIPTION="A WBEM services client that includes an SLP client for CIM service discovery"
 HOMEPAGE="https://sourceforge.net/projects/sblim.wiki/CimClient"
diff --git a/dev-java/skinlf/skinlf-6.7-r1.ebuild b/dev-java/skinlf/skinlf-6.7-r1.ebuild
index f04ab512d1bc..7d30b4c15a99 100644
--- a/dev-java/skinlf/skinlf-6.7-r1.ebuild
+++ b/dev-java/skinlf/skinlf-6.7-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 JAVA_PKG_IUSE="examples source"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit epatch java-pkg-2 java-ant-2
 
 MY_P="${P}-20060722"
 
diff --git a/dev-java/spymemcached/spymemcached-2.9.1-r1.ebuild b/dev-java/spymemcached/spymemcached-2.9.1-r1.ebuild
index bb946411bb78..7268e56ee81f 100644
--- a/dev-java/spymemcached/spymemcached-2.9.1-r1.ebuild
+++ b/dev-java/spymemcached/spymemcached-2.9.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A simple, asynchronous, single-threaded memcached client written in java"
 HOMEPAGE="https://code.google.com/p/spymemcached/"
diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild b/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
index 0b96d950c8a1..9b357c47389c 100644
--- a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-pkg-simple
+inherit epatch java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A Java template engine"
 HOMEPAGE="https://www.stringtemplate.org/"
diff --git a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild b/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
index c29b32ef39e9..30f96503ef2e 100644
--- a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,7 +6,7 @@ EAPI="5"
 ANTLR3="3.5.2"
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-pkg-simple
+inherit epatch java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A Java template engine"
 HOMEPAGE="https://www.stringtemplate.org/"
diff --git a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
index f244a96c1c95..1e21ce70574f 100644
--- a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
+++ b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 RDEPEND=">=virtual/jre-1.3"
 
 RESTRICT="bindist mirror"
diff --git a/dev-java/swt/swt-3.8.2-r3.ebuild b/dev-java/swt/swt-3.8.2-r3.ebuild
index 6234e6e49421..d65297c3817c 100644
--- a/dev-java/swt/swt-3.8.2-r3.ebuild
+++ b/dev-java/swt/swt-3.8.2-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+inherit epatch java-pkg-2 java-ant-2 toolchain-funcs java-osgi
 
 MY_PV="${PV/_rc/RC}"
 MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201301310800"
diff --git a/dev-java/swt/swt-4.2-r4.ebuild b/dev-java/swt/swt-4.2-r4.ebuild
index eff2fb275a5e..3b48a85ba055 100644
--- a/dev-java/swt/swt-4.2-r4.ebuild
+++ b/dev-java/swt/swt-4.2-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit eutils flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+inherit epatch flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
 
 MY_PV="${PV/_rc/RC}"
 MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201206081400"
diff --git a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild
index 904444297829..f3ae1c2d749c 100644
--- a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild
+++ b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 JAVA_PKG_IUSE="doc source"
 WANT_ANT_TASKS="ant-antlr"
 
-inherit java-pkg-2 java-ant-2 eutils versionator
+inherit java-pkg-2 java-ant-2 epatch versionator
 
 MY_PN=${PN/-/.}
 MY_PV=$(replace_version_separator 3 '-')
diff --git a/dev-java/xerces/xerces-2.12.1.ebuild b/dev-java/xerces/xerces-2.12.1.ebuild
index 75f4ab171637..0d5e000fae02 100644
--- a/dev-java/xerces/xerces-2.12.1.ebuild
+++ b/dev-java/xerces/xerces-2.12.1.ebuild
@@ -12,7 +12,7 @@ MY_PN="xercesImpl"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Xerces Java XML parser"
-HOMEPAGE="https://xml.apache.org/xerces2-j/index.html"
+HOMEPAGE="https://xerces.apache.org/xerces2-j/index.html"
 SRC_URI="https://repo1.maven.org/maven2/xerces/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
 
 LICENSE="Apache-2.0"
@@ -23,11 +23,11 @@ CDEPEND="dev-java/xml-commons-resolver:0"
 
 RDEPEND="
 	${CDEPEND}
-	>=virtual/jre-1.8:*"
+	>=virtual/jre-11:*"
 
 DEPEND="
 	${CDEPEND}
-	>=virtual/jdk-1.8:*"
+	>=virtual/jdk-11:*"
 
 JAVA_SRC_DIR="org"