From ddccd65a23ce6e558b6b471de668684eaeed7ea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Sat, 7 Dec 2019 01:19:45 +0000
Subject: [PATCH] Make initial bootstrap VMs slotted. This allows portage to
 properly resolve dependencies.

---
 README.md                                     |  25 +-
 dev-java/ant-core/Manifest                    |   2 +-
 dev-java/ant-core/ant-core-1.8.4-r1.ebuild    |  17 +-
 dev-java/eclipse-ecj/Manifest                 |   4 +-
 dev-java/eclipse-ecj/eclipse-ecj-3.2.ebuild   |  13 +-
 dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild |  24 +-
 .../eclipse-ecj/files/digest-eclipse-ecj-3.2  |   3 -
 dev-java/gnu-classpath/Manifest               |   6 +-
 .../gnu-classpath/gnu-classpath-0.93.ebuild   |   2 +-
 .../gnu-classpath-0.99-r2.ebuild              |  39 +-
 .../gnu-classpath-0.99_p1.ebuild              |  27 +-
 dev-java/icedtea/Manifest                     |  15 +-
 dev-java/icedtea/icedtea-3.3.0.ebuild         | 368 ------------------
 dev-java/icedtea/icedtea-3.7.0.ebuild         |   9 +-
 dev-java/icedtea/icedtea-7.2.6.9.ebuild       |   6 +-
 dev-java/jamvm/Manifest                       |  17 +-
 dev-java/jamvm/files/jamvm-1.5.1.env          |   8 +-
 .../jamvm-2.0.0-2-classes-location.patch      |  27 ++
 dev-java/jamvm/files/jamvm-2.0.0-2-env.file   |  15 +
 .../jamvm-2.0.0-3-classes-location.patch      |  27 ++
 dev-java/jamvm/files/jamvm-2.0.0-3-env.file   |  15 +
 .../files/jamvm-2.0.0-classes-location.patch  |   2 +-
 dev-java/jamvm/files/jamvm-2.0.0-env.file     |   2 +-
 dev-java/jamvm/jamvm-1.5.1.ebuild             |   6 +-
 dev-java/jamvm/jamvm-2.0.0-r10.ebuild         | 136 +++++++
 ...0.0-r100.ebuild => jamvm-2.0.0-r20.ebuild} |  70 ++--
 ...vm-2.0.0-r99.ebuild => jamvm-2.0.0.ebuild} |  62 ++-
 profiles/repo_name                            |   2 +-
 virtual/jdk/Manifest                          |   5 +-
 virtual/jdk/jdk-1.4.ebuild                    |   4 +-
 virtual/jdk/jdk-1.5.ebuild                    |  12 +
 virtual/jdk/jdk-1.6.ebuild                    |   6 +-
 virtual/jre/Manifest                          |   5 +-
 virtual/jre/jre-1.4.ebuild                    |   2 +-
 virtual/jre/jre-1.5.ebuild                    |  13 +
 virtual/jre/jre-1.6.ebuild                    |   4 +-
 36 files changed, 446 insertions(+), 554 deletions(-)
 delete mode 100644 dev-java/eclipse-ecj/files/digest-eclipse-ecj-3.2
 delete mode 100644 dev-java/icedtea/icedtea-3.3.0.ebuild
 create mode 100644 dev-java/jamvm/files/jamvm-2.0.0-2-classes-location.patch
 create mode 100644 dev-java/jamvm/files/jamvm-2.0.0-2-env.file
 create mode 100644 dev-java/jamvm/files/jamvm-2.0.0-3-classes-location.patch
 create mode 100644 dev-java/jamvm/files/jamvm-2.0.0-3-env.file
 create mode 100644 dev-java/jamvm/jamvm-2.0.0-r10.ebuild
 rename dev-java/jamvm/{jamvm-2.0.0-r100.ebuild => jamvm-2.0.0-r20.ebuild} (58%)
 rename dev-java/jamvm/{jamvm-2.0.0-r99.ebuild => jamvm-2.0.0.ebuild} (63%)
 create mode 100644 virtual/jdk/jdk-1.5.ebuild
 create mode 100644 virtual/jre/jre-1.5.ebuild

diff --git a/README.md b/README.md
index f5470ef..72054ad 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +1,28 @@
 ## Bootstrapping OpenJDK 8
 
 ```sh
-sudo emerge -a1v =dev-java/gnu-classpath-0.93
-sudo emerge -a1v =dev-java/jamvm-1.5.1
-sudo emerge -a1v =dev-java/gnu-classpath-0.99-r2
-sudo emerge -a1v =dev-java/jamvm-2.0.0-r99
-sudo emerge -a1v =dev-java/eclipse-ecj-4.2.1
-sudo emerge -a1v =dev-java/jamvm-2.0.0-r100 # Rebuild jamvm, so that it picks up new ecj
-sudo emerge -a1v dev-java/icedtea:7 # This icedtea will use jamvm, so a bit slowish (hotspot failed to build)
-sudo emerge -a dev-java/openjdk:8 # This will be installed form the main Gentoo portage tree
+sudo emerge -a dev-java/openjdk:8
 ```
 
 ## Bootstrapping OpenJDK 11
 ```sh
-sudo emerge -a1v dev-java/openjdk:9
-sudo emerge -a1v dev-java/openjdk:10
 sudo emerge -a1v dev-java/openjdk:11
 ```
 At this point you can remove this overlay and install OpenJDK from main tree:
 ```sh
 sudo emerge -a dev-java/openjdk:11
 ```
+
+## Bootstrapping story
+
+We first compile fastjar and jikes java compiler both of which are written in C++.
+This is enough to compile an old version of GNU Classpath 0.93. Then we compile an old
+version of JamVM 1.5.1. This serves as our initial Java Runtime Environment.
+
+We use this to compile ant 1.8.1 which then allows us to build ecj-3.2. This allows us
+to compile GNU Classpath 0.99 which comes with more java tools (e.g. javah). Then we
+compile JamVM 2.0.0. This serves as our second Java environment.
+
+Finally, we compile git snapshot of GNU Classpath which has a much better support for Java 1.6.
+Then we compile a slightly patched ecj-4.2. Together with JamVM 2.0.0 this will serve as
+Java environment that can bootstrap Icedtea 2 (Java 7).
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 990add5..931fad0 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,3 +1,3 @@
 DIST apache-ant-1.8.4-src.tar.bz2 3385365 BLAKE2B 2cbb84385dbfdcbc68d138fa5c88f6759ed579ae3e1df129094948aa5677fca6d4d1140c0c8c2723bddce1dfb04f0121f46b7f8a798f4beb6e1c5cdb15fe9eff SHA512 7dbbdcd31f5fd498cbbe7f125451899320e5e9c2396b80f1f90d18943f8ef066a75198edfdba0edf96b1e0b5b84cb049b5281403180a7a6924ebfb077930e307
-EBUILD ant-core-1.8.4-r1.ebuild 1667 BLAKE2B 899e6bb69b8e1a3c1e838f21d0a40031ed4d5f87c02f8b9a2d37c684b26036c851f0fa669d399588f813b66dc220d1554a5be5e0b2d5a18e85a2c894fa3831ee SHA512 a90c649a4f5532b24683405c3c576b5e1b16fdb4e387acb46bd7dc911fbd7f8c3742c6491fae38effcb565c3653b254791c647334d8bfefd9f7dddb55e0f88e0
+EBUILD ant-core-1.8.4-r1.ebuild 1782 BLAKE2B 6578d323f2dd142020c1006d3abe2b7c10ae3c77bb55c639cad3c6105b0e1c6e21c2e13b4b5d570806c3480fc5a2341bd64271246af71da6757c6788ab3d1f10 SHA512 9c34477c9884c7b289363eb10845871db91c46919b3c4f7d435574e04a76cfb873e5eb2378a9f9fbdf0b35c966dea05a9fa477fec70c5ddf186867aae10b0593
 MISC metadata.xml 390 BLAKE2B c6509d0728b476d3bc7d596a11e7477b75cae7c3c3918e18ae0f6bb5fdd04edb62e22f1dca148843d82760406ef2e9f4da43e3348b396801dbb3f07a322e5fae SHA512 ab625d234114a10cf0074c97cc4ec2fe9a191be282c9faca739964d36fc790199f4a6d6788fe4f6d3e9279e80b44f909aacfb3c5a595334b3b4bcc19f5f343e4
diff --git a/dev-java/ant-core/ant-core-1.8.4-r1.ebuild b/dev-java/ant-core/ant-core-1.8.4-r1.ebuild
index 4a4748f..057e763 100644
--- a/dev-java/ant-core/ant-core-1.8.4-r1.ebuild
+++ b/dev-java/ant-core/ant-core-1.8.4-r1.ebuild
@@ -20,13 +20,9 @@ SLOT="bootstrap"
 KEYWORDS="amd64"
 IUSE="doc"
 
-DEPEND="
-	virtual/jdk:1.4
-	!dev-java/ant-core:0
-"
+RDEPEND="dev-java/jamvm:1.5"
+DEPEND="${RDEPEND}"
 
-RDEPEND="${DEPEND}
-	virtual/jre:1.4"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -36,6 +32,15 @@ src_prepare() {
 	default
 }
 
