2017-02-28 20:39:58 UTC

882 files changed, 1760 insertions, 1760 deletions

diff --git a/metadata/md5-cache/dev-java/absolutelayout-6.7_beta-r1 b/metadata/md5-cache/dev-java/absolutelayout-6.7_beta-r1
index 63c74d31bceb..e74643bfd639 100644
--- a/metadata/md5-cache/dev-java/absolutelayout-6.7_beta-r1
+++ b/metadata/md5-cache/dev-java/absolutelayout-6.7_beta-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://gentoo/absolutelayout-6.7_beta.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=df1c57aaf6f5f7b8133bae567c1681b2
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c91c6aa4a3f822d39e6255d7f1aee5e7
diff --git a/metadata/md5-cache/dev-java/airline-0.7-r1 b/metadata/md5-cache/dev-java/airline-0.7-r1
index 5c4c3af1c915..0f9525d4c4b6 100644
--- a/metadata/md5-cache/dev-java/airline-0.7-r1
+++ b/metadata/md5-cache/dev-java/airline-0.7-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 dev-java/guava:20 dev-java/javax-inject:0 dev-java/jsr
 SLOT=0
 SRC_URI=https://github.com/airlift/airline/archive/0.7.tar.gz -> dev-java-airline-0.7.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=768d333e964ed72af8277d10fb687f67
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f10eb9d66f363dd910b206f40c4400b3
diff --git a/metadata/md5-cache/dev-java/android-util-4.1.1.4 b/metadata/md5-cache/dev-java/android-util-4.1.1.4
index 3f1efba514a6..17ab9025d79d 100644
--- a/metadata/md5-cache/dev-java/android-util-4.1.1.4
+++ b/metadata/md5-cache/dev-java/android-util-4.1.1.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 dev-java/xerces:2 dev-java/xpp3:0 >=dev-java/java-conf
 SLOT=0
 SRC_URI=http://central.maven.org/maven2/com/google/android/android/4.1.1.4/android-4.1.1.4-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2fc091cc40d9755ae313e729a3678739
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=84a7f67ccc6c69800aed50eece2dbf97
diff --git a/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15 b/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15
index bb1b530be8b7..4fbf8e0fb560 100644
--- a/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15
+++ b/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/mojohaus/animal-sniffer/archive/animal-sniffer-parent-1.15.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1951548cf3e00c1eee696594856e3abe
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=fe094af7c3df8f28084f12c1c3d153d1
diff --git a/metadata/md5-cache/dev-java/annogen-0.1.0-r3 b/metadata/md5-cache/dev-java/annogen-0.1.0-r3
index 5620bb855425..80a302e06ff3 100644
--- a/metadata/md5-cache/dev-java/annogen-0.1.0-r3
+++ b/metadata/md5-cache/dev-java/annogen-0.1.0-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-java/qdox:1.6 dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-
 SLOT=0
 SRC_URI=http://dist.codehaus.org/annogen/distributions/annogen-0.1.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=37a8165e246388373e46441b7e5d2826
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c1bd5018b79e6f047083c0526839891e
diff --git a/metadata/md5-cache/dev-java/ant-1.9.2 b/metadata/md5-cache/dev-java/ant-1.9.2
index f8f7a1b69bcd..08fda6371353 100644
--- a/metadata/md5-cache/dev-java/ant-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-1.9.2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=~dev-java/ant-core-1.9.2 ~dev-java/ant-nodeps-1.9.2 ~dev-java/ant-junit-1.9.2 !dev-java/ant-optional !dev-java/ant-tasks ~dev-java/ant-trax-1.9.2 ~dev-java/ant-apache-xalan2-1.9.2 antlr? ( ~dev-java/ant-antlr-1.9.2 ) bcel? ( ~dev-java/ant-apache-bcel-1.9.2 ) bsf? ( ~dev-java/ant-apache-bsf-1.9.2 ) log4j? ( ~dev-java/ant-apache-log4j-1.9.2 ) oro? ( ~dev-java/ant-apache-oro-1.9.2 ) regexp? ( ~dev-java/ant-apache-regexp-1.9.2 ) resolver? ( ~dev-java/ant-apache-resolver-1.9.2 ) commonslogging? ( ~dev-java/ant-commons-logging-1.9.2 ) commonsnet? ( ~dev-java/ant-commons-net-1.9.2 ) jai? ( ~dev-java/ant-jai-1.9.2 ) javamail? ( ~dev-java/ant-javamail-1.9.2 ) jdepend? ( ~dev-java/ant-jdepend-1.9.2 ) jmf? ( ~dev-java/ant-jmf-1.9.2 ) jsch? ( ~dev-java/ant-jsch-1.9.2 ) testutil? ( ~dev-java/ant-testutil-1.9.2 ) X? ( ~dev-java/ant-swing-1.9.2 )
 SLOT=0
 _eclass_exported_funcs=pkg_postinst:- src_compile:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=785d46a89f8463680948808160af14ad
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4450bfaec7d04c225096a376ff252a2d
diff --git a/metadata/md5-cache/dev-java/ant-antlr-1.9.2-r1 b/metadata/md5-cache/dev-java/ant-antlr-1.9.2-r1
index 3ae17bf669db..47b0c373bd99 100644
--- a/metadata/md5-cache/dev-java/ant-antlr-1.9.2-r1
+++ b/metadata/md5-cache/dev-java/ant-antlr-1.9.2-r1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:ant-tasks src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:ant-tasks src_install:-
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d2233407520078626a05da9e19725d43
+_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=772840decfa67039e5fa7733dd0326d9
diff --git a/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.2
index 13413a399608..46effd5f03f2 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:ant-tasks src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:ant-tasks src_install:ant-tasks
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=41c8ae6135484ef9907cd22b584fdb10
+_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5e5e4de27e43d77a69d1a8952f0d128d
diff --git a/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.2
index 4fbb219e9d17..7989aa07cf69 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_unpack:ant-tasks src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:ant-tasks src_install:ant-tasks
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=84d9867a5a62d31921a593d2cbcb6096
+_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=20f3379021b410e4b55ba3edb8e0880b
diff --git a/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.2
index 840600753229..35146f4bf601 100644
--- a/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:ant-tasks src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:ant-tasks src_install:ant-tasks
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d8cb5a5471303c0e0e5173e7c041dcfb
+_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=fa84590b04a16645844fce3695d63a24
diff --git a/metadata/md5-cache/dev-java/ant-apache-oro-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-oro-1.9.2
index 767ff6e90f08..87555cd0dee5 100644
--- a/metadata/md5-cache/dev-java/ant-apache-oro-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-oro-1.9.2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:ant-tasks src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:ant-tasks src_install:ant-tasks
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2ac8e9d9cb79e3f7e3cd771fe79fb8fb
+_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d36b8acd72294695993afa1162670270
diff --git a/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.2
index 8ea9150c39d8..d801ebb4b909 100644
--- a/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:ant-tasks src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:ant-tasks src_install:ant-tasks
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fcc4b6e0c2f103161348c1a248e41ba3
+_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=899786ac47ee607f6e11fff554870c9c
diff --git a/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.2
index 899aba6871de..3cb49a056f7e 100644
--- a/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:ant-tasks src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:ant-tasks src_install:ant-tasks
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=90344d82e29cc4c0adf7fd9877e17c0b
+_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3cc1a9c6593a14efe6f2e1ef78cd6cef
diff --git a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.2-r1 b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.2-r1
index 508364ea4e42..1ac24f936054 100644
--- a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.2-r1
+++ b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.2-r1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:ant-tasks src_install:ant-tasks
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a1ba7939118bbc1e784683ed2a91b3e2
+_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=815f245d2a82da02300f1199fb1078f8
diff --git a/metadata/md5-cache/dev-java/ant-commons-logging-1.9.2 b/metadata/md5-cache/dev-java/ant-commons-logging-1.9.2
index f05de15bd4d0..5214d04f9065 100644
--- a/metadata/md5-cache/dev-java/ant-commons-logging-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-commons-logging-1.9.2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:ant-tasks src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:ant-tasks src_install:ant-tasks
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3ba57c70a7cdc8a4ba878b40b28235d4
+_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d8763585ee3df0451112e6d93b2eea89
diff --git a/metadata/md5-cache/dev-java/ant-commons-net-1.9.2 b/metadata/md5-cache/dev-java/ant-commons-net-1.9.2
index b3ba22445b77..88ed9296c7ee 100644
--- a/metadata/md5-cache/dev-java/ant-commons-net-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-commons-net-1.9.2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:ant-tasks src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:ant-tasks src_install:ant-tasks
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8cc35b0bfa9ab3257230569298213fd6
+_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=aff675ffd55b6631947669a73f3feec4
diff --git a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta2-r2 b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta2-r2
index 0591680b3d2c..386d13539340 100644
--- a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta2-r2
+++ b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta2-r2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ant-contrib/ant-contrib-1.0b2-src.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a0e46649700bf9ad0f395a86a83d35af
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d51ef0892a1cfeb5e9d79ed8196ec685
diff --git a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta3-r1 b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta3-r1
index 2c319badd12b..a1836b615b7e 100644
--- a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta3-r1
+++ b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta3-r1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ant-contrib/ant-contrib-1.0b3-src.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7f329d7d4bdfe41cd42f23b7aa8e64d8
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7f0bcb35f4535b5af6d15bea00a26266
diff --git a/metadata/md5-cache/dev-java/ant-core-1.9.2 b/metadata/md5-cache/dev-java/ant-core-1.9.2
index 5256bbada1cb..76c4aef61149 100644
--- a/metadata/md5-cache/dev-java/ant-core-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-core-1.9.2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:- src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6ed6562c453c5e35cee3e7d80ddd1c47
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	prefix	df8265631f8bf5f5df387e9b987121f9	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=31ebd33e388df9d19f0c8b3da8233910
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.2.1 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.2.1
index 08abb34cf820..fd349e846d8a 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.2.1
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 ~dev-java/eclipse-ecj-4.2.1 >=dev-java/ant-core-1.7 >=
 SLOT=4.2
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.2.1-201209141800/ecjsrc-4.2.1.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5466c338e4f3e9001405d01b0c9dea8a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7f740ade0556724dab975ee971aaadd5
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.4.2 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.4.2
index a12e73330dae..0437fcf768c8 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.4.2
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.4.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-java/eclipse-ecj-4.4.2:4.4 >=dev-java/ant-core-1.7 >=virtual/jre-1.
 SLOT=4.4
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/ecjsrc-4.4.2.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c8fb10427b0cbc6248815bcb7155b1de
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	prefix	df8265631f8bf5f5df387e9b987121f9	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=52a94600dd13f49c4d92c4563d0b1941
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.5.1 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.5.1
index 3c329ccfd10a..4660b1f96618 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.5.1
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.5.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-java/eclipse-ecj-4.5.1:4.5 >=dev-java/ant-core-1.7 >=virtual/jre-1.
 SLOT=4.5
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.5.1-201509040015/ecjsrc-4.5.1.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=438e0678f6e952a1ea38fb29a54e5846
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	prefix	df8265631f8bf5f5df387e9b987121f9	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=560f0d4b13a75185238142a39ee944b2
diff --git a/metadata/md5-cache/dev-java/ant-ivy-1.3.1-r1 b/metadata/md5-cache/dev-java/ant-ivy-1.3.1-r1
index 33718d322caf..17e424d58f6b 100644
--- a/metadata/md5-cache/dev-java/ant-ivy-1.3.1-r1
+++ b/metadata/md5-cache/dev-java/ant-ivy-1.3.1-r1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://jayasoft.org/downloads/ivy/1.3.1/ivy-1.3.1-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6cf21397e4fa1ee8cebbc3ec07f8b7d7
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4495466e86641fe11326e96174786c91
diff --git a/metadata/md5-cache/dev-java/ant-ivy-1.4.1-r1 b/metadata/md5-cache/dev-java/ant-ivy-1.4.1-r1
index 1eb828a59323..21f4f7232feb 100644
--- a/metadata/md5-cache/dev-java/ant-ivy-1.4.1-r1
+++ b/metadata/md5-cache/dev-java/ant-ivy-1.4.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 dev-java/commons-cli:1 dev-java/co
 SLOT=0
 SRC_URI=http://www.jaya.free.fr/downloads/ivy/1.4.1/ivy-1.4.1-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=cd5e0be2d75e7b4e7d262a34284f9ecc
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5e3abe2dafb920ff64e64351eb5909b1
diff --git a/metadata/md5-cache/dev-java/ant-ivy-2.0.0 b/metadata/md5-cache/dev-java/ant-ivy-2.0.0
index 03c0b7e7f95f..aeaac0e5f389 100644
--- a/metadata/md5-cache/dev-java/ant-ivy-2.0.0
+++ b/metadata/md5-cache/dev-java/ant-ivy-2.0.0
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=2
 SRC_URI=mirror://apache/ant/ivy/2.0.0/apache-ivy-2.0.0-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=229bfbf4c04d5ca0e923ab10704d97ad
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=aa6055fffe67e00e629bea3e2eb4b215
diff --git a/metadata/md5-cache/dev-java/ant-ivy-2.3.0-r2 b/metadata/md5-cache/dev-java/ant-ivy-2.3.0-r2
index d877244e50c3..f6cb67549810 100644
--- a/metadata/md5-cache/dev-java/ant-ivy-2.3.0-r2
+++ b/metadata/md5-cache/dev-java/ant-ivy-2.3.0-r2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=2
 SRC_URI=mirror://apache/ant/ivy/2.3.0/apache-ivy-2.3.0-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6f2219679c44f598fdd9c5d02c12120e
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ab7f2ed11619c3ef0dad97f1ee988f87
diff --git a/metadata/md5-cache/dev-java/ant-jai-1.9.2 b/metadata/md5-cache/dev-java/ant-jai-1.9.2
index bef733a7f48d..669fe655834c 100644
--- a/metadata/md5-cache/dev-java/ant-jai-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-jai-1.9.2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:ant-tasks src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:ant-tasks src_install:ant-tasks
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6d463876051a4ae88b7450e57db4fe8f
+_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=db0150081d3ff862b5e68c0b7e1ff211
diff --git a/metadata/md5-cache/dev-java/ant-javamail-1.9.2 b/metadata/md5-cache/dev-java/ant-javamail-1.9.2
index 436e59fb5b13..5e5ff1fbc4a1 100644
--- a/metadata/md5-cache/dev-java/ant-javamail-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-javamail-1.9.2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:ant-tasks src_install:ant-tasks
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=15d34fc41305fcaabc544c41b859cfe5
+_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ed82100f07d620f65f9200d645a9f0ca
diff --git a/metadata/md5-cache/dev-java/ant-javamail-1.9.2-r2 b/metadata/md5-cache/dev-java/ant-javamail-1.9.2-r2
index 9b2f8bf6bd8e..57eefae69346 100644
--- a/metadata/md5-cache/dev-java/ant-javamail-1.9.2-r2
+++ b/metadata/md5-cache/dev-java/ant-javamail-1.9.2-r2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:ant-tasks src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:ant-tasks src_install:ant-tasks
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1a8b861beb50ebac57f0ec8027bd3649
+_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d71f75303d4f0ddc9bf982c9c6744afc
diff --git a/metadata/md5-cache/dev-java/ant-jdepend-1.9.2 b/metadata/md5-cache/dev-java/ant-jdepend-1.9.2
index d57c974e8449..2786c28c8354 100644
--- a/metadata/md5-cache/dev-java/ant-jdepend-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-jdepend-1.9.2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:ant-tasks src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:ant-tasks src_install:ant-tasks
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a921f7bad2484e148821127d366712ce
+_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2d33433c76f3b3b8b1222cf9e6a1a870
diff --git a/metadata/md5-cache/dev-java/ant-jmf-1.9.2 b/metadata/md5-cache/dev-java/ant-jmf-1.9.2
index e7285389e57a..09ef448edc46 100644
--- a/metadata/md5-cache/dev-java/ant-jmf-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-jmf-1.9.2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:ant-tasks src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:ant-tasks src_install:ant-tasks
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c740bccbd704318c0de856629f6d016f
+_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8f510965370ec7970384d2cdfd3cdaba
diff --git a/metadata/md5-cache/dev-java/ant-jsch-1.9.2 b/metadata/md5-cache/dev-java/ant-jsch-1.9.2
index 040954d8a6f7..1974c63f9534 100644
--- a/metadata/md5-cache/dev-java/ant-jsch-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-jsch-1.9.2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:ant-tasks src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:ant-tasks src_install:ant-tasks
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c361a49cf44111b6570de724d38749b8
+_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8496d8d85a5bf4e103d203a5ad64c6fa
diff --git a/metadata/md5-cache/dev-java/ant-junit-1.9.2 b/metadata/md5-cache/dev-java/ant-junit-1.9.2
index 956a0cef9912..4390d442b5f9 100644
--- a/metadata/md5-cache/dev-java/ant-junit-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-junit-1.9.2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:ant-tasks src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:ant-tasks
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f479c7741f8344101bdf2d67452a04ab
+_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1bd3ed2925ba9188c09a1f326c1ae101
diff --git a/metadata/md5-cache/dev-java/ant-junit4-1.9.2 b/metadata/md5-cache/dev-java/ant-junit4-1.9.2
index 34a62c15e952..7cf0b8f36fff 100644
--- a/metadata/md5-cache/dev-java/ant-junit4-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-junit4-1.9.2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:ant-tasks src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3d7c18cd259c244e280005fa5dd2ad5d
+_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=09a2753d78a3b6499ef5b8a133ccbb27
diff --git a/metadata/md5-cache/dev-java/ant-nodeps-1.9.2 b/metadata/md5-cache/dev-java/ant-nodeps-1.9.2
index e4ca40748503..6ca894b440b8 100644
--- a/metadata/md5-cache/dev-java/ant-nodeps-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-nodeps-1.9.2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_unpack:ant-tasks src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:ant-tasks
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ce21ccf7743e45c3e32728af456b7d6d
+_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=15071f14bea1e7f6044878355b436f23
diff --git a/metadata/md5-cache/dev-java/ant-owanttask-1.3.2 b/metadata/md5-cache/dev-java/ant-owanttask-1.3.2
index be71248de20b..9dd77dccc0e6 100644
--- a/metadata/md5-cache/dev-java/ant-owanttask-1.3.2
+++ b/metadata/md5-cache/dev-java/ant-owanttask-1.3.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7.0 dev-java/xalan >=dev-java/ja
 SLOT=0
 SRC_URI=http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_1.3.2.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9516adcb7cd6ce39ad3a4ecf729bdea5
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c7a75fc6cbfc1678cb14c2ffffd75aac
diff --git a/metadata/md5-cache/dev-java/ant-swing-1.9.2 b/metadata/md5-cache/dev-java/ant-swing-1.9.2
index 7e51b1fc3aa1..dd2fa05626a0 100644
--- a/metadata/md5-cache/dev-java/ant-swing-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-swing-1.9.2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:ant-tasks src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:ant-tasks src_install:ant-tasks
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=35747b6ea4310a521a8a2d99e1072d8b
+_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=31c9c8fabdf2114246a1c487cf596138
diff --git a/metadata/md5-cache/dev-java/ant-testutil-1.9.2 b/metadata/md5-cache/dev-java/ant-testutil-1.9.2
index e1054700c28d..fa12abc5079f 100644
--- a/metadata/md5-cache/dev-java/ant-testutil-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-testutil-1.9.2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:ant-tasks
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=abac61815d597dc9af5348c47a12dfe2
+_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=027f93bdce483c1a051ae455c9adc99b
diff --git a/metadata/md5-cache/dev-java/ant-trax-1.9.2 b/metadata/md5-cache/dev-java/ant-trax-1.9.2
index 82c574d7f4ab..4515cfceb13b 100644
--- a/metadata/md5-cache/dev-java/ant-trax-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-trax-1.9.2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_unpack:ant-tasks src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:ant-tasks
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1e97476a12e90a00dc3b003b6c7b43f7
+_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1233f6c81bf08b9ffd4a957061c59f2e
diff --git a/metadata/md5-cache/dev-java/antlr-2.7.7-r7 b/metadata/md5-cache/dev-java/antlr-2.7.7-r7
index 53053eb4b732..e8833e63914b 100644
--- a/metadata/md5-cache/dev-java/antlr-2.7.7-r7
+++ b/metadata/md5-cache/dev-java/antlr-2.7.7-r7
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://www.antlr2.org/download/antlr-2.7.7.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:- src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e0253abde2b7068de73cce7169f221cd
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ac88586642bb76962cb7fa82dbf9f87f
diff --git a/metadata/md5-cache/dev-java/antlr-3.2 b/metadata/md5-cache/dev-java/antlr-3.2
index bd92de0973fa..a11e59f36c19 100644
--- a/metadata/md5-cache/dev-java/antlr-3.2
+++ b/metadata/md5-cache/dev-java/antlr-3.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/antlr-2.7.7-r7:0 dev-java/stringtemplate:0 >=virtual/jre-1.6
 SLOT=3
 SRC_URI=http://www.antlr3.org/download/antlr-3.2.tar.gz http://www.antlr3.org/download/antlr-3.2.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1aeb80a40c75eaab154138365de68262
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=16d1fc5cb47d683497383ad72bbcc610
diff --git a/metadata/md5-cache/dev-java/antlr-3.5.2 b/metadata/md5-cache/dev-java/antlr-3.5.2
index 31bc29e6fccc..d5769f8a5e3f 100644
--- a/metadata/md5-cache/dev-java/antlr-3.5.2
+++ b/metadata/md5-cache/dev-java/antlr-3.5.2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/stringtemplate:4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=3.5
 SRC_URI=https://github.com/antlr/antlr3/archive/3.5.2.tar.gz -> antlr-3.5.2.tar.gz http://www.antlr3.org/download/antlr-3.5.2-complete.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d5122bdf06eefc47ef5a5a718f9f1dc7
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=79f056cf51b80d1cd8445e9554cf0d9e
diff --git a/metadata/md5-cache/dev-java/antlr-4.5.1 b/metadata/md5-cache/dev-java/antlr-4.5.1
index 92c5fb388744..8d994c378f87 100644
--- a/metadata/md5-cache/dev-java/antlr-4.5.1
+++ b/metadata/md5-cache/dev-java/antlr-4.5.1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/antlr:3.5 dev-java/stringtemplate:4 dev-java/treelayout:0 >=vir
 SLOT=4
 SRC_URI=https://github.com/antlr/antlr4/archive/4.5.1.tar.gz -> antlr-4.5.1.tar.gz http://www.antlr.org/download/antlr-4.5.1-complete.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f93f62a9c0d4c3eb6165c463f99bf18b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=67abe3e17580b738801f7edeeac7623d
diff --git a/metadata/md5-cache/dev-java/antlr-4.5.3 b/metadata/md5-cache/dev-java/antlr-4.5.3
index 1d7cd67b1d00..90c5f518590c 100644
--- a/metadata/md5-cache/dev-java/antlr-4.5.3
+++ b/metadata/md5-cache/dev-java/antlr-4.5.3
@@ -10,5 +10,5 @@ RDEPEND=dev-java/antlr:3.5 dev-java/stringtemplate:4 dev-java/treelayout:0 >=vir
 SLOT=4
 SRC_URI=https://github.com/antlr/antlr4/archive/4.5.3.tar.gz -> antlr-4.5.3.tar.gz http://www.antlr.org/download/antlr-4.5.3-complete.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7c6c36ad69078c2c88f313c190fc2a98
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f565f4aadb4c52ef080df5f3e35f308a
diff --git a/metadata/md5-cache/dev-java/aopalliance-1.0-r2 b/metadata/md5-cache/dev-java/aopalliance-1.0-r2
index 21a818fc6c40..aeaea0792e34 100644
--- a/metadata/md5-cache/dev-java/aopalliance-1.0-r2
+++ b/metadata/md5-cache/dev-java/aopalliance-1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=1
 SRC_URI=mirror://gentoo/aopalliance-1.0-gentoo.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4e6d3b0dc3d712802dc3e18d74892b33
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3f0ac57b59cb0a47359e31e28f1cfac0
diff --git a/metadata/md5-cache/dev-java/appframework-1.03-r4 b/metadata/md5-cache/dev-java/appframework-1.03-r4
index 403b006707b9..a5096bbbeaed 100644
--- a/metadata/md5-cache/dev-java/appframework-1.03-r4
+++ b/metadata/md5-cache/dev-java/appframework-1.03-r4
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~monsieurp/packages/AppFramework-1.03-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5e13dfc847b3f103083cd5aef99c63c3
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d5818f78f4a24b25c384c12cdfbb2cd9
diff --git a/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.5-r1 b/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.5-r1
index 597c826b4d82..6f791d43c355 100644
--- a/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.5-r1
+++ b/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://developer.apple.com/samplecode/AppleJavaExtensions/AppleJavaExtensions.zip -> apple-java-extensions-bin-1.5.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7386642be875c00cbd27145b252d13c5
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f19f66c11422b405cbcd89b9b99bd617
diff --git a/metadata/md5-cache/dev-java/apt-mirror-1.0-r1 b/metadata/md5-cache/dev-java/apt-mirror-1.0-r1
index 5ee88a652f72..cc24e1772e7f 100644
--- a/metadata/md5-cache/dev-java/apt-mirror-1.0-r1
+++ b/metadata/md5-cache/dev-java/apt-mirror-1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://gentoo/apt-mirror-1.0.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3e7aa15b3251f12275412ef5c0ef0926
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a7de7f688f5cd7929b870f72f332a77d
diff --git a/metadata/md5-cache/dev-java/args4j-2.32 b/metadata/md5-cache/dev-java/args4j-2.32
index 2e967dd475a4..06ce98cccbe6 100644
--- a/metadata/md5-cache/dev-java/args4j-2.32
+++ b/metadata/md5-cache/dev-java/args4j-2.32
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
 SLOT=2
 SRC_URI=http://repo1.maven.org/maven2/args4j/args4j/2.32/args4j-2.32-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=00a15799d3d1f8649f80c5f1830c6c08
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7bee76157b14452151d231b5a796a303
diff --git a/metadata/md5-cache/dev-java/asm-3.3.1-r1 b/metadata/md5-cache/dev-java/asm-3.3.1-r1
index 8bf19d3c6a66..5f5661918526 100644
--- a/metadata/md5-cache/dev-java/asm-3.3.1-r1
+++ b/metadata/md5-cache/dev-java/asm-3.3.1-r1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=3
 SRC_URI=http://download.forge.objectweb.org/asm/asm-3.3.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e2912df240d608b31ee72643aaf8cd44
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d9c57d6088c403841c7029ae62232b50
diff --git a/metadata/md5-cache/dev-java/asm-5.0.3 b/metadata/md5-cache/dev-java/asm-5.0.3
index 1a4f600fd0bc..186abd5cfb0e 100644
--- a/metadata/md5-cache/dev-java/asm-5.0.3
+++ b/metadata/md5-cache/dev-java/asm-5.0.3
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=4
 SRC_URI=http://download.forge.objectweb.org/asm/asm-5.0.3.tar.gz http://download.forge.objectweb.org/asm/asm-4.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f4d90a1739c9fd1ab4fdd55d99e24024
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0c2b2f76d73515dfa3c3485b3fd669c4
diff --git a/metadata/md5-cache/dev-java/asm-5.1 b/metadata/md5-cache/dev-java/asm-5.1
index dcffa8b24985..25afb4be0ce2 100644
--- a/metadata/md5-cache/dev-java/asm-5.1
+++ b/metadata/md5-cache/dev-java/asm-5.1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=4
 SRC_URI=http://download.forge.objectweb.org/asm/asm-5.1.tar.gz http://download.forge.objectweb.org/asm/asm-4.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3fd8e6679b4dd4d284ddc4a8b08ab5c7
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=48d7f80cb3fab1afb8222e4483b945ed
diff --git a/metadata/md5-cache/dev-java/aspectj-1.7.3-r1 b/metadata/md5-cache/dev-java/aspectj-1.7.3-r1
index 9ee136b98b4d..b70903c09014 100644
--- a/metadata/md5-cache/dev-java/aspectj-1.7.3-r1
+++ b/metadata/md5-cache/dev-java/aspectj-1.7.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/asm:4 dev-java/commons-logging:0 >=dev-java/j
 SLOT=0
 SRC_URI=http://www.eclipse.org/downloads/download.php?file=/tools/aspectj/aspectj-1.7.3-src.jar&r=1 -> aspectj-1.7.3.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=88eeaf294a53e5ca4956acb3ec0b3c08
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=413f95a9691d43ec03695e3f1a4aaf33
diff --git a/metadata/md5-cache/dev-java/aspectj-1.7.4 b/metadata/md5-cache/dev-java/aspectj-1.7.4
index f9d969b153b3..b2fa66c517ff 100644
--- a/metadata/md5-cache/dev-java/aspectj-1.7.4
+++ b/metadata/md5-cache/dev-java/aspectj-1.7.4
@@ -10,5 +10,5 @@ RDEPEND=dev-java/asm:4 dev-java/commons-logging:0 >=virtual/jre-1.5 >=dev-java/j
 SLOT=0
 SRC_URI=http://www.eclipse.org/downloads/download.php?file=/tools/aspectj/aspectj-1.7.4-src.jar&r=1 -> aspectj-1.7.4-src.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c84c79bca29307da8a0c01713e39011b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6c28ea71110f1b1a7b114b967431f7ee
diff --git a/metadata/md5-cache/dev-java/assertj-core-2.3.0 b/metadata/md5-cache/dev-java/assertj-core-2.3.0
index 13700505bdd9..00ca2c4612d4 100644
--- a/metadata/md5-cache/dev-java/assertj-core-2.3.0
+++ b/metadata/md5-cache/dev-java/assertj-core-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/cglib:3 dev-java/junit:4 >=virtual/jre-1.7 >=dev-java/java-conf
 SLOT=2
 SRC_URI=https://github.com/joel-costigliola/assertj-core/archive/assertj-core-2.3.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3ae22767ef5f5b733741472c791260d9
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=48caa779bec664eab903cf1c6674c791
diff --git a/metadata/md5-cache/dev-java/avalon-framework-4.1.5-r1 b/metadata/md5-cache/dev-java/avalon-framework-4.1.5-r1
index b023bab90623..2ad1c6372128 100644
--- a/metadata/md5-cache/dev-java/avalon-framework-4.1.5-r1
+++ b/metadata/md5-cache/dev-java/avalon-framework-4.1.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 =dev-java/avalon-logkit-2* >=dev-java/log4j-1.2.9 >=de
 SLOT=4.1
 SRC_URI=mirror://apache/avalon/avalon-framework/source/avalon-framework-4.1.5.src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b07b2f1f4a2ae51f0b319f7ae9b9d4a6
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=633235ca35b2558b1e12aff58e037876
diff --git a/metadata/md5-cache/dev-java/avalon-framework-4.1.5-r2 b/metadata/md5-cache/dev-java/avalon-framework-4.1.5-r2
index d1ba44facd88..2305a0f3039f 100644
--- a/metadata/md5-cache/dev-java/avalon-framework-4.1.5-r2
+++ b/metadata/md5-cache/dev-java/avalon-framework-4.1.5-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/avalon-logkit:2.0 dev-java/log4j:0 >=dev-java
 SLOT=4.1
 SRC_URI=mirror://apache/avalon/avalon-framework/source/avalon-framework-4.1.5.src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e9bab12b3381e3b9f3ac562b02d0673d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3dfb826dc158c3a5b024c297d71eb69d
diff --git a/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r1 b/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r1
index 7ec1737c7106..02205fe01299 100644
--- a/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r1
+++ b/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 =dev-java/avalon-logkit-2* >=dev-java/log4j-1.2.9 >=de
 SLOT=4.2
 SRC_URI=mirror://apache/avalon/avalon-framework/source/avalon-framework-4.2.0-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0fde1bccb4fce9cc44a045e362aa69af
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=19b6496714c914dd87279729b927da70
diff --git a/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r2 b/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r2
index 3406231b1ebf..036f37697818 100644
--- a/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r2
+++ b/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/avalon-logkit:2.0 dev-java/log4j:0 >=dev-java
 SLOT=4.2
 SRC_URI=mirror://apache/avalon/avalon-framework/source/avalon-framework-4.2.0-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d514bd19cdecb312810122bb98f37479
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=cdc2a3624c90cde3249f42f862fd7cc9
diff --git a/metadata/md5-cache/dev-java/avalon-logkit-1.2.2-r1 b/metadata/md5-cache/dev-java/avalon-logkit-1.2.2-r1
index 43d967650395..e1ba182dc219 100644
--- a/metadata/md5-cache/dev-java/avalon-logkit-1.2.2-r1
+++ b/metadata/md5-cache/dev-java/avalon-logkit-1.2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/avalon-framework:4.1 dev-java/log4j:0 java-virtuals/jaf:0 java-
 SLOT=1.2
 SRC_URI=mirror://apache/avalon/logkit/source/logkit-1.2.2-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9a79dc11dd785cb04e92b65eaa953d8a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9bb158c532ec1d217198f117c6ad86fa
diff --git a/metadata/md5-cache/dev-java/avalon-logkit-2.1-r8 b/metadata/md5-cache/dev-java/avalon-logkit-2.1-r8
index e9bd67b67b6b..615de93b3523 100644
--- a/metadata/md5-cache/dev-java/avalon-logkit-2.1-r8
+++ b/metadata/md5-cache/dev-java/avalon-logkit-2.1-r8
@@ -10,5 +10,5 @@ RDEPEND=dev-java/log4j:0 java-virtuals/jms:0 dev-java/oracle-javamail:0 java-vir
 SLOT=2.0
 SRC_URI=mirror://apache/excalibur/excalibur-logkit/source/avalon-logkit-2.1-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a384a05f83b5122d1d60c7008d469f47
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5884bb1e69a97273b59068c24005fd03
diff --git a/metadata/md5-cache/dev-java/backport-util-concurrent-3.1 b/metadata/md5-cache/dev-java/backport-util-concurrent-3.1
index 0b64bef5ffd1..5228c1ebe8e3 100644
--- a/metadata/md5-cache/dev-java/backport-util-concurrent-3.1
+++ b/metadata/md5-cache/dev-java/backport-util-concurrent-3.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/backport-jsr166/3.1/backport-util-concurrent-Java60-3.1-src.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3d865c0d4b855b9521fad4796e7a7090
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0ad26b669a2ad5768e69cf2f15392fb9
diff --git a/metadata/md5-cache/dev-java/backport-util-concurrent-3.1-r1 b/metadata/md5-cache/dev-java/backport-util-concurrent-3.1-r1
index 7b5e3d4e6418..b3c89fb5aa1f 100644
--- a/metadata/md5-cache/dev-java/backport-util-concurrent-3.1-r1
+++ b/metadata/md5-cache/dev-java/backport-util-concurrent-3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/backport-jsr166/3.1/backport-util-concurrent-Java60-3.1-src.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d317a53aed88f5e04ef261aea8f2c57f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=563258ad706bd950d64b8995f24f0332
diff --git a/metadata/md5-cache/dev-java/balloontip-1.2.1 b/metadata/md5-cache/dev-java/balloontip-1.2.1
index c0a6af47c02e..56ed8fbf9825 100644
--- a/metadata/md5-cache/dev-java/balloontip-1.2.1
+++ b/metadata/md5-cache/dev-java/balloontip-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://java.net/projects/balloontip/downloads/download/balloontip_1.2.1.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=35b93edd5d260b9ce00b39f86967deee
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=57daaafd5a937a3111f7ac2f34a3fefb
diff --git a/metadata/md5-cache/dev-java/batik-1.8-r3 b/metadata/md5-cache/dev-java/batik-1.8-r3
index 43b8efd08e2b..9d74cda1b73d 100644
--- a/metadata/md5-cache/dev-java/batik-1.8-r3
+++ b/metadata/md5-cache/dev-java/batik-1.8-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/xalan:0 dev-java/rhino:1.6 dev-java/xml-commo
 SLOT=1.8
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/batik/source/batik-src-1.8.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b9fb71464d315718f8b8230817ef09d5
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1f5ce4c48d793d396071ed36bd07cf49
diff --git a/metadata/md5-cache/dev-java/bcel-6.0_rc3 b/metadata/md5-cache/dev-java/bcel-6.0_rc3
index 6fe13f7937f5..b6c5394ae4f9 100644
--- a/metadata/md5-cache/dev-java/bcel-6.0_rc3
+++ b/metadata/md5-cache/dev-java/bcel-6.0_rc3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/apache/commons-bcel/archive/BCEL_6_0_RC3.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=24a051829b3a81ad93918dff45e3b765
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5a58807291afff1652e38c0744c26e92
diff --git a/metadata/md5-cache/dev-java/bcmail-1.38-r4 b/metadata/md5-cache/dev-java/bcmail-1.38-r4
index 9effb0d0a109..4ec2a0fb72bf 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.38-r4
+++ b/metadata/md5-cache/dev-java/bcmail-1.38-r4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/bcprov:1.38 dev-java/junit:0 dev-java/sun-jaf
 SLOT=1.38
 SRC_URI=http://www.bouncycastle.org/download/bcmail-jdk14-138.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2447b4d3f0772bd9e0aef7ffcb5a871b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d324384334984d02e994287be0db9370
diff --git a/metadata/md5-cache/dev-java/bcmail-1.38-r5 b/metadata/md5-cache/dev-java/bcmail-1.38-r5
index b82c2199ddcb..c12b268674f0 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.38-r5
+++ b/metadata/md5-cache/dev-java/bcmail-1.38-r5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/bcprov:1.38 dev-java/junit:0 java-virtuals/ja
 SLOT=1.38
 SRC_URI=http://www.bouncycastle.org/download/bcmail-jdk14-138.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=562228e4a479195e01ecba294e8e2c6b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1c25c787c67da2ee31b7898be3c2dd85
diff --git a/metadata/md5-cache/dev-java/bcmail-1.45-r3 b/metadata/md5-cache/dev-java/bcmail-1.45-r3
index eb9390b21516..7ab16a86f36c 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.45-r3
+++ b/metadata/md5-cache/dev-java/bcmail-1.45-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/bcprov:1.45 dev-java/junit:0 dev-java/sun-jaf
 SLOT=1.45
 SRC_URI=http://www.bouncycastle.org/download/bcmail-jdk15-145.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=803fe554377c837d47c3928ac4f06194
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5e19e8696019b67f65dee2735b7627a1
diff --git a/metadata/md5-cache/dev-java/bcmail-1.45-r4 b/metadata/md5-cache/dev-java/bcmail-1.45-r4
index c25c8b9fbbb8..80ca85b63032 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.45-r4
+++ b/metadata/md5-cache/dev-java/bcmail-1.45-r4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/bcprov:1.45 dev-java/junit:0 java-virtuals/ja
 SLOT=1.45
 SRC_URI=http://www.bouncycastle.org/download/bcmail-jdk15-145.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8ca763fa3d0f8a905acd9384cd545305
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=adf16c91c5706fc40d1d066135fa7cea
diff --git a/metadata/md5-cache/dev-java/bcmail-1.50-r2 b/metadata/md5-cache/dev-java/bcmail-1.50-r2
index e5ab141cdcba..97d6f60fc73b 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.50-r2
+++ b/metadata/md5-cache/dev-java/bcmail-1.50-r2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=1.50
 SRC_URI=http://www.bouncycastle.org/download/bcmail-jdk15on-150.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=013317ce536a4220f792c9c8b675346d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e1e6d6f3014d7920a4965d1fe136b0d4
diff --git a/metadata/md5-cache/dev-java/bcmail-1.52-r2 b/metadata/md5-cache/dev-java/bcmail-1.52-r2
index c92cc1f5c70b..25b8634c251d 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.52-r2
+++ b/metadata/md5-cache/dev-java/bcmail-1.52-r2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=1.52
 SRC_URI=http://www.bouncycastle.org/download/bcmail-jdk15on-152.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=73127fb030cde2cbba591319f58ebfca
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=064dde84a26d7f749cfbecb26dc95c7f
diff --git a/metadata/md5-cache/dev-java/bcpg-1.50-r1 b/metadata/md5-cache/dev-java/bcpg-1.50-r1
index 53c7dddbe5ab..f58184f41c94 100644
--- a/metadata/md5-cache/dev-java/bcpg-1.50-r1
+++ b/metadata/md5-cache/dev-java/bcpg-1.50-r1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=1.50
 SRC_URI=http://www.bouncycastle.org/download/bcpg-jdk15on-150.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=060b6e838e4f0fb9dde6fec9ea27d1f5
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e41fe33b8936c8f4468918437f9f3e2d
diff --git a/metadata/md5-cache/dev-java/bcpg-1.52-r1 b/metadata/md5-cache/dev-java/bcpg-1.52-r1
index 0c7579b7e5b9..ff67afdca0b3 100644
--- a/metadata/md5-cache/dev-java/bcpg-1.52-r1
+++ b/metadata/md5-cache/dev-java/bcpg-1.52-r1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=1.52
 SRC_URI=http://www.bouncycastle.org/download/bcpg-jdk15on-152.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=14447d28e8e5ba74b48a4541d3879dc0
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=47f3d3a3a675cba181ffb9a8db8b062d
diff --git a/metadata/md5-cache/dev-java/bcpkix-1.50-r2 b/metadata/md5-cache/dev-java/bcpkix-1.50-r2
index 7ebb7832697c..f8f9d80f0e4a 100644
--- a/metadata/md5-cache/dev-java/bcpkix-1.50-r2
+++ b/metadata/md5-cache/dev-java/bcpkix-1.50-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/bcprov:1.50 >=dev-java/java-config-2.2.0-r3 s
 SLOT=1.50
 SRC_URI=http://central.maven.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.50/bcpkix-jdk15on-1.50-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9e33230edf8786bc7feca140f442d222
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=952e85ba41f4ec47c983afe4ca99983c
diff --git a/metadata/md5-cache/dev-java/bcpkix-1.52-r1 b/metadata/md5-cache/dev-java/bcpkix-1.52-r1
index 519d1098f6b7..faeb54b8bcc2 100644
--- a/metadata/md5-cache/dev-java/bcpkix-1.52-r1
+++ b/metadata/md5-cache/dev-java/bcpkix-1.52-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/bcprov:1.52 >=dev-java/java-config-2.2.0-r3 s
 SLOT=1.52
 SRC_URI=http://central.maven.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.52/bcpkix-jdk15on-1.52-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=698074d40e4e27c667d70d0a2dc3cec5
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4ecb902c6d1a1747352b3c24b3df53f1
diff --git a/metadata/md5-cache/dev-java/bcprov-1.38-r4 b/metadata/md5-cache/dev-java/bcprov-1.38-r4
index 92bbb61e545c..0ad3d036f7b3 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.38-r4
+++ b/metadata/md5-cache/dev-java/bcprov-1.38-r4
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=1.38
 SRC_URI=http://central.maven.org/maven2/org/bouncycastle/bcprov-jdk16/1.38/bcprov-jdk16-1.38-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bcf116965a2ce70f86318d2d1dc4d25b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=457e7d861432215287e4a370671ebe07
diff --git a/metadata/md5-cache/dev-java/bcprov-1.40-r2 b/metadata/md5-cache/dev-java/bcprov-1.40-r2
index 29d350ec4362..aa4dc1c61117 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.40-r2
+++ b/metadata/md5-cache/dev-java/bcprov-1.40-r2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=1.40
 SRC_URI=http://central.maven.org/maven2/org/bouncycastle/bcprov-jdk16/1.40/bcprov-jdk16-1.40-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f4bc76662193f234941be95b83a199bb
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=419c2a2b9abd4ce7e5c1ab520f78e0de
diff --git a/metadata/md5-cache/dev-java/bcprov-1.45-r2 b/metadata/md5-cache/dev-java/bcprov-1.45-r2
index 8d6f8a810f04..d525c131dee3 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.45-r2
+++ b/metadata/md5-cache/dev-java/bcprov-1.45-r2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=1.45
 SRC_URI=http://central.maven.org/maven2/org/bouncycastle/bcprov-jdk16/1.45/bcprov-jdk16-1.45-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d518b4f8d718466eb00c8c74c74b0d70
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c4b18eba63f0edcdae99c00152adae9f
diff --git a/metadata/md5-cache/dev-java/bcprov-1.48-r2 b/metadata/md5-cache/dev-java/bcprov-1.48-r2
index 6d900b5979f1..aeacb624b1ae 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.48-r2
+++ b/metadata/md5-cache/dev-java/bcprov-1.48-r2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=1.48
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-148.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5124cb2137076428d391d8e59eca5e51
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=74bf0bb7c8ca3aaac65b8ec5107b7f3b
diff --git a/metadata/md5-cache/dev-java/bcprov-1.49-r4 b/metadata/md5-cache/dev-java/bcprov-1.49-r4
index b25539368b0f..d4c1e686c037 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.49-r4
+++ b/metadata/md5-cache/dev-java/bcprov-1.49-r4
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=1.49
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-149.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3adb43f833ee18f24cc78dd04c23b9f1
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c998a4359036e7df8694a8a648df8a77
diff --git a/metadata/md5-cache/dev-java/bcprov-1.50-r2 b/metadata/md5-cache/dev-java/bcprov-1.50-r2
index d08c979eb346..2e106cb04903 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.50-r2
+++ b/metadata/md5-cache/dev-java/bcprov-1.50-r2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=1.50
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-150.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e99d3a3c6e0e5a4148543a25540b35e9
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=dbd56b911b88d2f03fb20db991bc59ac
diff --git a/metadata/md5-cache/dev-java/bcprov-1.50-r3 b/metadata/md5-cache/dev-java/bcprov-1.50-r3
index 864b5f971cac..7ae884517f8a 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.50-r3
+++ b/metadata/md5-cache/dev-java/bcprov-1.50-r3
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-150.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7d2a6e75322048eaa67c9eb268cf1576
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=843b2da0a294459752b5ba188ccefee7
diff --git a/metadata/md5-cache/dev-java/bcprov-1.50-r4 b/metadata/md5-cache/dev-java/bcprov-1.50-r4
index 01f21197bd5f..79a9cd517313 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.50-r4
+++ b/metadata/md5-cache/dev-java/bcprov-1.50-r4
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=1.50
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-150.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=07141bd0eef44708816d6c05a4f47606
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=501fd0de71e8dddfd51ffbbfdf124bfb
diff --git a/metadata/md5-cache/dev-java/bcprov-1.52-r1 b/metadata/md5-cache/dev-java/bcprov-1.52-r1
index 436f50a3cfcf..b5b47af4a1c0 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.52-r1
+++ b/metadata/md5-cache/dev-java/bcprov-1.52-r1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=1.52
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-152.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6c6c56b88c0f1f1a950e02ab81d01af2
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3051dfca9ab4dcd220a7bbe4bb4d658e
diff --git a/metadata/md5-cache/dev-java/bcprov-1.52-r2 b/metadata/md5-cache/dev-java/bcprov-1.52-r2
index 18c7efc656bf..e89a63360ea4 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.52-r2
+++ b/metadata/md5-cache/dev-java/bcprov-1.52-r2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-152.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=546e4a9c82f37dda51c139d983f508cf
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=00b2db7b0d21c6affa24c8a755d48993
diff --git a/metadata/md5-cache/dev-java/bcprov-1.52-r3 b/metadata/md5-cache/dev-java/bcprov-1.52-r3
index 0d84b8cb13d1..534f5ae264de 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.52-r3
+++ b/metadata/md5-cache/dev-java/bcprov-1.52-r3
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=1.52
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-152.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2a995e1adcc7c9d2e1db10edb703b925
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a3fd8b67e292720d4b0ba74c35420659
diff --git a/metadata/md5-cache/dev-java/bcprov-1.54 b/metadata/md5-cache/dev-java/bcprov-1.54
index 50e8d4f439c9..0b7b615aa5f7 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.54
+++ b/metadata/md5-cache/dev-java/bcprov-1.54
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=1.54
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-154.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b650dd03bfd0b0247e0b8bef96c42d22
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6adfa86ba4a4b37d2e2565883189c614
diff --git a/metadata/md5-cache/dev-java/bctsp-1.45-r1 b/metadata/md5-cache/dev-java/bctsp-1.45-r1
index 44b166bfb48a..b5008f8d06a2 100644
--- a/metadata/md5-cache/dev-java/bctsp-1.45-r1
+++ b/metadata/md5-cache/dev-java/bctsp-1.45-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/bcprov:1.45 dev-java/bcmail:1.45 >=virtual/jre-1.6 >=dev-java/j
 SLOT=0
 SRC_URI=http://www.bouncycastle.org/download/bctsp-jdk15-145.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6f520bd73ed886b7a040a109c6318022
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2076b6bfc447be98f1ca558d35515f10
diff --git a/metadata/md5-cache/dev-java/beansbinding-1.2.1-r3 b/metadata/md5-cache/dev-java/beansbinding-1.2.1-r3
index a7555754b9ee..3312cef494b6 100644
--- a/metadata/md5-cache/dev-java/beansbinding-1.2.1-r3
+++ b/metadata/md5-cache/dev-java/beansbinding-1.2.1-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~monsieurp/packages/beansbinding-1.2.1-src.zip -> beansbinding-1.2.1.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0828cc2eb906131f0b34916b0fdb5106
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=bd62aa4d081f8b46a3533e7db2468846
diff --git a/metadata/md5-cache/dev-java/blowfishj-2.14-r3 b/metadata/md5-cache/dev-java/blowfishj-2.14-r3
index 2042950baef3..4c6a849b1058 100644
--- a/metadata/md5-cache/dev-java/blowfishj-2.14-r3
+++ b/metadata/md5-cache/dev-java/blowfishj-2.14-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/blowfishj/blowfishj-2.14-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7487e265cf3aa79fd989b3ebb53924d1
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=545abc2772bb0d1a3adbbe8b05c19d1a
diff --git a/metadata/md5-cache/dev-java/bnd-junit-2.1.0 b/metadata/md5-cache/dev-java/bnd-junit-2.1.0
index f47fe3566037..1a46c055d172 100644
--- a/metadata/md5-cache/dev-java/bnd-junit-2.1.0
+++ b/metadata/md5-cache/dev-java/bnd-junit-2.1.0
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=77ca8e61f01a8a53c114b1d19adc33d3
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2673026a30262cbd49961b2d2375dee2
diff --git a/metadata/md5-cache/dev-java/bndlib-2.1.0 b/metadata/md5-cache/dev-java/bndlib-2.1.0
index d5ac1d6a6fc2..84de68df2c8f 100644
--- a/metadata/md5-cache/dev-java/bndlib-2.1.0
+++ b/metadata/md5-cache/dev-java/bndlib-2.1.0
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f1f9a393ef4b44c3a21b6f965c70df9c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=07a34029be330d2867d34394e8a33c7c
diff --git a/metadata/md5-cache/dev-java/boilerpipe-1.2.0 b/metadata/md5-cache/dev-java/boilerpipe-1.2.0
index 42cf9b5a0b67..1f6d13f97090 100644
--- a/metadata/md5-cache/dev-java/boilerpipe-1.2.0
+++ b/metadata/md5-cache/dev-java/boilerpipe-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/xerces:2 dev-java/nekohtml:0 >=dev-java/java-
 SLOT=0
 SRC_URI=https://boilerpipe.googlecode.com/files/boilerpipe-1.2.0-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2b2614732869bb2ff436ff1a7bb3cf5a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a43ddeafcc79f17afb6c6068f3b23f6f
diff --git a/metadata/md5-cache/dev-java/boot-bin-2.6.0 b/metadata/md5-cache/dev-java/boot-bin-2.6.0
index deaa8d18b8ce..f02a652c6bfb 100644
--- a/metadata/md5-cache/dev-java/boot-bin-2.6.0
+++ b/metadata/md5-cache/dev-java/boot-bin-2.6.0
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/boot-clj/boot/releases/download/2.6.0/boot.jar -> boot-2.6.0.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=dbe20a949049f09614b47d528f76d229
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b7f9292d3a3d3c966bdc5dfaa4c3d724
diff --git a/metadata/md5-cache/dev-java/boot-bin-2.7.0 b/metadata/md5-cache/dev-java/boot-bin-2.7.0
index d2ffe943739f..91704f804903 100644
--- a/metadata/md5-cache/dev-java/boot-bin-2.7.0
+++ b/metadata/md5-cache/dev-java/boot-bin-2.7.0
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/boot-clj/boot/releases/download/2.7.0/boot.jar -> boot-2.7.0.jar https://raw.githubusercontent.com/boot-clj/boot/2.7.0/README.md -> boot-2.7.0-README.md https://raw.githubusercontent.com/boot-clj/boot/2.7.0/CHANGES.md -> boot-2.7.0-CHANGES.md
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=97d6ae65ff58e781e725507f0e5b439a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=bf5c6287ab05c255ad014c094743796c
diff --git a/metadata/md5-cache/dev-java/boot-bin-2.7.1 b/metadata/md5-cache/dev-java/boot-bin-2.7.1
index cf56d3eacb9e..71cc6b460b00 100644
--- a/metadata/md5-cache/dev-java/boot-bin-2.7.1
+++ b/metadata/md5-cache/dev-java/boot-bin-2.7.1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/boot-clj/boot/releases/download/2.7.1/boot.jar -> boot-2.7.1.jar https://raw.githubusercontent.com/boot-clj/boot/2.7.1/README.md -> boot-2.7.1-README.md https://raw.githubusercontent.com/boot-clj/boot/2.7.1/CHANGES.md -> boot-2.7.1-CHANGES.md
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=97d6ae65ff58e781e725507f0e5b439a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=bf5c6287ab05c255ad014c094743796c
diff --git a/metadata/md5-cache/dev-java/browserlauncher2-1.3-r1 b/metadata/md5-cache/dev-java/browserlauncher2-1.3-r1
index d0b70824518b..d0ab8897cf40 100644
--- a/metadata/md5-cache/dev-java/browserlauncher2-1.3-r1
+++ b/metadata/md5-cache/dev-java/browserlauncher2-1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=1.0
 SRC_URI=mirror://sourceforge/browserlaunch2/BrowserLauncher2-all-1_3.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5aca025be193fd173f9105330d1217fd
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4279f8a2d9870ce693edc5983e4cab73
diff --git a/metadata/md5-cache/dev-java/bsf-2.4.0-r2 b/metadata/md5-cache/dev-java/bsf-2.4.0-r2
index 078671df7206..aff9362ae31c 100644
--- a/metadata/md5-cache/dev-java/bsf-2.4.0-r2
+++ b/metadata/md5-cache/dev-java/bsf-2.4.0-r2
@@ -10,5 +10,5 @@ RDEPEND=python? ( dev-java/jython:2.7 ) javascript? ( dev-java/rhino:1.6 ) tcl?
 SLOT=2.3
 SRC_URI=mirror://apache/jakarta/bsf/source/bsf-src-2.4.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=056fae17896f32cb0143230d15724f8b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5d8200e37c6180e87fbfab6fb59f0812
diff --git a/metadata/md5-cache/dev-java/bsh-2.0_beta6 b/metadata/md5-cache/dev-java/bsh-2.0_beta6
index 6b8c4573757b..84f13b2f851f 100644
--- a/metadata/md5-cache/dev-java/bsh-2.0_beta6
+++ b/metadata/md5-cache/dev-java/bsh-2.0_beta6
@@ -10,5 +10,5 @@ RDEPEND=dev-java/bsf:2.3 java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-j
 SLOT=0
 SRC_URI=https://github.com/beanshell/beanshell/archive/2.0b6.zip -> bsh-2.0b6.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6d66d212cb2601629cbd67cd89977ca7
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1157fb7e5dcd33484ba20340b5a1a85e
diff --git a/metadata/md5-cache/dev-java/btf-1.2 b/metadata/md5-cache/dev-java/btf-1.2
index de2853d2292e..789b4840e116 100644
--- a/metadata/md5-cache/dev-java/btf-1.2
+++ b/metadata/md5-cache/dev-java/btf-1.2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jsr305:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 sour
 SLOT=0
 SRC_URI=https://github.com/fge/btf/archive/1.2.tar.gz -> btf-1.2.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bbaed607c649d204bc190f7059082697
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=53d687aa7f187cd3ddf8443b3107e327
diff --git a/metadata/md5-cache/dev-java/byaccj-1.15-r1 b/metadata/md5-cache/dev-java/byaccj-1.15-r1
index d790eb6357d0..e7ec1f934118 100644
--- a/metadata/md5-cache/dev-java/byaccj-1.15-r1
+++ b/metadata/md5-cache/dev-java/byaccj-1.15-r1
@@ -7,5 +7,5 @@ LICENSE=public-domain
 SLOT=0
 SRC_URI=mirror://sourceforge/byaccj/byaccj1.15_src.tar.gz
 _eclass_exported_funcs=src_compile:- src_install:-
-_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=c81d92ed84f3f70754f98161d97f0938
+_eclasses_=multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432
+_md5_=e87e79f3735c5642ffb83d8a501b28a2
diff --git a/metadata/md5-cache/dev-java/bytelist-1.0.10 b/metadata/md5-cache/dev-java/bytelist-1.0.10
index 9fb89ed85e8f..5a266fa37ce7 100644
--- a/metadata/md5-cache/dev-java/bytelist-1.0.10
+++ b/metadata/md5-cache/dev-java/bytelist-1.0.10
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jcodings:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 so
 SLOT=0
 SRC_URI=https://github.com/jruby/bytelist/tarball/1.0.10 -> bytelist-1.0.10.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=50c4327028396410ba4debced3bc4b18
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c2c4acaf9f1c90a400f146e331fba3c0
diff --git a/metadata/md5-cache/dev-java/c3p0-0.9.5.1 b/metadata/md5-cache/dev-java/c3p0-0.9.5.1
index 43a8e1162786..fd49196fef8c 100644
--- a/metadata/md5-cache/dev-java/c3p0-0.9.5.1
+++ b/metadata/md5-cache/dev-java/c3p0-0.9.5.1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/log4j:0 dev-java/mchange-commons:0 >=virtual/jre-1.6 >=dev-java
 SLOT=0
 SRC_URI=mirror://sourceforge/c3p0/c3p0-0.9.5.1.src.tgz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2a798b4e76f8bb781ed8314c3fa24b74
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d276529f7b28c5884a9d546627c9e318
diff --git a/metadata/md5-cache/dev-java/cal10n-0.8.1 b/metadata/md5-cache/dev-java/cal10n-0.8.1
index 176fd7d32386..180e5e3fc24c 100644
--- a/metadata/md5-cache/dev-java/cal10n-0.8.1
+++ b/metadata/md5-cache/dev-java/cal10n-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/ch/qos/cal10n/cal10n-api/0.8.1/cal10n-api-0.8.1-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bc39969c97856df81f98d454878e7b98
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=49a6d4f72816926d1248e47d4e6762eb
diff --git a/metadata/md5-cache/dev-java/cdegroot-db-0.08-r1 b/metadata/md5-cache/dev-java/cdegroot-db-0.08-r1
index 127b8342ac88..c6824524df0e 100644
--- a/metadata/md5-cache/dev-java/cdegroot-db-0.08-r1
+++ b/metadata/md5-cache/dev-java/cdegroot-db-0.08-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=1
 SRC_URI=http://www.cdegroot.com/software/db/download/com.cdegroot.db-0.08.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=198917fbb6ee57bcdb92d335fbbe6648
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e5d9402fb60aa04ab1c755c5e9cdc294
diff --git a/metadata/md5-cache/dev-java/cdegroot-db-0.08-r2 b/metadata/md5-cache/dev-java/cdegroot-db-0.08-r2
index edeec6a23983..02e1a39330dd 100644
--- a/metadata/md5-cache/dev-java/cdegroot-db-0.08-r2
+++ b/metadata/md5-cache/dev-java/cdegroot-db-0.08-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=1
 SRC_URI=http://www.cdegroot.com/software/db/download/com.cdegroot.db-0.08.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=563486f8516290b291c98760228522ec
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=455db05b22428b15aae500ef83155f26
diff --git a/metadata/md5-cache/dev-java/cdi-api-1.2 b/metadata/md5-cache/dev-java/cdi-api-1.2
index 6d72cbc0c609..888619028dfa 100644
--- a/metadata/md5-cache/dev-java/cdi-api-1.2
+++ b/metadata/md5-cache/dev-java/cdi-api-1.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/javax-inject:0 dev-java/glassfish-interceptor
 SLOT=1.2
 SRC_URI=https://repo1.maven.org/maven2/javax/enterprise/cdi-api/1.2/cdi-api-1.2-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b0ae36576ba71e812b8535fe3fd96747
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c8b290a8f7447ddb716ee18f507db8d6
diff --git a/metadata/md5-cache/dev-java/cdi-api-1.2-r1 b/metadata/md5-cache/dev-java/cdi-api-1.2-r1
index e6143db83cf4..b1e86f6e0119 100644
--- a/metadata/md5-cache/dev-java/cdi-api-1.2-r1
+++ b/metadata/md5-cache/dev-java/cdi-api-1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/javax-inject:0 dev-java/tomcat-servlet-api:3.0 dev-java/glassfi
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/javax/enterprise/cdi-api/1.2/cdi-api-1.2-sources.jar -> cdi-api-1.2.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=218633582e9c04446ef4bad4beb1ecc7
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b7c06136f27076faabda0672a52b5dcf
diff --git a/metadata/md5-cache/dev-java/cglib-3.1 b/metadata/md5-cache/dev-java/cglib-3.1
index 3e951bdcae76..73adf4c6fe7d 100644
--- a/metadata/md5-cache/dev-java/cglib-3.1
+++ b/metadata/md5-cache/dev-java/cglib-3.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/asm:4 dev-java/ant-core:0 >=dev-java/java-con
 SLOT=3
 SRC_URI=mirror://sourceforge/cglib/cglib-src-3.1.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4fa52ed996902d7104c8dc8ccbcaca1a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=bdd461c093574d1183420273bb829982
diff --git a/metadata/md5-cache/dev-java/classmate-0.9.0-r1 b/metadata/md5-cache/dev-java/classmate-0.9.0-r1
index 9a34a19a23b0..e06eb8b3f6de 100644
--- a/metadata/md5-cache/dev-java/classmate-0.9.0-r1
+++ b/metadata/md5-cache/dev-java/classmate-0.9.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/cowtowncoder/java-classmate/archive/classmate-0.9.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:vcs-snapshot src_prepare:java-pkg-2 src_compile:java-pkg-simple src_test:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f06eca22b87ff2c51be94f5344aaeeea
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=36e7e014bb229fabff11a49563a01470
diff --git a/metadata/md5-cache/dev-java/classmate-1.0.0 b/metadata/md5-cache/dev-java/classmate-1.0.0
index bec83f7b5deb..2b38520a806d 100644
--- a/metadata/md5-cache/dev-java/classmate-1.0.0
+++ b/metadata/md5-cache/dev-java/classmate-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/cowtowncoder/java-classmate/archive/classmate-1.0.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_test:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f10a1aa113deff5ce00d97a24e04d676
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a7e1efedc84603a5266eb2f4c06ece5f
diff --git a/metadata/md5-cache/dev-java/cldc-api-1.1-r1 b/metadata/md5-cache/dev-java/cldc-api-1.1-r1
index fc9c0248ba34..3210f91fab4a 100644
--- a/metadata/md5-cache/dev-java/cldc-api-1.1-r1
+++ b/metadata/md5-cache/dev-java/cldc-api-1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=1.1
 SRC_URI=mirror://gentoo/cldc-api-1.1.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=150271025e5701fa0095f4d8f7d99f31
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8b1c7a55f93192fb6c6f126589ab74b3
diff --git a/metadata/md5-cache/dev-java/codemodel-2.6 b/metadata/md5-cache/dev-java/codemodel-2.6
index 6eca4d44a443..d19cb832aeee 100644
--- a/metadata/md5-cache/dev-java/codemodel-2.6
+++ b/metadata/md5-cache/dev-java/codemodel-2.6
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=2
 SRC_URI=http://repo.maven.apache.org/maven2/com/sun/codemodel/codemodel/2.6/codemodel-2.6-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9bdc266768d10cd6503697faa81e1490
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0ac817ce51ba1dd8d8bb7c6813e66d7e
diff --git a/metadata/md5-cache/dev-java/cofoja-1.2 b/metadata/md5-cache/dev-java/cofoja-1.2
index f799f454055a..be4ec8b44269 100644
--- a/metadata/md5-cache/dev-java/cofoja-1.2
+++ b/metadata/md5-cache/dev-java/cofoja-1.2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/nhatminhle/cofoja/archive/v1.2.zip -> cofoja-1.2.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4c1961da5b1fb9f8f82e55eb916ff4c7
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3d046f896b4e2108f6f33db0badfbd3f
diff --git a/metadata/md5-cache/dev-java/colt-1.2.0-r3 b/metadata/md5-cache/dev-java/colt-1.2.0-r3
index 565eac2c5e83..f27cdc3908f8 100644
--- a/metadata/md5-cache/dev-java/colt-1.2.0-r3
+++ b/metadata/md5-cache/dev-java/colt-1.2.0-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://dsd.lbl.gov/~hoschek/colt-download/releases/colt-1.2.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=652cd16d84dd6801d0d2c3e16b756beb
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0b3f45cd668acbb9e7e8706a06ef0799
diff --git a/metadata/md5-cache/dev-java/commons-beanutils-1.9.2 b/metadata/md5-cache/dev-java/commons-beanutils-1.9.2
index c098e50f5954..6278ca6f0793 100644
--- a/metadata/md5-cache/dev-java/commons-beanutils-1.9.2
+++ b/metadata/md5-cache/dev-java/commons-beanutils-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/commons-collections:0 dev-java/commons-loggin
 SLOT=1.7
 SRC_URI=mirror://apache/commons/beanutils/source/commons-beanutils-1.9.2-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=94d22e05a6b5683d890761f9529413ba
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5faffd4f26caac1c7390c60e80038715
diff --git a/metadata/md5-cache/dev-java/commons-betwixt-0.8 b/metadata/md5-cache/dev-java/commons-betwixt-0.8
index 9384ee50a2a8..72ee54b63b28 100644
--- a/metadata/md5-cache/dev-java/commons-betwixt-0.8
+++ b/metadata/md5-cache/dev-java/commons-betwixt-0.8
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/commons-collections:0 >=dev-java/commons-logg
 SLOT=0.7
 SRC_URI=mirror://apache/commons//betwixt/source/commons-betwixt-0.8-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=54d7cccd05c1b72c56316064075b3fcf
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=da5161337afb93fb33a57b25ee18fbba
diff --git a/metadata/md5-cache/dev-java/commons-chain-1.2 b/metadata/md5-cache/dev-java/commons-chain-1.2
index 6dd5feb766bc..eade7449a109 100644
--- a/metadata/md5-cache/dev-java/commons-chain-1.2
+++ b/metadata/md5-cache/dev-java/commons-chain-1.2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/chain/source/commons-chain-1.2-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=11097db96ba44db58ec88e61e66036ed
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b4472f5b46f83e26d8808e19097e98b3
diff --git a/metadata/md5-cache/dev-java/commons-cli-1.2 b/metadata/md5-cache/dev-java/commons-cli-1.2
index ca15b0fa573f..cc6eea36db20 100644
--- a/metadata/md5-cache/dev-java/commons-cli-1.2
+++ b/metadata/md5-cache/dev-java/commons-cli-1.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=1
 SRC_URI=mirror://apache/commons/cli/source/commons-cli-1.2-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c7a45c03642fffb9bac4dbbc962d017f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c08789b998829ca27ec503ba31bfaba1
diff --git a/metadata/md5-cache/dev-java/commons-cli-1.3.1 b/metadata/md5-cache/dev-java/commons-cli-1.3.1
index 1ba28a3eb504..ca2a31cc3353 100644
--- a/metadata/md5-cache/dev-java/commons-cli-1.3.1
+++ b/metadata/md5-cache/dev-java/commons-cli-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=1
 SRC_URI=mirror://apache/commons/cli/source/commons-cli-1.3.1-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2467556a2b5866cc059c8b0bb518ddc1
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=06830900f2b106f732288adc1b253f31
diff --git a/metadata/md5-cache/dev-java/commons-codec-1.7 b/metadata/md5-cache/dev-java/commons-codec-1.7
index a6308e89f946..7e3b7a9920e7 100644
--- a/metadata/md5-cache/dev-java/commons-codec-1.7
+++ b/metadata/md5-cache/dev-java/commons-codec-1.7
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://apache/commons/codec/source/commons-codec-1.7-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b50cce0e7b83d6bde078dba844daa644
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=27f979353db8b7f94bdf9542e9b3d050
diff --git a/metadata/md5-cache/dev-java/commons-collections-3.2.1-r1 b/metadata/md5-cache/dev-java/commons-collections-3.2.1-r1
index 0376860073d7..90aa6f40b7de 100644
--- a/metadata/md5-cache/dev-java/commons-collections-3.2.1-r1
+++ b/metadata/md5-cache/dev-java/commons-collections-3.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 test-framework? ( dev-java/junit:0 dev-java/ant-junit:
 SLOT=0
 SRC_URI=mirror://apache/commons/collections/source/commons-collections-3.2.1-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=20ab11e7bc524a8ef5aca9c483855373
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3b23ea993e8f371b2b9c1e5e7eb42cb4
diff --git a/metadata/md5-cache/dev-java/commons-collections-4.1 b/metadata/md5-cache/dev-java/commons-collections-4.1
index ddb2f617a67f..5a6c60c8ef0d 100644
--- a/metadata/md5-cache/dev-java/commons-collections-4.1
+++ b/metadata/md5-cache/dev-java/commons-collections-4.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=4
 SRC_URI=mirror://apache/commons/collections/source/commons-collections4-4.1-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0a10a1efa9389f234a9533370ef28fc4
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f36f2129fc25942089cdbf4d75b58739
diff --git a/metadata/md5-cache/dev-java/commons-compress-1.10 b/metadata/md5-cache/dev-java/commons-compress-1.10
index a03ad6662b00..123ab811401b 100644
--- a/metadata/md5-cache/dev-java/commons-compress-1.10
+++ b/metadata/md5-cache/dev-java/commons-compress-1.10
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xz-java:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 sou
 SLOT=0
 SRC_URI=mirror://apache/commons//compress/source/commons-compress-1.10-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a70f8e0d7aaa7904d0e7c993d0b500ec
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b625d4f895d8d66105e3dbd132aedd77
diff --git a/metadata/md5-cache/dev-java/commons-configuration-1.6-r2 b/metadata/md5-cache/dev-java/commons-configuration-1.6-r2
index 0d76177fa5e0..ef24bffb5014 100644
--- a/metadata/md5-cache/dev-java/commons-configuration-1.6-r2
+++ b/metadata/md5-cache/dev-java/commons-configuration-1.6-r2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/configuration/source/commons-configuration-1.6-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5ee560cbda8162aa82fee5b09c487cc3
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b28571f055c9e0c436e599e100e59552
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.0.15 b/metadata/md5-cache/dev-java/commons-daemon-1.0.15
index 19a345efc233..a4fce4fb8d13 100644
--- a/metadata/md5-cache/dev-java/commons-daemon-1.0.15
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.0.15
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( sys-libs/libcap ) >=virtual/jre-1.6 >=dev-java/java-conf
 SLOT=0
 SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.0.15-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:- src_compile:- src_install:-
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	libtool	84763589a795fb127b537cac01e5359f	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=06dff7a6886deee8bd54383be74ded77
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	48b1b9f6194d2842456514d1184ca72e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2857286ad40d77cf977851834da63e78
diff --git a/metadata/md5-cache/dev-java/commons-dbcp-2.1 b/metadata/md5-cache/dev-java/commons-dbcp-2.1
index 3a384a89a4f5..c455e6ec83eb 100644
--- a/metadata/md5-cache/dev-java/commons-dbcp-2.1
+++ b/metadata/md5-cache/dev-java/commons-dbcp-2.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 >=dev-java/commons-logging-1.1.1 dev-java/commons-pool
 SLOT=2
 SRC_URI=mirror://apache/commons/dbcp/source/commons-dbcp2-2.1-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b2d4069de75319119b21f8fa072ff187
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7257281acead36a39c19bd1cc0dd4f11
diff --git a/metadata/md5-cache/dev-java/commons-dbutils-1.6 b/metadata/md5-cache/dev-java/commons-dbutils-1.6
index 9f1f94711a9c..9c9109377ea6 100644
--- a/metadata/md5-cache/dev-java/commons-dbutils-1.6
+++ b/metadata/md5-cache/dev-java/commons-dbutils-1.6
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://apache/commons/dbutils/source/commons-dbutils-1.6-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=eee36f70b1221238d099d67202ca4c2a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=30e5c402aeb4173ca297de80e81f5014
diff --git a/metadata/md5-cache/dev-java/commons-digester-1.8.1-r2 b/metadata/md5-cache/dev-java/commons-digester-1.8.1-r2
index c9f8fefae885..2656078c5fa8 100644
--- a/metadata/md5-cache/dev-java/commons-digester-1.8.1-r2
+++ b/metadata/md5-cache/dev-java/commons-digester-1.8.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/commons-beanutils:1.7 >=dev-java/commons-coll
 SLOT=0
 SRC_URI=mirror://apache/commons/digester/source/commons-digester-1.8.1-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=34b71fe085fe4aafdd2465e6319097fd
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1ab2e07b3dadd4479058b5dfd6f49a46
diff --git a/metadata/md5-cache/dev-java/commons-digester-2.1-r1 b/metadata/md5-cache/dev-java/commons-digester-2.1-r1
index 39104cc3a21e..8516eb6358df 100644
--- a/metadata/md5-cache/dev-java/commons-digester-2.1-r1
+++ b/metadata/md5-cache/dev-java/commons-digester-2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/commons-beanutils:1.7 >=dev-java/commons-coll
 SLOT=2.1
 SRC_URI=mirror://apache/commons/digester/source/commons-digester-2.1-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=08afc865a9bf035e7c79ebb3b575313f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4fd764215ee761450c0d546b03e1560d
diff --git a/metadata/md5-cache/dev-java/commons-digester-3.2-r2 b/metadata/md5-cache/dev-java/commons-digester-3.2-r2
index 4d7dcb78f987..d64e6cb4f977 100644
--- a/metadata/md5-cache/dev-java/commons-digester-3.2-r2
+++ b/metadata/md5-cache/dev-java/commons-digester-3.2-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/cglib:3 dev-java/commons-beanutils:1.7 >=dev-
 SLOT=3.2
 SRC_URI=mirror://apache/commons/digester/source/commons-digester3-3.2-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=881e187b8efaa2cdd2c5284117df9b88
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f970bc852b0dbde68f66f1b502a3e9f9
diff --git a/metadata/md5-cache/dev-java/commons-discovery-0.5 b/metadata/md5-cache/dev-java/commons-discovery-0.5
index ad35c273cc6d..7ecdb709cc72 100644
--- a/metadata/md5-cache/dev-java/commons-discovery-0.5
+++ b/metadata/md5-cache/dev-java/commons-discovery-0.5
@@ -10,5 +10,5 @@ RDEPEND=dev-java/commons-logging:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/commons-discovery/commons-discovery/0.5/commons-discovery-0.5-sources.jar -> commons-discovery-0.5.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3b98063ce1f91d55657541d72edf3f5a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3bd7f0a07cbe02394cd6bee40beaccfe
diff --git a/metadata/md5-cache/dev-java/commons-el-1.0-r3 b/metadata/md5-cache/dev-java/commons-el-1.0-r3
index 4e9a2f16d7f5..cb836000a0cc 100644
--- a/metadata/md5-cache/dev-java/commons-el-1.0-r3
+++ b/metadata/md5-cache/dev-java/commons-el-1.0-r3
@@ -10,5 +10,5 @@ RDEPEND=java-virtuals/servlet-api:2.5 >=virtual/jre-1.4 >=dev-java/java-config-2
 SLOT=0
 SRC_URI=mirror://apache/jakarta/commons/el/source/commons-el-1.0-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4a3d8d848e58923935f199fcf6c0a2a5
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-osgi	469f5c3bd9c193e463ffa6ccb1e2f1f4	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=28fca37133d34ae88be84416b764c7e0
diff --git a/metadata/md5-cache/dev-java/commons-email-1.4 b/metadata/md5-cache/dev-java/commons-email-1.4
index bd870c007929..0a37f9a39e3e 100644
--- a/metadata/md5-cache/dev-java/commons-email-1.4
+++ b/metadata/md5-cache/dev-java/commons-email-1.4
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/email/source/commons-email-1.4-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d154b39a9ab52bcea6346f969dd10564
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=38eacc0fd6775f9c96e1f3103a586b2e
diff --git a/metadata/md5-cache/dev-java/commons-fileupload-1.3 b/metadata/md5-cache/dev-java/commons-fileupload-1.3
index 1c492c4c7798..5fbe7c1c6c44 100644
--- a/metadata/md5-cache/dev-java/commons-fileupload-1.3
+++ b/metadata/md5-cache/dev-java/commons-fileupload-1.3
@@ -10,5 +10,5 @@ RDEPEND=dev-java/commons-io:1 dev-java/portletapi:1 java-virtuals/servlet-api:2.
 SLOT=0
 SRC_URI=mirror://apache/commons/fileupload/source/commons-fileupload-1.3-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5b6da7e24fbbd9906656e6e8c8f55c44
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=05e58df25a0615d18b0851254a84ccf8
diff --git a/metadata/md5-cache/dev-java/commons-graph-0.1 b/metadata/md5-cache/dev-java/commons-graph-0.1
index 90b20d1f4209..860dba1cb1d4 100644
--- a/metadata/md5-cache/dev-java/commons-graph-0.1
+++ b/metadata/md5-cache/dev-java/commons-graph-0.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~monsieurp/packages/commons-graph-0.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=05481f4d1fa900b89b791b47e97e0b8a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8cb391d376e1aac62f1674ab8ac6a19b
diff --git a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r1 b/metadata/md5-cache/dev-java/commons-httpclient-3.1-r1
index bb6409d2cb3e..5f8d6593d986 100644
--- a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r1
+++ b/metadata/md5-cache/dev-java/commons-httpclient-3.1-r1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=3
 SRC_URI=mirror://apache/httpcomponents/commons-httpclient/source/commons-httpclient-3.1-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=87bcb80c9797032fd38f85a9b8dc5ccd
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5affc34596febd705d9294ffa66d81fc
diff --git a/metadata/md5-cache/dev-java/commons-imaging-0.97 b/metadata/md5-cache/dev-java/commons-imaging-0.97
index d0857c3e5d54..9b8ecb8eefca 100644
--- a/metadata/md5-cache/dev-java/commons-imaging-0.97
+++ b/metadata/md5-cache/dev-java/commons-imaging-0.97
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/sanselan/source/apache-sanselan-incubating-0.97-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fbcc05cb6952205552d113a17ca257a1
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0e0cae9dabdcec1ca49bd8115b1a3bb8
diff --git a/metadata/md5-cache/dev-java/commons-io-2.4 b/metadata/md5-cache/dev-java/commons-io-2.4
index 7638b2e82884..5138c29816e2 100644
--- a/metadata/md5-cache/dev-java/commons-io-2.4
+++ b/metadata/md5-cache/dev-java/commons-io-2.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=1
 SRC_URI=mirror://apache/commons/io/source/commons-io-2.4-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0431a3eeeb6c47af111bb1b064084ef2
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b3d72a3f4461b3613fc3302a510824f7
diff --git a/metadata/md5-cache/dev-java/commons-jelly-1.0-r8 b/metadata/md5-cache/dev-java/commons-jelly-1.0-r8
index 91fe3cfe0ca6..1ef5ca33577e 100644
--- a/metadata/md5-cache/dev-java/commons-jelly-1.0-r8
+++ b/metadata/md5-cache/dev-java/commons-jelly-1.0-r8
@@ -10,5 +10,5 @@ RDEPEND=dev-java/dom4j:1 dev-java/junit:0 dev-java/jaxen:1.1 dev-java/commons-cl
 SLOT=1
 SRC_URI=mirror://apache/jakarta/commons/jelly/source/commons-jelly-1.0-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b6b4720fd2464d897f9a38affe211db9
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6e3268e5e735ac7c12bc9ab7b56d1bda
diff --git a/metadata/md5-cache/dev-java/commons-jexl-1.1-r1 b/metadata/md5-cache/dev-java/commons-jexl-1.1-r1
index ca3e9dd45b46..85e46ad7594b 100644
--- a/metadata/md5-cache/dev-java/commons-jexl-1.1-r1
+++ b/metadata/md5-cache/dev-java/commons-jexl-1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging dev-java/junit:0 >=dev-java/j
 SLOT=1.0
 SRC_URI=mirror://apache/jakarta/commons/jexl/source/commons-jexl-1.1-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=28c282ae347f416c4b09edac80b7dd21
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=433e7a610ad54ea8225bc23b3a089bef
diff --git a/metadata/md5-cache/dev-java/commons-jexl-2.1.1 b/metadata/md5-cache/dev-java/commons-jexl-2.1.1
index f525c1d9d081..f9eb35a58a5a 100644
--- a/metadata/md5-cache/dev-java/commons-jexl-2.1.1
+++ b/metadata/md5-cache/dev-java/commons-jexl-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging:0 >=dev-java/java-config-2.2.
 SLOT=2
 SRC_URI=mirror://apache/commons/jexl/source/commons-jexl-2.1.1-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e2944ae6113284fde474206e69754406
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=286570409a811a1be618db0ab146fdc1
diff --git a/metadata/md5-cache/dev-java/commons-jxpath-1.3-r1 b/metadata/md5-cache/dev-java/commons-jxpath-1.3-r1
index ac6d3a170647..375cc282dc0c 100644
--- a/metadata/md5-cache/dev-java/commons-jxpath-1.3-r1
+++ b/metadata/md5-cache/dev-java/commons-jxpath-1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/commons-beanutils:1.7 java-virtuals/servlet-a
 SLOT=0
 SRC_URI=mirror://apache/commons/jxpath/source/commons-jxpath-1.3-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bdc9ed9e4c4ab67bc0dee67e636dc59e
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2b97a134fc87b59f6bca8e569b100c3c
diff --git a/metadata/md5-cache/dev-java/commons-jxpath-1.3-r2 b/metadata/md5-cache/dev-java/commons-jxpath-1.3-r2
index 2424e3a93f1d..0ead618242dc 100644
--- a/metadata/md5-cache/dev-java/commons-jxpath-1.3-r2
+++ b/metadata/md5-cache/dev-java/commons-jxpath-1.3-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/commons-beanutils:1.7 java-virtuals/servlet-a
 SLOT=0
 SRC_URI=mirror://apache/commons/jxpath/source/commons-jxpath-1.3-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1a674121883f6f038207b95a41a33de2
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=116a95f7c580a35be8518ca9517448ad
diff --git a/metadata/md5-cache/dev-java/commons-jxpath-1.3-r3 b/metadata/md5-cache/dev-java/commons-jxpath-1.3-r3
index f2b7b7c762fe..13eb00bf5903 100644
--- a/metadata/md5-cache/dev-java/commons-jxpath-1.3-r3
+++ b/metadata/md5-cache/dev-java/commons-jxpath-1.3-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jdom:0 java-virtuals/servlet-api:3.0 dev-java/commons-beanutils
 SLOT=0
 SRC_URI=mirror://apache/commons/jxpath/source/commons-jxpath-1.3-src.tar.gz -> commons-jxpath-1.3.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=97af0bc8fe4b10dafb452d861143a975
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b42d599bb9f47fcc3ba8b9537a2f6523
diff --git a/metadata/md5-cache/dev-java/commons-lang-2.0-r2 b/metadata/md5-cache/dev-java/commons-lang-2.0-r2
index dd6b7c36fef6..b7884a88431f 100644
--- a/metadata/md5-cache/dev-java/commons-lang-2.0-r2
+++ b/metadata/md5-cache/dev-java/commons-lang-2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://apache/jakarta/commons/lang/source/commons-lang-2.0-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=676984c6af99568f2ceec914e5694244
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=647ba3ef58f1d2cf209ba253cbd822a7
diff --git a/metadata/md5-cache/dev-java/commons-lang-2.0-r3 b/metadata/md5-cache/dev-java/commons-lang-2.0-r3
index 4b344537b8d7..941efee61b56 100644
--- a/metadata/md5-cache/dev-java/commons-lang-2.0-r3
+++ b/metadata/md5-cache/dev-java/commons-lang-2.0-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://apache/jakarta/commons/lang/source/commons-lang-2.0-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8b5b20084cb0823692a0661c8800aafe
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e754ddf809325ced4fcd54b44a1bccb9
diff --git a/metadata/md5-cache/dev-java/commons-lang-2.6-r1 b/metadata/md5-cache/dev-java/commons-lang-2.6-r1
index 0d4a5219b05f..ff3dfbf7c36d 100644
--- a/metadata/md5-cache/dev-java/commons-lang-2.6-r1
+++ b/metadata/md5-cache/dev-java/commons-lang-2.6-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=2.1
 SRC_URI=mirror://apache/commons/lang/source/commons-lang-2.6-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0d8e7779be46ca0d7ed23a7612cbfe23
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=62d15ebe46d7b757840b0ed1e7e5e2f1
diff --git a/metadata/md5-cache/dev-java/commons-lang-3.1 b/metadata/md5-cache/dev-java/commons-lang-3.1
index dfece94f576b..18a77ea1b01c 100644
--- a/metadata/md5-cache/dev-java/commons-lang-3.1
+++ b/metadata/md5-cache/dev-java/commons-lang-3.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=3.1
 SRC_URI=mirror://apache/commons/lang/source/commons-lang3-3.1-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=59cc91a1b3e3decae50127f45077cbd9
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=383476404ea4cc83131866dcda9cb1aa
diff --git a/metadata/md5-cache/dev-java/commons-lang-3.3.2 b/metadata/md5-cache/dev-java/commons-lang-3.3.2
index ff317e469d7d..8c31b8579ae6 100644
--- a/metadata/md5-cache/dev-java/commons-lang-3.3.2
+++ b/metadata/md5-cache/dev-java/commons-lang-3.3.2
@@ -11,5 +11,5 @@ RESTRICT=ppc? ( test ) ppc64? ( test )
 SLOT=3.3
 SRC_URI=mirror://apache/commons/lang/source/commons-lang3-3.3.2-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b9c8591cb49e60b6915ae10e27fee7cc
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0b0de6ae252680979cc301a161a7ecb5
diff --git a/metadata/md5-cache/dev-java/commons-lang-3.4 b/metadata/md5-cache/dev-java/commons-lang-3.4
index f1b7b48282bd..4387b0f84d14 100644
--- a/metadata/md5-cache/dev-java/commons-lang-3.4
+++ b/metadata/md5-cache/dev-java/commons-lang-3.4
@@ -11,5 +11,5 @@ RESTRICT=ppc? ( test ) ppc64? ( test )
 SLOT=3.4
 SRC_URI=mirror://apache/commons/lang/source/commons-lang3-3.4-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c1b087cb7be23b8f43c0a92abadb4b0b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5eb0ba80208f110b8960ad7dc767a193
diff --git a/metadata/md5-cache/dev-java/commons-launcher-1.1-r2 b/metadata/md5-cache/dev-java/commons-launcher-1.1-r2
index 4fb4b92426fb..0f6a93609fc4 100644
--- a/metadata/md5-cache/dev-java/commons-launcher-1.1-r2
+++ b/metadata/md5-cache/dev-java/commons-launcher-1.1-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 so
 SLOT=0
 SRC_URI=mirror://apache/commons/launcher/source/commons-launcher-1.1-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=317f93b057273472db6c9fe9e6fad53e
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=35c93ab4d17a565984812aa192770ea4
diff --git a/metadata/md5-cache/dev-java/commons-logging-1.2 b/metadata/md5-cache/dev-java/commons-logging-1.2
index 69ff6cb3b4fb..d79e1126654a 100644
--- a/metadata/md5-cache/dev-java/commons-logging-1.2
+++ b/metadata/md5-cache/dev-java/commons-logging-1.2
@@ -11,5 +11,5 @@ RESTRICT=!servletapi? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/logging/source/commons-logging-1.2-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3e482db000ccfc20a187d1114ea31cd2
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-osgi	469f5c3bd9c193e463ffa6ccb1e2f1f4	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b3e042bb2c6802c71470a828a3f1a931
diff --git a/metadata/md5-cache/dev-java/commons-logging-1.2-r1 b/metadata/md5-cache/dev-java/commons-logging-1.2-r1
index f89cab33c4ac..45672824429a 100644
--- a/metadata/md5-cache/dev-java/commons-logging-1.2-r1
+++ b/metadata/md5-cache/dev-java/commons-logging-1.2-r1
@@ -11,5 +11,5 @@ RESTRICT=!servletapi? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/logging/source/commons-logging-1.2-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0ac941214040fb4d3ab097c5f59cadce
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-osgi	469f5c3bd9c193e463ffa6ccb1e2f1f4	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=df0a8301b54e5acf1abd71a4324f8fbb
diff --git a/metadata/md5-cache/dev-java/commons-math-2.1-r1 b/metadata/md5-cache/dev-java/commons-math-2.1-r1
index b2b8a20e47f8..5433db098ecd 100644
--- a/metadata/md5-cache/dev-java/commons-math-2.1-r1
+++ b/metadata/md5-cache/dev-java/commons-math-2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=2
 SRC_URI=mirror://apache/commons/math/source/commons-math-2.1-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c3dc035533b2ffa849a7a14279b88906
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3b1c0fc1d33227fa99f36ccba6284005
diff --git a/metadata/md5-cache/dev-java/commons-math-3.2 b/metadata/md5-cache/dev-java/commons-math-3.2
index 532ba9fe05c9..8d9b8c8c92a4 100644
--- a/metadata/md5-cache/dev-java/commons-math-3.2
+++ b/metadata/md5-cache/dev-java/commons-math-3.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=3
 SRC_URI=mirror://apache/commons/math/source/commons-math3-3.2-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=088fd670aa3e23c956ad5a37abd47d91
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-osgi	469f5c3bd9c193e463ffa6ccb1e2f1f4	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d95b579e23b32872e9374adbe5cbcf3b
diff --git a/metadata/md5-cache/dev-java/commons-net-3.2 b/metadata/md5-cache/dev-java/commons-net-3.2
index f9d39149531e..5219741167d9 100644
--- a/metadata/md5-cache/dev-java/commons-net-3.2
+++ b/metadata/md5-cache/dev-java/commons-net-3.2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/net/source/commons-net-3.2-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=00fd875d17e55640556212fdf350e3de
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-osgi	469f5c3bd9c193e463ffa6ccb1e2f1f4	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f7be5f640021e68485f097b550c4ef7b
diff --git a/metadata/md5-cache/dev-java/commons-pool-1.6 b/metadata/md5-cache/dev-java/commons-pool-1.6
index cf3aef14b722..b23381c87d23 100644
--- a/metadata/md5-cache/dev-java/commons-pool-1.6
+++ b/metadata/md5-cache/dev-java/commons-pool-1.6
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://apache/commons/pool/source/commons-pool-1.6-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=296555504335925937f198d630536151
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=fa65b0b1b43ea7cca28c60693a8acd55
diff --git a/metadata/md5-cache/dev-java/commons-pool-2.2 b/metadata/md5-cache/dev-java/commons-pool-2.2
index 9a5b1ae55610..b9d159070a6b 100644
--- a/metadata/md5-cache/dev-java/commons-pool-2.2
+++ b/metadata/md5-cache/dev-java/commons-pool-2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/cglib:3 dev-java/asm:4 >=virtual/jre-1.6 >=dev-java/java-config
 SLOT=2
 SRC_URI=mirror://apache/commons/pool/source/commons-pool2-2.2-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8e7aae0f87c3cfca2b4395c9aff33167
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=cf02b5994ab214491bc54415f70a1121
diff --git a/metadata/md5-cache/dev-java/commons-primitives-1.0-r3 b/metadata/md5-cache/dev-java/commons-primitives-1.0-r3
index be3b492fc552..a291969edbbb 100644
--- a/metadata/md5-cache/dev-java/commons-primitives-1.0-r3
+++ b/metadata/md5-cache/dev-java/commons-primitives-1.0-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://www.apache.org/dist/commons/primitives/source/commons-primitives-1.0-src.tar.gz -> commons-primitives-1.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=93dd527d1388b4be806fc000991208d1
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3d7f55fa3cff2151972f6356753beb5b
diff --git a/metadata/md5-cache/dev-java/commons-validator-1.4.0 b/metadata/md5-cache/dev-java/commons-validator-1.4.0
index 2d16083d652a..c799efbcadbf 100644
--- a/metadata/md5-cache/dev-java/commons-validator-1.4.0
+++ b/metadata/md5-cache/dev-java/commons-validator-1.4.0
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/validator/source/commons-validator-1.4.0-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=405207f362c1f4b6dff7673786000ef2
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5162a27b43aeabb27d1ad1237438a5da
diff --git a/metadata/md5-cache/dev-java/commons-validator-1.4.1 b/metadata/md5-cache/dev-java/commons-validator-1.4.1
index 873b71ac62b6..381aace0453b 100644
--- a/metadata/md5-cache/dev-java/commons-validator-1.4.1
+++ b/metadata/md5-cache/dev-java/commons-validator-1.4.1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/validator/source/commons-validator-1.4.1-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=07dd4475243e807058539e0c155de521
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4b779baef772711daf4764e69cc97abc
diff --git a/metadata/md5-cache/dev-java/commons-vfs-1.0-r1 b/metadata/md5-cache/dev-java/commons-vfs-1.0-r1
index fd4edeee5134..222a538f9128 100644
--- a/metadata/md5-cache/dev-java/commons-vfs-1.0-r1
+++ b/metadata/md5-cache/dev-java/commons-vfs-1.0-r1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/commons/vfs/source/commons-vfs-1.0-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=676dc79c821a0e09fdb6cf7cc90e73a8
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=74ae1c47cef902006c0dfa90056c9620
diff --git a/metadata/md5-cache/dev-java/commons-vfs-2.0-r1 b/metadata/md5-cache/dev-java/commons-vfs-2.0-r1
index cd0b2edbd6a6..5957e71c2306 100644
--- a/metadata/md5-cache/dev-java/commons-vfs-2.0-r1
+++ b/metadata/md5-cache/dev-java/commons-vfs-2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/ant-core:0 dev-java/commons-collections:0 dev
 SLOT=2
 SRC_URI=mirror://apache/commons/vfs/source/commons-vfs-2.0-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1c4e59c3ffa1e03946e39f6760e7df82
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b1094b64d71f4d81a17b86e3c6439b45
diff --git a/metadata/md5-cache/dev-java/constantine-0.7-r1 b/metadata/md5-cache/dev-java/constantine-0.7-r1
index 250348490086..e0ee71cd09eb 100644
--- a/metadata/md5-cache/dev-java/constantine-0.7-r1
+++ b/metadata/md5-cache/dev-java/constantine-0.7-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://gentoo/constantine-0.7.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5cc51a281e55dcb3d6122d808967a470
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=378570763a3ff27c48f1e392b353f872
diff --git a/metadata/md5-cache/dev-java/cortado-0.6.0-r1 b/metadata/md5-cache/dev-java/cortado-0.6.0-r1
index 39473f0d5c29..eb8505acdf85 100644
--- a/metadata/md5-cache/dev-java/cortado-0.6.0-r1
+++ b/metadata/md5-cache/dev-java/cortado-0.6.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/cortado/cortado-0.6.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ea018f3e5c85b35a6f0fa75c0c97fc48
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=afdc622bb92b9cd531129067286d1c03
diff --git a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5 b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5
index 2b61be879ed1..42c603ffb1bf 100644
--- a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5
+++ b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-core:0 dev-java/xerces:2 >=virtual/jre-1.6 >=dev-java/java-
 SLOT=0
 SRC_URI=mirror://sourceforge/ant-contrib/ant-contrib/cpptasks-1.0-beta5/cpptasks-1.0b5.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=79737dc7c20cf6517a3316f01d9db2d5
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d4f7ce17be82a1909eef001fac7c473c
diff --git a/metadata/md5-cache/dev-java/cssparser-0.9.20 b/metadata/md5-cache/dev-java/cssparser-0.9.20
index 6d59a5ef34da..bdf71a119c33 100644
--- a/metadata/md5-cache/dev-java/cssparser-0.9.20
+++ b/metadata/md5-cache/dev-java/cssparser-0.9.20
@@ -10,5 +10,5 @@ RDEPEND=dev-java/sac:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source?
 SLOT=0
 SRC_URI=mirror://sourceforge/cssparser/cssparser-0.9.20-sources.jar -> cssparser-0.9.20.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c6e5df70b9783c1346f0ae69b076ea74
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e7704fe83e20dde7a5ae7700e12f615c
diff --git a/metadata/md5-cache/dev-java/cssparser-0.9.21 b/metadata/md5-cache/dev-java/cssparser-0.9.21
index 8e1141f77b52..0c0fb1ab16bc 100644
--- a/metadata/md5-cache/dev-java/cssparser-0.9.21
+++ b/metadata/md5-cache/dev-java/cssparser-0.9.21
@@ -10,5 +10,5 @@ RDEPEND=dev-java/sac:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source?
 SLOT=0
 SRC_URI=mirror://sourceforge/cssparser/cssparser-0.9.21-sources.jar -> cssparser-0.9.21.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1b057c159f15c79cbd37f54cefbbcd6d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c68b46210a0852acde75c3118b226c4b
diff --git a/metadata/md5-cache/dev-java/db4o-jdk11-7.4 b/metadata/md5-cache/dev-java/db4o-jdk11-7.4
index edd60fc24502..866dd9e746dd 100644
--- a/metadata/md5-cache/dev-java/db4o-jdk11-7.4
+++ b/metadata/md5-cache/dev-java/db4o-jdk11-7.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=0
 SRC_URI=mirror://gentoo/db4o-jdk11-7.4.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=05c70df7e4c1eacec58378e295b6e20b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=31138b2fbbb3fef3588c2ad9588176b1
diff --git a/metadata/md5-cache/dev-java/db4o-jdk12-7.4 b/metadata/md5-cache/dev-java/db4o-jdk12-7.4
index 9f803f4dc2ad..a0b341acfabb 100644
--- a/metadata/md5-cache/dev-java/db4o-jdk12-7.4
+++ b/metadata/md5-cache/dev-java/db4o-jdk12-7.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/db4o-jdk11 >=dev-java/java-config-2.2.0-r3 >=
 SLOT=0
 SRC_URI=mirror://gentoo/db4o-jdk12-7.4.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6b1e3c0507592467051bfde0ac7deb1a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=46c0192675922a5d97e53d41ca1cff08
diff --git a/metadata/md5-cache/dev-java/db4o-jdk5-7.4 b/metadata/md5-cache/dev-java/db4o-jdk5-7.4
index cbd9cb6770a2..97b4e9aa847a 100644
--- a/metadata/md5-cache/dev-java/db4o-jdk5-7.4
+++ b/metadata/md5-cache/dev-java/db4o-jdk5-7.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/db4o-jdk11 dev-java/db4o-jdk12 >=dev-java/jav
 SLOT=0
 SRC_URI=mirror://gentoo/db4o-jdk5-7.4.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=45371b8b52f4a55109657695ff550bf3
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2df7dae06f7fc28cf776c4711508193a
diff --git a/metadata/md5-cache/dev-java/dbus-java-2.7-r1 b/metadata/md5-cache/dev-java/dbus-java-2.7-r1
index 33ac0d41f5f5..0fc6481e1ea4 100644
--- a/metadata/md5-cache/dev-java/dbus-java-2.7-r1
+++ b/metadata/md5-cache/dev-java/dbus-java-2.7-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/libmatthew-java-0.7-r1 >=dev-java/java-conf
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus-java/dbus-java-2.7.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=702bd9877da7f4c3c20077f9e157c29b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9e1b29f504e8a3e618e2278a478d969c
diff --git a/metadata/md5-cache/dev-java/dict4j-1.1 b/metadata/md5-cache/dev-java/dict4j-1.1
index bf000ad73330..0674aafede0c 100644
--- a/metadata/md5-cache/dev-java/dict4j-1.1
+++ b/metadata/md5-cache/dev-java/dict4j-1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/dict4j/dict4j-1.1-src.jar -> dict4j-1.1.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=80fedce585f7a954d0ff7803d8b7a872
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2c0183c0f6d52cf297e0ef24933d9b87
diff --git a/metadata/md5-cache/dev-java/disruptor-3.2.0 b/metadata/md5-cache/dev-java/disruptor-3.2.0
index a3deaa87c07c..892a64e75346 100644
--- a/metadata/md5-cache/dev-java/disruptor-3.2.0
+++ b/metadata/md5-cache/dev-java/disruptor-3.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/com/lmax/disruptor/3.2.0/disruptor-3.2.0-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=04c3c4bded3342e13cfa661df0babc96
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=42d9f64f840ecda95f14b07bf13c0af9
diff --git a/metadata/md5-cache/dev-java/dnsjava-2.1.6 b/metadata/md5-cache/dev-java/dnsjava-2.1.6
index a1db430741d6..3629808a16c1 100644
--- a/metadata/md5-cache/dev-java/dnsjava-2.1.6
+++ b/metadata/md5-cache/dev-java/dnsjava-2.1.6
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://www.dnsjava.org/download/dnsjava-2.1.6.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5db9880e7c5d1921cf584816b61796d8
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d45c3ec6b02ded313c621bad616eff28
diff --git a/metadata/md5-cache/dev-java/dnsjava-2.1.7 b/metadata/md5-cache/dev-java/dnsjava-2.1.7
index e13fd5cdbcdd..a7af583eba5d 100644
--- a/metadata/md5-cache/dev-java/dnsjava-2.1.7
+++ b/metadata/md5-cache/dev-java/dnsjava-2.1.7
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://www.dnsjava.org/download/dnsjava-2.1.7.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f658c0ff14388d2e530d590e03548914
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=dab6ffde143b324da389ac14eb4b075a
diff --git a/metadata/md5-cache/dev-java/dom4j-1.6.1-r5 b/metadata/md5-cache/dev-java/dom4j-1.6.1-r5
index 4b4695990492..2776429337e0 100644
--- a/metadata/md5-cache/dev-java/dom4j-1.6.1-r5
+++ b/metadata/md5-cache/dev-java/dom4j-1.6.1-r5
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xpp2:0 dev-java/xpp3:0 dev-java/jaxme:0 dev-java/xsdlib:0 dev-j
 SLOT=1
 SRC_URI=mirror://sourceforge/dom4j/dom4j-1.6.1.tar.gz mirror://gentoo/dom4j-1.6.1-java5.patch.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=747b4b54de1addb3aaedfb4c9575ce4a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=dd8c628218e7b3301aef4129bdd31b95
diff --git a/metadata/md5-cache/dev-java/dom4j-1.6.1-r6 b/metadata/md5-cache/dev-java/dom4j-1.6.1-r6
index 5a953ced2396..539fe9c67230 100644
--- a/metadata/md5-cache/dev-java/dom4j-1.6.1-r6
+++ b/metadata/md5-cache/dev-java/dom4j-1.6.1-r6
@@ -11,5 +11,5 @@ RDEPEND=dev-java/xpp2:0 dev-java/xpp3:0 dev-java/xsdlib:0 dev-java/relaxng-datat
 SLOT=1
 SRC_URI=mirror://sourceforge/dom4j/dom4j-1.6.1.tar.gz mirror://gentoo/dom4j-1.6.1-java5.patch.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2e6549d1ed9da700737e1528b5e593f4
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=24efcc56fe698bb1714463b21ac3dc59
diff --git a/metadata/md5-cache/dev-java/dtdparser-1.21-r2 b/metadata/md5-cache/dev-java/dtdparser-1.21-r2
index 6934e02d8e70..d90c95823c5f 100644
--- a/metadata/md5-cache/dev-java/dtdparser-1.21-r2
+++ b/metadata/md5-cache/dev-java/dtdparser-1.21-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=1.21
 SRC_URI=http://www.wutka.com/download/dtdparser-1.21.tgz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=84f0942d7efb761b04cb54342b616eef
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=79c69f1cb540858d8a00ffff3a5d1b8d
diff --git a/metadata/md5-cache/dev-java/dynalang-0.4-r1 b/metadata/md5-cache/dev-java/dynalang-0.4-r1
index a45d71e8aa4a..6d002b94a7ec 100644
--- a/metadata/md5-cache/dev-java/dynalang-0.4-r1
+++ b/metadata/md5-cache/dev-java/dynalang-0.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/dynalang/dynalang/dynalang-mop-0.4.tgz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=809fb5ccfd0fdcb695a5bbd469a66681
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=be7a7edbba60e588b54bda158d1bf229
diff --git a/metadata/md5-cache/dev-java/easymock-3.3.1 b/metadata/md5-cache/dev-java/easymock-3.3.1
index 3d717b5cae02..c3b7638e1d69 100644
--- a/metadata/md5-cache/dev-java/easymock-3.3.1
+++ b/metadata/md5-cache/dev-java/easymock-3.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/junit:4 dev-java/objenesis:0 dev-java/cglib:3
 SLOT=3.2
 SRC_URI=mirror://sourceforge/easymock/EasyMock/3.3.1/easymock-3.3.1.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=775527c247deda85979252fc5a9f1f84
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ea1e3da4fb0b156c8eb630492409116f
diff --git a/metadata/md5-cache/dev-java/easymock-classextension-3.2-r1 b/metadata/md5-cache/dev-java/easymock-classextension-3.2-r1
index de72c7b37cd8..58c1f9aed0d0 100644
--- a/metadata/md5-cache/dev-java/easymock-classextension-3.2-r1
+++ b/metadata/md5-cache/dev-java/easymock-classextension-3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/easymock:3.2 >=dev-java/java-config-2.2.0-r3
 SLOT=3.2
 SRC_URI=mirror://sourceforge/easymock/EasyMock%20Class%20Extension/3.2/easymockclassextension-3.2.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=37dc9176fdf20ae47d43df5842ec9d31
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5fc5553e79a3bfd53c08fc776f960e15
diff --git a/metadata/md5-cache/dev-java/easyneurons-2.3 b/metadata/md5-cache/dev-java/easyneurons-2.3
index c8cef32b2b76..00f4ca483dc5 100644
--- a/metadata/md5-cache/dev-java/easyneurons-2.3
+++ b/metadata/md5-cache/dev-java/easyneurons-2.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/colt:0 dev-java/appframework:0 dev-java/commo
 SLOT=0
 SRC_URI=mirror://sourceforge/neuroph/neuroph_2.3_nb.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=50c5e3723fd08f07810536e50f3ff4c2
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d5962a7235d69d3129c1a29e07e7b092
diff --git a/metadata/md5-cache/dev-java/echo2-2.1.1 b/metadata/md5-cache/dev-java/echo2-2.1.1
index 2e57a4d791be..a36d47da502c 100644
--- a/metadata/md5-cache/dev-java/echo2-2.1.1
+++ b/metadata/md5-cache/dev-java/echo2-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2
 SLOT=2.1
 SRC_URI=http://download.nextapp.com/downloads/echo2/2.1.1/NextApp_Echo2.tgz -> NextApp_Echo2-2.1.1.tgz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1c5351ee6fbfe63d623fc5b38ea4e52d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=16fe0a4aec19e36d40f4249fcf655219
diff --git a/metadata/md5-cache/dev-java/ecj-gcj-3.5.2-r3 b/metadata/md5-cache/dev-java/ecj-gcj-3.5.2-r3
index 1fc7f68da2af..12f62f67f277 100644
--- a/metadata/md5-cache/dev-java/ecj-gcj-3.5.2-r3
+++ b/metadata/md5-cache/dev-java/ecj-gcj-3.5.2-r3
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/gcc:*[gcj] app-eselect/eselect-java >=dev-java/java-config-2.2
 SLOT=3.5
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002111343/ecjsrc-3.5.2.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postrm:- pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3c81fe4925a7a8d042b9f5dd06f6f2cf
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	prefix	df8265631f8bf5f5df387e9b987121f9	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a60c13ea8d069d15ce69b87fa0afab52
diff --git a/metadata/md5-cache/dev-java/ecj-gcj-3.6-r1 b/metadata/md5-cache/dev-java/ecj-gcj-3.6-r1
index f51f3f9286c8..56a272dfe30f 100644
--- a/metadata/md5-cache/dev-java/ecj-gcj-3.6-r1
+++ b/metadata/md5-cache/dev-java/ecj-gcj-3.6-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/gcc:*[gcj] app-eselect/eselect-java >=dev-java/java-config-2.2
 SLOT=3.6
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops/R-3.6-201006080911/ecjsrc-3.6.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postrm:- pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1a142d7abe4f3cc3504cffcbf0312110
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	prefix	df8265631f8bf5f5df387e9b987121f9	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7443595bc5db135a2a2396dc32b55860
diff --git a/metadata/md5-cache/dev-java/ecj-gcj-4.2.1-r2 b/metadata/md5-cache/dev-java/ecj-gcj-4.2.1-r2
index c33b71532dfa..d2e550672189 100644
--- a/metadata/md5-cache/dev-java/ecj-gcj-4.2.1-r2
+++ b/metadata/md5-cache/dev-java/ecj-gcj-4.2.1-r2
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/gcc:*[gcj] app-eselect/eselect-java >=dev-java/java-config-2.2
 SLOT=4.2
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.2.1-201209141800/ecjsrc-4.2.1.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postrm:- pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f87b2095c2f6158a3d28c277d49b3274
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	prefix	df8265631f8bf5f5df387e9b987121f9	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d35f254f82b2ebeb75c2f87384335949
diff --git a/metadata/md5-cache/dev-java/ecj-gcj-4.4.2 b/metadata/md5-cache/dev-java/ecj-gcj-4.4.2
index 53289e8cf079..e807d367a351 100644
--- a/metadata/md5-cache/dev-java/ecj-gcj-4.4.2
+++ b/metadata/md5-cache/dev-java/ecj-gcj-4.4.2
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/gcc:*[gcj] app-eselect/eselect-java >=dev-java/java-config-2.2
 SLOT=4.4
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/ecjsrc-4.4.2.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postrm:- pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b3020c3c7e90ae717388a4a8091c54b8
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	prefix	df8265631f8bf5f5df387e9b987121f9	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2d005a5c0131be1f7682b4f459deb071
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.2.1 b/metadata/md5-cache/dev-java/eclipse-ecj-4.2.1
index b9006b82e26d..e2eae23dac15 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.2.1
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.2.1
@@ -11,5 +11,5 @@ RDEPEND=app-eselect/eselect-java >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-
 SLOT=4.2
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.2.1-201209141800/ecjsrc-4.2.1.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postrm:- pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f8d172ff351911ecd1095b171934978e
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=06938c34db550647d21df9401ffe164b
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.4.2-r1 b/metadata/md5-cache/dev-java/eclipse-ecj-4.4.2-r1
index d3fb26b620b0..31db8963943d 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.4.2-r1
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.4.2-r1
@@ -11,5 +11,5 @@ RDEPEND=app-eselect/eselect-java >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-
 SLOT=4.4
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/ecjsrc-4.4.2.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postrm:- pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b4846c49a80d4684235d6fb981ccec8a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3fe9fdcfa5590bc56ea81c9b0041e67b
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.5.1 b/metadata/md5-cache/dev-java/eclipse-ecj-4.5.1
index 7cc560a8e27e..9e01fb67a505 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.5.1
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.5.1
@@ -11,5 +11,5 @@ RDEPEND=app-eselect/eselect-java >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-
 SLOT=4.5
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.5.1-201509040015/ecjsrc-4.5.1.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postrm:- pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4312361aa421a207af0bb8fc688abe2f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1f6ab8e4dab8c5a12e6ad43ea20cbd57
diff --git a/metadata/md5-cache/dev-java/eclipsito-0_pre20130713 b/metadata/md5-cache/dev-java/eclipsito-0_pre20130713
index db1352a8aca9..3078dea1a85a 100644
--- a/metadata/md5-cache/dev-java/eclipsito-0_pre20130713
+++ b/metadata/md5-cache/dev-java/eclipsito-0_pre20130713
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/eclipsito-0_pre20130713.tar.xz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=777bc1f43542996de26b9ad462d4d0a6
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e543daefe08ec4c5f47812db799b2afb
diff --git a/metadata/md5-cache/dev-java/ecs-1.4.2-r2 b/metadata/md5-cache/dev-java/ecs-1.4.2-r2
index 0d0493bc0fb4..a3a20c4cf82a 100644
--- a/metadata/md5-cache/dev-java/ecs-1.4.2-r2
+++ b/metadata/md5-cache/dev-java/ecs-1.4.2-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xerces:2 dev-java/jakarta-regexp:1.3 >=virtual/jre-1.6 >=dev-ja
 SLOT=0
 SRC_URI=mirror://apache/jakarta/ecs/source/ecs-1.4.2-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c189f6b611aced0783fb3bdcbe219656
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=62c06a1b218998b7f6b34a5517da54d6
diff --git a/metadata/md5-cache/dev-java/edtftpj-2.4.0 b/metadata/md5-cache/dev-java/edtftpj-2.4.0
index 0abb8aad983d..e388ff238ae8 100644
--- a/metadata/md5-cache/dev-java/edtftpj-2.4.0
+++ b/metadata/md5-cache/dev-java/edtftpj-2.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://www.enterprisedt.com/products/edtftpj/download/edtftpj-2.4.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fe597ab363f473017ba23896b976b75e
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b48b6946304df8181976e031f0cf3466
diff --git a/metadata/md5-cache/dev-java/ehcache-1.2.4-r3 b/metadata/md5-cache/dev-java/ehcache-1.2.4-r3
index 2c62ec7d8116..0294839b97a1 100644
--- a/metadata/md5-cache/dev-java/ehcache-1.2.4-r3
+++ b/metadata/md5-cache/dev-java/ehcache-1.2.4-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/commons-collections:0 dev-java/commons-loggin
 SLOT=1.2
 SRC_URI=mirror://sourceforge/ehcache/ehcache-1.2.4.tgz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0792abb411e87d385726fca43e69b546
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5e20402210fa69690027c269bcf85f74
diff --git a/metadata/md5-cache/dev-java/ehcache-1.2.4-r4 b/metadata/md5-cache/dev-java/ehcache-1.2.4-r4
index d81186bf8641..54aa6c8bf8d0 100644
--- a/metadata/md5-cache/dev-java/ehcache-1.2.4-r4
+++ b/metadata/md5-cache/dev-java/ehcache-1.2.4-r4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/commons-collections:0 dev-java/commons-loggin
 SLOT=1.2
 SRC_URI=mirror://sourceforge/ehcache/ehcache-1.2.4.tgz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a24afbb554ed0c2272884e30dbaa6eda
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9338a39b4af504bf5044370aa0da1c38
diff --git a/metadata/md5-cache/dev-java/emma-2.0.5312-r3 b/metadata/md5-cache/dev-java/emma-2.0.5312-r3
index da785b152f54..859b4160dbf5 100644
--- a/metadata/md5-cache/dev-java/emma-2.0.5312-r3
+++ b/metadata/md5-cache/dev-java/emma-2.0.5312-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-core launcher? ( !sci-biology/emboss ) >=virtual/jre-1.6 >=
 SLOT=0
 SRC_URI=mirror://sourceforge/emma/emma-2.0.5312-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=48e29f264b6415a731df92e22de7ddbe
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=77b52187a16448325d1e16f24648f76d
diff --git a/metadata/md5-cache/dev-java/error-prone-annotations-2.0.14 b/metadata/md5-cache/dev-java/error-prone-annotations-2.0.14
index 60e04c5a2af0..f26cd24978b6 100644
--- a/metadata/md5-cache/dev-java/error-prone-annotations-2.0.14
+++ b/metadata/md5-cache/dev-java/error-prone-annotations-2.0.14
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/google/error-prone/archive/v2.0.14.tar.gz -> error-prone-2.0.14.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7bb33f7fecd5818c6009804748f8bbd1
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4474f25abcc009b06265e08c55a93550
diff --git a/metadata/md5-cache/dev-java/ezmorph-1.0.6 b/metadata/md5-cache/dev-java/ezmorph-1.0.6
index a39747d175ff..0e28a88e6172 100644
--- a/metadata/md5-cache/dev-java/ezmorph-1.0.6
+++ b/metadata/md5-cache/dev-java/ezmorph-1.0.6
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ezmorph/ezmorph-1.0.6-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1b57e861d3e38e9d3ef4fcce4dd88100
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1f4eaefc31a1ed344d1762e4be2f992d
diff --git a/metadata/md5-cache/dev-java/fastinfoset-1.2.11 b/metadata/md5-cache/dev-java/fastinfoset-1.2.11
index 08d4efcf06af..694678c2c256 100644
--- a/metadata/md5-cache/dev-java/fastinfoset-1.2.11
+++ b/metadata/md5-cache/dev-java/fastinfoset-1.2.11
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://search.maven.org/remotecontent?filepath=com/sun/xml/fastinfoset/FastInfoset/1.2.11/FastInfoset-1.2.11-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4e98cf1139e19f5c6f2fbeb81db5395d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e48eb85cd15605ef8f219945a5698bd7
diff --git a/metadata/md5-cache/dev-java/fastutil-7.0.10 b/metadata/md5-cache/dev-java/fastutil-7.0.10
index 47064f2597ad..50abe55842ab 100644
--- a/metadata/md5-cache/dev-java/fastutil-7.0.10
+++ b/metadata/md5-cache/dev-java/fastutil-7.0.10
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/vigna/fastutil/archive/7.0.10.zip -> fastutil-7.0.10.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6806be3ef842677aad5ad72573830155
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9dfc2cb6d124109a3efe18a4793537dd
diff --git a/metadata/md5-cache/dev-java/fec-1.0.4-r2 b/metadata/md5-cache/dev-java/fec-1.0.4-r2
index 16fff4496579..b5b75a6730f9 100644
--- a/metadata/md5-cache/dev-java/fec-1.0.4-r2
+++ b/metadata/md5-cache/dev-java/fec-1.0.4-r2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~monsieurp/packages/fec-1.0.4.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	flag-o-matic	35067884fbff37bc0c8e7421c5315558	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9e0551ca81d36fe65049401e4dfe53f9
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	flag-o-matic	979af9133d4de419fa98992355b07ca4	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=fdf9a43c0f47b2b2efbc7456ecd78ad6
diff --git a/metadata/md5-cache/dev-java/felix-bundlerepository-1.6.6 b/metadata/md5-cache/dev-java/felix-bundlerepository-1.6.6
index 784efa1d51c8..566c6237d9c0 100644
--- a/metadata/md5-cache/dev-java/felix-bundlerepository-1.6.6
+++ b/metadata/md5-cache/dev-java/felix-bundlerepository-1.6.6
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/kxml:2 dev-java/xpp3:0 dev-java/felix-shell:0
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.bundlerepository-1.6.6-source-release.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=047c2d921fd87087415fa9f020dd3d5b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-osgi	469f5c3bd9c193e463ffa6ccb1e2f1f4	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e6e6a5677159fe94aea78de6b95d5131
diff --git a/metadata/md5-cache/dev-java/felix-gogo-command-0.12.0 b/metadata/md5-cache/dev-java/felix-gogo-command-0.12.0
index cea7887f5b40..e681083a034a 100644
--- a/metadata/md5-cache/dev-java/felix-gogo-command-0.12.0
+++ b/metadata/md5-cache/dev-java/felix-gogo-command-0.12.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/felix-bundlerepository:0 dev-java/felix-gogo-
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.gogo.command-0.12.0-project.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5ddff1bbebc1443b951f0ad0ff18de9e
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-osgi	469f5c3bd9c193e463ffa6ccb1e2f1f4	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=59ce56d2f1f662d658fea4a67a010a80
diff --git a/metadata/md5-cache/dev-java/felix-gogo-runtime-0.10.0 b/metadata/md5-cache/dev-java/felix-gogo-runtime-0.10.0
index 07596396320a..818d9887d395 100644
--- a/metadata/md5-cache/dev-java/felix-gogo-runtime-0.10.0
+++ b/metadata/md5-cache/dev-java/felix-gogo-runtime-0.10.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.gogo.runtime-0.10.0-project.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ea4f8bb624c84f36d03c32035a0025c6
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-osgi	469f5c3bd9c193e463ffa6ccb1e2f1f4	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0db63394cba36f2e7d816544d67b98cf
diff --git a/metadata/md5-cache/dev-java/felix-shell-1.4.3 b/metadata/md5-cache/dev-java/felix-shell-1.4.3
index b7e97accfae1..6985f446f671 100644
--- a/metadata/md5-cache/dev-java/felix-shell-1.4.3
+++ b/metadata/md5-cache/dev-java/felix-shell-1.4.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.shell-1.4.3-source-release.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=91772ba61b884889fc82838ffa9191a4
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-osgi	469f5c3bd9c193e463ffa6ccb1e2f1f4	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=726de66509aa89f3d51e22cd03826d1b
diff --git a/metadata/md5-cache/dev-java/felix-utils-1.2.0 b/metadata/md5-cache/dev-java/felix-utils-1.2.0
index 2cf3be43c0ea..0be71795d4bd 100644
--- a/metadata/md5-cache/dev-java/felix-utils-1.2.0
+++ b/metadata/md5-cache/dev-java/felix-utils-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.utils-1.2.0-source-release.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=547e711dc1e30f882e2c68c27bddd8d7
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-osgi	469f5c3bd9c193e463ffa6ccb1e2f1f4	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c36d676cf72362ef24e36af5eac67811
diff --git a/metadata/md5-cache/dev-java/flyingsaucer-7-r2 b/metadata/md5-cache/dev-java/flyingsaucer-7-r2
index 9efa1a21e89b..6f4a3048cead 100644
--- a/metadata/md5-cache/dev-java/flyingsaucer-7-r2
+++ b/metadata/md5-cache/dev-java/flyingsaucer-7-r2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.pdoubleya.com/projects/flyingsaucer/downloads/r7/flyingsaucer-R7final-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=672d2c21b24ad41360c955d85b0eaeef
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=848175e7cc71ff8bd838c2148e699e8c
diff --git a/metadata/md5-cache/dev-java/fontbox-1.7.1 b/metadata/md5-cache/dev-java/fontbox-1.7.1
index 23dd3d161a16..c16488e64de0 100644
--- a/metadata/md5-cache/dev-java/fontbox-1.7.1
+++ b/metadata/md5-cache/dev-java/fontbox-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=1.7
 SRC_URI=mirror://apache/pdfbox/1.7.1/pdfbox-1.7.1-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2e53965ba2885d3804e669170077d577
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b4195696e7f288ba9b25439a767dc8fd
diff --git a/metadata/md5-cache/dev-java/fontbox-1.8.11 b/metadata/md5-cache/dev-java/fontbox-1.8.11
index b53273a5f704..b25935ba5d64 100644
--- a/metadata/md5-cache/dev-java/fontbox-1.8.11
+++ b/metadata/md5-cache/dev-java/fontbox-1.8.11
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/commons-logging-1.1.1:0 >=virtual/jre-1.6 >=dev-java/java-con
 SLOT=1.8
 SRC_URI=mirror://apache/pdfbox/1.8.11/pdfbox-1.8.11-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e2e4a88d8702f3592158eec82f259796
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=87ec6980fb7e121f7cfdaf928865679b
diff --git a/metadata/md5-cache/dev-java/fop-2.0-r2 b/metadata/md5-cache/dev-java/fop-2.0-r2
index a2ea1ef860e1..da18ba85b0b7 100644
--- a/metadata/md5-cache/dev-java/fop-2.0-r2
+++ b/metadata/md5-cache/dev-java/fop-2.0-r2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/xmlgraphics/fop/source/fop-2.0-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a19ed696ea4fd9d598310b8a3601616f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=28c6eef0841c0552cc81e49c8d60ea7d
diff --git a/metadata/md5-cache/dev-java/forehead-1.0_beta5-r2 b/metadata/md5-cache/dev-java/forehead-1.0_beta5-r2
index f8bdf46cab42..b4e05ad5ed73 100644
--- a/metadata/md5-cache/dev-java/forehead-1.0_beta5-r2
+++ b/metadata/md5-cache/dev-java/forehead-1.0_beta5-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://gentoo/forehead-1.0_beta5.tbz2 -> forehead-1.0_beta5.tbz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b348b583aab8bfc143b4b36b3f229546
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d217b1f6ae0e72f2a603511d1f08986e
diff --git a/metadata/md5-cache/dev-java/freehep-graphics2d-2.4 b/metadata/md5-cache/dev-java/freehep-graphics2d-2.4
index 8d43acaea0e3..5f38c5fa0964 100644
--- a/metadata/md5-cache/dev-java/freehep-graphics2d-2.4
+++ b/metadata/md5-cache/dev-java/freehep-graphics2d-2.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-java/freehep-graphicsbase-2.4:0 >=virtual/jre-1.7 >=dev-java/java-c
 SLOT=0
 SRC_URI=https://github.com/freehep/freehep-vectorgraphics/archive/freehep-vectorgraphics-2.4.tar.gz https://github.com/freehep/freehep-chartable-converter-plugin/archive/freehep-chartable-converter-plugin-2.2.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_test:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7b22ab33aa7ccb5eb966a7426cbc6a75
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=49881a3443f77ca7c99337d6cd8d9c53
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsbase-2.4 b/metadata/md5-cache/dev-java/freehep-graphicsbase-2.4
index 217b2c51847e..272b6b6a9f7a 100644
--- a/metadata/md5-cache/dev-java/freehep-graphicsbase-2.4
+++ b/metadata/md5-cache/dev-java/freehep-graphicsbase-2.4
@@ -10,5 +10,5 @@ RDEPEND=dev-java/freehep-io:0 dev-java/junit:4 >=virtual/jre-1.7 >=dev-java/java
 SLOT=0
 SRC_URI=https://github.com/freehep/freehep-vectorgraphics/archive/freehep-vectorgraphics-2.4.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_test:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f3b78ba315bf1406122e986e62b75943
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=db3665902764170bfbc693a6d53b742b
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsio-2.4 b/metadata/md5-cache/dev-java/freehep-graphicsio-2.4
index d1c0764d5bbb..d96f73e264dd 100644
--- a/metadata/md5-cache/dev-java/freehep-graphicsio-2.4
+++ b/metadata/md5-cache/dev-java/freehep-graphicsio-2.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-java/freehep-graphics2d-2.4:0 ~dev-java/freehep-graphicsbase-2.4:0
 SLOT=0
 SRC_URI=https://github.com/freehep/freehep-vectorgraphics/archive/freehep-vectorgraphics-2.4.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_test:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e4b6bcf1f14b96d837b42f5be7c5f2b7
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0dd0734058d76cf6f1bf92505124b8e9
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsio-emf-2.4 b/metadata/md5-cache/dev-java/freehep-graphicsio-emf-2.4
index 61b052335d09..2f671492b984 100644
--- a/metadata/md5-cache/dev-java/freehep-graphicsio-emf-2.4
+++ b/metadata/md5-cache/dev-java/freehep-graphicsio-emf-2.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-java/freehep-graphics2d-2.4:0 ~dev-java/freehep-graphicsbase-2.4:0
 SLOT=0
 SRC_URI=https://github.com/freehep/freehep-vectorgraphics/archive/freehep-vectorgraphics-2.4.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a955182bfadfa505f3cccf77fd1a2871
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e54660475680b4b6ec7ef8c3c16ea465
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsio-svg-2.4 b/metadata/md5-cache/dev-java/freehep-graphicsio-svg-2.4
index af47a70ea798..9716af6fd13d 100644
--- a/metadata/md5-cache/dev-java/freehep-graphicsio-svg-2.4
+++ b/metadata/md5-cache/dev-java/freehep-graphicsio-svg-2.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-java/freehep-graphics2d-2.4:0 ~dev-java/freehep-graphicsbase-2.4:0
 SLOT=0
 SRC_URI=https://github.com/freehep/freehep-vectorgraphics/archive/freehep-vectorgraphics-2.4.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_test:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=551aef5a8ff07038e71f1f943db9918d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9a9b67b7f2fa32fe1f1f960d8d10f7f4
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsio-tests-2.4 b/metadata/md5-cache/dev-java/freehep-graphicsio-tests-2.4
index 22bbd77935da..57a3ceff9955 100644
--- a/metadata/md5-cache/dev-java/freehep-graphicsio-tests-2.4
+++ b/metadata/md5-cache/dev-java/freehep-graphicsio-tests-2.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-java/freehep-graphics2d-2.4:0 ~dev-java/freehep-graphicsbase-2.4:0
 SLOT=0
 SRC_URI=https://github.com/freehep/freehep-vectorgraphics/archive/freehep-vectorgraphics-2.4.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bb220d6a0f08ed1c674b2d0038db1d7d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=43aceed558253c473001b76d9b9d387b
diff --git a/metadata/md5-cache/dev-java/freehep-io-2.2.2 b/metadata/md5-cache/dev-java/freehep-io-2.2.2
index ab2ca34d2a17..f184f8db68da 100644
--- a/metadata/md5-cache/dev-java/freehep-io-2.2.2
+++ b/metadata/md5-cache/dev-java/freehep-io-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/freehep/freehep-io/archive/freehep-io-2.2.2.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_test:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=405b7378426bc141ef1a5b787b719dca
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=aba2e19090a8092beb57957bef1e3a24
diff --git a/metadata/md5-cache/dev-java/freemarker-2.3.13-r2 b/metadata/md5-cache/dev-java/freemarker-2.3.13-r2
index 1e373fae6da9..af624f24f98a 100644
--- a/metadata/md5-cache/dev-java/freemarker-2.3.13-r2
+++ b/metadata/md5-cache/dev-java/freemarker-2.3.13-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jython:2.7 java-virtuals/servlet-api:2.3 java-virtuals/servlet-
 SLOT=2.3
 SRC_URI=mirror://sourceforge/freemarker/freemarker-2.3.13.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2cf93fbbd380b3675225c2388aaea3ad
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=cc9606b481217142183aea5f4ac2eb87
diff --git a/metadata/md5-cache/dev-java/freemarker-2.3.25 b/metadata/md5-cache/dev-java/freemarker-2.3.25
index 07a001cc39c8..4862e00c10e7 100644
--- a/metadata/md5-cache/dev-java/freemarker-2.3.25
+++ b/metadata/md5-cache/dev-java/freemarker-2.3.25
@@ -10,5 +10,5 @@ RDEPEND=dev-java/avalon-logkit:2.0 dev-java/commons-logging:0 dev-java/dom4j:1 d
 SLOT=2.3
 SRC_URI=https://github.com/apache/incubator-freemarker/archive/v2.3.25.tar.gz -> freemarker-2.3.25.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9084a7e22a5e3aa01fdc89167aa1487c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c7a210a6e0a1720f6d7cc0b445c6926d
diff --git a/metadata/md5-cache/dev-java/fscript-1.17-r1 b/metadata/md5-cache/dev-java/fscript-1.17-r1
index f73676b0b40f..962991d84f62 100644
--- a/metadata/md5-cache/dev-java/fscript-1.17-r1
+++ b/metadata/md5-cache/dev-java/fscript-1.17-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/fscript/fscript-1.17.tgz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b628ad1cf254961031619974c94aa622
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d24c955223f9fed3193e943a90991440
diff --git a/metadata/md5-cache/dev-java/gcj-jdk-4.9.4 b/metadata/md5-cache/dev-java/gcj-jdk-4.9.4
index 62d685b64065..fd3a0e5585c5 100644
--- a/metadata/md5-cache/dev-java/gcj-jdk-4.9.4
+++ b/metadata/md5-cache/dev-java/gcj-jdk-4.9.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/ecj-gcj:* dev-lang/perl ~sys-devel/gcc-4.9.4[awt?,gcj] >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
 SLOT=0
 _eclass_exported_funcs=pkg_prerm:java-vm-2 pkg_postrm:java-vm-2 pkg_postinst:- pkg_setup:java-vm-2 src_install:-
-_eclasses_=fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	4fd0e83bad4ea20bac7f73e2e59a0c60	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=9b204e6fcf63a16309ccbf7bea6bcf15
+_eclasses_=fdo-mime	21ef5adf81836863efa968f2a25cff64	java-vm-2	477ca23a49dfcd57017ee7f3bed47564	multilib	0236be304ee52e7f179ed2f337075515	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	df8265631f8bf5f5df387e9b987121f9	toolchain-funcs	53b75b4a49cf3e61530a523804045432
+_md5_=a700906b6b0b98fa7f44800a1898deeb
diff --git a/metadata/md5-cache/dev-java/geoip-java-1.3.0 b/metadata/md5-cache/dev-java/geoip-java-1.3.0
index a1c8879d1c63..b021ebb23549 100644
--- a/metadata/md5-cache/dev-java/geoip-java-1.3.0
+++ b/metadata/md5-cache/dev-java/geoip-java-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/maxmind/geoip-api-java/archive/v1.3.0.zip -> geoip-java-1.3.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3f8927fe150bd9c6e3933e1f64021ac4
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=72d8ed996a49f636dc049e5dfdbd4fb1
diff --git a/metadata/md5-cache/dev-java/glassfish-connector-api-1.1.2.2.04 b/metadata/md5-cache/dev-java/glassfish-connector-api-1.1.2.2.04
index 16614e6fd686..3c35ce36938b 100644
--- a/metadata/md5-cache/dev-java/glassfish-connector-api-1.1.2.2.04
+++ b/metadata/md5-cache/dev-java/glassfish-connector-api-1.1.2.2.04
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://download.java.net/javaee5/v2ur2/promoted/source/glassfish-v2ur2-b04-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ee238b79080253ad6b8220aef2047927
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1e9f08225ea8488902775bcf5c44e544
diff --git a/metadata/md5-cache/dev-java/glassfish-deployment-api-3.1.1 b/metadata/md5-cache/dev-java/glassfish-deployment-api-3.1.1
index c4ec032c099b..18e3f9ed9afc 100644
--- a/metadata/md5-cache/dev-java/glassfish-deployment-api-3.1.1
+++ b/metadata/md5-cache/dev-java/glassfish-deployment-api-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=1.2
 SRC_URI=https://repo1.maven.org/maven2/org/glassfish/javax.enterprise.deploy/3.1.1/javax.enterprise.deploy-3.1.1-sources.jar -> glassfish-deployment-api-3.1.1.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ae2fc6c0ff055f080b2894249126cc9d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5d7d9b841d904316193ad2363e8328c9
diff --git a/metadata/md5-cache/dev-java/glassfish-ejb-api-3.2 b/metadata/md5-cache/dev-java/glassfish-ejb-api-3.2
index fc1933c684e6..f833019738ca 100644
--- a/metadata/md5-cache/dev-java/glassfish-ejb-api-3.2
+++ b/metadata/md5-cache/dev-java/glassfish-ejb-api-3.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 java-virtuals/xmlrpc-api:0 java-virtuals/transaction-a
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/glassfish-ejb-api-3.2.tar.xz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=511ce80e7d85b3812dff671525b0ee86
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c35cecd5e6ab0c1d335a3795f0121409
diff --git a/metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1 b/metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1
index e5467fe33519..643f9e05eafe 100644
--- a/metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1
+++ b/metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/glassfish-interceptor-api-3.1.tar.xz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0fe442a71f556c16e045091240de96fe
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4b178abc079a1a435a3dd3dd587c0f95
diff --git a/metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04 b/metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04
index 51e61d9fa172..1de6428545b6 100644
--- a/metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04
+++ b/metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://download.java.net/javaee5/v2ur2/promoted/source/glassfish-v2ur2-b04-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8f61967eb9e1a497e250d3e5af1c5c2a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=81bc4b8eaafe4c4b3d49bb1d996b8c72
diff --git a/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r1 b/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r1
index 0c7e7258fd21..811aa9cf5ca7 100644
--- a/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r1
+++ b/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://download.java.net/javaee5/fcs_branch/promoted/source/glassfish-9_0-b48-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f40348ed675561f45175229305fae738
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6d3f63f19d5067f1f80927cc54b4354d
diff --git a/metadata/md5-cache/dev-java/glassfish-servlet-api-3.1.1 b/metadata/md5-cache/dev-java/glassfish-servlet-api-3.1.1
index 796220acc681..589e83bd49a4 100644
--- a/metadata/md5-cache/dev-java/glassfish-servlet-api-3.1.1
+++ b/metadata/md5-cache/dev-java/glassfish-servlet-api-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=3.1.1
 SRC_URI=http://central.maven.org/maven2/org/glassfish/javax.servlet/3.1.1/javax.servlet-3.1.1-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ce7befe6428dc634ad94a3d1299733d2
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=758ea5322735561666f7b30ae1c3d613
diff --git a/metadata/md5-cache/dev-java/glassfish-transaction-api-1.1.2.2.04 b/metadata/md5-cache/dev-java/glassfish-transaction-api-1.1.2.2.04
index b34a9ecf90f3..09091ab46eec 100644
--- a/metadata/md5-cache/dev-java/glassfish-transaction-api-1.1.2.2.04
+++ b/metadata/md5-cache/dev-java/glassfish-transaction-api-1.1.2.2.04
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=0
 SRC_URI=http://download.java.net/javaee5/v2ur2/promoted/source/glassfish-v2ur2-b04-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=cc8d740aa0b7335225297fd1878523a7
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b1fb2191151305bd7f6b5a4edfb9aa1f
diff --git a/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1 b/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1
index a8f74ba5442f..08c3b6c7931c 100644
--- a/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1
+++ b/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/glassfish-xmlrpc-api-1.1.1.tar.xz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=08f2420925b7afe899265f9390356335
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3c5a2c8cab7c937c2d95224f0887d6a0
diff --git a/metadata/md5-cache/dev-java/glazedlists-1.8.0-r1 b/metadata/md5-cache/dev-java/glazedlists-1.8.0-r1
index d465fd5249f2..a82c14cf1e88 100644
--- a/metadata/md5-cache/dev-java/glazedlists-1.8.0-r1
+++ b/metadata/md5-cache/dev-java/glazedlists-1.8.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://java.net/downloads/glazedlists/glazedlists-1.8.0/glazedlists-1.8.0-source_java15.zip -> glazedlists-1.8.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0f388c9122e4da7b0027938eb49fc621
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=fd7429e80100971ec78d110c3c2aa813
diff --git a/metadata/md5-cache/dev-java/gnu-classpath-0.98-r5 b/metadata/md5-cache/dev-java/gnu-classpath-0.98-r5
index d02a355318bb..a98c529292b2 100644
--- a/metadata/md5-cache/dev-java/gnu-classpath-0.98-r5
+++ b/metadata/md5-cache/dev-java/gnu-classpath-0.98-r5
@@ -11,5 +11,5 @@ REQUIRED_USE=doc? ( gjdoc )
 SLOT=0.98
 SRC_URI=mirror://gnu/classpath/classpath-0.98.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=569061aa4927f6a976199a7bb3fc1268
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e5c8304487c583e38e80796a49b8fe56
diff --git a/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.0-r3 b/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.0-r3
index afb833b05786..75050245ace4 100644
--- a/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.0-r3
+++ b/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.0-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/gnu-crypto-2.0.1 >=dev-java/java-config-2.2
 SLOT=1.0
 SRC_URI=mirror://gnu/classpath/inetlib-1.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=283379de7a12ee8fec604045c24757d2
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3a8f9ceb257ec5e440c66c47fc7e70de
diff --git a/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.1-r3 b/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.1-r3
index e235ce3435ee..d629c588a2db 100644
--- a/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.1-r3
+++ b/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.1-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/gnu-crypto-2.0.1 >=dev-java/java-config-2.2
 SLOT=1.1
 SRC_URI=mirror://gnu/classpath/inetlib-1.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f648922a80c168ba122a6e746aada4a2
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=123cd150616b1e151804ea9e817ecb05
diff --git a/metadata/md5-cache/dev-java/gnu-crypto-2.0.1-r2 b/metadata/md5-cache/dev-java/gnu-crypto-2.0.1-r2
index f43ae1e608b2..54f6a9c3791e 100644
--- a/metadata/md5-cache/dev-java/gnu-crypto-2.0.1-r2
+++ b/metadata/md5-cache/dev-java/gnu-crypto-2.0.1-r2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.gnupg.org/GnuPG/gnu-crypto/gnu-crypto-2.0.1.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_configure:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9853c3d8f98929a278a02e4803bca1a0
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=698dc0d56d4f30ca00dcece031cb9740
diff --git a/metadata/md5-cache/dev-java/gnu-crypto-2.0.1-r3 b/metadata/md5-cache/dev-java/gnu-crypto-2.0.1-r3
index b7da5d8b09c6..5fea2f6966a5 100644
--- a/metadata/md5-cache/dev-java/gnu-crypto-2.0.1-r3
+++ b/metadata/md5-cache/dev-java/gnu-crypto-2.0.1-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=ftp://ftp.gnupg.org/GnuPG/gnu-crypto/gnu-crypto-2.0.1.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9426c1f36c97fb544d413a0601b979cd
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4733b4aa2dd60a2e0fb80edb3f867126
diff --git a/metadata/md5-cache/dev-java/gnu-hylafax-1.0.3-r2 b/metadata/md5-cache/dev-java/gnu-hylafax-1.0.3-r2
index e5a5a58d49ff..2ef30913cee9 100644
--- a/metadata/md5-cache/dev-java/gnu-hylafax-1.0.3-r2
+++ b/metadata/md5-cache/dev-java/gnu-hylafax-1.0.3-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging:0 dev-java/commons-cli:1 dev-
 SLOT=0
 SRC_URI=mirror://sourceforge/gnu-hylafax/gnu-hylafax/1.0.3/gnu-hylafax-1.0.3-bin.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=289bb5b638166ea26d4499dc168ea779
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9c3f3a282a0e32b335a5c07fcdc2e5b8
diff --git a/metadata/md5-cache/dev-java/gnu-jaf-1.1.1 b/metadata/md5-cache/dev-java/gnu-jaf-1.1.1
index 0419b984ac50..040baf8effa1 100644
--- a/metadata/md5-cache/dev-java/gnu-jaf-1.1.1
+++ b/metadata/md5-cache/dev-java/gnu-jaf-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=1
 SRC_URI=mirror://gnu/classpathx/activation-1.1.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a1a34c9c4128e9a1df1f1a2b9073d5ef
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=599942e34ca052ecf78d981de3cdce57
diff --git a/metadata/md5-cache/dev-java/gnu-javamail-1.0-r2 b/metadata/md5-cache/dev-java/gnu-javamail-1.0-r2
index e43b5e5f30ce..7e263968748a 100644
--- a/metadata/md5-cache/dev-java/gnu-javamail-1.0-r2
+++ b/metadata/md5-cache/dev-java/gnu-javamail-1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 =dev-java/gnu-jaf-1* =dev-java/gnu-classpath-inetlib-1
 SLOT=1
 SRC_URI=mirror://gnu/classpathx/mail-1.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d74cdfac2ec4c13a7e714c7cb94ca10c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6c2e7b7d9937c9b36f763cd43c9094be
diff --git a/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r3 b/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r3
index 2fcc1f8c453e..075be0a81c68 100644
--- a/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r3
+++ b/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-java/java-getopt:1 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=1
 SRC_URI=mirror://gentoo/gnu.regexp-1.1.4.tar.gz -> gnu-regexp-1.1.4.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0288e9258c9d9e8e343358cb6e50149a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c495f76eaba15b0c83656d1f283a42a6
diff --git a/metadata/md5-cache/dev-java/gradle-bin-3.3 b/metadata/md5-cache/dev-java/gradle-bin-3.3
index 72586223b2ea..495635b59f8c 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-3.3
+++ b/metadata/md5-cache/dev-java/gradle-bin-3.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=3.3
 SRC_URI=http://services.gradle.org/distributions/gradle-3.3-all.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e313c8cb30bfe94db19b6d9ad237112f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=65cc8ffcef61a9b17d739aeb4455b16a
diff --git a/metadata/md5-cache/dev-java/groovy-2.4.5 b/metadata/md5-cache/dev-java/groovy-2.4.5
index d8baa664022d..403b99d105f4 100644
--- a/metadata/md5-cache/dev-java/groovy-2.4.5
+++ b/metadata/md5-cache/dev-java/groovy-2.4.5
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jansi:0 dev-java/xstream:0 dev-java/commons-cli:1 >=dev-java/as
 SLOT=0
 SRC_URI=https://github.com/apache/incubator-groovy/archive/GROOVY_2_4_5.zip -> groovy-2.4.5.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=efddc9ac0b1f301468a2a16389005c13
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=636deafd57fcfbd6cd82f9dd82ab7929
diff --git a/metadata/md5-cache/dev-java/gson-2.3.1 b/metadata/md5-cache/dev-java/gson-2.3.1
index 57e07e490293..efa261a45c2f 100644
--- a/metadata/md5-cache/dev-java/gson-2.3.1
+++ b/metadata/md5-cache/dev-java/gson-2.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=2.2.2
 SRC_URI=http://search.maven.org/remotecontent?filepath=com/google/code/gson/gson/2.3.1/gson-2.3.1-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9beec6309af0cf44c410937cb591faf8
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e452546422b1109e1631d3e022176d0e
diff --git a/metadata/md5-cache/dev-java/gson-2.6.2 b/metadata/md5-cache/dev-java/gson-2.6.2
index dd1769b09b87..8d2381f8baee 100644
--- a/metadata/md5-cache/dev-java/gson-2.6.2
+++ b/metadata/md5-cache/dev-java/gson-2.6.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=2.6
 SRC_URI=https://github.com/google/gson/archive/gson-parent-2.6.2.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4971df460ca4973abdeb59e7c45d3334
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7d63140218bd8ee15c35f50fa5ec344b
diff --git a/metadata/md5-cache/dev-java/gson-2.7 b/metadata/md5-cache/dev-java/gson-2.7
index ca205c8343d0..7b9d33d0edb3 100644
--- a/metadata/md5-cache/dev-java/gson-2.7
+++ b/metadata/md5-cache/dev-java/gson-2.7
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=2.7
 SRC_URI=https://github.com/google/gson/archive/gson-parent-2.7.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=aeb008a1e751ffafcd016d515830aee1
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=64c9be3fc4727f8cc3d88fb3b4663112
diff --git a/metadata/md5-cache/dev-java/guava-13.0.1 b/metadata/md5-cache/dev-java/guava-13.0.1
index d4c8bf2e46eb..23bcb4c4347b 100644
--- a/metadata/md5-cache/dev-java/guava-13.0.1
+++ b/metadata/md5-cache/dev-java/guava-13.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0 || ( virtual/jre:1.7
 SLOT=13
 SRC_URI=http://search.maven.org/remotecontent?filepath=com/google/guava/guava/13.0.1/guava-13.0.1-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d639b25ceda53ce88696b456bc6c4d64
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c014516b6db8dcfd6e618ca8fde8dd75
diff --git a/metadata/md5-cache/dev-java/guava-13.0.1-r3 b/metadata/md5-cache/dev-java/guava-13.0.1-r3
index 3a421ada2be7..6a5d407089b1 100644
--- a/metadata/md5-cache/dev-java/guava-13.0.1-r3
+++ b/metadata/md5-cache/dev-java/guava-13.0.1-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0 virtual/jre:1.7 >=dev
 SLOT=13
 SRC_URI=http://search.maven.org/remotecontent?filepath=com/google/guava/guava/13.0.1/guava-13.0.1-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b8ccd3a1d2085ef2842e73501744b089
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1f13d7da14c81d53fd026a00c88caa00
diff --git a/metadata/md5-cache/dev-java/guava-14.0.1 b/metadata/md5-cache/dev-java/guava-14.0.1
index a8c3aa2116e5..a4dfac2603d2 100644
--- a/metadata/md5-cache/dev-java/guava-14.0.1
+++ b/metadata/md5-cache/dev-java/guava-14.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/javax-inject:0 dev-java/jsr305:0 java-virtuals/jdk-with-com-sun
 SLOT=14
 SRC_URI=http://search.maven.org/remotecontent?filepath=com/google/guava/guava/14.0.1/guava-14.0.1-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0f020c653efe07463594efd3aa64dc91
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=001ef7b815507ce4defe2a02552553f0
diff --git a/metadata/md5-cache/dev-java/guava-18.0 b/metadata/md5-cache/dev-java/guava-18.0
index db3391486395..29d2a5c4ae3e 100644
--- a/metadata/md5-cache/dev-java/guava-18.0
+++ b/metadata/md5-cache/dev-java/guava-18.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/javax-inject:0 dev-java/jsr305:0 java-virtuals/jdk-with-com-sun
 SLOT=18
 SRC_URI=http://search.maven.org/remotecontent?filepath=com/google/guava/guava/18.0/guava-18.0-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=39c5e091a72a9b4ca734fe263efec32a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a02805f683da3204fe6c847cb2b592c2
diff --git a/metadata/md5-cache/dev-java/guava-20.0 b/metadata/md5-cache/dev-java/guava-20.0
index 1ea069750d3c..dd0a5e3eaae5 100644
--- a/metadata/md5-cache/dev-java/guava-20.0
+++ b/metadata/md5-cache/dev-java/guava-20.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/animal-sniffer-annotations:0 dev-java/error-prone-annotations:0
 SLOT=20
 SRC_URI=https://github.com/google/guava/archive/v20.0.tar.gz -> guava-20.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:- src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3e2b6b63c832d88245c4ee466325a751
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4d93b5becf35bf616f4a158df99ad168
diff --git a/metadata/md5-cache/dev-java/guice-4.0 b/metadata/md5-cache/dev-java/guice-4.0
index 5929f54d6e07..e9b1655b1d21 100644
--- a/metadata/md5-cache/dev-java/guice-4.0
+++ b/metadata/md5-cache/dev-java/guice-4.0
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=4
 SRC_URI=https://github.com/google/guice/archive/4.0.tar.gz -> guice-4.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3507a69b62bab3921614c92962ee476e
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0c2972c91a2fe932a611d7fd903250a1
diff --git a/metadata/md5-cache/dev-java/guice-4.1 b/metadata/md5-cache/dev-java/guice-4.1
index a63fd900f1e8..386c660010e1 100644
--- a/metadata/md5-cache/dev-java/guice-4.1
+++ b/metadata/md5-cache/dev-java/guice-4.1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=4
 SRC_URI=https://github.com/google/guice/archive/4.1.tar.gz -> guice-4.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=86eecf596398010b02fdb8beb61149ee
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4264c6c70b2cc10fa30a0e88cbf53740
diff --git a/metadata/md5-cache/dev-java/hamcrest-core-1.1-r1 b/metadata/md5-cache/dev-java/hamcrest-core-1.1-r1
index c92d1795fe3b..986c75e7c966 100644
--- a/metadata/md5-cache/dev-java/hamcrest-core-1.1-r1
+++ b/metadata/md5-cache/dev-java/hamcrest-core-1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-1.1.zip -> hamcrest-core-1.1.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a06a88f0fb2499d26236c8bc7a506b56
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3e902b74cde3e0a6b5c9e6fe8eeca238
diff --git a/metadata/md5-cache/dev-java/hamcrest-core-1.3 b/metadata/md5-cache/dev-java/hamcrest-core-1.3
index ef83727e5eb7..23fed7fd854e 100644
--- a/metadata/md5-cache/dev-java/hamcrest-core-1.3
+++ b/metadata/md5-cache/dev-java/hamcrest-core-1.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=1.3
 SRC_URI=https://hamcrest.googlecode.com/files/hamcrest-1.3.tgz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=500d1c18d9aca0e8ad19dcffb6d959a3
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=dc21c25041411236e2edda6eda4daebb
diff --git a/metadata/md5-cache/dev-java/hamcrest-generator-1.1 b/metadata/md5-cache/dev-java/hamcrest-generator-1.1
index 7115fae763e0..0b04fff73381 100644
--- a/metadata/md5-cache/dev-java/hamcrest-generator-1.1
+++ b/metadata/md5-cache/dev-java/hamcrest-generator-1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/qdox:1.6 >=dev-java/java-config-2.2.0-r3 sour
 SLOT=0
 SRC_URI=https://hamcrest.googlecode.com/files/hamcrest-1.1.tgz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3132bd8221f09d245efb6fec0e47f86c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=15f45f03a933e7c82fe79caea600a79a
diff --git a/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r1 b/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r1
index be741d7931b4..acca94b7cf0e 100644
--- a/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r1
+++ b/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/qdox-1.12-r1:1.12 >=dev-java/java-config-2.
 SLOT=1.3
 SRC_URI=https://hamcrest.googlecode.com/files/hamcrest-1.3.tgz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ca938e5e8e8d0e1f1d102badb72db55b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=17cef8a931537b8194da696330ecc4e4
diff --git a/metadata/md5-cache/dev-java/hamcrest-integration-1.3 b/metadata/md5-cache/dev-java/hamcrest-integration-1.3
index 520aaaa23c2f..016f8f959703 100644
--- a/metadata/md5-cache/dev-java/hamcrest-integration-1.3
+++ b/metadata/md5-cache/dev-java/hamcrest-integration-1.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/hamcrest-core:1.3 dev-java/qdox:1.6 dev-java/
 SLOT=1.3
 SRC_URI=https://hamcrest.googlecode.com/files/hamcrest-1.3.tgz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fdf107f49786a60ec8a2d479c1c4dcbd
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=506784f7f4caf627bcb75869ac92a9ec
diff --git a/metadata/md5-cache/dev-java/hamcrest-library-1.3-r1 b/metadata/md5-cache/dev-java/hamcrest-library-1.3-r1
index 1f203f03298f..dfd033a7fa63 100644
--- a/metadata/md5-cache/dev-java/hamcrest-library-1.3-r1
+++ b/metadata/md5-cache/dev-java/hamcrest-library-1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/hamcrest-generator:1.3 dev-java/hamcrest-core
 SLOT=1.3
 SRC_URI=https://hamcrest.googlecode.com/files/hamcrest-1.3.tgz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9aed00472da2cc8a5330b6913f9356a3
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f9874281ed2965040bd75e0c424f764e
diff --git a/metadata/md5-cache/dev-java/hawtjni-runtime-1.10 b/metadata/md5-cache/dev-java/hawtjni-runtime-1.10
index 3dd6fa32b7f4..79480dbe2f29 100644
--- a/metadata/md5-cache/dev-java/hawtjni-runtime-1.10
+++ b/metadata/md5-cache/dev-java/hawtjni-runtime-1.10
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/fusesource/hawtjni/archive/hawtjni-project-1.10.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=527bc0a8f864652915fe4b782f5f8090
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7ce5adf6438eb8bc8d61c33aff9fcab7
diff --git a/metadata/md5-cache/dev-java/headius-options-1.1 b/metadata/md5-cache/dev-java/headius-options-1.1
index bb32d4fc7e19..74a814e14a11 100644
--- a/metadata/md5-cache/dev-java/headius-options-1.1
+++ b/metadata/md5-cache/dev-java/headius-options-1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/headius/options/archive/options-1.1.tar.gz -> headius-options-1.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=61c3614169a8db1e64a42872d839b7cb
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=10f0aa8de33acbb25d8a6def7b184f7a
diff --git a/metadata/md5-cache/dev-java/helpgui-1.1-r2 b/metadata/md5-cache/dev-java/helpgui-1.1-r2
index d43637e95f94..339b54261192 100644
--- a/metadata/md5-cache/dev-java/helpgui-1.1-r2
+++ b/metadata/md5-cache/dev-java/helpgui-1.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/helpgui/helpgui-1.1-src.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=769f2adad2384fa0539c58f1d6566dff
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a4b0bdb057e9a6871add066b92164699
diff --git a/metadata/md5-cache/dev-java/hessian-4.0.37 b/metadata/md5-cache/dev-java/hessian-4.0.37
index 6eea15107c70..8ad2b4dceaa8 100644
--- a/metadata/md5-cache/dev-java/hessian-4.0.37
+++ b/metadata/md5-cache/dev-java/hessian-4.0.37
@@ -10,5 +10,5 @@ RDEPEND=java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2
 SLOT=4.0
 SRC_URI=http://hessian.caucho.com/download/hessian-4.0.37-src.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d7b85c16e84d64d221155c48a9675da4
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0c7f4a205359e997e998f9aeaf03e586
diff --git a/metadata/md5-cache/dev-java/higlayout-1.0-r2 b/metadata/md5-cache/dev-java/higlayout-1.0-r2
index 7d89c1cbe321..2be862d64c19 100644
--- a/metadata/md5-cache/dev-java/higlayout-1.0-r2
+++ b/metadata/md5-cache/dev-java/higlayout-1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://www.autel.cz/dmi/HIGLayout1.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=25806f790b477b90b167a9e8910b49b3
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8623e7b9fcd7dd820ae90fe3a86f7d77
diff --git a/metadata/md5-cache/dev-java/hoteqn-4.0.0-r1 b/metadata/md5-cache/dev-java/hoteqn-4.0.0-r1
index c4889eec5d8f..819dea8938e7 100644
--- a/metadata/md5-cache/dev-java/hoteqn-4.0.0-r1
+++ b/metadata/md5-cache/dev-java/hoteqn-4.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://gentoo/hoteqn-4.0.0.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=311330477ed5dfecacb81e6a57ee05d3
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c5c8730b17b5e42efb869faf368fb104
diff --git a/metadata/md5-cache/dev-java/htmlcleaner-2.13 b/metadata/md5-cache/dev-java/htmlcleaner-2.13
index b97144f3aecf..d500b0820d29 100644
--- a/metadata/md5-cache/dev-java/htmlcleaner-2.13
+++ b/metadata/md5-cache/dev-java/htmlcleaner-2.13
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jdom:2 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source
 SLOT=0
 SRC_URI=mirror://sourceforge/htmlcleaner/files/htmlcleaner-2.13-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_configure:- src_compile:java-pkg-simple src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1c26f90f826a10d60de3db75d0c3960c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c838b539b9d9f7822404768a74a60d32
diff --git a/metadata/md5-cache/dev-java/htmlparser-1.4-r1 b/metadata/md5-cache/dev-java/htmlparser-1.4-r1
index c920a792317a..484fc30bc8f6 100644
--- a/metadata/md5-cache/dev-java/htmlparser-1.4-r1
+++ b/metadata/md5-cache/dev-java/htmlparser-1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/icu4j:52 dev-java/jchardet:0 dev-java/xom:0 >=virtual/jre-1.6 >
 SLOT=0
 SRC_URI=http://about.validator.nu/htmlparser/htmlparser-1.4.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=444beebedbdf670a80fa9747a067d5e0
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=adc3f61b82e4634e5e3e3e56e28e1432
diff --git a/metadata/md5-cache/dev-java/htmlparser-org-1.6 b/metadata/md5-cache/dev-java/htmlparser-org-1.6
index 5982adb66c51..0b731678abe6 100644
--- a/metadata/md5-cache/dev-java/htmlparser-org-1.6
+++ b/metadata/md5-cache/dev-java/htmlparser-org-1.6
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/htmlparser/htmlparser1_6_20060610.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_test:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=efc922a9663c1b0c1d5a84e0ef93c849
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ee322e7c62f9e2901645381af1f86eb0
diff --git a/metadata/md5-cache/dev-java/httpcomponents-client-4.5 b/metadata/md5-cache/dev-java/httpcomponents-client-4.5
index 7aa2c98a0192..fdc7340a1891 100644
--- a/metadata/md5-cache/dev-java/httpcomponents-client-4.5
+++ b/metadata/md5-cache/dev-java/httpcomponents-client-4.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/ant-junit:0 dev-java/easymock:3.2 dev-java/sp
 SLOT=4.5
 SRC_URI=mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-4.5-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=35a943247b3f415f23cc0251885b49fa
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2c8b31d4c4453d34be180112b7d8b807
diff --git a/metadata/md5-cache/dev-java/httpcomponents-core-4.4.1-r1 b/metadata/md5-cache/dev-java/httpcomponents-core-4.4.1-r1
index bf1ef939bf74..6abf5acb15e1 100644
--- a/metadata/md5-cache/dev-java/httpcomponents-core-4.4.1-r1
+++ b/metadata/md5-cache/dev-java/httpcomponents-core-4.4.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=4.4
 SRC_URI=mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-4.4.1-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4d54317d120704bc0a4e658d5a11ab4f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d9f791b2d967a5a013d9294bc3ede1d8
diff --git a/metadata/md5-cache/dev-java/ical4j-1.0.5 b/metadata/md5-cache/dev-java/ical4j-1.0.5
index 9344247cabd5..93def67bace0 100644
--- a/metadata/md5-cache/dev-java/ical4j-1.0.5
+++ b/metadata/md5-cache/dev-java/ical4j-1.0.5
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ical4j/ical4j-1.0.5-src.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0c7bda9b9458acf4c331195ae548eba5
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=62e21b2440adc2fc482a07914f4ce6ce
diff --git a/metadata/md5-cache/dev-java/icedtea-3.3.0 b/metadata/md5-cache/dev-java/icedtea-3.3.0
index bf7d294e2403..6faebe7a692b 100644
--- a/metadata/md5-cache/dev-java/icedtea-3.3.0
+++ b/metadata/md5-cache/dev-java/icedtea-3.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=gtk? ( !headless-awt )
 SLOT=8
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-3.3.0.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.3.0/openjdk.tar.xz -> icedtea-3.3-openjdk-d5760f7cce54.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.3.0/corba.tar.xz -> icedtea-3.3-corba-8eb9dd5fe2fb.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.3.0/jaxp.tar.xz -> icedtea-3.3-jaxp-faf1c4a9a51d.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.3.0/jaxws.tar.xz -> icedtea-3.3-jaxws-5f5237104669.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.3.0/jdk.tar.xz -> icedtea-3.3-jdk-3642a826880b.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.3.0/hotspot.tar.xz -> icedtea-3.3-hotspot-6efaf77e82a1.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.3.0/nashorn.tar.xz -> icedtea-3.3-nashorn-8c0fe384c4e7.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.3.0/langtools.tar.xz -> icedtea-3.3-langtools-d10a13bdc98c.tar.xz shenandoah? ( http://icedtea.classpath.org/download/drops/icedtea8/3.3.0/shenandoah.tar.xz -> icedtea-3.3-shenandoah-d9a978177779.tar.xz ) http://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.xz -> icedtea-cacao-c182f119eaad.tar.xz http://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
 _eclass_exported_funcs=pkg_pretend:- pkg_prerm:java-vm-2 pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:- src_unpack:- src_prepare:java-pkg-2 src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	708f85bc1bf00876604e223fb56e062a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	java-vm-2	4fd0e83bad4ea20bac7f73e2e59a0c60	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	eb9be4b678c4e71f3f530a767df31912	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c567d55a4d1975b9df7ce04cc8e9a673
+_eclasses_=check-reqs	0aae1fa61c78fb91cb66cd09f3450029	eutils	3c847a0129fed780bd709b98e426f89c	fdo-mime	21ef5adf81836863efa968f2a25cff64	gnome2-utils	fe8e9099c6fc74a40946623c593c7236	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	java-vm-2	477ca23a49dfcd57017ee7f3bed47564	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	df8265631f8bf5f5df387e9b987121f9	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	178a84136f416b8ea1a857717eacd21c
+_md5_=dca062125653dd7a25c9c8f8e17d46e6
diff --git a/metadata/md5-cache/dev-java/icedtea-7.2.6.8 b/metadata/md5-cache/dev-java/icedtea-7.2.6.8
index a84a40e06818..fb0d3afcfdc4 100644
--- a/metadata/md5-cache/dev-java/icedtea-7.2.6.8
+++ b/metadata/md5-cache/dev-java/icedtea-7.2.6.8
@@ -12,5 +12,5 @@ REQUIRED_USE=gtk? ( !headless-awt )
 SLOT=7
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-2.6.8.tar.xz http://icedtea.classpath.org/download/drops/icedtea7/2.6.8/openjdk.tar.bz2 -> icedtea-2.6-openjdk-653c2662034d.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.8/corba.tar.bz2 -> icedtea-2.6-corba-9e002eaf26ed.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.8/jaxp.tar.bz2 -> icedtea-2.6-jaxp-3369fa5a875b.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.8/jaxws.tar.bz2 -> icedtea-2.6-jaxws-26bcf28b3a60.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.8/jdk.tar.bz2 -> icedtea-2.6-jdk-52225839bbea.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.8/hotspot.tar.bz2 -> icedtea-2.6-hotspot-223f6c442d49.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.8/langtools.tar.bz2 -> icedtea-2.6-langtools-545e512eb4de.tar.bz2 http://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.gz -> icedtea-cacao-c182f119eaad.tar.gz http://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
 _eclass_exported_funcs=pkg_pretend:- pkg_prerm:java-vm-2 pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:- src_unpack:- src_prepare:java-pkg-2 src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	708f85bc1bf00876604e223fb56e062a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	java-vm-2	4fd0e83bad4ea20bac7f73e2e59a0c60	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	eb9be4b678c4e71f3f530a767df31912	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6195487b5cba15c08cf288c006504cba
+_eclasses_=check-reqs	0aae1fa61c78fb91cb66cd09f3450029	eutils	3c847a0129fed780bd709b98e426f89c	fdo-mime	21ef5adf81836863efa968f2a25cff64	gnome2-utils	fe8e9099c6fc74a40946623c593c7236	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	java-vm-2	477ca23a49dfcd57017ee7f3bed47564	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	df8265631f8bf5f5df387e9b987121f9	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	178a84136f416b8ea1a857717eacd21c
+_md5_=257e62af165db55961bc58c7ccb524ce
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-3.3.0 b/metadata/md5-cache/dev-java/icedtea-bin-3.3.0
index 24763a9e59fd..f40223499292 100644
--- a/metadata/md5-cache/dev-java/icedtea-bin-3.3.0
+++ b/metadata/md5-cache/dev-java/icedtea-bin-3.3.0
@@ -13,5 +13,5 @@ RESTRICT=preserve-libs strip
 SLOT=8
 SRC_URI=doc? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-doc-3.3.0.tar.xz ) source? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-src-3.3.0.tar.xz ) multilib? ( amd64? ( abi_x86_32? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.3.0-x86.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.3.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.3.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.3.0-arm.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.3.0-arm.tar.xz ) ) ppc64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.3.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.3.0-ppc64.tar.xz ) ) x86? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.3.0-x86.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.3.0-x86.tar.xz ) )
 _eclass_exported_funcs=pkg_pretend:- pkg_prerm:java-vm-2 pkg_postrm:java-vm-2 pkg_postinst:java-vm-2 pkg_setup:java-vm-2 src_prepare:- src_install:-
-_eclasses_=fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	4fd0e83bad4ea20bac7f73e2e59a0c60	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=346b35d30cd897debf6edf4d0cd3cc43
+_eclasses_=fdo-mime	21ef5adf81836863efa968f2a25cff64	java-vm-2	477ca23a49dfcd57017ee7f3bed47564	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multilib-build	eed53a6313267c9fbcd35fc384bd0087	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	df8265631f8bf5f5df387e9b987121f9	toolchain-funcs	53b75b4a49cf3e61530a523804045432
+_md5_=d533fa35311ff750746af8353aaca347
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-7.2.6.8 b/metadata/md5-cache/dev-java/icedtea-bin-7.2.6.8
index ce3cf08370ff..500bb1a442ed 100644
--- a/metadata/md5-cache/dev-java/icedtea-bin-7.2.6.8
+++ b/metadata/md5-cache/dev-java/icedtea-bin-7.2.6.8
@@ -13,5 +13,5 @@ RESTRICT=preserve-libs strip
 SLOT=7
 SRC_URI=doc? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-doc-7.2.6.8.tar.xz ) source? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-src-7.2.6.8.tar.xz ) multilib? ( amd64? ( abi_x86_32? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-7.2.6.8-x86.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-7.2.6.8-amd64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-7.2.6.8-amd64.tar.xz ) ) x86? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-7.2.6.8-x86.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-7.2.6.8-x86.tar.xz ) )
 _eclass_exported_funcs=pkg_pretend:- pkg_prerm:java-vm-2 pkg_postrm:java-vm-2 pkg_postinst:java-vm-2 pkg_setup:java-vm-2 src_prepare:- src_install:-
-_eclasses_=fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	4fd0e83bad4ea20bac7f73e2e59a0c60	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=1ee68bf4aa0bf66ef6aaa452c527cae2
+_eclasses_=fdo-mime	21ef5adf81836863efa968f2a25cff64	java-vm-2	477ca23a49dfcd57017ee7f3bed47564	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multilib-build	eed53a6313267c9fbcd35fc384bd0087	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	df8265631f8bf5f5df387e9b987121f9	toolchain-funcs	53b75b4a49cf3e61530a523804045432
+_md5_=cc3b397396a54c7cf5255a4ffa4966db
diff --git a/metadata/md5-cache/dev-java/icedtea-sound-1.0.1 b/metadata/md5-cache/dev-java/icedtea-sound-1.0.1
index 5ece4f6bac4f..db89e3ef1407 100644
--- a/metadata/md5-cache/dev-java/icedtea-sound-1.0.1
+++ b/metadata/md5-cache/dev-java/icedtea-sound-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.6.0 >=media-sound/pulseaudio-0.9.11:= >=dev-java/java-co
 SLOT=0
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-sound-1.0.1.tar.xz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:- src_prepare:java-pkg-2 src_configure:- src_compile:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f30d5b913ee478aae6af7d5ec76b05ef
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	prefix	df8265631f8bf5f5df387e9b987121f9	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=09e579118498d4923a4a941c3c446ad5
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.6.1-r1 b/metadata/md5-cache/dev-java/icedtea-web-1.6.1-r1
index 6a9abd2c30b1..fede40bc0fdf 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.6.1-r1
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.6.1-r1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-web-1.6.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:- src_configure:- src_compile:- src_install:-
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	libtool	84763589a795fb127b537cac01e5359f	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=385cb5f9b5e5065cb4083c055b7488f1
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	48b1b9f6194d2842456514d1184ca72e	multilib	0236be304ee52e7f179ed2f337075515	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	178a84136f416b8ea1a857717eacd21c
+_md5_=8c7139bfe2bf53f7d6b515d492244d80
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.6.2 b/metadata/md5-cache/dev-java/icedtea-web-1.6.2
index aad6a5852095..8012bd829d17 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.6.2
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.6.2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-web-1.6.2.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:- src_configure:- src_compile:- src_install:-
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	libtool	84763589a795fb127b537cac01e5359f	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=7b0e68458f1d46debb490c64e886aa68
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	48b1b9f6194d2842456514d1184ca72e	multilib	0236be304ee52e7f179ed2f337075515	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	178a84136f416b8ea1a857717eacd21c
+_md5_=d4599466389f73466b3735491a5fbf74
diff --git a/metadata/md5-cache/dev-java/icu4j-54.1.1 b/metadata/md5-cache/dev-java/icu4j-54.1.1
index b1f6298bed71..db12cdf70eb3 100644
--- a/metadata/md5-cache/dev-java/icu4j-54.1.1
+++ b/metadata/md5-cache/dev-java/icu4j-54.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=52
 SRC_URI=http://download.icu-project.org/files/icu4j/54.1.1/icu4j-54_1_1.tgz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f26b6442eb630dd233647c052b982810
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f07035b9fb48983b51858ff74544631a
diff --git a/metadata/md5-cache/dev-java/icu4j-55.1 b/metadata/md5-cache/dev-java/icu4j-55.1
index 09393d3bf4d3..bcc419753677 100644
--- a/metadata/md5-cache/dev-java/icu4j-55.1
+++ b/metadata/md5-cache/dev-java/icu4j-55.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=55
 SRC_URI=http://download.icu-project.org/files/icu4j/55.1/icu4j-55_1.tgz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=77a900b526caac9c74e6c3c86b1d6a23
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=127ceb7e9501360d517fc60766800b5d
diff --git a/metadata/md5-cache/dev-java/icu4j-56.1 b/metadata/md5-cache/dev-java/icu4j-56.1
index dba1cad644f4..dad767ae63bf 100644
--- a/metadata/md5-cache/dev-java/icu4j-56.1
+++ b/metadata/md5-cache/dev-java/icu4j-56.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=56
 SRC_URI=http://download.icu-project.org/files/icu4j/56.1/icu4j-56_1.tgz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2dd0041ccab75afa5904b8cae5f4b007
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=53146e273e01f410276673a01f46bc71
diff --git a/metadata/md5-cache/dev-java/idm-console-framework-1.1.7 b/metadata/md5-cache/dev-java/idm-console-framework-1.1.7
index 3fd1aa9fcb77..1a37ec11fcf6 100644
--- a/metadata/md5-cache/dev-java/idm-console-framework-1.1.7
+++ b/metadata/md5-cache/dev-java/idm-console-framework-1.1.7
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/java-
 SLOT=1.1
 SRC_URI=http://directory.fedoraproject.org/sources/idm-console-framework-1.1.7.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ee5c985d9542b1c5d3ad325e0e640f09
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c7e5ec6c30a64c35d5cdd1fefdb1dc08
diff --git a/metadata/md5-cache/dev-java/ini4j-0.5.1 b/metadata/md5-cache/dev-java/ini4j-0.5.1
index 9b78a7deeaf9..8fe8b7b96554 100644
--- a/metadata/md5-cache/dev-java/ini4j-0.5.1
+++ b/metadata/md5-cache/dev-java/ini4j-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://central.maven.org/maven2/org/ini4j/ini4j/0.5.1/ini4j-0.5.1-sources.jar -> ini4j-0.5.1.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6d3e91e0b49b1fde5102741b7038607d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4e57727d6d1179fa2de3452dcedbb991
diff --git a/metadata/md5-cache/dev-java/invokebinder-1.6 b/metadata/md5-cache/dev-java/invokebinder-1.6
index eaacd1b723a6..4b8bce8708aa 100644
--- a/metadata/md5-cache/dev-java/invokebinder-1.6
+++ b/metadata/md5-cache/dev-java/invokebinder-1.6
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/headius/invokebinder/archive/invokebinder-1.6.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=74e79e4c36c63f1b4f603b5a730614a3
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7adf737eb0720dc8b5f7fc6517a3d30c
diff --git a/metadata/md5-cache/dev-java/iso-relax-20050331-r4 b/metadata/md5-cache/dev-java/iso-relax-20050331-r4
index a59d73503216..062f42999d60 100644
--- a/metadata/md5-cache/dev-java/iso-relax-20050331-r4
+++ b/metadata/md5-cache/dev-java/iso-relax-20050331-r4
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/iso-relax-20050331-gentoo.tar.bz2 -> iso-relax-20050331.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=aebf9de12a9557ca8c9a5b2c126c2a11
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=694c54ddd2fbfdf7fbc31e91c1e79291
diff --git a/metadata/md5-cache/dev-java/istack-commons-buildtools-2.22-r1 b/metadata/md5-cache/dev-java/istack-commons-buildtools-2.22-r1
index cda24db7511b..66939c789e61 100644
--- a/metadata/md5-cache/dev-java/istack-commons-buildtools-2.22-r1
+++ b/metadata/md5-cache/dev-java/istack-commons-buildtools-2.22-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/ant-core:0 dev-java/codemodel:2 >=dev-java/ja
 SLOT=0
 SRC_URI=https://maven.java.net/content/repositories/releases/com/sun/istack/istack-commons-buildtools/2.22/istack-commons-buildtools-2.22-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=52da762493fe0b8b6199302c39317b7b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0d94f07f235f2a273c6a334e3c506c5e
diff --git a/metadata/md5-cache/dev-java/istack-commons-runtime-2.22 b/metadata/md5-cache/dev-java/istack-commons-runtime-2.22
index e30bc2a252cc..6b16a3e02bfd 100644
--- a/metadata/md5-cache/dev-java/istack-commons-runtime-2.22
+++ b/metadata/md5-cache/dev-java/istack-commons-runtime-2.22
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://maven.java.net/content/repositories/releases/com/sun/istack/istack-commons-runtime/2.22/istack-commons-runtime-2.22-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6f94b3cc30fca4426d12a0acde694203
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=385460e0023ee6a1ccceb880ed529ef8
diff --git a/metadata/md5-cache/dev-java/istack-commons-soimp-2.22 b/metadata/md5-cache/dev-java/istack-commons-soimp-2.22
index 174a80139a51..d29d4db2e8e4 100644
--- a/metadata/md5-cache/dev-java/istack-commons-soimp-2.22
+++ b/metadata/md5-cache/dev-java/istack-commons-soimp-2.22
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/ant-core:0 dev-java/args4j:2 >=dev-java/java-
 SLOT=0
 SRC_URI=https://maven.java.net/content/repositories/releases/com/sun/istack/istack-commons-soimp/2.22/istack-commons-soimp-2.22-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4274ba3e6693dbc918a5abd9cb9795ef
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0d429c54e030787f6afb85fed9320bec
diff --git a/metadata/md5-cache/dev-java/itext-2.1.5-r2 b/metadata/md5-cache/dev-java/itext-2.1.5-r2
index b4b5e1f344eb..b5df1062fee8 100644
--- a/metadata/md5-cache/dev-java/itext-2.1.5-r2
+++ b/metadata/md5-cache/dev-java/itext-2.1.5-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/bcmail:1.45 dev-java/bcprov:1.45 rups? ( dev-java/dom4j:1 dev-j
 SLOT=0
 SRC_URI=mirror://sourceforge/itext/iText-src-2.1.5.tar.gz cjk? ( mirror://sourceforge/itext/iTextAsian.jar mirror://sourceforge/itext/iTextAsianCmaps.jar )
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e27c0ebe338c762b88c5a483f3a14e78
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a3090c4e47a7973841fafae0830eb653
diff --git a/metadata/md5-cache/dev-java/itext-5.5.4-r2 b/metadata/md5-cache/dev-java/itext-5.5.4-r2
index ad7ebcbdaf9a..4a5a71ee0b7a 100644
--- a/metadata/md5-cache/dev-java/itext-5.5.4-r2
+++ b/metadata/md5-cache/dev-java/itext-5.5.4-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/bcmail:1.52 dev-java/bcpkix:1.52 dev-java/bcprov:1.52 dev-java/
 SLOT=5
 SRC_URI=mirror://sourceforge/itext/itext-5.5.4.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=770e0abae42b76a70015dfe2ea074c40
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=068ab393ab40b3129f3cd4b0a20e0dd5
diff --git a/metadata/md5-cache/dev-java/j2objc-annotations-1.2 b/metadata/md5-cache/dev-java/j2objc-annotations-1.2
index 863437a6beae..c6e7f740076c 100644
--- a/metadata/md5-cache/dev-java/j2objc-annotations-1.2
+++ b/metadata/md5-cache/dev-java/j2objc-annotations-1.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/google/j2objc/archive/1.2.tar.gz -> j2objc-1.2.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c3d03d4319103e4542db87a4f2c60ba5
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1297c80623d07d25b70574264a306f7c
diff --git a/metadata/md5-cache/dev-java/j2ssh-0.2.9 b/metadata/md5-cache/dev-java/j2ssh-0.2.9
index 73e4ea71e6c8..a808a2dafc86 100644
--- a/metadata/md5-cache/dev-java/j2ssh-0.2.9
+++ b/metadata/md5-cache/dev-java/j2ssh-0.2.9
@@ -10,5 +10,5 @@ RDEPEND=dev-java/commons-logging:0 dev-java/ant-core:0 >=virtual/jre-1.5 >=dev-j
 SLOT=0
 SRC_URI=mirror://sourceforge/sshtools/j2ssh-0.2.9-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d3232d1fcbfe183cb0c003ef4cd0fb88
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=65769b0364e3ee7c0db17f26080b60a9
diff --git a/metadata/md5-cache/dev-java/jackcess-1.2.14.3 b/metadata/md5-cache/dev-java/jackcess-1.2.14.3
index 122059ce4b9c..b1eba5736dfb 100644
--- a/metadata/md5-cache/dev-java/jackcess-1.2.14.3
+++ b/metadata/md5-cache/dev-java/jackcess-1.2.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/commons-lang-2.6:2.1 >=dev-java/commons-log
 SLOT=1
 SRC_URI=mirror://sourceforge/jackcess/jackcess-1.2.14.3-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e91991dec0924afa89a3010fb5ede36d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=15f94ab3297a9a94b2beb721b2821afd
diff --git a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1 b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1
index ceb831e82d82..d990ab9b5448 100644
--- a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1
+++ b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/bndlib:0 dev-java/slf4j-api:0 dev-java/slf4j-
 SLOT=0
 SRC_URI=mirror://apache/jackrabbit/2.10.1/jackrabbit-2.10.1-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3f612e34328e776b58b75df135cbea6d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=aeb82541390a8eef4c1a487a95fc711c
diff --git a/metadata/md5-cache/dev-java/jackson-2.8.5 b/metadata/md5-cache/dev-java/jackson-2.8.5
index 35487ca508e6..cc89427bdc81 100644
--- a/metadata/md5-cache/dev-java/jackson-2.8.5
+++ b/metadata/md5-cache/dev-java/jackson-2.8.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-core/archive/jackson-core-2.8.5.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a0efd2f66b10f66131a3a091f2821877
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=fcb10c605afc2229e7cdabf220387c09
diff --git a/metadata/md5-cache/dev-java/jackson-annotations-2.8.5 b/metadata/md5-cache/dev-java/jackson-annotations-2.8.5
index 3dd1ecd8b0c0..58c34c3fc6a4 100644
--- a/metadata/md5-cache/dev-java/jackson-annotations-2.8.5
+++ b/metadata/md5-cache/dev-java/jackson-annotations-2.8.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-annotations/archive/jackson-annotations-2.8.5.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=826c9a160d31a553f695f342689cebe4
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3bad43db6fe7890cd24e88f196c330b8
diff --git a/metadata/md5-cache/dev-java/jackson-databind-2.8.5 b/metadata/md5-cache/dev-java/jackson-databind-2.8.5
index 531306e73fd2..ae9228ab651d 100644
--- a/metadata/md5-cache/dev-java/jackson-databind-2.8.5
+++ b/metadata/md5-cache/dev-java/jackson-databind-2.8.5
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-databind/archive/jackson-databind-2.8.5.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ca6f0fe31285c6bd4047a3987b93d15e
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=49d389aae3d13dad44cba6c42e95f8c4
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.8.5 b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.8.5
index f301b2c7bbcb..b6e858912cf7 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.8.5
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.8.5
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-dataformat-xml/archive/jackson-dataformat-xml-2.8.5.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fb1bba33cf8bbe05b248eb50b3d690df
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6569ac64c708abc242975c57c1939b33
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.8.5 b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.8.5
index e17245caedd6..53eca3c8d8da 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.8.5
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.8.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 ~dev-java/jackson-2.8.5:2 ~dev-java/jackson-databind-2
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-dataformat-yaml/archive/jackson-dataformat-yaml-2.8.5.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=593b21d55991bc7355972d7110f427c1
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7cbf733f75ef21480bfc5e740598d6f7
diff --git a/metadata/md5-cache/dev-java/jackson-module-jaxb-annotations-2.8.5 b/metadata/md5-cache/dev-java/jackson-module-jaxb-annotations-2.8.5
index f9019865e5e0..0fb63e16bb8b 100644
--- a/metadata/md5-cache/dev-java/jackson-module-jaxb-annotations-2.8.5
+++ b/metadata/md5-cache/dev-java/jackson-module-jaxb-annotations-2.8.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 ~dev-java/jackson-2.8.5:2 ~dev-java/jackson-annotation
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-module-jaxb-annotations/archive/jackson-module-jaxb-annotations-2.8.5.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ed6ad51dd9d851615dee2f38ab4623b1
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f96b3e725f24e09ddf2059e03eadca41
diff --git a/metadata/md5-cache/dev-java/jacl-1.4.1-r1 b/metadata/md5-cache/dev-java/jacl-1.4.1-r1
index b76e1a234f6b..389c816e2b45 100644
--- a/metadata/md5-cache/dev-java/jacl-1.4.1-r1
+++ b/metadata/md5-cache/dev-java/jacl-1.4.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/tcl-8.4.5:* >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/tcljava/jacl1.4.1.tar.gz -> jacl-1.4.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bc251373fc39b2c8b011eca79c551eff
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=95111e60c6decf30e31fca50d5761ad7
diff --git a/metadata/md5-cache/dev-java/jacoco-0.7.5 b/metadata/md5-cache/dev-java/jacoco-0.7.5
index f441ad671fd2..fc14124a53f7 100644
--- a/metadata/md5-cache/dev-java/jacoco-0.7.5
+++ b/metadata/md5-cache/dev-java/jacoco-0.7.5
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-core:0 dev-java/asm:4 >=virtual/jre-1.6 >=dev-java/java-con
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/jacoco/org.jacoco.report/0.7.5.201505241946/org.jacoco.report-0.7.5.201505241946-sources.jar -> jacoco-0.7.5-report.jar https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.7.5.201505241946/org.jacoco.agent-0.7.5.201505241946-sources.jar -> jacoco-0.7.5-agent.jar https://repo1.maven.org/maven2/org/jacoco/org.jacoco.core/0.7.5.201505241946/org.jacoco.core-0.7.5.201505241946-sources.jar -> jacoco-0.7.5-core.jar https://repo1.maven.org/maven2/org/jacoco/org.jacoco.ant/0.7.5.201505241946/org.jacoco.ant-0.7.5.201505241946-sources.jar -> jacoco-0.7.5-ant.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=cdab38de070a11cd4c44b582f2af871e
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a3c5900c7d069d8a2fffb02371e63609
diff --git a/metadata/md5-cache/dev-java/jacoco-0.7.9 b/metadata/md5-cache/dev-java/jacoco-0.7.9
index efe82a262b6a..98ef7b3919bc 100644
--- a/metadata/md5-cache/dev-java/jacoco-0.7.9
+++ b/metadata/md5-cache/dev-java/jacoco-0.7.9
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-core:0 dev-java/asm:4 >=virtual/jre-1.6 >=dev-java/java-con
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/jacoco/org.jacoco.report/0.7.9/org.jacoco.report-0.7.9-sources.jar -> jacoco-0.7.9-report.jar https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.7.9/org.jacoco.agent-0.7.9-sources.jar -> jacoco-0.7.9-agent.jar https://repo1.maven.org/maven2/org/jacoco/org.jacoco.core/0.7.9/org.jacoco.core-0.7.9-sources.jar -> jacoco-0.7.9-core.jar https://repo1.maven.org/maven2/org/jacoco/org.jacoco.ant/0.7.9/org.jacoco.ant-0.7.9-sources.jar -> jacoco-0.7.9-ant.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=72b14b8f36759ea985bc5555069ec3b1
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b113baab65d94c8c0b9f699072dd0345
diff --git a/metadata/md5-cache/dev-java/jad-bin-1.5.8e-r1 b/metadata/md5-cache/dev-java/jad-bin-1.5.8e-r1
index 79a5e09aab62..fbb2189ad14c 100644
--- a/metadata/md5-cache/dev-java/jad-bin-1.5.8e-r1
+++ b/metadata/md5-cache/dev-java/jad-bin-1.5.8e-r1
@@ -9,4 +9,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=http://www.kpdus.com/jad/linux/jadls158.zip
 _eclass_exported_funcs=src_install:-
-_md5_=d98bf9cb6c176939eace80b6a984cf52
+_md5_=8ef2339b9646c510e295fe3d05d8bbc9
diff --git a/metadata/md5-cache/dev-java/jade-3.3-r3 b/metadata/md5-cache/dev-java/jade-3.3-r3
index fe12272621e1..36b8e0c1420f 100644
--- a/metadata/md5-cache/dev-java/jade-3.3-r3
+++ b/metadata/md5-cache/dev-java/jade-3.3-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://gentoo/JADE-src-3.3.zip -> jade-3.3.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=91f22d80684dc0702899379b254c4dd0
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=facde30a70c588fbc4dab74518aa299e
diff --git a/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r3 b/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r3
index f3c23d35c850..9b9da395abc9 100644
--- a/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r3
+++ b/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=2.0
 SRC_URI=http://archive.apache.org/dist/jakarta/oro/jakarta-oro-2.0.8.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c43271c1f366674f389e0cb375b03a9e
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f20ec9bd4043d2176dc94434840bac4c
diff --git a/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r4 b/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r4
index b8353f6bce58..b1aa424d1ac2 100644
--- a/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r4
+++ b/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=2.0
 SRC_URI=http://archive.apache.org/dist/jakarta/oro/jakarta-oro-2.0.8.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=87ae10cb84266c57c53978fc2ec8bf00
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e0a2db0635146649751346e564720d70
diff --git a/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r5 b/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r5
index dd708973973f..5a7d5ef24380 100644
--- a/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r5
+++ b/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=1.3
 SRC_URI=mirror://apache/jakarta/regexp/source/jakarta-regexp-1.3.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6b08c115b51a78852bdcd2285f822370
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c803a019d158dd22ba378e6651c5afae
diff --git a/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r2 b/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r2
index 5240deeed61a..3e55122d98c9 100644
--- a/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r2
+++ b/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=1.4
 SRC_URI=mirror://apache/jakarta/regexp/source/jakarta-regexp-1.4.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6b08c115b51a78852bdcd2285f822370
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c803a019d158dd22ba378e6651c5afae
diff --git a/metadata/md5-cache/dev-java/jakarta-regexp-1.5 b/metadata/md5-cache/dev-java/jakarta-regexp-1.5
index f52452e22df4..6dd5b978b2ac 100644
--- a/metadata/md5-cache/dev-java/jakarta-regexp-1.5
+++ b/metadata/md5-cache/dev-java/jakarta-regexp-1.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=1.5
 SRC_URI=mirror://apache/jakarta/regexp/source/jakarta-regexp-1.5.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6b08c115b51a78852bdcd2285f822370
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c803a019d158dd22ba378e6651c5afae
diff --git a/metadata/md5-cache/dev-java/jal-20031117-r3 b/metadata/md5-cache/dev-java/jal-20031117-r3
index e38137ffa2f9..b9fa107b1b85 100644
--- a/metadata/md5-cache/dev-java/jal-20031117-r3
+++ b/metadata/md5-cache/dev-java/jal-20031117-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=0
 SRC_URI=http://vigna.dsi.unimi.it/jal/jal-20031117-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7ba33c6156e5f36cc28549df61334868
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ca944c5dccf346f1375404d1ce1805e8
diff --git a/metadata/md5-cache/dev-java/jal-20031117-r4 b/metadata/md5-cache/dev-java/jal-20031117-r4
index 873795336a63..cfba4e9814e1 100644
--- a/metadata/md5-cache/dev-java/jal-20031117-r4
+++ b/metadata/md5-cache/dev-java/jal-20031117-r4
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 so
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~monsieurp/packages/jal-20031117.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=32478670ca0bfd4e04b660f1861ab54b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5df22616c4ef5c750949e69eff2246f1
diff --git a/metadata/md5-cache/dev-java/jama-1.0.3-r1 b/metadata/md5-cache/dev-java/jama-1.0.3-r1
index 101b005adce4..e04fda2422db 100644
--- a/metadata/md5-cache/dev-java/jama-1.0.3-r1
+++ b/metadata/md5-cache/dev-java/jama-1.0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://math.nist.gov/javanumerics/jama/Jama-1.0.3.tar.gz -> jama-1.0.3.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3003adb178e59bc588f1641485a12e5d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ff217d16aa9f14cc2051f4d49e880205
diff --git a/metadata/md5-cache/dev-java/jamon-2.81 b/metadata/md5-cache/dev-java/jamon-2.81
index 7be720a5eabb..e37f65ca1b02 100644
--- a/metadata/md5-cache/dev-java/jamon-2.81
+++ b/metadata/md5-cache/dev-java/jamon-2.81
@@ -10,5 +10,5 @@ RDEPEND=dev-java/log4j:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-a
 SLOT=2
 SRC_URI=https://github.com/stevensouza/jamonapi/archive/v2_81.tar.gz -> jamonapi-2_81.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bc81281fec77360cca01e0669bca1f82
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0dc6fea4fe09b0fed823b3db68c08076
diff --git a/metadata/md5-cache/dev-java/jamvm-2.0.0-r1 b/metadata/md5-cache/dev-java/jamvm-2.0.0-r1
index e24d82a2a1c8..a5b76fa5f1e7 100644
--- a/metadata/md5-cache/dev-java/jamvm-2.0.0-r1
+++ b/metadata/md5-cache/dev-java/jamvm-2.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/gnu-classpath:0.98 || ( dev-java/eclipse-ecj:* dev-java/ecj-gcj
 SLOT=0
 SRC_URI=mirror://sourceforge/jamvm/jamvm-2.0.0.tar.gz
 _eclass_exported_funcs=pkg_prerm:java-vm-2 pkg_postrm:java-vm-2 pkg_postinst:java-vm-2 pkg_setup:java-vm-2 src_prepare:- src_configure:- src_install:-
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	708f85bc1bf00876604e223fb56e062a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	35067884fbff37bc0c8e7421c5315558	java-vm-2	4fd0e83bad4ea20bac7f73e2e59a0c60	libtool	84763589a795fb127b537cac01e5359f	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=ad4288f650dffd4382042a47600864c7
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	eutils	3c847a0129fed780bd709b98e426f89c	fdo-mime	21ef5adf81836863efa968f2a25cff64	flag-o-matic	979af9133d4de419fa98992355b07ca4	java-vm-2	477ca23a49dfcd57017ee7f3bed47564	libtool	48b1b9f6194d2842456514d1184ca72e	multilib	0236be304ee52e7f179ed2f337075515	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	df8265631f8bf5f5df387e9b987121f9	toolchain-funcs	53b75b4a49cf3e61530a523804045432
+_md5_=da533340fee43eee318c7b76810c59e6
diff --git a/metadata/md5-cache/dev-java/janino-2.7.0 b/metadata/md5-cache/dev-java/janino-2.7.0
index 9939c9f55e63..ad98c16cdc99 100644
--- a/metadata/md5-cache/dev-java/janino-2.7.0
+++ b/metadata/md5-cache/dev-java/janino-2.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/ant-core:0 dev-java/unkrig-nullanalysis:0 >=d
 SLOT=0
 SRC_URI=http://janino.net/download/janino-2.7.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=cab7a883ab5526e2b6d7ff05a89e5934
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d3481284a365744490f18ddf2d709a57
diff --git a/metadata/md5-cache/dev-java/jansi-1.11-r1 b/metadata/md5-cache/dev-java/jansi-1.11-r1
index c595b56c8d9c..7b8c39cca303 100644
--- a/metadata/md5-cache/dev-java/jansi-1.11-r1
+++ b/metadata/md5-cache/dev-java/jansi-1.11-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jansi-native:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r
 SLOT=1.11
 SRC_URI=https://github.com/fusesource/jansi/tarball/jansi-project-1.11 -> jansi-1.11.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:vcs-snapshot src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4133f37a00dce01fee08bc46a800dabb
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8de041fb0450c9be6aac935a2d8d2777
diff --git a/metadata/md5-cache/dev-java/jansi-1.5 b/metadata/md5-cache/dev-java/jansi-1.5
index 3b165cea3a1b..50082b36581f 100644
--- a/metadata/md5-cache/dev-java/jansi-1.5
+++ b/metadata/md5-cache/dev-java/jansi-1.5
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jansi-native:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r
 SLOT=0
 SRC_URI=https://github.com/fusesource/jansi/archive/jansi-1.5.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=700a23c9739604b29072e95b99f1c6b0
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=cad8a053c78ed1d189f03e2454d7f6a9
diff --git a/metadata/md5-cache/dev-java/jansi-1.5-r1 b/metadata/md5-cache/dev-java/jansi-1.5-r1
index c62a24d2109f..12fff6b8f03a 100644
--- a/metadata/md5-cache/dev-java/jansi-1.5-r1
+++ b/metadata/md5-cache/dev-java/jansi-1.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jansi-native:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r
 SLOT=0
 SRC_URI=https://github.com/fusesource/jansi/archive/jansi-1.5.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6be686c95fdb5ad2fe3ded294667aa36
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=876a9bc45746309ff9c4a1dbb071df48
diff --git a/metadata/md5-cache/dev-java/jansi-native-1.5 b/metadata/md5-cache/dev-java/jansi-native-1.5
index cec9a9137030..fbdc66f4573b 100644
--- a/metadata/md5-cache/dev-java/jansi-native-1.5
+++ b/metadata/md5-cache/dev-java/jansi-native-1.5
@@ -10,5 +10,5 @@ RDEPEND=dev-java/hawtjni-runtime:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.
 SLOT=0
 SRC_URI=https://github.com/fusesource/jansi-native/tarball/jansi-native-1.5 -> jansi-native-1.5.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:vcs-snapshot src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b218f7c638a1ab3a256cc15039f8fee3
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=99611f2ce59a46f14ad24442258e97e4
diff --git a/metadata/md5-cache/dev-java/japitools-0.9.7-r4 b/metadata/md5-cache/dev-java/japitools-0.9.7-r4
index 21b926d197d7..7fb4855dcc73 100644
--- a/metadata/md5-cache/dev-java/japitools-0.9.7-r4
+++ b/metadata/md5-cache/dev-java/japitools-0.9.7-r4
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.kaffe.org/~stuart/japi/japitools-0.9.7.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=08f26d9f502a4796dfa82c2f4ac7b395
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=afe0177420d765fbe9b51a633b0905fe
diff --git a/metadata/md5-cache/dev-java/jarbundler-1.8.1-r2 b/metadata/md5-cache/dev-java/jarbundler-1.8.1-r2
index 6cefeefae478..fc77fbf9f7ac 100644
--- a/metadata/md5-cache/dev-java/jarbundler-1.8.1-r2
+++ b/metadata/md5-cache/dev-java/jarbundler-1.8.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/xerces-2.8.1:2 >=virtual/jre-1.4 >=dev-java/ant-core-1.7:0 >=
 SLOT=0
 SRC_URI=mirror://sourceforge/jarbundler/jarbundler-1.8.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f1667939017fca2c247e9bd7e94e8280
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=604efa718fb813941e554cc7f432d387
diff --git a/metadata/md5-cache/dev-java/jarbundler-2.3.1 b/metadata/md5-cache/dev-java/jarbundler-2.3.1
index c795ea84b443..8602f9846f26 100644
--- a/metadata/md5-cache/dev-java/jarbundler-2.3.1
+++ b/metadata/md5-cache/dev-java/jarbundler-2.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/xerces-2.8.1:2 >=virtual/jre-1.6 >=dev-java/ant-core-1.7:0 >=
 SLOT=0
 SRC_URI=http://downloads.sourceforge.net/project/jarbundler/JarBundler/v2.3.1/jarbundler.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=92df49493bcbb0b3d9179484d7bdd5a1
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9e5f0098d42f148a36869dfc16bcbe73
diff --git a/metadata/md5-cache/dev-java/jargs-1.0 b/metadata/md5-cache/dev-java/jargs-1.0
index dfee3eb86b26..468439d550e7 100644
--- a/metadata/md5-cache/dev-java/jargs-1.0
+++ b/metadata/md5-cache/dev-java/jargs-1.0
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/jargs/jargs-1.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bf33f2ef2064cdc33b30ce7e13ce2610
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=51675f9ee4eba29a5f3d82f71cd21212
diff --git a/metadata/md5-cache/dev-java/jarjar-1.4 b/metadata/md5-cache/dev-java/jarjar-1.4
index e189210720d6..ad17f89a7027 100644
--- a/metadata/md5-cache/dev-java/jarjar-1.4
+++ b/metadata/md5-cache/dev-java/jarjar-1.4
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=1
 SRC_URI=https://jarjar.googlecode.com/files/jarjar-src-1.4.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d7ec2961448e24f229a32aabac49a3c9
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=895de2ea53d7c34e8461afee2f0236b8
diff --git a/metadata/md5-cache/dev-java/java-apicheck-0_p20150907 b/metadata/md5-cache/dev-java/java-apicheck-0_p20150907
index 794b288ca707..c7f6dbe652c5 100644
--- a/metadata/md5-cache/dev-java/java-apicheck-0_p20150907
+++ b/metadata/md5-cache/dev-java/java-apicheck-0_p20150907
@@ -8,4 +8,4 @@ RDEPEND=dev-java/japitools dev-java/java-config
 SLOT=0
 SRC_URI=https://github.com/gentoo/java-apicheck/archive/0_p20150907.tar.gz -> java-apicheck-0_p20150907.tar.gz
 _eclass_exported_funcs=src_install:-
-_md5_=6a4a46bb6588013ab28572c82f60c178
+_md5_=ec2abe84c6585f61f67841324d147a3c
diff --git a/metadata/md5-cache/dev-java/java-config-2.2.0-r3 b/metadata/md5-cache/dev-java/java-config-2.2.0-r3
index cf402ae48927..0b149148b9f7 100644
--- a/metadata/md5-cache/dev-java/java-config-2.2.0-r3
+++ b/metadata/md5-cache/dev-java/java-config-2.2.0-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=2
 SRC_URI=https://dev.gentoo.org/~sera/distfiles/java-config-2.2.0.tar.bz2
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
-_eclasses_=distutils-r1	ff7a6238714c20c6b0ba05d9956b5ad8	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	eb9be4b678c4e71f3f530a767df31912	python-r1	1f16d4a5e3af0ebb79bbe131576e0618	python-utils-r1	50dad5f912d4c16c130f5679777f25e8	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=14d0b23c627418cd9451a5dd7bef6455
+_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e0edbf5130eaefe107b8c8872bd818bc	python-utils-r1	316c531873247e48befb99900e5aa2ed	toolchain-funcs	53b75b4a49cf3e61530a523804045432	xdg-utils	178a84136f416b8ea1a857717eacd21c
+_md5_=6f10d501b60542ae8444b4418ad2396d
diff --git a/metadata/md5-cache/dev-java/java-dep-check-0.3-r1 b/metadata/md5-cache/dev-java/java-dep-check-0.3-r1
index 8f76219962f9..12b029b43e6f 100644
--- a/metadata/md5-cache/dev-java/java-dep-check-0.3-r1
+++ b/metadata/md5-cache/dev-java/java-dep-check-0.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/commons-cli:1 dev-java/asm:3 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=cc124014d15e5b0ebf2a05c0ea9c30b5
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=28add8ad94aa7dd5bbec987318af7fae
diff --git a/metadata/md5-cache/dev-java/java-dep-check-0.4 b/metadata/md5-cache/dev-java/java-dep-check-0.4
index 43cbdb7dbef8..8fb89aaaf56a 100644
--- a/metadata/md5-cache/dev-java/java-dep-check-0.4
+++ b/metadata/md5-cache/dev-java/java-dep-check-0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8 dev-java/commons-cli:1 dev-java/asm:4 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8e61a7103e1a638b352ad599077b38ff
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4ed42693cd6c88a80edefb95bb405a23
diff --git a/metadata/md5-cache/dev-java/java-getopt-1.0.14 b/metadata/md5-cache/dev-java/java-getopt-1.0.14
index ec781d3168b1..be542662568d 100644
--- a/metadata/md5-cache/dev-java/java-getopt-1.0.14
+++ b/metadata/md5-cache/dev-java/java-getopt-1.0.14
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=1
 SRC_URI=http://www.urbanophile.com/arenn/hacking/getopt/java-getopt-1.0.14.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=47a1b5386bc0021bdb42e97210899dbb
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e8f96c2918a8db582473e0d38e6301f8
diff --git a/metadata/md5-cache/dev-java/java-gnome-4.0.19 b/metadata/md5-cache/dev-java/java-gnome-4.0.19
index 3e2cb732fc54..1b9ab7748cc5 100644
--- a/metadata/md5-cache/dev-java/java-gnome-4.0.19
+++ b/metadata/md5-cache/dev-java/java-gnome-4.0.19
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=4.0
 SRC_URI=mirror://gnome/sources/java-gnome/4.0/java-gnome-4.0.19.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1e86635627d9441fbd67f3c164a4d647
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=12f885b75f27d7a6cff7251499876837
diff --git a/metadata/md5-cache/dev-java/java-gnome-4.0.20 b/metadata/md5-cache/dev-java/java-gnome-4.0.20
index eb4b7c274bb2..6026969eb2cb 100644
--- a/metadata/md5-cache/dev-java/java-gnome-4.0.20
+++ b/metadata/md5-cache/dev-java/java-gnome-4.0.20
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=4.0
 SRC_URI=mirror://gnome/sources/java-gnome/4.0/java-gnome-4.0.20.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:- src_prepare:java-pkg-2 src_configure:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	1f16d4a5e3af0ebb79bbe131576e0618	python-utils-r1	50dad5f912d4c16c130f5679777f25e8	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fd87415d858de86dd31adca3a15a6d17
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	python-r1	e0edbf5130eaefe107b8c8872bd818bc	python-utils-r1	316c531873247e48befb99900e5aa2ed	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=18c15e981d4cbe52cf228f7c5e753a44
diff --git a/metadata/md5-cache/dev-java/java-gnome-4.1.3 b/metadata/md5-cache/dev-java/java-gnome-4.1.3
index d25c60b1c884..2eae4edb8823 100644
--- a/metadata/md5-cache/dev-java/java-gnome-4.1.3
+++ b/metadata/md5-cache/dev-java/java-gnome-4.1.3
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=4.1
 SRC_URI=mirror://gnome/sources/java-gnome/4.1/java-gnome-4.1.3.tar.xz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:- src_prepare:java-pkg-2 src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	1f16d4a5e3af0ebb79bbe131576e0618	python-utils-r1	50dad5f912d4c16c130f5679777f25e8	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=8d8c090d18a682f848bc827380d40928
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	python-r1	e0edbf5130eaefe107b8c8872bd818bc	python-utils-r1	316c531873247e48befb99900e5aa2ed	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_md5_=2a0d12b1097ddedbe267fde48d28e5ad
diff --git a/metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.80 b/metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.80
index 0cff5c0f30a8..944cd30339e1 100644
--- a/metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.80
+++ b/metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.80
@@ -9,5 +9,5 @@ RESTRICT=fetch
 SLOT=1.7
 SRC_URI=jdk-7u80-docs-all.zip
 _eclass_exported_funcs=src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7f1a2245c16e0ab2fda84113b6988a0d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=478bc04e522bc7c083246348a42b12c3
diff --git a/metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.121 b/metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.121
index b028a4d37357..7738dd438c00 100644
--- a/metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.121
+++ b/metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.121
@@ -9,5 +9,5 @@ RESTRICT=fetch
 SLOT=1.8
 SRC_URI=jdk-8u121-docs-all.zip
 _eclass_exported_funcs=src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=aa1d6373d4a42712005088405a1ac08e
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b49b533e7efc49895d9c18acbdc75e63
diff --git a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r1 b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r1
index 7b5186b86c6c..cd8ab4544f62 100644
--- a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r1
+++ b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://wrapper.tanukisoftware.org/download/3.5.25/wrapper_3.5.25_src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9c5e277a2e10af07669e04748ebe8ab1
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=de5d68acf18bde177cdac36fd88b917c
diff --git a/metadata/md5-cache/dev-java/javacc-5.0-r2 b/metadata/md5-cache/dev-java/javacc-5.0-r2
index a8503c2efea8..1e931c9234dd 100644
--- a/metadata/md5-cache/dev-java/javacc-5.0-r2
+++ b/metadata/md5-cache/dev-java/javacc-5.0-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 sourc
 SLOT=0
 SRC_URI=http://java.net/projects/javacc/downloads/download/javacc-5.0src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2c237f28a4bd0ef49901f7494d683217
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f96b9e433aa965e13856e3aebb648a0d
diff --git a/metadata/md5-cache/dev-java/javacsv-2.1 b/metadata/md5-cache/dev-java/javacsv-2.1
index 41acf5e4d451..d2104155aba6 100644
--- a/metadata/md5-cache/dev-java/javacsv-2.1
+++ b/metadata/md5-cache/dev-java/javacsv-2.1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/javacsv/javacsv2.1.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=111cea26d4fe28418286282f0447137c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=612ee0db58c8431823a273966418daa8
diff --git a/metadata/md5-cache/dev-java/javacup-0.11b_p20151001 b/metadata/md5-cache/dev-java/javacup-0.11b_p20151001
index cbece890c1ff..8a9642a49e58 100644
--- a/metadata/md5-cache/dev-java/javacup-0.11b_p20151001
+++ b/metadata/md5-cache/dev-java/javacup-0.11b_p20151001
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-11b-20151001.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9149ac6bab88707180f1de4595ee0109
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d822b08cb6175048d8f185fb6ca73631
diff --git a/metadata/md5-cache/dev-java/javahelp-2.0.05_p63 b/metadata/md5-cache/dev-java/javahelp-2.0.05_p63
index a46f1b4b2276..d356c42577c0 100644
--- a/metadata/md5-cache/dev-java/javahelp-2.0.05_p63
+++ b/metadata/md5-cache/dev-java/javahelp-2.0.05_p63
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2
 SLOT=0
 SRC_URI=https://javahelp.dev.java.net/files/documents/5985/145533/javahelp2-src-2.0.05_svn63.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a67814960fe824b7ce0d4c8e4dc1145c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1731d9cfd555ef4919963622aaee80a5
diff --git a/metadata/md5-cache/dev-java/javassist-2.6-r2 b/metadata/md5-cache/dev-java/javassist-2.6-r2
index 3467f6a7071d..cb3b83399802 100644
--- a/metadata/md5-cache/dev-java/javassist-2.6-r2
+++ b/metadata/md5-cache/dev-java/javassist-2.6-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=2
 SRC_URI=mirror://sourceforge/jboss/javassist-2.6.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d3d9181ed3f0871006c749591d83ab02
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4c2caa6cfd54a279ed75cafa487c5ac4
diff --git a/metadata/md5-cache/dev-java/javassist-3.18.2 b/metadata/md5-cache/dev-java/javassist-3.18.2
index 38b84617cf97..687f9d892eaf 100644
--- a/metadata/md5-cache/dev-java/javassist-3.18.2
+++ b/metadata/md5-cache/dev-java/javassist-3.18.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=3
 SRC_URI=https://github.com/jboss-javassist/javassist/archive/rel_3_18_2_ga_build.tar.gz -> javassist-3.18.2.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e0a769e4a9226f88bb3302e4c14461b7
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c4ec1865d6de5f492aa68a8aafc9e42f
diff --git a/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9 b/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9
index 9ed5403a916c..c90e56f9e85a 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/javatoolkit-0.3.0.tar.bz2
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
-_eclasses_=distutils-r1	ff7a6238714c20c6b0ba05d9956b5ad8	eutils	708f85bc1bf00876604e223fb56e062a	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	eb9be4b678c4e71f3f530a767df31912	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-r1	1f16d4a5e3af0ebb79bbe131576e0618	python-utils-r1	50dad5f912d4c16c130f5679777f25e8	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=fe3738e72a35f474fafabfea7c3f0bb0
+_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	eutils	3c847a0129fed780bd709b98e426f89c	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	prefix	df8265631f8bf5f5df387e9b987121f9	python-r1	e0edbf5130eaefe107b8c8872bd818bc	python-utils-r1	316c531873247e48befb99900e5aa2ed	toolchain-funcs	53b75b4a49cf3e61530a523804045432	xdg-utils	178a84136f416b8ea1a857717eacd21c
+_md5_=3eba84009d591d6836390c2e84b3d144
diff --git a/metadata/md5-cache/dev-java/javax-inject-1-r2 b/metadata/md5-cache/dev-java/javax-inject-1-r2
index 2d1fa987e7a6..807f1c850c6b 100644
--- a/metadata/md5-cache/dev-java/javax-inject-1-r2
+++ b/metadata/md5-cache/dev-java/javax-inject-1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://central.maven.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6ab8a7315e5d41f0c4c8e5cd6f728839
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=87a123a0652152ec469cccf81591362a
diff --git a/metadata/md5-cache/dev-java/javax-mail-1.4 b/metadata/md5-cache/dev-java/javax-mail-1.4
index 8e4e4702e1ba..b6c81fad4292 100644
--- a/metadata/md5-cache/dev-java/javax-mail-1.4
+++ b/metadata/md5-cache/dev-java/javax-mail-1.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/javax/mail/mail/1.4/mail-1.4-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=82504d60c72ebf7d01c99411a60dc8ee
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8c354652c8c04a6e83eb1c21d54a2d22
diff --git a/metadata/md5-cache/dev-java/javolution-4.0.2-r1 b/metadata/md5-cache/dev-java/javolution-4.0.2-r1
index c082c020741e..945d25eeaa5b 100644
--- a/metadata/md5-cache/dev-java/javolution-4.0.2-r1
+++ b/metadata/md5-cache/dev-java/javolution-4.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=4
 SRC_URI=http://javolution.org/javolution-4.0.2-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bb64563db442931acb475841651e8cac
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4405b9dc1094e9afc3ffc96c3eec51d8
diff --git a/metadata/md5-cache/dev-java/javolution-6.0.0 b/metadata/md5-cache/dev-java/javolution-6.0.0
index be4d1e671da2..01c8c543e750 100644
--- a/metadata/md5-cache/dev-java/javolution-6.0.0
+++ b/metadata/md5-cache/dev-java/javolution-6.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/osgi-core-api:0 dev-java/osgi-compendium:0 >=
 SLOT=6
 SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/javolution-6.0.0.tar.xz https://dev.gentoo.org/~tomwij/files/dist/javolution-6.0.0-build.xml.tar.xz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=aabe8178c8b179f51bab86b9c8a31770
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	unpacker	76ddf385f3c212c12857bb8ec2a8bd35	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=968a2a8c9811c7e2096307d8bd05290c
diff --git a/metadata/md5-cache/dev-java/jaxen-1.1.4-r1 b/metadata/md5-cache/dev-java/jaxen-1.1.4-r1
index 058b1773e779..90152009246a 100644
--- a/metadata/md5-cache/dev-java/jaxen-1.1.4-r1
+++ b/metadata/md5-cache/dev-java/jaxen-1.1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xom:0 dev-java/jdom:0 dev-java/dom4j:1 >=virtual/jre-1.4 >=dev-
 SLOT=1.1
 SRC_URI=http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.4-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=74897d2467aeb7bac1972c283b5d6d2f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=69a82d4ba51477a5cff6c4626b530b52
diff --git a/metadata/md5-cache/dev-java/jaxen-1.1.6 b/metadata/md5-cache/dev-java/jaxen-1.1.6
index f9cdf4bd8915..d7201f343150 100644
--- a/metadata/md5-cache/dev-java/jaxen-1.1.6
+++ b/metadata/md5-cache/dev-java/jaxen-1.1.6
@@ -10,5 +10,5 @@ RDEPEND=dev-java/dom4j:1 dev-java/jdom:0 dev-java/xom:0 >=virtual/jre-1.6 >=dev-
 SLOT=1.1
 SRC_URI=https://repo1.maven.org/maven2/jaxen/jaxen/1.1.6/jaxen-1.1.6-sources.jar -> jaxen-1.1.6.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=314b3dbab236f176405d41871c6b222f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3c578ea7dd0f84f24ae5ee247b2e2260
diff --git a/metadata/md5-cache/dev-java/jaxme-0.5.2-r2 b/metadata/md5-cache/dev-java/jaxme-0.5.2-r2
index 9adabcfe9c26..69177b5ba5eb 100644
--- a/metadata/md5-cache/dev-java/jaxme-0.5.2-r2
+++ b/metadata/md5-cache/dev-java/jaxme-0.5.2-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/xerces:2 >=dev-java/antlr-2.7.7-r7:0 >=dev-ja
 SLOT=0
 SRC_URI=mirror://apache/ws/jaxme/source/ws-jaxme-0.5.2-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ee774eb8caea1522087cc727934e2d34
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=fc37fb08dcc177524d4827b9025520aa
diff --git a/metadata/md5-cache/dev-java/jazzy-0.5.2-r1 b/metadata/md5-cache/dev-java/jazzy-0.5.2-r1
index cdfe56a882e0..06738e488f28 100644
--- a/metadata/md5-cache/dev-java/jazzy-0.5.2-r1
+++ b/metadata/md5-cache/dev-java/jazzy-0.5.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/jazzy/jazzy-0.5.2.src.zip -> jazzy-0.5.2.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e3e15495f293c56f79410d6356750552
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=efc31ab48dcfa7a9bb6b44d3b90e6ca5
diff --git a/metadata/md5-cache/dev-java/jbitcollider-core-0.8 b/metadata/md5-cache/dev-java/jbitcollider-core-0.8
index 4255069dfe43..3e2602e80781 100644
--- a/metadata/md5-cache/dev-java/jbitcollider-core-0.8
+++ b/metadata/md5-cache/dev-java/jbitcollider-core-0.8
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/bitcollider/jBitcollider-0.8.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0f4a3ffd89a92784bcc9f6c6635cd10a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6e561116ca9fa076ab4eabc2578cbe0d
diff --git a/metadata/md5-cache/dev-java/jboss-logging-3.1.4 b/metadata/md5-cache/dev-java/jboss-logging-3.1.4
index c8de82115ebf..d0d9cd5b2141 100644
--- a/metadata/md5-cache/dev-java/jboss-logging-3.1.4
+++ b/metadata/md5-cache/dev-java/jboss-logging-3.1.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/jboss-logmanager:0 >=dev-java/slf4j-api-1.7.7
 SLOT=0
 SRC_URI=https://github.com/jboss-logging/jboss-logging/archive/3.1.4.GA.tar.gz -> jboss-logging-3.1.4.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a044d8906d252cf7b40c99ea17f9ac4c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a548ecc9765dfdc7b16f751cf815f35a
diff --git a/metadata/md5-cache/dev-java/jboss-logmanager-1.5.1 b/metadata/md5-cache/dev-java/jboss-logmanager-1.5.1
index 51ef4cd9d3e1..09ebeeb3d187 100644
--- a/metadata/md5-cache/dev-java/jboss-logmanager-1.5.1
+++ b/metadata/md5-cache/dev-java/jboss-logmanager-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/jboss-modules:0 >=dev-java/java-config-2.2.0-
 SLOT=0
 SRC_URI=https://github.com/jboss-logging/jboss-logmanager/archive/1.5.1.Final.tar.gz -> jboss-logmanager-1.5.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=edb3034f46b5d411dca2bca4078adbe2
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=054fcb20584315fb7d20741059963104
diff --git a/metadata/md5-cache/dev-java/jboss-marshalling-1.3.0 b/metadata/md5-cache/dev-java/jboss-marshalling-1.3.0
index f41106e397f4..f709fe963ddd 100644
--- a/metadata/md5-cache/dev-java/jboss-marshalling-1.3.0
+++ b/metadata/md5-cache/dev-java/jboss-marshalling-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/jboss-modules:0 >=dev-java/java-config-2.2.0-
 SLOT=0
 SRC_URI=http://download.jboss.org/jbossmarshalling/jboss-marshalling-1.3.0.CR9-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=41a15d1d8196904c379ca8ce73559df1
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a16bfd02665e915c70d8a9ee6ca856e9
diff --git a/metadata/md5-cache/dev-java/jboss-marshalling-1.3.0-r1 b/metadata/md5-cache/dev-java/jboss-marshalling-1.3.0-r1
index 9c585b316329..e36d81367ba4 100644
--- a/metadata/md5-cache/dev-java/jboss-marshalling-1.3.0-r1
+++ b/metadata/md5-cache/dev-java/jboss-marshalling-1.3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jboss-modules:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-
 SLOT=0
 SRC_URI=http://download.jboss.org/jbossmarshalling/jboss-marshalling-1.3.0.CR9-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=65e6defa3e99914f8ca72b86d550a638
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=552907a2fc946b347aec546a333b60ce
diff --git a/metadata/md5-cache/dev-java/jboss-marshalling-river-1.3.0 b/metadata/md5-cache/dev-java/jboss-marshalling-river-1.3.0
index e9e9d2d3d0c8..e5b0c4c84c6d 100644
--- a/metadata/md5-cache/dev-java/jboss-marshalling-river-1.3.0
+++ b/metadata/md5-cache/dev-java/jboss-marshalling-river-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=~dev-java/jboss-marshalling-1.3.0:0 >=virtual/jre-1.7 >=dev-java/java-co
 SLOT=0
 SRC_URI=http://download.jboss.org/jbossmarshalling/jboss-marshalling-river-1.3.0.CR9-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=62408e986de15cbbd9981e47a197d3b8
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3f89ba5674e996a26801bed48dba38eb
diff --git a/metadata/md5-cache/dev-java/jboss-marshalling-serial-1.3.0 b/metadata/md5-cache/dev-java/jboss-marshalling-serial-1.3.0
index 0ef9c5d28698..ace4a97c613e 100644
--- a/metadata/md5-cache/dev-java/jboss-marshalling-serial-1.3.0
+++ b/metadata/md5-cache/dev-java/jboss-marshalling-serial-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=~dev-java/jboss-marshalling-1.3.0:0 >=virtual/jre-1.7 >=dev-java/java-co
 SLOT=0
 SRC_URI=http://download.jboss.org/jbossmarshalling/jboss-marshalling-serial-1.3.0.CR9-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=99a74cef226c312ae1be95825c3e1ddf
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=858d43f3a3a786bee2ef8c6296c9f6d9
diff --git a/metadata/md5-cache/dev-java/jboss-modules-1.3.0 b/metadata/md5-cache/dev-java/jboss-modules-1.3.0
index 804d0e8091e8..82e611e03fe7 100644
--- a/metadata/md5-cache/dev-java/jboss-modules-1.3.0
+++ b/metadata/md5-cache/dev-java/jboss-modules-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/jboss-modules/jboss-modules/archive/1.3.0.Final.tar.gz -> jboss-modules-1.3.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7cc83cf99911c4be1d0aec92e07e5f3b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b3e4f8d2f5662a7ce10996c3b5c763c5
diff --git a/metadata/md5-cache/dev-java/jboss-modules-1.3.3 b/metadata/md5-cache/dev-java/jboss-modules-1.3.3
index 65b379d26aa7..129531e74113 100644
--- a/metadata/md5-cache/dev-java/jboss-modules-1.3.3
+++ b/metadata/md5-cache/dev-java/jboss-modules-1.3.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/jboss-modules/jboss-modules/archive/1.3.3.Final.tar.gz -> jboss-modules-1.3.3.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=74738c1d303cccbc051169b9b7fc522d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ec08d0a7f5ea7b6b1428cb818201550a
diff --git a/metadata/md5-cache/dev-java/jcalendar-1.4 b/metadata/md5-cache/dev-java/jcalendar-1.4
index 6b4a5a74de85..324fa5b00b6e 100644
--- a/metadata/md5-cache/dev-java/jcalendar-1.4
+++ b/metadata/md5-cache/dev-java/jcalendar-1.4
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=1.2
 SRC_URI=http://www.toedter.com/download/jcalendar-1.4.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=cdfbc310ac4895a3bd71a75204f2068d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3794a92463f8704139567c381e170be9
diff --git a/metadata/md5-cache/dev-java/jchardet-1.1-r1 b/metadata/md5-cache/dev-java/jchardet-1.1-r1
index c7a057e1ec63..631a3ed4f8af 100644
--- a/metadata/md5-cache/dev-java/jchardet-1.1-r1
+++ b/metadata/md5-cache/dev-java/jchardet-1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/jchardet/jchardet/jchardet-1.1.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0eafbfdc7992f891acd52b703228e905
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a7f32751743bcde69edf9bff122d4465
diff --git a/metadata/md5-cache/dev-java/jchart2d-3.2.2 b/metadata/md5-cache/dev-java/jchart2d-3.2.2
index 0a0224eac809..036d96bc7ee5 100644
--- a/metadata/md5-cache/dev-java/jchart2d-3.2.2
+++ b/metadata/md5-cache/dev-java/jchart2d-3.2.2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/jchart2d/jchart2d/sources/jchart2d-eclipse-project-3.2.2.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7b9a279be34e57f2670a1df8edb0aef4
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=893245b4f3d4480fd82b0dc3d00f1ab4
diff --git a/metadata/md5-cache/dev-java/jcifs-1.3.17-r1 b/metadata/md5-cache/dev-java/jcifs-1.3.17-r1
index 76c37bbc4a87..6464df849a4e 100644
--- a/metadata/md5-cache/dev-java/jcifs-1.3.17-r1
+++ b/metadata/md5-cache/dev-java/jcifs-1.3.17-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2
 SLOT=1.1
 SRC_URI=http://jcifs.samba.org/src/jcifs-1.3.17.tgz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7bd60229f94ac09be6d4e2beb553c0cb
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=772661336b6cf8cd534365df2fc0af08
diff --git a/metadata/md5-cache/dev-java/jcip-annotations-1.0.1 b/metadata/md5-cache/dev-java/jcip-annotations-1.0.1
index eee81494bb0a..cdb3be95b820 100644
--- a/metadata/md5-cache/dev-java/jcip-annotations-1.0.1
+++ b/metadata/md5-cache/dev-java/jcip-annotations-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/stephenc/jcip-annotations/archive/jcip-annotations-1.0-1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c73dd9cb6bfb232fe5c14eafc978bd03
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=405cbba190600574bf7ce5b27660c741
diff --git a/metadata/md5-cache/dev-java/jclasslib-3.0-r1 b/metadata/md5-cache/dev-java/jclasslib-3.0-r1
index d1c8527b460a..b6a14ad7b03b 100644
--- a/metadata/md5-cache/dev-java/jclasslib-3.0-r1
+++ b/metadata/md5-cache/dev-java/jclasslib-3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/jclasslib/jclasslib_unix_3_0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d02e9041b127873d27b72545268540b2
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=bf34c84010b042b4fbaaa158c48c7661
diff --git a/metadata/md5-cache/dev-java/jcmdline-1.0.2-r2 b/metadata/md5-cache/dev-java/jcmdline-1.0.2-r2
index 5ce8b6813bb3..351bbe457681 100644
--- a/metadata/md5-cache/dev-java/jcmdline-1.0.2-r2
+++ b/metadata/md5-cache/dev-java/jcmdline-1.0.2-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=1.0
 SRC_URI=mirror://sourceforge/jcmdline/jcmdline-1.0.2.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6ace69e084a4809a7759b605fd57d834
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=42ec54722bba09657be42910b5eb9dc2
diff --git a/metadata/md5-cache/dev-java/jcmdline-2.0.0 b/metadata/md5-cache/dev-java/jcmdline-2.0.0
index 43d9da48286d..a24bc842b5e8 100644
--- a/metadata/md5-cache/dev-java/jcmdline-2.0.0
+++ b/metadata/md5-cache/dev-java/jcmdline-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/jcmdline/jcmdline-2.0.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d5b247fad5125be20e982d2a6dc3e7ca
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ce07028ea8fb54c97d457a423b0f3a25
diff --git a/metadata/md5-cache/dev-java/jcodings-1.0.11 b/metadata/md5-cache/dev-java/jcodings-1.0.11
index da3435b7a048..88ba54c69e17 100644
--- a/metadata/md5-cache/dev-java/jcodings-1.0.11
+++ b/metadata/md5-cache/dev-java/jcodings-1.0.11
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=1
 SRC_URI=https://github.com/jruby/jcodings/archive/jcodings-1.0.11.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4e17cbe64f444d481366f79c820cb84a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=42d094096348eae62152e3a76c48bb2b
diff --git a/metadata/md5-cache/dev-java/jcodings-1.0.4 b/metadata/md5-cache/dev-java/jcodings-1.0.4
index 425d0443604e..62d838bf2902 100644
--- a/metadata/md5-cache/dev-java/jcodings-1.0.4
+++ b/metadata/md5-cache/dev-java/jcodings-1.0.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://gentoo/jcodings-1.0.4-git.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:base src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=865792815b973b533cb7af6becd00f50
+_eclasses_=base	df2aa567b3f0595aae0d0923889f7631	eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6c4276322c41c7e22d45ce1c3c57b5ed
diff --git a/metadata/md5-cache/dev-java/jcodings-1.0.5 b/metadata/md5-cache/dev-java/jcodings-1.0.5
index c4a034d28b36..028e9f2256fb 100644
--- a/metadata/md5-cache/dev-java/jcodings-1.0.5
+++ b/metadata/md5-cache/dev-java/jcodings-1.0.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/jruby/jcodings/tarball/1.0.5 -> jcodings-1.0.5-git.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b7ad123cddcc75319f445e97f67b5c23
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=12b9d4e9def83163aa5e7d3d444c9e8f
diff --git a/metadata/md5-cache/dev-java/jcommander-1.48 b/metadata/md5-cache/dev-java/jcommander-1.48
index 19bbb8e3c498..0247364ea68e 100644
--- a/metadata/md5-cache/dev-java/jcommander-1.48
+++ b/metadata/md5-cache/dev-java/jcommander-1.48
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cbeust/jcommander/archive/jcommander-1.48.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1d26df66391499bc25b21df62d93abe9
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1d42990a88c54b9a16ce747edbd9d151
diff --git a/metadata/md5-cache/dev-java/jcommon-1.0.23 b/metadata/md5-cache/dev-java/jcommon-1.0.23
index 70b1b722467f..1bf1792ff7ba 100644
--- a/metadata/md5-cache/dev-java/jcommon-1.0.23
+++ b/metadata/md5-cache/dev-java/jcommon-1.0.23
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=1.0
 SRC_URI=mirror://sourceforge/jfreechart/jcommon-1.0.23.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9bc420285e4970c254a1d835a7a93e9d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2a836781671d8eef5dfa18558c432eff
diff --git a/metadata/md5-cache/dev-java/jcs-2.0 b/metadata/md5-cache/dev-java/jcs-2.0
index c2fb764c0726..f12f60fa4eea 100644
--- a/metadata/md5-cache/dev-java/jcs-2.0
+++ b/metadata/md5-cache/dev-java/jcs-2.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/jisp:2.5 dev-db/hsqldb:0 dev-java/log4j:0 dev
 SLOT=2.0
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/commons/jcs/source/commons-jcs-dist-2.0-beta-1-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c1ff06e4baddee5bb121c4a18c3a87ba
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5bdceb8168c310729532b158ba20df56
diff --git a/metadata/md5-cache/dev-java/jdbc-informix-3.00.3 b/metadata/md5-cache/dev-java/jdbc-informix-3.00.3
index 3ecbf297c890..92395757c504 100644
--- a/metadata/md5-cache/dev-java/jdbc-informix-3.00.3
+++ b/metadata/md5-cache/dev-java/jdbc-informix-3.00.3
@@ -11,5 +11,5 @@ RESTRICT=fetch
 SLOT=0
 SRC_URI=JDBC.3.00.JC3.tar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ef1009d065a006d205f676b003d502d2
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6c9150346b6266df7e820516a37f67fe
diff --git a/metadata/md5-cache/dev-java/jdbc-jaybird-2.2.9 b/metadata/md5-cache/dev-java/jdbc-jaybird-2.2.9
index e10cacc92e70..fcc6aff4df60 100644
--- a/metadata/md5-cache/dev-java/jdbc-jaybird-2.2.9
+++ b/metadata/md5-cache/dev-java/jdbc-jaybird-2.2.9
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:4 dev-java/antlr:3.5 dev-java/log4j:0 dev-java/glassfish-
 SLOT=0
 SRC_URI=https://github.com/FirebirdSQL/jaybird/archive/v2.2.9.zip -> Jaybird-2.2.9-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3ea17a236201357de72cfc439bd28feb
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c74964d40dd15fea82a48fbf35cdbd20
diff --git a/metadata/md5-cache/dev-java/jdbc-mssqlserver-4.0.2206.100 b/metadata/md5-cache/dev-java/jdbc-mssqlserver-4.0.2206.100
index faf22e0313f2..b8d5addd8fa5 100644
--- a/metadata/md5-cache/dev-java/jdbc-mssqlserver-4.0.2206.100
+++ b/metadata/md5-cache/dev-java/jdbc-mssqlserver-4.0.2206.100
@@ -11,5 +11,5 @@ RESTRICT=mirror
 SLOT=4.0
 SRC_URI=http://download.microsoft.com/download/0/2/A/02AAE597-3865-456C-AE7F-613F99F850A8/sqljdbc_4.0.2206.100_enu.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=59d8b94bf609813de27ff69d6bbe8e1a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=43db3fc54703ec1a29a4c49014646049
diff --git a/metadata/md5-cache/dev-java/jdbc-mysql-5.1.26 b/metadata/md5-cache/dev-java/jdbc-mysql-5.1.26
index f9811984797c..a8c83ca42248 100644
--- a/metadata/md5-cache/dev-java/jdbc-mysql-5.1.26
+++ b/metadata/md5-cache/dev-java/jdbc-mysql-5.1.26
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://mysql/Downloads/Connector-J/mysql-connector-java-5.1.26.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=506f388b403ed820fcc1ef7c3b470747
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=12fe92b91887b3596dcf498c2422ed33
diff --git a/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.1.0.5 b/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.1.0.5
index 0c95675e0136..55134836ed78 100644
--- a/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.1.0.5
+++ b/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.1.0.5
@@ -11,5 +11,5 @@ RESTRICT=fetch
 SLOT=10.1
 SRC_URI=!dms? ( !debug? ( jdbc-oracle-bin-10.1.0.5-ojdbc14.jar ) debug? ( jdbc-oracle-bin-10.1.0.5-ojdbc14_g.jar ) ) dms? ( !debug? ( jdbc-oracle-bin-10.1.0.5-ojdbc14dms.jar ) debug? ( jdbc-oracle-bin-10.1.0.5-ojdbc14dms_g.jar ) ) jdbc-oracle-bin-10.1.0.5-ocrs12.jar doc? ( jdbc-oracle-bin-10.1.0.5-javadoc.zip ) examples? ( jdbc-oracle-bin-10.1.0.5-demo.tar ) nls? ( jdbc-oracle-bin-10.1.0.5-orai18n.jar )
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d2ba19b2dc5087a23176e97ef633c6d1
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2b4fd17c1feadaed7733cb308c57b25e
diff --git a/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.2.0.3 b/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.2.0.3
index ed791a47e251..84efc57d48e2 100644
--- a/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.2.0.3
+++ b/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.2.0.3
@@ -11,5 +11,5 @@ RESTRICT=fetch
 SLOT=10.2
 SRC_URI=!dms? ( !debug? ( jdbc-oracle-bin-10.2.0.3-ojdbc14.jar ) debug? ( jdbc-oracle-bin-10.2.0.3-ojdbc14_g.jar ) ) dms? ( !debug? ( jdbc-oracle-bin-10.2.0.3-ojdbc14dms.jar ) debug? ( jdbc-oracle-bin-10.2.0.3-ojdbc14dms_g.jar ) ) doc? ( jdbc-oracle-bin-10.2.0.1-javadoc.zip ) examples? ( jdbc-oracle-bin-10.2.0.3-demo.tar ) nls? ( jdbc-oracle-bin-10.2.0.3-orai18n.jar ) ons? ( jdbc-oracle-bin-10.2.0.3-ons.jar )
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9f3014cc6c4660a00f722bdbbef10ebd
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=93980569593721c3eefebdfa155064fd
diff --git a/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.2.0.4 b/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.2.0.4
index f72534bdad1a..e06c7bc837ca 100644
--- a/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.2.0.4
+++ b/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.2.0.4
@@ -11,5 +11,5 @@ RESTRICT=fetch
 SLOT=10.2
 SRC_URI=!dms? ( !debug? ( jdbc-oracle-bin-10.2.0.4-ojdbc14.jar ) debug? ( jdbc-oracle-bin-10.2.0.4-ojdbc14_g.jar ) ) dms? ( !debug? ( jdbc-oracle-bin-10.2.0.4-ojdbc14dms.jar ) debug? ( jdbc-oracle-bin-10.2.0.4-ojdbc14dms_g.jar ) ) doc? ( jdbc-oracle-bin-10.2.0.1-javadoc.zip ) examples? ( jdbc-oracle-bin-10.2.0.4-demo.tar ) nls? ( jdbc-oracle-bin-10.2.0.4-orai18n.jar ) ons? ( jdbc-oracle-bin-10.2.0.3-ons.jar )
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6c9e76560a073735f334fc57151947dd
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8940370190425395c7c6d752adb95f92
diff --git a/metadata/md5-cache/dev-java/jdbc-oracle-bin-9.2.0.8 b/metadata/md5-cache/dev-java/jdbc-oracle-bin-9.2.0.8
index a58bf8ae7b47..5af40ad1519e 100644
--- a/metadata/md5-cache/dev-java/jdbc-oracle-bin-9.2.0.8
+++ b/metadata/md5-cache/dev-java/jdbc-oracle-bin-9.2.0.8
@@ -11,5 +11,5 @@ RESTRICT=fetch
 SLOT=9.2
 SRC_URI=!debug? ( jdbc-oracle-bin-9.2.0.8-ojdbc14.jar ) debug? ( jdbc-oracle-bin-9.2.0.8-ojdbc14_g.jar ) jdbc-oracle-bin-9.2.0.8-ocrs12.jar doc? ( jdbc-oracle-bin-9.2.0.8-javadoc.tar )
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=74b51075d9460aee5c3d12f0801c4e4f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=91c35f1f9e78b1cee99965f5f5c3ad45
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1003 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1003
index b41e1c928418..92526f2ccc74 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1003
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1003
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://jdbc.postgresql.org/download/postgresql-jdbc-9.2-1003.src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5d0a532eda10a36710cb8ce19893cdca
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e99bb548bd1aa8ddac28657987ab2c60
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1004 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1004
index df63100243bb..84ee8bb7b1b5 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1004
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1004
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://jdbc.postgresql.org/download/postgresql-jdbc-9.2-1004.src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c69e626b5168b91dae64d17417c5e51f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a430664642e4300c390d0aa5e01ef263
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.3_p1100 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.3_p1100
index 5b52506ca0be..81529cda94e0 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.3_p1100
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.3_p1100
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://jdbc.postgresql.org/download/postgresql-jdbc-9.3-1100.src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c69e626b5168b91dae64d17417c5e51f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a430664642e4300c390d0aa5e01ef263
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1205 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1205
index 767f159da431..2ee0c182ed7b 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1205
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1205
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://jdbc.postgresql.org/download/postgresql-jdbc-9.4-1205.src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e2441372d0a78501e6da11b736e01565
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=db5639c6d83d2740c8a777d1ccdac4b1
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1206 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1206
index 1b7cefc63a33..039ad408455e 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1206
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1206
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://jdbc.postgresql.org/download/postgresql-jdbc-9.4-1206.src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e55d1de016818b414277d61a9ee196f0
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3455f2542fdd5ffa7b4a26d91056166b
diff --git a/metadata/md5-cache/dev-java/jdbc2-stdext-2.0-r3 b/metadata/md5-cache/dev-java/jdbc2-stdext-2.0-r3
index bc9561894ef0..f528ffb6e006 100644
--- a/metadata/md5-cache/dev-java/jdbc2-stdext-2.0-r3
+++ b/metadata/md5-cache/dev-java/jdbc2-stdext-2.0-r3
@@ -11,5 +11,5 @@ RESTRICT=fetch
 SLOT=0
 SRC_URI=jdbc2_0-stdext-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0981eea9a722149e594736f60f44db1b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=bec5e47bbf4c177b05574192aca193e5
diff --git a/metadata/md5-cache/dev-java/jdbm-0.12-r2 b/metadata/md5-cache/dev-java/jdbm-0.12-r2
index 4a2f23d002d2..b22a842ec7eb 100644
--- a/metadata/md5-cache/dev-java/jdbm-0.12-r2
+++ b/metadata/md5-cache/dev-java/jdbm-0.12-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=1
 SRC_URI=mirror://sourceforge/jdbm/jdbm-0.12-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b6f9e13c751147a7777fdca29467ae51
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=da3b598dfcbd818b038b921257d4d16c
diff --git a/metadata/md5-cache/dev-java/jdepend-2.9-r5 b/metadata/md5-cache/dev-java/jdepend-2.9-r5
index 251225861b30..0a1a68e1028f 100644
--- a/metadata/md5-cache/dev-java/jdepend-2.9-r5
+++ b/metadata/md5-cache/dev-java/jdepend-2.9-r5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://www.clarkware.com/software/jdepend-2.9.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8e3f52520a0e79e17df9bc4fd8446909
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2cff4a6abf62324ec941c1690dfbf852
diff --git a/metadata/md5-cache/dev-java/jdom-1.0-r2 b/metadata/md5-cache/dev-java/jdom-1.0-r2
index fa6396686e4f..eb8d40edc060 100644
--- a/metadata/md5-cache/dev-java/jdom-1.0-r2
+++ b/metadata/md5-cache/dev-java/jdom-1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/saxpath >=dev-java/xerces-2.7 >=dev-java/java
 SLOT=1.0
 SRC_URI=http://www.jdom.org/dist/source/jdom-1.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_unpack:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=db11827a79653f976ba0e8a96b707bb5
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ebf045e5e78f9c0505cb122082c74d26
diff --git a/metadata/md5-cache/dev-java/jdom-1.0-r4 b/metadata/md5-cache/dev-java/jdom-1.0-r4
index fb5dafb3d473..a798e101c9f5 100644
--- a/metadata/md5-cache/dev-java/jdom-1.0-r4
+++ b/metadata/md5-cache/dev-java/jdom-1.0-r4
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/saxpath >=dev-java/xerces-2.7 >=dev-java/java
 SLOT=1.0
 SRC_URI=http://www.jdom.org/dist/source/archive/jdom-1.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2ec920c5bf26545b83b5b23ba8e13e97
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d400b4a6e2876d557515f55ed2019b04
diff --git a/metadata/md5-cache/dev-java/jdom-1.1.3 b/metadata/md5-cache/dev-java/jdom-1.1.3
index f4aa17f6e9a6..c7e5e899158a 100644
--- a/metadata/md5-cache/dev-java/jdom-1.1.3
+++ b/metadata/md5-cache/dev-java/jdom-1.1.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://www.jdom.org/dist/binary/archive/jdom-1.1.3.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=69d149d1f40ff0a52007a503c2681841
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e7794e2a7c1c49fcdb1e476133cea2b8
diff --git a/metadata/md5-cache/dev-java/jdom-2.0.6-r4 b/metadata/md5-cache/dev-java/jdom-2.0.6-r4
index 593f55a28877..dafc909c8e06 100644
--- a/metadata/md5-cache/dev-java/jdom-2.0.6-r4
+++ b/metadata/md5-cache/dev-java/jdom-2.0.6-r4
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xalan:0 dev-java/jaxen:1.1 dev-java/iso-relax:0 >=virtual/jre-1
 SLOT=2
 SRC_URI=https://github.com/hunterhacker/jdom/archive/JDOM-2.0.6.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=55afe736f9ca8ed313e5ce1c70e3b749
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=07e6a0339f0650a8ffceb89b2ff929d4
diff --git a/metadata/md5-cache/dev-java/jdom-jaxen-1.0-r1 b/metadata/md5-cache/dev-java/jdom-jaxen-1.0-r1
index 903117353868..8cc44575ca77 100644
--- a/metadata/md5-cache/dev-java/jdom-jaxen-1.0-r1
+++ b/metadata/md5-cache/dev-java/jdom-jaxen-1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 ~dev-java/jdom-1.0 =dev-java/jaxen-1.1* dev-java/saxpa
 SLOT=1.0
 SRC_URI=http://www.jdom.org/dist/source/jdom-1.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:base src_compile:- src_install:-
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a08fc4de9f15c9aad091b4d870ccb4dd
+_eclasses_=base	df2aa567b3f0595aae0d0923889f7631	eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1f86018bd7a80daf381c4a1c19d2fe2d
diff --git a/metadata/md5-cache/dev-java/jdynamite-1.2-r1 b/metadata/md5-cache/dev-java/jdynamite-1.2-r1
index 81850b975d31..ab0b193c81f9 100644
--- a/metadata/md5-cache/dev-java/jdynamite-1.2-r1
+++ b/metadata/md5-cache/dev-java/jdynamite-1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/gnu-regexp:1 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jdynamite/jdynamite1_2.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d1767d348928bffc2037e0b6611642a6
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6591e25c0cd34754b8ebf14fa6c0bb7e
diff --git a/metadata/md5-cache/dev-java/jebl-2013.02.18 b/metadata/md5-cache/dev-java/jebl-2013.02.18
index 1d2a6c6adefe..b2213132553a 100644
--- a/metadata/md5-cache/dev-java/jebl-2013.02.18
+++ b/metadata/md5-cache/dev-java/jebl-2013.02.18
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/jebl-2013.02.18.tar.xz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=942a9e4e900e5bfa4c5a9a6286b74c6b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7f09f4583807b47004872a3b3b71933b
diff --git a/metadata/md5-cache/dev-java/jempbox-1.7.1 b/metadata/md5-cache/dev-java/jempbox-1.7.1
index 1fdcd02e7758..597dd884642a 100644
--- a/metadata/md5-cache/dev-java/jempbox-1.7.1
+++ b/metadata/md5-cache/dev-java/jempbox-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=1.7
 SRC_URI=mirror://apache/pdfbox/1.7.1/pdfbox-1.7.1-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d67c518c3c3b84cf7a1c83c22c0cb27c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9401cece3744665a72abd9c618145b89
diff --git a/metadata/md5-cache/dev-java/jempbox-1.8.11 b/metadata/md5-cache/dev-java/jempbox-1.8.11
index 37017facbf21..f589f19dca9f 100644
--- a/metadata/md5-cache/dev-java/jempbox-1.8.11
+++ b/metadata/md5-cache/dev-java/jempbox-1.8.11
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=1.8
 SRC_URI=mirror://apache/pdfbox/1.8.11/pdfbox-1.8.11-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=cbdac9dd39ca06044776f02d6031c84b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9079129700b7e51ec915ec23456f3604
diff --git a/metadata/md5-cache/dev-java/jettison-1.3.7 b/metadata/md5-cache/dev-java/jettison-1.3.7
index 6cb4dc333bf0..c8a63c6256df 100644
--- a/metadata/md5-cache/dev-java/jettison-1.3.7
+++ b/metadata/md5-cache/dev-java/jettison-1.3.7
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/codehaus/jettison/archive/jettison-1.3.7.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_test:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8e6d4804727523c6cc342a59c1c9e142
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e26111e976bf5541e0dfd87dd3c370cf
diff --git a/metadata/md5-cache/dev-java/jetty-alpn-api-1.1.2 b/metadata/md5-cache/dev-java/jetty-alpn-api-1.1.2
index 9984447b9f1e..745723731a71 100644
--- a/metadata/md5-cache/dev-java/jetty-alpn-api-1.1.2
+++ b/metadata/md5-cache/dev-java/jetty-alpn-api-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/eclipse/jetty.alpn/archive/alpn-api-1.1.2.v20150522.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=70f6fe0db9f1f33eae928b1e2e7c2568
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e9134e0546ab2e44901f183d2ade342b
diff --git a/metadata/md5-cache/dev-java/jetty-npn-api-1.1.1 b/metadata/md5-cache/dev-java/jetty-npn-api-1.1.1
index 5a4e9e85a81f..9262cf306043 100644
--- a/metadata/md5-cache/dev-java/jetty-npn-api-1.1.1
+++ b/metadata/md5-cache/dev-java/jetty-npn-api-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://central.maven.org/maven2/org/eclipse/jetty/npn/npn-api/1.1.1.v20141010/npn-api-1.1.1.v20141010-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b860bd0c2e42081b9f4c8fc2f11dc5d0
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4c247b4d54668ce38c2ff6300684f680
diff --git a/metadata/md5-cache/dev-java/jexcelapi-2.6.8-r2 b/metadata/md5-cache/dev-java/jexcelapi-2.6.8-r2
index e2f31fa71888..142ae4d1e36d 100644
--- a/metadata/md5-cache/dev-java/jexcelapi-2.6.8-r2
+++ b/metadata/md5-cache/dev-java/jexcelapi-2.6.8-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/log4j:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 sourc
 SLOT=0
 SRC_URI=mirror://sourceforge/jexcelapi/jexcelapi_2_6_8.tar.gz -> jexcelapi-2.6.8.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=546e502517d644d1cf9905be154a57b2
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9dd84c629d56d37cc67cc4a46b4e3949
diff --git a/metadata/md5-cache/dev-java/jffi-1.2.9 b/metadata/md5-cache/dev-java/jffi-1.2.9
index dd33d45531ed..b5ee4ede7e4f 100644
--- a/metadata/md5-cache/dev-java/jffi-1.2.9
+++ b/metadata/md5-cache/dev-java/jffi-1.2.9
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=1.2
 SRC_URI=https://github.com/jnr/jffi/archive/1.2.9.tar.gz -> jffi-1.2.9.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a359b1b446ccdcfa4abadcc7f0d50bb2
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e76e98ede128733a7c6e5057afd00dc0
diff --git a/metadata/md5-cache/dev-java/jflex-1.6.1 b/metadata/md5-cache/dev-java/jflex-1.6.1
index 3636ca0ec46c..61bfc01b38a4 100644
--- a/metadata/md5-cache/dev-java/jflex-1.6.1
+++ b/metadata/md5-cache/dev-java/jflex-1.6.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.6 vim-syntax? ( || ( app-editors/vim app-editors/gvim )
 SLOT=0
 SRC_URI=http://jflex.de/jflex-1.6.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f916a9437ce7186c8c0cdac6bcb3fe28
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9bb7be455440a88fa5448baf96f05b56
diff --git a/metadata/md5-cache/dev-java/jformatstring-2.0.3 b/metadata/md5-cache/dev-java/jformatstring-2.0.3
index a98e0f20dacc..f2c4fa59275f 100644
--- a/metadata/md5-cache/dev-java/jformatstring-2.0.3
+++ b/metadata/md5-cache/dev-java/jformatstring-2.0.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/findbugs/findbugs-3.0.1-source.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4c68c600533e841316b52d31fa7877d7
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e0fbc4fea60468f05f99ba648a302d97
diff --git a/metadata/md5-cache/dev-java/jfreechart-1.0.19-r1 b/metadata/md5-cache/dev-java/jfreechart-1.0.19-r1
index 4e929717c079..6287bfb0344a 100644
--- a/metadata/md5-cache/dev-java/jfreechart-1.0.19-r1
+++ b/metadata/md5-cache/dev-java/jfreechart-1.0.19-r1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=1.0
 SRC_URI=mirror://sourceforge/jfreechart/jfreechart-1.0.19.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e03e4b6fefaffe412046bc5fff90b135
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b98cb85a0de0f2ad8cee7d9c164bada2
diff --git a/metadata/md5-cache/dev-java/jfreesvg-2.1-r1 b/metadata/md5-cache/dev-java/jfreesvg-2.1-r1
index 3597235c8fe7..da0d5e15b5eb 100644
--- a/metadata/md5-cache/dev-java/jfreesvg-2.1-r1
+++ b/metadata/md5-cache/dev-java/jfreesvg-2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=2.1
 SRC_URI=mirror://sourceforge/jfreegraphics2d/jfreesvg-2.1.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c25afddf0aac5f53525011cb95b12d40
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4714b5f1df8880e9936254ab9b3ddd05
diff --git a/metadata/md5-cache/dev-java/jfreesvg-3.0 b/metadata/md5-cache/dev-java/jfreesvg-3.0
index 20380253012c..3df60825d86d 100644
--- a/metadata/md5-cache/dev-java/jfreesvg-3.0
+++ b/metadata/md5-cache/dev-java/jfreesvg-3.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=3.0
 SRC_URI=mirror://sourceforge/jfreegraphics2d/jfreesvg-3.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a3ec0a14f3c91fa668ba07356258f39d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=71f1073b7bef0f744d89970c79856ecd
diff --git a/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0 b/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0
index ea5b7d0d3fff..8a3ca5ec44ed 100644
--- a/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0
+++ b/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 examples? ( x86? ( >=dev-java/jgoodies-binding-1.1 >=d
 SLOT=0
 SRC_URI=http://www.jgoodies.com/download/libraries/animation-1_2_0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=584169f0a70716973b43be191131b220
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ae2582f69e745ab646ca90e478e66a34
diff --git a/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0-r1 b/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0-r1
index dd33ae7dfb7b..89bda0afe2f3 100644
--- a/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 examples? ( >=dev-java/jgoodies-binding-1.1:1.0 >=dev-
 SLOT=0
 SRC_URI=http://www.jgoodies.com/download/libraries/animation-1_2_0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fdf04eb694de4a685360451183035ca8
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b26833bb296d6db3987610d7edda18ab
diff --git a/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2 b/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2
index b105d5403ccf..96f10e32dadd 100644
--- a/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2
+++ b/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=1.0
 SRC_URI=http://www.jgoodies.com/download/libraries/binding-1_1_2.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=85d3635ee5a40ae707d4f762d8f9770f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a9a316b3bdefdb8d8f530b0bd516f69f
diff --git a/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2-r1 b/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2-r1
index aa578cd721d6..3c8a58a5a673 100644
--- a/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2-r1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=1.0
 SRC_URI=http://www.jgoodies.com/download/libraries/binding-1_1_2.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1add2825937efab85c216f389039eb62
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=94797ef6f526b52568e1bdaf61516d9b
diff --git a/metadata/md5-cache/dev-java/jgoodies-common-1.8.0 b/metadata/md5-cache/dev-java/jgoodies-common-1.8.0
index e69bef5d5b1d..43d22520cfe6 100644
--- a/metadata/md5-cache/dev-java/jgoodies-common-1.8.0
+++ b/metadata/md5-cache/dev-java/jgoodies-common-1.8.0
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=1.8
 SRC_URI=http://www.jgoodies.com/download/libraries/common/jgoodies-common-1_8_0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bbc7b8c0b46739035e409109cc8cc24c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c14cba0f89b095bf2c43c1eef62aede4
diff --git a/metadata/md5-cache/dev-java/jgoodies-forms-1.3.0-r1 b/metadata/md5-cache/dev-java/jgoodies-forms-1.3.0-r1
index 4c2259c88c6e..71eb75f505c8 100644
--- a/metadata/md5-cache/dev-java/jgoodies-forms-1.3.0-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-forms-1.3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://www.jgoodies.com/download/libraries/forms/forms-1_3_0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6148fa337087b683c973fcca642e260d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ecd00ae31ad557282d91909f5f299174
diff --git a/metadata/md5-cache/dev-java/jgoodies-forms-1.8.0 b/metadata/md5-cache/dev-java/jgoodies-forms-1.8.0
index 66034461f7a8..fffc3f4eff66 100644
--- a/metadata/md5-cache/dev-java/jgoodies-forms-1.8.0
+++ b/metadata/md5-cache/dev-java/jgoodies-forms-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/jgoodies-common:1.8 >=dev-java/java-config-2.
 SLOT=1.8
 SRC_URI=http://www.jgoodies.com/download/libraries/forms/jgoodies-forms-1_8_0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=eb3b1eb1524e8fe22f31ce67c220331e
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=42dfefc4e4c40a82bc0946c0faad7202
diff --git a/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r2 b/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r2
index cda4bc10d515..66452cd64b22 100644
--- a/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r2
+++ b/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=1.2
 SRC_URI=http://www.jgoodies.com/download/libraries/looks-1_2_2.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=85c468dca1f56fe14110d82659632b3a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=229f1448b33d0fb471ff0d74aff6f0a4
diff --git a/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1-r1 b/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1-r1
index 7a3f6eda54d6..300d0c051727 100644
--- a/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=2.0
 SRC_URI=http://www.jgoodies.com/download/libraries/looks/looks-2_3_1.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=92dd9af00e39e7f5545ce685c666746c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7fc66eeea4ebcc1c3396b5547e2ff6fc
diff --git a/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0 b/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0
index fcb5419db50c..3388f0652d13 100644
--- a/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0
+++ b/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jgoodies-common:1.8 >=virtual/jre-1.6 >=dev-java/java-config-2.
 SLOT=2.6
 SRC_URI=http://www.jgoodies.com/download/libraries/looks/jgoodies-looks-2_6_0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3608ddfaed12185e2fc3368d8923ecb9
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=bf007ba9c5ed1214242f69eb9eb13bfe
diff --git a/metadata/md5-cache/dev-java/jgraph-5.12.0.4 b/metadata/md5-cache/dev-java/jgraph-5.12.0.4
index 13ca9a4a5190..140aedae1823 100644
--- a/metadata/md5-cache/dev-java/jgraph-5.12.0.4
+++ b/metadata/md5-cache/dev-java/jgraph-5.12.0.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/jgraph/jgraph-5.12.0.4-lgpl-src.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=62dee6f7fbb2acf3c3bd54aa77cc1486
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0415e696aedc572105f0b005d00a4ebe
diff --git a/metadata/md5-cache/dev-java/jgrapht-0.8.3 b/metadata/md5-cache/dev-java/jgrapht-0.8.3
index e0e3934f322b..63ecf5f91536 100644
--- a/metadata/md5-cache/dev-java/jgrapht-0.8.3
+++ b/metadata/md5-cache/dev-java/jgrapht-0.8.3
@@ -10,5 +10,5 @@ RDEPEND=dev-java/touchgraph-graphlayout:0 dev-java/jgraph:0 >=virtual/jre-1.6 >=
 SLOT=0
 SRC_URI=mirror://sourceforge/jgrapht/jgrapht-0.8.3.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b5d0c06e20d9986f86cdcf47da6a6ffb
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1a27818180025e86f9835b683b45b496
diff --git a/metadata/md5-cache/dev-java/jgroups-2.9.0 b/metadata/md5-cache/dev-java/jgroups-2.9.0
index 7663b2b82d49..716995047c22 100644
--- a/metadata/md5-cache/dev-java/jgroups-2.9.0
+++ b/metadata/md5-cache/dev-java/jgroups-2.9.0
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/javagroups/JGroups-2.9.0.GA.src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7dac791c1c88719e4aa86e71d25ddadf
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5877e0ab68eca8cac1f1e22d70cefd84
diff --git a/metadata/md5-cache/dev-java/jibx-1.1.5-r1 b/metadata/md5-cache/dev-java/jibx-1.1.5-r1
index 71758827be49..3b07e2b796c8 100644
--- a/metadata/md5-cache/dev-java/jibx-1.1.5-r1
+++ b/metadata/md5-cache/dev-java/jibx-1.1.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/dom4j:1 dev-java/ant-core:0 dev-java/bcel:0 j
 SLOT=0
 SRC_URI=mirror://sourceforge/jibx/jibx_1_1_5.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7c7fb7630871f1a9c69c7cab9df6a2f5
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d8b730646501d9771c6aea1ff3c599c9
diff --git a/metadata/md5-cache/dev-java/jibx-1.1.5-r2 b/metadata/md5-cache/dev-java/jibx-1.1.5-r2
index 91190f66ff7e..6e5f30262c22 100644
--- a/metadata/md5-cache/dev-java/jibx-1.1.5-r2
+++ b/metadata/md5-cache/dev-java/jibx-1.1.5-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/dom4j:1 dev-java/ant-core:0 dev-java/bcel:0 d
 SLOT=0
 SRC_URI=mirror://sourceforge/jibx/jibx_1_1_5.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=827ef1e4e551b01599075977f07907a9
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d9495f38e279365583179c529eacafed
diff --git a/metadata/md5-cache/dev-java/jibx-1.2.6 b/metadata/md5-cache/dev-java/jibx-1.2.6
index 2236a2989fac..f6d6f4f624e1 100644
--- a/metadata/md5-cache/dev-java/jibx-1.2.6
+++ b/metadata/md5-cache/dev-java/jibx-1.2.6
@@ -10,5 +10,5 @@ RDEPEND=dev-java/bcel:0 dev-java/xpp3:0 dev-java/jdom:0 dev-java/dom4j:1 dev-jav
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/jibx/jibx-extras/1.2.6/jibx-extras-1.2.6-sources.jar https://repo1.maven.org/maven2/org/jibx/jibx-bind/1.2.6/jibx-bind-1.2.6-sources.jar https://repo1.maven.org/maven2/org/jibx/jibx-run/1.2.6/jibx-run-1.2.6-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=caf9f68220a527066db8fd49ccf03788
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c787eb2bdaaa70641311eaecf87e148b
diff --git a/metadata/md5-cache/dev-java/jibx-tools-1.1.5-r2 b/metadata/md5-cache/dev-java/jibx-tools-1.1.5-r2
index af228475b1e6..d81d72bd2dd2 100644
--- a/metadata/md5-cache/dev-java/jibx-tools-1.1.5-r2
+++ b/metadata/md5-cache/dev-java/jibx-tools-1.1.5-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/bcel:0 java-virtuals/stax-api:0 dev-java/jibx
 SLOT=0
 SRC_URI=mirror://sourceforge/jibx/jibx_1_1_5.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=983c439d9af7517a134cff782d50fa6a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3e3f54441022bc2033f0b5a4ae00c2a5
diff --git a/metadata/md5-cache/dev-java/jibx-tools-1.1.5-r3 b/metadata/md5-cache/dev-java/jibx-tools-1.1.5-r3
index e2ab96350b33..ab48c71fc81f 100644
--- a/metadata/md5-cache/dev-java/jibx-tools-1.1.5-r3
+++ b/metadata/md5-cache/dev-java/jibx-tools-1.1.5-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/bcel:0 dev-java/jibx:0 >=dev-java/java-config
 SLOT=0
 SRC_URI=mirror://sourceforge/jibx/jibx_1_1_5.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=04677e5a2d3d16e6c22e89954045793f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b785c49b69cf0c7ae028e9f9e8f0efb5
diff --git a/metadata/md5-cache/dev-java/jicmp-1.0.2 b/metadata/md5-cache/dev-java/jicmp-1.0.2
index a20e3df89967..ed0fc042c8fe 100644
--- a/metadata/md5-cache/dev-java/jicmp-1.0.2
+++ b/metadata/md5-cache/dev-java/jicmp-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/opennms/jicmp-1.0.2.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:base src_prepare:- src_configure:base src_compile:- src_install:-
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	libtool	84763589a795fb127b537cac01e5359f	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=76848a76520fdd0bbc22de8c368b3e21
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	base	df2aa567b3f0595aae0d0923889f7631	eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	48b1b9f6194d2842456514d1184ca72e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=209a07410a4cd95531c9ed3f24280dba
diff --git a/metadata/md5-cache/dev-java/jid3-0.46-r2 b/metadata/md5-cache/dev-java/jid3-0.46-r2
index 3a23ca0f83f6..b93b2689ac6b 100644
--- a/metadata/md5-cache/dev-java/jid3-0.46-r2
+++ b/metadata/md5-cache/dev-java/jid3-0.46-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://jid3.blinkenlights.org/release/jid3_0.46.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e1536f6b7378fe5e6dba5ffd5469eb09
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=53352187f7bcf7f51fefe8b6c8453fcb
diff --git a/metadata/md5-cache/dev-java/jide-oss-3.6.12 b/metadata/md5-cache/dev-java/jide-oss-3.6.12
index 9c761f19cb9b..4c5f99fdaf91 100644
--- a/metadata/md5-cache/dev-java/jide-oss-3.6.12
+++ b/metadata/md5-cache/dev-java/jide-oss-3.6.12
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/jidesoft/jide-oss/archive/3.6.12.tar.gz -> jide-oss-3.6.12.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=aa1c6c15c79a5c8ad69ead26b006fe0d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=64d413126ce650453bcdcc5ac44eb1e8
diff --git a/metadata/md5-cache/dev-java/jikes-1.22-r13 b/metadata/md5-cache/dev-java/jikes-1.22-r13
index 044dc133c02a..bd1a457f0278 100644
--- a/metadata/md5-cache/dev-java/jikes-1.22-r13
+++ b/metadata/md5-cache/dev-java/jikes-1.22-r13
@@ -8,5 +8,5 @@ RDEPEND=>=dev-java/java-config-2.0.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jikes/jikes-1.22.tar.bz2
 _eclass_exported_funcs=src_unpack:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	flag-o-matic	35067884fbff37bc0c8e7421c5315558	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=875eabe3121190987ab55ae44ed2f70b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	flag-o-matic	979af9133d4de419fa98992355b07ca4	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432
+_md5_=460976774d1c53173f02ccb4cdfa27b8
diff --git a/metadata/md5-cache/dev-java/jinklevel-0.1 b/metadata/md5-cache/dev-java/jinklevel-0.1
index 94a511b08e45..bdd5c36f7ff0 100644
--- a/metadata/md5-cache/dev-java/jinklevel-0.1
+++ b/metadata/md5-cache/dev-java/jinklevel-0.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=net-print/libinklevel-0.8.0 >=dev-java/java-config-2
 SLOT=0
 SRC_URI=https://mso.googlecode.com/files/jinklevel-0.1.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8e81b7f8bf9fe7f218ac57c1bd81fee7
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9a340f17e6370f3e25fb5c30ab3093a5
diff --git a/metadata/md5-cache/dev-java/jinput-2.0.6-r1 b/metadata/md5-cache/dev-java/jinput-2.0.6-r1
index 9d9100f20128..f767061a8b80 100644
--- a/metadata/md5-cache/dev-java/jinput-2.0.6-r1
+++ b/metadata/md5-cache/dev-java/jinput-2.0.6-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/jutils:0 >=dev-java/java-config-2.2.0-r3 sour
 SLOT=0
 SRC_URI=https://github.com/jinput/jinput/archive/790b666.tar.gz -> jinput-2.0.6.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:vcs-snapshot src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=04b417d6c9e5035d4836e366d95f6f8d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e2e7421d277298fc52fc9780d292d116
diff --git a/metadata/md5-cache/dev-java/jisp-2.5.1-r3 b/metadata/md5-cache/dev-java/jisp-2.5.1-r3
index a752497f917a..4d7ded843612 100644
--- a/metadata/md5-cache/dev-java/jisp-2.5.1-r3
+++ b/metadata/md5-cache/dev-java/jisp-2.5.1-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=2.5
 SRC_URI=http://gentooexperimental.org/distfiles/jisp-2.5.1-source.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=73a742298f569d98577ea93fe18b7b66
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b8408b1b04c51df40bca8f011964a4b7
diff --git a/metadata/md5-cache/dev-java/jlayer-1.0.1 b/metadata/md5-cache/dev-java/jlayer-1.0.1
index e5f8239d1e8a..2a7855883ffb 100644
--- a/metadata/md5-cache/dev-java/jlayer-1.0.1
+++ b/metadata/md5-cache/dev-java/jlayer-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://www.javazoom.net/javalayer/sources/jlayer1.0.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0fac9a4a6eb79521fe51f34069ea98d1
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=697c9f8358f9a8e065c15f737b06d951
diff --git a/metadata/md5-cache/dev-java/jlex-1.2.6-r2 b/metadata/md5-cache/dev-java/jlex-1.2.6-r2
index 793dd3b6bbba..68a99134b912 100644
--- a/metadata/md5-cache/dev-java/jlex-1.2.6-r2
+++ b/metadata/md5-cache/dev-java/jlex-1.2.6-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://gentoo/jlex-1.2.6.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5d2b82a798e13459769b469f29ae87b1
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b9047cce4e22f815bf074122e4519e57
diff --git a/metadata/md5-cache/dev-java/jlfgr-1.0-r2 b/metadata/md5-cache/dev-java/jlfgr-1.0-r2
index d71c58bcccda..a8010c46c688 100644
--- a/metadata/md5-cache/dev-java/jlfgr-1.0-r2
+++ b/metadata/md5-cache/dev-java/jlfgr-1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://gentoo/jlfgr-1_0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=94939de1be46e8507e308d56dd753c77
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=81014697eb26e4d7b2a05800ae12da9b
diff --git a/metadata/md5-cache/dev-java/jlibeps-0.1-r1 b/metadata/md5-cache/dev-java/jlibeps-0.1-r1
index 6339b0f637da..f9c8f0d36858 100644
--- a/metadata/md5-cache/dev-java/jlibeps-0.1-r1
+++ b/metadata/md5-cache/dev-java/jlibeps-0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/jlibeps/jlibeps-0.1-src.zip -> jlibeps-0.1.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ecb0325655de41744cd66e4c8c89a43c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3da1ea2f428d97ca6975c377d8990cd6
diff --git a/metadata/md5-cache/dev-java/jline-1.0 b/metadata/md5-cache/dev-java/jline-1.0
index 7e7c9ea9118f..434224addd75 100644
--- a/metadata/md5-cache/dev-java/jline-1.0
+++ b/metadata/md5-cache/dev-java/jline-1.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/jline/jline-1.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d935f456fcb95d855b9886c0035d0094
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1bec6d8d4dbffced1500b3c372b69384
diff --git a/metadata/md5-cache/dev-java/jline-2.12.1-r1 b/metadata/md5-cache/dev-java/jline-2.12.1-r1
index 487e994e679f..b7dbe2056779 100644
--- a/metadata/md5-cache/dev-java/jline-2.12.1-r1
+++ b/metadata/md5-cache/dev-java/jline-2.12.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jansi:0 dev-java/jansi-native:0 >=virtual/jre-1.6 >=dev-java/ja
 SLOT=2
 SRC_URI=https://github.com/jline/jline/archive/jline-2.12.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8e615453bd759dd9842c71601983149b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b539b533569890159a1fa738ac98cc12
diff --git a/metadata/md5-cache/dev-java/jmdns-3.4.1-r1 b/metadata/md5-cache/dev-java/jmdns-3.4.1-r1
index 05105facb22a..77f24f170b70 100644
--- a/metadata/md5-cache/dev-java/jmdns-3.4.1-r1
+++ b/metadata/md5-cache/dev-java/jmdns-3.4.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/jmdns/jmdns-3.4.1.tgz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1b543a3959baaac67dd502480bc0c29e
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=893634ab129e1696e9554b96f9c75c64
diff --git a/metadata/md5-cache/dev-java/jmh-core-1.4.1 b/metadata/md5-cache/dev-java/jmh-core-1.4.1
index e43030d88b89..32ed6f08795c 100644
--- a/metadata/md5-cache/dev-java/jmh-core-1.4.1
+++ b/metadata/md5-cache/dev-java/jmh-core-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 dev-java/asm:4 dev-java/commons-math:3 =dev-java/jopt-
 SLOT=0
 SRC_URI=http://hg.openjdk.java.net/code-tools/jmh/archive/7ff584954008.tar.gz -> jmh-core-1.4.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f8be19dc77357b1b5b27d2c2a7fc81d1
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=438b00ebd56266bb4fb56a2b5802019a
diff --git a/metadata/md5-cache/dev-java/jmi-interface-1.0-r3 b/metadata/md5-cache/dev-java/jmi-interface-1.0-r3
index 6d129c0fe299..1502ddfa3328 100644
--- a/metadata/md5-cache/dev-java/jmi-interface-1.0-r3
+++ b/metadata/md5-cache/dev-java/jmi-interface-1.0-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=0
 SRC_URI=mirror://gentoo/jmi-1_0-fr-interfaces.zip mirror://gentoo/mof-1.0.xml.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=70089cc4620f9295eeb588d266ec6b80
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f1edacfa707113f9d70cf7a63c5d1bf5
diff --git a/metadata/md5-cache/dev-java/jmi-interface-1.0-r4 b/metadata/md5-cache/dev-java/jmi-interface-1.0-r4
index 7fea5da25e52..b4a5af0d461c 100644
--- a/metadata/md5-cache/dev-java/jmi-interface-1.0-r4
+++ b/metadata/md5-cache/dev-java/jmi-interface-1.0-r4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://gentoo/jmi-1_0-fr-interfaces.zip mirror://gentoo/mof-1.0.xml.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ef152c1d243a0df0227a17e8cbb51c89
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=75c0580fdafae214fff5b00a36cbaac8
diff --git a/metadata/md5-cache/dev-java/jmock-1.2.0-r1 b/metadata/md5-cache/dev-java/jmock-1.2.0-r1
index 0b9322ce34ad..96825b455db7 100644
--- a/metadata/md5-cache/dev-java/jmock-1.2.0-r1
+++ b/metadata/md5-cache/dev-java/jmock-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 sourc
 SLOT=1.0
 SRC_URI=http://www.jmock.org/downloads/jmock-1.2.0-jars.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3882d829206cfd3ce799d70aa6fbc6db
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=873b3b0b0ce7affc32f71b6b443d22d1
diff --git a/metadata/md5-cache/dev-java/jmock-2.6.1 b/metadata/md5-cache/dev-java/jmock-2.6.1
index dd7047a55984..fc189ac47056 100644
--- a/metadata/md5-cache/dev-java/jmock-2.6.1
+++ b/metadata/md5-cache/dev-java/jmock-2.6.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1
 SLOT=2
 SRC_URI=http://www.jmock.org/downloads/jmock-2.6.1-jars.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b41ca81f42b30c7c6216486752b59e04
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=98679b2b15c2147132d83f442abf0285
diff --git a/metadata/md5-cache/dev-java/jna-3.4.1 b/metadata/md5-cache/dev-java/jna-3.4.1
index 6bb15034ec90..f7291503e464 100644
--- a/metadata/md5-cache/dev-java/jna-3.4.1
+++ b/metadata/md5-cache/dev-java/jna-3.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( awt nio-buffers )
 SLOT=0
 SRC_URI=https://github.com/twall/jna/tarball/3.4.1 -> jna-3.4.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:vcs-snapshot src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	flag-o-matic	35067884fbff37bc0c8e7421c5315558	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=135ca9c5bdc4add9ea974997a147529f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	flag-o-matic	979af9133d4de419fa98992355b07ca4	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9e72c13ade56412c2846421cf82db82e
diff --git a/metadata/md5-cache/dev-java/jna-4.2.2-r1 b/metadata/md5-cache/dev-java/jna-4.2.2-r1
index 51c8a9b54788..79cb8d8d500a 100644
--- a/metadata/md5-cache/dev-java/jna-4.2.2-r1
+++ b/metadata/md5-cache/dev-java/jna-4.2.2-r1
@@ -12,5 +12,5 @@ RESTRICT=test
 SLOT=4
 SRC_URI=https://github.com/twall/jna/archive/4.2.2.tar.gz -> jna-4.2.2.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_configure:- src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ff68237e00d92f721c308939ceade907
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=919371f98032943ea0df91d486e9edaf
diff --git a/metadata/md5-cache/dev-java/jnlp-api-6.0.18 b/metadata/md5-cache/dev-java/jnlp-api-6.0.18
index 7c52c3b7d37d..20d9431ed5ac 100644
--- a/metadata/md5-cache/dev-java/jnlp-api-6.0.18
+++ b/metadata/md5-cache/dev-java/jnlp-api-6.0.18
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~caster/distfiles/jnlp-api-6.0.18.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f0b9b1fde45e57724d363fba5a90b706
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=35679f87fc2b42085c5a30dd7bf04d8c
diff --git a/metadata/md5-cache/dev-java/jnr-constants-0.8.6 b/metadata/md5-cache/dev-java/jnr-constants-0.8.6
index fdb05e4ecab3..844c4c8540e2 100644
--- a/metadata/md5-cache/dev-java/jnr-constants-0.8.6
+++ b/metadata/md5-cache/dev-java/jnr-constants-0.8.6
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/jnr/jnr-constants/archive/jnr-constants-0.8.6.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e73d5cb697e1ca162b5ac025b846d786
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=24f1bb9be6489c7ba54fad032bc88818
diff --git a/metadata/md5-cache/dev-java/jnr-enxio-0.7-r1 b/metadata/md5-cache/dev-java/jnr-enxio-0.7-r1
index 8d8ffe7370d0..54baa50feed5 100644
--- a/metadata/md5-cache/dev-java/jnr-enxio-0.7-r1
+++ b/metadata/md5-cache/dev-java/jnr-enxio-0.7-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:2 >=virtual/jre-1.7 >=dev-java
 SLOT=0
 SRC_URI=https://github.com/jnr/jnr-enxio/archive/0.7.tar.gz -> jnr-enxio-0.7.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=104914c0495518c9b09e24a2d39c01d2
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0360ef646c8255ea1ce04044b644bcff
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-2.0.2 b/metadata/md5-cache/dev-java/jnr-ffi-2.0.2
index bb794f571d8e..82dffcbcda5b 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-2.0.2
+++ b/metadata/md5-cache/dev-java/jnr-ffi-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jffi:1.2 dev-java/jnr-x86asm:1.0 dev-java/asm:4 >=virtual/jre-1
 SLOT=2
 SRC_URI=https://github.com/jnr/jnr-ffi/archive/2.0.2.tar.gz -> jnr-ffi-2.0.2.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=cf9ab8c7120b1716671842fc4ecc5562
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9dd99b2904a4212ca06267b9d18dac4b
diff --git a/metadata/md5-cache/dev-java/jnr-netdb-1.1.4 b/metadata/md5-cache/dev-java/jnr-netdb-1.1.4
index 085acab64d04..e4915e698b53 100644
--- a/metadata/md5-cache/dev-java/jnr-netdb-1.1.4
+++ b/metadata/md5-cache/dev-java/jnr-netdb-1.1.4
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jnr-ffi:2 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 sou
 SLOT=1.0
 SRC_URI=https://github.com/jnr/jnr-netdb/archive/1.1.4.tar.gz -> jnr-netdb-1.1.4.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8b91fb954095424b23cc5a15b286daf4
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9c2432b35a7bc8659334f938120e659c
diff --git a/metadata/md5-cache/dev-java/jnr-posix-3.0.10 b/metadata/md5-cache/dev-java/jnr-posix-3.0.10
index acd12d21320f..c62237e1ac1e 100644
--- a/metadata/md5-cache/dev-java/jnr-posix-3.0.10
+++ b/metadata/md5-cache/dev-java/jnr-posix-3.0.10
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:2 >=virtual/jre-1.6 >=dev-java
 SLOT=3.0
 SRC_URI=https://github.com/jnr/jnr-posix/archive/3.0.10.tar.gz -> jnr-posix-3.0.10.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5adbc622db0df8de9e7e52157aa1fcd4
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=25d9af3945bf147ce9c41b3d3036b4bf
diff --git a/metadata/md5-cache/dev-java/jnr-unixsocket-0.6-r1 b/metadata/md5-cache/dev-java/jnr-unixsocket-0.6-r1
index 8d5bf4c7cdf9..84e775882fb8 100644
--- a/metadata/md5-cache/dev-java/jnr-unixsocket-0.6-r1
+++ b/metadata/md5-cache/dev-java/jnr-unixsocket-0.6-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-enxio:0 dev-java/jnr-posix:3.0 dev
 SLOT=0
 SRC_URI=https://github.com/jnr/jnr-unixsocket/archive/0.6.tar.gz -> jnr-unixsocket-0.6.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ed257ed13f1a66826b712ef8b8671cda
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7836e09796f994737a1d4ea8bd46cd86
diff --git a/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r1 b/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r1
index 535b15fd119a..ce5158ffe544 100644
--- a/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r1
+++ b/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=1.0
 SRC_URI=https://github.com/jnr/jnr-x86asm/archive/1.0.2.zip -> jnr-x86asm-1.0.2.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d36b9fa1b0c3f41974b73bfda7f66771
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=184aa980c0639732415e2e4485a24f68
diff --git a/metadata/md5-cache/dev-java/joda-convert-1.3.1 b/metadata/md5-cache/dev-java/joda-convert-1.3.1
index 8925bc469371..3d9e352aa31e 100644
--- a/metadata/md5-cache/dev-java/joda-convert-1.3.1
+++ b/metadata/md5-cache/dev-java/joda-convert-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/joda-convert/joda-convert-1.3.1-dist.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=64a4fb089f4c45d5f3add460316535e5
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ab500aadb8005badef0d7beaa9e949d1
diff --git a/metadata/md5-cache/dev-java/joda-time-2.7 b/metadata/md5-cache/dev-java/joda-time-2.7
index c830ffe8549a..99f5f4fb9ce1 100644
--- a/metadata/md5-cache/dev-java/joda-time-2.7
+++ b/metadata/md5-cache/dev-java/joda-time-2.7
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/JodaOrg/joda-time/releases/download/v2.7/joda-time-2.7-dist.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9309a25bc03883fbbbf66a213ad88dfa
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c4df77829ce5df2a9a8d4cac94369ef8
diff --git a/metadata/md5-cache/dev-java/joni-2.1.0 b/metadata/md5-cache/dev-java/joni-2.1.0
index 62b3ef4137e0..9f0a7f3abd05 100644
--- a/metadata/md5-cache/dev-java/joni-2.1.0
+++ b/metadata/md5-cache/dev-java/joni-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/asm:3 dev-java/jcodings:1 >=virtual/jre-1.5 >=dev-java/java-con
 SLOT=2.1
 SRC_URI=https://github.com/jruby/joni/archive/joni-2.1.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:base src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d9b41cad5ccc12b1ce32198182082038
+_eclasses_=base	df2aa567b3f0595aae0d0923889f7631	eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5b917ed4210a3b0784376558e35840d7
diff --git a/metadata/md5-cache/dev-java/jopt-simple-4.6 b/metadata/md5-cache/dev-java/jopt-simple-4.6
index 1025e303d576..7d76a882712b 100644
--- a/metadata/md5-cache/dev-java/jopt-simple-4.6
+++ b/metadata/md5-cache/dev-java/jopt-simple-4.6
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/pholser/jopt-simple/tarball/jopt-simple-4.6 -> jopt-simple-4.6.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=23b86b98d023270add458d0e1b4943e5
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8a5dd6e40b86933032f3de2aa48fcf80
diff --git a/metadata/md5-cache/dev-java/jopt-simple-4.8 b/metadata/md5-cache/dev-java/jopt-simple-4.8
index 7d10869c81da..20ca2a980d96 100644
--- a/metadata/md5-cache/dev-java/jopt-simple-4.8
+++ b/metadata/md5-cache/dev-java/jopt-simple-4.8
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/pholser/jopt-simple/tarball/jopt-simple-4.8 -> jopt-simple-4.8.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4a832d5c72dc26d5489eab973c8ad9d5
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7317f527dbf058e81aefa1c7e3bffde7
diff --git a/metadata/md5-cache/dev-java/jopt-simple-4.9 b/metadata/md5-cache/dev-java/jopt-simple-4.9
index 47836e788712..d12c339a0ee0 100644
--- a/metadata/md5-cache/dev-java/jopt-simple-4.9
+++ b/metadata/md5-cache/dev-java/jopt-simple-4.9
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/pholser/jopt-simple/tarball/jopt-simple-4.9 -> jopt-simple-4.9.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1034528d10e1f9f8ba7b63caaa6d8df2
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=291ff0c479e25abc37b71453ca1a1004
diff --git a/metadata/md5-cache/dev-java/jortho-1.0 b/metadata/md5-cache/dev-java/jortho-1.0
index dd898d1c1045..34cb22a20e0d 100644
--- a/metadata/md5-cache/dev-java/jortho-1.0
+++ b/metadata/md5-cache/dev-java/jortho-1.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/project/jortho/JOrtho%20Library/1.0/JOrtho_1.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=57c4e1cad73b4e0189722af1c53c37a6
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0ecbeff852119e92573e5d5326042d32
diff --git a/metadata/md5-cache/dev-java/jreleaseinfo-1.3.0-r2 b/metadata/md5-cache/dev-java/jreleaseinfo-1.3.0-r2
index 1d62f8a325bf..ed0a0d577ce6 100644
--- a/metadata/md5-cache/dev-java/jreleaseinfo-1.3.0-r2
+++ b/metadata/md5-cache/dev-java/jreleaseinfo-1.3.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jreleaseinfo/jreleaseinfo-1.3.0-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=91d55d6b447b34cf5409cd7cd06af15a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=68803e238dde5d92e5daa68b1ca8bb12
diff --git a/metadata/md5-cache/dev-java/jrexx-1.1.1-r2 b/metadata/md5-cache/dev-java/jrexx-1.1.1-r2
index 1f8e7e708cf4..e0b518a5cda1 100644
--- a/metadata/md5-cache/dev-java/jrexx-1.1.1-r2
+++ b/metadata/md5-cache/dev-java/jrexx-1.1.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/jrexx/jrexx-1.1.1-src.zip -> jrexx-1.1.1.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ecfde31cb328525d6a1d51941fb8921b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b80d652cc2cacd109e597c42c76ac6a9
diff --git a/metadata/md5-cache/dev-java/jrobin-1.6.0-r1 b/metadata/md5-cache/dev-java/jrobin-1.6.0-r1
index 930ae750c462..360e14ffd39d 100644
--- a/metadata/md5-cache/dev-java/jrobin-1.6.0-r1
+++ b/metadata/md5-cache/dev-java/jrobin-1.6.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/OpenNMS/jrobin/archive/jrobin-1.6.0-1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ce528f31a536e9a35eef395ef22a4140
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=bf6a8c273a08665f33c99248ac57adda
diff --git a/metadata/md5-cache/dev-java/jrrd-1.0.1-r1 b/metadata/md5-cache/dev-java/jrrd-1.0.1-r1
index 915fe2aa0083..dd6e2fa54793 100644
--- a/metadata/md5-cache/dev-java/jrrd-1.0.1-r1
+++ b/metadata/md5-cache/dev-java/jrrd-1.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 net-analyzer/rrdtool >=dev-java/java-config-2.2.0-r3 >
 SLOT=0
 SRC_URI=mirror://sourceforge/opennms/jrrd-1.0.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:- src_install:-
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	libtool	84763589a795fb127b537cac01e5359f	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=74bf1226c798fbcf93303c2d0985f88e
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	base	df2aa567b3f0595aae0d0923889f7631	eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	48b1b9f6194d2842456514d1184ca72e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f9f47542b9349a1a89ecd86a07862f93
diff --git a/metadata/md5-cache/dev-java/jruby-1.7.12 b/metadata/md5-cache/dev-java/jruby-1.7.12
index 532b2f28064a..42359edb920e 100644
--- a/metadata/md5-cache/dev-java/jruby-1.7.12
+++ b/metadata/md5-cache/dev-java/jruby-1.7.12
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://jruby.org.s3.amazonaws.com/downloads/1.7.12/jruby-src-1.7.12.tar.gz https://dev.gentoo.org/~tomwij/files/dist/jruby-1.7.12-mvn-ant-ant.patch
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e9a8528c53693ab0f23c2f0ae7346246
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c455f41f06610378330d0dba478cf801
diff --git a/metadata/md5-cache/dev-java/jsap-2.1-r2 b/metadata/md5-cache/dev-java/jsap-2.1-r2
index 0f3b985bb32e..8d5f93960545 100644
--- a/metadata/md5-cache/dev-java/jsap-2.1-r2
+++ b/metadata/md5-cache/dev-java/jsap-2.1-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xstream:0 dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java
 SLOT=0
 SRC_URI=mirror://sourceforge/jsap/JSAP-2.1-src.tar.gz -> jsap-2.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fd1ee1ff279279f0c3470bec7f6f05dd
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=73a464b058edc4e5c0504aaa6ae03d8a
diff --git a/metadata/md5-cache/dev-java/jsch-0.1.52 b/metadata/md5-cache/dev-java/jsch-0.1.52
index 6542a772aad1..9c2f7e2ec836 100644
--- a/metadata/md5-cache/dev-java/jsch-0.1.52
+++ b/metadata/md5-cache/dev-java/jsch-0.1.52
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 zlib? ( dev-java/jzlib:0 ) >=dev-java/java-config-2.2.
 SLOT=0
 SRC_URI=mirror://sourceforge/jsch/jsch-0.1.52.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=120f063b70d1d307abf9e1f0450f703a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-osgi	469f5c3bd9c193e463ffa6ccb1e2f1f4	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0de606fed8646fc440b813f0a689fa22
diff --git a/metadata/md5-cache/dev-java/json-20150729 b/metadata/md5-cache/dev-java/json-20150729
index 499990799f01..6d2595b21612 100644
--- a/metadata/md5-cache/dev-java/json-20150729
+++ b/metadata/md5-cache/dev-java/json-20150729
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/douglascrockford/JSON-java/archive/20150729.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5e4cd8a419120cf1448e7596a97093ea
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7b404f89c94da4472d29667bf3622a90
diff --git a/metadata/md5-cache/dev-java/json-20160212 b/metadata/md5-cache/dev-java/json-20160212
index 16cc01147fdf..c8a75445840e 100644
--- a/metadata/md5-cache/dev-java/json-20160212
+++ b/metadata/md5-cache/dev-java/json-20160212
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/douglascrockford/JSON-java/archive/20160212.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=981ab9eecaa4ab89aeecb1acf5823815
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=60aa1222badd362a6101e8451e3fa7bb
diff --git a/metadata/md5-cache/dev-java/json-simple-1.1 b/metadata/md5-cache/dev-java/json-simple-1.1
index 04782daed16f..50a1f09fe8e9 100644
--- a/metadata/md5-cache/dev-java/json-simple-1.1
+++ b/metadata/md5-cache/dev-java/json-simple-1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://json-simple.googlecode.com/files/json_simple-1.1-all.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=74f0f038b9a72d27ff00d3d186af0d17
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b7585ec9702be2db29e50089cb7f23e5
diff --git a/metadata/md5-cache/dev-java/jsoup-1.8.3 b/metadata/md5-cache/dev-java/jsoup-1.8.3
index 0289233792d2..60251859a2bb 100644
--- a/metadata/md5-cache/dev-java/jsoup-1.8.3
+++ b/metadata/md5-cache/dev-java/jsoup-1.8.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/jhy/jsoup/archive/jsoup-1.8.3a.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_test:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=08aa504f17d71c9e41940f02dd269d12
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ec837b26ed99a493175e522042533f4f
diff --git a/metadata/md5-cache/dev-java/jspeex-0.9.7-r1 b/metadata/md5-cache/dev-java/jspeex-0.9.7-r1
index 518b52335c4a..d8bc6914fc07 100644
--- a/metadata/md5-cache/dev-java/jspeex-0.9.7-r1
+++ b/metadata/md5-cache/dev-java/jspeex-0.9.7-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 so
 SLOT=0
 SRC_URI=mirror://sourceforge/jspeex/jspeex-0.9.7.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:base src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c70192c5ec931f00c59287731f94e1f3
+_eclasses_=base	df2aa567b3f0595aae0d0923889f7631	eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c6b746607334263fcaecbba41cf93dc4
diff --git a/metadata/md5-cache/dev-java/jsr101-1.4-r3 b/metadata/md5-cache/dev-java/jsr101-1.4-r3
index ec7cc953b959..cf0a5d75e0de 100644
--- a/metadata/md5-cache/dev-java/jsr101-1.4-r3
+++ b/metadata/md5-cache/dev-java/jsr101-1.4-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 java-virtuals/saaj-api:0 java-virtuals/servlet-api:3.0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/jsr101-1.4.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9d1e7c77eef3dd1e7f0dd377da9d2979
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=68342d5741f1d7c0c246b741434ac608
diff --git a/metadata/md5-cache/dev-java/jsr173-1.0-r1 b/metadata/md5-cache/dev-java/jsr173-1.0-r1
index 6d2cc38b014a..da6438a48164 100644
--- a/metadata/md5-cache/dev-java/jsr173-1.0-r1
+++ b/metadata/md5-cache/dev-java/jsr173-1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.3 dev-java/jaxme >=dev-java/java-config-2.2.0-r3 >=sys-a
 SLOT=0
 SRC_URI=http://ftpna2.bea.com/pub/downloads/jsr173.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=194ec20ca81f6429814fda18489add48
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a6c1257c4fc8cae34a3280ec12671ee5
diff --git a/metadata/md5-cache/dev-java/jsr173-1.0-r2 b/metadata/md5-cache/dev-java/jsr173-1.0-r2
index 586370af61f2..6bd0e31846d2 100644
--- a/metadata/md5-cache/dev-java/jsr173-1.0-r2
+++ b/metadata/md5-cache/dev-java/jsr173-1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jaxme:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 sourc
 SLOT=0
 SRC_URI=http://ftpna2.bea.com/pub/downloads/jsr173.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=20ce70d59f50e263ea5c64d21e1a26dc
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=cefe7b3e7da753197acd10a3bd7fa419
diff --git a/metadata/md5-cache/dev-java/jsr173-1.0-r3 b/metadata/md5-cache/dev-java/jsr173-1.0-r3
index 15a300bef9da..3372bcd7630d 100644
--- a/metadata/md5-cache/dev-java/jsr173-1.0-r3
+++ b/metadata/md5-cache/dev-java/jsr173-1.0-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jaxme:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 sourc
 SLOT=0
 SRC_URI=http://ftpna2.bea.com/pub/downloads/jsr173.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=95bc9313711db62e5c27dceda885f402
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b50059da69571586f8232d9b889a86f4
diff --git a/metadata/md5-cache/dev-java/jsr181-1.0-r2 b/metadata/md5-cache/dev-java/jsr181-1.0-r2
index e1e01e30a5d7..4d65638cc887 100644
--- a/metadata/md5-cache/dev-java/jsr181-1.0-r2
+++ b/metadata/md5-cache/dev-java/jsr181-1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://central.maven.org/maven2/javax/jws/jsr181-api/1.0-MR1/jsr181-api-1.0-MR1-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e1e23c9b15d94cf402a617d284f80432
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=22e22595689df4512f6a531006e57b14
diff --git a/metadata/md5-cache/dev-java/jsr223-1.0-r2 b/metadata/md5-cache/dev-java/jsr223-1.0-r2
index 21086f33fc05..c52dac91ebdf 100644
--- a/metadata/md5-cache/dev-java/jsr223-1.0-r2
+++ b/metadata/md5-cache/dev-java/jsr223-1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://gentoo/jsr223-openjdk-6-src-b19.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=496e455ec521d466182a7d7615fc1a47
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=65613ae5136184e9a06c9597b6a110d6
diff --git a/metadata/md5-cache/dev-java/jsr225-1.0 b/metadata/md5-cache/dev-java/jsr225-1.0
index 6e7a4d7c7797..82f99d142dd4 100644
--- a/metadata/md5-cache/dev-java/jsr225-1.0
+++ b/metadata/md5-cache/dev-java/jsr225-1.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/cfoster/xqj-api-1.0.0/raw/master/javax/xml/xquery/xqj-api/1.0/xqj-api-1.0-sources.jar -> jsr225-1.0.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b3a6a16c5c1d1d55a6adfe2c7f0bb818
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a2832b6b086c32f570d012dd949ddbb5
diff --git a/metadata/md5-cache/dev-java/jsr250-1.2 b/metadata/md5-cache/dev-java/jsr250-1.2
index 5f1f086c571d..f0bc0b147994 100644
--- a/metadata/md5-cache/dev-java/jsr250-1.2
+++ b/metadata/md5-cache/dev-java/jsr250-1.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2-sources.jar -> jsr250-1.2.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=469bb98ddae5cb595a5a7ad1532e4866
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=fcb412822ad04c1fcbf66a18dbf6c75d
diff --git a/metadata/md5-cache/dev-java/jsr305-3.0.1 b/metadata/md5-cache/dev-java/jsr305-3.0.1
index 17a32a176ddb..683096539d68 100644
--- a/metadata/md5-cache/dev-java/jsr305-3.0.1
+++ b/metadata/md5-cache/dev-java/jsr305-3.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://central.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ee6349d4a0bc3f4998d6e024d2d6ffd3
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=eec7696a9519e1d52a7bfe7a55fadf08
diff --git a/metadata/md5-cache/dev-java/jsr311-api-1.1.1 b/metadata/md5-cache/dev-java/jsr311-api-1.1.1
index da630b25a53a..21739bdca6e4 100644
--- a/metadata/md5-cache/dev-java/jsr311-api-1.1.1
+++ b/metadata/md5-cache/dev-java/jsr311-api-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9bff8f0c6d6bdb336b167fcb83416226
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d9267f51129fbebd084011565a577bc8
diff --git a/metadata/md5-cache/dev-java/jsr322-1.5 b/metadata/md5-cache/dev-java/jsr322-1.5
index 16883f31b7e3..be7e597bd167 100644
--- a/metadata/md5-cache/dev-java/jsr322-1.5
+++ b/metadata/md5-cache/dev-java/jsr322-1.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/javax/resource/connector-api/1.5/connector-api-1.5-sources.jar -> jsr322-1.5.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2b021afdba0c9b815f6bfb28fb425439
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=23cb0595b8bf58a4c9c2500b01b2aeed
diff --git a/metadata/md5-cache/dev-java/jsr67-1.3-r1 b/metadata/md5-cache/dev-java/jsr67-1.3-r1
index d562f169eb7d..4b3c15f1079d 100644
--- a/metadata/md5-cache/dev-java/jsr67-1.3-r1
+++ b/metadata/md5-cache/dev-java/jsr67-1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/sun/xml/messaging/saaj/saaj-impl/1.3/saaj-impl-1.3-sources.jar -> jsr67-1.3.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9385e4e365df005ad23c4410e78f9321
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c2be0304b20e39b97206358694681269
diff --git a/metadata/md5-cache/dev-java/jss-4.3.2 b/metadata/md5-cache/dev-java/jss-4.3.2
index 452e83343721..ca7610be4c34 100644
--- a/metadata/md5-cache/dev-java/jss-4.3.2
+++ b/metadata/md5-cache/dev-java/jss-4.3.2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=3.4
 SRC_URI=https://dev.gentoo.org/~chewi/distfiles/jss-4.3.2.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=35bf46e1271905a71a2d010eafa57923
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3ecfdb3992479889e3532fb0c35dc4fc
diff --git a/metadata/md5-cache/dev-java/jssc-2.8.0-r1 b/metadata/md5-cache/dev-java/jssc-2.8.0-r1
index 7deef744ea46..a71d1b9cfdc9 100644
--- a/metadata/md5-cache/dev-java/jssc-2.8.0-r1
+++ b/metadata/md5-cache/dev-java/jssc-2.8.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/scream3r/java-simple-serial-connector/archive/2.8.0.zip -> jssc-2.8.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=370a351dcd968b491e861c9a43c1f96d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b238f6570dbc2e7cadfe16a8040b61f6
diff --git a/metadata/md5-cache/dev-java/jstun-0.7.3 b/metadata/md5-cache/dev-java/jstun-0.7.3
index 860c11a2891d..2385425fc7ad 100644
--- a/metadata/md5-cache/dev-java/jstun-0.7.3
+++ b/metadata/md5-cache/dev-java/jstun-0.7.3
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://jstun.javawi.de/jstun-0.7.3.src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=68690ff58106e0d871e5fa645bc6e8b2
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=fab3417b6d18672ed5466c0d202dae97
diff --git a/metadata/md5-cache/dev-java/jta-1.0.1-r1 b/metadata/md5-cache/dev-java/jta-1.0.1-r1
index 5b89426a30fb..d90adee922c2 100644
--- a/metadata/md5-cache/dev-java/jta-1.0.1-r1
+++ b/metadata/md5-cache/dev-java/jta-1.0.1-r1
@@ -11,5 +11,5 @@ RESTRICT=fetch
 SLOT=0
 SRC_URI=jta-1_0_1B-classes.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=186854830121eacd3157b9126b3fa2b2
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f11d9ce4c8c74d22dd357171b1ec55e4
diff --git a/metadata/md5-cache/dev-java/jta-1.1 b/metadata/md5-cache/dev-java/jta-1.1
index b4281d56cb08..99384b5be648 100644
--- a/metadata/md5-cache/dev-java/jta-1.1
+++ b/metadata/md5-cache/dev-java/jta-1.1
@@ -11,5 +11,5 @@ RESTRICT=fetch
 SLOT=0
 SRC_URI=jta-1_1-classes.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5e0cefdf89546e6abdef13eb4a680867
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d01c9e666f72517281ee91f9c8be8da4
diff --git a/metadata/md5-cache/dev-java/jtds-1.3.1 b/metadata/md5-cache/dev-java/jtds-1.3.1
index 252dd2bc3045..06a024c70396 100644
--- a/metadata/md5-cache/dev-java/jtds-1.3.1
+++ b/metadata/md5-cache/dev-java/jtds-1.3.1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=1.3
 SRC_URI=mirror://sourceforge/jtds/jtds-1.3.1-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1146108a3bfda1dd4a62b057b67f3645
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b1ea4fb9465118316d10fc1d637a58d2
diff --git a/metadata/md5-cache/dev-java/jtidy-1.0 b/metadata/md5-cache/dev-java/jtidy-1.0
index b81673e673b0..9762357c5f32 100644
--- a/metadata/md5-cache/dev-java/jtidy-1.0
+++ b/metadata/md5-cache/dev-java/jtidy-1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 so
 SLOT=0
 SRC_URI=mirror://sourceforge/jtidy/jtidy-r938-sources.zip -> jtidy-1.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=72b2a24f76ab6474f6e991d4ea2fc50d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=520505db054e83f36b44f002f2dd3c9c
diff --git a/metadata/md5-cache/dev-java/jtreemap-1.1.0-r1 b/metadata/md5-cache/dev-java/jtreemap-1.1.0-r1
index 3604b27c1dd4..f25c64c57108 100644
--- a/metadata/md5-cache/dev-java/jtreemap-1.1.0-r1
+++ b/metadata/md5-cache/dev-java/jtreemap-1.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/jtreemap/jtreemap-1.1.0-src.zip -> jtreemap-1.1.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d4b9f141a3690b64da8d6279ed630e5e
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ab9af3c7443e60186d3f81146f136f86
diff --git a/metadata/md5-cache/dev-java/jts-core-1.14 b/metadata/md5-cache/dev-java/jts-core-1.14
index 8335eace40b1..079ab32a82a4 100644
--- a/metadata/md5-cache/dev-java/jts-core-1.14
+++ b/metadata/md5-cache/dev-java/jts-core-1.14
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/dr-jts/jts/archive/f67d35c1da06922c8165f66a919490ee94a04649.tar.gz -> jts-1.14.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_test:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2af88159c367aa24d0024590b9cbb697
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1b90fadf0900a38c34a27ea220dd5c71
diff --git a/metadata/md5-cache/dev-java/juel-2.1.0-r2 b/metadata/md5-cache/dev-java/juel-2.1.0-r2
index 3b79a6a4d840..7dd4a6135738 100644
--- a/metadata/md5-cache/dev-java/juel-2.1.0-r2
+++ b/metadata/md5-cache/dev-java/juel-2.1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/juel/juel-2.1.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=78e0dedbae633882811e39de32530bac
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ba13be2954f565c8e798e73dbb352a13
diff --git a/metadata/md5-cache/dev-java/jump-0.5-r1 b/metadata/md5-cache/dev-java/jump-0.5-r1
index b1237a9bd29d..bac6bad25c38 100644
--- a/metadata/md5-cache/dev-java/jump-0.5-r1
+++ b/metadata/md5-cache/dev-java/jump-0.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/jump-math/jump-0.5.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=416a269dbd0033e5a7d2c6b14b378173
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5c52f7a08c92782e1fef25680c717481
diff --git a/metadata/md5-cache/dev-java/jung-1.7.6 b/metadata/md5-cache/dev-java/jung-1.7.6
index ed204c7856b0..603433af31d8 100644
--- a/metadata/md5-cache/dev-java/jung-1.7.6
+++ b/metadata/md5-cache/dev-java/jung-1.7.6
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/colt:0 dev-java/commons-collections >=dev-jav
 SLOT=0
 SRC_URI=mirror://sourceforge/jung/jung-1.7.6.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=56390b68437ed75ae94ac7abdd694791
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4d2b2df627c3d84b09a90bf709dd91ef
diff --git a/metadata/md5-cache/dev-java/jung-1.7.6-r1 b/metadata/md5-cache/dev-java/jung-1.7.6-r1
index d7d9e83ce5dd..e0e3abed84b7 100644
--- a/metadata/md5-cache/dev-java/jung-1.7.6-r1
+++ b/metadata/md5-cache/dev-java/jung-1.7.6-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/colt:0 dev-java/commons-collections:0 >=virtual/jre-1.6 >=dev-j
 SLOT=0
 SRC_URI=mirror://sourceforge/jung/jung-1.7.6.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=60c242bb4d4c38c79614cce756948c0b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a12d6bd10b3cc6e804324cdd270ed7be
diff --git a/metadata/md5-cache/dev-java/junit-3.8.2-r1 b/metadata/md5-cache/dev-java/junit-3.8.2-r1
index e40a3015f07b..64667e67aa54 100644
--- a/metadata/md5-cache/dev-java/junit-3.8.2-r1
+++ b/metadata/md5-cache/dev-java/junit-3.8.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/junit/junit3.8.2.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=57351919d3f34a35ca23ce9a0153497f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e4bff82a99ea91157987abee55645281
diff --git a/metadata/md5-cache/dev-java/junit-4.12-r1 b/metadata/md5-cache/dev-java/junit-4.12-r1
index be172732713b..8d6058a2227f 100644
--- a/metadata/md5-cache/dev-java/junit-4.12-r1
+++ b/metadata/md5-cache/dev-java/junit-4.12-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/hamcrest-core:1.3 >=dev-java/java-config-2.2.
 SLOT=4
 SRC_URI=https://github.com/junit-team/junit4/archive/r4.12.tar.gz -> junit4-r4.12.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d9097cb0db029f69cdf6799343d1cd4e
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c5d64ba1e460393574f90a672ec1ef77
diff --git a/metadata/md5-cache/dev-java/junit-addons-1.4-r1 b/metadata/md5-cache/dev-java/junit-addons-1.4-r1
index dff46fbcb25b..79192a93903b 100644
--- a/metadata/md5-cache/dev-java/junit-addons-1.4-r1
+++ b/metadata/md5-cache/dev-java/junit-addons-1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/junit:0 dev-java/ant-core:0 dev-java/jdom:0 d
 SLOT=0
 SRC_URI=mirror://sourceforge/junit-addons/junit-addons-1.4.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=28e01f74b288e985e0d13b7a28b36218
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=92f017acf1d126d5277af68859f28704
diff --git a/metadata/md5-cache/dev-java/junitperf-1.9.1-r2 b/metadata/md5-cache/dev-java/junitperf-1.9.1-r2
index 1379607d7c27..5a48904f48ac 100644
--- a/metadata/md5-cache/dev-java/junitperf-1.9.1-r2
+++ b/metadata/md5-cache/dev-java/junitperf-1.9.1-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 sourc
 SLOT=0
 SRC_URI=http://www.clarkware.com/software/junitperf-1.9.1.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=65be98ebfda27242660f33fc3127dec5
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=721ec6c0ca1d7fa988c6bd08247d1774
diff --git a/metadata/md5-cache/dev-java/junrar-0.6 b/metadata/md5-cache/dev-java/junrar-0.6
index cef70485a67d..69aed97d6578 100644
--- a/metadata/md5-cache/dev-java/junrar-0.6
+++ b/metadata/md5-cache/dev-java/junrar-0.6
@@ -10,5 +10,5 @@ RDEPEND=dev-java/commons-logging:0 dev-java/commons-vfs:2 >=virtual/jre-1.5 >=de
 SLOT=0
 SRC_URI=https://github.com/edmund-wagner/junrar/archive/junrar-0.6.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:vcs-snapshot src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3ad6710a35583d6875c32c9f352f1def
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=469d45623bcdd9f70abdcb61bcb8af9c
diff --git a/metadata/md5-cache/dev-java/jupidator-0.6.0 b/metadata/md5-cache/dev-java/jupidator-0.6.0
index 723d87434c21..1ab6377c394c 100644
--- a/metadata/md5-cache/dev-java/jupidator-0.6.0
+++ b/metadata/md5-cache/dev-java/jupidator-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/ant-core >=dev-java/java-config-2.2.0-r3 sour
 SLOT=0
 SRC_URI=mirror://sourceforge/jupidator/jupidator.0.6.0.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=92649537d35d888d2c47387758ca8f89
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e0769396ba4595000b478417c029c4a1
diff --git a/metadata/md5-cache/dev-java/jupidator-0.6.0-r1 b/metadata/md5-cache/dev-java/jupidator-0.6.0-r1
index a6bf35ca68c0..a3ee33acb618 100644
--- a/metadata/md5-cache/dev-java/jupidator-0.6.0-r1
+++ b/metadata/md5-cache/dev-java/jupidator-0.6.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/jupidator/jupidator.0.6.0.tar.bz2 -> jupidator-0.6.0.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=04b9b868e4614fa3ae9db4218fc90d39
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=62564d60c5b47298b1bcd45d7a6414ec
diff --git a/metadata/md5-cache/dev-java/jusb-0.4.4-r1 b/metadata/md5-cache/dev-java/jusb-0.4.4-r1
index 37be54dc8652..46f70b397bf8 100644
--- a/metadata/md5-cache/dev-java/jusb-0.4.4-r1
+++ b/metadata/md5-cache/dev-java/jusb-0.4.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/jusb/jusb-0.4.4-src.tgz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:- src_unpack:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	flag-o-matic	35067884fbff37bc0c8e7421c5315558	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=473b7317de244a751beeeec485862814
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	flag-o-matic	979af9133d4de419fa98992355b07ca4	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=16fb6fb811c217479fd51ced0f1cfd01
diff --git a/metadata/md5-cache/dev-java/jutils-1.0.0-r1 b/metadata/md5-cache/dev-java/jutils-1.0.0-r1
index 42650920fbd8..6f35edf19ce3 100644
--- a/metadata/md5-cache/dev-java/jutils-1.0.0-r1
+++ b/metadata/md5-cache/dev-java/jutils-1.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://central.maven.org/maven2/net/java/jutils/jutils/1.0.0/jutils-1.0.0-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b3458fe9d32afe3173e1516544606ba9
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d11d190825ada64cea0de3c52d9fdcc2
diff --git a/metadata/md5-cache/dev-java/jvmstat-3.0 b/metadata/md5-cache/dev-java/jvmstat-3.0
index a0d726da81c2..b2affe6e1c03 100644
--- a/metadata/md5-cache/dev-java/jvmstat-3.0
+++ b/metadata/md5-cache/dev-java/jvmstat-3.0
@@ -11,5 +11,5 @@ RESTRICT=fetch strip
 SLOT=0
 SRC_URI=jvmstat-3_0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b0b4a46e47841769b9d33f45d668aae3
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6883ca479ceed3389c94750f3f24ca36
diff --git a/metadata/md5-cache/dev-java/jvyaml-0.2.1-r2 b/metadata/md5-cache/dev-java/jvyaml-0.2.1-r2
index 5a5ca62ecc1f..92d9dfcc6ed8 100644
--- a/metadata/md5-cache/dev-java/jvyaml-0.2.1-r2
+++ b/metadata/md5-cache/dev-java/jvyaml-0.2.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://gentoo/jvyaml-src-0.2.1.tar.gz -> jvyaml-0.2.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=dea86f8dca6b2cad2cf1344d6ee25b29
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=dd65a4de08bceda421096b78a1174a11
diff --git a/metadata/md5-cache/dev-java/jvyamlb-0.2.5 b/metadata/md5-cache/dev-java/jvyamlb-0.2.5
index f7a405acc27d..617e9685b234 100644
--- a/metadata/md5-cache/dev-java/jvyamlb-0.2.5
+++ b/metadata/md5-cache/dev-java/jvyamlb-0.2.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/bytelist:0 dev-java/jcodings:0 dev-java/joda-
 SLOT=0
 SRC_URI=https://jvyamlb.googlecode.com/files/jvyamlb-src-0.2.5.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=124c0d3d8e79f84751ffbc0f3e989a95
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=168c481bd14a9d383d53ab6f6025165e
diff --git a/metadata/md5-cache/dev-java/jython-2.7.0 b/metadata/md5-cache/dev-java/jython-2.7.0
index d49bf14dbabb..c2dc404de42b 100644
--- a/metadata/md5-cache/dev-java/jython-2.7.0
+++ b/metadata/md5-cache/dev-java/jython-2.7.0
@@ -12,5 +12,5 @@ RESTRICT=test
 SLOT=2.7
 SRC_URI=http://search.maven.org/remotecontent?filepath=org/python/jython/2.7.0/jython-2.7.0-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	flag-o-matic	35067884fbff37bc0c8e7421c5315558	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	python-utils-r1	50dad5f912d4c16c130f5679777f25e8	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=423457b9ae94b9b3321d3fc32e42a618
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	flag-o-matic	979af9133d4de419fa98992355b07ca4	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	python-utils-r1	316c531873247e48befb99900e5aa2ed	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=627ccdd238320371b93815bba75128f1
diff --git a/metadata/md5-cache/dev-java/jython-2.7.0-r1 b/metadata/md5-cache/dev-java/jython-2.7.0-r1
index 38726749bf5d..0c2556f80986 100644
--- a/metadata/md5-cache/dev-java/jython-2.7.0-r1
+++ b/metadata/md5-cache/dev-java/jython-2.7.0-r1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=2.7
 SRC_URI=http://search.maven.org/remotecontent?filepath=org/python/jython/2.7.0/jython-2.7.0-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_configure:- src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	flag-o-matic	35067884fbff37bc0c8e7421c5315558	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	python-utils-r1	50dad5f912d4c16c130f5679777f25e8	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0f3e2533030d76c4eb5aea3ebcb41eed
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	flag-o-matic	979af9133d4de419fa98992355b07ca4	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	python-utils-r1	316c531873247e48befb99900e5aa2ed	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a5124eedb450a61eb582f768c5b66fd3
diff --git a/metadata/md5-cache/dev-java/jzlib-1.0.7-r2 b/metadata/md5-cache/dev-java/jzlib-1.0.7-r2
index 784d80827a37..4d35553298ec 100644
--- a/metadata/md5-cache/dev-java/jzlib-1.0.7-r2
+++ b/metadata/md5-cache/dev-java/jzlib-1.0.7-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://www.jcraft.com/jzlib/jzlib-1.0.7.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=26c258219a97cb2dd9e8696c1dac52aa
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=89e3f34ea5057c122f51298d420936c2
diff --git a/metadata/md5-cache/dev-java/jzlib-1.1.1 b/metadata/md5-cache/dev-java/jzlib-1.1.1
index 18ca2a308802..25f9d57ac523 100644
--- a/metadata/md5-cache/dev-java/jzlib-1.1.1
+++ b/metadata/md5-cache/dev-java/jzlib-1.1.1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=1.1
 SRC_URI=http://www.jcraft.com/jzlib/jzlib-1.1.1.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=be226e4181eae083aae261b796502a15
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=57ebf645a38e09d48ab45a1b51aeca90
diff --git a/metadata/md5-cache/dev-java/jzlib-1.1.3 b/metadata/md5-cache/dev-java/jzlib-1.1.3
index fad66d017aa2..4d556d33c457 100644
--- a/metadata/md5-cache/dev-java/jzlib-1.1.3
+++ b/metadata/md5-cache/dev-java/jzlib-1.1.3
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=1.1.3
 SRC_URI=https://github.com/ymnk/jzlib/archive/1.1.3.zip -> jzlib-1.1.3.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=da595e89e10a1705bd2ac2cd2be6f2ef
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7bd60d7f992d2b63867980a83259ead6
diff --git a/metadata/md5-cache/dev-java/kryo-2.24.0 b/metadata/md5-cache/dev-java/kryo-2.24.0
index 216e2c6dc3d4..94e37cc47433 100644
--- a/metadata/md5-cache/dev-java/kryo-2.24.0
+++ b/metadata/md5-cache/dev-java/kryo-2.24.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/objenesis:0 dev-java/reflectasm:0 dev-java/minlog:0 >=virtual/j
 SLOT=2
 SRC_URI=https://github.com/EsotericSoftware/kryo/archive/kryo-2.24.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_compile:java-pkg-simple src_test:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=552a53c9dbd1947d0a5dfb43d2e22ab4
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5d3c6c4ade48ab3f6c2e5aea9dbcf22f
diff --git a/metadata/md5-cache/dev-java/kunststoff-2.0.2-r1 b/metadata/md5-cache/dev-java/kunststoff-2.0.2-r1
index 4f2ff5f40c1d..aa19c5b17b30 100644
--- a/metadata/md5-cache/dev-java/kunststoff-2.0.2-r1
+++ b/metadata/md5-cache/dev-java/kunststoff-2.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=2.0
 SRC_URI=http://www.incors.org/archive/kunststoff-2_0_2.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2fd5e0f42578907b3b6d1b33a7814ef8
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=fdf0570457d0a40afe2222e294ee4f15
diff --git a/metadata/md5-cache/dev-java/kxml-2.3.0 b/metadata/md5-cache/dev-java/kxml-2.3.0
index 8ff4420b1ee0..396f408709b7 100644
--- a/metadata/md5-cache/dev-java/kxml-2.3.0
+++ b/metadata/md5-cache/dev-java/kxml-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xpp3:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source
 SLOT=2
 SRC_URI=mirror://sourceforge/kxml/kxml2-src-2.3.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=515b382902ddfb665f930d056fe52973
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e7c066dba1d92c3e7a4749ad3fe5846c
diff --git a/metadata/md5-cache/dev-java/l2fprod-common-7.3-r2 b/metadata/md5-cache/dev-java/l2fprod-common-7.3-r2
index 11f62623557c..623111466e8c 100644
--- a/metadata/md5-cache/dev-java/l2fprod-common-7.3-r2
+++ b/metadata/md5-cache/dev-java/l2fprod-common-7.3-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/nachocalendar:0 dev-java/jcalendar:1.2 >=dev-
 SLOT=0
 SRC_URI=mirror://gentoo/l2fprod-common-7.3.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7e941a0ca88bc29da2bd998722116f89
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=96acb5be1c0702ec59ce26a1d3869499
diff --git a/metadata/md5-cache/dev-java/laf-plugin-0.2-r1 b/metadata/md5-cache/dev-java/laf-plugin-0.2-r1
index a285e561c3c0..0b4dd4d21ac7 100644
--- a/metadata/md5-cache/dev-java/laf-plugin-0.2-r1
+++ b/metadata/md5-cache/dev-java/laf-plugin-0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://gentoo/laf-plugin-0.2-src.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=641c34d9dcaf743ac0dae20d6c2ee7c3
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9c47fc85b8934a054c81c678328fe107
diff --git a/metadata/md5-cache/dev-java/laf-plugin-1.1 b/metadata/md5-cache/dev-java/laf-plugin-1.1
index 0b5f6490e0cc..0b416a5a6899 100644
--- a/metadata/md5-cache/dev-java/laf-plugin-1.1
+++ b/metadata/md5-cache/dev-java/laf-plugin-1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/nanoxml:0 >=dev-java/java-config-2.2.0-r3 sou
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/net/java/dev/laf-plugin/laf-plugin/1.1/laf-plugin-1.1-sources.jar -> laf-plugin-1.1.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f433d7e91f16cc59536b30c1011b98d2
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2a5d5263c46adbaa86f51c840b9d0a7c
diff --git a/metadata/md5-cache/dev-java/ldapsdk-4.1.7-r4 b/metadata/md5-cache/dev-java/ldapsdk-4.1.7-r4
index fab8ee8355fc..3f6aad9be1b4 100644
--- a/metadata/md5-cache/dev-java/ldapsdk-4.1.7-r4
+++ b/metadata/md5-cache/dev-java/ldapsdk-4.1.7-r4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/jss:3.4 dev-java/jakarta-oro:2.0 >=dev-java/j
 SLOT=4.1
 SRC_URI=http://www.mozilla.org/directory/ldapsdk_java_20020819.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e08f92287e522d2718e339a5d29bface
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0d84497b79bbdb7d72722bc7368b1e96
diff --git a/metadata/md5-cache/dev-java/leiningen-bin-2.7.0 b/metadata/md5-cache/dev-java/leiningen-bin-2.7.0
index dd765fe5b972..7c8691dbc26b 100644
--- a/metadata/md5-cache/dev-java/leiningen-bin-2.7.0
+++ b/metadata/md5-cache/dev-java/leiningen-bin-2.7.0
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/technomancy/leiningen/releases/download/2.7.0/leiningen-2.7.0-standalone.zip -> leiningen-2.7.0-standalone.jar https://raw.githubusercontent.com/technomancy/leiningen/2.7.0/bin/lein-pkg -> leiningen-2.7.0.sh
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=79dd5adc1068562f89ec67177a8a33f1
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=12e9760c1019f32a7930fa8bf2722764
diff --git a/metadata/md5-cache/dev-java/leiningen-bin-2.7.1 b/metadata/md5-cache/dev-java/leiningen-bin-2.7.1
index 003f3236edc1..d51851bf9c52 100644
--- a/metadata/md5-cache/dev-java/leiningen-bin-2.7.1
+++ b/metadata/md5-cache/dev-java/leiningen-bin-2.7.1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/technomancy/leiningen/releases/download/2.7.1/leiningen-2.7.1-standalone.zip -> leiningen-2.7.1-standalone.jar https://raw.githubusercontent.com/technomancy/leiningen/2.7.1/bin/lein-pkg -> leiningen-2.7.1.sh
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=79dd5adc1068562f89ec67177a8a33f1
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=12e9760c1019f32a7930fa8bf2722764
diff --git a/metadata/md5-cache/dev-java/libg-2.1.0-r1 b/metadata/md5-cache/dev-java/libg-2.1.0-r1
index 839b785be385..f296f02f5e7c 100644
--- a/metadata/md5-cache/dev-java/libg-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/libg-2.1.0-r1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1cdc8377aef338e4276ee92c27ea9d0f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=cce0dc87133c79e2f85f024fae178440
diff --git a/metadata/md5-cache/dev-java/libmatthew-java-0.7.2-r1 b/metadata/md5-cache/dev-java/libmatthew-java-0.7.2-r1
index 0dde346e561e..aad46de90315 100644
--- a/metadata/md5-cache/dev-java/libmatthew-java-0.7.2-r1
+++ b/metadata/md5-cache/dev-java/libmatthew-java-0.7.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=0
 SRC_URI=http://www.matthew.ath.cx/projects/java/libmatthew-java-0.7.2.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	flag-o-matic	35067884fbff37bc0c8e7421c5315558	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1fdf6207db380d6d5c9c8cab8eff029c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	flag-o-matic	979af9133d4de419fa98992355b07ca4	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7b35f2fa6401e3c695004f8e94191b12
diff --git a/metadata/md5-cache/dev-java/libmso-0.1 b/metadata/md5-cache/dev-java/libmso-0.1
index 108abd354cd1..4d3f10d906fa 100644
--- a/metadata/md5-cache/dev-java/libmso-0.1
+++ b/metadata/md5-cache/dev-java/libmso-0.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 sys-apps/hwinfo dev-java/jinklevel:0 >=dev-java/java-c
 SLOT=0
 SRC_URI=https://mso.googlecode.com/files/libmso-0.1.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=cfa222c8797bf851d4aa52b05756aecb
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a9442b7a04d404a9bc4937e4fa182545
diff --git a/metadata/md5-cache/dev-java/libreadline-java-0.8.0-r3 b/metadata/md5-cache/dev-java/libreadline-java-0.8.0-r3
index 1a3300da4ef2..ce2ef794325c 100644
--- a/metadata/md5-cache/dev-java/libreadline-java-0.8.0-r3
+++ b/metadata/md5-cache/dev-java/libreadline-java-0.8.0-r3
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/java-readline/libreadline-java-0.8.0-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ecdc3c223cd23e97fc21c13a3a9981c7
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=802acd8a871f3afa4629642b60481906
diff --git a/metadata/md5-cache/dev-java/log4j-1.2.17-r3 b/metadata/md5-cache/dev-java/log4j-1.2.17-r3
index cd2e932b0662..f2a7a3b9f668 100644
--- a/metadata/md5-cache/dev-java/log4j-1.2.17-r3
+++ b/metadata/md5-cache/dev-java/log4j-1.2.17-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 javamail? ( dev-java/oracle-javamail:0 java-virtuals/j
 SLOT=0
 SRC_URI=mirror://apache/logging/log4j/1.2.17/log4j-1.2.17.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=46786f4e8d635f0f8378ef1151afa123
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0495180524cee7c35c7b1941aa750b63
diff --git a/metadata/md5-cache/dev-java/logback-1.0.13-r1 b/metadata/md5-cache/dev-java/logback-1.0.13-r1
index 352670495da9..5cb62067f879 100644
--- a/metadata/md5-cache/dev-java/logback-1.0.13-r1
+++ b/metadata/md5-cache/dev-java/logback-1.0.13-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jansi:0 dev-java/janino:0 dev-java/slf4j-api:0 dev-java/oracle-
 SLOT=0
 SRC_URI=http://logback.qos.ch/dist/logback-1.0.13.tar.gz https://dev.gentoo.org/~ercpe/distfiles/dev-java/logback/logback-1.0.13-build.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0db1da13eaa1b6715464780b2c3f180c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d3782a4b089575d4fd8c28b37298f85b
diff --git a/metadata/md5-cache/dev-java/lucene-1.4.3-r3 b/metadata/md5-cache/dev-java/lucene-1.4.3-r3
index 16d4d754bb93..70924042e021 100644
--- a/metadata/md5-cache/dev-java/lucene-1.4.3-r3
+++ b/metadata/md5-cache/dev-java/lucene-1.4.3-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=1
 SRC_URI=mirror://apache/lucene/java/archive/lucene-1.4.3-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=044c7fdb7be507d6a223afbc10bf0f79
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=44b181fc4a85d963d24bac985040dece
diff --git a/metadata/md5-cache/dev-java/lucene-2.4.1-r1 b/metadata/md5-cache/dev-java/lucene-2.4.1-r1
index 06695c61ca50..5891f775ec80 100644
--- a/metadata/md5-cache/dev-java/lucene-2.4.1-r1
+++ b/metadata/md5-cache/dev-java/lucene-2.4.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=2.4
 SRC_URI=mirror://apache/lucene/java/lucene-2.4.1-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=74da587faab26e0d6a720570e46d7624
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c5b4690b27e0a162b30dad9237008047
diff --git a/metadata/md5-cache/dev-java/lucene-3.5.0 b/metadata/md5-cache/dev-java/lucene-3.5.0
index 81bf6140a3da..deedbe112fe1 100644
--- a/metadata/md5-cache/dev-java/lucene-3.5.0
+++ b/metadata/md5-cache/dev-java/lucene-3.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=3.5
 SRC_URI=mirror://apache/lucene/java/3.5.0/lucene-3.5.0-src.tgz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0a292ecee3c93f5b8dd619f80f49598d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f1c58ae60acb12eb5a6d95f58eff6565
diff --git a/metadata/md5-cache/dev-java/lucene-3.6.2 b/metadata/md5-cache/dev-java/lucene-3.6.2
index 0d0d45b7fc7b..653f63a9f71b 100644
--- a/metadata/md5-cache/dev-java/lucene-3.6.2
+++ b/metadata/md5-cache/dev-java/lucene-3.6.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.5 contrib? ( dev-java/commons-beanutils:1.7 >=dev-java/c
 SLOT=3.6
 SRC_URI=mirror://apache/lucene/java/3.6.2/lucene-3.6.2-src.tgz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=07534aeba3871ccaffc4654b364adc77
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=31aa9747e05ed6aa0e575f3c4325849e
diff --git a/metadata/md5-cache/dev-java/lucene-analyzers-1.9.1-r1 b/metadata/md5-cache/dev-java/lucene-analyzers-1.9.1-r1
index fa0adb358880..c36a77e80ae6 100644
--- a/metadata/md5-cache/dev-java/lucene-analyzers-1.9.1-r1
+++ b/metadata/md5-cache/dev-java/lucene-analyzers-1.9.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=1.9
 SRC_URI=mirror://apache/lucene/java/lucene-1.9.1-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5362be898a16e19ccb7efc52281dd523
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-osgi	469f5c3bd9c193e463ffa6ccb1e2f1f4	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e593bce57cd00712c3c05a34961ae1dc
diff --git a/metadata/md5-cache/dev-java/lucene-analyzers-2.3.2 b/metadata/md5-cache/dev-java/lucene-analyzers-2.3.2
index 133bbd0bc082..9fec44c81231 100644
--- a/metadata/md5-cache/dev-java/lucene-analyzers-2.3.2
+++ b/metadata/md5-cache/dev-java/lucene-analyzers-2.3.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=2.3
 SRC_URI=mirror://apache/lucene/java/lucene-2.3.2-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=84015ae3faaa88e619cb14e6e7ceae58
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-osgi	469f5c3bd9c193e463ffa6ccb1e2f1f4	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7541a402509e87d23a56506ac6ddb4b4
diff --git a/metadata/md5-cache/dev-java/lzma-9.18 b/metadata/md5-cache/dev-java/lzma-9.18
index 1f890d322dda..54e5d9823c28 100644
--- a/metadata/md5-cache/dev-java/lzma-9.18
+++ b/metadata/md5-cache/dev-java/lzma-9.18
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/sevenzip/lzma918.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7d977c02f84a6326c5e9997c2710875c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5a18e7029cea04af3f2d5effb43d2a27
diff --git a/metadata/md5-cache/dev-java/lzmajio-0.95-r1 b/metadata/md5-cache/dev-java/lzmajio-0.95-r1
index 2600453b654f..1be498920aee 100644
--- a/metadata/md5-cache/dev-java/lzmajio-0.95-r1
+++ b/metadata/md5-cache/dev-java/lzmajio-0.95-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/lzma:0 >=dev-java/java-config-2.2.0-r3 source
 SLOT=0
 SRC_URI=http://comsci.liu.edu/~league/dist/lzmajio/lzmajio-0.95.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2cd582dbc79969d72b8792a7e944daa0
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0061ecaa9b89d5f32d62511c71aca7e4
diff --git a/metadata/md5-cache/dev-java/matrix-toolkits-java-0.9.12 b/metadata/md5-cache/dev-java/matrix-toolkits-java-0.9.12
index 1eebaf585835..c508d62fe782 100644
--- a/metadata/md5-cache/dev-java/matrix-toolkits-java-0.9.12
+++ b/metadata/md5-cache/dev-java/matrix-toolkits-java-0.9.12
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://matrix-toolkits-java.googlecode.com/files/mtj-0.9.12.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b2f039686c9fac42a9877b10b54034ca
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e5a6ebd9d52ce99ea89fd7d74cb7ad47
diff --git a/metadata/md5-cache/dev-java/maven-bin-1.1-r3 b/metadata/md5-cache/dev-java/maven-bin-1.1-r3
index 7fc2387a0a9f..90e78fa6502f 100644
--- a/metadata/md5-cache/dev-java/maven-bin-1.1-r3
+++ b/metadata/md5-cache/dev-java/maven-bin-1.1-r3
@@ -9,4 +9,4 @@ RDEPEND=>=virtual/jdk-1.5 app-eselect/eselect-java
 SLOT=1.1
 SRC_URI=mirror://apache/maven/maven-1/1.1/binaries/maven-1.1.tar.gz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_install:-
-_md5_=016e4e7b1251434b69e0662ec6a7219f
+_md5_=8f4924ab03dc46d411e973d362aa5942
diff --git a/metadata/md5-cache/dev-java/maven-bin-2.0.11-r2 b/metadata/md5-cache/dev-java/maven-bin-2.0.11-r2
index 86968fee8b94..1f3952469328 100644
--- a/metadata/md5-cache/dev-java/maven-bin-2.0.11-r2
+++ b/metadata/md5-cache/dev-java/maven-bin-2.0.11-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.4 app-eselect/eselect-java >=dev-java/java-config-2.2.0-
 SLOT=2.0
 SRC_URI=mirror://apache/maven/maven-2/2.0.11/binaries/apache-maven-2.0.11-bin.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postrm:- pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9d8d7d5388546747a854183929f8a53a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e90ba02a2104a19a3d7efdc54bb656fb
diff --git a/metadata/md5-cache/dev-java/maven-bin-2.2.1-r2 b/metadata/md5-cache/dev-java/maven-bin-2.2.1-r2
index 09c625b33553..40de82d7e378 100644
--- a/metadata/md5-cache/dev-java/maven-bin-2.2.1-r2
+++ b/metadata/md5-cache/dev-java/maven-bin-2.2.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.5 app-eselect/eselect-java >=dev-java/java-config-2.2.0-
 SLOT=2.2
 SRC_URI=mirror://apache/maven/maven-2/2.2.1/binaries/apache-maven-2.2.1-bin.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postrm:- pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=08b15e8b54ccaf44d1939a34c053b3b6
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=fb60cc4dca4eacd97262549a6a0285b9
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.0.4-r1 b/metadata/md5-cache/dev-java/maven-bin-3.0.4-r1
index fed6d86750ed..cdd999c9ac06 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.0.4-r1
+++ b/metadata/md5-cache/dev-java/maven-bin-3.0.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.5 app-eselect/eselect-java >=dev-java/java-config-2.2.0-
 SLOT=3.0
 SRC_URI=mirror://apache/maven/maven-3/3.0.4/binaries/apache-maven-3.0.4-bin.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postrm:- pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f3f815ed8533b42fe84d6427f8ac4e48
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=11ca67a1b0c31b62c40337fe0cdc1458
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.1.1 b/metadata/md5-cache/dev-java/maven-bin-3.1.1
index 06ba8fb0d453..0ec5c09c6224 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.1.1
+++ b/metadata/md5-cache/dev-java/maven-bin-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.5 app-eselect/eselect-java || ( dev-java/commons-logging
 SLOT=3.1
 SRC_URI=mirror://apache/maven/maven-3/3.1.1/binaries/apache-maven-3.1.1-bin.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postrm:- pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e2f5cdac03f2d34570dcb1878b883431
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=136ae24521281eea15ee317228f334e8
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.2.5 b/metadata/md5-cache/dev-java/maven-bin-3.2.5
index 2cbbd026c8db..3d2c592c2453 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.2.5
+++ b/metadata/md5-cache/dev-java/maven-bin-3.2.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.6 >=virtual/jre-1.6 app-eselect/eselect-java || ( dev-ja
 SLOT=3.2
 SRC_URI=mirror://apache/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postrm:- pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=075e8dddd93bae82404fb6a43e427173
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6a86e31133ac3725b42fcdec8cc9db14
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.3.3-r1 b/metadata/md5-cache/dev-java/maven-bin-3.3.3-r1
index a94ef16e1544..d6ff674f67e1 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.3.3-r1
+++ b/metadata/md5-cache/dev-java/maven-bin-3.3.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/juel:0 dev-java/log4j:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-
 SLOT=3.3
 SRC_URI=mirror://apache/maven/maven-3/3.3.3/binaries/apache-maven-3.3.3-bin.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postrm:- pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b9a56c796d94e4e088852435e523d6b4
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9639c763b94761f151bcb677e8f4e5bc
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.3.9 b/metadata/md5-cache/dev-java/maven-bin-3.3.9
index 2c46f2370c8f..df536b6db628 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.3.9
+++ b/metadata/md5-cache/dev-java/maven-bin-3.3.9
@@ -10,5 +10,5 @@ RDEPEND=dev-java/juel:0 dev-java/log4j:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-
 SLOT=3.3
 SRC_URI=mirror://apache/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postrm:- pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8e924ceeb331f1db22f9d4d905f36cae
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f494b539cba92a3a81b85617a48cae1b
diff --git a/metadata/md5-cache/dev-java/maven-hawtjni-plugin-1.11 b/metadata/md5-cache/dev-java/maven-hawtjni-plugin-1.11
index dea201691373..0fa36e09dcd9 100644
--- a/metadata/md5-cache/dev-java/maven-hawtjni-plugin-1.11
+++ b/metadata/md5-cache/dev-java/maven-hawtjni-plugin-1.11
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/fusesource/hawtjni/archive/hawtjni-project-1.11.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d4d24d412fd6e7838e46470fbb65a867
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6dd645fe045caa32ef91d41bcb05ef9d
diff --git a/metadata/md5-cache/dev-java/mchange-commons-0.2.10 b/metadata/md5-cache/dev-java/mchange-commons-0.2.10
index b91e644f5422..71c19d998609 100644
--- a/metadata/md5-cache/dev-java/mchange-commons-0.2.10
+++ b/metadata/md5-cache/dev-java/mchange-commons-0.2.10
@@ -10,5 +10,5 @@ RDEPEND=dev-java/log4j:0 dev-java/slf4j-api:0 dev-java/typesafe-config:0 >=virtu
 SLOT=0
 SRC_URI=https://github.com/swaldman/mchange-commons-java/archive/mchange-commons-java-0.2.10.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=dc34f7e15945cbd4185a1374103ccebd
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1644232f23d99cbe43ad579f5a966c6b
diff --git a/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r1 b/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r1
index c9d6050e4248..9cc1840074e5 100644
--- a/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r1
+++ b/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://gentoo/mersennetwister-0_pre23765.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=dfdff444aee065a188796cdc39a53062
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e91ad9292fe06c848fe998664b0a68e9
diff --git a/metadata/md5-cache/dev-java/metadata-extractor-2.8.1 b/metadata/md5-cache/dev-java/metadata-extractor-2.8.1
index 25675fac4924..ea9ef653a868 100644
--- a/metadata/md5-cache/dev-java/metadata-extractor-2.8.1
+++ b/metadata/md5-cache/dev-java/metadata-extractor-2.8.1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xmpcore:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 sou
 SLOT=0
 SRC_URI=https://github.com/drewnoakes/metadata-extractor/archive/2.8.1.tar.gz -> metadata-extractor-2.8.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=be5c459ea7e6eb781dc4eafd67a38c3e
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ea22e4a9a121838d920895f3331e364c
diff --git a/metadata/md5-cache/dev-java/metainf-services-1.6 b/metadata/md5-cache/dev-java/metainf-services-1.6
index a7cc1b578188..1deac800710d 100644
--- a/metadata/md5-cache/dev-java/metainf-services-1.6
+++ b/metadata/md5-cache/dev-java/metainf-services-1.6
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/kohsuke/metainf-services/archive/metainf-services-1.6.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=584b20ffe305ebdebecafcebe4a9fb8b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f79e64abbaca065377eea9c82b583245
diff --git a/metadata/md5-cache/dev-java/metainf-services-1.7 b/metadata/md5-cache/dev-java/metainf-services-1.7
index 66ad25639f0d..7a5d6bff84a1 100644
--- a/metadata/md5-cache/dev-java/metainf-services-1.7
+++ b/metadata/md5-cache/dev-java/metainf-services-1.7
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/kohsuke/metainf-services/archive/metainf-services-1.7.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=abb512f600bcaa86bfc01d49fb02152f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0f3ab79241926a177e59063f163ace6d
diff --git a/metadata/md5-cache/dev-java/microba-0.4.4.3 b/metadata/md5-cache/dev-java/microba-0.4.4.3
index 9e0fc927d55c..ed5f60905e27 100644
--- a/metadata/md5-cache/dev-java/microba-0.4.4.3
+++ b/metadata/md5-cache/dev-java/microba-0.4.4.3
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jgraph:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 sour
 SLOT=0
 SRC_URI=https://github.com/tdbear/microba/archive/0.4.4.3.zip -> microba-0.4.4.3.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=de58ee9fa6a5d7cd38e195c1a0ce6b55
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e4bab5adb155ea661e0e672fe97a803f
diff --git a/metadata/md5-cache/dev-java/miglayout-4.0 b/metadata/md5-cache/dev-java/miglayout-4.0
index 6d4ac4e1e817..0caaa939f50b 100644
--- a/metadata/md5-cache/dev-java/miglayout-4.0
+++ b/metadata/md5-cache/dev-java/miglayout-4.0
@@ -10,5 +10,5 @@ RDEPEND=swt? ( dev-java/swt:3.7 ) >=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.migcalendar.com/miglayout/versions/4.0/miglayout-4.0-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9c95afb0254c3006a3d154b1204c861f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8c6c0e2531637e38eccb6ba0dcdd002e
diff --git a/metadata/md5-cache/dev-java/milton-api-2.7.1.3 b/metadata/md5-cache/dev-java/milton-api-2.7.1.3
index 4b1c916ecfa2..da5e5f92e795 100644
--- a/metadata/md5-cache/dev-java/milton-api-2.7.1.3
+++ b/metadata/md5-cache/dev-java/milton-api-2.7.1.3
@@ -10,5 +10,5 @@ RDEPEND=dev-java/commons-codec:0 dev-java/commons-io:1 dev-java/slf4j-api:0 >=vi
 SLOT=0
 SRC_URI=http://milton.io/maven/io/milton/milton-api/2.7.1.3/milton-api-2.7.1.3-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4b113867e1b33e09a913a5d02111e68e
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d4b3c84f8f717269c5ecf3079bba222a
diff --git a/metadata/md5-cache/dev-java/milton-mail-api-2.7.1.3 b/metadata/md5-cache/dev-java/milton-mail-api-2.7.1.3
index 70b61b125f1f..55eec34f77b7 100644
--- a/metadata/md5-cache/dev-java/milton-mail-api-2.7.1.3
+++ b/metadata/md5-cache/dev-java/milton-mail-api-2.7.1.3
@@ -10,5 +10,5 @@ RDEPEND=dev-java/slf4j-api:0 dev-java/milton-api:0 dev-java/oracle-javamail:0 >=
 SLOT=0
 SRC_URI=http://milton.io/maven/io/milton/milton-mail-api/2.7.1.3/milton-mail-api-2.7.1.3-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=62d17024f249bfbce540173937e41a53
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=eb55e47f331d0e1af496a79600fab21f
diff --git a/metadata/md5-cache/dev-java/mimepull-1.8 b/metadata/md5-cache/dev-java/mimepull-1.8
index 8f98c34ee730..869dbc51c83e 100644
--- a/metadata/md5-cache/dev-java/mimepull-1.8
+++ b/metadata/md5-cache/dev-java/mimepull-1.8
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sera/distfiles/mimepull-1.8.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=33bf03a28f5f9915c4a72ac600aa0935
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8feb981c551340fc5c9a53b667b295ad
diff --git a/metadata/md5-cache/dev-java/mimepull-1.9.6-r1 b/metadata/md5-cache/dev-java/mimepull-1.9.6-r1
index 88ed3fd2d62f..4ea55424c8d0 100644
--- a/metadata/md5-cache/dev-java/mimepull-1.9.6-r1
+++ b/metadata/md5-cache/dev-java/mimepull-1.9.6-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/jvnet/mimepull/mimepull/1.9.6/mimepull-1.9.6-sources.jar -> mimepull-1.9.6.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5d0c13e32b75c5feb043c525c591a82f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=03be053348f261b7481e8f7de3822a97
diff --git a/metadata/md5-cache/dev-java/mina-core-1.1.7 b/metadata/md5-cache/dev-java/mina-core-1.1.7
index a7a79812e3a7..145f890dbfb9 100644
--- a/metadata/md5-cache/dev-java/mina-core-1.1.7
+++ b/metadata/md5-cache/dev-java/mina-core-1.1.7
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/slf4j-api >=dev-java/java-config-2.2.0-r3 >=s
 SLOT=0
 SRC_URI=mirror://gentoo/mina-core-1.1.7-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5302b50e9d22ae0951da4c140f90803f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d07ca15b20f0c3cae502203692d12888
diff --git a/metadata/md5-cache/dev-java/mina-core-2.0.7 b/metadata/md5-cache/dev-java/mina-core-2.0.7
index 2e6b953bb1f6..13d3d543b14d 100644
--- a/metadata/md5-cache/dev-java/mina-core-2.0.7
+++ b/metadata/md5-cache/dev-java/mina-core-2.0.7
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3 s
 SLOT=0
 SRC_URI=mirror://apache/mina/mina/2.0.7/apache-mina-2.0.7-src.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e60889d5b524fb8bb102e28ef6e1d42e
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6138fee668c4fa5ea9600ff91b4f9dfe
diff --git a/metadata/md5-cache/dev-java/minlog-1.2 b/metadata/md5-cache/dev-java/minlog-1.2
index 7d308207e152..02d7c6cbb9a2 100644
--- a/metadata/md5-cache/dev-java/minlog-1.2
+++ b/metadata/md5-cache/dev-java/minlog-1.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://minlog.googlecode.com/files/minlog-1.2.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c48db2c18027ea23d6b3b00992cbf3e5
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=552e56123f25f09f775f28c212a7e6f3
diff --git a/metadata/md5-cache/dev-java/mockito-1.9.5-r1 b/metadata/md5-cache/dev-java/mockito-1.9.5-r1
index f0b68de4061e..51e7c6014a3c 100644
--- a/metadata/md5-cache/dev-java/mockito-1.9.5-r1
+++ b/metadata/md5-cache/dev-java/mockito-1.9.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/junit:4 dev-java/objenesis:0 dev-java/hamcres
 SLOT=0
 SRC_URI=https://mockito.googlecode.com/files/mockito-1.9.5.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f9c02ea1b5289b24ee3033d65228db36
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4f82f88ec305ef10bc31e84e3bdd2d6c
diff --git a/metadata/md5-cache/dev-java/mojarra-2.2.12-r1 b/metadata/md5-cache/dev-java/mojarra-2.2.12-r1
index e453a89b4bf9..8ffe1d11f6cc 100644
--- a/metadata/md5-cache/dev-java/mojarra-2.2.12-r1
+++ b/metadata/md5-cache/dev-java/mojarra-2.2.12-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/glassfish-persistence:0 dev-java/glassfish-ej
 SLOT=2.2
 SRC_URI=https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/2.2.12/javax.faces-2.2.12-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=232b8784fc49d802b6d6f084112a4a3c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=02497fc8ad9a9255f5946dcddbf4904f
diff --git a/metadata/md5-cache/dev-java/moshi-1.1.0 b/metadata/md5-cache/dev-java/moshi-1.1.0
index 44511ab75760..13b5da414c00 100644
--- a/metadata/md5-cache/dev-java/moshi-1.1.0
+++ b/metadata/md5-cache/dev-java/moshi-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 dev-java/assertj-core:2 dev-java/junit:4 dev-java/okio
 SLOT=0
 SRC_URI=https://github.com/square/moshi/archive/moshi-parent-1.1.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ac6280afd4e83ec0873e6a048998f45c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=91889ce21b18d9125a2a35d34dd3bdd3
diff --git a/metadata/md5-cache/dev-java/msv-20130601 b/metadata/md5-cache/dev-java/msv-20130601
index d340e05d1c67..ef2f2ee0bf75 100644
--- a/metadata/md5-cache/dev-java/msv-20130601
+++ b/metadata/md5-cache/dev-java/msv-20130601
@@ -10,5 +10,5 @@ RDEPEND=dev-java/iso-relax:0 dev-java/relaxng-datatype:0 dev-java/xsdlib:0 dev-j
 SLOT=0
 SRC_URI=http://search.maven.org/remotecontent?filepath=net/java/dev/msv/msv-core/2013.6.1/msv-core-2013.6.1-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6ca103a0927d4b9b47750e8d2b6526d0
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=aa665497469ee6d3de191b77667e4428
diff --git a/metadata/md5-cache/dev-java/myfaces-api-2.2.8 b/metadata/md5-cache/dev-java/myfaces-api-2.2.8
index c636c8916695..2b208e9f15ea 100644
--- a/metadata/md5-cache/dev-java/myfaces-api-2.2.8
+++ b/metadata/md5-cache/dev-java/myfaces-api-2.2.8
@@ -10,5 +10,5 @@ RDEPEND=dev-java/cdi-api:1.2 dev-java/javax-inject:0 dev-java/tomcat-jstl-spec:0
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/org/apache/myfaces/core/myfaces-api/2.2.8/myfaces-api-2.2.8-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3dfa21695aadae1db703e9236b27d5ea
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=26b89410fb72b7aa95d66f159e4643ed
diff --git a/metadata/md5-cache/dev-java/myfaces-builder-annotations-1.0.9 b/metadata/md5-cache/dev-java/myfaces-builder-annotations-1.0.9
index bfb4bb9c2db6..8ec94a852eef 100644
--- a/metadata/md5-cache/dev-java/myfaces-builder-annotations-1.0.9
+++ b/metadata/md5-cache/dev-java/myfaces-builder-annotations-1.0.9
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/org/apache/myfaces/buildtools/myfaces-builder-annotations/1.0.9/myfaces-builder-annotations-1.0.9-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9645949379c813649f98993dd2a395f9
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ca97f0a8ca4c5d457592ca3f1e44b31a
diff --git a/metadata/md5-cache/dev-java/nachocalendar-0.23-r1 b/metadata/md5-cache/dev-java/nachocalendar-0.23-r1
index cc3264877b39..948e2a2deaf6 100644
--- a/metadata/md5-cache/dev-java/nachocalendar-0.23-r1
+++ b/metadata/md5-cache/dev-java/nachocalendar-0.23-r1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nachocalendar/nachocalendar-src-0.23.tar.bz2 -> nachocalendar-0.23.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=73ddf60e179d15b00dc8960924f0a5ac
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8eafd41753f5769c1409c33ff856f05a
diff --git a/metadata/md5-cache/dev-java/nailgun-0.7.1-r1 b/metadata/md5-cache/dev-java/nailgun-0.7.1-r1
index 9f7f6c8479aa..cb21770f57bc 100644
--- a/metadata/md5-cache/dev-java/nailgun-0.7.1-r1
+++ b/metadata/md5-cache/dev-java/nailgun-0.7.1-r1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nailgun/nailgun-src-0.7.1.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5bee4e6c6d05f3b3f033be18b368d531
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8b278acdd6fea00d8908b30c22da66f8
diff --git a/metadata/md5-cache/dev-java/nanoxml-2.2.3-r3 b/metadata/md5-cache/dev-java/nanoxml-2.2.3-r3
index 6048a7253986..1dd4db67a0ce 100644
--- a/metadata/md5-cache/dev-java/nanoxml-2.2.3-r3
+++ b/metadata/md5-cache/dev-java/nanoxml-2.2.3-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-java/sax:0 source? ( app-arch/zip ) >=virtual/jre-1.6 >=dev-java/jav
 SLOT=0
 SRC_URI=http://pkgs.fedoraproject.org/repo/pkgs/nanoxml/NanoXML-2.2.3.tar.gz/357c7136417ea996cf714278ea84f2df/NanoXML-2.2.3.tar.gz -> nanoxml-2.2.3.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ce8dee49e8f16b2910f6fb66b1838028
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1d94ed59eb1992e3a31c8eb7e72a0843
diff --git a/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1 b/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1
index 05895dcaf46a..870147af9c95 100644
--- a/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1
+++ b/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/nekohtml/nekohtml-1.9.18.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=49ebb3cb7fd7e8c159e255a13210532f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=10cbb9ff7c8cb8442faec9a992af7263
diff --git a/metadata/md5-cache/dev-java/netbeans-apisupport-8.0.2 b/metadata/md5-cache/dev-java/netbeans-apisupport-8.0.2
index f0e329e27f1a..1d07252674aa 100644
--- a/metadata/md5-cache/dev-java/netbeans-apisupport-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-apisupport-8.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.0.2 ~dev-java/netbeans-har
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6cdca6939d83ac87867d08f1acbdb6ff
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4ea0af98d987a5607ee423a917dbc4fd
diff --git a/metadata/md5-cache/dev-java/netbeans-apisupport-8.1 b/metadata/md5-cache/dev-java/netbeans-apisupport-8.1
index a4669cdb96db..e9253b053e02 100644
--- a/metadata/md5-cache/dev-java/netbeans-apisupport-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-apisupport-8.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.1 ~dev-java/netbeans-harne
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ddb1ec3065499b4f62d2ca696189e0d8
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4028d6af139f309bfee61dab4c9c7738
diff --git a/metadata/md5-cache/dev-java/netbeans-apisupport-8.2 b/metadata/md5-cache/dev-java/netbeans-apisupport-8.2
index f9460a66d69a..b004be5a4490 100644
--- a/metadata/md5-cache/dev-java/netbeans-apisupport-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-apisupport-8.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-harness
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=620424953ee0d2f518e3d0747bfd3046
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=254e62992c6d4402fab8434d86d4543d
diff --git a/metadata/md5-cache/dev-java/netbeans-cnd-8.0.2 b/metadata/md5-cache/dev-java/netbeans-cnd-8.0.2
index 2be218e8d8c2..52b551c21603 100644
--- a/metadata/md5-cache/dev-java/netbeans-cnd-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-cnd-8.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-dlight-8.0.2 ~dev-java/netbeans-har
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar http://hg.netbeans.org/binaries/24C58A1D3C410AD3E23CD828871630C17068B238-cnd-build-trace-1.0.zip http://hg.netbeans.org/binaries/2BCF2047382FB68A2F275677745C80E79B4046AB-cnd-rfs-1.0.zip http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=56f9fd1d64e271f6dda99a2d386e38d3
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=20221279ab5cec55dd3b14e72dd18bb3
diff --git a/metadata/md5-cache/dev-java/netbeans-cnd-8.1 b/metadata/md5-cache/dev-java/netbeans-cnd-8.1
index 3d380f2cb1f1..d2f5d7656022 100644
--- a/metadata/md5-cache/dev-java/netbeans-cnd-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-cnd-8.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-dlight-8.1 ~dev-java/netbeans-harne
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar http://hg.netbeans.org/binaries/99529DC0E1426A102A98EF5494B6F6AA6E497F62-clank_0.3.6.zip http://hg.netbeans.org/binaries/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip http://hg.netbeans.org/binaries/BB83D4F8047D608858154CB041054F5CAE35B903-cnd-rfs-1.0.zip http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ac2c5d4ca5a78954d0071a40486adaf2
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=36ec58d6c31b48f14381602c246fd0fe
diff --git a/metadata/md5-cache/dev-java/netbeans-cnd-8.2 b/metadata/md5-cache/dev-java/netbeans-cnd-8.2
index b30463654f34..a61ac7a82e17 100644
--- a/metadata/md5-cache/dev-java/netbeans-cnd-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-cnd-8.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-dlight-8.2 ~dev-java/netbeans-harness
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar http://hg.netbeans.org/binaries/F20EEEDF4FE6B93B180387576FB780EED9F79C66-clank_0.3.9.zip http://hg.netbeans.org/binaries/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip http://hg.netbeans.org/binaries/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=dcdb7639b5d06f80d63dc4be673e9ead
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=24af434cd7be6753b9474a7fab85ad90
diff --git a/metadata/md5-cache/dev-java/netbeans-dlight-8.0.2 b/metadata/md5-cache/dev-java/netbeans-dlight-8.0.2
index fc756c7225e7..3e36a32f8892 100644
--- a/metadata/md5-cache/dev-java/netbeans-dlight-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-dlight-8.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-platfo
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/457A4C66AE33D1D5887BB1F359EEA41A10EBB2AB-fs_server-1.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7ec9bc3abc66f8761e6a103391676c1d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=866acbe1a5f29464f88c84a860192ee2
diff --git a/metadata/md5-cache/dev-java/netbeans-dlight-8.1 b/metadata/md5-cache/dev-java/netbeans-dlight-8.1
index 3859a2f2e270..066f61f4e9ba 100644
--- a/metadata/md5-cache/dev-java/netbeans-dlight-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-dlight-8.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-ide-8.1 ~dev-java/netbeans-platform
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/51AC4960C19CF4C2CCA636765BFBC09A5029BFC5-fs_server-1.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6e1c57eb286a40e932534f004fd40461
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9f550871aa0dd23c172e175fd784a7c4
diff --git a/metadata/md5-cache/dev-java/netbeans-dlight-8.2 b/metadata/md5-cache/dev-java/netbeans-dlight-8.2
index 30f8af8f25cb..958c0b0e7a1f 100644
--- a/metadata/md5-cache/dev-java/netbeans-dlight-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-dlight-8.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-platform-8
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/18E39A0D10357B72EDB76F2070E27019317792F1-fs_server-1.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8dadab5851f44fb1e23de731ff539e9f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a9bb2f56db514c39e9428770318ff0a7
diff --git a/metadata/md5-cache/dev-java/netbeans-enterprise-8.0.2-r1 b/metadata/md5-cache/dev-java/netbeans-enterprise-8.0.2-r1
index 13bbfda96ee5..b34f644240a6 100644
--- a/metadata/md5-cache/dev-java/netbeans-enterprise-8.0.2-r1
+++ b/metadata/md5-cache/dev-java/netbeans-enterprise-8.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-harnes
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar http://hg.netbeans.org/binaries/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar http://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar http://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar http://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar http://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar http://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar http://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar http://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar http://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar http://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip http://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip http://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar http://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip http://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip http://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=262de79e23fc8839b57c23b46d32cf1a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7405ad4bf7ff6a9fd6fad621a63a1a97
diff --git a/metadata/md5-cache/dev-java/netbeans-enterprise-8.1-r1 b/metadata/md5-cache/dev-java/netbeans-enterprise-8.1-r1
index 20bb0c0d902d..26bad4bfe1de 100644
--- a/metadata/md5-cache/dev-java/netbeans-enterprise-8.1-r1
+++ b/metadata/md5-cache/dev-java/netbeans-enterprise-8.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-ide-8.1 ~dev-java/netbeans-harness-
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar http://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar http://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar http://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar http://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar http://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar http://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar http://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar http://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar http://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip http://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip http://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar http://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip http://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip http://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4cd505235cdafd609dd662d845edf163
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=33b2c56c6734d3a0a217c5c8096e5d1f
diff --git a/metadata/md5-cache/dev-java/netbeans-enterprise-8.2 b/metadata/md5-cache/dev-java/netbeans-enterprise-8.2
index bdf15b9fda91..2d768582326c 100644
--- a/metadata/md5-cache/dev-java/netbeans-enterprise-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-enterprise-8.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-harness-8.
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar http://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar http://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar http://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar http://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar http://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar http://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar http://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar http://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar http://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip http://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip http://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar http://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip http://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip http://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=cd9f28c32f55140a893265cfc8e7bc33
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=046f289ec2bef7434cde1687353a21c9
diff --git a/metadata/md5-cache/dev-java/netbeans-enterprise-8.2-r1 b/metadata/md5-cache/dev-java/netbeans-enterprise-8.2-r1
index 0f6682fed0a5..f3176e00a3e3 100644
--- a/metadata/md5-cache/dev-java/netbeans-enterprise-8.2-r1
+++ b/metadata/md5-cache/dev-java/netbeans-enterprise-8.2-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-harness-8.
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar http://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar http://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar http://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar http://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar http://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar http://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar http://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar http://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar http://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip http://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip http://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar http://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip http://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip http://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d3fbe314b7787c66e13125b1fca0e119
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d1654d55df33b2d2796445b92116df40
diff --git a/metadata/md5-cache/dev-java/netbeans-ergonomics-8.0.2 b/metadata/md5-cache/dev-java/netbeans-ergonomics-8.0.2
index 00c092423a13..43712f3cf75a 100644
--- a/metadata/md5-cache/dev-java/netbeans-ergonomics-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-ergonomics-8.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-nb-8.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=714c20ba241e63909e860b48fa681adb
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=bf5b2295fa71d5d1cd4b69f42ba8a955
diff --git a/metadata/md5-cache/dev-java/netbeans-ergonomics-8.1 b/metadata/md5-cache/dev-java/netbeans-ergonomics-8.1
index ea2ee5d79e85..1943df534ef0 100644
--- a/metadata/md5-cache/dev-java/netbeans-ergonomics-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-ergonomics-8.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-ide-8.1 ~dev-java/netbeans-nb-8.1 ~
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=141c76840c7d7b4620f6195b0192c66c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8b20027bb6f9a0be7865e274b17eefc9
diff --git a/metadata/md5-cache/dev-java/netbeans-ergonomics-8.2 b/metadata/md5-cache/dev-java/netbeans-ergonomics-8.2
index f77f6dcfdf44..89bfd24c89e7 100644
--- a/metadata/md5-cache/dev-java/netbeans-ergonomics-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-ergonomics-8.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-nb-8.2 ~de
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=781a3def92a503c2e5324677abcdd90b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ab5623bfc67115bc7fa9909f26ffa80a
diff --git a/metadata/md5-cache/dev-java/netbeans-extide-8.0.2 b/metadata/md5-cache/dev-java/netbeans-extide-8.0.2
index 5a548bd2b93b..9b7db8484d04 100644
--- a/metadata/md5-cache/dev-java/netbeans-extide-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-extide-8.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-platfo
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip http://hg.netbeans.org/binaries/95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5c0c72b69db9ada1bb363dc1f8269c50
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2663a88de315df5c8a6dd77af601a64a
diff --git a/metadata/md5-cache/dev-java/netbeans-extide-8.1 b/metadata/md5-cache/dev-java/netbeans-extide-8.1
index d588aa74d2cd..db15cc3ba680 100644
--- a/metadata/md5-cache/dev-java/netbeans-extide-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-extide-8.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-ide-8.1 ~dev-java/netbeans-platform
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip http://hg.netbeans.org/binaries/95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=502a3f75c38eab65820b97570b40b59a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4b88fc23c706a8ab546ee1050d60b2f4
diff --git a/metadata/md5-cache/dev-java/netbeans-extide-8.2 b/metadata/md5-cache/dev-java/netbeans-extide-8.2
index 73d55a6c9b2e..c1e1ddd19031 100644
--- a/metadata/md5-cache/dev-java/netbeans-extide-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-extide-8.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-platform-8
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip http://hg.netbeans.org/binaries/545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b3331b66f11f7958a0cdeeab9c1fc701
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=18afb237ef6b8fc44293dab7e246aaae
diff --git a/metadata/md5-cache/dev-java/netbeans-groovy-8.0.2 b/metadata/md5-cache/dev-java/netbeans-groovy-8.0.2
index a7c06ca4541c..721c5c795751 100644
--- a/metadata/md5-cache/dev-java/netbeans-groovy-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-groovy-8.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.0.2 ~dev-java/netbeans-ide
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/C136AE67C3C40740AE986582BAF65BA5C5CE69A0-groovy-all-2.1.7.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a9de35b75eaeefd6b443d48c8fb32485
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7d1240cb796e1808e9d9b76a2f8f9f33
diff --git a/metadata/md5-cache/dev-java/netbeans-groovy-8.1 b/metadata/md5-cache/dev-java/netbeans-groovy-8.1
index e5e89aa3e2e4..207ce8a1f24b 100644
--- a/metadata/md5-cache/dev-java/netbeans-groovy-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-groovy-8.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.1 ~dev-java/netbeans-ide-8
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/C136AE67C3C40740AE986582BAF65BA5C5CE69A0-groovy-all-2.1.7.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5108480e1d8478cc8d92f5c2a5e4c047
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=710b8eb3c4f268c13a425cb62175dd62
diff --git a/metadata/md5-cache/dev-java/netbeans-groovy-8.2 b/metadata/md5-cache/dev-java/netbeans-groovy-8.2
index 7bc4bf2e7b75..b1cdbcba3aa2 100644
--- a/metadata/md5-cache/dev-java/netbeans-groovy-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-groovy-8.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-ide-8.2
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=852ec96e7de6f546fa935344e71b10f8
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=226c1888a1336e485dff173b02f6010d
diff --git a/metadata/md5-cache/dev-java/netbeans-harness-8.0.2 b/metadata/md5-cache/dev-java/netbeans-harness-8.0.2
index 21b0806621cf..37cd6491156f 100644
--- a/metadata/md5-cache/dev-java/netbeans-harness-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-harness-8.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-platform-8.0.2 dev-java/javahelp:0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=076b67863ace010e0de53fcc094acdb6
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=66d8857172776812245ac1afa6b5669f
diff --git a/metadata/md5-cache/dev-java/netbeans-harness-8.1 b/metadata/md5-cache/dev-java/netbeans-harness-8.1
index 72d21de58eee..18cfe3eae94d 100644
--- a/metadata/md5-cache/dev-java/netbeans-harness-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-harness-8.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-platform-8.1 dev-java/javahelp:0 >=
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1775ba1e4b62d6fc2de5555320310590
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=66c5f2fa78830ffc9d7b414bf0e73cf7
diff --git a/metadata/md5-cache/dev-java/netbeans-harness-8.2 b/metadata/md5-cache/dev-java/netbeans-harness-8.2
index 4eff1923161c..94b9ea9f398e 100644
--- a/metadata/md5-cache/dev-java/netbeans-harness-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-harness-8.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-platform-8.2 dev-java/javahelp:0 >=de
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6887b412ede762ab7a019442094a619c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=efc8c730539b3ba3ad14383124ecbbbc
diff --git a/metadata/md5-cache/dev-java/netbeans-ide-8.0.2-r2 b/metadata/md5-cache/dev-java/netbeans-ide-8.0.2-r2
index a3c9660bbd35..4129d7695a64 100644
--- a/metadata/md5-cache/dev-java/netbeans-ide-8.0.2-r2
+++ b/metadata/md5-cache/dev-java/netbeans-ide-8.0.2-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-harness-8.0.2 ~dev-java/netbeans-pl
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar http://hg.netbeans.org/binaries/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip http://hg.netbeans.org/binaries/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip http://hg.netbeans.org/binaries/C40DFDACDF892D1BA14B540B32C11B6F34659931-exechlp-1.0.zip http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar http://hg.netbeans.org/binaries/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip http://hg.netbeans.org/binaries/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar http://hg.netbeans.org/binaries/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar http://hg.netbeans.org/binaries/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar http://hg.netbeans.org/binaries/DA6CE3C2EB334DB61EFA99CD66134619867368FA-js-corestubs.zip http://hg.netbeans.org/binaries/997BF4A93B8A99E37AB51C9016D1D18CF5FF4B60-js-domstubs.zip http://hg.netbeans.org/binaries/A723CD3E76C92CFE563B602035532C1C9D3D7192-js-reststubs.zip http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar http://hg.netbeans.org/binaries/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar http://hg.netbeans.org/binaries/7052E115041D04410A4519A61307502FB7C138E6-org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar http://hg.netbeans.org/binaries/B19A4D998C76FE7A30830C96B9E3A47682F320FC-org.eclipse.core.jobs-3.5.101.jar http://hg.netbeans.org/binaries/E64EF6A3FC5DB01AD95632B843706CCE56614C90-org.eclipse.core.net_1.2.100.I20110511-0800.jar http://hg.netbeans.org/binaries/6658C235056134F7E86295E751129508802D71F2-org.eclipse.core.runtime-3.7.0.jar http://hg.netbeans.org/binaries/0CA9B9DF8A8E4C6805C60A5761C470FCE8AE828F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar http://hg.netbeans.org/binaries/9C74D245214DB08E7EB9BC07A951B41CFE3E3648-org.eclipse.equinox.app-1.3.100.jar http://hg.netbeans.org/binaries/78E5D0B8516B042495660DA36CE5114650F8F156-org.eclipse.equinox.common_3.6.0.v20110523.jar http://hg.netbeans.org/binaries/FD94003A1BCE42008753522BFED68E5A84B92644-org.eclipse.equinox.preferences-3.4.2.jar http://hg.netbeans.org/binaries/54AE046B40C9095C2637F8D21664C5CD76E34485-org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar http://hg.netbeans.org/binaries/0FFB9B1D7CD992CE6C8AAEEC2F6F98DFBB1D2F91-org.eclipse.equinox.security-1.1.1.jar http://hg.netbeans.org/binaries/7FE73A21F4A078ABAAFACE4D2B03B5EB3D306F63-org.eclipse.jgit-3.4.1.201406201815-r.jar http://hg.netbeans.org/binaries/49F1EFEBC8CECA5D514209BE18A048EB5707C0A7-org.eclipse.jgit.java7-3.4.1.201406201815-r.jar http://hg.netbeans.org/binaries/A94F8F805202B28236FFBC03C1CA149129DAEA1C-org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar http://hg.netbeans.org/binaries/19D64C17A692D2023E22B16AD515118DF6427790-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar http://hg.netbeans.org/binaries/A1BF01D1DD09274446738C3F83360314B8881CD5-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar http://hg.netbeans.org/binaries/136A7EB3BB9B2559C5F9184B438F108C959B3C03-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar http://hg.netbeans.org/binaries/531746EBE57071AB7F8CCC7ACB0E806F25893916-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar http://hg.netbeans.org/binaries/D3ED088A49DE9E5163457E9279181DD4185BFBE6-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar http://hg.netbeans.org/binaries/8D4278A9F47D17A104182E59CF06D682B3DE0B3E-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055.jar http://hg.netbeans.org/binaries/1FC011B8A350B70950B3F1D722D7F2890C6E76D8-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar http://hg.netbeans.org/binaries/6E914CA3075C8FDF7652F04A02868CF32F2EDCE3-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar http://hg.netbeans.org/binaries/8A2F6232978E0330A5D36F19BA0686F96FB980B5-org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar http://hg.netbeans.org/binaries/820FD32B3FB7F885996B15474F220BDCCACD6D27-processtreekiller-1.0.2.jar http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar http://hg.netbeans.org/binaries/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar http://hg.netbeans.org/binaries/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar http://hg.netbeans.org/binaries/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar http://hg.netbeans.org/binaries/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar http://hg.netbeans.org/binaries/CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar http://hg.netbeans.org/binaries/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c744eb346e399a9da2173590b6bd722a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5b4991ece0ce65f3f40cfabd36dc6d45
diff --git a/metadata/md5-cache/dev-java/netbeans-ide-8.1-r2 b/metadata/md5-cache/dev-java/netbeans-ide-8.1-r2
index 89187a75dd3a..57b9dc66bcb5 100644
--- a/metadata/md5-cache/dev-java/netbeans-ide-8.1-r2
+++ b/metadata/md5-cache/dev-java/netbeans-ide-8.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-harness-8.1 ~dev-java/netbeans-plat
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar http://hg.netbeans.org/binaries/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar http://hg.netbeans.org/binaries/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip http://hg.netbeans.org/binaries/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar http://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar http://hg.netbeans.org/binaries/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar http://hg.netbeans.org/binaries/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar http://hg.netbeans.org/binaries/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar http://hg.netbeans.org/binaries/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar http://hg.netbeans.org/binaries/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar http://hg.netbeans.org/binaries/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar http://hg.netbeans.org/binaries/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar http://hg.netbeans.org/binaries/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar http://hg.netbeans.org/binaries/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar http://hg.netbeans.org/binaries/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar http://hg.netbeans.org/binaries/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar http://hg.netbeans.org/binaries/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar http://hg.netbeans.org/binaries/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar http://hg.netbeans.org/binaries/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar http://hg.netbeans.org/binaries/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar http://hg.netbeans.org/binaries/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar http://hg.netbeans.org/binaries/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar http://hg.netbeans.org/binaries/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar http://hg.netbeans.org/binaries/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar http://hg.netbeans.org/binaries/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar http://hg.netbeans.org/binaries/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar http://hg.netbeans.org/binaries/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar http://hg.netbeans.org/binaries/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar http://hg.netbeans.org/binaries/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar http://hg.netbeans.org/binaries/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar http://hg.netbeans.org/binaries/E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.jar http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar http://hg.netbeans.org/binaries/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar http://hg.netbeans.org/binaries/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar http://hg.netbeans.org/binaries/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar http://hg.netbeans.org/binaries/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar http://hg.netbeans.org/binaries/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4b3a8880a8ff058407346f180e79f477
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d34df23094b21c70ee433a4da709ba1a
diff --git a/metadata/md5-cache/dev-java/netbeans-ide-8.2 b/metadata/md5-cache/dev-java/netbeans-ide-8.2
index c4adbf4e5f66..7460041c9dfb 100644
--- a/metadata/md5-cache/dev-java/netbeans-ide-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-ide-8.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-harness-8.2 ~dev-java/netbeans-platfo
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar http://hg.netbeans.org/binaries/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar http://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar http://hg.netbeans.org/binaries/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip http://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar http://hg.netbeans.org/binaries/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar http://hg.netbeans.org/binaries/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar http://hg.netbeans.org/binaries/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar http://hg.netbeans.org/binaries/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar http://hg.netbeans.org/binaries/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar http://hg.netbeans.org/binaries/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar http://hg.netbeans.org/binaries/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar http://hg.netbeans.org/binaries/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar http://hg.netbeans.org/binaries/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar http://hg.netbeans.org/binaries/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar http://hg.netbeans.org/binaries/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar http://hg.netbeans.org/binaries/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar http://hg.netbeans.org/binaries/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar http://hg.netbeans.org/binaries/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar http://hg.netbeans.org/binaries/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar http://hg.netbeans.org/binaries/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar http://hg.netbeans.org/binaries/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar http://hg.netbeans.org/binaries/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar http://hg.netbeans.org/binaries/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar http://hg.netbeans.org/binaries/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar http://hg.netbeans.org/binaries/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar http://hg.netbeans.org/binaries/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar http://hg.netbeans.org/binaries/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar http://hg.netbeans.org/binaries/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar http://hg.netbeans.org/binaries/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar http://hg.netbeans.org/binaries/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar http://hg.netbeans.org/binaries/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar http://hg.netbeans.org/binaries/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar http://hg.netbeans.org/binaries/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar http://hg.netbeans.org/binaries/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=31c8bfe47a59ef7b04551eec06082e77
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d1c539b7e61b177d59aa8a99a29f09cd
diff --git a/metadata/md5-cache/dev-java/netbeans-java-8.0.2-r5 b/metadata/md5-cache/dev-java/netbeans-java-8.0.2-r5
index f77051010d3b..e4266a640d7b 100644
--- a/metadata/md5-cache/dev-java/netbeans-java-8.0.2-r5
+++ b/metadata/md5-cache/dev-java/netbeans-java-8.0.2-r5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-platform-8.0.2 ~dev-java/netbeans-e
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar http://hg.netbeans.org/binaries/2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.jar http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar http://hg.netbeans.org/binaries/E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar http://hg.netbeans.org/binaries/8BDE88C9512D8783E64788F32A50E4CCBC48485E-nb-javac-impl.jar http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
 _eclass_exported_funcs=pkg_pretend:- pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=144f1ee833ae058ebd219c9d4d756cb6
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=98a6a960e385a122652a7daa19d7b296
diff --git a/metadata/md5-cache/dev-java/netbeans-java-8.1-r2 b/metadata/md5-cache/dev-java/netbeans-java-8.1-r2
index 3862b7b39289..f6927b3fb60e 100644
--- a/metadata/md5-cache/dev-java/netbeans-java-8.1-r2
+++ b/metadata/md5-cache/dev-java/netbeans-java-8.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-platform-8.1 ~dev-java/netbeans-ext
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar http://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar http://hg.netbeans.org/binaries/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar http://hg.netbeans.org/binaries/FBC85B83A93F76A159C8C0D782F02AF7E68E8ECF-nb-javac-impl.jar http://hg.netbeans.org/binaries/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip http://hg.netbeans.org/binaries/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar
 _eclass_exported_funcs=pkg_pretend:- pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3b273aa00362325e57d31e17064fcb97
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f90a57d4d6c5e12808e35b7d1428fb28
diff --git a/metadata/md5-cache/dev-java/netbeans-java-8.2 b/metadata/md5-cache/dev-java/netbeans-java-8.2
index 9ab4891017ba..264ec5f82465 100644
--- a/metadata/md5-cache/dev-java/netbeans-java-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-java-8.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-extid
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar http://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar http://hg.netbeans.org/binaries/5968566A351B28623DE4720B0ACB1E40338074D0-nb-javac-impl.jar http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip http://hg.netbeans.org/binaries/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar http://hg.netbeans.org/binaries/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar http://hg.netbeans.org/binaries/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar http://hg.netbeans.org/binaries/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar
 _eclass_exported_funcs=pkg_pretend:- pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2ffec8e827e5bda7972bdbda2b9515fb
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=bbe117632ed6f4c1c931ab9a30af42f9
diff --git a/metadata/md5-cache/dev-java/netbeans-javacard-8.0.2 b/metadata/md5-cache/dev-java/netbeans-javacard-8.0.2
index 399458b6b692..927511a75cc3 100644
--- a/metadata/md5-cache/dev-java/netbeans-javacard-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-javacard-8.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.0.2 ~dev-java/netbeans-ide
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9dcfe9529b8ab3daa037b0bae903063f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=63adeae95e31611982696741bc24f0f9
diff --git a/metadata/md5-cache/dev-java/netbeans-javacard-8.1 b/metadata/md5-cache/dev-java/netbeans-javacard-8.1
index 10135c868d00..22d4a72a7b2a 100644
--- a/metadata/md5-cache/dev-java/netbeans-javacard-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-javacard-8.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.1 ~dev-java/netbeans-ide-8
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=33c6b992c6c0c3c4b8c0398ef9db5f32
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2342fa62cb60427c550e06f1b868f1de
diff --git a/metadata/md5-cache/dev-java/netbeans-javacard-8.2 b/metadata/md5-cache/dev-java/netbeans-javacard-8.2
index de3a6ae803bd..e704472a1104 100644
--- a/metadata/md5-cache/dev-java/netbeans-javacard-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-javacard-8.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-ide-8.2
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a18aae00d561c707f46589f03d37310e
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=dd5c0d1485edf1d3ad47192eaf76d616
diff --git a/metadata/md5-cache/dev-java/netbeans-javadoc-8.0.2 b/metadata/md5-cache/dev-java/netbeans-javadoc-8.0.2
index c6029c4b67b8..0ddf3d33c52a 100644
--- a/metadata/md5-cache/dev-java/netbeans-javadoc-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-javadoc-8.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1b84223117e5b4ae020f733b57a83f46
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=758c2b8a309c3b7e66249e494d3b7293
diff --git a/metadata/md5-cache/dev-java/netbeans-javadoc-8.1 b/metadata/md5-cache/dev-java/netbeans-javadoc-8.1
index 9d0265732042..feb1b1c36e06 100644
--- a/metadata/md5-cache/dev-java/netbeans-javadoc-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-javadoc-8.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b772ce2ba634ad44a2db22b9936bba3a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5ffefda53cd7035fec656bb05501078b
diff --git a/metadata/md5-cache/dev-java/netbeans-javadoc-8.2 b/metadata/md5-cache/dev-java/netbeans-javadoc-8.2
index a898022a0c7a..bacb02365ebf 100644
--- a/metadata/md5-cache/dev-java/netbeans-javadoc-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-javadoc-8.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=011698dc441f05f8a9a85b82086af21d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0851033698aa367357676a0d1a530edd
diff --git a/metadata/md5-cache/dev-java/netbeans-javafx-8.0.2 b/metadata/md5-cache/dev-java/netbeans-javafx-8.0.2
index 55aa2ab40178..4a149b030f49 100644
--- a/metadata/md5-cache/dev-java/netbeans-javafx-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-javafx-8.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.0.2 ~dev-java/netbeans-ide
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar http://hg.netbeans.org/binaries/0F7FC8D69950B86D5F67529B5C551DB84C5BCF87-nb-javac-api.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c1d49985ca3124606ed7683f2f0329ea
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c9c91a4f9f8e8133044873ea1b700b5d
diff --git a/metadata/md5-cache/dev-java/netbeans-javafx-8.1 b/metadata/md5-cache/dev-java/netbeans-javafx-8.1
index 095ff292f56f..68d130271f7c 100644
--- a/metadata/md5-cache/dev-java/netbeans-javafx-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-javafx-8.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.1 ~dev-java/netbeans-ide-8
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar http://hg.netbeans.org/binaries/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5f25fcf0be1f7bffb68932643090cc47
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0986b5a3a377c7c6812627187e0c017f
diff --git a/metadata/md5-cache/dev-java/netbeans-javafx-8.2 b/metadata/md5-cache/dev-java/netbeans-javafx-8.2
index fccd8ba9dbbe..acd245c4a217 100644
--- a/metadata/md5-cache/dev-java/netbeans-javafx-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-javafx-8.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-ide-8.2
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=08cbe57a5325b1de121456f8380ee83c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b27c8666451d9bfedb929b859a9ea88b
diff --git a/metadata/md5-cache/dev-java/netbeans-mobility-8.0.2 b/metadata/md5-cache/dev-java/netbeans-mobility-8.0.2
index 641938beb01d..cfb8ae82ed71 100644
--- a/metadata/md5-cache/dev-java/netbeans-mobility-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-mobility-8.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-apisupport-8.0.2 ~dev-java/netbeans
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8ca0b108c05f3daf1aa9a38aa2d482a3
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=10f1c5076235ad3bbc1ebd8d42b12752
diff --git a/metadata/md5-cache/dev-java/netbeans-mobility-8.1 b/metadata/md5-cache/dev-java/netbeans-mobility-8.1
index 4b205d2ecce3..4bd705cc4b02 100644
--- a/metadata/md5-cache/dev-java/netbeans-mobility-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-mobility-8.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-apisupport-8.1 ~dev-java/netbeans-e
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e4049aa5909ed0c5679c9a2acbeffe3b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d487091f105f5d4d0028b81422a75d09
diff --git a/metadata/md5-cache/dev-java/netbeans-mobility-8.2 b/metadata/md5-cache/dev-java/netbeans-mobility-8.2
index cd57d5416af9..1ecc29e76123 100644
--- a/metadata/md5-cache/dev-java/netbeans-mobility-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-mobility-8.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-apisupport-8.2 ~dev-java/netbeans-ent
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ba56537c82c578c392df4e721227f23a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8d36198a3f63d5e655c273e29fa32db6
diff --git a/metadata/md5-cache/dev-java/netbeans-nb-8.0.2 b/metadata/md5-cache/dev-java/netbeans-nb-8.0.2
index bdf984558e94..3fd670694011 100644
--- a/metadata/md5-cache/dev-java/netbeans-nb-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-nb-8.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-platform-8.0.2 ~dev-java/netbeans-h
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3be46a2ad57386b1eba7711e4c908054
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f1076869bcd6a0100d8ac11bc558f1ae
diff --git a/metadata/md5-cache/dev-java/netbeans-nb-8.1 b/metadata/md5-cache/dev-java/netbeans-nb-8.1
index ed2c7f7f0305..b3d75dac41cd 100644
--- a/metadata/md5-cache/dev-java/netbeans-nb-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-nb-8.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-platform-8.1 ~dev-java/netbeans-har
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8969a75da43f417b6d7c0ee9365695ad
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5f6345a7ddb6434e822e33a8865303f1
diff --git a/metadata/md5-cache/dev-java/netbeans-nb-8.2 b/metadata/md5-cache/dev-java/netbeans-nb-8.2
index e1f10ce15852..63d2d96cab0e 100644
--- a/metadata/md5-cache/dev-java/netbeans-nb-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-nb-8.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-harne
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=392fee8be8f5a29f0e4c08a0a0e843a6
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=91be947c5a2de8d664247df293c3c324
diff --git a/metadata/md5-cache/dev-java/netbeans-php-8.0.2 b/metadata/md5-cache/dev-java/netbeans-php-8.0.2
index 754b4340cfd0..f432bf15d951 100644
--- a/metadata/md5-cache/dev-java/netbeans-php-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-php-8.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.0.2 ~dev-java/netbeans-ide
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip http://hg.netbeans.org/binaries/BFB982F9B33E2F1A1766C212C8208793F9B7E77C-phpsigfiles.zip http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a6ba3691c8e974719ba49dbb2c9d057f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=597ebefda8eaf538ae31f1f92a981d10
diff --git a/metadata/md5-cache/dev-java/netbeans-php-8.1 b/metadata/md5-cache/dev-java/netbeans-php-8.1
index 7f625c77e5d6..5aa34c67d399 100644
--- a/metadata/md5-cache/dev-java/netbeans-php-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-php-8.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.1 ~dev-java/netbeans-ide-8
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip http://hg.netbeans.org/binaries/73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-phpsigfiles.zip http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bd72b6cba4b283df8d7cc2674417c9f5
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=bcf7a98a21c7c8de10215ab03fcedcf4
diff --git a/metadata/md5-cache/dev-java/netbeans-php-8.2 b/metadata/md5-cache/dev-java/netbeans-php-8.2
index 8285bd35a147..31f9f6f79ba9 100644
--- a/metadata/md5-cache/dev-java/netbeans-php-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-php-8.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-ide-8.2
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip http://hg.netbeans.org/binaries/472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=172ee28746f9f6f2ffafe14ac80e2ee9
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a5187bbba33aff58f74aa556027e53f8
diff --git a/metadata/md5-cache/dev-java/netbeans-platform-8.0.2 b/metadata/md5-cache/dev-java/netbeans-platform-8.0.2
index 06b61a8cb82c..55aad9062a54 100644
--- a/metadata/md5-cache/dev-java/netbeans-platform-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-platform-8.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 dev-java/javahelp:0 >=dev-java/jna-3.4:0 >=dev-java/os
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar http://hg.netbeans.org/binaries/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar http://hg.netbeans.org/binaries/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip http://hg.netbeans.org/binaries/AC97B566699146713B3CF0ABC226B5C08EF7CF33-testng-6.8.1-dist.jar http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ca9086807a9ed3d351e05ba4493109e5
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0c65ed62691660dbc53fa338ed9d514d
diff --git a/metadata/md5-cache/dev-java/netbeans-platform-8.1 b/metadata/md5-cache/dev-java/netbeans-platform-8.1
index 1e83970c76a1..75491bd5fac5 100644
--- a/metadata/md5-cache/dev-java/netbeans-platform-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-platform-8.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 dev-java/hamcrest-core:1.3 dev-java/javahelp:0 >=dev-j
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar http://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar http://hg.netbeans.org/binaries/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar http://hg.netbeans.org/binaries/A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62-ko4j-1.2.3.jar http://hg.netbeans.org/binaries/78DD1C0B4EDC348FF4DCD0616597BB809AAE248D-net.java.html-1.2.3.jar http://hg.netbeans.org/binaries/7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E-net.java.html.boot-1.2.3.jar http://hg.netbeans.org/binaries/068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar http://hg.netbeans.org/binaries/8621531E83EC4850DA61AA2266FE41105C304F40-net.java.html.boot.script-1.2.3.jar http://hg.netbeans.org/binaries/24824B1E8C2A2D3A5C471F5875BF61F27E8916DB-net.java.html.geo-1.2.3.jar http://hg.netbeans.org/binaries/F41518385DA4B5682C864F19B82C3BA4AF65AE83-net.java.html.json-1.2.3.jar http://hg.netbeans.org/binaries/989A81454D4FA962EB1C158FE794D2EB060AB9F6-net.java.html.sound-1.2.3.jar http://hg.netbeans.org/binaries/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=20e4b405bb7944ac44e40053a6fc11cb
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f410ebadca82266a756de7bca59d21dd
diff --git a/metadata/md5-cache/dev-java/netbeans-platform-8.2 b/metadata/md5-cache/dev-java/netbeans-platform-8.2
index f2045806db83..45f39ad81bf3 100644
--- a/metadata/md5-cache/dev-java/netbeans-platform-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-platform-8.2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/hamcrest-core:1.3 dev-java/javahelp:0 >=dev-java/jna-3.4:0 dev-
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar http://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar http://hg.netbeans.org/binaries/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar http://hg.netbeans.org/binaries/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar http://hg.netbeans.org/binaries/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar http://hg.netbeans.org/binaries/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar http://hg.netbeans.org/binaries/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar http://hg.netbeans.org/binaries/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar http://hg.netbeans.org/binaries/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar http://hg.netbeans.org/binaries/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar http://hg.netbeans.org/binaries/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar http://hg.netbeans.org/binaries/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip http://hg.netbeans.org/binaries/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e0be611bd99280becf54bed7178f366c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=54b9c5192b10681539854c5b63a62601
diff --git a/metadata/md5-cache/dev-java/netbeans-profiler-8.0.2 b/metadata/md5-cache/dev-java/netbeans-profiler-8.0.2
index 774fbff508c0..1d34aa96f9ab 100644
--- a/metadata/md5-cache/dev-java/netbeans-profiler-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-profiler-8.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.0.2 ~dev-java/netbeans-ide
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d82ea95d503961ec51b4faf691376974
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4d7fbe9365ec8ae25d968d320694d9f8
diff --git a/metadata/md5-cache/dev-java/netbeans-profiler-8.1 b/metadata/md5-cache/dev-java/netbeans-profiler-8.1
index 2a0d0d31824c..56561e52b319 100644
--- a/metadata/md5-cache/dev-java/netbeans-profiler-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-profiler-8.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.1 ~dev-java/netbeans-ide-8
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d941f913768baf899f3cbf5ddf9cd6c2
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=dd2bc4b0171d5a820ded572328e0b78d
diff --git a/metadata/md5-cache/dev-java/netbeans-profiler-8.2 b/metadata/md5-cache/dev-java/netbeans-profiler-8.2
index a5ae75789ff0..bb792bcfc390 100644
--- a/metadata/md5-cache/dev-java/netbeans-profiler-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-profiler-8.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-extide-8.2 ~dev-java/netbeans-ide-8.2
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b33d2bfa023b6f9e9c302572af9d7e73
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9fcc6a29b193658de56ae89a6fe975ba
diff --git a/metadata/md5-cache/dev-java/netbeans-webcommon-8.0.2 b/metadata/md5-cache/dev-java/netbeans-webcommon-8.0.2
index 2c354718574d..ff482946fc4e 100644
--- a/metadata/md5-cache/dev-java/netbeans-webcommon-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-webcommon-8.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-platform-8.0.2 ~dev-java/netbeans-e
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/20317762D93542637CD2C6123B836C8DA267DE9D-cdnjs.zip http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar http://hg.netbeans.org/binaries/81483881778F37D0495C07323E445361084CA1DB-ios-sim http://hg.netbeans.org/binaries/9D29F2A9722C91A403F32971E97DD0E49E97B02E-libiDeviceNativeBinding.dylib http://hg.netbeans.org/binaries/9F0D0D95F57E73C0110FA023813A4F9756D543B1-libimobiledevice.4.dylib http://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib http://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar http://hg.netbeans.org/binaries/D05B7274396C8EED185207399B6D0400DE347DB7-libusbmuxd.2.dylib
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1f8262fe7756574239b3985f7219fd21
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=eaf2002ba5d4ade1e42f9557ccd6d407
diff --git a/metadata/md5-cache/dev-java/netbeans-webcommon-8.1 b/metadata/md5-cache/dev-java/netbeans-webcommon-8.1
index c3c00d82ac18..5a85ce56b2f3 100644
--- a/metadata/md5-cache/dev-java/netbeans-webcommon-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-webcommon-8.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-platform-8.1 ~dev-java/netbeans-ext
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim http://hg.netbeans.org/binaries/9D29F2A9722C91A403F32971E97DD0E49E97B02E-libiDeviceNativeBinding.dylib http://hg.netbeans.org/binaries/9F0D0D95F57E73C0110FA023813A4F9756D543B1-libimobiledevice.4.dylib http://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib http://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar http://hg.netbeans.org/binaries/D05B7274396C8EED185207399B6D0400DE347DB7-libusbmuxd.2.dylib
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fe29ed376db1002a5cfa9b18caae5af0
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=eb3242b811379327b528b28161ca0b97
diff --git a/metadata/md5-cache/dev-java/netbeans-webcommon-8.2 b/metadata/md5-cache/dev-java/netbeans-webcommon-8.2
index c57fd2da7453..fa7fe111fa5c 100644
--- a/metadata/md5-cache/dev-java/netbeans-webcommon-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-webcommon-8.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-extid
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/7CA13589F586F659BB0E1561719A91CA47BF1897-com.oracle.js.parser.jar http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim http://hg.netbeans.org/binaries/C8EEAB10E4539BEAF97476EBA252BD4B40377FA9-js-corestubs.zip http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip http://hg.netbeans.org/binaries/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib http://hg.netbeans.org/binaries/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib http://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib http://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar http://hg.netbeans.org/binaries/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib http://hg.netbeans.org/binaries/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip http://hg.netbeans.org/binaries/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip http://hg.netbeans.org/binaries/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1df78c06cbfed657fdeac3bc1be17b7c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b932916e321be95ebeb8cc5b5319ccf2
diff --git a/metadata/md5-cache/dev-java/netbeans-websvccommon-8.0.2 b/metadata/md5-cache/dev-java/netbeans-websvccommon-8.0.2
index b246e7431efe..fb447f23cf80 100644
--- a/metadata/md5-cache/dev-java/netbeans-websvccommon-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-websvccommon-8.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-platform-8.0.2 ~dev-java/netbeans-i
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9d908a8ef3e1e43673714ecf8795cf99
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ca23f17e7824e003445e8f1a3ffb4055
diff --git a/metadata/md5-cache/dev-java/netbeans-websvccommon-8.1 b/metadata/md5-cache/dev-java/netbeans-websvccommon-8.1
index 1789e1e9ce15..4e59f822bee2 100644
--- a/metadata/md5-cache/dev-java/netbeans-websvccommon-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-websvccommon-8.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-platform-8.1 ~dev-java/netbeans-ide
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=968b8c1faca1adb7cc8b6894cdf6c870
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c45d68536848a3600f39e873e51a9f9e
diff --git a/metadata/md5-cache/dev-java/netbeans-websvccommon-8.2 b/metadata/md5-cache/dev-java/netbeans-websvccommon-8.2
index 58e82792db95..cdc22e7ba1cd 100644
--- a/metadata/md5-cache/dev-java/netbeans-websvccommon-8.2
+++ b/metadata/md5-cache/dev-java/netbeans-websvccommon-8.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-platform-8.2 ~dev-java/netbeans-ide-8
 SLOT=8.2
 SRC_URI=http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bf6e4d0a3f25b608e57a2697d0aa317b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9023b9a0c71d3b7ece5131c982562f24
diff --git a/metadata/md5-cache/dev-java/netty-buffer-4.0.21 b/metadata/md5-cache/dev-java/netty-buffer-4.0.21
index 45a12f170c57..522c80db4e33 100644
--- a/metadata/md5-cache/dev-java/netty-buffer-4.0.21
+++ b/metadata/md5-cache/dev-java/netty-buffer-4.0.21
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/netty-common:0 >=dev-java/java-config-2.2.0-r
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.21.Final.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=46ea591e489767e3fc88c34cf9ed4030
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2b8ef651f2f5bfee6a0373a487651f6f
diff --git a/metadata/md5-cache/dev-java/netty-buffer-4.0.36 b/metadata/md5-cache/dev-java/netty-buffer-4.0.36
index 76d93fd9ffd6..edd399b50c35 100644
--- a/metadata/md5-cache/dev-java/netty-buffer-4.0.36
+++ b/metadata/md5-cache/dev-java/netty-buffer-4.0.36
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 ~dev-java/netty-common-4.0.36:0 >=dev-java/java-config
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_test:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ddb03926af2a4c44eb87d2afa2fc0e39
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1294ec9d7c0ca2590012425f7f03b85a
diff --git a/metadata/md5-cache/dev-java/netty-codec-4.0.36 b/metadata/md5-cache/dev-java/netty-codec-4.0.36
index 8868a4a1368e..a2797e9c210f 100644
--- a/metadata/md5-cache/dev-java/netty-codec-4.0.36
+++ b/metadata/md5-cache/dev-java/netty-codec-4.0.36
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 ~dev-java/netty-buffer-4.0.36:0 ~dev-java/netty-common
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_test:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0110981822e6b2074ab33bb293cc07f4
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9f6b4c663ee5c365e32427369161a6dd
diff --git a/metadata/md5-cache/dev-java/netty-codec-http-4.0.36 b/metadata/md5-cache/dev-java/netty-codec-http-4.0.36
index bd149165da9a..fbebbe1780bc 100644
--- a/metadata/md5-cache/dev-java/netty-codec-http-4.0.36
+++ b/metadata/md5-cache/dev-java/netty-codec-http-4.0.36
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 ~dev-java/netty-buffer-4.0.36:0 ~dev-java/netty-codec-
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_test:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0e86c5424fb44d744cd5e9985d1e1972
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c2933bb7f2bec99a75d5dc07516645ff
diff --git a/metadata/md5-cache/dev-java/netty-common-4.0.21 b/metadata/md5-cache/dev-java/netty-common-4.0.21
index 1f611fa39940..f7db27d55488 100644
--- a/metadata/md5-cache/dev-java/netty-common-4.0.21
+++ b/metadata/md5-cache/dev-java/netty-common-4.0.21
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.21.Final.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3a13d2f31aa1d5a4ffa91e8d123b0827
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8e73d83b5b4b236701c46333da33cd7d
diff --git a/metadata/md5-cache/dev-java/netty-common-4.0.36 b/metadata/md5-cache/dev-java/netty-common-4.0.36
index 0aa18d4db121..844879362c30 100644
--- a/metadata/md5-cache/dev-java/netty-common-4.0.36
+++ b/metadata/md5-cache/dev-java/netty-common-4.0.36
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 dev-java/commons-logging:0 dev-java/javassist:3 dev-ja
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_test:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8e455ce84ea31a00fd71de2b912d4718
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=63f92fdd4c750450fb1151b2d1aca790
diff --git a/metadata/md5-cache/dev-java/netty-handler-4.0.36 b/metadata/md5-cache/dev-java/netty-handler-4.0.36
index 1c7c7fa592b3..9e88db3914af 100644
--- a/metadata/md5-cache/dev-java/netty-handler-4.0.36
+++ b/metadata/md5-cache/dev-java/netty-handler-4.0.36
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 ~dev-java/netty-buffer-4.0.36:0 ~dev-java/netty-codec-
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_test:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f121a50b7dcca8cb8b1f1fda277d44ed
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=870435e8e1cde2407235e6454216db4e
diff --git a/metadata/md5-cache/dev-java/netty-tcnative-1.1.33.15 b/metadata/md5-cache/dev-java/netty-tcnative-1.1.33.15
index a5f9b7ccaea1..d7d429c4882a 100644
--- a/metadata/md5-cache/dev-java/netty-tcnative-1.1.33.15
+++ b/metadata/md5-cache/dev-java/netty-tcnative-1.1.33.15
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/apr:1= dev-libs/openssl:0= >=virtual/jre-1.7 >=dev-java/java-co
 SLOT=0
 SRC_URI=https://github.com/netty/netty-tcnative/archive/netty-tcnative-1.1.33.Fork15.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:- src_compile:- src_install:-
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	libtool	84763589a795fb127b537cac01e5359f	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e01cb30ac4a9b3f8a328dc0379d70f49
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	48b1b9f6194d2842456514d1184ca72e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c3a587c4eb1e8c205098004bc0b7e803
diff --git a/metadata/md5-cache/dev-java/netty-transport-4.0.21-r1 b/metadata/md5-cache/dev-java/netty-transport-4.0.21-r1
index daf7ad52a89d..cb7eed8e280b 100644
--- a/metadata/md5-cache/dev-java/netty-transport-4.0.21-r1
+++ b/metadata/md5-cache/dev-java/netty-transport-4.0.21-r1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.21.Final.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=215c26588b34d98c47b103e0b931e0ff
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=59fc05743912e07bb781dd8423fdfbec
diff --git a/metadata/md5-cache/dev-java/netty-transport-4.0.36 b/metadata/md5-cache/dev-java/netty-transport-4.0.36
index 4780528b4dda..49a53a1985ba 100644
--- a/metadata/md5-cache/dev-java/netty-transport-4.0.36
+++ b/metadata/md5-cache/dev-java/netty-transport-4.0.36
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 ~dev-java/netty-buffer-4.0.36:0 ~dev-java/netty-common
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_test:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=949b3fb3bf5d353e894552a062c07f0a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a08db750d9247ef19d1f3cebaae63fae
diff --git a/metadata/md5-cache/dev-java/neuroph-2.3 b/metadata/md5-cache/dev-java/neuroph-2.3
index 78abf403125e..69893e8df8e4 100644
--- a/metadata/md5-cache/dev-java/neuroph-2.3
+++ b/metadata/md5-cache/dev-java/neuroph-2.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/neuroph/neuroph_2.3_nb.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a6c971d4df73a15ddbdb3480acdb518c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4ba3924d22dcf77c1d102447cf1872af
diff --git a/metadata/md5-cache/dev-java/neuroph-2.3.1 b/metadata/md5-cache/dev-java/neuroph-2.3.1
index 8a34393c4d45..9806337e3acf 100644
--- a/metadata/md5-cache/dev-java/neuroph-2.3.1
+++ b/metadata/md5-cache/dev-java/neuroph-2.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/neuroph/neuroph_2.3.1_nb.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a6c971d4df73a15ddbdb3480acdb518c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4ba3924d22dcf77c1d102447cf1872af
diff --git a/metadata/md5-cache/dev-java/neuroph-2.4 b/metadata/md5-cache/dev-java/neuroph-2.4
index bb462ed4e18b..6d7d2ea85a38 100644
--- a/metadata/md5-cache/dev-java/neuroph-2.4
+++ b/metadata/md5-cache/dev-java/neuroph-2.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/neuroph/neuroph_2.4_nb.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2b2573a719373a87554793315f934e2e
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0d925704ae30fab2300fba6b27aa8d86
diff --git a/metadata/md5-cache/dev-java/objenesis-1.3 b/metadata/md5-cache/dev-java/objenesis-1.3
index 4161249c0dc4..3e9d9c50bbd0 100644
--- a/metadata/md5-cache/dev-java/objenesis-1.3
+++ b/metadata/md5-cache/dev-java/objenesis-1.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://objenesis.googlecode.com/files/objenesis-1.3-bin.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ee6b7ef31c45723b36de97a15754bf93
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d3a12bd2a46b0be99205c80b09268f39
diff --git a/metadata/md5-cache/dev-java/odfdom-0.8.6-r1 b/metadata/md5-cache/dev-java/odfdom-0.8.6-r1
index 75a366d1ac04..5c69808a8d53 100644
--- a/metadata/md5-cache/dev-java/odfdom-0.8.6-r1
+++ b/metadata/md5-cache/dev-java/odfdom-0.8.6-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/xerces:2 dev-java/xml-commons-external:1.4 >=
 SLOT=0
 SRC_URI=http://odftoolkit.org/projects/odfdom/downloads/download/current-version%252Fodfdom-0.8.6-sources.zip -> odfdom-0.8.6-sources.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f8895a9ca6847c9f537bfa3e20fb7baa
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9f3f5341774584108674fd75d4577e74
diff --git a/metadata/md5-cache/dev-java/offo-hyphenation-2.0 b/metadata/md5-cache/dev-java/offo-hyphenation-2.0
index 4c94515dc18b..509b8803dcf2 100644
--- a/metadata/md5-cache/dev-java/offo-hyphenation-2.0
+++ b/metadata/md5-cache/dev-java/offo-hyphenation-2.0
@@ -9,4 +9,4 @@ LICENSE=GPL-2 Apache-2.0 LPPL-1.3b TeX
 SLOT=0
 SRC_URI=mirror://sourceforge/offo/offo-hyphenation_v2.0.zip
 _eclass_exported_funcs=pkg_postinst:- src_compile:- src_install:-
-_md5_=97b8ddbf7b90d68f4e42f611dc3dd329
+_md5_=0e03890d8761daabc9ba40cbe0607f9b
diff --git a/metadata/md5-cache/dev-java/ognl-3.0.8 b/metadata/md5-cache/dev-java/ognl-3.0.8
index 3088483ff854..9a1e22574c03 100644
--- a/metadata/md5-cache/dev-java/ognl-3.0.8
+++ b/metadata/md5-cache/dev-java/ognl-3.0.8
@@ -10,5 +10,5 @@ RDEPEND=dev-java/javassist:3 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 s
 SLOT=3.0
 SRC_URI=https://github.com/jkuhnert/ognl/archive/OGNL_3_0_8.tar.gz https://ognl.dev.java.net/source/browse/*checkout*/ognl/osbuild.xml
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7e9c52173e4ede9a5bcebdcb6b85930f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c6ebf25296a071d6e5aee15b966c35c9
diff --git a/metadata/md5-cache/dev-java/okio-1.11.0 b/metadata/md5-cache/dev-java/okio-1.11.0
index 626dcaf64bde..682795a5d4e4 100644
--- a/metadata/md5-cache/dev-java/okio-1.11.0
+++ b/metadata/md5-cache/dev-java/okio-1.11.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 source? ( app-arch/zip ) dev-java/jmh-core:0 dev-java/
 SLOT=0
 SRC_URI=https://github.com/square/okio/archive/okio-parent-1.11.0.zip -> okio-1.11.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5b2aa2da4dacfd8ffb8cab89b0b758f8
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=04bad6d03a17eb5ed5ae39359058b097
diff --git a/metadata/md5-cache/dev-java/opencsv-2.3 b/metadata/md5-cache/dev-java/opencsv-2.3
index 5e043e129aaf..477182c1f857 100644
--- a/metadata/md5-cache/dev-java/opencsv-2.3
+++ b/metadata/md5-cache/dev-java/opencsv-2.3
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/opencsv/opencsv-2.3-src-with-libs.tar.gz -> opencsv-2.3.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c2097cd0ee7fac37cfdfec7428afa4f4
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6340ad3a91296be825974ab2eb5c8001
diff --git a/metadata/md5-cache/dev-java/oracle-javamail-1.5.2 b/metadata/md5-cache/dev-java/oracle-javamail-1.5.2
index 00afdf431bf9..cffd436dc452 100644
--- a/metadata/md5-cache/dev-java/oracle-javamail-1.5.2
+++ b/metadata/md5-cache/dev-java/oracle-javamail-1.5.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://java.net/projects/javamail/downloads/download/source/javamail-1.5.2-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=10437368007aecd8ffbd28e9e2a2057a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c7de91079551f1cbc30cb5d784040cfc
diff --git a/metadata/md5-cache/dev-java/oracle-javamail-1.5.5 b/metadata/md5-cache/dev-java/oracle-javamail-1.5.5
index a97f8e01ebaf..6223bc3155ff 100644
--- a/metadata/md5-cache/dev-java/oracle-javamail-1.5.5
+++ b/metadata/md5-cache/dev-java/oracle-javamail-1.5.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://java.net/projects/javamail/downloads/download/source/javamail-1.5.5-src.zip -> oracle-javamail-1.5.5.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5a0f97d652110d186a086aa8848adb6b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d0c10d8128a25057cdd7487b30c0b766
diff --git a/metadata/md5-cache/dev-java/oracle-javamail-1.5.6 b/metadata/md5-cache/dev-java/oracle-javamail-1.5.6
index 5a32b8d13473..c1ffe38f0f34 100644
--- a/metadata/md5-cache/dev-java/oracle-javamail-1.5.6
+++ b/metadata/md5-cache/dev-java/oracle-javamail-1.5.6
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://java.net/projects/javamail/downloads/download/source/javamail-1.5.6-src.zip -> oracle-javamail-1.5.6.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5a0f97d652110d186a086aa8848adb6b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d0c10d8128a25057cdd7487b30c0b766
diff --git a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.121 b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.121
index f4c546ded88b..6a2772a89ddf 100644
--- a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.121
+++ b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.121
@@ -12,5 +12,5 @@ RESTRICT=fetch preserve-libs strip
 SLOT=1.8
 SRC_URI=amd64? ( jdk-8u121-linux-x64.tar.gz examples? ( jdk-8u121-linux-x64-demos.tar.gz ) ) arm? ( jdk-8u121-linux-arm32-vfp-hflt.tar.gz examples? ( jdk-8u121-linux-arm32-vfp-hflt-demos.tar.gz ) ) arm64? ( jdk-8u121-linux-arm64-vfp-hflt.tar.gz examples? ( jdk-8u121-linux-arm64-vfp-hflt-demos.tar.gz ) ) x86? ( jdk-8u121-linux-i586.tar.gz examples? ( jdk-8u121-linux-i586-demos.tar.gz ) ) x64-solaris? ( jdk-8u121-solaris-x64.tar.gz examples? ( jdk-8u121-solaris-x64-demos.tar.gz ) ) sparc64-solaris? ( jdk-8u121-solaris-sparcv9.tar.gz examples? ( jdk-8u121-solaris-sparcv9-demos.tar.gz ) ) x64-macos? ( jdk-8u121-macosx-x64.dmg examples? ( jdk-8u121-macosx-x86_64-demos.zip ) ) jce? ( jce_policy-8.zip )
 _eclass_exported_funcs=pkg_prerm:java-vm-2 pkg_postrm:java-vm-2 pkg_postinst:- pkg_setup:java-vm-2 src_unpack:- src_prepare:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	4fd0e83bad4ea20bac7f73e2e59a0c60	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=54f24f4048510a3db125468da01269bd
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	fdo-mime	21ef5adf81836863efa968f2a25cff64	java-vm-2	477ca23a49dfcd57017ee7f3bed47564	multilib	0236be304ee52e7f179ed2f337075515	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	df8265631f8bf5f5df387e9b987121f9	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a65246436a6ac9b713445bbd5c97861a
diff --git a/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.121 b/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.121
index 0e382df148a8..b09d9fcdbed7 100644
--- a/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.121
+++ b/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.121
@@ -11,5 +11,5 @@ RESTRICT=fetch preserve-libs strip
 SLOT=1.8
 SRC_URI=amd64? ( jre-8u121-linux-x64.tar.gz ) x86? ( jre-8u121-linux-i586.tar.gz ) jce? ( jce_policy-8.zip )
 _eclass_exported_funcs=pkg_prerm:java-vm-2 pkg_postrm:java-vm-2 pkg_postinst:- pkg_setup:java-vm-2 src_unpack:- src_prepare:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	4fd0e83bad4ea20bac7f73e2e59a0c60	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3443812649687cbfd5d6091884cdeafa
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	fdo-mime	21ef5adf81836863efa968f2a25cff64	java-vm-2	477ca23a49dfcd57017ee7f3bed47564	multilib	0236be304ee52e7f179ed2f337075515	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	df8265631f8bf5f5df387e9b987121f9	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=026269d9667a5abe9c5e6c0822800afc
diff --git a/metadata/md5-cache/dev-java/osgi-compendium-4.3.1 b/metadata/md5-cache/dev-java/osgi-compendium-4.3.1
index 4b96d1f91a33..6c1e94ad00a5 100644
--- a/metadata/md5-cache/dev-java/osgi-compendium-4.3.1
+++ b/metadata/md5-cache/dev-java/osgi-compendium-4.3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 dev-java/osgi-
 SLOT=0
 SRC_URI=https://osgi.org/download/r4v43/osgi.cmpn-4.3.1.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a5cbe5068fec521f198546094f7d7917
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4f82570a3ff65f7b4659df644c60984f
diff --git a/metadata/md5-cache/dev-java/osgi-core-api-5.0.0 b/metadata/md5-cache/dev-java/osgi-core-api-5.0.0
index 75718d5d3c2f..bd8d67521b8d 100644
--- a/metadata/md5-cache/dev-java/osgi-core-api-5.0.0
+++ b/metadata/md5-cache/dev-java/osgi-core-api-5.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://www.osgi.org/download/r5/osgi.core-5.0.0.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=87bebd688491eb43562769ed9a925e90
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=67b4ff654c4128fe52e97d9eb92442fb
diff --git a/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r1 b/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r1
index afeca89e6f9c..b0e083035b52 100644
--- a/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r1
+++ b/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://www.osgi.org/download/r5/osgi.core-5.0.0.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b959a33bfa87f26a6ca1d8be5e7c6ba2
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d700801b4ddcc54f72fdc83673dae3ff
diff --git a/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0 b/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0
index d757d6117466..6b6dd7d5f5bf 100644
--- a/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0
+++ b/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0
@@ -11,5 +11,5 @@ RESTRICT=bindist fetch
 SLOT=0
 SRC_URI=http://www.osgi.org/download/r5/osgi.enterprise-5.0.0.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3124a4eeb9a314ecfa02853204dbf22d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=bf845d50be067f9eb844b69191ac5b4d
diff --git a/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r1 b/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r1
index 92596643594d..9508b62c88ed 100644
--- a/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r1
+++ b/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/osgi-foundation-1.2.0.tar.xz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b1e08d4a8ae241982edc047368dfc5f9
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=115c3fb4eec53990852908dec04d1f9d
diff --git a/metadata/md5-cache/dev-java/osgi-obr-1.0.2 b/metadata/md5-cache/dev-java/osgi-obr-1.0.2
index b72fb84e9f8c..9f67823ed11a 100644
--- a/metadata/md5-cache/dev-java/osgi-obr-1.0.2
+++ b/metadata/md5-cache/dev-java/osgi-obr-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/osgi-core-api:0 >=dev-java/java-config-2.2.0-
 SLOT=0
 SRC_URI=mirror://apache/dist/felix/org.osgi.service.obr-1.0.2-project.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d22b32945e569a7eca9a98389b09f576
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8c79dc7b9f79b2a007e3400919d5c5f6
diff --git a/metadata/md5-cache/dev-java/pat-1.5.3-r1 b/metadata/md5-cache/dev-java/pat-1.5.3-r1
index c22a761bc0fb..91eb554afeeb 100644
--- a/metadata/md5-cache/dev-java/pat-1.5.3-r1
+++ b/metadata/md5-cache/dev-java/pat-1.5.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://www.javaregex.com/binaries/patsrcfree153.jar -> pat-1.5.3.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8cc333e2513945b96d32e9e5fb2a0dc3
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b99ddff372b7536759dbf9141edbe168
diff --git a/metadata/md5-cache/dev-java/pdf-renderer-0.9.1 b/metadata/md5-cache/dev-java/pdf-renderer-0.9.1
index b30df8bbd873..a9fa87aa2a40 100644
--- a/metadata/md5-cache/dev-java/pdf-renderer-0.9.1
+++ b/metadata/md5-cache/dev-java/pdf-renderer-0.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://java.net/projects/pdf-renderer/downloads/download/PDFRenderer-full-0.9.1.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=75940c07ac4cd067385d3cac92c0d13c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c1e804c8677dcff00e7c081f5c479c88
diff --git a/metadata/md5-cache/dev-java/pdf-renderer-1.0.5 b/metadata/md5-cache/dev-java/pdf-renderer-1.0.5
index 6ae2a48f4d1e..151ff258f3c6 100644
--- a/metadata/md5-cache/dev-java/pdf-renderer-1.0.5
+++ b/metadata/md5-cache/dev-java/pdf-renderer-1.0.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/org/swinglabs/pdf-renderer/1.0.5/pdf-renderer-1.0.5-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bc5b25726b4b5648f5dde138ce0a3415
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6ef3a49c9e84dd52f899a2b0500fa224
diff --git a/metadata/md5-cache/dev-java/pdfbox-1.8.11 b/metadata/md5-cache/dev-java/pdfbox-1.8.11
index 7f976a55836d..ab6425168d1e 100644
--- a/metadata/md5-cache/dev-java/pdfbox-1.8.11
+++ b/metadata/md5-cache/dev-java/pdfbox-1.8.11
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=1.8
 SRC_URI=mirror://apache/pdfbox/1.8.11/pdfbox-1.8.11-src.zip http://repo2.maven.org/maven2/com/adobe/pdf/pcfi/2010.08.09/pcfi-2010.08.09.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=cb37e3ba6cd23a9da13e035b84c0705c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=edaa8e6e99f81af84a2d7e979172c62f
diff --git a/metadata/md5-cache/dev-java/piccolo-1.04 b/metadata/md5-cache/dev-java/piccolo-1.04
index ff69f4b7fa7b..102bd6e088cc 100644
--- a/metadata/md5-cache/dev-java/piccolo-1.04
+++ b/metadata/md5-cache/dev-java/piccolo-1.04
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/piccolo/piccolo-1.04-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=94b8a72b1c6d61286dd977210d3fa832
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9d9336f5e71e84b6c28435a6a5476627
diff --git a/metadata/md5-cache/dev-java/piccolo2d-3.0-r1 b/metadata/md5-cache/dev-java/piccolo2d-3.0-r1
index 6eef835eb2d8..c21c2f4deea6 100644
--- a/metadata/md5-cache/dev-java/piccolo2d-3.0-r1
+++ b/metadata/md5-cache/dev-java/piccolo2d-3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/swt:3.8 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 sourc
 SLOT=0
 SRC_URI=https://github.com/piccolo2d/piccolo2d.java/archive/piccolo2d-complete-3.0.zip -> piccolo2d-3.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=06d91477ad73040a4df5bfb7ae4e65ba
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=77f9aedc88bd327f8651e00bfa9b4cd5
diff --git a/metadata/md5-cache/dev-java/picocontainer-1.1-r1 b/metadata/md5-cache/dev-java/picocontainer-1.1-r1
index 059e0d34cae3..1e9cbbce4290 100644
--- a/metadata/md5-cache/dev-java/picocontainer-1.1-r1
+++ b/metadata/md5-cache/dev-java/picocontainer-1.1-r1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=1
 SRC_URI=http://dist.codehaus.org/picocontainer/distributions/picocontainer-1.1-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d44a14ca1ac0235716e90cebd2671d57
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=87d279420f99638d6cde698acd8aa1f9
diff --git a/metadata/md5-cache/dev-java/plexus-classworlds-2.2.3 b/metadata/md5-cache/dev-java/plexus-classworlds-2.2.3
index af0efad4e3fe..bf4c8cabe0ea 100644
--- a/metadata/md5-cache/dev-java/plexus-classworlds-2.2.3
+++ b/metadata/md5-cache/dev-java/plexus-classworlds-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ercpe/distfiles/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b450e3fc2dbfb057baeb16d28f76e26d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c87c2903a70984cdac9a4037aa9d8f38
diff --git a/metadata/md5-cache/dev-java/portletapi-1.0-r1 b/metadata/md5-cache/dev-java/portletapi-1.0-r1
index 92341bd56fa1..987bb4be3c3f 100644
--- a/metadata/md5-cache/dev-java/portletapi-1.0-r1
+++ b/metadata/md5-cache/dev-java/portletapi-1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=1
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/portletapi-1.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=39ec7a56487207ab68b3c7908c6f10cb
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b2236e7efe7f8db35adbedff484a7145
diff --git a/metadata/md5-cache/dev-java/portletapi-2.0-r1 b/metadata/md5-cache/dev-java/portletapi-2.0-r1
index a2efed126a8b..a813128af30f 100644
--- a/metadata/md5-cache/dev-java/portletapi-2.0-r1
+++ b/metadata/md5-cache/dev-java/portletapi-2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/tomcat-servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config
 SLOT=2.0
 SRC_URI=https://repo1.maven.org/maven2/javax/portlet/portlet-api/2.0/portlet-api-2.0-sources.jar -> portletapi-2.0.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0a800a6f69ca96a88493b2079c6c1b7a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=637750794e80e3f84fcd9fb4009ec3a6
diff --git a/metadata/md5-cache/dev-java/prefuse-20071021_beta b/metadata/md5-cache/dev-java/prefuse-20071021_beta
index abf55ccd2c30..6545b90f38c5 100644
--- a/metadata/md5-cache/dev-java/prefuse-20071021_beta
+++ b/metadata/md5-cache/dev-java/prefuse-20071021_beta
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/lucene:1 >=dev-java/java-config-2.2.0-r3 sour
 SLOT=2006
 SRC_URI=mirror://sourceforge/prefuse/prefuse-beta-20071021.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d4947f5d8d105497807527a7340fa61e
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f4dbf11910d7b49607dc9ea9438befd1
diff --git a/metadata/md5-cache/dev-java/proguard-4.5 b/metadata/md5-cache/dev-java/proguard-4.5
index b56685da9d57..6ad341c79dd5 100644
--- a/metadata/md5-cache/dev-java/proguard-4.5
+++ b/metadata/md5-cache/dev-java/proguard-4.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7:0 j2me? ( >=dev-java/sun-j2me-
 SLOT=0
 SRC_URI=mirror://sourceforge/proguard/proguard4.5.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a9bcb7ff7ff6b3b83a0990767503d5f6
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1a09022ffac7314abdac2e1c91383bcf
diff --git a/metadata/md5-cache/dev-java/proguard-4.7 b/metadata/md5-cache/dev-java/proguard-4.7
index a3d034a47e28..c3b3288a6ba9 100644
--- a/metadata/md5-cache/dev-java/proguard-4.7
+++ b/metadata/md5-cache/dev-java/proguard-4.7
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7:0 j2me? ( >=dev-java/sun-j2me-
 SLOT=0
 SRC_URI=mirror://sourceforge/proguard/proguard4.7.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7aebdf33867b15f0bc88c18c953622cb
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1dfb1e3cdcf8efbefa147c3e2535c0c2
diff --git a/metadata/md5-cache/dev-java/proguard-4.8 b/metadata/md5-cache/dev-java/proguard-4.8
index 23f109c95d08..117ad4da5183 100644
--- a/metadata/md5-cache/dev-java/proguard-4.8
+++ b/metadata/md5-cache/dev-java/proguard-4.8
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7:0 j2me? ( >=dev-java/sun-j2me-
 SLOT=0
 SRC_URI=mirror://sourceforge/proguard/proguard4.8.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7fa22d791a1896cf4da6d182a60f41ad
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=aaa971eaf64d8c4bed128f929beb09d9
diff --git a/metadata/md5-cache/dev-java/proguard-5.2.1 b/metadata/md5-cache/dev-java/proguard-5.2.1
index 4d0e96446231..60e3da36e733 100644
--- a/metadata/md5-cache/dev-java/proguard-5.2.1
+++ b/metadata/md5-cache/dev-java/proguard-5.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/ant-core-1.7:0 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/proguard/proguard5.2.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=46cebf5d1695ed950d1b37019380faa1
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a43ab86ec8610ec6d42c5b5301b3ac0b
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.0.0_beta3_p1 b/metadata/md5-cache/dev-java/protobuf-java-3.0.0_beta3_p1
index 5d486019088f..066e7845a75f 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.0.0_beta3_p1
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.0.0_beta3_p1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-
 SLOT=0/10b3
 SRC_URI=https://github.com/google/protobuf/archive/v3.0.0-beta-3.1.tar.gz -> protobuf-3.0.0_beta3_p1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0c54ee6aa98ad7ba3263efb106c6cb63
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2e029e24da4bdcc9bcff02779fd5f14d
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.0.2 b/metadata/md5-cache/dev-java/protobuf-java-3.0.2
index d57d533c051d..1963f096e5ee 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.0.2
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-
 SLOT=0/10
 SRC_URI=https://github.com/google/protobuf/archive/v3.0.2.tar.gz -> protobuf-3.0.2.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=54a8dfa7d9472610582e65ccd24e5e1e
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5e84baf73fdda8c4f6a027bd242613bf
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.1.0 b/metadata/md5-cache/dev-java/protobuf-java-3.1.0
index 1492b6d2ea03..600521a30f46 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.1.0
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-
 SLOT=0/11
 SRC_URI=https://github.com/google/protobuf/archive/v3.1.0.tar.gz -> protobuf-3.1.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b40a1b8e0d73f9dde59d5dbb3b8f9326
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=df599ebdefe16964c800fd520c8e4c22
diff --git a/metadata/md5-cache/dev-java/qdox-1.12.1-r1 b/metadata/md5-cache/dev-java/qdox-1.12.1-r1
index 6f3077b1b391..c94ce744ba2f 100644
--- a/metadata/md5-cache/dev-java/qdox-1.12.1-r1
+++ b/metadata/md5-cache/dev-java/qdox-1.12.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 so
 SLOT=1.12
 SRC_URI=https://github.com/codehaus/qdox/archive/qdox-1.12.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=be844aa21e61bb387ae2ef62db06cd0a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=db74765db912b7170e1c72b05061477a
diff --git a/metadata/md5-cache/dev-java/qdox-1.6.3 b/metadata/md5-cache/dev-java/qdox-1.6.3
index 8e4358001c1f..8d310b3c4288 100644
--- a/metadata/md5-cache/dev-java/qdox-1.6.3
+++ b/metadata/md5-cache/dev-java/qdox-1.6.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/ant-core =dev-java/junit-3.8* >=dev-java/java
 SLOT=1.6
 SRC_URI=http://repository.codehaus.org/com/thoughtworks/qdox/qdox/1.6.3/qdox-1.6.3-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e32b202031a87f55238ee71686aa74f9
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5bc9646466b04ea59ca4ca181677b30b
diff --git a/metadata/md5-cache/dev-java/radeox-1.0_beta2-r1 b/metadata/md5-cache/dev-java/radeox-1.0_beta2-r1
index 78a1019b9970..c2b9efb92723 100644
--- a/metadata/md5-cache/dev-java/radeox-1.0_beta2-r1
+++ b/metadata/md5-cache/dev-java/radeox-1.0_beta2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 =dev-java/commons-logging-1* >=dev-java/java-config-2.
 SLOT=1
 SRC_URI=ftp://snipsnap.org/radeox/radeox-1.0-BETA-2-src.tgz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6256687cb4ae1104a6abe855f7ea7665
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=33eedcf109a3d94f73b2653944a50759
diff --git a/metadata/md5-cache/dev-java/rat-0.11 b/metadata/md5-cache/dev-java/rat-0.11
index c66699851915..220f4940e601 100644
--- a/metadata/md5-cache/dev-java/rat-0.11
+++ b/metadata/md5-cache/dev-java/rat-0.11
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-core:0 dev-java/commons-io:1 dev-java/commons-cli:1 dev-jav
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/apache/rat/apache-rat-core/0.11/apache-rat-core-0.11-sources.jar https://repo1.maven.org/maven2/org/apache/rat/apache-rat-tasks/0.11/apache-rat-tasks-0.11-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b21df9c8fca62fb6c809dcd5dbd98a14
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1e0034c3107bec2b36014dd366ca4abe
diff --git a/metadata/md5-cache/dev-java/reflectasm-1.11.0 b/metadata/md5-cache/dev-java/reflectasm-1.11.0
index 5e3332b61022..8e57c46197d9 100644
--- a/metadata/md5-cache/dev-java/reflectasm-1.11.0
+++ b/metadata/md5-cache/dev-java/reflectasm-1.11.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/asm:4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source?
 SLOT=0
 SRC_URI=https://github.com/EsotericSoftware/reflectasm/archive/reflectasm-1.11.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ed6488b51448e558965534907bd4dd4f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e17bc1aef2d119f041c3fd4b7b9c9cf3
diff --git a/metadata/md5-cache/dev-java/reflectasm-1.11.1 b/metadata/md5-cache/dev-java/reflectasm-1.11.1
index 390da96e1086..e455908131b9 100644
--- a/metadata/md5-cache/dev-java/reflectasm-1.11.1
+++ b/metadata/md5-cache/dev-java/reflectasm-1.11.1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/asm:4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source?
 SLOT=0
 SRC_URI=https://github.com/EsotericSoftware/reflectasm/archive/reflectasm-1.11.1.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=72120022cb289cd6ff19eb9b09b0c8e9
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b4412ff39b57da0dfb11d8e21d1e849d
diff --git a/metadata/md5-cache/dev-java/reflections-0.9.10-r1 b/metadata/md5-cache/dev-java/reflections-0.9.10-r1
index c3046d5f926f..0d93ed375c57 100644
--- a/metadata/md5-cache/dev-java/reflections-0.9.10-r1
+++ b/metadata/md5-cache/dev-java/reflections-0.9.10-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 dev-java/commons-vfs:2 dev-java/dom4j:1 dev-java/gson:
 SLOT=0
 SRC_URI=http://search.maven.org/remotecontent?filepath=org/reflections/reflections/0.9.10/reflections-0.9.10-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=38b1ca769cda546cb17e9b7be8819079
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3317ac010aba1b01e1529c417ef57570
diff --git a/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r1 b/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r1
index 14f2f299dc0b..ef1eb15b2a05 100644
--- a/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r1
+++ b/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/relaxng/relaxngDatatype-1.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1f42be03c166e221b9d890146f2ced9b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8877c44acdc1684caa799ec4f362afee
diff --git a/metadata/md5-cache/dev-java/relaxngcc-1.12-r3 b/metadata/md5-cache/dev-java/relaxngcc-1.12-r3
index 5b93372ab5de..c59b45d64b68 100644
--- a/metadata/md5-cache/dev-java/relaxngcc-1.12-r3
+++ b/metadata/md5-cache/dev-java/relaxngcc-1.12-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-java/msv:0 dev-java/xsdlib:0 dev-java/ant-core:0 dev-java/iso-relax:
 SLOT=0
 SRC_URI=mirror://sourceforge/relaxngcc/relaxngcc-20031218.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3371896072d9a4b6a62c6e64e3cfa786
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c97d7fe9f9c9a375015562cf355936d7
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25 b/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25
index 1e46d9932384..2647648e2cf2 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=2.4
 SRC_URI=http://www.caucho.com/download/resin-3.0.25-src.zip mirror://gentoo/resin-gentoo-patches-3.0.25.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e18a3aa4f5344d81b13837d58b8f7ef7
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a9299cb5aa15656d474c20e343f6a9f2
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-3.1.12 b/metadata/md5-cache/dev-java/resin-servlet-api-3.1.12
index 3605775603fa..b6d8af390e43 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-3.1.12
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-3.1.12
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=2.5
 SRC_URI=http://www.caucho.com/download/resin-3.1.12-src.zip mirror://gentoo/resin-gentoo-patches-3.1.12.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ec05d88ee8aba5b1fc37f39348899193
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e8c757cb1d24f28a3bedb5262bcc0310
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.26 b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.26
index 2ea05ad74d44..5c496742e03b 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.26
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.26
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=3.0
 SRC_URI=http://www.caucho.com/download/resin-4.0.26-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=38a531da017257d50c3a72a6fa69bfa1
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0054655b58f100ee3e9154835c6f3570
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.27 b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.27
index 9f344f0f38f8..624457d3cd1f 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.27
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.27
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=3.0
 SRC_URI=http://www.caucho.com/download/resin-4.0.27-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=abc8671627c6f92619379d092b5d4921
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=451dd806ae8b37f6650f4066caebeac5
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.44 b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.44
index 1d9e5132b317..7c24d12c0d06 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.44
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.44
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=3.1
 SRC_URI=http://www.caucho.com/download/resin-4.0.44-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b0b50a6bc7f359c7b6bc285c80b53591
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=32e550cb4fcd52135d237f9a2c961979
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.46 b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.46
index 18ba42250d44..1860bc1a2191 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.46
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.46
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=3.1
 SRC_URI=http://www.caucho.com/download/resin-4.0.46-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b0b50a6bc7f359c7b6bc285c80b53591
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=32e550cb4fcd52135d237f9a2c961979
diff --git a/metadata/md5-cache/dev-java/rhino-1.7.7-r1 b/metadata/md5-cache/dev-java/rhino-1.7.7-r1
index f6ec7fe76336..75d6855739f0 100644
--- a/metadata/md5-cache/dev-java/rhino-1.7.7-r1
+++ b/metadata/md5-cache/dev-java/rhino-1.7.7-r1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=1.6
 SRC_URI=https://github.com/mozilla/rhino/archive/Rhino1_7_7_RELEASE.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d6647bef205f3a39c48629f99ed1164a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=76d1f3d24f70d1dcaffcef19cdf7a308
diff --git a/metadata/md5-cache/dev-java/rngom-20100718-r1 b/metadata/md5-cache/dev-java/rngom-20100718-r1
index b6f4954c7fad..269865a17e26 100644
--- a/metadata/md5-cache/dev-java/rngom-20100718-r1
+++ b/metadata/md5-cache/dev-java/rngom-20100718-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xsdlib:0 dev-java/relaxng-datatype:0 >=virtual/jre-1.6 >=dev-ja
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/kohsuke/rngom/rngom/20100718/rngom-20100718-sources.jar -> rngom-20100718.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9f284728cfa064702c369e49ebfc3510
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b3231e1d679b800f1199db3e1a348108
diff --git a/metadata/md5-cache/dev-java/rome-0.9-r2 b/metadata/md5-cache/dev-java/rome-0.9-r2
index 54a89e461195..7b70e27d7742 100644
--- a/metadata/md5-cache/dev-java/rome-0.9-r2
+++ b/metadata/md5-cache/dev-java/rome-0.9-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jdom:1.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 sour
 SLOT=0
 SRC_URI=https://rome.dev.java.net/source/browse/*checkout*/rome/www/dist/rome-0.9-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2cdc1699237ed43a9c9dd25b61ddeb4c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8b4843a1466955a73c052e5a0b485ca0
diff --git a/metadata/md5-cache/dev-java/rome-0.9-r3 b/metadata/md5-cache/dev-java/rome-0.9-r3
index f5aa504cd9ae..debedb1bbee5 100644
--- a/metadata/md5-cache/dev-java/rome-0.9-r3
+++ b/metadata/md5-cache/dev-java/rome-0.9-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jdom:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source
 SLOT=0
 SRC_URI=mirror://gentoo/rome-0.9-src.zip -> rome-0.9.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4585ebed65b07f1b5654c96f9e2f0382
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=fbd86419558b9a1a388edb5367b18b83
diff --git a/metadata/md5-cache/dev-java/rundoc-0.11-r1 b/metadata/md5-cache/dev-java/rundoc-0.11-r1
index e5d218c24f91..db6bea5b1bed 100644
--- a/metadata/md5-cache/dev-java/rundoc-0.11-r1
+++ b/metadata/md5-cache/dev-java/rundoc-0.11-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 so
 SLOT=0
 SRC_URI=http://www.martiansoftware.com/lab/rundoc/rundoc-0.11-src.zip -> rundoc-0.11.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d52ee7001e62bf0ac0d3958884187028
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b331493cee16a9663d2e72ceb9cbb3b9
diff --git a/metadata/md5-cache/dev-java/rxtx-2.2_pre2 b/metadata/md5-cache/dev-java/rxtx-2.2_pre2
index fb9c96639b23..fce524458ba3 100644
--- a/metadata/md5-cache/dev-java/rxtx-2.2_pre2
+++ b/metadata/md5-cache/dev-java/rxtx-2.2_pre2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3
 SLOT=2
 SRC_URI=ftp://ftp.qbang.org/pub/rxtx/rxtx-2.2pre2.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:- src_configure:- src_compile:- src_install:-
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	libtool	84763589a795fb127b537cac01e5359f	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ac49d7d906489912fc479f082e6c75e1
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	48b1b9f6194d2842456514d1184ca72e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d99eaecbbdbe15b47c6ada5296cfa691
diff --git a/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r1 b/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r1
index 53ee219faca3..8e751ac1ee1e 100644
--- a/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r1
+++ b/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 lfd? ( sys-apps/xinetd ) >=dev-java/java-config-2.2.0-
 SLOT=2
 SRC_URI=ftp://ftp.qbang.org/pub/rxtx/rxtx-2.2pre2.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:- src_configure:- src_compile:- src_install:-
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	libtool	84763589a795fb127b537cac01e5359f	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=384c9f6c6e1f77752f3ae5af251ca97d
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	48b1b9f6194d2842456514d1184ca72e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=419b08828d0e665e7913f1e18e1c9ba7
diff --git a/metadata/md5-cache/dev-java/saaj-1.3.19-r1 b/metadata/md5-cache/dev-java/saaj-1.3.19-r1
index 276fcdb46063..f5f39cee8dad 100644
--- a/metadata/md5-cache/dev-java/saaj-1.3.19-r1
+++ b/metadata/md5-cache/dev-java/saaj-1.3.19-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/mimepull:0 dev-java/xerces:2 dev-java/xml-commons-external:1.4
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sera/distfiles/saaj-1.3.19.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=06eaceca0471648ee6c132ae80b9cb64
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b4462ea389911c207f3c4f5d85ccae81
diff --git a/metadata/md5-cache/dev-java/sablecc-3.7-r1 b/metadata/md5-cache/dev-java/sablecc-3.7-r1
index 01b909fc5b51..157a995e0747 100644
--- a/metadata/md5-cache/dev-java/sablecc-3.7-r1
+++ b/metadata/md5-cache/dev-java/sablecc-3.7-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/sablecc/sablecc-3.7.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0f04d5d0d18705750209aef2ce621140
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0f77efbd32781bcb53f20da78f1d323e
diff --git a/metadata/md5-cache/dev-java/sablecc-anttask-1.1.0-r2 b/metadata/md5-cache/dev-java/sablecc-anttask-1.1.0-r2
index 1eab6babe8c4..c2724467c72e 100644
--- a/metadata/md5-cache/dev-java/sablecc-anttask-1.1.0-r2
+++ b/metadata/md5-cache/dev-java/sablecc-anttask-1.1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/sablecc/sablecc-anttask-1.1.0-src.tar.gz -> sablecc-anttask-1.1.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=57b4cee6f799b906da21d31bc8783356
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d8def591295e0a264501ab6298aa1ebf
diff --git a/metadata/md5-cache/dev-java/sac-1.3-r2 b/metadata/md5-cache/dev-java/sac-1.3-r2
index 401bd374813e..771674159e14 100644
--- a/metadata/md5-cache/dev-java/sac-1.3-r2
+++ b/metadata/md5-cache/dev-java/sac-1.3-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://www.w3.org/2002/06/sacjava-1.3.zip -> sac-1.3.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0d47167c6c38642c0f097d200919c14a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=339d2921a57cc787069b75baf5970368
diff --git a/metadata/md5-cache/dev-java/sat4j-core-2.2.0 b/metadata/md5-cache/dev-java/sat4j-core-2.2.0
index dfbe14108e78..ba9106ea1efe 100644
--- a/metadata/md5-cache/dev-java/sat4j-core-2.2.0
+++ b/metadata/md5-cache/dev-java/sat4j-core-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=2
 SRC_URI=http://download.forge.objectweb.org/sat4j/sat4j-core-v20100623.zip http://download.forge.objectweb.org/sat4j/build-2.4.xml -> sat4j-core-2.2.0-build.xml
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c418055e4e093a09b741c819ec442c19
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3576990347e79a7b53889e7fe421f883
diff --git a/metadata/md5-cache/dev-java/sat4j-core-2.3.1-r1 b/metadata/md5-cache/dev-java/sat4j-core-2.3.1-r1
index 23337decf7dc..ab531e256714 100644
--- a/metadata/md5-cache/dev-java/sat4j-core-2.3.1-r1
+++ b/metadata/md5-cache/dev-java/sat4j-core-2.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=2.3
 SRC_URI=http://download.forge.objectweb.org/sat4j/sat4j-core-v20111030.zip http://download.forge.objectweb.org/sat4j/build-2.4.xml -> sat4j-core-2.3.1-build.xml
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4ede27a2d6bcc023dfd172f5c0473454
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=49f89a7b92d9725552b80396091ff817
diff --git a/metadata/md5-cache/dev-java/sat4j-pseudo-2.2.0 b/metadata/md5-cache/dev-java/sat4j-pseudo-2.2.0
index a2984a64bbeb..fafc3b0f466d 100644
--- a/metadata/md5-cache/dev-java/sat4j-pseudo-2.2.0
+++ b/metadata/md5-cache/dev-java/sat4j-pseudo-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/sat4j-core:2 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
 SLOT=2
 SRC_URI=http://download.forge.objectweb.org/sat4j/sat4j-pb-v20100623.zip http://download.forge.objectweb.org/sat4j/build-2.4.xml -> sat4j-pseudo-2.2.0-build.xml
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4fcd6408c60589002a71ed69e1b1e33b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8e785ba116eb746157dc52e2cd1c3497
diff --git a/metadata/md5-cache/dev-java/sat4j-pseudo-2.3.1 b/metadata/md5-cache/dev-java/sat4j-pseudo-2.3.1
index ba63d324b34b..03268255050e 100644
--- a/metadata/md5-cache/dev-java/sat4j-pseudo-2.3.1
+++ b/metadata/md5-cache/dev-java/sat4j-pseudo-2.3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/sat4j-core:2.3 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r
 SLOT=2.3
 SRC_URI=http://download.forge.objectweb.org/sat4j/sat4j-pb-v20111030.zip http://download.forge.objectweb.org/sat4j/build-2.4.xml -> sat4j-pseudo-2.3.1-build.xml
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4c7f1203fc1477ad5ec7ddf860db6124
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=14adaf21bade1a789bc42ea78c6accf9
diff --git a/metadata/md5-cache/dev-java/sax-2.2.1-r2 b/metadata/md5-cache/dev-java/sax-2.2.1-r2
index f835d02e5e71..ba7e5a109d8e 100644
--- a/metadata/md5-cache/dev-java/sax-2.2.1-r2
+++ b/metadata/md5-cache/dev-java/sax-2.2.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/sax/sax2r3.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f30fb5043b4d6de068a5a8cba1c7fddb
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=cc227ff58a6b1b87d8d719802ae4894f
diff --git a/metadata/md5-cache/dev-java/sax-2.2.1-r3 b/metadata/md5-cache/dev-java/sax-2.2.1-r3
index fde8d98e085d..70c01200fe3d 100644
--- a/metadata/md5-cache/dev-java/sax-2.2.1-r3
+++ b/metadata/md5-cache/dev-java/sax-2.2.1-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/sax/sax2r3.zip -> sax-2.2.1.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b451bdbf0912ee6bda7c24e02bc76d5b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f2950f2c125a1adaf3dd00ffc0ed3963
diff --git a/metadata/md5-cache/dev-java/saxon-6.5.5 b/metadata/md5-cache/dev-java/saxon-6.5.5
index aa6bec9359ff..f559b412e78a 100644
--- a/metadata/md5-cache/dev-java/saxon-6.5.5
+++ b/metadata/md5-cache/dev-java/saxon-6.5.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 ~dev-java/jdom-1.0 >=dev-java/java-config-2.2.0-r3 >=s
 SLOT=6.5
 SRC_URI=mirror://sourceforge/saxon/saxon6-5-5.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ef1ff799914606dd8dd192131cb25026
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f505985edd4c3527cdd553f475a28d0e
diff --git a/metadata/md5-cache/dev-java/saxon-6.5.5-r1 b/metadata/md5-cache/dev-java/saxon-6.5.5-r1
index 7bc00e31087e..28a4c5f37309 100644
--- a/metadata/md5-cache/dev-java/saxon-6.5.5-r1
+++ b/metadata/md5-cache/dev-java/saxon-6.5.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/jdom:0 >=dev-java/java-config-2.2.0-r3 source
 SLOT=6.5
 SRC_URI=mirror://sourceforge/saxon/saxon6-5-5.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=68eba903909a4ce7e2a825cd56facec7
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=560ea73c9530d92f30a3a3d380b9d638
diff --git a/metadata/md5-cache/dev-java/saxon-9.2.0.6 b/metadata/md5-cache/dev-java/saxon-9.2.0.6
index e6a96d851477..e71adc2fb51b 100644
--- a/metadata/md5-cache/dev-java/saxon-9.2.0.6
+++ b/metadata/md5-cache/dev-java/saxon-9.2.0.6
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/ant-core dev-java/dom4j:1 dev-java/jdom:1.0 d
 SLOT=9
 SRC_URI=mirror://sourceforge/saxon/saxonhe9-2-0-6source.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=32c6cdd6dd269b2d21c32ce81385ef31
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=142bb6b8cb322fa3d0f4f1be1f54066a
diff --git a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r1 b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r1
index 9a0e79af267b..b535b202f733 100644
--- a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r1
+++ b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/ant-core dev-java/dom4j:1 dev-java/jdom:0 dev
 SLOT=9
 SRC_URI=mirror://sourceforge/saxon/saxonhe9-2-0-6source.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e04629f2c7117e620655d17624504131
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=29c3a1965f5d21b48b9aebe137a7134d
diff --git a/metadata/md5-cache/dev-java/saxpath-1.0-r2 b/metadata/md5-cache/dev-java/saxpath-1.0-r2
index 9167a372d44b..14be1f2fb19a 100644
--- a/metadata/md5-cache/dev-java/saxpath-1.0-r2
+++ b/metadata/md5-cache/dev-java/saxpath-1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/saxpath/saxpath-1.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8f574a86b3e5201c614456f2bf8a6f77
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f5c99226f184310201a099575f60b3bc
diff --git a/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1 b/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1
index 97f6e67932f9..cc397ef5d571 100644
--- a/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1
+++ b/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=2
 SRC_URI=mirror://sourceforge/sblim/sblim-cim-client2-2.2.1-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=aef68072b3a3704b9e2644397d522cc5
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b9aa107031f2bee352bbe1638903137f
diff --git a/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1-r1 b/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1-r1
index 16cb6bb90290..4b15ef7a2ae3 100644
--- a/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1-r1
+++ b/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=2
 SRC_URI=mirror://sourceforge/sblim/sblim-cim-client2-2.2.1-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=df26676baabebfc5e54b983086cf2b74
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2f15622af1fcb50be148fad6eff0991f
diff --git a/metadata/md5-cache/dev-java/sbt-0.13.10_rc2 b/metadata/md5-cache/dev-java/sbt-0.13.10_rc2
index 6ddbe80837db..47303ce20be3 100644
--- a/metadata/md5-cache/dev-java/sbt-0.13.10_rc2
+++ b/metadata/md5-cache/dev-java/sbt-0.13.10_rc2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=!binary? ( https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.10_rc2-src.tar.bz2 https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.10_rc2-ivy2-deps.tar.bz2 https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.10_rc2-sbt-deps.tar.bz2 https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.10_rc2-test-deps.tar.bz2 http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.13.10-RC2/sbt-launch.jar -> sbt-launch-0.13.9.jar ) binary? ( https://dev.gentoo.org/~gienah/files/dist/sbt-0.13.10_rc2-gentoo-binary.tar.bz2 )
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=20f1fe2eaf98d99bd8767e22ee8665e4
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b4b7b73d33605bb7d26a428ffc0d8603
diff --git a/metadata/md5-cache/dev-java/sbt-0.13.11 b/metadata/md5-cache/dev-java/sbt-0.13.11
index 4248bac076cc..b297e9844861 100644
--- a/metadata/md5-cache/dev-java/sbt-0.13.11
+++ b/metadata/md5-cache/dev-java/sbt-0.13.11
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=!binary? ( https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.11-src.tar.bz2 https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.11-ivy2-deps.tar.bz2 https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.11-sbt-deps.tar.bz2 http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.13.11/sbt-launch.jar -> sbt-launch-0.13.11.jar ) binary? ( https://dev.gentoo.org/~gienah/files/dist/sbt-0.13.11-gentoo-binary.tar.bz2 )
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=01313637f0ec4ff32d1058420f20bfeb
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ebcc537024ddce95d57c3066acedb4e1
diff --git a/metadata/md5-cache/dev-java/sbt-0.13.13 b/metadata/md5-cache/dev-java/sbt-0.13.13
index 75bfef1b6409..7622869932b2 100644
--- a/metadata/md5-cache/dev-java/sbt-0.13.13
+++ b/metadata/md5-cache/dev-java/sbt-0.13.13
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=!binary? ( https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.13-src.tar.xz https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.13-ivy2-deps.tar.xz https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.13-sbt-deps.tar.xz http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.13.13/sbt-launch.jar -> sbt-launch-0.13.13.jar ) binary? ( https://dev.gentoo.org/~gienah/files/dist/sbt-0.13.13-gentoo-binary.tar.xz )
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:- src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=996ee038b46f04a95787c02c9cf8398c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=fef567bbe34c2d0e38cb5c1ac74b7b24
diff --git a/metadata/md5-cache/dev-java/sbt-0.13.8-r1 b/metadata/md5-cache/dev-java/sbt-0.13.8-r1
index d5841c37a154..5a1712a44c4c 100644
--- a/metadata/md5-cache/dev-java/sbt-0.13.8-r1
+++ b/metadata/md5-cache/dev-java/sbt-0.13.8-r1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=!binary? ( https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.8-src.tar.bz2 https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.8-ivy2-deps.tar.bz2 https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.8-sbt-deps.tar.bz2 https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.8-test-deps.tar.bz2 http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.13.8/sbt-launch.jar -> sbt-launch-0.13.7.jar ) binary? ( https://dev.gentoo.org/~gienah/files/dist/sbt-0.13.8-gentoo-binary.tar.bz2 )
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a855e4f7c73a9ac45b1f5ac3a612163b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=dfb1e2b070fd75d5e117bf7bb7ef0c05
diff --git a/metadata/md5-cache/dev-java/sbt-bin-0.12.4 b/metadata/md5-cache/dev-java/sbt-bin-0.12.4
index 4ad5d4ff340d..e9774d370949 100644
--- a/metadata/md5-cache/dev-java/sbt-bin-0.12.4
+++ b/metadata/md5-cache/dev-java/sbt-bin-0.12.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 !dev-java/sbt >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://dl.bintray.com/sbt/native-packages/sbt/0.12.4/sbt-0.12.4.tgz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=df7955c5df478eefe79f2a7b440afa05
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=abd4924ed269be3d5a14f3488ae021e3
diff --git a/metadata/md5-cache/dev-java/sbt-bin-0.13.6 b/metadata/md5-cache/dev-java/sbt-bin-0.13.6
index e576e3320755..c4984e28e010 100644
--- a/metadata/md5-cache/dev-java/sbt-bin-0.13.6
+++ b/metadata/md5-cache/dev-java/sbt-bin-0.13.6
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 !dev-java/sbt >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://dl.bintray.com/sbt/native-packages/sbt/0.13.6/sbt-0.13.6.tgz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=df7955c5df478eefe79f2a7b440afa05
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=abd4924ed269be3d5a14f3488ae021e3
diff --git a/metadata/md5-cache/dev-java/sbt-bin-0.13.7 b/metadata/md5-cache/dev-java/sbt-bin-0.13.7
index 4f87c58ec02a..278d37ddd62f 100644
--- a/metadata/md5-cache/dev-java/sbt-bin-0.13.7
+++ b/metadata/md5-cache/dev-java/sbt-bin-0.13.7
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 !dev-java/sbt >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://dl.bintray.com/sbt/native-packages/sbt/0.13.7/sbt-0.13.7.tgz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=df7955c5df478eefe79f2a7b440afa05
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=abd4924ed269be3d5a14f3488ae021e3
diff --git a/metadata/md5-cache/dev-java/sbt-bin-0.13.8 b/metadata/md5-cache/dev-java/sbt-bin-0.13.8
index 5c0fb4fb476d..4712313b8617 100644
--- a/metadata/md5-cache/dev-java/sbt-bin-0.13.8
+++ b/metadata/md5-cache/dev-java/sbt-bin-0.13.8
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 !dev-java/sbt >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://dl.bintray.com/sbt/native-packages/sbt/0.13.8/sbt-0.13.8.tgz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=df7955c5df478eefe79f2a7b440afa05
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=abd4924ed269be3d5a14f3488ae021e3
diff --git a/metadata/md5-cache/dev-java/sbt-bin-0.13.9 b/metadata/md5-cache/dev-java/sbt-bin-0.13.9
index b5152bfdd31e..6ebb4d0b0885 100644
--- a/metadata/md5-cache/dev-java/sbt-bin-0.13.9
+++ b/metadata/md5-cache/dev-java/sbt-bin-0.13.9
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 !dev-java/sbt >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://dl.bintray.com/sbt/native-packages/sbt/0.13.9/sbt-0.13.9.tgz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=df7955c5df478eefe79f2a7b440afa05
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=abd4924ed269be3d5a14f3488ae021e3
diff --git a/metadata/md5-cache/dev-java/servletapi-2.2-r3 b/metadata/md5-cache/dev-java/servletapi-2.2-r3
index 81026aeed382..0f4e7dc5caa1 100644
--- a/metadata/md5-cache/dev-java/servletapi-2.2-r3
+++ b/metadata/md5-cache/dev-java/servletapi-2.2-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=2.2
 SRC_URI=mirror://gentoo/servletapi-2.2-20021101.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b8aeae31a74dc49b6edca391da4b0490
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=07f4c69803cb1845a9a122a000ee8c2a
diff --git a/metadata/md5-cache/dev-java/servletapi-2.3-r3 b/metadata/md5-cache/dev-java/servletapi-2.3-r3
index a81ffc78f2f4..19f74a890435 100644
--- a/metadata/md5-cache/dev-java/servletapi-2.3-r3
+++ b/metadata/md5-cache/dev-java/servletapi-2.3-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=2.3
 SRC_URI=mirror://gentoo/servletapi-2.3-20021101.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4b18114b25f7eff96d9b400ecdd21a53
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=530f571fc77485b99c2ffdf0259f55d6
diff --git a/metadata/md5-cache/dev-java/servletapi-2.4-r5 b/metadata/md5-cache/dev-java/servletapi-2.4-r5
index ac1f1f4577e6..98f43bf212cb 100644
--- a/metadata/md5-cache/dev-java/servletapi-2.4-r5
+++ b/metadata/md5-cache/dev-java/servletapi-2.4-r5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=2.4
 SRC_URI=http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.20/src/apache-tomcat-5.5.20-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4c115388cb74972f9d69108bb120acb4
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9e6c4d7b97f536d2d067369672581a4d
diff --git a/metadata/md5-cache/dev-java/shared-objects-1.4-r4 b/metadata/md5-cache/dev-java/shared-objects-1.4-r4
index 81d04fef5d25..9ce022313fde 100644
--- a/metadata/md5-cache/dev-java/shared-objects-1.4-r4
+++ b/metadata/md5-cache/dev-java/shared-objects-1.4-r4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://www.cwi.nl/projects/MetaEnv/shared-objects/shared-objects-1.4.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:- src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=946f47176c6cee03018bfa28694ba980
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=94db2a353c974109de92bfa076a37532
diff --git a/metadata/md5-cache/dev-java/simplyhtml-0.13.1-r1 b/metadata/md5-cache/dev-java/simplyhtml-0.13.1-r1
index 4a16e90a0753..6114b039e34d 100644
--- a/metadata/md5-cache/dev-java/simplyhtml-0.13.1-r1
+++ b/metadata/md5-cache/dev-java/simplyhtml-0.13.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/javahelp:0 dev-java/gnu-regexp:1 >=virtual/jre-1.6 >=dev-java/j
 SLOT=0
 SRC_URI=mirror://sourceforge/simplyhtml/SimplyHTML_src_0_13_1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=be0dd21b6271863af5fd5e7a932e8210
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1f3541238a04a8b3ead5e5ad78461243
diff --git a/metadata/md5-cache/dev-java/sjsxp-1.0.1-r3 b/metadata/md5-cache/dev-java/sjsxp-1.0.1-r3
index b7042ba72392..71889fce9b6d 100644
--- a/metadata/md5-cache/dev-java/sjsxp-1.0.1-r3
+++ b/metadata/md5-cache/dev-java/sjsxp-1.0.1-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xpp3:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source
 SLOT=0
 SRC_URI=mirror://gentoo/sjsxp-1.0.1.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=66d680652c99d69c7bfce5fa203fb0f6
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6456e0d1f113a7dbebd8944cb1de651f
diff --git a/metadata/md5-cache/dev-java/skinlf-6.7-r1 b/metadata/md5-cache/dev-java/skinlf-6.7-r1
index eb97d8cb003c..eb7294c3d953 100644
--- a/metadata/md5-cache/dev-java/skinlf-6.7-r1
+++ b/metadata/md5-cache/dev-java/skinlf-6.7-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/laf-plugin:0 dev-java/xalan:0 >=dev-java/java
 SLOT=0
 SRC_URI=https://skinlf.dev.java.net/files/documents/66/37801/skinlf-6.7-20060722.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f918fe4e919f13da303bf012daac7013
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f5e79b345220fafdf48dd3913b273740
diff --git a/metadata/md5-cache/dev-java/slf4j-api-1.7.7 b/metadata/md5-cache/dev-java/slf4j-api-1.7.7
index 08fb00a54db7..c58c6ca4615f 100644
--- a/metadata/md5-cache/dev-java/slf4j-api-1.7.7
+++ b/metadata/md5-cache/dev-java/slf4j-api-1.7.7
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4227a46ca6de3450f049809d6911cb4d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=fd5ba6ab83415b4765521876178252a0
diff --git a/metadata/md5-cache/dev-java/slf4j-ext-1.7.5 b/metadata/md5-cache/dev-java/slf4j-ext-1.7.5
index 0c9e69c837bb..84a20888ee9a 100644
--- a/metadata/md5-cache/dev-java/slf4j-ext-1.7.5
+++ b/metadata/md5-cache/dev-java/slf4j-ext-1.7.5
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.5.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=41c7c67d524602719fed1dd29525d133
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b55dd37b7e892e31a4ac8edd2b9baeb9
diff --git a/metadata/md5-cache/dev-java/slf4j-ext-1.7.7 b/metadata/md5-cache/dev-java/slf4j-ext-1.7.7
index 568aed4d4243..c92b2d7d25f0 100644
--- a/metadata/md5-cache/dev-java/slf4j-ext-1.7.7
+++ b/metadata/md5-cache/dev-java/slf4j-ext-1.7.7
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a3594b3fbcbef7f2df2f979d304ef9c4
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=edf1a164c1662d3c3c17168930087d20
diff --git a/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.7 b/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.7
index d0c358248c9d..f4503016dea6 100644
--- a/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.7
+++ b/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.7
@@ -10,5 +10,5 @@ RDEPEND=dev-java/log4j:0 dev-java/slf4j-api:0 >=virtual/jre-1.6 >=dev-java/java-
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e0284b80167957f1f490ac9c617fa141
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=88bcdd78c78224103d61169f7d7bf98b
diff --git a/metadata/md5-cache/dev-java/slf4j-nop-1.7.7 b/metadata/md5-cache/dev-java/slf4j-nop-1.7.7
index 49771fac0eaf..01765635ac50 100644
--- a/metadata/md5-cache/dev-java/slf4j-nop-1.7.7
+++ b/metadata/md5-cache/dev-java/slf4j-nop-1.7.7
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3 s
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9dcff2dc8d1ab47f7c522a174af5d363
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=526245eca5f28dfa648ddd5fb385a913
diff --git a/metadata/md5-cache/dev-java/slf4j-simple-1.7.7 b/metadata/md5-cache/dev-java/slf4j-simple-1.7.7
index 57de3bef77f9..968b08f81e36 100644
--- a/metadata/md5-cache/dev-java/slf4j-simple-1.7.7
+++ b/metadata/md5-cache/dev-java/slf4j-simple-1.7.7
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3 s
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=08ca7e2fe1bb27cacf5494f369806864
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0dd74cff08720921d6cd2c2a18210a58
diff --git a/metadata/md5-cache/dev-java/smack-2.2.1 b/metadata/md5-cache/dev-java/smack-2.2.1
index 5d1c9f149b91..46907bc6224a 100644
--- a/metadata/md5-cache/dev-java/smack-2.2.1
+++ b/metadata/md5-cache/dev-java/smack-2.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/xpp3 >=dev-java/java-config-2.2.0-r3 >=sys-ap
 SLOT=2.2
 SRC_URI=http://www.jivesoftware.org/builds/smack/smack-dev-2.2.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b85edb896e5c4c0f66bc6799ad313c1a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=90a3feaa2daea65d675d423649d8cf40
diff --git a/metadata/md5-cache/dev-java/snakeyaml-1.16 b/metadata/md5-cache/dev-java/snakeyaml-1.16
index f5a91e857e20..c91b4c2640f6 100644
--- a/metadata/md5-cache/dev-java/snakeyaml-1.16
+++ b/metadata/md5-cache/dev-java/snakeyaml-1.16
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://bitbucket.org/asomov/snakeyaml/get/v1.16.tar.bz2 -> snakeyaml-1.16.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:vcs-snapshot src_prepare:java-pkg-2 src_compile:java-pkg-simple src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=db8fdb6df1567afc1e097e56b7803993
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8278c06c265e08303d76fb124feb16bd
diff --git a/metadata/md5-cache/dev-java/snappy-1.0.3_rc3 b/metadata/md5-cache/dev-java/snappy-1.0.3_rc3
index 0ecb0d6b4889..383e8500314e 100644
--- a/metadata/md5-cache/dev-java/snappy-1.0.3_rc3
+++ b/metadata/md5-cache/dev-java/snappy-1.0.3_rc3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/osgi-core-api:0 app-arch/snappy >=dev-java/ja
 SLOT=1.0
 SRC_URI=https://github.com/xerial/snappy-java/archive/snappy-java-1.0.3-rc3.tar.gz -> snappy-java-1.0.3_rc3.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f9a8d3361ffc457fa6a635b7e8a41856
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9c87aad9bb1076d8f5cec730a1ad9f6e
diff --git a/metadata/md5-cache/dev-java/snappy-1.1.0.1 b/metadata/md5-cache/dev-java/snappy-1.1.0.1
index 91b16090b346..81eb5a3ea2ab 100644
--- a/metadata/md5-cache/dev-java/snappy-1.1.0.1
+++ b/metadata/md5-cache/dev-java/snappy-1.1.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/osgi-core-api:0 app-arch/snappy >=dev-java/ja
 SLOT=1.1
 SRC_URI=https://github.com/xerial/snappy-java/archive/1.1.0.1.tar.gz -> snappy-java-1.1.0.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5f1fda4025885b655017f70776c1edfb
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=682a7afb07c4d74950986862764f2924
diff --git a/metadata/md5-cache/dev-java/snip-0.11-r1 b/metadata/md5-cache/dev-java/snip-0.11-r1
index 079f0e055bca..31214f6ee7cf 100644
--- a/metadata/md5-cache/dev-java/snip-0.11-r1
+++ b/metadata/md5-cache/dev-java/snip-0.11-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 so
 SLOT=0
 SRC_URI=http://www.martiansoftware.com/lab/snip/snip-0.11-src.zip -> snip-0.11.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d52ee7001e62bf0ac0d3958884187028
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b331493cee16a9663d2e72ceb9cbb3b9
diff --git a/metadata/md5-cache/dev-java/spice-jndikit-1.2 b/metadata/md5-cache/dev-java/spice-jndikit-1.2
index 77b154e8fbba..902aa74a2c28 100644
--- a/metadata/md5-cache/dev-java/spice-jndikit-1.2
+++ b/metadata/md5-cache/dev-java/spice-jndikit-1.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=0
 SRC_URI=http://dist.codehaus.org/spice/distributions/spice-jndikit-1.2-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1d1c86a557572982757791818df0a8f5
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6e0b27e686abcbaf6105bec72d3690e1
diff --git a/metadata/md5-cache/dev-java/spice-jndikit-1.4 b/metadata/md5-cache/dev-java/spice-jndikit-1.4
index 064ee528706b..05f4fae83cc5 100644
--- a/metadata/md5-cache/dev-java/spice-jndikit-1.4
+++ b/metadata/md5-cache/dev-java/spice-jndikit-1.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/realityforge/jndikit/archive/1.4.zip -> spice-jndikit-1.4.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b448c8ffa85ac9f46dedb33f3dd6da8c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c3a1be00711f3a4dbbeb88d7d2d3c826
diff --git a/metadata/md5-cache/dev-java/spin-1.5-r1 b/metadata/md5-cache/dev-java/spin-1.5-r1
index 29767f11e6b2..95eb2507107a 100644
--- a/metadata/md5-cache/dev-java/spin-1.5-r1
+++ b/metadata/md5-cache/dev-java/spin-1.5-r1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/spin/spin-1.5-all.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1e8240fc087afff2edfe2d1089678c03
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8bfd524ca4facefc1b00aa755c67ad78
diff --git a/metadata/md5-cache/dev-java/spring-aop-3.2.4 b/metadata/md5-cache/dev-java/spring-aop-3.2.4
index c0b93e31516c..42a49bb26905 100644
--- a/metadata/md5-cache/dev-java/spring-aop-3.2.4
+++ b/metadata/md5-cache/dev-java/spring-aop-3.2.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 dev-java/spring-core:3.2 dev-java/spring-beans:3.2 dev
 SLOT=3.2
 SRC_URI=https://github.com/SpringSource/spring-framework/archive/v3.2.4.RELEASE.tar.gz -> spring-framework-3.2.4.tar.gz https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-3.2.4-buildscripts.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1fcae0a87eaa2af3236bf17cf4f9a17b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7ef52117e3754ee54a56f73eae6ad479
diff --git a/metadata/md5-cache/dev-java/spring-beans-3.2.4 b/metadata/md5-cache/dev-java/spring-beans-3.2.4
index 2af4e8049c02..c4fa87f9551a 100644
--- a/metadata/md5-cache/dev-java/spring-beans-3.2.4
+++ b/metadata/md5-cache/dev-java/spring-beans-3.2.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 dev-java/commons-logging:0 java-virtuals/servlet-api:3
 SLOT=3.2
 SRC_URI=https://github.com/SpringSource/spring-framework/archive/v3.2.4.RELEASE.tar.gz -> spring-framework-3.2.4.tar.gz https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-3.2.4-buildscripts.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1b0fed8113df1f7dbf797f74c5af827a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=bcd84ca4abe9bb6eb99edb1d4ddd4870
diff --git a/metadata/md5-cache/dev-java/spring-core-3.2.4 b/metadata/md5-cache/dev-java/spring-core-3.2.4
index 32fc96dcbefc..29fdc891ebbd 100644
--- a/metadata/md5-cache/dev-java/spring-core-3.2.4
+++ b/metadata/md5-cache/dev-java/spring-core-3.2.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 dev-java/commons-logging:0 dev-java/log4j:0 dev-java/a
 SLOT=3.2
 SRC_URI=https://github.com/SpringSource/spring-framework/archive/v3.2.4.RELEASE.tar.gz -> spring-framework-3.2.4.tar.gz https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-3.2.4-buildscripts.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1d2070d296fde4ac566f1ae802c87221
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9b9890dad3f2c7cdf713f4e00214a787
diff --git a/metadata/md5-cache/dev-java/spring-expression-3.2.4 b/metadata/md5-cache/dev-java/spring-expression-3.2.4
index 104853ed2c96..8928087346ee 100644
--- a/metadata/md5-cache/dev-java/spring-expression-3.2.4
+++ b/metadata/md5-cache/dev-java/spring-expression-3.2.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 dev-java/spring-core:3.2 >=dev-java/java-config-2.2.0-
 SLOT=3.2
 SRC_URI=https://github.com/SpringSource/spring-framework/archive/v3.2.4.RELEASE.tar.gz -> spring-framework-3.2.4.tar.gz https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-3.2.4-buildscripts.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f502aefaacd88d85cdd2311d557d465d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=34c6ae5aaf6b24c6a84aa67caba9bfc1
diff --git a/metadata/md5-cache/dev-java/spring-instrument-3.2.4 b/metadata/md5-cache/dev-java/spring-instrument-3.2.4
index f6e15b8b070b..6a269bff0ece 100644
--- a/metadata/md5-cache/dev-java/spring-instrument-3.2.4
+++ b/metadata/md5-cache/dev-java/spring-instrument-3.2.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=3.2
 SRC_URI=https://github.com/SpringSource/spring-framework/archive/v3.2.4.RELEASE.tar.gz -> spring-framework-3.2.4.tar.gz https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-3.2.4-buildscripts.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fca57445c1e215019076a33820e67549
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=aa17dea217d93c22e7ed8929f73ce4af
diff --git a/metadata/md5-cache/dev-java/spymemcached-2.9.1-r1 b/metadata/md5-cache/dev-java/spymemcached-2.9.1-r1
index 46f828ed35d7..36f65a40d6d0 100644
--- a/metadata/md5-cache/dev-java/spymemcached-2.9.1-r1
+++ b/metadata/md5-cache/dev-java/spymemcached-2.9.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/log4j:0 dev-java/slf4j-api:0 >=dev-java/java-
 SLOT=0
 SRC_URI=https://spymemcached.googlecode.com/files/spymemcached-2.9.1-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6014c683cd4a6ce1f8470c53f1574a08
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=410acf131707a404ea3256ebb344d3a0
diff --git a/metadata/md5-cache/dev-java/squareness-jlf-2.3.0-r1 b/metadata/md5-cache/dev-java/squareness-jlf-2.3.0-r1
index 10248f6c1531..6f5886a729b0 100644
--- a/metadata/md5-cache/dev-java/squareness-jlf-2.3.0-r1
+++ b/metadata/md5-cache/dev-java/squareness-jlf-2.3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/laf-plugin:0 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/squareness/squareness_jlf_src-2.3.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2c12f76a460bbdaa2fa202bb320f4adc
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a460b84cbeea73767f2b2c36962e343d
diff --git a/metadata/md5-cache/dev-java/stax-1.2.0 b/metadata/md5-cache/dev-java/stax-1.2.0
index 4d1d02adb0da..6f6321f2d049 100644
--- a/metadata/md5-cache/dev-java/stax-1.2.0
+++ b/metadata/md5-cache/dev-java/stax-1.2.0
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://dist.codehaus.org/stax/distributions/stax-src-1.2.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2aa5242d60065388a09e5c552cfc8e69
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=871be68d567f2fb3be805c3ea73fff40
diff --git a/metadata/md5-cache/dev-java/stax-ex-1.0-r4 b/metadata/md5-cache/dev-java/stax-ex-1.0-r4
index 9574a9c39fef..a6061bd6444c 100644
--- a/metadata/md5-cache/dev-java/stax-ex-1.0-r4
+++ b/metadata/md5-cache/dev-java/stax-ex-1.0-r4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 java-virtuals/jaf:0 >=dev-java/java-config-2.2.0-r3 so
 SLOT=0
 SRC_URI=https://stax-ex.java.net/files/documents/4480/44372/stax-ex-1.0-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=db0ada23352c23e0b1e717d97ce9131b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b50f7180af6708d7633019fce6d5290b
diff --git a/metadata/md5-cache/dev-java/stax-ex-1.7.6 b/metadata/md5-cache/dev-java/stax-ex-1.7.6
index 0342e08cc1b7..972ab4148f9c 100644
--- a/metadata/md5-cache/dev-java/stax-ex-1.7.6
+++ b/metadata/md5-cache/dev-java/stax-ex-1.7.6
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=1
 SRC_URI=https://maven.java.net/content/groups/public/org/jvnet/staxex/stax-ex/1.7.6/stax-ex-1.7.6-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b2a6a7b78a9404a2161cfbb074494d66
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2d3ca4fdd8bec973471d100c9d3f35e2
diff --git a/metadata/md5-cache/dev-java/stax2-api-4.0.0 b/metadata/md5-cache/dev-java/stax2-api-4.0.0
index f4f8fc6fae2f..e1de3594bf1b 100644
--- a/metadata/md5-cache/dev-java/stax2-api-4.0.0
+++ b/metadata/md5-cache/dev-java/stax2-api-4.0.0
@@ -10,5 +10,5 @@ RDEPEND=java-virtuals/stax-api:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-
 SLOT=0
 SRC_URI=https://github.com/FasterXML/stax2-api/archive/stax2-api-4.0.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6731f900c29d4828565f8d23eb60946c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ddb6e90bd4154dafae813c350b6d3474
diff --git a/metadata/md5-cache/dev-java/stax2-api-4.0.0-r1 b/metadata/md5-cache/dev-java/stax2-api-4.0.0-r1
index c2ca8d29ed72..25ae0c7f4b84 100644
--- a/metadata/md5-cache/dev-java/stax2-api-4.0.0-r1
+++ b/metadata/md5-cache/dev-java/stax2-api-4.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/FasterXML/stax2-api/archive/stax2-api-4.0.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=027e96fcad1fea5f16036ac75e7d6f2f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c9848cf618267746a810a0d81e0e5545
diff --git a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r1 b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r1
index 49cccfe71840..46d8c6f50aef 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r1
+++ b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/antlr-2.7.7-r7:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2
 SLOT=0
 SRC_URI=https://github.com/antlr/stringtemplate3/archive/3.2.1.tar.gz -> stringtemplate-3.2.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2fc463cf45d7127b4206ce3bd2647369
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b6c1dea2103c71afd5c39d20e00577b5
diff --git a/metadata/md5-cache/dev-java/stringtemplate-4.0.8 b/metadata/md5-cache/dev-java/stringtemplate-4.0.8
index 74d92bc02f61..71d5dbd94975 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-4.0.8
+++ b/metadata/md5-cache/dev-java/stringtemplate-4.0.8
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=4
 SRC_URI=https://github.com/antlr/stringtemplate4/archive/4.0.8.tar.gz -> stringtemplate-4.0.8.tar.gz http://www.antlr3.org/download/antlr-3.5.2-complete.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f331874920cb82a251bc3608c2b6504a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6ec35eecfb5a5e3c8b1cb2bef651e849
diff --git a/metadata/md5-cache/dev-java/sun-dtdparser-1.0 b/metadata/md5-cache/dev-java/sun-dtdparser-1.0
index a261b13eb932..560fcd4dc204 100644
--- a/metadata/md5-cache/dev-java/sun-dtdparser-1.0
+++ b/metadata/md5-cache/dev-java/sun-dtdparser-1.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=0
 SRC_URI=mirror://gentoo/dtd-parser-1.0-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ab8dc3dd4e4dfe5db1d9eb1acb169609
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c0539e608d7ba24f9638eea588ab8dea
diff --git a/metadata/md5-cache/dev-java/sun-httpserver-bin-2.0.1-r1 b/metadata/md5-cache/dev-java/sun-httpserver-bin-2.0.1-r1
index 95703cfc85ac..d7468ed76d08 100644
--- a/metadata/md5-cache/dev-java/sun-httpserver-bin-2.0.1-r1
+++ b/metadata/md5-cache/dev-java/sun-httpserver-bin-2.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
 SLOT=2
 SRC_URI=https://jax-ws.dev.java.net/jax-ws-201-m1/JAXWS2.0.1m1_source_20060817.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5c53142dbfd9240bc010ede57c5af74b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a1295fd4203a8f51d0cbdf496a94f0da
diff --git a/metadata/md5-cache/dev-java/sun-j2ee-deployment-bin-1.1-r2 b/metadata/md5-cache/dev-java/sun-j2ee-deployment-bin-1.1-r2
index 5da4e236c2fb..4be7817efc3f 100644
--- a/metadata/md5-cache/dev-java/sun-j2ee-deployment-bin-1.1-r2
+++ b/metadata/md5-cache/dev-java/sun-j2ee-deployment-bin-1.1-r2
@@ -11,5 +11,5 @@ RESTRICT=fetch
 SLOT=1.1
 SRC_URI=j2ee_deployment-1_1-fr-class.zip doc? ( j2ee_deployment-1_1-fr-doc.zip )
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3b76b8562ca7598d156ca01d488ab41d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c1c2dab864fb709702277b562955b9b3
diff --git a/metadata/md5-cache/dev-java/sun-jacc-api-20070102 b/metadata/md5-cache/dev-java/sun-jacc-api-20070102
index 845fd5fc6867..d934646435a7 100644
--- a/metadata/md5-cache/dev-java/sun-jacc-api-20070102
+++ b/metadata/md5-cache/dev-java/sun-jacc-api-20070102
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 =dev-java/servletapi-2.4* >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/sun-jacc-api-20070102.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f4e7a58863223c22814974ac619eea7f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=82d48daecae62764feeccf786dd1b67f
diff --git a/metadata/md5-cache/dev-java/sun-jaf-1.1.1 b/metadata/md5-cache/dev-java/sun-jaf-1.1.1
index 70f0f499f8e0..80d5ac2fe63b 100644
--- a/metadata/md5-cache/dev-java/sun-jaf-1.1.1
+++ b/metadata/md5-cache/dev-java/sun-jaf-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=0
 SRC_URI=mirror://gentoo/sun-jaf-1.1.1.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=21848824250de75e80d10af8496442e9
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=878f5df6644093760dc8382362146b25
diff --git a/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3 b/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3
index 119fddec2893..5c7b01158038 100644
--- a/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3
+++ b/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3
@@ -11,5 +11,5 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=http://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-i586.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_unpack:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5c347e6977e6f3c484c1e2800e08b7d7
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=32f5da8b49b1a36d53fb2446bdcc2cb9
diff --git a/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r1 b/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r1
index 4393ff624d92..459318517f1f 100644
--- a/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r1
+++ b/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r1
@@ -11,5 +11,5 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=!amd64? ( http://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-i586.tar.gz ) amd64? ( http://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-amd64.tar.gz )
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_unpack:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=47c16bd5b376ab623a096e44a91ef6b0
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8ee82069c97c3a67d92f1303e504792e
diff --git a/metadata/md5-cache/dev-java/sun-java3d-bin-1.3.2-r1 b/metadata/md5-cache/dev-java/sun-java3d-bin-1.3.2-r1
index 2611e2bf1ea9..8c48b47388f9 100644
--- a/metadata/md5-cache/dev-java/sun-java3d-bin-1.3.2-r1
+++ b/metadata/md5-cache/dev-java/sun-java3d-bin-1.3.2-r1
@@ -11,5 +11,5 @@ RESTRICT=fetch
 SLOT=0
 SRC_URI=amd64? ( java3d-1_3_2-linux-amd64.zip ) x86? ( java3d-1_3_2-linux-i586.zip )
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_unpack:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=76e368e98b4efff43c92478802102207
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=204d22bde13fb0bb9d0dee5e55ed1973
diff --git a/metadata/md5-cache/dev-java/sun-java3d-bin-1.4.0_pre5-r1 b/metadata/md5-cache/dev-java/sun-java3d-bin-1.4.0_pre5-r1
index fb7e6da32b94..62b68dfd7ebb 100644
--- a/metadata/md5-cache/dev-java/sun-java3d-bin-1.4.0_pre5-r1
+++ b/metadata/md5-cache/dev-java/sun-java3d-bin-1.4.0_pre5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=0
 SRC_URI=amd64? ( http://download.java.net/media/java3d/builds/stable/1_4_0-build5/java3d-1_4_0-build5-linux-amd64.zip ) x86? ( http://download.java.net/media/java3d/builds/stable/1_4_0-build5/java3d-1_4_0-build5-linux-i586.zip )
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_unpack:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4929950fd5d66b9062dc1f2d4d9cb9e7
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a91ad94e333eab8ae57120a78b7747c0
diff --git a/metadata/md5-cache/dev-java/sun-javamail-1.4.3 b/metadata/md5-cache/dev-java/sun-javamail-1.4.3
index a4f6969e2ac0..4c21caf18a17 100644
--- a/metadata/md5-cache/dev-java/sun-javamail-1.4.3
+++ b/metadata/md5-cache/dev-java/sun-javamail-1.4.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 java-virtuals/jaf >=dev-java/java-config-2.2.0-r3 sour
 SLOT=0
 SRC_URI=http://kenai.com/projects/javamail/downloads/download//javamail-1.4.3-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=aee3d0d2221125aac81a3a4196e3ae2c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=05cc90567b2ec46e8493dc41051a591b
diff --git a/metadata/md5-cache/dev-java/sun-jimi-1.0-r3 b/metadata/md5-cache/dev-java/sun-jimi-1.0-r3
index dcbe78628484..28fb68cfe4e8 100644
--- a/metadata/md5-cache/dev-java/sun-jimi-1.0-r3
+++ b/metadata/md5-cache/dev-java/sun-jimi-1.0-r3
@@ -11,5 +11,5 @@ RESTRICT=fetch
 SLOT=0
 SRC_URI=jimi1_0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3659f12919f24ae121afa7191cd4b14a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=053636c1c9b9ec2f480a54988a4bcf40
diff --git a/metadata/md5-cache/dev-java/sun-jms-1.1-r2 b/metadata/md5-cache/dev-java/sun-jms-1.1-r2
index f23c2b3a9f6c..48eb59d9c1ce 100644
--- a/metadata/md5-cache/dev-java/sun-jms-1.1-r2
+++ b/metadata/md5-cache/dev-java/sun-jms-1.1-r2
@@ -11,5 +11,5 @@ RESTRICT=fetch
 SLOT=0
 SRC_URI=jms-1_1-fr-apidocs.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6012d3686475570e2cd3f6516c5140ab
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2d357131ecd1b26de20245e8ad083dca
diff --git a/metadata/md5-cache/dev-java/sun-jmx-1.2.1-r3 b/metadata/md5-cache/dev-java/sun-jmx-1.2.1-r3
index 4f2912d85f44..a4b8c4d5ff8e 100644
--- a/metadata/md5-cache/dev-java/sun-jmx-1.2.1-r3
+++ b/metadata/md5-cache/dev-java/sun-jmx-1.2.1-r3
@@ -11,5 +11,5 @@ RESTRICT=fetch
 SLOT=0
 SRC_URI=jmx-1_2_1-ri.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d76166f6e68717119f8c01b1f6383184
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=acb437c6fe862e1e0191b26be8cf5304
diff --git a/metadata/md5-cache/dev-java/super-csv-2.3.1 b/metadata/md5-cache/dev-java/super-csv-2.3.1
index 8980478058fd..05b172b2ce3d 100644
--- a/metadata/md5-cache/dev-java/super-csv-2.3.1
+++ b/metadata/md5-cache/dev-java/super-csv-2.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/super-csv/super-csv/archive/v2.3.1.zip -> super-csv-2.3.1.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=32b43285af7963c21b749c038d05a03c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7d3585a2eaf8f531285ee87e0ab511ac
diff --git a/metadata/md5-cache/dev-java/svgsalamander-0.0-r2 b/metadata/md5-cache/dev-java/svgsalamander-0.0-r2
index 7d5665bd450c..8f4c90e7cad3 100644
--- a/metadata/md5-cache/dev-java/svgsalamander-0.0-r2
+++ b/metadata/md5-cache/dev-java/svgsalamander-0.0-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-core:0 dev-java/javacc:0 >=virtual/jre-1.6 >=dev-java/java-
 SLOT=0
 SRC_URI=mirror://gentoo/svgsalamander-0.0.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6a9003313e7875ba4592d6bfccd31956
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d9cec4124050563c0926ef5c76872fd5
diff --git a/metadata/md5-cache/dev-java/swarmcache-1.0_pre20050106-r1 b/metadata/md5-cache/dev-java/swarmcache-1.0_pre20050106-r1
index ac1fa6551dba..9fac8aa9a9af 100644
--- a/metadata/md5-cache/dev-java/swarmcache-1.0_pre20050106-r1
+++ b/metadata/md5-cache/dev-java/swarmcache-1.0_pre20050106-r1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=1.0
 SRC_URI=mirror://gentoo/swarmcache-1.0_pre20050106.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=abbee118fd7a8a559e993d33fa6ee451
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e52f5bf355d4288eefceb05039c4dcad
diff --git a/metadata/md5-cache/dev-java/swidgets-0.1.1-r1 b/metadata/md5-cache/dev-java/swidgets-0.1.1-r1
index 027564071dad..14419b4e4cb2 100644
--- a/metadata/md5-cache/dev-java/swidgets-0.1.1-r1
+++ b/metadata/md5-cache/dev-java/swidgets-0.1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.3 dev-java/toolbar >=dev-java/java-config-2.2.0-r3 >=sys
 SLOT=0
 SRC_URI=http://swidgets.tigris.org/files/documents/1472/18566/swidgets-0.1.1-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d6807a2eb5f38398372d2b8610ebf338
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9a2eebff0935d84f65c062c81c18cc1a
diff --git a/metadata/md5-cache/dev-java/swing-layout-1.0.4 b/metadata/md5-cache/dev-java/swing-layout-1.0.4
index 3ba6f9801950..dfc11f4bdf6c 100644
--- a/metadata/md5-cache/dev-java/swing-layout-1.0.4
+++ b/metadata/md5-cache/dev-java/swing-layout-1.0.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=1
 SRC_URI=https://swing-layout.dev.java.net/files/documents/2752/144673/swing-layout-1.0.4-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=46678f73521688ae4c80f5f330bd3ed5
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0a6979a53f7d611856134423727a75c1
diff --git a/metadata/md5-cache/dev-java/swing-layout-1.0.4-r1 b/metadata/md5-cache/dev-java/swing-layout-1.0.4-r1
index 1bd3de448755..01eb77a73bf9 100644
--- a/metadata/md5-cache/dev-java/swing-layout-1.0.4-r1
+++ b/metadata/md5-cache/dev-java/swing-layout-1.0.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=1
 SRC_URI=mirror://gentoo/swing-layout-1.0.4-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=604156773d48abd2b7ae0e4fafd84bed
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=361e084b55c5cdba480777ca6fe96ed3
diff --git a/metadata/md5-cache/dev-java/swing-worker-1.1 b/metadata/md5-cache/dev-java/swing-worker-1.1
index 2c5d4946e03d..6493a47e66ec 100644
--- a/metadata/md5-cache/dev-java/swing-worker-1.1
+++ b/metadata/md5-cache/dev-java/swing-worker-1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=0
 SRC_URI=https://swingworker.dev.java.net/files/documents/2810/51774/swing-worker-src-1.1.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=31345c40027c9f0f2db3c696dbf3cb03
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=684a32514f09f7060d6fac96bd58b471
diff --git a/metadata/md5-cache/dev-java/swingx-1.6.4 b/metadata/md5-cache/dev-java/swingx-1.6.4
index 5e1566e6f254..0f45bb496649 100644
--- a/metadata/md5-cache/dev-java/swingx-1.6.4
+++ b/metadata/md5-cache/dev-java/swingx-1.6.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/metainf-services:0 >=dev-java/java-config-2.2
 SLOT=1.6
 SRC_URI=https://java.net/projects/swingx/downloads/download/releases/swingx-all-1.6.4-sources.jar https://java.net/projects/swingx/downloads/download/releases/swingx-mavensupport-1.6.4-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=26fdf53ff50721170c5904ec3b4321f0
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c3dfc928408132dcbd5220a51e3d8bfd
diff --git a/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4 b/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4
index 7cddf2911d67..64aed950ed4d 100644
--- a/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4
+++ b/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/swingx:1.6 >=dev-java/java-config-2.2.0-r3 so
 SLOT=0
 SRC_URI=https://java.net/downloads/swingx/releases/swingx-beaninfo-1.6.4-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ab42c80589e0b3f63d1ffe76897dbffb
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f6bda4b99401ba57c4fbb563caacbc18
diff --git a/metadata/md5-cache/dev-java/swingx-ws-1.0-r1 b/metadata/md5-cache/dev-java/swingx-ws-1.0-r1
index 09d63f3bc1c2..e0270132e9b1 100644
--- a/metadata/md5-cache/dev-java/swingx-ws-1.0-r1
+++ b/metadata/md5-cache/dev-java/swingx-ws-1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/commons-httpclient:3 dev-java/jdom:0 dev-java/json:0 dev-java/j
 SLOT=0
 SRC_URI=http://central.maven.org/maven2/org/swinglabs/swingx-ws/1.0/swingx-ws-1.0-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_compile:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=49c9546704af6d99ba57f51b2029db39
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=fda1ea2cf95461f85bdf8e7cd631d784
diff --git a/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r1 b/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r1
index bab26fa91581..90d519c340da 100644
--- a/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r1
+++ b/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jdom:0 dev-java/json:0 dev-java/rome:0 dev-java/jtidy:0 dev-jav
 SLOT=bt747
 SRC_URI=mirror://sourceforge/bt747/Development/swingx-ws-2011_05_15-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_compile:- src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5ea8e2bcb3f6344b562bc826fb4c2134
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=958c1295e93ec8d0ef96da1e6e30bb52
diff --git a/metadata/md5-cache/dev-java/swt-3.5.2 b/metadata/md5-cache/dev-java/swt-3.5.2
index 0aad5c67326f..2fa15cfeb8de 100644
--- a/metadata/md5-cache/dev-java/swt-3.5.2
+++ b/metadata/md5-cache/dev-java/swt-3.5.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs
 SLOT=3.5
 SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002111343/swt-3.5.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002111343/swt-3.5.2-gtk-linux-ppc.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002111343/swt-3.5.2-gtk-linux-x86_64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002111343/swt-3.5.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002111343/swt-3.5.2-gtk-linux-x86.zip )
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0457149633ffb5fb918cdf49530d1990
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-osgi	469f5c3bd9c193e463ffa6ccb1e2f1f4	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b8a6955dfe24f2c21d59b68456709ccc
diff --git a/metadata/md5-cache/dev-java/swt-3.7.2-r1 b/metadata/md5-cache/dev-java/swt-3.7.2-r1
index b738b10f4ee0..4c9dc0015305 100644
--- a/metadata/md5-cache/dev-java/swt-3.7.2-r1
+++ b/metadata/md5-cache/dev-java/swt-3.7.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs
 SLOT=3.7
 SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip )
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=27ae35f62b7e08037de54768bd141555
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-osgi	469f5c3bd9c193e463ffa6ccb1e2f1f4	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8b3f28dda9196a448a8d0c7fce487aae
diff --git a/metadata/md5-cache/dev-java/swt-3.8.2-r1 b/metadata/md5-cache/dev-java/swt-3.8.2-r1
index 220c12e0aca1..80abb97e386c 100644
--- a/metadata/md5-cache/dev-java/swt-3.8.2-r1
+++ b/metadata/md5-cache/dev-java/swt-3.8.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs
 SLOT=3.8
 SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip )
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=48b09c3335948bf4582d31ab84910933
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-osgi	469f5c3bd9c193e463ffa6ccb1e2f1f4	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=89dcf24b9ca72988c109c968e51c4eb9
diff --git a/metadata/md5-cache/dev-java/swt-4.2-r2 b/metadata/md5-cache/dev-java/swt-4.2-r2
index 4f6081b7e368..4b89e36127a8 100644
--- a/metadata/md5-cache/dev-java/swt-4.2-r2
+++ b/metadata/md5-cache/dev-java/swt-4.2-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-l
 SLOT=4.2
 SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip )
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	flag-o-matic	35067884fbff37bc0c8e7421c5315558	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0b8ff4dd0db3498be737851d3c80b116
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	flag-o-matic	979af9133d4de419fa98992355b07ca4	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-osgi	469f5c3bd9c193e463ffa6ccb1e2f1f4	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f0fb989686b431a32bdd3aae6534c1b3
diff --git a/metadata/md5-cache/dev-java/tablelayout-1.0 b/metadata/md5-cache/dev-java/tablelayout-1.0
index 606a6f81bdee..0cd6acbdb367 100644
--- a/metadata/md5-cache/dev-java/tablelayout-1.0
+++ b/metadata/md5-cache/dev-java/tablelayout-1.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://www.oracle.com/technetwork/java/tablelayout.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3d60698d511f372f7a7693e511352134
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=84d2c101a460d304e77098775687b994
diff --git a/metadata/md5-cache/dev-java/tagsoup-1.2.1 b/metadata/md5-cache/dev-java/tagsoup-1.2.1
index 93687fdc9054..9aa6fd2bf83a 100644
--- a/metadata/md5-cache/dev-java/tagsoup-1.2.1
+++ b/metadata/md5-cache/dev-java/tagsoup-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://mercury.ccil.org/~cowan/XML/tagsoup/tagsoup-1.2.1-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5cd3640021a83c161000500f2fda1f96
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8824b9cd35b9302b33f861eee5c00057
diff --git a/metadata/md5-cache/dev-java/tapestry-3.0.4-r2 b/metadata/md5-cache/dev-java/tapestry-3.0.4-r2
index 1726593c8214..4b1d9c55a15c 100644
--- a/metadata/md5-cache/dev-java/tapestry-3.0.4-r2
+++ b/metadata/md5-cache/dev-java/tapestry-3.0.4-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/bsf:2.3 dev-java/commons-beanutils:1.7 dev-java/commons-codec:0
 SLOT=3.0
 SRC_URI=mirror://apache/tapestry/Tapestry-3.0.4-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8cb4d09b3ee84b5bee3c8fd727db6183
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ed28cfbacfd9a6e0ce4a6ce6eb6ce28a
diff --git a/metadata/md5-cache/dev-java/telnetd-2.0-r1 b/metadata/md5-cache/dev-java/telnetd-2.0-r1
index f9839265d2fb..eb2ff657cb37 100644
--- a/metadata/md5-cache/dev-java/telnetd-2.0-r1
+++ b/metadata/md5-cache/dev-java/telnetd-2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/commons-logging:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.
 SLOT=0
 SRC_URI=mirror://sourceforge/telnetd/telnetd-2.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ec82285d1fe4155289dcea02e2c129c2
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d977d6b5eee0c6a2467de618095be42b
diff --git a/metadata/md5-cache/dev-java/testng-6.9.10 b/metadata/md5-cache/dev-java/testng-6.9.10
index d5453b2d9f4a..86cdb5e8a3fc 100644
--- a/metadata/md5-cache/dev-java/testng-6.9.10
+++ b/metadata/md5-cache/dev-java/testng-6.9.10
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cbeust/testng/archive/6.9.10.tar.gz -> testng-6.9.10.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=da7407597d4d692f11853b3e29ebad88
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e8628278a39c54082302839e2c63697d
diff --git a/metadata/md5-cache/dev-java/texhyphj-1.1 b/metadata/md5-cache/dev-java/texhyphj-1.1
index bc04d9b11a7e..979007d16bde 100644
--- a/metadata/md5-cache/dev-java/texhyphj-1.1
+++ b/metadata/md5-cache/dev-java/texhyphj-1.1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://ftp.davidashen.net/TeXHyphenator-J/texhyphj-1.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3ac3b5292e0eaa834329d5a0fdadb368
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6dffc109a684d5a138fec9378f90abbc
diff --git a/metadata/md5-cache/dev-java/tijmp-0.8 b/metadata/md5-cache/dev-java/tijmp-0.8
index 9073babce176..6d9a78bfd489 100644
--- a/metadata/md5-cache/dev-java/tijmp-0.8
+++ b/metadata/md5-cache/dev-java/tijmp-0.8
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://www.khelekore.org/jmp/tijmp/tijmp-0.8.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:- src_compile:- src_install:-
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	libtool	84763589a795fb127b537cac01e5359f	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1ba8db266288470cdaff33bca5c05540
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	48b1b9f6194d2842456514d1184ca72e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ab93a14124703b8e2f6e6dbcbe02d78c
diff --git a/metadata/md5-cache/dev-java/tomcat-jstl-compat-1.2.5-r1 b/metadata/md5-cache/dev-java/tomcat-jstl-compat-1.2.5-r1
index cc4fe9e35080..e2db6b6ac673 100644
--- a/metadata/md5-cache/dev-java/tomcat-jstl-compat-1.2.5-r1
+++ b/metadata/md5-cache/dev-java/tomcat-jstl-compat-1.2.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/tomcat-jstl-spec:0 dev-java/tomcat-jstl-impl:0 java-virtuals/se
 SLOT=0
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip -> tomcat-jstl-compat-1.2.5.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=979af093c2b878620e88678b15c05719
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0b314a1e79c47565c2ccd2d5dd28c445
diff --git a/metadata/md5-cache/dev-java/tomcat-jstl-el-1.2.5-r1 b/metadata/md5-cache/dev-java/tomcat-jstl-el-1.2.5-r1
index 8139f2a1d239..fa650604a7dd 100644
--- a/metadata/md5-cache/dev-java/tomcat-jstl-el-1.2.5-r1
+++ b/metadata/md5-cache/dev-java/tomcat-jstl-el-1.2.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 java-virtuals/se
 SLOT=0
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip -> tomcat-jstl-el-1.2.5.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7132e1c957bb23272ba1615a92f1fe9e
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b35c235a6d96d48e3b0b464fb588d1c8
diff --git a/metadata/md5-cache/dev-java/tomcat-jstl-impl-1.2.5-r1 b/metadata/md5-cache/dev-java/tomcat-jstl-impl-1.2.5-r1
index 1718f4cb3725..68052cdfe51b 100644
--- a/metadata/md5-cache/dev-java/tomcat-jstl-impl-1.2.5-r1
+++ b/metadata/md5-cache/dev-java/tomcat-jstl-impl-1.2.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xalan:0 dev-java/tomcat-jstl-spec:0 dev-java/tomcat-servlet-api
 SLOT=0
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip -> tomcat-jstl-impl-1.2.5.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=62322babe2b7ff15b5d080b0332ee9c4
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3b156f83be6e54ca69e340ae6ac21b8d
diff --git a/metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5-r1 b/metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5-r1
index a4802c478fda..1e7479707f22 100644
--- a/metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5-r1
+++ b/metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5-r1
@@ -10,5 +10,5 @@ RDEPEND=java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2
 SLOT=0
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip -> tomcat-jstl-spec-1.2.5.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c57fe347dce9abaf7a0118438579f358
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=80680f00201543ce8406ed3ddb38ce83
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.10 b/metadata/md5-cache/dev-java/tomcat-native-1.2.10
index 3049fdc3da69..78da6764c608 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.10
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.2.10
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/apr:1 dev-libs/openssl:= >=virtual/jre-1.7 >=dev-java/java-conf
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.10/source/tomcat-native-1.2.10-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=42d13e610237092fda506730ec915a94
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a7493a46d6cdd83bc7cbf5d05baf3211
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.12 b/metadata/md5-cache/dev-java/tomcat-native-1.2.12
index 29eb9b8e5aba..79cf38a9b8f9 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.12
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.2.12
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/apr:1 dev-libs/openssl:= >=virtual/jre-1.7 >=dev-java/java-conf
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.12/source/tomcat-native-1.2.12-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=78491a53ce4af4b90f19f825ad2d9fcd
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=35ffa00d8d5c27f26e52e92989d182e5
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.4 b/metadata/md5-cache/dev-java/tomcat-native-1.2.4
index f49baf0535d1..ae148e4bdcee 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.4
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.2.4
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/apr:1 dev-libs/openssl:= >=virtual/jre-1.7 >=dev-java/java-conf
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.4/source/tomcat-native-1.2.4-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5f475fb38cd35a906322591e437696d3
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=39f2362a66e7ef7fd69aa66af7628f7e
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.7 b/metadata/md5-cache/dev-java/tomcat-native-1.2.7
index 3b4a1ba8496e..1183f5fcfa45 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.7
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.2.7
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/apr:1 dev-libs/openssl:= >=virtual/jre-1.7 >=dev-java/java-conf
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.7/source/tomcat-native-1.2.7-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=42d13e610237092fda506730ec915a94
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a7493a46d6cdd83bc7cbf5d05baf3211
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.8 b/metadata/md5-cache/dev-java/tomcat-native-1.2.8
index 15ec2ee19761..73902070f63f 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.8
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.2.8
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/apr:1 dev-libs/openssl:= >=virtual/jre-1.7 >=dev-java/java-conf
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.8/source/tomcat-native-1.2.8-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=759606736750c1d5b194f953baac473f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=72b7785368963a5a0526df7d90d9d889
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-3 b/metadata/md5-cache/dev-java/tomcat-servlet-api-3
index 6a1aa5db1dfe..f513370e08d1 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-3
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=2.2
 SRC_URI=mirror://apache/jakarta/tomcat-3/src/jakarta-servletapi-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ae45f029cdca5f28744ed687cf80800d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=068c11a2a50966ae28d7bcfb2a42890f
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.36 b/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.36
index 9ca2d09b54f0..0c720d1a7a5f 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.36
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.36
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=2.3
 SRC_URI=mirror://apache/tomcat/tomcat-4/v4.1.36/src/apache-tomcat-4.1.36-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f95b2cd439b1475bb52873faf3c7c87b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d94d3fe1e3a9db2177442178af973b57
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.27-r1 b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.27-r1
index a5d65a0bc281..d513760d8a42 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.27-r1
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.27-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=2.4
 SRC_URI=mirror://apache/tomcat/tomcat-5/v5.5.27/src/apache-tomcat-5.5.27-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0b1a156c2be1e5b6e4a05f7ab4cc10c0
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-osgi	469f5c3bd9c193e463ffa6ccb1e2f1f4	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=fcc78cc57c31327d08f2b9cdf906535d
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.34 b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.34
index 02457c62e2d5..38575a0b9a80 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.34
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.34
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=2.4
 SRC_URI=mirror://apache/tomcat/tomcat-5/v5.5.34/src/apache-tomcat-5.5.34-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f775599d5713a4c3e5d5db352352811e
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-osgi	469f5c3bd9c193e463ffa6ccb1e2f1f4	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=528b47ade4735d4ecbe79e18b4b6b9c6
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.44-r1 b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.44-r1
index 03158734172b..f6614fbc1139 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.44-r1
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.44-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=2.5
 SRC_URI=mirror://apache/tomcat/tomcat-6/v6.0.44/src/apache-tomcat-6.0.44-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6c9ff43cd5e475ab5532f08bfeccf6d1
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=08674b074a8b05d494cb8c7102951916
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.45 b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.45
index ec94c573e251..dbd5c41a13b6 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.45
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.45
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=2.5
 SRC_URI=mirror://apache/tomcat/tomcat-6/v6.0.45/src/apache-tomcat-6.0.45-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=670c86d035292349090993a7abe19a0f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4ff03783b673a6cee16a664b0ca19714
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.73 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.73
index 4d909c4ad2a4..94f910e0e0d7 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.73
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.73
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.73/src/apache-tomcat-7.0.73-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6f18a3c7c5c121fad144a846320b1f8f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=611c4dd4a6ecc31c3ce32e984326d2b6
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.75 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.75
index a06ceef17eef..1c6a8e5337b5 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.75
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.75
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.75/src/apache-tomcat-7.0.75-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9789ebbb2461406e2916e1e64507da8e
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d2c7747eb0c16d0fb9dbc5ce32e9eb80
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.39 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.39
index a676115a4a14..6b61d32de452 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.39
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.39
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.39/src/apache-tomcat-8.0.39-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1410fbb2b8a2af4d4859e951cf344856
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8887cf1bd0041e44c8d9360a825189f0
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.41 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.41
index 4b5a0a21df7f..c8a072f375b9 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.41
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.41
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.41/src/apache-tomcat-8.0.41-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=060252de81112acb273aafac357175a6
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=95e2703363c89503cb9989b61e1033d4
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.11 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.11
index b6e040ae785c..589d022d31a7 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.11
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.11
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.11/src/apache-tomcat-8.5.11-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ab5807bc561b6666daf53cf8b0873c07
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=78dcfe113646b70259c3066815905b7a
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.9 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.9
index 3fa888b9b12a..ed538e192b79 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.9
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.9
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.9/src/apache-tomcat-8.5.9-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1a0d90a2402c0a1a61c7c106e5c052f7
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ee6b1da15b0ba18d72cb2e57dceae81d
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.0_alpha15 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.0_alpha15
index 680050908637..f7957f082d91 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.0_alpha15
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.0_alpha15
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.0.M15/src/apache-tomcat-9.0.0.M15-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5285ea9306a6c651bc0eafa8195e794c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=76e09b0ee6474f8912d9d3155c379ee8
diff --git a/metadata/md5-cache/dev-java/toolbar-1.1.0-r2 b/metadata/md5-cache/dev-java/toolbar-1.1.0-r2
index 6aa34c83d7ed..10b2ac1d7ba6 100644
--- a/metadata/md5-cache/dev-java/toolbar-1.1.0-r2
+++ b/metadata/md5-cache/dev-java/toolbar-1.1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://toolbar.tigris.org/files/documents/869/25285/toolbar-1.1.0-src.zip -> toolbar-1.1.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8e8c1c510dfac033757394e1401c7221
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d6742ea1ab2e449f57db63c288c836e5
diff --git a/metadata/md5-cache/dev-java/touchgraph-graphlayout-1.22-r1 b/metadata/md5-cache/dev-java/touchgraph-graphlayout-1.22-r1
index 2ea1abbea8c5..de3b7a46ffbd 100644
--- a/metadata/md5-cache/dev-java/touchgraph-graphlayout-1.22-r1
+++ b/metadata/md5-cache/dev-java/touchgraph-graphlayout-1.22-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/touchgraph/TGGL_122_jre11.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f0ecc36b97cf2143f320c033291a5390
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9a7e167141b173b7ac928a96610acb78
diff --git a/metadata/md5-cache/dev-java/treelayout-1.0.2 b/metadata/md5-cache/dev-java/treelayout-1.0.2
index 6cc718c95458..69c45167a1f5 100644
--- a/metadata/md5-cache/dev-java/treelayout-1.0.2
+++ b/metadata/md5-cache/dev-java/treelayout-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/abego/treelayout/archive/v1.0.2.tar.gz -> treelayout-1.0.2.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:- src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=52aa4d58ec4864a1bc377f26fea401fc
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0bede0c19e35672400b1c787a3673ae6
diff --git a/metadata/md5-cache/dev-java/trident-1.3 b/metadata/md5-cache/dev-java/trident-1.3
index 07fe93352e92..9b57a1145ff9 100644
--- a/metadata/md5-cache/dev-java/trident-1.3
+++ b/metadata/md5-cache/dev-java/trident-1.3
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://kenai.com/projects/trident/downloads/download/version%201.3%20-%20stable/trident-all.zip -> trident-1.3.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7c8ebdc0ce992b961db560119345e010
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2f80b86c7c62e5e4588953bc93f543a5
diff --git a/metadata/md5-cache/dev-java/trove-2.1.0 b/metadata/md5-cache/dev-java/trove-2.1.0
index 01ec9362991b..37a62ef0c163 100644
--- a/metadata/md5-cache/dev-java/trove-2.1.0
+++ b/metadata/md5-cache/dev-java/trove-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/trove4j/trove-2.1.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1002c146361ecc34c5a23e8ff0a0e128
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2886168be55d0a68036416afabfe65b6
diff --git a/metadata/md5-cache/dev-java/trove-3.0.2 b/metadata/md5-cache/dev-java/trove-3.0.2
index bce8093f2aea..c18266d755f2 100644
--- a/metadata/md5-cache/dev-java/trove-3.0.2
+++ b/metadata/md5-cache/dev-java/trove-3.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=3
 SRC_URI=mirror://sourceforge/trove4j/trove-3.0.2.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=01778a4b3152464bf227d24970382494
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=800938575bdf1332dbd566b8c8096f0f
diff --git a/metadata/md5-cache/dev-java/trove-3.0.2-r1 b/metadata/md5-cache/dev-java/trove-3.0.2-r1
index 47eb27c98e70..ac471c47bcd8 100644
--- a/metadata/md5-cache/dev-java/trove-3.0.2-r1
+++ b/metadata/md5-cache/dev-java/trove-3.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=3
 SRC_URI=mirror://sourceforge/trove4j/trove-3.0.2.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=895fcc3554e83815d05aacd82d768deb
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7ff2cba17809b92c78332b08df4b1689
diff --git a/metadata/md5-cache/dev-java/trove-3.0.2-r2 b/metadata/md5-cache/dev-java/trove-3.0.2-r2
index a18cb6b4fff3..b560eb54b765 100644
--- a/metadata/md5-cache/dev-java/trove-3.0.2-r2
+++ b/metadata/md5-cache/dev-java/trove-3.0.2-r2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/trove4j/trove-3.0.2.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=646b24bd6d380844d47ea508ace69162
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6f6f1fd1334aed1155f0002bf879277a
diff --git a/metadata/md5-cache/dev-java/txw2-runtime-20110809 b/metadata/md5-cache/dev-java/txw2-runtime-20110809
index 3410dd5683db..ea76d05b8758 100644
--- a/metadata/md5-cache/dev-java/txw2-runtime-20110809
+++ b/metadata/md5-cache/dev-java/txw2-runtime-20110809
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://central.maven.org/maven2/com/sun/xml/txw2/txw2/20110809/txw2-20110809-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=495a02ebd1d0695b24ac838949853201
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=98cb2793862c0d155d99744dc8e64b21
diff --git a/metadata/md5-cache/dev-java/typesafe-config-1.2.1 b/metadata/md5-cache/dev-java/typesafe-config-1.2.1
index 4f790de5d4da..3324939e5fe2 100644
--- a/metadata/md5-cache/dev-java/typesafe-config-1.2.1
+++ b/metadata/md5-cache/dev-java/typesafe-config-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/typesafehub/config/archive/v1.2.1.zip -> typesafe-config-1.2.1.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=995485ee9c082ca88bcc3b2c82695076
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b0ccde796d9b1769cbfbfca6016c42b8
diff --git a/metadata/md5-cache/dev-java/typesafe-config-1.3.0-r2 b/metadata/md5-cache/dev-java/typesafe-config-1.3.0-r2
index e114acccdc10..c924abaa1ef5 100644
--- a/metadata/md5-cache/dev-java/typesafe-config-1.3.0-r2
+++ b/metadata/md5-cache/dev-java/typesafe-config-1.3.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/typesafehub/config/archive/v1.3.0.zip -> typesafe-config-1.3.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1ffb37da0492af88312f9e2893e2567c
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0fd4adbd85e38551ff06e8af47e10b02
diff --git a/metadata/md5-cache/dev-java/unkrig-nullanalysis-0_pre1644 b/metadata/md5-cache/dev-java/unkrig-nullanalysis-0_pre1644
index 05c08b2432ad..976f2f1a0323 100644
--- a/metadata/md5-cache/dev-java/unkrig-nullanalysis-0_pre1644
+++ b/metadata/md5-cache/dev-java/unkrig-nullanalysis-0_pre1644
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ercpe/distfiles/dev-java/unkrig-nullanalysis/unkrig-nullanalysis-0_pre1644.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c635702f4b207ad77d761f784ba73e09
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c1e3e967e811cb6a8506aaf8f196e00c
diff --git a/metadata/md5-cache/dev-java/upnplib-1.0.7 b/metadata/md5-cache/dev-java/upnplib-1.0.7
index fbf3319f030f..8bf2e99056f5 100644
--- a/metadata/md5-cache/dev-java/upnplib-1.0.7
+++ b/metadata/md5-cache/dev-java/upnplib-1.0.7
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 dev-java/commons-jxpath:0 dev-java/log4j:0 >=dev-java/
 SLOT=0
 SRC_URI=https://github.com/RPTools/upnplib/archive/33d17845e34c7c8b897224d0d1c243951398f853.tar.gz -> upnplib-1.0.7.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5378a22b8f044823a813a0ef5dec8aab
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=75c7a6d103415791b2c681ecbb2c1c01
diff --git a/metadata/md5-cache/dev-java/validation-api-1.1.0 b/metadata/md5-cache/dev-java/validation-api-1.1.0
index 01b5d32afd23..0139f5e163cc 100644
--- a/metadata/md5-cache/dev-java/validation-api-1.1.0
+++ b/metadata/md5-cache/dev-java/validation-api-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=1.0
 SRC_URI=https://repo1.maven.org/maven2/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-sources.jar -> validation-api-1.1.0.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0e7663b475de468d748243232092bce6
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=84b0be6a7cd0a0a6714241b9b7675944
diff --git a/metadata/md5-cache/dev-java/vecmath-1.6.0_pre12 b/metadata/md5-cache/dev-java/vecmath-1.6.0_pre12
index 5cd8b2d091e0..f548ef3af456 100644
--- a/metadata/md5-cache/dev-java/vecmath-1.6.0_pre12
+++ b/metadata/md5-cache/dev-java/vecmath-1.6.0_pre12
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/hharrison/vecmath/archive/1.6.0-pre12.tar.gz -> vecmath-1.6.0_pre12.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d75c52b1d4ce9a1347c4fe13e665f42d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=50f4b389050a187f8eeda3446df1c448
diff --git a/metadata/md5-cache/dev-java/velocity-1.7-r2 b/metadata/md5-cache/dev-java/velocity-1.7-r2
index a24186cc64c8..f8d97eaa357a 100644
--- a/metadata/md5-cache/dev-java/velocity-1.7-r2
+++ b/metadata/md5-cache/dev-java/velocity-1.7-r2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/velocity/engine/1.7/velocity-1.7.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=78a3f10cc9c5f7bdddaf44bfd176a9fc
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f6738a10cdc4c5e284fa94cb46fefd7b
diff --git a/metadata/md5-cache/dev-java/velocity-dvsl-1.0 b/metadata/md5-cache/dev-java/velocity-dvsl-1.0
index 0f518ac4dbbe..deac28c11983 100644
--- a/metadata/md5-cache/dev-java/velocity-dvsl-1.0
+++ b/metadata/md5-cache/dev-java/velocity-dvsl-1.0
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/velocity/dvsl/1.0/velocity-dvsl-1.0-src.zip -> velocity-dvsl-1.0.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=80b8c6e4f41c9fc7b376d5fa877ec43f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6bcb23959a562c6f52d60347ad9c4e93
diff --git a/metadata/md5-cache/dev-java/vldocking-3.0.5 b/metadata/md5-cache/dev-java/vldocking-3.0.5
index 554ace967881..c0c9a51a41da 100644
--- a/metadata/md5-cache/dev-java/vldocking-3.0.5
+++ b/metadata/md5-cache/dev-java/vldocking-3.0.5
@@ -10,5 +10,5 @@ RDEPEND=dev-java/slf4j-log4j12:0 dev-java/slf4j-api:0 >=virtual/jre-1.6 >=dev-ja
 SLOT=0
 SRC_URI=https://github.com/cmadsen/vldocking/archive/vldocking-3.0.5.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=91358952916f3f39d08d43d7967e2c48
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c53dae5bd83796c6b49ebcdf6b6d1e9d
diff --git a/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r4 b/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r4
index 7a3d134e6b9f..fe6f3ac74ded 100644
--- a/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r4
+++ b/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/jdom:0 >=dev-java/antlr-2.7.7-r7:0 >=dev-java
 SLOT=0
 SRC_URI=mirror://gentoo/werken.xpath-0.9.4-beta-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=567bce4d1c310c1b7eb94791fb5c9fe6
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e671ea85ba19a3a8b556a08a204a3060
diff --git a/metadata/md5-cache/dev-java/ws-commons-util-1.0.1-r1 b/metadata/md5-cache/dev-java/ws-commons-util-1.0.1-r1
index b5da817a5fd0..0ca899ba8b6a 100644
--- a/metadata/md5-cache/dev-java/ws-commons-util-1.0.1-r1
+++ b/metadata/md5-cache/dev-java/ws-commons-util-1.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://apache/ws/commons/util/sources/ws-commons-util-1.0.1-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=901aee45d374862c3132904d991537a5
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=71abc402370c8ebe6ca75cc67c6d2ad6
diff --git a/metadata/md5-cache/dev-java/wsdl4j-1.6.2 b/metadata/md5-cache/dev-java/wsdl4j-1.6.2
index fd46dca991a1..40181a75f73d 100644
--- a/metadata/md5-cache/dev-java/wsdl4j-1.6.2
+++ b/metadata/md5-cache/dev-java/wsdl4j-1.6.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/wsdl4j/wsdl4j-src-1.6.2.zip test? ( mirror://sourceforge/jwsdltck/jwsdltck-bin-1.2.zip )
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6879479b335ffb82fa6f411f31e16efe
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=725f7956a7c74910d5ae4aed9cb6894b
diff --git a/metadata/md5-cache/dev-java/wstx-3.2.9-r1 b/metadata/md5-cache/dev-java/wstx-3.2.9-r1
index 97d87fbca338..d6cc7a73fad4 100644
--- a/metadata/md5-cache/dev-java/wstx-3.2.9-r1
+++ b/metadata/md5-cache/dev-java/wstx-3.2.9-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/sax:0 dev-java/msv:0 dev-java/relaxng-datatype:0 >=virtual/jre-
 SLOT=3.2
 SRC_URI=mirror://gentoo/wstx-src-3.2.9.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ee9daf0aec7757c47129da14fc749f9a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=edb56e0437c58c79c7108df0363e1d92
diff --git a/metadata/md5-cache/dev-java/xalan-2.7.2 b/metadata/md5-cache/dev-java/xalan-2.7.2
index c3b3ada930c2..e6c9ca9aa5f0 100644
--- a/metadata/md5-cache/dev-java/xalan-2.7.2
+++ b/metadata/md5-cache/dev-java/xalan-2.7.2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/javacup:0 dev-java/bcel:0 >=virtual/jre-1.3 ~dev-java/xalan-ser
 SLOT=0
 SRC_URI=mirror://apache/xalan/xalan-j/source/xalan-j_2_7_2-src.tar.gz doc? ( mirror://apache/xalan/xalan-j/binaries/xalan-j_2_7_2-bin.zip )
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=339d3ae6986c153b07a2357538c62912
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=759a387de7e01d965b331ef1f998bc29
diff --git a/metadata/md5-cache/dev-java/xalan-serializer-2.7.2 b/metadata/md5-cache/dev-java/xalan-serializer-2.7.2
index 847dd0861b87..7a33e9c6a928 100644
--- a/metadata/md5-cache/dev-java/xalan-serializer-2.7.2
+++ b/metadata/md5-cache/dev-java/xalan-serializer-2.7.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://apache/xalan/xalan-j/source/xalan-j_2_7_2-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bcc80a704738ad7ec495dd29b49f135f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=019f89163e6dccf426b0c78f810e14ae
diff --git a/metadata/md5-cache/dev-java/xerces-2.11.0 b/metadata/md5-cache/dev-java/xerces-2.11.0
index 9555a7bc8e24..a82627154147 100644
--- a/metadata/md5-cache/dev-java/xerces-2.11.0
+++ b/metadata/md5-cache/dev-java/xerces-2.11.0
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=2
 SRC_URI=mirror://apache/xerces/j/Xerces-J-src.2.11.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=49dd5b78d93b7570169aec218fe88b97
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0e5c573076f7ab96c30358aacb926b84
diff --git a/metadata/md5-cache/dev-java/xerces-2.11.0-r1 b/metadata/md5-cache/dev-java/xerces-2.11.0-r1
index 4bbaf4e7089e..b8485845ff31 100644
--- a/metadata/md5-cache/dev-java/xerces-2.11.0-r1
+++ b/metadata/md5-cache/dev-java/xerces-2.11.0-r1
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=2
 SRC_URI=mirror://apache/xerces/j/Xerces-J-src.2.11.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1ec0150d82a407f9c5aa7603910a4fd2
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=630bfd08158ba72a1819c69ddfe33f99
diff --git a/metadata/md5-cache/dev-java/xerial-core-2.0.1 b/metadata/md5-cache/dev-java/xerial-core-2.0.1
index 3b631d423bfa..d093682a45ab 100644
--- a/metadata/md5-cache/dev-java/xerial-core-2.0.1
+++ b/metadata/md5-cache/dev-java/xerial-core-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ercpe/distfiles/dev-java/xerial-core/xerial-core-2.0.1.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1ce87607f16174e2519956bd903ba6fe
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=654c972a7c7906472c5d010773355f3b
diff --git a/metadata/md5-cache/dev-java/xjavac-20110814 b/metadata/md5-cache/dev-java/xjavac-20110814
index adeacd58e142..bbd3560634ff 100644
--- a/metadata/md5-cache/dev-java/xjavac-20110814
+++ b/metadata/md5-cache/dev-java/xjavac-20110814
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.4 >=dev-java/ant-core-1.7 >=dev-java/java-config-2.2.0-r
 SLOT=1
 SRC_URI=mirror://gentoo/xjavac-20110814.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5c83bc6675b99da44d19f89c36ba4d2d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=845783b1736cc679a9f677b41cc2db92
diff --git a/metadata/md5-cache/dev-java/xml-commons-1.4.01 b/metadata/md5-cache/dev-java/xml-commons-1.4.01
index 7941b3f4a7e1..ac91297cbfb7 100644
--- a/metadata/md5-cache/dev-java/xml-commons-1.4.01
+++ b/metadata/md5-cache/dev-java/xml-commons-1.4.01
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://apache/xerces/xml-commons/source/xml-commons-external-1.4.01-src.tar.gz -> xml-commons-1.4.01.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=80dd15639213c71cfa1c037d5cd55669
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=695f23cc19b504f706b35b546fd70f7d
diff --git a/metadata/md5-cache/dev-java/xml-commons-external-1.3.04 b/metadata/md5-cache/dev-java/xml-commons-external-1.3.04
index 64148a2c8fde..2c378cd5ac06 100644
--- a/metadata/md5-cache/dev-java/xml-commons-external-1.3.04
+++ b/metadata/md5-cache/dev-java/xml-commons-external-1.3.04
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=1.3
 SRC_URI=mirror://gentoo/xml-commons-external-1.3.04.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=30b039a62a3c51d4994bfb46ab8281e1
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=79f193d190c34b4f9681a06994f88be0
diff --git a/metadata/md5-cache/dev-java/xml-commons-external-1.4.01 b/metadata/md5-cache/dev-java/xml-commons-external-1.4.01
index a22327a593df..b0ca8a21c20d 100644
--- a/metadata/md5-cache/dev-java/xml-commons-external-1.4.01
+++ b/metadata/md5-cache/dev-java/xml-commons-external-1.4.01
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=1.4
 SRC_URI=https://dev.gentoo.org/~sera/distfiles/xml-commons-external-1.4.01.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=615be9a4ef3e4142b9ac5db09eb7e715
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=bb90c9edb93a9d439121248210cf07a6
diff --git a/metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r1 b/metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r1
index 9425a57141b2..0e362119f0e8 100644
--- a/metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r1
+++ b/metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=1.4
 SRC_URI=https://repo1.maven.org/maven2/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-sources.jar -> xml-commons-external-1.4.01.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=74c0a6748c0aabcde704452a0bb97a15
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3786fa3dae97909ac79efa671d4d4d10
diff --git a/metadata/md5-cache/dev-java/xml-commons-resolver-1.2 b/metadata/md5-cache/dev-java/xml-commons-resolver-1.2
index 09570ec43658..5094b3a37a62 100644
--- a/metadata/md5-cache/dev-java/xml-commons-resolver-1.2
+++ b/metadata/md5-cache/dev-java/xml-commons-resolver-1.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1
 SLOT=0
 SRC_URI=mirror://apache/xml/commons/xml-commons-resolver-1.2.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=da0ac078dd061e522118e2f7ed63523a
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=81f5be7a6a67b903ef7456944ece3e70
diff --git a/metadata/md5-cache/dev-java/xml-security-1.5.7-r1 b/metadata/md5-cache/dev-java/xml-security-1.5.7-r1
index ab1ecf8a7312..cc29159495fa 100644
--- a/metadata/md5-cache/dev-java/xml-security-1.5.7-r1
+++ b/metadata/md5-cache/dev-java/xml-security-1.5.7-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/commons-logging:0 dev-java/xalan:0 >=virtual/jre-1.6 >=dev-java
 SLOT=0
 SRC_URI=mirror://apache/santuario/java-library/1_5_7/xml-security-bin-1_5_7.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6043baad2aebfea12ca3790f6fd221b9
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d93c6a4c3a5797a04b68f16f00ae9504
diff --git a/metadata/md5-cache/dev-java/xml-writer-0.2-r1 b/metadata/md5-cache/dev-java/xml-writer-0.2-r1
index 2c2a8674c045..0447424b4e7e 100644
--- a/metadata/md5-cache/dev-java/xml-writer-0.2-r1
+++ b/metadata/md5-cache/dev-java/xml-writer-0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://www.megginson.com/downloads/xml-writer-0.2.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c851d458acbc24a8217aad944aff3291
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=957c130a9698360ae600982b0f7d291e
diff --git a/metadata/md5-cache/dev-java/xml-xmlbeans-2.6.0 b/metadata/md5-cache/dev-java/xml-xmlbeans-2.6.0
index 84c74400dd58..9101d49a1dec 100644
--- a/metadata/md5-cache/dev-java/xml-xmlbeans-2.6.0
+++ b/metadata/md5-cache/dev-java/xml-xmlbeans-2.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/saxon:9 dev-java/jsr173:0 dev-java/annogen:0 dev-java/piccolo:0
 SLOT=2
 SRC_URI=http://archive.apache.org/dist/xmlbeans/source/xmlbeans-2.6.0-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e72f1325212d2a00a098038588b604d6
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=aaafed38e99a7b6df1193542a5623d3b
diff --git a/metadata/md5-cache/dev-java/xmldb-20011111-r1 b/metadata/md5-cache/dev-java/xmldb-20011111-r1
index db4d57247020..2a58b91b3904 100644
--- a/metadata/md5-cache/dev-java/xmldb-20011111-r1
+++ b/metadata/md5-cache/dev-java/xmldb-20011111-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/xerces-2.7 >=dev-java/xalan-2.7 =dev-java/j
 SLOT=0
 SRC_URI=mirror://sourceforge/xmldb-org/xmldb-api-11112001.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=cd9115e509bc3db5832978e465929dfa
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=afe885b5804d30517d7b0a34155b96ba
diff --git a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.0.1 b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.0.1
index 138d239f6dfe..41d5a7ee78fc 100644
--- a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.0.1
+++ b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/commons-io:1 >=dev-java/commons-logging-1:0 >
 SLOT=2
 SRC_URI=mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-2.0.1-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=38bcd99789c23611d43315024bb95735
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f2365b8e47087c26cc6cf28a6ab47fb3
diff --git a/metadata/md5-cache/dev-java/xmlrpc-3.1.3 b/metadata/md5-cache/dev-java/xmlrpc-3.1.3
index 1a389f72e04e..28249f028084 100644
--- a/metadata/md5-cache/dev-java/xmlrpc-3.1.3
+++ b/metadata/md5-cache/dev-java/xmlrpc-3.1.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/commons-httpclient:3 dev-java/commons-codec:0
 SLOT=3
 SRC_URI=https://archive.apache.org/dist/ws/xmlrpc/sources/apache-xmlrpc-3.1.3-src.tar.bz2 https://dev.gentoo.org/~ercpe/distfiles/dev-java/xmlrpc/xmlrpc-3.1.3-build.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=85811cf60a8dc8b4e02131a9ee5d76e9
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d4505da5368b09057275021d438d142d
diff --git a/metadata/md5-cache/dev-java/xmlstreambuffer-1.5.3 b/metadata/md5-cache/dev-java/xmlstreambuffer-1.5.3
index 3ec87a3afd1c..5136d4187dee 100644
--- a/metadata/md5-cache/dev-java/xmlstreambuffer-1.5.3
+++ b/metadata/md5-cache/dev-java/xmlstreambuffer-1.5.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/stax-ex:1 >=dev-java/java-config-2.2.0-r3 sou
 SLOT=0
 SRC_URI=https://maven.java.net/content/repositories/releases/com/sun/xml/stream/buffer/streambuffer/1.5.3/streambuffer-1.5.3-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7b59b7a8ede9a3325c48be3b635ec310
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=11179c564cf043adabbffbf78259b1b7
diff --git a/metadata/md5-cache/dev-java/xmlunit-1.6 b/metadata/md5-cache/dev-java/xmlunit-1.6
index e76930939709..58a7f0427889 100644
--- a/metadata/md5-cache/dev-java/xmlunit-1.6
+++ b/metadata/md5-cache/dev-java/xmlunit-1.6
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 sourc
 SLOT=1
 SRC_URI=mirror://sourceforge/xmlunit/xmlunit-1.6-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a6661a3308bbbacd4c9d566b755526b2
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8ae33ea11c42a76004a49eb62b5ef326
diff --git a/metadata/md5-cache/dev-java/xmpcore-5.1.2 b/metadata/md5-cache/dev-java/xmpcore-5.1.2
index 5df4cf6c0d77..8698f0c8fa7c 100644
--- a/metadata/md5-cache/dev-java/xmpcore-5.1.2
+++ b/metadata/md5-cache/dev-java/xmpcore-5.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://central.maven.org/maven2/com/adobe/xmp/xmpcore/5.1.2/xmpcore-5.1.2-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=811850158ca768088454d58c6210cc36
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=671d780fcbe97b1fdbe03a8d3839e378
diff --git a/metadata/md5-cache/dev-java/xom-1.2.10 b/metadata/md5-cache/dev-java/xom-1.2.10
index a91228e8a52f..85f26a079787 100644
--- a/metadata/md5-cache/dev-java/xom-1.2.10
+++ b/metadata/md5-cache/dev-java/xom-1.2.10
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://cafeconleche.org/XOM/xom-1.2.10.tar.gz http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.6-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=28293d419ddfa924dde62fd73349d92d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6370fa986a780053f0499eabdf946c1b
diff --git a/metadata/md5-cache/dev-java/xp-0.5-r3 b/metadata/md5-cache/dev-java/xp-0.5-r3
index dbf0f0ac5643..3f7883c32a0c 100644
--- a/metadata/md5-cache/dev-java/xp-0.5-r3
+++ b/metadata/md5-cache/dev-java/xp-0.5-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=ftp://ftp.jclark.com/pub/xml/xp.zip -> xp-0.5.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4d430ae49465ea814b6f02c71f7b174d
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=93be56d970c3d530ceed373db66fdf57
diff --git a/metadata/md5-cache/dev-java/xpp2-2.1.10-r2 b/metadata/md5-cache/dev-java/xpp2-2.1.10-r2
index e6024e93c47c..6ee51d020c93 100644
--- a/metadata/md5-cache/dev-java/xpp2-2.1.10-r2
+++ b/metadata/md5-cache/dev-java/xpp2-2.1.10-r2
@@ -11,5 +11,5 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=943321d9b4abcaac3cbf63c3ee1092a1
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3475148d2ebd46197b61bfb2e0179321
diff --git a/metadata/md5-cache/dev-java/xpp3-1.1.4c-r3 b/metadata/md5-cache/dev-java/xpp3-1.1.4c-r3
index 82e1e85aa3b3..060b52d9749d 100644
--- a/metadata/md5-cache/dev-java/xpp3-1.1.4c-r3
+++ b/metadata/md5-cache/dev-java/xpp3-1.1.4c-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/xpp3/xpp3/1.1.4c/xpp3-1.1.4c-sources.jar -> xpp3-1.1.4c.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1cc1549c07848715f8cd7eb364030469
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5dcecca6e954f88ad2b67e55443fa57a
diff --git a/metadata/md5-cache/dev-java/xsdlib-20090415 b/metadata/md5-cache/dev-java/xsdlib-20090415
index 5c72d7787a8d..bdbcc27d8ba0 100644
--- a/metadata/md5-cache/dev-java/xsdlib-20090415
+++ b/metadata/md5-cache/dev-java/xsdlib-20090415
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xerces:2 dev-java/relaxng-datatype:0 >=virtual/jre-1.4 >=dev-ja
 SLOT=0
 SRC_URI=http://java.net/downloads/msv/releases/xsdlib.20090415.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3abaeee67e6200fe5539a27cc0b6088f
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ab37cbde4273c858baf47f243bab082d
diff --git a/metadata/md5-cache/dev-java/xsom-20140925 b/metadata/md5-cache/dev-java/xsom-20140925
index cf032b7cfa39..f0cc7d4a2b3c 100644
--- a/metadata/md5-cache/dev-java/xsom-20140925
+++ b/metadata/md5-cache/dev-java/xsom-20140925
@@ -10,5 +10,5 @@ RDEPEND=dev-java/relaxng-datatype:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/sun/xsom/xsom/20140925/xsom-20140925-sources.jar -> xsom-20140925.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=103b9a57ab6cc120598ddb2535f42af1
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c8b375aca71de935fa93798b11ff9b4f
diff --git a/metadata/md5-cache/dev-java/xstream-1.4.8-r1 b/metadata/md5-cache/dev-java/xstream-1.4.8-r1
index 03f1e2460e96..e8b067215b96 100644
--- a/metadata/md5-cache/dev-java/xstream-1.4.8-r1
+++ b/metadata/md5-cache/dev-java/xstream-1.4.8-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/kxml:2 dev-java/xom:0 dev-java/xpp3:0 dev-java/cglib:3 dev-java
 SLOT=0
 SRC_URI=http://central.maven.org/maven2/com/thoughtworks/xstream/xstream/1.4.8/xstream-1.4.8-sources.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ac52125a78783c6ac890713b29536517
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e420caa516ff403b21f3a1704b6a8074
diff --git a/metadata/md5-cache/dev-java/xstream-1.4.8-r2 b/metadata/md5-cache/dev-java/xstream-1.4.8-r2
index c2bb30ca9cf6..3fd2920af41c 100644
--- a/metadata/md5-cache/dev-java/xstream-1.4.8-r2
+++ b/metadata/md5-cache/dev-java/xstream-1.4.8-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xom:0 dev-java/xpp3:0 dev-java/jdom:0 dev-java/jdom:2 dev-java/
 SLOT=0
 SRC_URI=http://central.maven.org/maven2/com/thoughtworks/xstream/xstream/1.4.8/xstream-1.4.8-sources.jar -> xstream-1.4.8.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_compile:java-pkg-simple src_install:java-pkg-simple
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bc6c82f8efc7fe8ec074f9f846d0091b
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=64a57d0bf2b2c614de815b7e124020be
diff --git a/metadata/md5-cache/dev-java/xz-java-1.5 b/metadata/md5-cache/dev-java/xz-java-1.5
index e4b984ccea05..8b33345d2247 100644
--- a/metadata/md5-cache/dev-java/xz-java-1.5
+++ b/metadata/md5-cache/dev-java/xz-java-1.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://tukaani.org/xz/xz-java-1.5.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2b67ec2934be0add8c0c50ec233b1b56
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b0a55db7aec8213da2fa571e62c31186
diff --git a/metadata/md5-cache/dev-java/xz-java-1.6 b/metadata/md5-cache/dev-java/xz-java-1.6
index 8de70ad3373f..d5ada0d6435d 100644
--- a/metadata/md5-cache/dev-java/xz-java-1.6
+++ b/metadata/md5-cache/dev-java/xz-java-1.6
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://tukaani.org/xz/xz-java-1.6.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4e61f6d749a043f9ca69a1f6be054c26
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=da5187c0e7c4eef4f6f4057d4b135d77
diff --git a/metadata/md5-cache/dev-java/yanfs-1.0 b/metadata/md5-cache/dev-java/yanfs-1.0
index c00f73fa0bbc..4a9a51448e14 100644
--- a/metadata/md5-cache/dev-java/yanfs-1.0
+++ b/metadata/md5-cache/dev-java/yanfs-1.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ercpe/distfiles/dev-java/yanfs/yanfs-1.0.tar.bz2
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fdc722d788b962fadeb010dfb1bad959
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9fd0563473ecfd3f49457df6e16ee7ac
diff --git a/metadata/md5-cache/dev-java/zemberek-2.1.1 b/metadata/md5-cache/dev-java/zemberek-2.1.1
index 0766725fac77..a6961123a00c 100644
--- a/metadata/md5-cache/dev-java/zemberek-2.1.1
+++ b/metadata/md5-cache/dev-java/zemberek-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://zemberek.googlecode.com/files/zemberek-2.1.1-nolibs-src.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_test:- src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=40a1bb5ae76c47f44a3034f8717db480
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1177c8cb3601424ed091c6a2b4a063ad
diff --git a/metadata/md5-cache/dev-java/zeus-jscl-1.64-r1 b/metadata/md5-cache/dev-java/zeus-jscl-1.64-r1
index 4a9c4b3069af..72d8e4819d1c 100644
--- a/metadata/md5-cache/dev-java/zeus-jscl-1.64-r1
+++ b/metadata/md5-cache/dev-java/zeus-jscl-1.64-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=mirror://sourceforge/zeus-jscl/zeus-jscl_v1_64.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_configure:java-ant-2 src_compile:java-pkg-2 src_install:-
-_eclasses_=eutils	708f85bc1bf00876604e223fb56e062a	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	b31a7fe19a47c6a2d901f6de949e5209	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a38a3f9374271e8f9a11d23d3d6227e7
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	java-ant-2	111e7a22bb74fb783039d11dc169e599	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	53b75b4a49cf3e61530a523804045432	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=35332c903b99f92424ba601a79124b72