Also fix EAPI6 issues in jamvm.

dev-java/jamvm/Manifest

@@ -13,8 +13,8 @@ AUX jamvm-2.0.0-noexecstack.patch 1387 BLAKE2B afd020772bf627c3dbd6b5da9e03d3b03
 AUX jamvm-2.0.0-opcode-guard.patch 1396 BLAKE2B 0f6ba763606d9e1aa807d3441fd51383c7f71f9f649e73a93e177fee48a788bd320b3491e5ff05e8f9fa0022f3751c38bf444c7a154a3c872a6647fa95d07747 SHA512 842fd08f4e11e240c809ca7a0029ea9936f33fb12a765a47a34e73ac4a3d3e7eda1e6a1c1c99d3157911347d2fc1333faae35a6e502bfafb8eab30f69ace8001
 DIST jamvm-1.5.1.tar.gz 599084 BLAKE2B af79d5615fbfa395230d93ec52fd70f6000d85eac881414f59ab9f33ab4393a4dadbfa6966c574d11422612e10354bec562b3728e4a8fe6e6334b5c0f2742ed9 SHA512 9f93611fefb28b5494d166d7ec9575eb8d12add775dd65b2b46303355e3f845f417d5301649a1f09cb306e6690cd82b67cb1dface30ce18d0b2ecc815d3bc9b9
 DIST jamvm-2.0.0.tar.gz 741459 BLAKE2B 9b8b0f8cfd8f56c0b835144c07aaca709ef466fdfe5df18438d05c66cd8a07fecfebf27e1581c67658feb3674a96c2e916b85f13dc434baf2db9be4e4fbfd0cf SHA512 8ac27787ee94fa8fde962635d3c08d1dc1e5244c9d56bb693e73f3fd9b58e944ad3f7a0127afeed727d7c00d904a775d2c483157f5ac87e7eab6ecade1aad21d
-EBUILD jamvm-1.5.1.ebuild 1733 BLAKE2B 550f9cb65941c110c94396a3113680a9d3d32c8e4febf2a83ec0ea0872282f152c110228eeca549b2f6a99db434587f5074a85caf3ef285fa268a44dad5c4813 SHA512 67708d68e0813b97590b9ccc27dd0afab45dbf2e7a59a94bef725b54927fb27268e2aa4d162d3610095cd2a159802886fda546614a7a0d68c7ee7b35cc4d86af
-EBUILD jamvm-2.0.0-r10.ebuild 4299 BLAKE2B 0a22a4e7ddf3c33e796d9c3a2ebaa9fd2a7492f35adf24309db71d06ff674b4294c82c8fd91499945aa2795aaff4e8b95538f6299752108b3d2edd4309bd4271 SHA512 20619ffa877bd459a4d37d7ba498ea2dc9235ea3f01dbaa515054ad00de88ac2b07f83ad65f74aa3439fee6c45ed9a8393deed1cb6fac237ea0bfd3ad47ed988
-EBUILD jamvm-2.0.0-r20.ebuild 4301 BLAKE2B 1407dcfd88e6c3555022a89075f20f3ae586ec20d400a5dcb88c4760baf0ff2cda1f54f0bdd07086664f1b4d8349312131a80a2eb401cb77bf57845eeb552d84 SHA512 cec86202777681cd3ae773acdb59e392a9c32f4642e24496678f02edebe9e66514461c7f97889484d8dd0bc0eea458a857152d54f81c4991c42aca453ee7fdcf
-EBUILD jamvm-2.0.0.ebuild 4204 BLAKE2B c4b3d951a5733c10860aadfe6ec25d9b9cdc2120354b1df7b1b46b84a8edb95b4b95b9fd38446d9553a68cbd00b2604162c9b1a41c44d12feddc4dac9b10a465 SHA512 1f79eeacb4dc5041991cd9684448260da98d3c30e7da0ac0387f00bee0414291fab53e663206d16f0d15c7494ac111a56d43b0c45f862e3e9545713bbcc2f93a
+EBUILD jamvm-1.5.1.ebuild 1723 BLAKE2B d066e6a69361bfdaeaa15ebd451bf4ec34d98db4e9c79a1647a9f2c1606207175fc4add97f4a8b8e1306ea37917549b211021ca693200a886add97a1d45579a4 SHA512 07202263067d713ddd16c24b4075f2fefbeacf246a96e60cf81f445f4528042ae9cedcce0b37305460bca68862418af1841cc3d9183b0645df69e18d00108a38
+EBUILD jamvm-2.0.0-r10.ebuild 4312 BLAKE2B c8ac41c7e4a611f746c2883d2c6304c91ba49d407272faf46919e89ee470289e701c808726e8a6f2160ceb2c92f412865356a8ed9966ee7e47dfd90dedcbd780 SHA512 2ff7c481346df673b81e4a8f2de19087dca5f557a44c214606e6f9418f3ee883e3efe093fb795b16278bfe7dcc5322fc250664dca3e541d363db0bf058cdea62
+EBUILD jamvm-2.0.0-r20.ebuild 4315 BLAKE2B 47409c72ba74ea0c8cbb27db1e1461e18a320ccbef8ed25c54486eca6ca1b96b20ad93bcc3d857427e6c0214a93be76ab1089ae847dddb24f765ae139d363047 SHA512 3b737905a5074d93403ef4f58ddc4fa1c5234898d9982b48a39af75c0ab303e815486a1b2d22c74aca80433c123d289ba1c30a3f1c34a35bd17a3f5b68547045
+EBUILD jamvm-2.0.0.ebuild 4218 BLAKE2B 5c6c6aed18bf0ed14f7758386c15219e1253fdf3bf1256d1fc9e94960a7d0dbad66ecd5440b6e6523dc21905cf5d229a98b33ea1337734e63ed5134b46f7169d SHA512 3a62c447f41eb61ee64267f6ca6070102c0e50fc3fc05a15bb357904db8f99aef46a868d88eadc6651096b03d93b24000b79d6c3653f673795cc4adf6c8bd39e
 MISC metadata.xml 252 BLAKE2B a3a36edd6c0b4e630f0e38d236ff4133a5c6b4aa42f5525d8a0978ecdbbe3d53602d3fcde02cf1a495bfabb4fd06f914826df44bda7f542ce8543b32fd7bbfe2 SHA512 1ab83f56876901e45f2b34aa5c81bd1d7b243009236d238b49fca2d49ec167c596ea589de6df1c8dfe1a6b834a2e0e493409ee65d499bd2b6ecaf687ae71df69

