diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index ab36d47..b8eaad2 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 1748 BLAKE2B b417ff52d2d1bf64dd69f259a4c2590b959efca7091ae14254340b94f0eb0251366cf82c664cc0f71baf2f344644e5c80ff4a7cb5229a8b3e7fc2cdc1d9a54c7 SHA512 5f1b9abad05ff55382d573030711d1e4e5171f169da6ccc095845ee136ab5af2bca78614ee4b58be888f249ad12d0a758022598f4bca08365d94ccef06e413af
+EBUILD ant-core-1.8.4-r1.ebuild 1650 BLAKE2B 94b22ba7216bb7117d22dcc14343d5966afd2d75f6068cd1ea9d03059999114dfb3cf843d533dd8b692ff42b6b7d7bd1c769cf4e1c230f11257c0f17a2a1f1bd SHA512 fe6a650a13793bac2c273d11c752ae0be44f410ce48a66b4d0737445b8508cac504c9ae323c4f7b9eab0a7d6342bbf580fc5fbd695f32323307bfee1f06ac01e
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 b07141d..03d504d 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
@@ -18,7 +18,7 @@ SRC_URI="http://archive.apache.org/dist/ant/source/apache-ant-${PV}-src.tar.bz2"
LICENSE="Apache-2.0"
SLOT="bootstrap"
KEYWORDS="amd64"
-IUSE=""
+IUSE="doc"
DEPEND="
virtual/jdk:1.4
@@ -37,8 +37,6 @@ src_prepare() {
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"
@@ -60,7 +58,6 @@ src_install() {
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"
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
new file mode 100644
index 0000000..1d00e7d
--- /dev/null
+++ b/dev-java/eclipse-ecj/Manifest
@@ -0,0 +1,4 @@
+AUX compiler-settings-3.2 258 BLAKE2B 11b1f283a93a8ff9ce57dc51aebfaafe4130eb66180474c5ce795c0b2b7a906c6c1c36b649fd525ad6dca12f2d29c24dd2c05d81fec783b114bd5943b52fdd86 SHA512 51c692c00788237c2bd4c51d5dda1bc06630490b0eb4f2e6b15355b37341932f6544d4a94d0f92f9c45c9a6546972895660b07e6cd71b241d453936333b9ee32
+AUX eclipse-ecj-3.2-build-gentoo.patch 1874 BLAKE2B dee1fd186a776a049ecdaf05472dafb703b377fdf58cfe8efa62fc8ee26e3465b04a3caf76292597df67a8fd056e99def64cbe7bc10a77ef19e969cf932d1993 SHA512 69c01c184c0b0aae461d51381f16eace5c2ed6775eb71a1abdab04af3957324501535b043134824408f02761b6c0fe3fb2db9cc477974cd7e8f6ad77b344f6b4
+DIST eclipse-ecj-3.2.tar.bz2 612611 BLAKE2B dc2cadb2f7be85f6583020079f2e02a66d6432b35f595c44cc38731504c8dcd43cd3e407b80c93e5dc828e10eb37d78a74a4674e2c7c5eac7329f179947b8683 SHA512 037564cacb154e6dc81718cbb1a4f1547663c151681e3725d7728db782611ed22905d5395d24214336cfaefeeb4e2ea87fab69f5012f163164a7aaf87f203ba2
+EBUILD eclipse-ecj-3.2.ebuild 1305 BLAKE2B 1b166266688978fd625538f24b72fff34104b47aab2ca4a6db5fdb0146e4a819b21a4dfbfab36bcf09061eb21fef4654c7d544bd84fa0cb0296fc7fc54deff87 SHA512 b6ebfb7efcb9ace536a487a2e6e0de928f078cf9b68a7a8783f9ea0bf768fcbed4550028f2f5733a2e2a6c4f0dfa2760fd2714d69406c07830f6a6b927e916df
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.2.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.2.ebuild
new file mode 100644
index 0000000..e933fba
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-3.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils java-pkg-2 java-ant-2
+
+#MY_PN=${PN##*-}
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="${P}.tar.bz2"
+LICENSE="EPL-1.0"
+KEYWORDS="amd64"
+SLOT="3.2"
+
+RDEPEND=">=virtual/jre-1.4"
+
+DEPEND="${RDEPEND}
+ >=virtual/jdk-1.4
+ dev-java/ant-core"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ # remove unzip, add javadoc target, put final ecj.jar and javadocs in dist/ and not ../
+ epatch "${FILESDIR}/${P}-build-gentoo.patch"
+}
+
+src_compile() {
+ # we don't use eant because the compile*.xml files specifically set -source -target and used compiler
+
+ # bootstrap build with JDK's javac
+ ant "-Dbuild.compiler=jikes" -f compilejdtcorewithjavac.xml || die "Failed to bootstrap build with javac"
+
+ # recompile with ecj.jar made in first step, to get dist/ecj.jar
+ export CLASSPATH=/usr/share/classpath/glibj.zip
+ ant ${ant_flags} -lib ecj.jar -f compilejdtcore.xml compile $(use_doc) || die "Failed to rebuild with ecj"
+}
+
+src_install() {
+ java-pkg_dojar dist/ecj.jar
+
+ java-pkg_dolauncher ecj-${SLOT} --main org.eclipse.jdt.internal.compiler.batch.Main
+
+ insinto /usr/share/java-config-2/compiler
+ newins ${FILESDIR}/compiler-settings-${SLOT} ecj-${SLOT}
+}
+
diff --git a/dev-java/eclipse-ecj/files/compiler-settings-3.2 b/dev-java/eclipse-ecj/files/compiler-settings-3.2
new file mode 100644
index 0000000..ea7091a
--- /dev/null
+++ b/dev-java/eclipse-ecj/files/compiler-settings-3.2
@@ -0,0 +1,7 @@
+JAVAC="/usr/bin/ecj-3.2"
+PACKAGE="=dev-java/eclipse-ecj-3.2*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-3.2"
+GENERATION="2"
diff --git a/dev-java/eclipse-ecj/files/digest-eclipse-ecj-3.2 b/dev-java/eclipse-ecj/files/digest-eclipse-ecj-3.2
new file mode 100644
index 0000000..a185223
--- /dev/null
+++ b/dev-java/eclipse-ecj/files/digest-eclipse-ecj-3.2
@@ -0,0 +1,3 @@
+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/eclipse-ecj/files/eclipse-ecj-3.2-build-gentoo.patch b/dev-java/eclipse-ecj/files/eclipse-ecj-3.2-build-gentoo.patch
new file mode 100644
index 0000000..c60a659
--- /dev/null
+++ b/dev-java/eclipse-ecj/files/eclipse-ecj-3.2-build-gentoo.patch
@@ -0,0 +1,52 @@
+diff -Naur eclipse-ecj-3.2/compilejdtcorewithjavac.xml eclipse-ecj-3.2-mod/compilejdtcorewithjavac.xml
+--- eclipse-ecj-3.2/compilejdtcorewithjavac.xml 2006-06-30 01:20:00.000000000 +0200
++++ eclipse-ecj-3.2-mod/compilejdtcorewithjavac.xml 2006-07-28 01:35:06.000000000 +0200
+@@ -6,7 +6,6 @@
+
+
+
+-
+
+
+
+diff -Naur eclipse-ecj-3.2/compilejdtcore.xml eclipse-ecj-3.2-mod/compilejdtcore.xml
+--- eclipse-ecj-3.2/compilejdtcore.xml 2006-06-30 01:20:00.000000000 +0200
++++ eclipse-ecj-3.2-mod/compilejdtcore.xml 2006-07-29 03:22:07.000000000 +0200
+@@ -5,7 +5,9 @@
+
+
+
+-
++
++
++
+
+
+
+@@ -13,6 +15,7 @@
+
+
+
++
+
+
+
+@@ -57,9 +60,17 @@
+
+
+
+-
++
+
+
+
+
++
++
++
++
++
++
++
++
+
diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest
index 7341124..6671a07 100644
--- a/dev-java/gnu-classpath/Manifest
+++ b/dev-java/gnu-classpath/Manifest
@@ -1,3 +1,5 @@
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 1093 BLAKE2B e81893c8cda4174ed7b905f4b002eae4a69a13c16fed19f8c7db576fc79325557cb9269b3e3b9449abda834605259d9db37481fdf0d2d19cc425a9ed92bd021e SHA512 763b7345e5568f8e3a2ebb43fccf20331e12eb93fe5157835e5109bd5b42bd3774aeb1059ef74e789eaa1e24cbe48a5fb152f8c49803764a43f18fe4a37d249f
+EBUILD gnu-classpath-0.99-r2.ebuild 1853 BLAKE2B 84300636803b2648e1ad64153676a3293e29456db785c24718c619046fd2fe94b57b61f6405bf1c2882908bb524453eeb677a7c9d420acc1c2887d1a92cd1158 SHA512 15183b72f3aea5e30d2647876b0cd27fa35ecf98033bb8cd33f4f6ba1c35d97698e4b61496e605089385c0bd6eba3c48423402394ea3bb27def7ac5906ff7bc9
MISC metadata.xml 252 BLAKE2B a3a36edd6c0b4e630f0e38d236ff4133a5c6b4aa42f5525d8a0978ecdbbe3d53602d3fcde02cf1a495bfabb4fd06f914826df44bda7f542ce8543b32fd7bbfe2 SHA512 1ab83f56876901e45f2b34aa5c81bd1d7b243009236d238b49fca2d49ec167c596ea589de6df1c8dfe1a6b834a2e0e493409ee65d499bd2b6ecaf687ae71df69
diff --git a/virtual/jre/Manifest b/virtual/jre/Manifest
new file mode 100644
index 0000000..303e9e3
--- /dev/null
+++ b/virtual/jre/Manifest
@@ -0,0 +1,2 @@
+EBUILD jre-1.4.ebuild 254 BLAKE2B 1f647e1884b94c0371f77d006cc00c1231a8ee8839f7e9010eccfb50edd785c62386bacd289df04173e460313aa66dae87967d0cd5269f25d53f6b0d4e73c924 SHA512 b944e9a74449795561e28c34f0dab19a529a2ebb7813efedb6a721956f91df379faa1a7416641b19f43129e1d50d3ad1b138b0c824daefef1b96ac009d13298e
+MISC metadata.xml 252 BLAKE2B a3a36edd6c0b4e630f0e38d236ff4133a5c6b4aa42f5525d8a0978ecdbbe3d53602d3fcde02cf1a495bfabb4fd06f914826df44bda7f542ce8543b32fd7bbfe2 SHA512 1ab83f56876901e45f2b34aa5c81bd1d7b243009236d238b49fca2d49ec167c596ea589de6df1c8dfe1a6b834a2e0e493409ee65d499bd2b6ecaf687ae71df69
diff --git a/virtual/jre/jre-1.4.ebuild b/virtual/jre/jre-1.4.ebuild
new file mode 100644
index 0000000..5291e17
--- /dev/null
+++ b/virtual/jre/jre-1.4.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:1.5
+"
diff --git a/virtual/jre/metadata.xml b/virtual/jre/metadata.xml
new file mode 100644
index 0000000..901b713
--- /dev/null
+++ b/virtual/jre/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ andrius@stikonas.eu
+ Andrius Štikonas
+
+