+pkg_setup() {
+	JAVA_PKG_WANT_BUILD_VM="jamvm-1.5"
+	JAVA_PKG_WANT_SOURCE="1.4"
+	JAVA_PKG_WANT_TARGET="1.4"
+
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
 src_compile() {
 	export BOOTJAVAC_OPTS="-nowarn"
 	export ANT_OPTS="-Dbuild.compiler=jikes"
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index aef8f57..76b4c2f 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -3,5 +3,5 @@ AUX eclipse-ecj-3.2-build-gentoo.patch 1874 BLAKE2B dee1fd186a776a049ecdaf05472d
 AUX override.patch 53592 BLAKE2B ddfb5cdb8b3569755036a4cde4a49924dd9d6eb124c52c52a2aab1161fccdc579f6722d9173863a65da3b059fb7f7a9d1b4098e6014deb70f9f3715807f7961d SHA512 f5f84c9f4388a4a5b81ece22fdb5e3b106659fff23927e814d97eae4f4ccbfd5ebec41825386ad118ee7ef266dc56eaea0e771800195a2ecac61fbf781e4bff6
 DIST ecjsrc-4.2.1.jar 1417043 BLAKE2B dc6915ec85d96a6ecdafb04485549feeb6ef8329811e294647e9e179ff3b1ec3cea55c29ad23b306ff3489dbfe6f574dc691ee31080a592d71607d3a996e9bb4 SHA512 967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf
 DIST eclipse-ecj-3.2.tar.bz2 612611 BLAKE2B dc2cadb2f7be85f6583020079f2e02a66d6432b35f595c44cc38731504c8dcd43cd3e407b80c93e5dc828e10eb37d78a74a4674e2c7c5eac7329f179947b8683 SHA512 037564cacb154e6dc81718cbb1a4f1547663c151681e3725d7728db782611ed22905d5395d24214336cfaefeeb4e2ea87fab69f5012f163164a7aaf87f203ba2
-EBUILD eclipse-ecj-3.2.ebuild 1371 BLAKE2B 208f75413c9343cf200ade78283d5ceaeaabde708310302652490ddceb5e61bd024bc1d9c2b9c15bd0a90dd1dc63d0a204065375d27c070d7141cdc596a71639 SHA512 50ced7841614278fa37664b48599568778ac9c51aa07c6065ecf9ed7e513eeee31754a3a5ed1303b6124a680d6d004b1784f5fa8b672728b1d31576150303da0
-EBUILD eclipse-ecj-4.2.1.ebuild 2890 BLAKE2B 87349162e4b589b643a5f2f76cd4927c844bae91e8e74a584713855ee8fe5dee99a1da98fa95dba0626f55d2c5417faffb1e0b20fbac7217440e558827ad087a SHA512 f91a9bdecfc38cc84c40c67405e12eaff13b4114d3c1461634375c1955c7e0f7a89642ccee9f57cf1d1bf00d8a664a09a8624f17eb9acb16a1a8556bdf45fe5a
+EBUILD eclipse-ecj-3.2.ebuild 1516 BLAKE2B e760457fb3d845a13ab78c92c4320b33703c0bc70a29bb05a47bf289b4c9c3bf15bdef479378c532d5cf88bc886926dbf2e4f65313abe34d38194941e5c80f06 SHA512 244914719c20bbf869a80208b410f317b3f2b1aea18623d6aa3f6fa46846b4df40be0215a64c38f486f12f14c00c69a4ee635f34a7af5c8d86e275ad53325723
+EBUILD eclipse-ecj-4.2.1.ebuild 2890 BLAKE2B 8628fb9ea54e4056a0d4884ba201e23ee399b4375cbe0315284550aed86ea2da199ef44a53f9a5214766edd179fedcd3e462d82fb8c24e392533ef462a8e97a5 SHA512 5c462d52376b2354e134e981d4a1c753af36a26bf4b36d9dda9181f75eceb81a311d5d24dbec3df842ce650b0e0f35306a7bf0f6a0ff00998f9673b2a8eb9b81
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.2.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.2.ebuild
index 7c73a52..797b2bb 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-3.2.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-3.2.ebuild
@@ -6,9 +6,7 @@ EAPI=6
 # depend on bootstrap slot
 JAVA_ANT_DISABLE_ANT_CORE_DEP=true
 
-inherit eutils java-pkg-2 java-ant-2
-
-#MY_PN=${PN##*-}
+inherit eutils java-pkg-2 java-vm-2 java-ant-2
 
 DESCRIPTION="Eclipse Compiler for Java"
 HOMEPAGE="http://www.eclipse.org/"
@@ -31,6 +29,15 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-build-gentoo.patch"
 }
 
+pkg_setup() {
+	JAVA_PKG_WANT_BUILD_VM="jamvm-1.5"
+	JAVA_PKG_WANT_SOURCE="1.4"
+	JAVA_PKG_WANT_TARGET="1.4"
+
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
 src_compile() {
 	# we don't use eant because the compile*.xml files specifically set -source -target and used compiler
 
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild
index 41dab49..8b7f49d 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI="6"
 
-inherit java-pkg-2
+inherit java-pkg-2 java-vm-2 
 
 MY_PN="ecj"
 DMF="R-${PV}-201209141800"
@@ -20,31 +20,31 @@ IUSE="+userland_GNU"
 COMMON_DEP="
 	app-eselect/eselect-java"
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.4"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.6
+	dev-java/jamvm:2.0-2
+	virtual/jre:1.6"
+DEPEND="${RDEPEND}
+	virtual/jdk:1.5
 	app-arch/unzip
 	userland_GNU? ( sys-apps/findutils )"
 
 S="${WORKDIR}"
 
-JAVA_PKG_WANT_SOURCE=1.4
-JAVA_PKG_WANT_TARGET=1.4
-
-java_prepare() {
+src_prepare() {
 	# These have their own package.
 	rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die
 	rm -fr org/eclipse/jdt/internal/antadapter || die
 
 	epatch "${FILESDIR}"/override.patch
+	default
 }
 
 pkg_setup() {
 
-	JAVA_PKG_WANT_BUILD_VM="jamvm-bootstrap"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
+	JAVA_PKG_WANT_BUILD_VM="jamvm-2.0-2"
+	JAVA_PKG_WANT_SOURCE="1.4"
+	JAVA_PKG_WANT_TARGET="1.4"
 
+	java-vm-2_pkg_setup
 	java-pkg-2_pkg_setup
 }
 
diff --git a/dev-java/eclipse-ecj/files/digest-eclipse-ecj-3.2 b/dev-java/eclipse-ecj/files/digest-eclipse-ecj-3.2
deleted file mode 100644
index a185223..0000000
--- a/dev-java/eclipse-ecj/files/digest-eclipse-ecj-3.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 37eddadf0d2b70bd65185e4d84700b28 eclipse-ecj-3.2.tar.bz2 612374
-RMD160 935538b0f8178711882443749103176818d97f1e eclipse-ecj-3.2.tar.bz2 612374
-SHA256 a8489f46951bac0b3866601fddf8f3673323a5298b0ebd40c649d2401213121c eclipse-ecj-3.2.tar.bz2 612374
diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest
index 73bd2f3..d4f7718 100644
--- a/dev-java/gnu-classpath/Manifest
+++ b/dev-java/gnu-classpath/Manifest
@@ -1,6 +1,6 @@
 DIST classpath-0.93.tar.gz 9534222 BLAKE2B 36313f25e165856a8716c18873d725d82f52e20310d2c22ca0b0b0a481e66a00ccad4138c76e96c119772565819bc06cd626bc100ddea0684d04165e10206541 SHA512 69d831361085514bb7c5607fa694914cc01bc9fe589b7744d5534c97d434722193a1b68a336642d0dba9a3b50e9acea0364741790e9f19d196e5956a51c320b0
 DIST classpath-0.99.tar.gz 11078232 BLAKE2B cb62cc58b9ce75df98809298a6c6a588704a98a133e8a0378c372e6cc0e6b07c8f05d7bd23c52f2697e6a3b4bfc1f0cdfc7aa108f2f681af154e6fd8c59d9460 SHA512 d8f38677ecc6a0f4b26197ab16e9888c51043364141675ad69684828e2d0ecb93122249672e2e7997aea817cc4aac68c17ccf59bf8913afe81e9536bee6b73ac
-EBUILD gnu-classpath-0.93.ebuild 1098 BLAKE2B 75549f70382effecc79969b4b74665fc61c4f6122a6df15cba5041108075db3c65d0f6189583598b9375cbcdf3a2c7aad263a5ea46c5d7012f9c142db3dac62f SHA512 5361df84237ce82aed5062e91d285dd9247c974b5408a53b2ccfabea3a01e615adef6dbae59d3f789a1bfab5ec0b8bdcbca97a7a922d727572f38160f0fba4a2
-EBUILD gnu-classpath-0.99-r2.ebuild 1956 BLAKE2B 053fa31b8e5c74b136fb2434baa324ef9971705535a96d0cdda16989cbda8bfd8d39681c4b2d4baf67e44244e2ef217c92e2a43a15f1544551c7f092b1afb986 SHA512 3825e8fba8a95773f842ccef8573c9ae9834843911425596139352193124f49c360cafd624bad8378688b7f4cb91fddabed07c1458d7912ab8342125e6f74349
-EBUILD gnu-classpath-0.99_p1.ebuild 2117 BLAKE2B b5c70f8f218378855648cd04eada5b104c979b0162b7fe34f0fb92690c27ed8e37341389b3ec4614b690cc4416c4c88eab4bdcb0597b8a22359ac1749d03bc0b SHA512 83d011eb51f9487501e560c7b45965d11449188cabd6c3b6ba4fcf12fc92f8b906d2e902022202242c215b1250fc7a30236e3e68c9531bcf8097fc078f04f057
+EBUILD gnu-classpath-0.93.ebuild 1093 BLAKE2B e81893c8cda4174ed7b905f4b002eae4a69a13c16fed19f8c7db576fc79325557cb9269b3e3b9449abda834605259d9db37481fdf0d2d19cc425a9ed92bd021e SHA512 763b7345e5568f8e3a2ebb43fccf20331e12eb93fe5157835e5109bd5b42bd3774aeb1059ef74e789eaa1e24cbe48a5fb152f8c49803764a43f18fe4a37d249f
+EBUILD gnu-classpath-0.99-r2.ebuild 2448 BLAKE2B 0b809111313f9f5fd396c945c759a8fab26efb5f6943140e795f2a0ce6fd7b9bb1753f57882c3f4b7ede8f862abd9922ff077cf94b2d7d4d260e30323c892deb SHA512 370539badfe7d2907c989273e4c6e55bbf426288f65f8b5d230f0cdd76e93bc69063a6d23c9c33ee25ddef8033983e1b0e2d26175919e5c22eaeabea1db8f49a
+EBUILD gnu-classpath-0.99_p1.ebuild 2418 BLAKE2B bbb310f640a33b8ea70abb481418dbcc329386c6427fd7fd863bc9b1a9782d64646e27e15e38225039d58643d1face20ee86a05e518e9b42635e268f6c2bbab2 SHA512 3bdcf8597b076dd0f10c0524bf8e7b51b32c7fca837ad6e7168400aeb413b7625f08b3683787f4e4a621a956cb9f5f7db01c4c69d27ba13dc1fe600b1c63e039
 MISC metadata.xml 252 BLAKE2B a3a36edd6c0b4e630f0e38d236ff4133a5c6b4aa42f5525d8a0978ecdbbe3d53602d3fcde02cf1a495bfabb4fd06f914826df44bda7f542ce8543b32fd7bbfe2 SHA512 1ab83f56876901e45f2b34aa5c81bd1d7b243009236d238b49fca2d49ec167c596ea589de6df1c8dfe1a6b834a2e0e493409ee65d499bd2b6ecaf687ae71df69
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.93.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.93.ebuild
index 3b9a16c..6b66612 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.93.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.93.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz"
 HOMEPAGE="https://www.gnu.org/software/classpath"
 
 LICENSE="GPL-2-with-linking-exception"
-SLOT="bootstrap"
+SLOT="0.93"
 KEYWORDS="amd64"
 
 DEPEND="sys-libs/zlib
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.99-r2.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.99-r2.ebuild
index 1ea4d71..b7dc7a2 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.99-r2.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.99-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit eutils java-pkg-2 multilib
+inherit eutils java-pkg-2 java-vm-2 multilib
 
 MY_P=${P/gnu-/}
 DESCRIPTION="Free core class libraries for use with VMs and compilers for the Java language"
@@ -11,32 +11,36 @@ SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz"
 HOMEPAGE="https://www.gnu.org/software/classpath"
 
 LICENSE="GPL-2-with-linking-exception"
-SLOT="bootstrap"
+SLOT="0.99"
 KEYWORDS="amd64"
 
 IUSE=""
 REQUIRED_USE=""
 
-RDEPEND=""
-
-# java-config >2.1.11 needed for ecj version globbing
 DEPEND="app-arch/zip
 		dev-java/eclipse-ecj:3.2
 		>=dev-java/java-config-2.1.11
-		virtual/jdk:1.4
-		${RDEPEND}"
+		dev-java/jamvm:1.5"
 
-RDEPEND="virtual/jre:1.4
-	${RDEPEND}"
+RDEPEND="${DEPEND}
+	virtual/jre:1.4"
 
 S=${WORKDIR}/${MY_P}
 
+pkg_setup() {
+	JAVA_PKG_WANT_BUILD_VM="jamvm-1.5"
+	JAVA_PKG_WANT_SOURCE="1.5"
+	JAVA_PKG_WANT_TARGET="1.5"
+
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
 src_configure() {
 	local ecj_pkg="eclipse-ecj"
 
 	# We require ecj anyway, so force it to avoid problems with bad versions of javac
 	export JAVAC="${EPREFIX}/usr/bin/ecj-3.2"
-	export JAVA="${EPREFIX}/usr/bin/java"
 	# build takes care of them itself, duplicate -source -target kills ecj
 	export JAVACFLAGS="-nowarn"
 	# build system is passing -J-Xmx768M which ecj however ignores
@@ -55,8 +59,13 @@ src_configure() {
 		--enable-jni \
 		--disable-dependency-tracking \
 		--disable-plugin \
-		--bindir="${EPREFIX}"/usr/libexec/${PN} \
-		--includedir="${EPREFIX}"/usr/include/classpath \
+		--disable-examples \
+		--prefix="${EPREFIX}/usr/$(get_libdir)/classpath-0.99" \
+		--with-glibj-dir="${EPREFIX}/usr/$(get_libdir)/classpath-0.99/share/classpath" \
+		--datadir="${EPREFIX}/usr/$(get_libdir)/classpath-0.99" \
+		--datarootdir="${EPREFIX}/usr/$(get_libdir)/classpath-0.99/share" \
+		--mandir="${EPREFIX}/usr/$(get_libdir)/classpath-0.99/share/man" \
+		--infodir="${EPREFIX}/usr/$(get_libdir)/classpath-0.99/share/info" \
 		--with-ecj-jar=$(java-pkg_getjar --build-only ${ecj_pkg}-* ecj.jar)
 }
 
@@ -67,7 +76,7 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install
 	dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO
-	java-pkg_regjar /usr/share/classpath/glibj.zip
-	java-pkg_regjar /usr/share/classpath/tools.zip
-	dosym /usr/libexec/gnu-classpath/gjavah /usr/bin/gjavah
+	java-pkg_regjar "${EPREFIX}"/usr/$(get_libdir)/classpath-0.99/share/classpath/glibj.zip
+	java-pkg_regjar "${EPREFIX}"/usr/$(get_libdir)/classpath-0.99/classpath/tools.zip
+	dosym "${EPREFIX}"/usr/$(get_libdir)/classpath-0.99/bin/gjavah "${EPREFIX}"/usr/bin/gjavah
 }
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.99_p1.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.99_p1.ebuild
index 56d419d..e0e99f2 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.99_p1.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.99_p1.ebuild
@@ -6,12 +6,12 @@ EAPI=5
 inherit eutils java-pkg-2 java-vm-2 multilib git-r3
 
 DESCRIPTION="Free core class libraries for use with VMs and compilers for the Java language"
-EGIT_REPO_URI="https://git.savannah.gnu.org/git/classpath.git"
+EGIT_REPO_URI="git://git.savannah.gnu.org/classpath.git"
 EGIT_COMMIT="e7c13ee0cf2005206fbec0eca677f8cf66d5a103"
 HOMEPAGE="https://www.gnu.org/software/classpath"
 
 LICENSE="GPL-2-with-linking-exception"
-SLOT="bootstrap"
+SLOT="0.99-devel"
 KEYWORDS="amd64"
 
 IUSE=""
@@ -19,23 +19,22 @@ REQUIRED_USE=""
 
 RDEPEND=""
 
-# java-config >2.1.11 needed for ecj version globbing
 DEPEND="app-arch/zip
 		dev-java/eclipse-ecj:3.2
 		>=dev-java/java-config-2.1.11
-		>=virtual/jdk-1.4
-		>=dev-java/gnu-classpath-0.99-r2:bootstrap
+		virtual/jdk:1.5
 		${RDEPEND}"
 
-RDEPEND=">=virtual/jre-1.4
-	${RDEPEND}"
+RDEPEND="${DEPEND}
+	virtual/jre:1.5"
 
 S=${WORKDIR}/${P}
 
 pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="jamvm-bootstrap"
+	JAVA_PKG_WANT_BUILD_VM="jamvm-2.0"
 	JAVA_PKG_WANT_SOURCE="1.5"
 	JAVA_PKG_WANT_TARGET="1.5"
+
 	java-vm-2_pkg_setup
 	java-pkg-2_pkg_setup
 }
@@ -67,8 +66,11 @@ src_configure() {
 		--enable-jni \
 		--disable-dependency-tracking \
 		--disable-plugin \
-		--bindir="${EPREFIX}"/usr/libexec/${PN} \
-		--includedir="${EPREFIX}"/usr/include/classpath \
+		--disable-examples \
+		--prefix="${EPREFIX}/usr/$(get_libdir)/classpath-0.99-devel" \
+		--with-glibj-dir="${EPREFIX}/usr/$(get_libdir)/classpath-0.99-devel/share/classpath" \
+		--datadir="${EPREFIX}/usr/$(get_libdir)/classpath-0.99-devel" \
+		--datarootdir="${EPREFIX}/usr/$(get_libdir)/classpath-0.99-devel/share" \
 		--with-ecj-jar=$(java-pkg_getjar --build-only ${ecj_pkg}-* ecj.jar)
 }
 
@@ -79,6 +81,7 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install
 	dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO
-	java-pkg_regjar /usr/share/classpath/glibj.zip
-	java-pkg_regjar /usr/share/classpath/tools.zip
+	java-pkg_regjar "${EPREFIX}"/usr/$(get_libdir)/classpath-0.99-devel/share/classpath/glibj.zip
+	java-pkg_regjar "${EPREFIX}"/usr/$(get_libdir)/classpath-0.99-devel/classpath/tools.zip
+	dosym "${EPREFIX}"/usr/$(get_libdir)/classpath-0.99-devel/bin/gjavah "${EPREFIX}"/usr/bin/gjavah-devel
 }
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index e617520..58ed528 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -9,16 +9,6 @@ DIST icedtea-2.6-jdk-ce87b1399385.tar.bz2 32812887 BLAKE2B 2ce5c2318d9bde2cec6c8
 DIST icedtea-2.6-langtools-dd8e22d986c8.tar.bz2 1711235 BLAKE2B 274196b0784a696a1106a2c35903fd091db641abfee139f116cb4887932dd22c6fc54a10cbda5b08d2339caaae8dd61057ec87075beeeacab470fbadf1e0419e SHA512 880924b19d3c021f137368eea51c380b0df8222c0148d8442b1b786d13a3698dc567d8783af1798a31364bdaa31b7580fcf02dfb82147a890407cd33c6a5595e
 DIST icedtea-2.6-openjdk-2dd04ef37829.tar.bz2 130401 BLAKE2B 4f724258553d8055e661c3ac8f2fb61eab29651364679cd819681025b9c5674df420e862df7e134abe5bd799301eee6722d61f1346b0c111b569d72a52bc4903 SHA512 67493785ec7aa3093f3d558a82e45c3f699bea63ccefacf273754b046d0a10b5cd19bb9a3dad7803a19e5d242ac06082729d1ac73088479db5712ccd08fdd223
 DIST icedtea-2.6.9.tar.xz 2107156 BLAKE2B f14babb6d52c85473bef75a4a4b10b4a52d0def45a0e3c9d036dcffe8c4c28c3f0428fa33b743311ca75ed1a13c2146a3860978cdcfebe316fb14f81d3a83717 SHA512 6362e7329bdf5224d1c6340d4c03fe3ca6e5a879395c3af75390fcff9a8e8a599517a3f287d36110c301ba908e5bc4bcc8aa89cd605aa76f0e51f7a9aced6b3e
-DIST icedtea-3.3-corba-8eb9dd5fe2fb.tar.xz 940804 BLAKE2B d838131cc9c9d13f95f5eec6713d83fffdbcd1f38b4e9a6fcd90c4d22a6630f02629e48b4fe461df74d03f6fcbd344f4f730feda0d578297e6893810c23ae401 SHA512 b1f44e1e41b3565bd45176f726e4d1c2999c5ff25a5f2e973f0e5836b7fd2cf6540eae83d3944b303677797e052abd950bb9748fb3e218e4c71b1ea059bf1209
-DIST icedtea-3.3-hotspot-6efaf77e82a1.tar.xz 6813884 BLAKE2B 3efdeaef01bdd301ae1401fbf750ff32b1578e942bc9b04729bada7f7a6900c7d12837610aa8d06b7d1333aa2f934fd36faf71d4b8dae96d8cffc66f30f56b70 SHA512 8a593b1c9f022e7a3efa834c5547c59f1a2143f946edae2647a3368f9d4d39b9d473f36575d395e627e5bfac1f9cdef0efe607e0a81b40c46dca44ad6d59a65b
-DIST icedtea-3.3-jaxp-faf1c4a9a51d.tar.xz 2302792 BLAKE2B a3ba9c92705e5c1b61199e9dbd47f5ab9d65d293c1877bf0f3c28b1380aaa3ac4aa60a61b9828757e5988cb8d43730eaaa913cad2e049e8e65fff3803d712eaf SHA512 3addabc7478c8a443de5db5606b9eb71778484ed68943d3aa2b61c02bff993d3cb446333be7a5bfc90f8757d0125eb1f53f2483c60c79bb0f19e642e1696ddcd
-DIST icedtea-3.3-jaxws-5f5237104669.tar.xz 2269396 BLAKE2B efde94737e03f9abeef06d8aa8fda4988dc9b358f0353e709c96383897a6a260c00405d96a977002f9e8587dbd0e4b6fea76da41ff625ecafa60ec30d89ee30e SHA512 1b83b0a90cf0c11220cae034d2f86ad51ff8f6d153dc22e8e9f65b8ec4de8f7148fd37356aa19098e6545967da3c53e87edac747adfa76e254c1fc9d31e4ec1b
-DIST icedtea-3.3-jdk-3642a826880b.tar.xz 38972276 BLAKE2B 0e107edc97e2cbd07e618223cd48a4e47a1138de414a389fb278e5839d9c69d88a03896abb4d2c0cab9d8b0d55ec62fedd2f49f7e5ea2208ce4efa7f9f813783 SHA512 60c932a057dc1869bec52ea73af2a21af9e622a196510d074c5d17c01bf7d98babd651f5577bafe96a832e6a54ded8704c4f7d964f0874edaf2222bdbe3c0c46
-DIST icedtea-3.3-langtools-d10a13bdc98c.tar.xz 2070432 BLAKE2B cf3a9510d591c480ebc0c0d2f7926f9286938df254aea425cc46439674e397d390f95d2322ba41a49fdaf6323aec382ab3f80f4614ac3cc281b2baa4ee87e7ce SHA512 13065b54ca036ad11b8879d9ebaa725a823c25cda5b28f0092902bda2b8879cfd000d132916302f2661b63b03c0bec90d1adfe4863d38c201cfbdf74f1f942c6
-DIST icedtea-3.3-nashorn-8c0fe384c4e7.tar.xz 2229336 BLAKE2B bb8d8842d4d45863223fe4874b4ce4a0b1edc9a699aa6fe30a7d5311e15d350b22aae3eb28595fc1d56596d69a780e361240a57f0dad19f6a13ac1e8706c17cf SHA512 c0aec36e921288b6ad11e71daa32111a4ee45302a2bbe407229cc143f05869372993f7b0dd366c07ecb31fac47e1d3cdb0c59cc1a48375d3719656c2159fee95
-DIST icedtea-3.3-openjdk-d5760f7cce54.tar.xz 337064 BLAKE2B 6077dba3d39301f23058d1d6ed5d9c19d4efd7228e783e3c0822e3e6b40b82a5e5ac837e84088ab7805b67d3410986819d36057fd1adf4d23eab2bf4ac10ceac SHA512 d98790823408e09f3fa9946ceeeda48187dddd3302625fc546d64a4ecc89967235c550af23c05368a90d8dd2ceb38c092cd3130958132d18d30692342bd1151e
-DIST icedtea-3.3-shenandoah-d9a978177779.tar.xz 6866276 BLAKE2B 9c95bb1645b87211919fbbbc84b86f0a5bb1e4d4c20180f62a2f0d0ab5bf675d6f60f97be4b8d1d109bfdf721329e8c0af640a8fdbb91599ffa654ef7b98a4fc SHA512 df658cea99bb306962fe393d6babc4e69b363f0e03d64ac90ef4ce8c14faec723cb6d338598e7b6739139f9e9aa447e3463fd9ab773fad95b5c5266955f5c53f
-DIST icedtea-3.3.0.tar.xz 1453792 BLAKE2B b6ef155360d72ae83c22253dce012c166d59dde9f934c136abedf2d5cd8f6cbd416baf87e3922446d6b9f6fe8317cb252db84165886248d61ac2d3d8a548f2a3 SHA512 58f8fc80ba68d38cac797192af827d6da5a93e165a5c62b8dfe852f848bfd8cb851dfb3d5d2c7b79f60f2fdced985ba473102afc4a2d5a56d6ddf1f8bb7cf9c3
 DIST icedtea-3.7-aarch32-1cd346521065.tar.xz 6756352 BLAKE2B dce797dd03cb84631367a6536fdc3fdc98d4f47c7414a2782f1f18f7efbba96d042efb3f044d02af6a83f2c1f5ddf48656aed9a18d121a193077210f95c071c0 SHA512 3ed8d17c2209da39b21b57c96ee87453cf5dcacb6060f88bcbc0247a905eed07f2e763d3dbe34f3fba797b28b19d0c6e73603cb7d9ea145fa515ceb9ca807403
 DIST icedtea-3.7-corba-872ca6c060bb.tar.xz 941016 BLAKE2B 30424376c9050bf144feeafb350325fec3402751e521bd2224e22e45a95d2c13251c81641f89661c98a90e4b4132f9bdad9c2d72a200a2474d7652e4c96a8645 SHA512 5fae98bec6b54c4bcc374db940256163fa9db2c8f9447c78e61887ecbce16f98bbd00720e9fe78f860bb2d83bc062e3beb430b637ea200d935aaae1f3e905243
 DIST icedtea-3.7-hotspot-074a569c30e4.tar.xz 6832164 BLAKE2B 86d563253094a5da07fc193bae073c936b4f6e35b3bd39dac7af3768877b7ecf2570b9150bfad5b957b5b3b22e2472e6a8223fbb5548abe72138ab7418901fef SHA512 c7c2e4ccccdc4fd9ac2f4c71e9a89997dd68fbd73a966015f9e764489cdf0027479d4c335c8f339d5ee2eb2968bc187a12e3c5e72d94ad59556cfb452a732658
@@ -33,6 +23,5 @@ DIST icedtea-3.7.0.tar.xz 1487360 BLAKE2B efef75c5ac615c21310f16f50fc425c5a76076
 DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 BLAKE2B 5c1faa3cbbfea62f819562a01ec389f3682cf3164d06f5404d1d16359c87b37d6ae4101f7c33cde30bad4f3d52af18f0f410e36868b2c9d1280661d2340e683b SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23
 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
-EBUILD icedtea-3.3.0.ebuild 12233 BLAKE2B 617a4a440d073002e4e844f7ce59714759ec39090e64982a3605b3e3f2024705c7dca3d9bbd329ffc535c56cbe7a57d5e8717283af25d665c1e80504138d4110 SHA512 98b7ed34fad1d58e26e30ce38b1cd1dd7ca23971c1bf2e28fbff18ca638999619e05de4a6def9b933b385df336d8283556ec871db6da0a235fa2b3f5371c8378
-EBUILD icedtea-3.7.0.ebuild 13708 BLAKE2B c965ea39c2237cb19ed659088ee5932efad2bd491ffef627937800545b55d6cdaf371311cec05df34d2cce01127e3c127a85d2ba8e00c6e31bc95ba7927866ad SHA512 720b441ca953fcd5e15259e1c9d13f7a1b6c068da886f75b53397684b32a461137d7e7c33791815079f14f4a96524dc0fccd80b1b7761e76aac6d070038f10d0
-EBUILD icedtea-7.2.6.9.ebuild 11500 BLAKE2B 55dd39c4624c46a72c63e6dc1414db8ecf0bc7ae83a8217d3b8fc20821624a58fb1bbab0c6a5d375162029b9873443e14b83c8ca5d9612486b966d74a73cff36 SHA512 c13e9b57e78ad410ce5fe09c7d964d508ea308dc5e3faf88dfcdd99ad5082faf320c1079f6ef540b09d64de4615576cfe51f16d3623ba9da1136cd10c5c0ecc0
+EBUILD icedtea-3.7.0.ebuild 13501 BLAKE2B 1da31aaf786ea499f12d0e4fded5579fface8079f6f5c566d38dcb10d27ef2aaa636f1da3f4e0e31205347916b8afa85eab7afad9dc11ef0f92c8edd4c66f9af SHA512 b394fdeb39a0b58be9e1164b81db10f6f068b63dcd5cd502432c759ad89e82c9b54c1c255ea17928393f338ba8ff3bc7f8a5c6979d90defe7317ca14ab7c0bc1
+EBUILD icedtea-7.2.6.9.ebuild 11491 BLAKE2B 694927ac4be20fd1ac15a8f12d78f8d1c3d44277da2e00889ceac04d64107617cada164c55232feb82775e83fc48bafd3274e4761c555babf3dfb0d9afc2dd5b SHA512 2f942daee4363e6359184ea4d6742c6748ebfc88c1336ca705db3b1e9b9361f0ede19acf8a694996abb86fb49464485448b3c80867b11b6ed1c47a981d84cbf1
diff --git a/dev-java/icedtea/icedtea-3.3.0.ebuild b/dev-java/icedtea/icedtea-3.3.0.ebuild
deleted file mode 100644
index b0bec02..0000000
--- a/dev-java/icedtea/icedtea-3.3.0.ebuild
+++ /dev/null
@@ -1,368 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-# 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 gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator
-
-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="8eb9dd5fe2fb.tar.xz"
-JAXP_TARBALL="faf1c4a9a51d.tar.xz"
-JAXWS_TARBALL="5f5237104669.tar.xz"
-JDK_TARBALL="3642a826880b.tar.xz"
-LANGTOOLS_TARBALL="d10a13bdc98c.tar.xz"
-OPENJDK_TARBALL="d5760f7cce54.tar.xz"
-NASHORN_TARBALL="8c0fe384c4e7.tar.xz"
-HOTSPOT_TARBALL="6efaf77e82a1.tar.xz"
-SHENANDOAH_TARBALL="d9a978177779.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}"
-
-CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
-
-DROP_URL="http://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="http://icedtea.classpath.org"
-SRC_PKG="${ICEDTEA_PKG}.tar.xz"
-SRC_URI="
-	http://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} )
-	${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"
-
-IUSE="+alsa cacao +cups doc examples +gtk headless-awt
-	jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch
-	pulseaudio sctp selinux shenandoah smartcard +source +sunec test +webstart zero"
-
-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-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2
-	x11-base/xorg-proto"
-
-# 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=
-	>=media-libs/lcms-2.5:2=
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg:0=
-	kerberos? ( virtual/krb5 )
-	sctp? ( net-misc/lksctp-tools )
-	smartcard? ( sys-apps/pcsc-lite )
-	sunec? ( >=dev-libs/nss-3.16.1-r1 )"
-
-# 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
-	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
-# 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/icedtea-bin:8
-		dev-java/icedtea-bin:7
-		dev-java/icedtea:8
-		dev-java/icedtea:7
-	)
-	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="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-	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="icedtea-8 icedtea-7"
-	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() {
-	# For bootstrap builds as the sandbox control file might not yet exist.
-	addpredict /proc/self/coredump_filter
-
-	# 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 arm64 || use ppc64 || use sparc || use x86; }; then
-		hotspot_port="yes"
-	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; then
-			hs_config="--with-hotspot-build=shenandoah"
-			hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
-		else
-			eerror "Shenandoah can only be built on x86_64. Please re-build with USE="-shenandoah""
-		fi
-	else
-		hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
-	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
-
-	# Warn about potential problems with ccache enabled
-	if has ccache ${FEATURES}; then
-		ewarn 'ccache has been known to break IcedTea. Disable it before filing bugs.'
-		config+=" --enable-ccache"
-	else
-		config+=" --disable-ccache"
-	fi
-
-	config+=" --with-parallel-jobs=$(makeopts_jobs)"
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	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" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--with-pkgversion="Gentoo ${PF}" \
-		--disable-downloading --disable-Werror --disable-tests \
-		--enable-system-lcms --enable-system-jpeg \
-		--enable-system-zlib --disable-systemtap-tests \
-		--enable-improved-font-rendering \
-		$(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_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
-		$(use_enable pch precompiled-headers) \
-		$(use_enable sctp system-sctp) \
-		$(use_enable smartcard system-pcsc) \
-		$(use_enable sunec) \
-		${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
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
-	mkdir "${T}/certgen" && cd "${T}/certgen" || die
-	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
-	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
-		openssl x509 -text -in "${c}" >> all.crt || die
-	done
-	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-	java-vm_install-env "${FILESDIR}/icedtea.env.sh"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/dev-java/icedtea/icedtea-3.7.0.ebuild b/dev-java/icedtea/icedtea-3.7.0.ebuild
index 7989665..b1c7388 100644
--- a/dev-java/icedtea/icedtea-3.7.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.7.0.ebuild
@@ -66,8 +66,8 @@ LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 M
 KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 IUSE="+alsa cacao +cups doc examples +gtk headless-awt
-	jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch
-	pulseaudio sctp selinux shenandoah smartcard +source +sunec test +webstart zero"
+	jamvm +jbootstrap kerberos libressl pax_kernel +pch
+	sctp selinux shenandoah smartcard +source +sunec test zero"
 
 REQUIRED_USE="gtk? ( !headless-awt )"
 
@@ -109,7 +109,6 @@ COMMON_DEP="
 # 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
 	virtual/ttf-fonts
 	alsa? ( ${ALSA_COMMON_DEP} )
@@ -150,10 +149,6 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_
 	virtual/pkgconfig
 	pax_kernel? ( sys-apps/elfix )"
 
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-	pulseaudio? ( dev-java/icedtea-sound )"
-
 S="${WORKDIR}"/${ICEDTEA_PKG}
 
 # @FUNCTION: get_systemtap_arch
diff --git a/dev-java/icedtea/icedtea-7.2.6.9.ebuild b/dev-java/icedtea/icedtea-7.2.6.9.ebuild
index ca5577e..3ee1802 100644
--- a/dev-java/icedtea/icedtea-7.2.6.9.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.9.ebuild
@@ -130,14 +130,14 @@ RDEPEND="${COMMON_DEP}
 # ca-certificates, perl and openssl are used for the cacerts keystore generation
 DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
 	|| (
-		>=dev-java/jamvm-2.0.0-r100
+		dev-java/jamvm:2.0-3
 		dev-java/icedtea:7
 	)
 	app-arch/cpio
 	app-arch/unzip
 	app-arch/zip
 	app-misc/ca-certificates
-	>=dev-java/ant-core-1.8.2
+	dev-java/ant-core:bootstrap
 	dev-lang/perl
 	>=dev-libs/libxslt-1.1.26
 	!libressl? ( dev-libs/openssl )
@@ -169,7 +169,7 @@ pkg_setup() {
 	icedtea_check_requirements
 
 	JAVA_PKG_WANT_BUILD_VM="
-		jamvm-bootstrap	icedtea-7	gcj-jdk"
+		jamvm-2.0-2	icedtea-7	gcj-jdk"
 	JAVA_PKG_WANT_SOURCE="1.5"
 	JAVA_PKG_WANT_TARGET="1.5"
 
diff --git a/dev-java/jamvm/Manifest b/dev-java/jamvm/Manifest
index 1ff2ce1..cf9ea34 100644
--- a/dev-java/jamvm/Manifest
+++ b/dev-java/jamvm/Manifest
@@ -1,12 +1,17 @@
 AUX classes-location.patch 1184 BLAKE2B 367fad8488bf6866021aade628221a7ce53a000fc6cba0b59bbe4b2145d30a07cb6d057dcc7a4ea370f82926e0171021e50691ce35959b129802ad38d441983d SHA512 0e441916dbf66289bea37da807a85930a9fe320b5c3a5301df85a870418125fe9fe0c5fb7ce7e4baa9dfc75a3438509e9d77b0ede67b06411935875ec7e641ee
-AUX jamvm-1.5.1.env 378 BLAKE2B 0d35f75ab71d3ecfd194c47eade38076cbd1856c009692e6c959712546aeb845f445914bc4005660ad4209a0faeb3327bb818a9a89b5b6e575b42da215f899b0 SHA512 c71b3a1f689778e67fd977bc7f338784868bf09d6fd0444d1b23da8abc3e8d8d93e01e85a840420c6efa89af3676327c2f1bf93dc62a2c35a7ee314542a89a41
-AUX jamvm-2.0.0-classes-location.patch 1276 BLAKE2B 7e7fd91a3dcdc1eeea665517043a856bf8ab3e76d6dd91a27ea91c422555fde0c0bc853a4410bc4feb6552efae1d9ba577e39f5f9774aa2b2f601dfcb251826c SHA512 c399cb8ebce0556a778a1511fec43eeedc2e8d4b1ca732ebd201faf49d6a607baef914fb54e34f2c5b494ace6f5c072d296fb30c65038461e97a518c9e1924bd
-AUX jamvm-2.0.0-env.file 545 BLAKE2B 74c79f1d671806404afb191be4e1d6d02546e3a100dd6e153cb43845ec47cb4bc77b44cc2dde656595aad1c7dad5355b9f69d48cbadd71dba77c1954a89677e3 SHA512 612620f2ad3d98f6cf0c4f8e07a4f8086be0d1128b65a0e3318418bb331eff6720a7f3b73a50f5fc0e9f27ad94561044ff16a9796539640bd6019ecf34d0e1cc
+AUX jamvm-1.5.1.env 502 BLAKE2B 51e16cc15c1e6392b3c9d37089c1c8e73f64ec0431a90369ba60fd0bc6751c6aa8d3af5283a14ddb509091bb0a9390ba131c7b8bc92f1f371b7ea95a5d6c1f4f SHA512 b00ff86eb6de75c73b46f8f6dff14be1cf290d1b9d2942710fb9b6c2c90543cf2eb0e92d40df42804e9b5ff644b9099ff78a272cc2e253cfc85ee619a7d46ab6
+AUX jamvm-2.0.0-2-classes-location.patch 1278 BLAKE2B 9da04a8e239ae8522ff055ea56d09f69be348701fc2790b38143d78425a1396168daa55bb609b88a26638d879b5bea0bf040224f5e867416038b4b0de7b86705 SHA512 841ef1ebe425127130883c8b20372e558bf072c8fa596aa61f6d68a9cc1fd6716e1a92d7d4563a973470a537e26b4d3e0a6ac3d46b8c9dc73cada9aaf48ed193
+AUX jamvm-2.0.0-2-env.file 549 BLAKE2B 328469234c99b25df79c2324491fb12d3a7c7baf95a58729b81c40aad019061be8b564b8931c7f39c24e8146e64cf06575142c4e1dd393370c44cb3bc9f5ce68 SHA512 f8a4350c4281f04c120471765b112dcb02bea4302cb2e3c37c0d65d46c7c59620b2572eb2ab0e2e32c2b50c381a34b71de4183101f98fd3466e15168a032be84
+AUX jamvm-2.0.0-3-classes-location.patch 1278 BLAKE2B 09375a5f0a975868679e959a35eebed9290db064edc2278ecffab282cd1641247f4fcdaf2ad3c79b24aa0c0033745c6e70450d4180868486bd150e3f678555ef SHA512 60bac0cd29d1d0affa01a6eb5f5deb6c29e72c26c5bfc172754ba528d28ab45fd6fc522dc3b4dee103c557a883140dff6a54398a710ee2312a42de964e648162
+AUX jamvm-2.0.0-3-env.file 549 BLAKE2B 51d4f1c4aa8331eb75817ab93cc2e941eb2e83f3c5312577cf88fa686b4a8fd659bd62969d0dbc2380a2abda207f2691482bb9a78be40652b40368ab1e24b395 SHA512 e551495436bd8c0f6be7b7950fb7c56d494fca1469dafa2f222ca9c310e3e3e4fd7b3f16c0a68488d3f1405fd596772efe8b71f9bd99b630609a786f6f03d08f
+AUX jamvm-2.0.0-classes-location.patch 1278 BLAKE2B 10a7851ad9f0c7651aaed7ff0e72a2c96a04157dedbcc38eefc465ad436a5011fea94b11e793a746d825384e80149444d93955ef35ef2fa7c6f87b8cffef08e8 SHA512 45299cbcfd17aaae64f0a1678462970704543dfeed7162b03eb732b415f497aedf83fbb831782226b30e2508d61ba4e72d60d54b4f4fa8347bedf2934cb15a1c
+AUX jamvm-2.0.0-env.file 547 BLAKE2B 805af8fd4b6ba6452d645a4ae46d9ecdb74cbd9b6d13ffe4f0ab545963bfaf6b4ec2a7b57f39b5143d59816e0838054fb07bcf9dc0ee1fa7b48abf5b7cc2448b SHA512 6135a2ca9eafa39619a8f427864e81589e38b061be31dfb5cbfdf19b2530a4f7aab1b50de5cdc4c37f696f8e92cd96684845fd107a3bfa937a2fa334225c15de
 AUX jamvm-2.0.0-javac.in 1739 BLAKE2B ff167bfba594dbfb71dd1d09e41ce502ebfcc598fbcef0794cb967c00894745f8b16412adc7b4afbd167878defa29351e99b30a71b4377987c5c8a692f404e30 SHA512 65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb
 AUX jamvm-2.0.0-noexecstack.patch 1387 BLAKE2B afd020772bf627c3dbd6b5da9e03d3b03e8f5c9dc3844279fe325183819cb11deadaedb4920ebfb0c6b25321daeee9f0e4fff45addd162e2b6c02e3f3ea12d31 SHA512 17c38ad0017e5659295dea7ed57f263eb0eee673bbc1f5d1e44e0c8fe588f4172a8a05c832a1fd41f3dc094779fade66aa710c8ce48c754412b0b6afdea6551a
 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 1686 BLAKE2B af5b31e441f7dfe6fbd42bdecb976dc344eab91d744d62562eae8edb0d07b0f18713df52d067fafb74f2b71ea4a588300d557b9d5bf6c75904bfb85d0f723e88 SHA512 3ef5b3d03aaa2f84801b36c688f27a1dbc535f71822079491a7b0ba7d8569ad9edd5db3d7f551a8e7c01274d084b583162b6d95fd864027cff1f2a90839b9e5a
-EBUILD jamvm-2.0.0-r100.ebuild 3997 BLAKE2B d70cca1363723c45621d62df532a395179e4d12b59b1c884287821e06af44e90ff4a4e3752093a2a28b33f900e891c9f7e9c9cfbef1d46ea4ed7f05f2ec30f6f SHA512 7be4b6122255914c0b7616adfd2f7cda35448e638b9470509cb0c9f2cf0535084adc2af286c2d45a80d0d4b5a697a19c781354eb3d6920ebce23a86e1db9bfa8
-EBUILD jamvm-2.0.0-r99.ebuild 4040 BLAKE2B 1803cb1e481b9dc1208f6ae0acd9131a611f483639e91cb2f2137f1ec0a1fa971cdd7758c3805c4243a305b8349a39e2d637ea728341a892b260e8081907279b SHA512 2e9deb7574e94bbd58c2d172007a40226b97c47fa605b534361d68178a2c92a7c7c46caa36abd1e5e4f82fdcd9a7cee20c8c49005133a8af94218405bee28856
+EBUILD jamvm-1.5.1.ebuild 1678 BLAKE2B ce5004db30b6b6062fd703ad6303c225e38b30e17a27e1fad3dd4896f09309c9e70c1b01cf5ccc275b74083e9134ced379537a1047e111068627fb4f7e7544b7 SHA512 847d70b720b02302975f281aa33506de2a27587bb964b9ecabb0b1461e781b1b978cad3c2f203ca8c2fedb206e7273f4f3b48b069112b82790526771e3dadca0
+EBUILD jamvm-2.0.0-r10.ebuild 4219 BLAKE2B b585af6b56568eba2cb6209b52c2f4a9704ec5504a109abbedeab2c187cf5bbe094236296aff5ba8fd7de032e72610da3ae1268a09c747d5ac3fb22ce956fb1b SHA512 8cbb68442ce2bbd4ed9d564c93a5e0fd0027b6eb68daea752962174a7af1365c2aab0a03cf4ea50cc3cb55000a7cf4db54fccfcd23f11d3dbbc320eb53a59cdb
+EBUILD jamvm-2.0.0-r20.ebuild 4221 BLAKE2B ede08481ed657e5ddb7db69addd86f54e246871dce7a5a6f6f484485bb99f7dca9d4ee9a616d314ecef0c6b09df5a0fdc100ea0053d40c8abea93e7cbe9e82a0 SHA512 3a3a96e221e3a06ae61c028f91554ba8c32e18160db3ae06ab851f9c43b054f191b2baa9522742dce9f1d8dd640ef5f58ddfcea5d421788641bd24608135e7c0
+EBUILD jamvm-2.0.0.ebuild 4124 BLAKE2B 06feced993e3c8ca65aab256d600f81fde6b88bc02194f51f9a8940e059e02f07021df5c94d1ab35965f197de94684a44662c3b3c06e29a6fe3c3c14f8f3b2eb SHA512 f7eeb3554eae8c4a2b0f7961d8cbe54206faea734125e0a71372323226c5c7da103bf80cab08727c4bd930a20ea8174b4d612b2e9e145a744f52ce4926c6ff7c
 MISC metadata.xml 252 BLAKE2B a3a36edd6c0b4e630f0e38d236ff4133a5c6b4aa42f5525d8a0978ecdbbe3d53602d3fcde02cf1a495bfabb4fd06f914826df44bda7f542ce8543b32fd7bbfe2 SHA512 1ab83f56876901e45f2b34aa5c81bd1d7b243009236d238b49fca2d49ec167c596ea589de6df1c8dfe1a6b834a2e0e493409ee65d499bd2b6ecaf687ae71df69
diff --git a/dev-java/jamvm/files/jamvm-1.5.1.env b/dev-java/jamvm/files/jamvm-1.5.1.env
index 7f95cf8..f4622e8 100644
--- a/dev-java/jamvm/files/jamvm-1.5.1.env
+++ b/dev-java/jamvm/files/jamvm-1.5.1.env
@@ -1,12 +1,12 @@
 VERSION="JamVM @PV@"
-JAVA_HOME=/usr/@PN@
-BOOTCLASSPATH="/usr/share/@PN@/classes.zip:/usr/share/classpath/glibj.zip"
-JDK_HOME=/usr/@PN@
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@PN@"
+BOOTCLASSPATH="@GENTOO_PORTAGE_EPREFIX@/usr/share/@PN@/classes.zip:/usr/share/classpath/glibj.zip"
+JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@PN@"
 JAVAC=${JAVA_HOME}/bin/javac
 PATH="${JAVA_HOME}/bin"
 ROOTPATH="${JAVA_HOME}/bin"
 PROVIDES_TYPE="JDK JRE"
 PROVIDES_VERSION="1.4"
 GENERATION="2"
-LDPATH="/usr/@PN@/@LIBDIR@:/usr/@LIBDIR@/classpath"
+LDPATH="@GENTOO_PORTAGE_EPREFIX@/usr/@PN@/@LIBDIR@:@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/classpath"
 ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH LDPATH"
diff --git a/dev-java/jamvm/files/jamvm-2.0.0-2-classes-location.patch b/dev-java/jamvm/files/jamvm-2.0.0-2-classes-location.patch
new file mode 100644
index 0000000..e3fd8f3
--- /dev/null
+++ b/dev-java/jamvm/files/jamvm-2.0.0-2-classes-location.patch
@@ -0,0 +1,27 @@
+diff -Nru jamvm-2.0.0.old/configure.ac jamvm-2.0.0/configure.ac
+--- jamvm-2.0.0.old/configure.ac	2014-06-10 21:33:37.000000000 +0100
++++ jamvm-2.0.0/configure.ac	2014-11-28 19:22:12.183091414 +0000
+@@ -236,6 +236,7 @@
+     install_dir=$prefix
+ fi
+ AC_DEFINE_UNQUOTED(INSTALL_DIR, "$install_dir", [Installation directory (prefix)])
++AC_DEFINE_UNQUOTED(PKGDATADIR, "$datadir/$PACKAGE", [Package data directory (pkgdatadir)])
+ 
+ AC_ARG_ENABLE(zip,
+     [AS_HELP_STRING(--disable-zip,turn-off zip support in the bootstrap loader)],,)
+diff -Nru jamvm-2.0.0.old/src/classlib/gnuclasspath/class.c jamvm-2.0.0/src/classlib/gnuclasspath/class.c
+--- jamvm-2.0.0.old/src/classlib/gnuclasspath/class.c	2012-05-17 22:01:47.000000000 +0100
++++ jamvm-2.0.0/src/classlib/gnuclasspath/class.c	2014-11-28 19:23:27.312108240 +0000
+@@ -110,10 +110,10 @@
+    separate class files in a directory structure */
+ 
+ #ifdef USE_ZIP
+-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes.zip"
++#define JAMVM_CLASSES PKGDATADIR"/classes-2.zip"
+ #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath/glibj.zip"
+ #else
+-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes"
++#define JAMVM_CLASSES PKGDATADIR"/classes"
+ #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath"
+ #endif
+ 
diff --git a/dev-java/jamvm/files/jamvm-2.0.0-2-env.file b/dev-java/jamvm/files/jamvm-2.0.0-2-env.file
new file mode 100644
index 0000000..000558c
--- /dev/null
+++ b/dev-java/jamvm/files/jamvm-2.0.0-2-env.file
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="JamVM JDK @PV@"
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/@PN@-jdk2"
+JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/@PN@-jdk2"
+BOOTCLASSPATH="@GENTOO_PORTAGE_EPREFIX@/usr/share/@PN@/classes-2.zip:${JAVA_HOME}/jre/lib/rt.jar"
+JAVAC="${JAVA_HOME}/bin/javac"
+PATH="${JAVA_HOME}/bin"
+ROOTPATH="${JAVA_HOME}/bin"
+PROVIDES_TYPE="JRE"
+PROVIDES_VERSION="1.5"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JAVAC PATH"
+LDPATH="${JAVA_HOME}/lib"
diff --git a/dev-java/jamvm/files/jamvm-2.0.0-3-classes-location.patch b/dev-java/jamvm/files/jamvm-2.0.0-3-classes-location.patch
new file mode 100644
index 0000000..cc0ed64
--- /dev/null
+++ b/dev-java/jamvm/files/jamvm-2.0.0-3-classes-location.patch
@@ -0,0 +1,27 @@
+diff -Nru jamvm-2.0.0.old/configure.ac jamvm-2.0.0/configure.ac
+--- jamvm-2.0.0.old/configure.ac	2014-06-10 21:33:37.000000000 +0100
++++ jamvm-2.0.0/configure.ac	2014-11-28 19:22:12.183091414 +0000
+@@ -236,6 +236,7 @@
+     install_dir=$prefix
+ fi
+ AC_DEFINE_UNQUOTED(INSTALL_DIR, "$install_dir", [Installation directory (prefix)])
++AC_DEFINE_UNQUOTED(PKGDATADIR, "$datadir/$PACKAGE", [Package data directory (pkgdatadir)])
+ 
+ AC_ARG_ENABLE(zip,
+     [AS_HELP_STRING(--disable-zip,turn-off zip support in the bootstrap loader)],,)
+diff -Nru jamvm-2.0.0.old/src/classlib/gnuclasspath/class.c jamvm-2.0.0/src/classlib/gnuclasspath/class.c
+--- jamvm-2.0.0.old/src/classlib/gnuclasspath/class.c	2012-05-17 22:01:47.000000000 +0100
++++ jamvm-2.0.0/src/classlib/gnuclasspath/class.c	2014-11-28 19:23:27.312108240 +0000
+@@ -110,10 +110,10 @@
+    separate class files in a directory structure */
+ 
+ #ifdef USE_ZIP
+-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes.zip"
++#define JAMVM_CLASSES PKGDATADIR"/classes-3.zip"
+ #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath/glibj.zip"
+ #else
+-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes"
++#define JAMVM_CLASSES PKGDATADIR"/classes"
+ #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath"
+ #endif
+ 
diff --git a/dev-java/jamvm/files/jamvm-2.0.0-3-env.file b/dev-java/jamvm/files/jamvm-2.0.0-3-env.file
new file mode 100644
index 0000000..2a7e528
--- /dev/null
+++ b/dev-java/jamvm/files/jamvm-2.0.0-3-env.file
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="JamVM JDK @PV@"
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/@PN@-jdk3"
+JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/@PN@-jdk3"
+BOOTCLASSPATH="@GENTOO_PORTAGE_EPREFIX@/usr/share/@PN@/classes-3.zip:${JAVA_HOME}/jre/lib/rt.jar"
+JAVAC="${JAVA_HOME}/bin/javac"
+PATH="${JAVA_HOME}/bin"
+ROOTPATH="${JAVA_HOME}/bin"
+PROVIDES_TYPE="JRE"
+PROVIDES_VERSION="1.5"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JAVAC PATH"
+LDPATH="${JAVA_HOME}/lib"
diff --git a/dev-java/jamvm/files/jamvm-2.0.0-classes-location.patch b/dev-java/jamvm/files/jamvm-2.0.0-classes-location.patch
index 6cf7611..2c1cd29 100644
--- a/dev-java/jamvm/files/jamvm-2.0.0-classes-location.patch
+++ b/dev-java/jamvm/files/jamvm-2.0.0-classes-location.patch
@@ -17,7 +17,7 @@ diff -Nru jamvm-2.0.0.old/src/classlib/gnuclasspath/class.c jamvm-2.0.0/src/clas
  
  #ifdef USE_ZIP
 -#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes.zip"
-+#define JAMVM_CLASSES PKGDATADIR"/classes.zip"
++#define JAMVM_CLASSES PKGDATADIR"/classes-1.zip"
  #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath/glibj.zip"
  #else
 -#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes"
diff --git a/dev-java/jamvm/files/jamvm-2.0.0-env.file b/dev-java/jamvm/files/jamvm-2.0.0-env.file
index 58fe948..ecc9ddf 100644
--- a/dev-java/jamvm/files/jamvm-2.0.0-env.file
+++ b/dev-java/jamvm/files/jamvm-2.0.0-env.file
@@ -4,7 +4,7 @@
 VERSION="JamVM JDK @PV@"
 JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/@PN@-jdk"
 JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/@PN@-jdk"
-BOOTCLASSPATH="@GENTOO_PORTAGE_EPREFIX@/usr/share/@PN@/classes.zip:${JAVA_HOME}/jre/lib/rt.jar"
+BOOTCLASSPATH="@GENTOO_PORTAGE_EPREFIX@/usr/share/@PN@/classes-1.zip:${JAVA_HOME}/jre/lib/rt.jar"
 JAVAC="${JAVA_HOME}/bin/javac"
 PATH="${JAVA_HOME}/bin"
 ROOTPATH="${JAVA_HOME}/bin"
diff --git a/dev-java/jamvm/jamvm-1.5.1.ebuild b/dev-java/jamvm/jamvm-1.5.1.ebuild
index 5ce0537..e9e08b8 100644
--- a/dev-java/jamvm/jamvm-1.5.1.ebuild
+++ b/dev-java/jamvm/jamvm-1.5.1.ebuild
@@ -10,11 +10,10 @@ HOMEPAGE="http://jamvm.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="bootstrap"
+SLOT="1.5"
 KEYWORDS="amd64"
 
-CLASSPATH_SLOT="bootstrap"
-DEPEND="dev-java/gnu-classpath:${CLASSPATH_SLOT}"
+DEPEND="dev-java/gnu-classpath:0.93"
 
 RDEPEND="${DEPEND}"
 
@@ -65,4 +64,5 @@ src_install() {
 	dodir ${bindir}
 	dosym /usr/bin/jamvm ${bindir}/java
 	dosym /usr/bin/jikes ${bindir}/javac
+	dosym /usr/bin/fastjar ${bindir}/jar
 }
diff --git a/dev-java/jamvm/jamvm-2.0.0-r10.ebuild b/dev-java/jamvm/jamvm-2.0.0-r10.ebuild
new file mode 100644
index 0000000..9940de6
--- /dev/null
+++ b/dev-java/jamvm/jamvm-2.0.0-r10.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib java-pkg-2 java-vm-2 autotools
+
+DESCRIPTION="An extremely small and specification-compliant virtual machine"
+HOMEPAGE="http://jamvm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2.0-2"
+KEYWORDS="amd64"
+IUSE="libffi"
+
+DEPEND="dev-java/gnu-classpath:0.99-devel
+	dev-java/eclipse-ecj:3.2
+	libffi? ( virtual/libffi )
+	ppc64? ( virtual/libffi )
+	sparc? ( virtual/libffi )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/"${P}-2-classes-location.patch"
+	"${FILESDIR}"/"${P}-noexecstack.patch"
+)
+
+src_prepare() {
+	# without this patch, classes-2.zip is not found at runtime
+	epatch "${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!"
+
+	eautoreconf
+
+	# These come precompiled.
+	# configure script uses detects the compiler
+	# from PATH. I guess we should compile this from source.
+	# Then just make sure not to hit
+	# https://bugs.gentoo.org/show_bug.cgi?id=163801
+	#
+	rm -v src/classlib/gnuclasspath/lib/classes.zip || die
+}
+
+pkg_setup() {
+	JAVA_PKG_WANT_BUILD_VM="jamvm-2.0"
+	JAVA_PKG_WANT_SOURCE="1.5"
+	JAVA_PKG_WANT_TARGET="1.5"
+
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_configure() {
+	export CLASSPATH="${EPREFIX}"/usr/$(get_libdir)/classpath-0.99-devel/share/classpath/glibj.zip
+
+	filter-flags "-fomit-frame-pointer"
+
+	if use ppc64 || use sparc || use libffi; then
+		append-cflags "$(pkg-config --cflags-only-I libffi)"
+	fi
+
+	local fficonf="--enable-ffi"
+	if { ! use ppc64 && ! use sparc; }; then
+		fficonf="$(use_enable libffi ffi)"
+	fi
+
+	econf ${fficonf} \
+		--disable-dependency-tracking \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN}-jdk2 \
+		--datadir="${EPREFIX}"/usr/share \
+		--bindir="${EPREFIX}"/usr/bin \
+		--includedir="${EPREFIX}"/usr/include/${PN}2 \
+		--with-classpath-install-dir="${EPREFIX}/usr/$(get_libdir)/classpath-0.99-devel"
+}
+
+src_compile() {
+	export LD_LIBRARY_PATH="${EPREFIX}/usr/$(get_libdir)/classpath-0.99-devel/$(get_libdir)"
+	default
+}
+
+src_install() {
+	local libdir=$(get_libdir)
+	local CLASSPATH_DIR="${EPREFIX}"/usr/${libdir}/classpath-0.99-devel/bin
+	local JDK_DIR="${EPREFIX}"/usr/${libdir}/${PN}-jdk2
+
+	emake DESTDIR="${D}" install
+
+	dodoc ACKNOWLEDGEMENTS AUTHORS ChangeLog NEWS README
+
+	set_java_env "${FILESDIR}/${P}-2-env.file"
+
+	dodir ${JDK_DIR}/bin
+	mv "${ED}"usr/bin/jamvm "${ED}"usr/bin/jamvm-2.0-2
+	mv "${ED}"usr/share/jamvm/classes.zip "${ED}"usr/share/jamvm/classes-2.zip
+	dosym "${EPREFIX}"/usr/bin/jamvm-2.0-2 ${JDK_DIR}/bin/java
+	for files in ${CLASSPATH_DIR}/g*; do
+		if [ $files = "${CLASSPATH_DIR}/bin/gjdoc" ] ; then
+			dosym $files ${JDK_DIR}/bin/javadoc || die
+		else
+			dosym $files \
+				${JDK_DIR}/bin/$(echo $files|sed "s#$(dirname $files)/g##") || die
+		fi
+	done
+
+	dodir ${JDK_DIR}/jre/lib
+	dosym "${EPREFIX}"/usr/${libdir}/classpath-0.99-devel/share/classpath/glibj.zip ${JDK_DIR}/jre/lib/rt.jar
+	dodir ${JDK_DIR}/lib
+	dosym "${EPREFIX}"/usr/${libdir}/classpath-0.99-devel/classpath/tools.zip ${JDK_DIR}/lib/tools.jar
+	dosym "${EPREFIX}/usr/${libdir}/classpath-0.99-devel/include/" ${JDK_DIR}/include
+
+	local ecj_jar="${EPREFIX}"/usr/share/eclipse-ecj-3.2/lib/ecj.jar
+	exeinto ${JDK_DIR}/bin
+	sed -e "s#@JAVA@#/usr/bin/jamvm-2.0-2#" \
+		-e "s#@ECJ_JAR@#${ecj_jar}#" \
+		-e "s#@RT_JAR@#/usr/${libdir}/jamvm-jdk2/jre/lib/rt.jar#" \
+		-e "s#@TOOLS_JAR@#/usr/${libdir}/jamvm-jdk2/lib/tools.jar#" \
+		"${FILESDIR}"/"${P}-javac.in" | newexe - javac
+
+	local libarch="${ARCH}"
+	[ ${ARCH} == x86 ] && libarch="i386"
+	[ ${ARCH} == x86_64 ] && libarch="amd64"
+	dodir ${JDK_DIR}/jre/lib/${libarch}/client
+	dodir ${JDK_DIR}/jre/lib/${libarch}/server
+
+	# Can't use java-vm_set-pax-markings as doesn't work with symbolic links
+	# Ensure a PaX header is created.
+	local pax_markings="C"
+	# Usually disabling MPROTECT is sufficient.
+	local pax_markings+="m"
+	# On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
+	use x86 && pax_markings+="sp"
+
+	pax-mark ${pax_markings} "${ED}"/usr/bin/jamvm-2.0-2
+}
diff --git a/dev-java/jamvm/jamvm-2.0.0-r100.ebuild b/dev-java/jamvm/jamvm-2.0.0-r20.ebuild
similarity index 58%
rename from dev-java/jamvm/jamvm-2.0.0-r100.ebuild
rename to dev-java/jamvm/jamvm-2.0.0-r20.ebuild
index c06dc18..30c0365 100644
--- a/dev-java/jamvm/jamvm-2.0.0-r100.ebuild
+++ b/dev-java/jamvm/jamvm-2.0.0-r20.ebuild
@@ -3,18 +3,18 @@
 
 EAPI=5
 
-inherit eutils flag-o-matic multilib java-vm-2 autotools
+inherit eutils flag-o-matic multilib java-pkg-2 java-vm-2 autotools
 
 DESCRIPTION="An extremely small and specification-compliant virtual machine"
 HOMEPAGE="http://jamvm.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="bootstrap"
+SLOT="2.0-3"
 KEYWORDS="amd64"
 IUSE="libffi"
 
-DEPEND="dev-java/gnu-classpath:bootstrap
+DEPEND="dev-java/gnu-classpath:0.99-devel
 	dev-java/eclipse-ecj:4.2
 	libffi? ( virtual/libffi )
 	ppc64? ( virtual/libffi )
@@ -22,12 +22,12 @@ DEPEND="dev-java/gnu-classpath:bootstrap
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/"${P}-classes-location.patch"
+	"${FILESDIR}"/"${P}-3-classes-location.patch"
 	"${FILESDIR}"/"${P}-noexecstack.patch"
 )
 
 src_prepare() {
-	# without this patch, classes.zip is not found at runtime
+	# without this patch, classes-3.zip is not found at runtime
 	epatch "${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!"
@@ -43,8 +43,17 @@ src_prepare() {
 	rm -v src/classlib/gnuclasspath/lib/classes.zip || die
 }
 
+pkg_setup() {
+	JAVA_PKG_WANT_BUILD_VM="jamvm-2.0-2"
+	JAVA_PKG_WANT_SOURCE="1.5"
+	JAVA_PKG_WANT_TARGET="1.5"
+
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
 src_configure() {
-	export CLASSPATH=/usr/share/classpath/glibj.zip
+	export CLASSPATH="${EPREFIX}"/usr/$(get_libdir)/classpath-0.99-devel/share/classpath/glibj.zip
 
 	filter-flags "-fomit-frame-pointer"
 
@@ -59,40 +68,33 @@ src_configure() {
 
 	econf ${fficonf} \
 		--disable-dependency-tracking \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
-		--includedir="${EPREFIX}"/usr/include/${PN} \
-		--with-classpath-install-dir="${EPREFIX}/usr"
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN}-jdk3 \
+		--datadir="${EPREFIX}"/usr/share \
+		--bindir="${EPREFIX}"/usr/bin \
+		--includedir="${EPREFIX}"/usr/include/${PN}3 \
+		--with-classpath-install-dir="${EPREFIX}/usr/$(get_libdir)/classpath-0.99-devel"
 }
 
 src_compile() {
-	export LD_LIBRARY_PATH="${EPREFIX}/usr/$(get_libdir)/classpath"
+	export LD_LIBRARY_PATH="${EPREFIX}/usr/$(get_libdir)/classpath-0.99-devel/$(get_libdir)"
 	default
 }
 
-create_launcher() {
-	local script="${D}/${INSTALL_DIR}/bin/${1}"
-	cat > "${script}" <<-EOF
-		#!/bin/sh
-		exec /usr/bin/jamvm \
-			-Xbootclasspath/p:/usr/share/classpath/tools.zip" \
-			gnu.classpath.tools.${1}.Main "\$@"
-	EOF
-	chmod +x "${script}" || die
-}
-
 src_install() {
 	local libdir=$(get_libdir)
-	local CLASSPATH_DIR=/usr/libexec/gnu-classpath
-	local JDK_DIR=/usr/${libdir}/${PN}-jdk
+	local CLASSPATH_DIR="${EPREFIX}"/usr/${libdir}/classpath-0.99-devel/bin
+	local JDK_DIR="${EPREFIX}"/usr/${libdir}/${PN}-jdk3
 
 	emake DESTDIR="${D}" install
 
 	dodoc ACKNOWLEDGEMENTS AUTHORS ChangeLog NEWS README
 
-	set_java_env "${FILESDIR}/${P}-env.file"
+	set_java_env "${FILESDIR}/${P}-3-env.file"
 
 	dodir ${JDK_DIR}/bin
-	dosym /usr/bin/jamvm ${JDK_DIR}/bin/java
+	mv "${ED}"usr/bin/jamvm "${ED}"usr/bin/jamvm-2.0-3
+	mv "${ED}"usr/share/jamvm/classes.zip "${ED}"usr/share/jamvm/classes-3.zip
+	dosym "${EPREFIX}"/usr/bin/jamvm-2.0-3 ${JDK_DIR}/bin/java
 	for files in ${CLASSPATH_DIR}/g*; do
 		if [ $files = "${CLASSPATH_DIR}/bin/gjdoc" ] ; then
 			dosym $files ${JDK_DIR}/bin/javadoc || die
@@ -103,17 +105,17 @@ src_install() {
 	done
 
 	dodir ${JDK_DIR}/jre/lib
-	dosym /usr/share/classpath/glibj.zip ${JDK_DIR}/jre/lib/rt.jar
+	dosym "${EPREFIX}"/usr/${libdir}/classpath-0.99-devel/share/classpath/glibj.zip ${JDK_DIR}/jre/lib/rt.jar
 	dodir ${JDK_DIR}/lib
-	dosym "${EPREFIX}/usr/share/classpath/tools.zip" ${JDK_DIR}/lib/tools.jar
-	dosym "${EPREFIX}/usr/include/classpath" ${JDK_DIR}/include
+	dosym "${EPREFIX}"/usr/${libdir}/classpath-0.99-devel/classpath/tools.zip ${JDK_DIR}/lib/tools.jar
+	dosym "${EPREFIX}/usr/${libdir}/classpath-0.99-devel/include/" ${JDK_DIR}/include
 
-	local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+	local ecj_jar="${EPREFIX}"/usr/share/eclipse-ecj-4.2/lib/ecj.jar
 	exeinto ${JDK_DIR}/bin
-	sed -e "s#@JAVA@#/usr/bin/jamvm#" \
+	sed -e "s#@JAVA@#/usr/bin/jamvm-2.0-3#" \
 		-e "s#@ECJ_JAR@#${ecj_jar}#" \
-		-e "s#@RT_JAR@#/usr/share/classpath/glibj.zip#" \
-		-e "s#@TOOLS_JAR@#/usr/share/classpath/tools.zip#" \
+		-e "s#@RT_JAR@#/usr/${libdir}/jamvm-jdk3/jre/lib/rt.jar#" \
+		-e "s#@TOOLS_JAR@#/usr/${libdir}/jamvm-jdk3/lib/tools.jar#" \
 		"${FILESDIR}"/"${P}-javac.in" | newexe - javac
 
 	local libarch="${ARCH}"
@@ -121,8 +123,6 @@ src_install() {
 	[ ${ARCH} == x86_64 ] && libarch="amd64"
 	dodir ${JDK_DIR}/jre/lib/${libarch}/client
 	dodir ${JDK_DIR}/jre/lib/${libarch}/server
-	dosym /usr/${libdir}/${PN}/libjvm.so ${JDK_DIR}/jre/lib/${libarch}/client/libjvm.so
-	dosym /usr/${libdir}/${PN}/libjvm.so ${JDK_DIR}/jre/lib/${libarch}/server/libjvm.so
 
 	# Can't use java-vm_set-pax-markings as doesn't work with symbolic links
 	# Ensure a PaX header is created.
@@ -132,5 +132,5 @@ src_install() {
 	# On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
 	use x86 && pax_markings+="sp"
 
-	pax-mark ${pax_markings} "${ED}"/usr/bin/jamvm
+	pax-mark ${pax_markings} "${ED}"/usr/bin/jamvm-2.0-3
 }
diff --git a/dev-java/jamvm/jamvm-2.0.0-r99.ebuild b/dev-java/jamvm/jamvm-2.0.0.ebuild
similarity index 63%
rename from dev-java/jamvm/jamvm-2.0.0-r99.ebuild
rename to dev-java/jamvm/jamvm-2.0.0.ebuild
index 6eb901b..88dda46 100644
--- a/dev-java/jamvm/jamvm-2.0.0-r99.ebuild
+++ b/dev-java/jamvm/jamvm-2.0.0.ebuild
@@ -3,18 +3,18 @@
 
 EAPI=5
 
-inherit eutils flag-o-matic multilib java-vm-2 autotools
+inherit eutils flag-o-matic multilib java-pkg-2 java-vm-2 autotools
 
 DESCRIPTION="An extremely small and specification-compliant virtual machine"
 HOMEPAGE="http://jamvm.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="bootstrap"
+SLOT="2.0"
 KEYWORDS="amd64"
 IUSE="libffi"
 
-DEPEND="dev-java/gnu-classpath:bootstrap
+DEPEND="dev-java/gnu-classpath:0.99
 	dev-java/eclipse-ecj:3.2
 	libffi? ( virtual/libffi )
 	ppc64? ( virtual/libffi )
@@ -27,7 +27,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	# without this patch, classes.zip is not found at runtime
+	# without this patch, classes-1.zip is not found at runtime
 	epatch "${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!"
@@ -43,8 +43,17 @@ src_prepare() {
 	rm -v src/classlib/gnuclasspath/lib/classes.zip || die
 }
 
+pkg_setup() {
+	JAVA_PKG_WANT_BUILD_VM="jamvm-1.5"
+	JAVA_PKG_WANT_SOURCE="1.5"
+	JAVA_PKG_WANT_TARGET="1.5"
+
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
 src_configure() {
-	export CLASSPATH=/usr/share/classpath/glibj.zip
+	export CLASSPATH="${EPREFIX}"/usr/$(get_libdir)/classpath-0.99/share/classpath/glibj.zip
 	export JAVAC="${EPREFIX}/usr/bin/ecj-3.2"
 
 	filter-flags "-fomit-frame-pointer"
@@ -60,31 +69,20 @@ src_configure() {
 
 	econf ${fficonf} \
 		--disable-dependency-tracking \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN}-jdk \
 		--includedir="${EPREFIX}"/usr/include/${PN} \
-		--with-classpath-install-dir="${EPREFIX}/usr"
+		--with-classpath-install-dir="${EPREFIX}/usr/$(get_libdir)/classpath-0.99"
 }
 
 src_compile() {
-	export LD_LIBRARY_PATH="${EPREFIX}/usr/$(get_libdir)/classpath"
+	export LD_LIBRARY_PATH="${EPREFIX}/usr/$(get_libdir)/classpath-0.99/$(get_libdir)"
 	default
 }
 
-create_launcher() {
-	local script="${D}/${INSTALL_DIR}/bin/${1}"
-	cat > "${script}" <<-EOF
-		#!/bin/sh
-		exec /usr/bin/jamvm \
-			-Xbootclasspath/p:/usr/share/classpath/tools.zip" \
-			gnu.classpath.tools.${1}.Main "\$@"
-	EOF
-	chmod +x "${script}" || die
-}
-
 src_install() {
 	local libdir=$(get_libdir)
-	local CLASSPATH_DIR=/usr/libexec/gnu-classpath
-	local JDK_DIR=/usr/${libdir}/${PN}-jdk
+	local CLASSPATH_DIR="${EPREFIX}"/usr/${libdir}/classpath-0.99/bin
+	local JDK_DIR="${EPREFIX}"/usr/${libdir}/${PN}-jdk
 
 	emake DESTDIR="${D}" install
 
@@ -93,7 +91,9 @@ src_install() {
 	set_java_env "${FILESDIR}/${P}-env.file"
 
 	dodir ${JDK_DIR}/bin
-	dosym /usr/bin/jamvm ${JDK_DIR}/bin/java
+	mv "${ED}"usr/bin/jamvm "${ED}"usr/bin/jamvm-2.0
+	mv "${ED}"usr/share/jamvm/classes.zip "${ED}"usr/share/jamvm/classes-1.zip
+	dosym "${EPREFIX}"/usr/bin/jamvm-2.0 ${JDK_DIR}/bin/java
 	for files in ${CLASSPATH_DIR}/g*; do
 		if [ $files = "${CLASSPATH_DIR}/bin/gjdoc" ] ; then
 			dosym $files ${JDK_DIR}/bin/javadoc || die
@@ -104,17 +104,17 @@ src_install() {
 	done
 
 	dodir ${JDK_DIR}/jre/lib
-	dosym /usr/share/classpath/glibj.zip ${JDK_DIR}/jre/lib/rt.jar
+	dosym "${EPREFIX}"/usr/${libdir}/classpath-0.99/share/classpath/glibj.zip ${JDK_DIR}/jre/lib/rt.jar
 	dodir ${JDK_DIR}/lib
-	dosym "${EPREFIX}/usr/share/classpath/tools.zip" ${JDK_DIR}/lib/tools.jar
-	dosym "${EPREFIX}/usr/include/classpath" ${JDK_DIR}/include
+	dosym "${EPREFIX}"/usr/${libdir}/classpath-0.99/classpath/tools.zip ${JDK_DIR}/lib/tools.jar
+	dosym "${EPREFIX}/usr/${libdir}/classpath-0.99/include/" ${JDK_DIR}/include
 
-	local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+	local ecj_jar="${EPREFIX}"/usr/share/eclipse-ecj-3.2/lib/ecj.jar
 	exeinto ${JDK_DIR}/bin
-	sed -e "s#@JAVA@#/usr/bin/jamvm#" \
+	sed -e "s#@JAVA@#/usr/bin/jamvm-2.0#" \
 		-e "s#@ECJ_JAR@#${ecj_jar}#" \
-		-e "s#@RT_JAR@#/usr/share/classpath/glibj.zip#" \
-		-e "s#@TOOLS_JAR@#/usr/share/classpath/tools.zip#" \
+		-e "s#@RT_JAR@#/usr/${libdir}/jamvm-jdk/jre/lib/rt.jar#" \
+		-e "s#@TOOLS_JAR@#/usr/${libdir}/jamvm-jdk/lib/tools.jar#" \
 		"${FILESDIR}"/"${P}-javac.in" | newexe - javac
 
 	local libarch="${ARCH}"
@@ -122,8 +122,6 @@ src_install() {
 	[ ${ARCH} == x86_64 ] && libarch="amd64"
 	dodir ${JDK_DIR}/jre/lib/${libarch}/client
 	dodir ${JDK_DIR}/jre/lib/${libarch}/server
-	dosym /usr/${libdir}/${PN}/libjvm.so ${JDK_DIR}/jre/lib/${libarch}/client/libjvm.so
-	dosym /usr/${libdir}/${PN}/libjvm.so ${JDK_DIR}/jre/lib/${libarch}/server/libjvm.so
 
 	# Can't use java-vm_set-pax-markings as doesn't work with symbolic links
 	# Ensure a PaX header is created.
@@ -133,5 +131,5 @@ src_install() {
 	# On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
 	use x86 && pax_markings+="sp"
 
-	pax-mark ${pax_markings} "${ED}"/usr/bin/jamvm
+	pax-mark ${pax_markings} "${ED}"/usr/bin/jamvm-2.0
 }
diff --git a/profiles/repo_name b/profiles/repo_name
index 5395a4f..3e01690 100644
--- a/profiles/repo_name
+++ b/profiles/repo_name
@@ -1 +1 @@
-openjdk 11 bootstrap
+openjdk bootstrap
diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest
index d562650..e992124 100644
--- a/virtual/jdk/Manifest
+++ b/virtual/jdk/Manifest
@@ -1,3 +1,4 @@
-EBUILD jdk-1.4.ebuild 232 BLAKE2B d211381d126338f618fd5ffd5a79aa861e1131eb3157ddcbead8a84b050e2aeb94f2e4dcc4626c1b792a04ae678d29e84fd7f7ebc43526ddea8d3d278e2d7621 SHA512 1fa87ac13acfa3269ad016de78e9b64110de71a78ef1626020426fe5f1e626e13d87620e438aafbc47de28480a488b49799160788a99aab848be3ddcbbb2e397
-EBUILD jdk-1.6.ebuild 244 BLAKE2B c3eddb77520d596c22451c6ec35486b55827b62afd28d62b47046eae9474a29766aa8d9fd4693e0048b68d79eda858400c7fcfb03f0dac3d2b9d6971434926b2 SHA512 325617037f56b4a3862150a59dd708e48c861ad7c9952a2d2b52a5e8254e09445ea8b40ea9bc2d706ba47ff2bd24c36277d302067e5ed4ad8a80c9f2fefd5521
+EBUILD jdk-1.4.ebuild 228 BLAKE2B b8d13df90ece66eacbd60e27632b8c24792374fb8bac3cd8a0bd15c6c351aedc122447b979a8af6774cc0f600ea0f6105105b6954c3c92058a5bf39aaf3f8b73 SHA512 28fc9af3aee5105d8a62cce67d6ec39b024f3443d2a311d683445b7a0d89f0bd357c5278a3968d48edf5136fe4b0010a46efffa93e74931b90278fa21e7ed93f
+EBUILD jdk-1.5.ebuild 299 BLAKE2B 7afa97c8d9c66930a366d3028ffea4bc17d14f16a06fc26be0e12b8c0b461948d67a6f2abb1d00e822fa01aadbd276d6802ff8aebc066e3b7b63ff778d3bab1d SHA512 17951a5d0a4eb79bd35ee30d60ec55029a9d3744e6eaffba8a545330b9b68fac2480bc9c6a17d39cdae5ccbd5229bb2999046fe3550f547cb3c3313f99f2be4d
+EBUILD jdk-1.6.ebuild 307 BLAKE2B 0e31699224424cd04a701d4f4d4b9eb90361c8c78e3c659a5f81f42086e8f7765ddb2e00c0d093213588200a9a9b83ddd3bf3087d119e78e90d30939662f3b52 SHA512 7affd522fadb5f3ae118228ed9d7d00bbe45d5359ece6b36782a608e3793f9dd060be36173da86584585bb494a09721a4625ea115aa6e68ff9bca2f5c2dd7680
 MISC metadata.xml 252 BLAKE2B a3a36edd6c0b4e630f0e38d236ff4133a5c6b4aa42f5525d8a0978ecdbbe3d53602d3fcde02cf1a495bfabb4fd06f914826df44bda7f542ce8543b32fd7bbfe2 SHA512 1ab83f56876901e45f2b34aa5c81bd1d7b243009236d238b49fca2d49ec167c596ea589de6df1c8dfe1a6b834a2e0e493409ee65d499bd2b6ecaf687ae71df69
diff --git a/virtual/jdk/jdk-1.4.ebuild b/virtual/jdk/jdk-1.4.ebuild
index d6d4ef7..9fb6351 100644
--- a/virtual/jdk/jdk-1.4.ebuild
+++ b/virtual/jdk/jdk-1.4.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 DESCRIPTION="Virtual for Java Development Kit (JDK)"
-SLOT="1.4"
+SLOT="${PV}"
 KEYWORDS="amd64"
 
-RDEPEND="dev-java/jamvm:bootstrap"
+RDEPEND="dev-java/jamvm:1.5"
diff --git a/virtual/jdk/jdk-1.5.ebuild b/virtual/jdk/jdk-1.5.ebuild
new file mode 100644
index 0000000..be8044a
--- /dev/null
+++ b/virtual/jdk/jdk-1.5.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Virtual for Java Development Kit (JDK)"
+SLOT="${PV}"
+KEYWORDS="amd64"
+
+RDEPEND="dev-java/jamvm:2.0
+         dev-java/eclipse-ecj:3.2
+         dev-java/gnu-classpath:0.99"
diff --git a/virtual/jdk/jdk-1.6.ebuild b/virtual/jdk/jdk-1.6.ebuild
index 7c69aa4..d3f38be 100644
--- a/virtual/jdk/jdk-1.6.ebuild
+++ b/virtual/jdk/jdk-1.6.ebuild
@@ -4,7 +4,9 @@
 EAPI="7"
 
 DESCRIPTION="Virtual for Java Development Kit (JDK)"
-SLOT="1.6"
+SLOT="${PV}"
 KEYWORDS="amd64"
 
-RDEPEND=">=dev-java/jamvm-2.0.0-r99:bootstrap"
+RDEPEND="dev-java/jamvm:2.0-3
+         dev-java/eclipse-ecj:4.2
+         dev-java/gnu-classpath:0.99-devel"
diff --git a/virtual/jre/Manifest b/virtual/jre/Manifest
index db00fa5..24e0d4f 100644
--- a/virtual/jre/Manifest
+++ b/virtual/jre/Manifest
@@ -1,3 +1,4 @@
-EBUILD jre-1.4.ebuild 260 BLAKE2B 23d7458b8d6b1e4c3d087704755794877b0e04ab43143d7205cf98ceda6e73e9ad18ebaaa325eba5015c2122695788fb7cc6a016f93162710ab92c1b87729acf SHA512 4d34f5cff6d7815eee780ee0f9030caa4af866da5d5cbd2fd240a9bb86e92a8e8ee23b467df9ea828dc66566b171154c5423f40e45d4d935fb4a3a8a96003e4b
-EBUILD jre-1.6.ebuild 306 BLAKE2B 6a8918fee9d0279b01a6737cbbbc2765b220477d82a2a77c1ac3d6b47c8444fb68fe96f8b79b352e829e0f5efe10c2439084fa96818c62195fa5617f2faa2496 SHA512 e63e5f869639b8c2b8756c3ba9a875fd5d782df29a784cf1a2a1385e0a28ca313cc402bb3cab495b904ff65d9207891a156716822afb2249c21dab59b8c5834c
+EBUILD jre-1.4.ebuild 254 BLAKE2B 1f647e1884b94c0371f77d006cc00c1231a8ee8839f7e9010eccfb50edd785c62386bacd289df04173e460313aa66dae87967d0cd5269f25d53f6b0d4e73c924 SHA512 b944e9a74449795561e28c34f0dab19a529a2ebb7813efedb6a721956f91df379faa1a7416641b19f43129e1d50d3ad1b138b0c824daefef1b96ac009d13298e
+EBUILD jre-1.5.ebuild 254 BLAKE2B 15695c42ab53e92ac36e94e1a180660caf4a9096ac04071f5b6a7a8241924e3f376b731a0da61ceedda287b6c2d46c3de54ea6bc70206daf98dae00037f7f050 SHA512 0660c4aefc799ac147af86b8a1bc0e3ccdd25ce0c44579f2b1ff0f5ead90622829e36a2c10c8d97f4438848c7844f8c01504e5d5918601d3ac4d6067cb9c547c
+EBUILD jre-1.6.ebuild 235 BLAKE2B 65f9dcfc8e1b2918e90022e55b5724f612a47516b213417ec8fdd498436e5246167d95669f75754664513a103a2c5b7f54b5b5372d0dc0205fe31fe3e0ae886c SHA512 5534dd2be6bd69e6e4b8897b204c1dc7ffe77b9454fd11db9296b2d26c4cf5aa9b1a23f88e3f51f365c3aee56c87221eb39569fa9c608d3c013a7edfd08aaafb
 MISC metadata.xml 252 BLAKE2B a3a36edd6c0b4e630f0e38d236ff4133a5c6b4aa42f5525d8a0978ecdbbe3d53602d3fcde02cf1a495bfabb4fd06f914826df44bda7f542ce8543b32fd7bbfe2 SHA512 1ab83f56876901e45f2b34aa5c81bd1d7b243009236d238b49fca2d49ec167c596ea589de6df1c8dfe1a6b834a2e0e493409ee65d499bd2b6ecaf687ae71df69
diff --git a/virtual/jre/jre-1.4.ebuild b/virtual/jre/jre-1.4.ebuild
index 4dd96f7..5291e17 100644
--- a/virtual/jre/jre-1.4.ebuild
+++ b/virtual/jre/jre-1.4.ebuild
@@ -9,5 +9,5 @@ KEYWORDS="amd64"
 
 RDEPEND="
 	virtual/jdk:${SLOT}
-	dev-java/jamvm:bootstrap
+	dev-java/jamvm:1.5
 "
diff --git a/virtual/jre/jre-1.5.ebuild b/virtual/jre/jre-1.5.ebuild
new file mode 100644
index 0000000..b5f3308
--- /dev/null
+++ b/virtual/jre/jre-1.5.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
+SLOT="${PV}"
+KEYWORDS="amd64"
+
+RDEPEND="
+	virtual/jdk:${SLOT}
+	dev-java/jamvm:2.0
+"
diff --git a/virtual/jre/jre-1.6.ebuild b/virtual/jre/jre-1.6.ebuild
index 0daa573..69f8ebc 100644
--- a/virtual/jre/jre-1.6.ebuild
+++ b/virtual/jre/jre-1.6.ebuild
@@ -8,7 +8,5 @@ SLOT="${PV}"
 KEYWORDS="amd64"
 
 RDEPEND="
-	virtual/jdk:${SLOT}
-	>=dev-java/gnu-classpath-0.99_p1
-	>=dev-java/jamvm-2.0.0-r99:bootstrap
+	dev-java/jamvm:2.0-2
 "