dev-java/jamvm/jamvm-1.5.1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,15 +23,15 @@ src_unpack() {
 
 src_prepare() {
 	rm -v lib/classes.zip || die
+	eapply "${FILESDIR}/classes-location.patch"
+	eapply "${FILESDIR}/${P}-aarch64-support.patch"
 
 	default
 }
 
 src_configure() {
 	export JAVAC="${EPREFIX}/usr/bin/jikes-bin"
-	epatch "${FILESDIR}/classes-location.patch"
-	epatch "${FILESDIR}/${P}-aarch64-support.patch"
-        sed -i -e "s/return CLASSPATH_INSTALL_DIR\"\/lib\/classpath\";/return CLASSPATH_INSTALL_DIR\"\/$(get_libdir)\/classpath\";/g" src/dll.c || die "Sed failed!"
+	sed -i -e "s/return CLASSPATH_INSTALL_DIR\"\/lib\/classpath\";/return CLASSPATH_INSTALL_DIR\"\/$(get_libdir)\/classpath\";/g" src/dll.c || die "Sed failed!"
 	eautoreconf
 
 	filter-flags "-fomit-frame-pointer"

dev-java/jamvm/jamvm-2.0.0-r10.ebuild

@@ -29,8 +29,9 @@ PATCHES=(
 )
 
 src_prepare() {
+	eapply_user
 	# without this patch, classes-2.zip is not found at runtime
-	epatch "${PATCHES[@]}"
+	eapply "${PATCHES[@]}"
 
 	sed -i -e "s/return CLASSPATH_INSTALL_DIR\"\/lib\/classpath\";/return CLASSPATH_INSTALL_DIR\"\/$(get_libdir)\/classpath\";/g" src/classlib/gnuclasspath/dll.c || die "Sed failed!"
 

dev-java/jamvm/jamvm-2.0.0-r20.ebuild

@@ -29,8 +29,10 @@ PATCHES=(
 )
 
 src_prepare() {
+	eapply_user
+
 	# without this patch, classes-3.zip is not found at runtime
-	epatch "${PATCHES[@]}"
+	eapply "${PATCHES[@]}"
 
 	sed -i -e "s/return CLASSPATH_INSTALL_DIR\"\/lib\/classpath\";/return CLASSPATH_INSTALL_DIR\"\/$(get_libdir)\/classpath\";/g" src/classlib/gnuclasspath/dll.c || die "Sed failed!"
 

dev-java/jamvm/jamvm-2.0.0.ebuild

@@ -29,8 +29,10 @@ PATCHES=(
 )
 
 src_prepare() {
+	eapply_user
+
 	# without this patch, classes-1.zip is not found at runtime
-	epatch "${PATCHES[@]}"
+	eapply "${PATCHES[@]}"
 
 	sed -i -e "s/return CLASSPATH_INSTALL_DIR\"\/lib\/classpath\";/return CLASSPATH_INSTALL_DIR\"\/$(get_libdir)\/classpath\";/g" src/classlib/gnuclasspath/dll.c || die "Sed failed!"