From 94002c3121a2949c5c06740349360dfa2f59fe17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Sat, 7 Dec 2019 16:37:47 +0000
Subject: [PATCH] Fix ant-core blocker.

---
 README.md                                  | 1 +
 dev-java/ant-core/Manifest                 | 2 +-
 dev-java/ant-core/ant-core-1.8.4-r1.ebuild | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 84f4afa..e074509 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 ```sh
 sudo emerge -a1v =dev-java/icedtea-3.7.0
 sudo emerge -av dev-java/openjdk:8
+sudo emerge -a --depclean # Remove old software that was used for bootstrapping
 ```
 
 Note: you need to do it in two steps as currently ant-core:bootstrap is not co-installable
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 4aa2bb3..5bcd6a8 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 1804 BLAKE2B 269857d0b34859b66fbce0744652edccd43541e2bf422212ffa93c4758e244d6ecc9a03164d4b21d9e1397596474013810a0a1a8102720701e076368dd2944d1 SHA512 daadd2d226b44af53bcc0b751b15ce1c195e2e3c813f6d8ba3e1759e9466ce0b92d9d2b60db68b1e7efe7f9dde01a87e407aa1e6f9ba44f19751161ef2af187c
+EBUILD ant-core-1.8.4-r1.ebuild 1814 BLAKE2B f6a914256e3d781b3861abbf68f44abbfdb96f54b544c28d7581f528e5462b40abba5b17ae1f4c996f34f3e5d6bcf4bdcf6151dcbeb811c538ff2f4a5608207b SHA512 a8f2e5c96641a7201c9655b3ac2324f51d51b413e1399787757d1bded7a1b92938682d1ff192370027da846aea8ace2bff59563feb2151912b7d81b7a7791cb4
 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 5d0be58..1c62bbf 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
@@ -7,7 +7,7 @@ EAPI=6
 JAVA_ANT_DISABLE_ANT_CORE_DEP=true
 # rewriting build.xml files for the testcases has no reason atm
 JAVA_PKG_BSFIX_ALL=no
-inherit eutils java-pkg-2 java-ant-2
+inherit eutils java-pkg-2 java-vm-2 java-ant-2
 
 MY_P="apache-ant-${PV}"
 
@@ -20,9 +20,9 @@ SLOT="bootstrap"
 KEYWORDS="amd64"
 IUSE="doc"
 
-RDEPEND="dev-java/jamvm:1.5"
-DEPEND="${RDEPEND}
+RDEPEND="dev-java/jamvm:1.5
 	!dev-java/ant-core:0"
+DEPEND="${RDEPEND}"
 
 
 S="${WORKDIR}/${MY_P}"