diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
new file mode 100644
index 0000000..ab36d47
--- /dev/null
+++ b/dev-java/ant-core/Manifest
@@ -0,0 +1,3 @@
+DIST apache-ant-1.8.4-src.tar.bz2 3385365 BLAKE2B 2cbb84385dbfdcbc68d138fa5c88f6759ed579ae3e1df129094948aa5677fca6d4d1140c0c8c2723bddce1dfb04f0121f46b7f8a798f4beb6e1c5cdb15fe9eff SHA512 7dbbdcd31f5fd498cbbe7f125451899320e5e9c2396b80f1f90d18943f8ef066a75198edfdba0edf96b1e0b5b84cb049b5281403180a7a6924ebfb077930e307
+EBUILD ant-core-1.8.4-r1.ebuild 1748 BLAKE2B b417ff52d2d1bf64dd69f259a4c2590b959efca7091ae14254340b94f0eb0251366cf82c664cc0f71baf2f344644e5c80ff4a7cb5229a8b3e7fc2cdc1d9a54c7 SHA512 5f1b9abad05ff55382d573030711d1e4e5171f169da6ccc095845ee136ab5af2bca78614ee4b58be888f249ad12d0a758022598f4bca08365d94ccef06e413af
+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
new file mode 100644
index 0000000..b07141d
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.8.4-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# don't depend on itself
+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
+
+MY_P="apache-ant-${PV}"
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
+HOMEPAGE="http://ant.apache.org/"
+SRC_URI="http://archive.apache.org/dist/ant/source/apache-ant-${PV}-src.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="bootstrap"
+KEYWORDS="amd64"
+IUSE=""
+
+DEPEND="
+	virtual/jdk:1.4
+	!dev-java/ant-core:0
+"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i -e 's/depends="jars,test-jar"/depends="jars"/' build.xml || die "Sed failed!"
+
+	default
+}
+
+src_compile() {
+	export BOOTJAVAC_OPTS="-nowarn"
+	export JAVA_HOME="${EPREFIX}/usr/lib/jvm/jamvm-1.5"
+
+	export ANT_OPTS="-Dbuild.compiler=jikes"
+
+	./build.sh || die "build failed"
+}
+
+src_install() {
+	dodir /usr/share/ant/lib
+	for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do
+		java-pkg_dojar build/lib/${jar}
+		dosym /usr/share/${PN}-bootstrap/lib/${jar} /usr/share/ant/lib/${jar}
+	done
+
+	dobin "${S}/dist/bin/ant" || die "failed to install wrapper"
+	dodir /usr/share/${PN}/bin
+	for each in antRun antRun.pl runant.pl runant.py complete-ant-cmd.pl ; do
+		dobin "${S}/src/script/${each}"
+		dosym /usr/bin/${each} /usr/share/${PN}/bin/${each}
+	done
+	dosym /usr/share/${PN}/bin /usr/share/ant/bin
+
+	insinto /usr/share/${PN}
+	dosym /usr/share/${PN}/etc /usr/share/ant/etc
+
+	echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant"
+	doenvd "${T}/20ant" || die "failed to install env.d file"
+
+	dodoc NOTICE README WHATSNEW KEYS || die
+}
diff --git a/dev-java/ant-core/metadata.xml b/dev-java/ant-core/metadata.xml
new file mode 100644
index 0000000..cf036ae
--- /dev/null
+++ b/dev-java/ant-core/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+       <maintainer type="person">
+               <email>andrius@stikonas.eu</email>
+               <name>Andrius Štikonas</name>
+       </maintainer>
+       <upstream>
+               <remote-id type="sourceforge">jikes</remote-id>
+       </upstream>
+</pkgmetadata>
diff --git a/dev-java/jamvm/Manifest b/dev-java/jamvm/Manifest
index dbca127..d77a286 100644
--- a/dev-java/jamvm/Manifest
+++ b/dev-java/jamvm/Manifest
@@ -1,5 +1,5 @@
 AUX classes-location.patch 1184 BLAKE2B 367fad8488bf6866021aade628221a7ce53a000fc6cba0b59bbe4b2145d30a07cb6d057dcc7a4ea370f82926e0171021e50691ce35959b129802ad38d441983d SHA512 0e441916dbf66289bea37da807a85930a9fe320b5c3a5301df85a870418125fe9fe0c5fb7ce7e4baa9dfc75a3438509e9d77b0ede67b06411935875ec7e641ee
 AUX jamvm-1.5.1.env 378 BLAKE2B 0d35f75ab71d3ecfd194c47eade38076cbd1856c009692e6c959712546aeb845f445914bc4005660ad4209a0faeb3327bb818a9a89b5b6e575b42da215f899b0 SHA512 c71b3a1f689778e67fd977bc7f338784868bf09d6fd0444d1b23da8abc3e8d8d93e01e85a840420c6efa89af3676327c2f1bf93dc62a2c35a7ee314542a89a41
 DIST jamvm-1.5.1.tar.gz 599084 BLAKE2B af79d5615fbfa395230d93ec52fd70f6000d85eac881414f59ab9f33ab4393a4dadbfa6966c574d11422612e10354bec562b3728e4a8fe6e6334b5c0f2742ed9 SHA512 9f93611fefb28b5494d166d7ec9575eb8d12add775dd65b2b46303355e3f845f417d5301649a1f09cb306e6690cd82b67cb1dface30ce18d0b2ecc815d3bc9b9
-EBUILD jamvm-1.5.1.ebuild 1470 BLAKE2B fa7c7079125bf92c1c906a082ee6ee9e485c8d3cc540492896383f3a8b7b6654d12de05d0a66ea6f00c5593685e4bfbb05390e19b19a32bc25c0666034734bd4 SHA512 0a33757fa430565518200c7f9f02a40626c11a45acdde2a4a4a3351fead64de369867b570a69411cd0bfd88d0168fad1d50c2690516141edd8e71decdea2048d
+EBUILD jamvm-1.5.1.ebuild 1474 BLAKE2B 0f70686930ef73e500790b457b8763f69358e10711a69933fcd319a288905da5e7953976e13e3ee911f55c609b37453857bdf8664e315609630ac5ca7e244c2d SHA512 ee945efcfb517885d3256663f40bc25f4f49557a1b828c4e3937d5e330fd7171d81408b12f8f7faf70cf8ba11cca30942fdc83458a2380a9c27168dd8a3ddacf
 MISC metadata.xml 252 BLAKE2B a3a36edd6c0b4e630f0e38d236ff4133a5c6b4aa42f5525d8a0978ecdbbe3d53602d3fcde02cf1a495bfabb4fd06f914826df44bda7f542ce8543b32fd7bbfe2 SHA512 1ab83f56876901e45f2b34aa5c81bd1d7b243009236d238b49fca2d49ec167c596ea589de6df1c8dfe1a6b834a2e0e493409ee65d499bd2b6ecaf687ae71df69