2017-01-07 18:36:53 UTC

868 files changed, 868 insertions, 868 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 71d80b36764b..2c20b548cd66 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=df1c57aaf6f5f7b8133bae567c1681b2
diff --git a/metadata/md5-cache/dev-java/airline-0.7-r1 b/metadata/md5-cache/dev-java/airline-0.7-r1
index 678478425632..81b0959e1929 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=768d333e964ed72af8277d10fb687f67
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 48ea80558295..fbc324f4aaca 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2fc091cc40d9755ae313e729a3678739
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 ae1b2ffa3f49..e7b125af5658 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1951548cf3e00c1eee696594856e3abe
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 edd7a69eafe6..774e1010f36b 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=37a8165e246388373e46441b7e5d2826
diff --git a/metadata/md5-cache/dev-java/ant-1.9.2 b/metadata/md5-cache/dev-java/ant-1.9.2
index 8f61edc1838b..7887e5ebdfb0 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	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1940f01cfaf5e0503a7c35846728932e
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 a04ad139505c..93d714322fef 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d2ac92abe8267b2f7f4b0b259cc21124
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 0d5c49702ee7..cd540fa80a8a 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e60b98206088a5f7a7c3c1aefe7cb335
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 ba1cf2bb01f4..f83922003964 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=87ac72eef99ed1837b184ea48d99898a
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 4265073be448..87f3d4d33200 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ed1053fd4f0be2a4e8c10b201cfbb7c1
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 34b6a7c2479f..d2c682fd9955 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=54b15853f8657cb74d621b0b4cdd482c
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 fa9d443caf82..851cc3471744 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bb0d2e09130e9cff002658d8d352206d
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 92cbd6e29aab..57dde3cde44c 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e0e7e90aa355559dd425ee59262b38fc
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 f071672034f6..676c02549f10 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e4dc377139f2baefe7e6133f1dc82550
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 4e9002968a8b..b0ce6751e6eb 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d93c99deba2b70ad3f268c2e2ebd54a1
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 e3285c267616..2b902f2429e3 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=84d4bc4818b982769e0ada75656e0f8f
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 4456be769cef..d0326ae9ad36 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a0e46649700bf9ad0f395a86a83d35af
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 8716627a473b..e77fa205d347 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c50557314f60f4d23092678ae6b03d69
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 07023cccb80f..a1ec7d07787e 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4ec71def9bdeec62c51ecf2af3c42f24
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 233808b577d9..c9ba14e03fe1 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5466c338e4f3e9001405d01b0c9dea8a
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 d8003bfd59a6..f511ffc6928f 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c8fb10427b0cbc6248815bcb7155b1de
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 7329f6ceb69c..fd9152f65f96 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=438e0678f6e952a1ea38fb29a54e5846
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 2ec112959dec..6f104b62e68e 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6cf21397e4fa1ee8cebbc3ec07f8b7d7
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 eca09fdced82..b48a69bc522f 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cd5e0be2d75e7b4e7d262a34284f9ecc
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 9b19f9ce3c9f..854d3d632405 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=229bfbf4c04d5ca0e923ab10704d97ad
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 91aef1c8c654..8b7f8ffcd18d 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6f2219679c44f598fdd9c5d02c12120e
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 ec9e2ff15bc4..6aa6bbf60a3f 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6d463876051a4ae88b7450e57db4fe8f
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 4f9825f9c6e8..953915a27e60 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e11f81aaf8c823decee440b7d19032d8
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 ef26206f3d80..b5d04ef2785c 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8937dd23a4a82fc2fd88fafb09b689cb
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 8cd0c407d14f..421a2610b3af 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=08e9d7f8af95c6edbcf2817da71fee76
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 115035ff4bae..6f0195fdef7f 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=66522c0bfe65bf26d7c44624b46b83b8
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 c6afc923bb27..23dcf5e707ab 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f9e1bd47c4bb6f121625a97942201420
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 b471d86e4871..c0f2e72ca1ee 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bb3aea82a9a7ff5e5eb2bde185240b32
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 0ae23e6539a4..ba57f8b42b84 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3d7c18cd259c244e280005fa5dd2ad5d
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 9bf7500a21cb..b9d59fe7608a 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0d87189cc265b742995287b25e1ee2ea
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 65801df56231..4d1fd6d0fbde 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=400e1c0745193f1cab96fe38c978dcc7
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 d70f6ae5ed71..1a422297632b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9085eee68b1619bcc37824b7ff7870ed
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 a372ade478fd..87191561bfcf 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0020710e1259842f7b56283538bbd275
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 97a4e56975aa..f308243a21ba 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e720584b8d913450f5b37f2d72a45ac6
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 a2c8488fd4c8..e3b9ba7107b5 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f1e41f44e2ed86fd21e8096e2b0e5d5b
diff --git a/metadata/md5-cache/dev-java/antlr-3.2 b/metadata/md5-cache/dev-java/antlr-3.2
index 3db17c479ca8..e8c6f53aaead 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8a60f4deec3806dff43e79906eb70016
diff --git a/metadata/md5-cache/dev-java/antlr-3.5.2 b/metadata/md5-cache/dev-java/antlr-3.5.2
index 98164f319a90..a59ec17615e9 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fdd986a23dde0eb7b033dfc5f31a05c5
diff --git a/metadata/md5-cache/dev-java/antlr-4.5.1 b/metadata/md5-cache/dev-java/antlr-4.5.1
index 3e6b7a1f7052..9856ec16da25 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c746f3f062406e10c2d8b06b2041888d
diff --git a/metadata/md5-cache/dev-java/antlr-4.5.3 b/metadata/md5-cache/dev-java/antlr-4.5.3
index 0a8311b4a538..0dfbb46333a3 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b930a603d5189fa4d9df346dfa938dff
diff --git a/metadata/md5-cache/dev-java/aopalliance-1.0-r2 b/metadata/md5-cache/dev-java/aopalliance-1.0-r2
index 909a09264489..325ab7066ac6 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4e6d3b0dc3d712802dc3e18d74892b33
diff --git a/metadata/md5-cache/dev-java/appframework-1.03-r4 b/metadata/md5-cache/dev-java/appframework-1.03-r4
index bcc85e4c7274..90ce636e92fc 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5e13dfc847b3f103083cd5aef99c63c3
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 6f2cb0b4ae4d..a9355c2dfa68 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7386642be875c00cbd27145b252d13c5
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 efb6398fe9ab..66b3f806e61d 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3e7aa15b3251f12275412ef5c0ef0926
diff --git a/metadata/md5-cache/dev-java/args4j-2.32 b/metadata/md5-cache/dev-java/args4j-2.32
index 298dbf28f7ab..fb3e949585d0 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=00a15799d3d1f8649f80c5f1830c6c08
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 41b2a23ec4b4..dbc0319b905b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e2912df240d608b31ee72643aaf8cd44
diff --git a/metadata/md5-cache/dev-java/asm-5.0.3 b/metadata/md5-cache/dev-java/asm-5.0.3
index 6b4c1401fdad..5b71fffbcb53 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f4d90a1739c9fd1ab4fdd55d99e24024
diff --git a/metadata/md5-cache/dev-java/asm-5.1 b/metadata/md5-cache/dev-java/asm-5.1
index 6a2d44d434e3..53fea9db6241 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3fd8e6679b4dd4d284ddc4a8b08ab5c7
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 5ed37e375a87..f09b74333725 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=88eeaf294a53e5ca4956acb3ec0b3c08
diff --git a/metadata/md5-cache/dev-java/aspectj-1.7.4 b/metadata/md5-cache/dev-java/aspectj-1.7.4
index c7d449acd155..e19bb651bfe4 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c84c79bca29307da8a0c01713e39011b
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 f0dde31d48da..c6489e86366d 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3ae22767ef5f5b733741472c791260d9
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 24b48faeb3b6..c674742dc6cc 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b07b2f1f4a2ae51f0b319f7ae9b9d4a6
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 cf1f38597d42..7eb9ac8b9dcb 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e9bab12b3381e3b9f3ac562b02d0673d
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 300a16966c9e..2ce22172a329 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=93e560c8f985025bb65d8068df130f18
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 c5b55ef4014b..5757f3e0b4f2 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e452f79e737147f31fee79e60d17ef2c
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 830f9b018bd2..6fb2c23be4ae 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9a79dc11dd785cb04e92b65eaa953d8a
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 02d20723211e..6dbab8f03ce4 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a384a05f83b5122d1d60c7008d469f47
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 81ce687d39eb..7c7ad9b56e4a 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8d3dd6db99d0e45e50bef03f39becfe1
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 119038d49c5b..8d2ce6dd9a66 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e6161d81373c58efd65591269cb6899b
diff --git a/metadata/md5-cache/dev-java/balloontip-1.2.1 b/metadata/md5-cache/dev-java/balloontip-1.2.1
index 74355af81e46..cda5dc85460b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=35b93edd5d260b9ce00b39f86967deee
diff --git a/metadata/md5-cache/dev-java/batik-1.8-r3 b/metadata/md5-cache/dev-java/batik-1.8-r3
index e1246446f4ff..846bdcdc5fe6 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b9fb71464d315718f8b8230817ef09d5
diff --git a/metadata/md5-cache/dev-java/bcel-6.0_rc3 b/metadata/md5-cache/dev-java/bcel-6.0_rc3
index 95a04d24e91e..2a9e74419dd5 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=870a235a0e0cfe1d9ee4597c83a4838a
diff --git a/metadata/md5-cache/dev-java/bcmail-1.38-r4 b/metadata/md5-cache/dev-java/bcmail-1.38-r4
index 4a7d4446591b..7cbd9bdd40b1 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2447b4d3f0772bd9e0aef7ffcb5a871b
diff --git a/metadata/md5-cache/dev-java/bcmail-1.38-r5 b/metadata/md5-cache/dev-java/bcmail-1.38-r5
index f957a4b8036f..13b074c243d5 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=562228e4a479195e01ecba294e8e2c6b
diff --git a/metadata/md5-cache/dev-java/bcmail-1.45-r3 b/metadata/md5-cache/dev-java/bcmail-1.45-r3
index 5647da4f123e..dd84f2eef647 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=803fe554377c837d47c3928ac4f06194
diff --git a/metadata/md5-cache/dev-java/bcmail-1.45-r4 b/metadata/md5-cache/dev-java/bcmail-1.45-r4
index 6ff5e38b99fe..906b370ab080 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8ca763fa3d0f8a905acd9384cd545305
diff --git a/metadata/md5-cache/dev-java/bcmail-1.50-r2 b/metadata/md5-cache/dev-java/bcmail-1.50-r2
index 0dfd924c4078..335c4dd070ab 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=013317ce536a4220f792c9c8b675346d
diff --git a/metadata/md5-cache/dev-java/bcmail-1.52-r2 b/metadata/md5-cache/dev-java/bcmail-1.52-r2
index 50fac36483ac..85083c3f396d 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=73127fb030cde2cbba591319f58ebfca
diff --git a/metadata/md5-cache/dev-java/bcpg-1.50-r1 b/metadata/md5-cache/dev-java/bcpg-1.50-r1
index 258dc0858e27..86aa44a9f4ec 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=060b6e838e4f0fb9dde6fec9ea27d1f5
diff --git a/metadata/md5-cache/dev-java/bcpg-1.52-r1 b/metadata/md5-cache/dev-java/bcpg-1.52-r1
index 8c161e9f6a29..75d172287e6f 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=14447d28e8e5ba74b48a4541d3879dc0
diff --git a/metadata/md5-cache/dev-java/bcpkix-1.50-r2 b/metadata/md5-cache/dev-java/bcpkix-1.50-r2
index 0329f45628f5..797bdb566450 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9e33230edf8786bc7feca140f442d222
diff --git a/metadata/md5-cache/dev-java/bcpkix-1.52-r1 b/metadata/md5-cache/dev-java/bcpkix-1.52-r1
index ac5e5668910d..15fb7f5e1a85 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=698074d40e4e27c667d70d0a2dc3cec5
diff --git a/metadata/md5-cache/dev-java/bcprov-1.38-r4 b/metadata/md5-cache/dev-java/bcprov-1.38-r4
index 590b9b2d2c82..682daeb487d9 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bcf116965a2ce70f86318d2d1dc4d25b
diff --git a/metadata/md5-cache/dev-java/bcprov-1.40-r2 b/metadata/md5-cache/dev-java/bcprov-1.40-r2
index 132262639f32..b939d85856ff 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f4bc76662193f234941be95b83a199bb
diff --git a/metadata/md5-cache/dev-java/bcprov-1.45-r2 b/metadata/md5-cache/dev-java/bcprov-1.45-r2
index e3a811ee8aa3..12e991494f3b 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d518b4f8d718466eb00c8c74c74b0d70
diff --git a/metadata/md5-cache/dev-java/bcprov-1.48-r2 b/metadata/md5-cache/dev-java/bcprov-1.48-r2
index bc5a55b563af..48b810a8292d 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5124cb2137076428d391d8e59eca5e51
diff --git a/metadata/md5-cache/dev-java/bcprov-1.49-r4 b/metadata/md5-cache/dev-java/bcprov-1.49-r4
index f97a6095c5f4..cc5a84c44fd7 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3adb43f833ee18f24cc78dd04c23b9f1
diff --git a/metadata/md5-cache/dev-java/bcprov-1.50-r2 b/metadata/md5-cache/dev-java/bcprov-1.50-r2
index dccc48564ac3..af2617c22353 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e99d3a3c6e0e5a4148543a25540b35e9
diff --git a/metadata/md5-cache/dev-java/bcprov-1.50-r3 b/metadata/md5-cache/dev-java/bcprov-1.50-r3
index e22ca3cbb16a..3a9bd6d947c8 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7d2a6e75322048eaa67c9eb268cf1576
diff --git a/metadata/md5-cache/dev-java/bcprov-1.50-r4 b/metadata/md5-cache/dev-java/bcprov-1.50-r4
index 46e323256667..3723a3d29f9f 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=07141bd0eef44708816d6c05a4f47606
diff --git a/metadata/md5-cache/dev-java/bcprov-1.52-r1 b/metadata/md5-cache/dev-java/bcprov-1.52-r1
index 20bbeaf8aae7..003a064c04e0 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6c6c56b88c0f1f1a950e02ab81d01af2
diff --git a/metadata/md5-cache/dev-java/bcprov-1.52-r2 b/metadata/md5-cache/dev-java/bcprov-1.52-r2
index eec1107eedab..a7bfa62832f1 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=546e4a9c82f37dda51c139d983f508cf
diff --git a/metadata/md5-cache/dev-java/bcprov-1.52-r3 b/metadata/md5-cache/dev-java/bcprov-1.52-r3
index ca0e23d8a659..ef54514cf41a 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2a995e1adcc7c9d2e1db10edb703b925
diff --git a/metadata/md5-cache/dev-java/bcprov-1.54 b/metadata/md5-cache/dev-java/bcprov-1.54
index cfdd659d6364..80b68ea75c8a 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b650dd03bfd0b0247e0b8bef96c42d22
diff --git a/metadata/md5-cache/dev-java/bctsp-1.45-r1 b/metadata/md5-cache/dev-java/bctsp-1.45-r1
index 860e281c5310..6ae135d7d8c3 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6f520bd73ed886b7a040a109c6318022
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 5c0bed8d6aed..18daea05ae73 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0828cc2eb906131f0b34916b0fdb5106
diff --git a/metadata/md5-cache/dev-java/blowfishj-2.14-r3 b/metadata/md5-cache/dev-java/blowfishj-2.14-r3
index 42e7c37628fb..e038b53f10c3 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7487e265cf3aa79fd989b3ebb53924d1
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 1901d9241b22..c08c31d523dc 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=77ca8e61f01a8a53c114b1d19adc33d3
diff --git a/metadata/md5-cache/dev-java/bndlib-2.1.0 b/metadata/md5-cache/dev-java/bndlib-2.1.0
index 33c0802f2e1e..826c79a410c6 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f1f9a393ef4b44c3a21b6f965c70df9c
diff --git a/metadata/md5-cache/dev-java/boilerpipe-1.2.0 b/metadata/md5-cache/dev-java/boilerpipe-1.2.0
index a4f054afe456..92eb736f6b4f 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2b2614732869bb2ff436ff1a7bb3cf5a
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 3ada08e9ff25..605136025554 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dbe20a949049f09614b47d528f76d229
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 e2911884bc90..c1b0f778c44b 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=97d6ae65ff58e781e725507f0e5b439a
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 4d367962570d..7ec2f83ffde0 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=97d6ae65ff58e781e725507f0e5b439a
diff --git a/metadata/md5-cache/dev-java/browserlauncher2-1.3-r1 b/metadata/md5-cache/dev-java/browserlauncher2-1.3-r1
index 4fb7df3e2a16..f6209c81d7ab 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5aca025be193fd173f9105330d1217fd
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 829e55a2926c..c9b1d9d5416b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fef548462a9ad859dcfa02170a950c8b
diff --git a/metadata/md5-cache/dev-java/bsh-2.0_beta6 b/metadata/md5-cache/dev-java/bsh-2.0_beta6
index df0353a9e7d8..52939b7f1ef7 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=021ffe09dc425a786d38da1fa0f896de
diff --git a/metadata/md5-cache/dev-java/btf-1.2 b/metadata/md5-cache/dev-java/btf-1.2
index 56c4172bde85..9bc6fabd17b9 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bbaed607c649d204bc190f7059082697
diff --git a/metadata/md5-cache/dev-java/bytelist-1.0.10 b/metadata/md5-cache/dev-java/bytelist-1.0.10
index 483fecb6d91c..dbe7de2c1ba8 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=50c4327028396410ba4debced3bc4b18
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 1561bba65a3e..9ec2ed3f5cda 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2a798b4e76f8bb781ed8314c3fa24b74
diff --git a/metadata/md5-cache/dev-java/cal10n-0.8.1 b/metadata/md5-cache/dev-java/cal10n-0.8.1
index 287d7d5ef75e..b8648d423b13 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bc39969c97856df81f98d454878e7b98
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 ee657f22ea2f..0a0565e93159 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=198917fbb6ee57bcdb92d335fbbe6648
diff --git a/metadata/md5-cache/dev-java/cdi-api-1.2 b/metadata/md5-cache/dev-java/cdi-api-1.2
index acaafbb77757..c5cb5806de92 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b0ae36576ba71e812b8535fe3fd96747
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 4b0312552043..40dc10d64e3b 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=218633582e9c04446ef4bad4beb1ecc7
diff --git a/metadata/md5-cache/dev-java/cglib-3.1 b/metadata/md5-cache/dev-java/cglib-3.1
index 8bd813f539d4..c242dce7c227 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4fa52ed996902d7104c8dc8ccbcaca1a
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 4f6572e3ee7d..0913d7150e34 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f06eca22b87ff2c51be94f5344aaeeea
diff --git a/metadata/md5-cache/dev-java/classmate-1.0.0 b/metadata/md5-cache/dev-java/classmate-1.0.0
index df97a798a49c..7a33f5c45d95 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f10a1aa113deff5ce00d97a24e04d676
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 82b74f5f642b..3721015f7a05 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=150271025e5701fa0095f4d8f7d99f31
diff --git a/metadata/md5-cache/dev-java/codemodel-2.6 b/metadata/md5-cache/dev-java/codemodel-2.6
index c1dd2943c5a8..788ff99dbb2d 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9bdc266768d10cd6503697faa81e1490
diff --git a/metadata/md5-cache/dev-java/cofoja-1.2 b/metadata/md5-cache/dev-java/cofoja-1.2
index 834116f76700..b367241d5815 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4c1961da5b1fb9f8f82e55eb916ff4c7
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 7a944df2963d..ee2993e99782 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=652cd16d84dd6801d0d2c3e16b756beb
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 522fae3de0ef..79f5939e66cd 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1fdf1fc3e0fbd9d3adf9d42f345c6b41
diff --git a/metadata/md5-cache/dev-java/commons-betwixt-0.8 b/metadata/md5-cache/dev-java/commons-betwixt-0.8
index 2f3d10033a6b..c97bf2a3e90d 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=54d7cccd05c1b72c56316064075b3fcf
diff --git a/metadata/md5-cache/dev-java/commons-chain-1.2 b/metadata/md5-cache/dev-java/commons-chain-1.2
index 1879cdbf555e..19bb8657aafe 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=11097db96ba44db58ec88e61e66036ed
diff --git a/metadata/md5-cache/dev-java/commons-cli-1.2 b/metadata/md5-cache/dev-java/commons-cli-1.2
index d9ed1dcff626..6cada0b3c098 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b074abc6b4fcd7dae10807cde01dc943
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 0d57746b5d0d..4dc9c2963f0c 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=315783d3a7ed74c37b22281ff3052163
diff --git a/metadata/md5-cache/dev-java/commons-codec-1.7 b/metadata/md5-cache/dev-java/commons-codec-1.7
index 69217be93769..b57fdbb74a4a 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d02de811544bb3291c1565ee09b969c7
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 87ef057ff878..79ca9cd121c4 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=89ee2d603ec902bae708d46760171266
diff --git a/metadata/md5-cache/dev-java/commons-collections-4.1 b/metadata/md5-cache/dev-java/commons-collections-4.1
index d4d1ec7aac97..b884700e441f 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0a10a1efa9389f234a9533370ef28fc4
diff --git a/metadata/md5-cache/dev-java/commons-compress-1.10 b/metadata/md5-cache/dev-java/commons-compress-1.10
index 6db6b99979b6..2b02d0d3a3d7 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a70f8e0d7aaa7904d0e7c993d0b500ec
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 9e44630f9dab..5f3cf8005e74 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5ee560cbda8162aa82fee5b09c487cc3
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 8af97f3979b9..b4bf350f56bb 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bfb2e5240dafa51e37ed24c602da542e
diff --git a/metadata/md5-cache/dev-java/commons-dbcp-2.1 b/metadata/md5-cache/dev-java/commons-dbcp-2.1
index d3d4d8dcdf5a..0263c642d61d 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=92460cea57656b64fe437df4bf3fb09d
diff --git a/metadata/md5-cache/dev-java/commons-dbutils-1.6 b/metadata/md5-cache/dev-java/commons-dbutils-1.6
index 6db460cc2397..f56e2a8bba6f 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eee36f70b1221238d099d67202ca4c2a
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 a04e54389eca..82c46e1295dc 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=34b71fe085fe4aafdd2465e6319097fd
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 b6b6c01865be..9a42d3ca2695 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=08afc865a9bf035e7c79ebb3b575313f
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 d633cccf7f39..3a305eede564 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=881e187b8efaa2cdd2c5284117df9b88
diff --git a/metadata/md5-cache/dev-java/commons-discovery-0.5 b/metadata/md5-cache/dev-java/commons-discovery-0.5
index 2ed162e37f3b..41065b0c3e0e 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3b98063ce1f91d55657541d72edf3f5a
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 937977290969..f389bc117d2a 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4a3d8d848e58923935f199fcf6c0a2a5
diff --git a/metadata/md5-cache/dev-java/commons-email-1.4 b/metadata/md5-cache/dev-java/commons-email-1.4
index 783b59dc64f4..64bade386581 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d154b39a9ab52bcea6346f969dd10564
diff --git a/metadata/md5-cache/dev-java/commons-fileupload-1.3 b/metadata/md5-cache/dev-java/commons-fileupload-1.3
index 52e97a954fbf..707a73031388 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5b6da7e24fbbd9906656e6e8c8f55c44
diff --git a/metadata/md5-cache/dev-java/commons-graph-0.1 b/metadata/md5-cache/dev-java/commons-graph-0.1
index 2eac4724231d..c6442a592a49 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=05481f4d1fa900b89b791b47e97e0b8a
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 6951b66fb1b1..c067fcb48b91 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e3b2df63c5504578a2610a87be06a481
diff --git a/metadata/md5-cache/dev-java/commons-imaging-0.97 b/metadata/md5-cache/dev-java/commons-imaging-0.97
index 9fa2eadbf916..5f56a02fe224 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fbcc05cb6952205552d113a17ca257a1
diff --git a/metadata/md5-cache/dev-java/commons-io-2.4 b/metadata/md5-cache/dev-java/commons-io-2.4
index ad8bce815e5f..0228c6cd14d2 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ba880d7469d5c1261e17a8db9f62f4ae
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 18528572b604..bce01a289d09 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b6b4720fd2464d897f9a38affe211db9
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 62142fdee6f5..72af24ec7f19 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=28c282ae347f416c4b09edac80b7dd21
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 42a06d2e3c66..0654f13f53ff 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e2944ae6113284fde474206e69754406
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 04c354f5d207..4718d910fa34 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bdc9ed9e4c4ab67bc0dee67e636dc59e
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 cb03fdc48081..57e27830176c 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1a674121883f6f038207b95a41a33de2
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 264fe6b1af58..5b602178dd6c 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=97af0bc8fe4b10dafb452d861143a975
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 717a223f6243..49422ddf43e9 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=75d9413fcfbff741c3a975d9b7d7ccc5
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 1fdc022dadc6..2d88179b8cf1 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3433f8132db9ae6383700dfe97d57daf
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 dd6e8abb4d52..20ae58e0b11e 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dc24a686aea57141e75e2a42b7e8d21b
diff --git a/metadata/md5-cache/dev-java/commons-lang-3.1 b/metadata/md5-cache/dev-java/commons-lang-3.1
index 114fd36273ce..84daa3c0368f 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a66f591bda863b6648b7886225dd3122
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 47da72e4c331..776e5dffa426 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=736fb59509562c91a7b85743a87cb7f2
diff --git a/metadata/md5-cache/dev-java/commons-lang-3.4 b/metadata/md5-cache/dev-java/commons-lang-3.4
index aa2eebac86f1..0f864d28b179 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f1fd83738378c0f1c5d8793bd205368e
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 706319cf0c50..6a26e1ce70ab 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=317f93b057273472db6c9fe9e6fad53e
diff --git a/metadata/md5-cache/dev-java/commons-logging-1.2 b/metadata/md5-cache/dev-java/commons-logging-1.2
index ab30defc0e96..94f71c08ef0c 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e12dfb928fe86e81886c1469991121be
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 5afcb2b676a5..2f87d77e83c5 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bceccbd224bf4b73af5d580e71890b62
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 2bbe43bf12d7..6e6ea80925a5 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c3dc035533b2ffa849a7a14279b88906
diff --git a/metadata/md5-cache/dev-java/commons-math-3.2 b/metadata/md5-cache/dev-java/commons-math-3.2
index 0774d2102845..6f02a9f3fc8e 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=088fd670aa3e23c956ad5a37abd47d91
diff --git a/metadata/md5-cache/dev-java/commons-net-3.2 b/metadata/md5-cache/dev-java/commons-net-3.2
index 74eb13f20422..50961d384719 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2654d09c613a3db63d2e489d8fd611de
diff --git a/metadata/md5-cache/dev-java/commons-pool-1.6 b/metadata/md5-cache/dev-java/commons-pool-1.6
index ea523418295f..6d1eb8741030 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bebdb011c5e1e082b1408a351a099641
diff --git a/metadata/md5-cache/dev-java/commons-pool-2.2 b/metadata/md5-cache/dev-java/commons-pool-2.2
index d39a69eb42a7..d022e0f90daa 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8e7aae0f87c3cfca2b4395c9aff33167
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 29c8b5eaa804..db7327cf83da 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=93dd527d1388b4be806fc000991208d1
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 3d48086ff1c5..ca2b3221a646 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=405207f362c1f4b6dff7673786000ef2
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 3b58fedb3577..bab60e97c093 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=07dd4475243e807058539e0c155de521
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 34b819e726fe..bc2628e4e7bd 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=676dc79c821a0e09fdb6cf7cc90e73a8
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 bf0d7799de94..a0f227619ef2 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1c4e59c3ffa1e03946e39f6760e7df82
diff --git a/metadata/md5-cache/dev-java/constantine-0.7-r1 b/metadata/md5-cache/dev-java/constantine-0.7-r1
index 3e0c570d9815..7aa95cd0dc01 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5cc51a281e55dcb3d6122d808967a470
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 d9acf4e6aea6..17722492968e 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ea018f3e5c85b35a6f0fa75c0c97fc48
diff --git a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5 b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5
index c3cd72f5808f..503d070354a3 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=79737dc7c20cf6517a3316f01d9db2d5
diff --git a/metadata/md5-cache/dev-java/cssparser-0.9.19 b/metadata/md5-cache/dev-java/cssparser-0.9.19
index 95e75439301a..c9b4c72c956c 100644
--- a/metadata/md5-cache/dev-java/cssparser-0.9.19
+++ b/metadata/md5-cache/dev-java/cssparser-0.9.19
@@ -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.19-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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d797250a22bb2153a5f1ff7c1df6df7c
diff --git a/metadata/md5-cache/dev-java/cssparser-0.9.20 b/metadata/md5-cache/dev-java/cssparser-0.9.20
index 287863f86c71..0a4742581f3b 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
 _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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b1bdfd6e606fb483a89cbde66d175600
diff --git a/metadata/md5-cache/dev-java/db4o-jdk11-7.4 b/metadata/md5-cache/dev-java/db4o-jdk11-7.4
index 9e5e470fb928..c76fa383cdc4 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=05c70df7e4c1eacec58378e295b6e20b
diff --git a/metadata/md5-cache/dev-java/db4o-jdk12-7.4 b/metadata/md5-cache/dev-java/db4o-jdk12-7.4
index 8974331143e8..c156300b87b0 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6b1e3c0507592467051bfde0ac7deb1a
diff --git a/metadata/md5-cache/dev-java/db4o-jdk5-7.4 b/metadata/md5-cache/dev-java/db4o-jdk5-7.4
index c6066801ad9b..a79c395ca835 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=45371b8b52f4a55109657695ff550bf3
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 d4a4f3c6056f..7e47739ea6ce 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=702bd9877da7f4c3c20077f9e157c29b
diff --git a/metadata/md5-cache/dev-java/dict4j-1.1 b/metadata/md5-cache/dev-java/dict4j-1.1
index b5ff1a114702..429566ec3216 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=80fedce585f7a954d0ff7803d8b7a872
diff --git a/metadata/md5-cache/dev-java/disruptor-3.2.0 b/metadata/md5-cache/dev-java/disruptor-3.2.0
index a9c3a0837f22..51a2e6dab67b 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=04c3c4bded3342e13cfa661df0babc96
diff --git a/metadata/md5-cache/dev-java/dnsjava-2.1.6 b/metadata/md5-cache/dev-java/dnsjava-2.1.6
index 1c5d1b0d7d22..dbf232e2628b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5db9880e7c5d1921cf584816b61796d8
diff --git a/metadata/md5-cache/dev-java/dnsjava-2.1.7 b/metadata/md5-cache/dev-java/dnsjava-2.1.7
index 47f029975d0b..bbfc25cb5087 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f658c0ff14388d2e530d590e03548914
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 1b85e8981e57..e99a1dbbc76e 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=78cec72581d98e00bb111e49e6bb8fba
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 60eb0fda6402..b23f96784995 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5a2b61a3afbe2d155589496cd2b41f5f
diff --git a/metadata/md5-cache/dev-java/dtdparser-1.21-r2 b/metadata/md5-cache/dev-java/dtdparser-1.21-r2
index 3a4d7dcdbb42..c94c2e68cc06 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=84f0942d7efb761b04cb54342b616eef
diff --git a/metadata/md5-cache/dev-java/dynalang-0.4-r1 b/metadata/md5-cache/dev-java/dynalang-0.4-r1
index a02eb8093525..505b74953d0f 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=809fb5ccfd0fdcb695a5bbd469a66681
diff --git a/metadata/md5-cache/dev-java/easymock-3.3.1 b/metadata/md5-cache/dev-java/easymock-3.3.1
index 855a7d5cc459..9852023ca819 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=775527c247deda85979252fc5a9f1f84
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 37af9ec3680c..35d2daaf3951 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=37dc9176fdf20ae47d43df5842ec9d31
diff --git a/metadata/md5-cache/dev-java/easyneurons-2.3 b/metadata/md5-cache/dev-java/easyneurons-2.3
index 26a7619b3cf6..93e97733be13 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=50c5e3723fd08f07810536e50f3ff4c2
diff --git a/metadata/md5-cache/dev-java/echo2-2.1.1 b/metadata/md5-cache/dev-java/echo2-2.1.1
index c5c42a60c78e..0ec8bd4de9c9 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1c5351ee6fbfe63d623fc5b38ea4e52d
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 318b21b56a4c..363f1c2d4920 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3c81fe4925a7a8d042b9f5dd06f6f2cf
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 5eb830d6072b..e31fc567a98c 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1a142d7abe4f3cc3504cffcbf0312110
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 1eec4eeaebe7..25a07d96f475 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f87b2095c2f6158a3d28c277d49b3274
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 24889a71d218..f647bf6dea5b 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f7b294d0f841a25080e8d936538a9abd
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 3c3f488dc6b7..82cff5fef84a 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c6519cdf779ddfe252f26545b22a47c2
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 9e15016f140a..57783921f584 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=646fbedee96d68a15db782b5d80e7e4d
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 862040463465..af9a73379af6 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=54eaa3b14f05ecc812268860a132c945
diff --git a/metadata/md5-cache/dev-java/eclipsito-0_pre20130713 b/metadata/md5-cache/dev-java/eclipsito-0_pre20130713
index 146fa90af22a..7d282ee9f8d8 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=777bc1f43542996de26b9ad462d4d0a6
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 e530a57ab856..18e5c833f7cc 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c189f6b611aced0783fb3bdcbe219656
diff --git a/metadata/md5-cache/dev-java/edtftpj-2.4.0 b/metadata/md5-cache/dev-java/edtftpj-2.4.0
index 3435c987c9e1..1fb2b3c96a38 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fe597ab363f473017ba23896b976b75e
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 6cb2eef5af8a..f18bfb5933e4 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0792abb411e87d385726fca43e69b546
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 ea4582e201ac..0ef642654a01 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a24afbb554ed0c2272884e30dbaa6eda
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 3e322ed0926c..4daaf9fb6438 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=48e29f264b6415a731df92e22de7ddbe
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 98a6ddf92fe2..bc104315d60e 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7bb33f7fecd5818c6009804748f8bbd1
diff --git a/metadata/md5-cache/dev-java/ezmorph-1.0.6 b/metadata/md5-cache/dev-java/ezmorph-1.0.6
index e726b137ed9d..48bf3bdec65b 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1b57e861d3e38e9d3ef4fcce4dd88100
diff --git a/metadata/md5-cache/dev-java/fastinfoset-1.2.11 b/metadata/md5-cache/dev-java/fastinfoset-1.2.11
index 2e78510bcbf5..1658dc9dd0de 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4e98cf1139e19f5c6f2fbeb81db5395d
diff --git a/metadata/md5-cache/dev-java/fastutil-7.0.10 b/metadata/md5-cache/dev-java/fastutil-7.0.10
index 1bcb9493244d..122f19899f87 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6806be3ef842677aad5ad72573830155
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 41ca106f644c..a91d914d7371 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	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9e0551ca81d36fe65049401e4dfe53f9
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 341288255890..bbbacea0d5f6 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=047c2d921fd87087415fa9f020dd3d5b
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 6b586f0dd7d0..20200ebdf7d7 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5ddff1bbebc1443b951f0ad0ff18de9e
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 ae112b1ab9d1..88008c89d21c 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ea4f8bb624c84f36d03c32035a0025c6
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 01bed068f51b..8eb69ed0cce0 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=91772ba61b884889fc82838ffa9191a4
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 ea087e76b706..6bfce098eebf 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=547e711dc1e30f882e2c68c27bddd8d7
diff --git a/metadata/md5-cache/dev-java/flyingsaucer-7-r2 b/metadata/md5-cache/dev-java/flyingsaucer-7-r2
index 6d0b9cfdba45..dfaa9d0f06e6 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=672d2c21b24ad41360c955d85b0eaeef
diff --git a/metadata/md5-cache/dev-java/fontbox-1.7.1 b/metadata/md5-cache/dev-java/fontbox-1.7.1
index 387a453f667b..5f0349118a48 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2e53965ba2885d3804e669170077d577
diff --git a/metadata/md5-cache/dev-java/fontbox-1.8.11 b/metadata/md5-cache/dev-java/fontbox-1.8.11
index de1ee400dc68..97bcc483f2b6 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e2e4a88d8702f3592158eec82f259796
diff --git a/metadata/md5-cache/dev-java/fop-2.0-r2 b/metadata/md5-cache/dev-java/fop-2.0-r2
index 8f2f22a33a4d..6f80e0a8d38d 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a19ed696ea4fd9d598310b8a3601616f
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 df7e2b1cfac8..0c6cfbc7c605 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b348b583aab8bfc143b4b36b3f229546
diff --git a/metadata/md5-cache/dev-java/freehep-graphics2d-2.4 b/metadata/md5-cache/dev-java/freehep-graphics2d-2.4
index 98bc5e4f559f..5a355f1588c0 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7b22ab33aa7ccb5eb966a7426cbc6a75
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsbase-2.4 b/metadata/md5-cache/dev-java/freehep-graphicsbase-2.4
index 2d635f381b60..6696266b4c48 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f3b78ba315bf1406122e986e62b75943
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsio-2.4 b/metadata/md5-cache/dev-java/freehep-graphicsio-2.4
index 815a6c678d9a..908a9cb10ce6 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e4b6bcf1f14b96d837b42f5be7c5f2b7
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 29d69194f471..ce150af9ba4e 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a955182bfadfa505f3cccf77fd1a2871
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 af0c932c8cfd..435664f40729 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=551aef5a8ff07038e71f1f943db9918d
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 9fdfd26dff30..a684dd064945 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bb220d6a0f08ed1c674b2d0038db1d7d
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 08dd751cc243..c19d90842611 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=405b7378426bc141ef1a5b787b719dca
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 c0742ca05935..bbe5a1ca9b35 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2f3cf2e6f4d39df06f738eb7cd57cefc
diff --git a/metadata/md5-cache/dev-java/freemarker-2.3.25 b/metadata/md5-cache/dev-java/freemarker-2.3.25
index f51c0f6d78d2..6e440274f152 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9084a7e22a5e3aa01fdc89167aa1487c
diff --git a/metadata/md5-cache/dev-java/fscript-1.17-r1 b/metadata/md5-cache/dev-java/fscript-1.17-r1
index 146b87b13d38..6e7220d4c3be 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b628ad1cf254961031619974c94aa622
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 ddf6ecc3180a..b83cf5529851 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3f8927fe150bd9c6e3933e1f64021ac4
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 630991144cc1..bff908dfdd8c 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ee238b79080253ad6b8220aef2047927
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 08b5cb136158..0fcaf5da2eb2 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ae2fc6c0ff055f080b2894249126cc9d
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 841fb7866493..e639978d82c2 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=511ce80e7d85b3812dff671525b0ee86
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 57c9d12aa58d..e11edb67cc95 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0fe442a71f556c16e045091240de96fe
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 b89924798cf0..e9f7de65327c 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8f61967eb9e1a497e250d3e5af1c5c2a
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 4e1c140ffd18..db0de5a84dd3 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f40348ed675561f45175229305fae738
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 03b836f81397..aa6be5d7b080 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ce7befe6428dc634ad94a3d1299733d2
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 22007308df0b..02ab2991fd68 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2cc7d4b71206c68facbc5af209e4fae4
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 34e8a42dc805..d0cdf638fe66 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=08f2420925b7afe899265f9390356335
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 b00bf7124d55..c5d6b89f4f92 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0f388c9122e4da7b0027938eb49fc621
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 1df7ed076dac..364eedbff648 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=569061aa4927f6a976199a7bb3fc1268
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 8ebd2025b6e1..62c605996358 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=283379de7a12ee8fec604045c24757d2
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 740eda60d38c..4c2b7d338840 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f648922a80c168ba122a6e746aada4a2
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 92faafc5fcfe..4449838478ab 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=792c2dad0df5a6c14d0ef26050837551
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 b9e78fc19b3c..a90c0712d3b9 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=400c4b5d5791da1294de05b05c970676
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 eaca24cda642..94600eb91614 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dd0b50c146fb0b03eab2163e474805ac
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 b90fad7b1dea..1355a08b8dd0 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a1a34c9c4128e9a1df1f1a2b9073d5ef
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 fc973339d255..3c5264b299d6 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d74cdfac2ec4c13a7e714c7cb94ca10c
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 54b1aef6ee49..b9976a0d3c5e 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a23edf062f15ebf637b7128644a5213f
diff --git a/metadata/md5-cache/dev-java/groovy-2.4.5 b/metadata/md5-cache/dev-java/groovy-2.4.5
index 5a72f5c4b896..0e900b932726 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=efddc9ac0b1f301468a2a16389005c13
diff --git a/metadata/md5-cache/dev-java/gson-2.3.1 b/metadata/md5-cache/dev-java/gson-2.3.1
index 9ba702ba9b0c..849e92cc8933 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9beec6309af0cf44c410937cb591faf8
diff --git a/metadata/md5-cache/dev-java/gson-2.6.2 b/metadata/md5-cache/dev-java/gson-2.6.2
index 32f2b7d02c56..fce696235b2f 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4971df460ca4973abdeb59e7c45d3334
diff --git a/metadata/md5-cache/dev-java/gson-2.7 b/metadata/md5-cache/dev-java/gson-2.7
index 4636cc57f63c..ac37183732bd 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aeb008a1e751ffafcd016d515830aee1
diff --git a/metadata/md5-cache/dev-java/guava-13.0.1 b/metadata/md5-cache/dev-java/guava-13.0.1
index 63fee5a6ce5b..be300d4bd70e 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d639b25ceda53ce88696b456bc6c4d64
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 d99bd3201768..d0ffa48c52ab 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b8ccd3a1d2085ef2842e73501744b089
diff --git a/metadata/md5-cache/dev-java/guava-14.0.1 b/metadata/md5-cache/dev-java/guava-14.0.1
index 88c1e430a471..95ad42090e0a 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0f020c653efe07463594efd3aa64dc91
diff --git a/metadata/md5-cache/dev-java/guava-18.0 b/metadata/md5-cache/dev-java/guava-18.0
index 0fbb8b780b5c..af675c30eccd 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=39c5e091a72a9b4ca734fe263efec32a
diff --git a/metadata/md5-cache/dev-java/guava-20.0 b/metadata/md5-cache/dev-java/guava-20.0
index cdf642c387f0..d6573528c708 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3e2b6b63c832d88245c4ee466325a751
diff --git a/metadata/md5-cache/dev-java/guice-4.0 b/metadata/md5-cache/dev-java/guice-4.0
index a314e9c03b5f..182a3a1f73bd 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3507a69b62bab3921614c92962ee476e
diff --git a/metadata/md5-cache/dev-java/guice-4.1 b/metadata/md5-cache/dev-java/guice-4.1
index e90d357f78f2..360eafad232d 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=86eecf596398010b02fdb8beb61149ee
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 0b7d22feb935..87cb75c40cd3 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a06a88f0fb2499d26236c8bc7a506b56
diff --git a/metadata/md5-cache/dev-java/hamcrest-core-1.3 b/metadata/md5-cache/dev-java/hamcrest-core-1.3
index 8db36c221763..f546343a750f 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=500d1c18d9aca0e8ad19dcffb6d959a3
diff --git a/metadata/md5-cache/dev-java/hamcrest-generator-1.1 b/metadata/md5-cache/dev-java/hamcrest-generator-1.1
index 98d3f9d0d8f2..1aadda8c50de 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3132bd8221f09d245efb6fec0e47f86c
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 243c831ecf93..fc6c8ec2e68e 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ca938e5e8e8d0e1f1d102badb72db55b
diff --git a/metadata/md5-cache/dev-java/hamcrest-integration-1.3 b/metadata/md5-cache/dev-java/hamcrest-integration-1.3
index 29ba404ef82f..27d7536eef17 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fdf107f49786a60ec8a2d479c1c4dcbd
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 061256a78b11..4e33c50968e3 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9aed00472da2cc8a5330b6913f9356a3
diff --git a/metadata/md5-cache/dev-java/hawtjni-runtime-1.10 b/metadata/md5-cache/dev-java/hawtjni-runtime-1.10
index 84d4fa0a3415..01d01c5a46a1 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=527bc0a8f864652915fe4b782f5f8090
diff --git a/metadata/md5-cache/dev-java/headius-options-1.1 b/metadata/md5-cache/dev-java/headius-options-1.1
index e9e3b47fadc2..3d527894b957 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=61c3614169a8db1e64a42872d839b7cb
diff --git a/metadata/md5-cache/dev-java/helpgui-1.1-r2 b/metadata/md5-cache/dev-java/helpgui-1.1-r2
index 656210585f27..0597c611f7b1 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=769f2adad2384fa0539c58f1d6566dff
diff --git a/metadata/md5-cache/dev-java/hessian-4.0.37 b/metadata/md5-cache/dev-java/hessian-4.0.37
index 60f602aabae3..c77460f6f7bc 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d7b85c16e84d64d221155c48a9675da4
diff --git a/metadata/md5-cache/dev-java/higlayout-1.0-r2 b/metadata/md5-cache/dev-java/higlayout-1.0-r2
index 00a14e2512d3..c47f311df3d9 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=25806f790b477b90b167a9e8910b49b3
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 da63e4a756c9..917c6756336a 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=311330477ed5dfecacb81e6a57ee05d3
diff --git a/metadata/md5-cache/dev-java/htmlcleaner-2.13 b/metadata/md5-cache/dev-java/htmlcleaner-2.13
index ba6c5ab5061b..c1117d5049e6 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1c26f90f826a10d60de3db75d0c3960c
diff --git a/metadata/md5-cache/dev-java/htmlparser-1.4-r1 b/metadata/md5-cache/dev-java/htmlparser-1.4-r1
index 35dd9f103f1b..ef97ca066b9f 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=444beebedbdf670a80fa9747a067d5e0
diff --git a/metadata/md5-cache/dev-java/htmlparser-org-1.6 b/metadata/md5-cache/dev-java/htmlparser-org-1.6
index 69044db6bc8f..04962b449b01 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=efc922a9663c1b0c1d5a84e0ef93c849
diff --git a/metadata/md5-cache/dev-java/httpcomponents-client-4.5 b/metadata/md5-cache/dev-java/httpcomponents-client-4.5
index d11e0e7070cc..2eddb46de011 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=35a943247b3f415f23cc0251885b49fa
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 b906dcbdce63..8ff745011090 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4d54317d120704bc0a4e658d5a11ab4f
diff --git a/metadata/md5-cache/dev-java/ical4j-1.0.5 b/metadata/md5-cache/dev-java/ical4j-1.0.5
index 72c97a5cbca8..b2a127426b07 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0c7bda9b9458acf4c331195ae548eba5
diff --git a/metadata/md5-cache/dev-java/icedtea-3.2.0 b/metadata/md5-cache/dev-java/icedtea-3.2.0
index 048f1bf73e21..ecdcde196a15 100644
--- a/metadata/md5-cache/dev-java/icedtea-3.2.0
+++ b/metadata/md5-cache/dev-java/icedtea-3.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=gtk? ( !headless-awt )
 SLOT=8
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-3.2.0.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.2.0/openjdk.tar.xz -> icedtea-3.2-openjdk-200203ccf4bb.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.2.0/corba.tar.xz -> icedtea-3.2-corba-9d3757e6da35.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.2.0/jaxp.tar.xz -> icedtea-3.2-jaxp-81c2773fbb0d.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.2.0/jaxws.tar.xz -> icedtea-3.2-jaxws-f57f3ddddff6.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.2.0/jdk.tar.xz -> icedtea-3.2-jdk-0cc71de3df18.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.2.0/hotspot.tar.xz -> icedtea-3.2-hotspot-be4aeaa327f7.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.2.0/nashorn.tar.xz -> icedtea-3.2-nashorn-0fb33c8b64d1.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.2.0/langtools.tar.xz -> icedtea-3.2-langtools-a553c153d376.tar.xz shenandoah? ( http://icedtea.classpath.org/download/drops/icedtea8/3.2.0/shenandoah.tar.xz -> icedtea-3.2-shenandoah-24002f5b584e.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	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	java-vm-2	c8b4e8309c59dc750e862fc8a2fec671	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	017377e73405d964cd0137088cddb9c3	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	java-vm-2	c8b4e8309c59dc750e862fc8a2fec671	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=9b1e64cb59d1d008eb7bc14103d81d94
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 cad2779fa46e..a08d223e421c 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	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	java-vm-2	c8b4e8309c59dc750e862fc8a2fec671	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	017377e73405d964cd0137088cddb9c3	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	java-vm-2	c8b4e8309c59dc750e862fc8a2fec671	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8da7f28c5d644dcccb3bb7a2a188a06d
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-3.1.0 b/metadata/md5-cache/dev-java/icedtea-bin-3.1.0
index 160203cf3459..162c6c8a8064 100644
--- a/metadata/md5-cache/dev-java/icedtea-bin-3.1.0
+++ b/metadata/md5-cache/dev-java/icedtea-bin-3.1.0
@@ -13,5 +13,5 @@ RESTRICT=preserve-libs strip
 SLOT=8
 SRC_URI=doc? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-doc-3.1.0.tar.xz ) source? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-src-3.1.0.tar.xz ) multilib? ( amd64? ( abi_x86_32? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.1.0-x86.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.1.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.1.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.1.0-arm.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.1.0-arm.tar.xz ) ) ppc64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.1.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.1.0-ppc64.tar.xz ) ) x86? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.1.0-x86.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.1.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_=eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	c8b4e8309c59dc750e862fc8a2fec671	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	c8b4e8309c59dc750e862fc8a2fec671	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
 _md5_=5a1881b0d02ffe935922441e3d500aad
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 2fdde5956780..4993cc47b861 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f30d5b913ee478aae6af7d5ec76b05ef
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 1c74a08a6c13..d1ee56432ff6 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=385cb5f9b5e5065cb4083c055b7488f1
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 e03c4e9b6877..de432f9a6627 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f69c8418e21a02369d54624abf3a2883
diff --git a/metadata/md5-cache/dev-java/icu4j-54.1.1 b/metadata/md5-cache/dev-java/icu4j-54.1.1
index 1c73ab0b54d1..33fb4c70ae20 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0c4ec40f1d680607b74fea4ce0fbe502
diff --git a/metadata/md5-cache/dev-java/icu4j-55.1 b/metadata/md5-cache/dev-java/icu4j-55.1
index c8d3b66f43b0..396ef2858050 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=41f4e467e4d9640628aac37931eadcbf
diff --git a/metadata/md5-cache/dev-java/icu4j-56.1 b/metadata/md5-cache/dev-java/icu4j-56.1
index 18cda813f271..31ec30f3a886 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3b2d18be080bc7693f0bc8f22ccb7bea
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 9a9a02eccfca..895f76778f05 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ee5c985d9542b1c5d3ad325e0e640f09
diff --git a/metadata/md5-cache/dev-java/ini4j-0.5.1 b/metadata/md5-cache/dev-java/ini4j-0.5.1
index 0a9c7c345a4a..7bbcdcbe925e 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6d3e91e0b49b1fde5102741b7038607d
diff --git a/metadata/md5-cache/dev-java/invokebinder-1.6 b/metadata/md5-cache/dev-java/invokebinder-1.6
index 7c60ed880cc5..26c448d4bc54 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=74e79e4c36c63f1b4f603b5a730614a3
diff --git a/metadata/md5-cache/dev-java/iso-relax-20050331-r4 b/metadata/md5-cache/dev-java/iso-relax-20050331-r4
index b4731429a6c3..f76c185d0a79 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=648b0ad2282bf46c327aba937e8b53d2
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 0c750bc23165..0260da5462c2 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=52da762493fe0b8b6199302c39317b7b
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 438d217da056..da2be63de6f0 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6f94b3cc30fca4426d12a0acde694203
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 9e4eb064c53a..471b3438bb6a 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4274ba3e6693dbc918a5abd9cb9795ef
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 713ec5942946..737fae8e056c 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e27c0ebe338c762b88c5a483f3a14e78
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 0a73ce8a7d15..7b065164ff35 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=770e0abae42b76a70015dfe2ea074c40
diff --git a/metadata/md5-cache/dev-java/j2objc-annotations-1.2 b/metadata/md5-cache/dev-java/j2objc-annotations-1.2
index 35e24ff48e03..8bb65f90e9ed 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c3d03d4319103e4542db87a4f2c60ba5
diff --git a/metadata/md5-cache/dev-java/j2ssh-0.2.9 b/metadata/md5-cache/dev-java/j2ssh-0.2.9
index 9da3a7be9fbc..1d8b3ee19778 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d3232d1fcbfe183cb0c003ef4cd0fb88
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 f97e47b83ea0..628a16b94d12 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e91991dec0924afa89a3010fb5ede36d
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 a198e7ca7c76..5d08cc2e5580 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d5946d2457d8c4a3b6c2942ef61ca0cc
diff --git a/metadata/md5-cache/dev-java/jackson-2.8.5 b/metadata/md5-cache/dev-java/jackson-2.8.5
index e40e1df6bdcf..2042fe525310 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a0efd2f66b10f66131a3a091f2821877
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 1119bf1acd09..9e5c09f59fe7 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=826c9a160d31a553f695f342689cebe4
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 c11f7de15f60..53ab3931ed69 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ca6f0fe31285c6bd4047a3987b93d15e
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 0a3043a2a0f3..0650534a98c0 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fb1bba33cf8bbe05b248eb50b3d690df
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 ee6ffdb978cb..39ef01629ee2 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=593b21d55991bc7355972d7110f427c1
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 22d5459e2834..03c5a05c7c30 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ed6ad51dd9d851615dee2f38ab4623b1
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 d5328d75f676..1f62a310dab9 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bc251373fc39b2c8b011eca79c551eff
diff --git a/metadata/md5-cache/dev-java/jacoco-0.7.5 b/metadata/md5-cache/dev-java/jacoco-0.7.5
index f49a3e4d2d74..ecb64ef3b15d 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cdab38de070a11cd4c44b582f2af871e
diff --git a/metadata/md5-cache/dev-java/jade-3.3-r3 b/metadata/md5-cache/dev-java/jade-3.3-r3
index cc2fa9e0f9d5..ad13b21d144a 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=91f22d80684dc0702899379b254c4dd0
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 09bb653f807f..e44f7ed82279 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f606c8b20722b6f53ff15885f4f0f240
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 0aae557551dd..2c853a1f6418 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=35494dda19cad57fd4cf6b36f47c972b
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 e8b4620492e2..f1f69c0c683f 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bc505ab2fa1761e77659dcc93a149faf
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 6440846d995b..ac220b2f8d56 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bc505ab2fa1761e77659dcc93a149faf
diff --git a/metadata/md5-cache/dev-java/jakarta-regexp-1.5 b/metadata/md5-cache/dev-java/jakarta-regexp-1.5
index f3718855002b..265e6e717501 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bc505ab2fa1761e77659dcc93a149faf
diff --git a/metadata/md5-cache/dev-java/jal-20031117-r3 b/metadata/md5-cache/dev-java/jal-20031117-r3
index 0a7f2361851f..2702786fed45 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7ba33c6156e5f36cc28549df61334868
diff --git a/metadata/md5-cache/dev-java/jal-20031117-r4 b/metadata/md5-cache/dev-java/jal-20031117-r4
index dcb85365477b..ef9799a4d007 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=32478670ca0bfd4e04b660f1861ab54b
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 fa6938dbcc09..37d7faeefd5f 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3003adb178e59bc588f1641485a12e5d
diff --git a/metadata/md5-cache/dev-java/jamon-2.81 b/metadata/md5-cache/dev-java/jamon-2.81
index 7e8a22513b7a..cf5823f35ef7 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bc81281fec77360cca01e0669bca1f82
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 10ccf40faa28..5ba23a44c4ef 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	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	java-vm-2	c8b4e8309c59dc750e862fc8a2fec671	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	017377e73405d964cd0137088cddb9c3	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	java-vm-2	c8b4e8309c59dc750e862fc8a2fec671	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
 _md5_=ad4288f650dffd4382042a47600864c7
diff --git a/metadata/md5-cache/dev-java/janino-2.7.0 b/metadata/md5-cache/dev-java/janino-2.7.0
index 171447e94304..a6089974ec61 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cab7a883ab5526e2b6d7ff05a89e5934
diff --git a/metadata/md5-cache/dev-java/jansi-1.11-r1 b/metadata/md5-cache/dev-java/jansi-1.11-r1
index 72f05d835cc6..997f823e83df 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4133f37a00dce01fee08bc46a800dabb
diff --git a/metadata/md5-cache/dev-java/jansi-1.5 b/metadata/md5-cache/dev-java/jansi-1.5
index 619a5c09f655..6741731970a6 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=700a23c9739604b29072e95b99f1c6b0
diff --git a/metadata/md5-cache/dev-java/jansi-1.5-r1 b/metadata/md5-cache/dev-java/jansi-1.5-r1
index 5f3971d0ba70..6afa04bdb810 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6be686c95fdb5ad2fe3ded294667aa36
diff --git a/metadata/md5-cache/dev-java/jansi-native-1.5 b/metadata/md5-cache/dev-java/jansi-native-1.5
index b6eadeb971c6..8906a218b241 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b218f7c638a1ab3a256cc15039f8fee3
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 13558e1d4617..611dc8f5fc82 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=08f26d9f502a4796dfa82c2f4ac7b395
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 72a850e00984..6c79eb005b45 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f1667939017fca2c247e9bd7e94e8280
diff --git a/metadata/md5-cache/dev-java/jarbundler-2.3.1 b/metadata/md5-cache/dev-java/jarbundler-2.3.1
index 154fdc713a09..3b1e2f74f01b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=92df49493bcbb0b3d9179484d7bdd5a1
diff --git a/metadata/md5-cache/dev-java/jargs-1.0 b/metadata/md5-cache/dev-java/jargs-1.0
index 5eebfdd49e0e..81ab40840719 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bf33f2ef2064cdc33b30ce7e13ce2610
diff --git a/metadata/md5-cache/dev-java/jarjar-1.4 b/metadata/md5-cache/dev-java/jarjar-1.4
index ebe342b300af..072529381674 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d7ec2961448e24f229a32aabac49a3c9
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 05d497c03643..0b123d4cbcf2 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cc124014d15e5b0ebf2a05c0ea9c30b5
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 459b3fb173ab..fc8138d09bd7 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8e61a7103e1a638b352ad599077b38ff
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 c18517363e58..c240c8b11499 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=47a1b5386bc0021bdb42e97210899dbb
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 78fb9080c6b7..3c7a2ab706f4 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1e86635627d9441fbd67f3c164a4d647
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 02f86f3b9740..3b0e9493107d 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fd87415d858de86dd31adca3a15a6d17
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 40eb803a6319..15d8958a07d5 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=8d8c090d18a682f848bc827380d40928
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 c2d9dfe5e00e..e8f5b9c23c32 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	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7f1a2245c16e0ab2fda84113b6988a0d
diff --git a/metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.112 b/metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.112
index 91a46a453c0b..d06597e722ff 100644
--- a/metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.112
+++ b/metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.112
@@ -9,5 +9,5 @@ RESTRICT=fetch
 SLOT=1.8
 SRC_URI=jdk-8u112-docs-all.zip
 _eclass_exported_funcs=src_install:-
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=be61d15febd9e0bbefbd592b45dfff49
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 5f7b9aa0f839..fe1bd9523a21 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9c5e277a2e10af07669e04748ebe8ab1
diff --git a/metadata/md5-cache/dev-java/javacc-5.0-r2 b/metadata/md5-cache/dev-java/javacc-5.0-r2
index 06a5bea1be09..a725019ff7e9 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=04268c1f76be5b0de0e8f3a8d3b46b83
diff --git a/metadata/md5-cache/dev-java/javacsv-2.1 b/metadata/md5-cache/dev-java/javacsv-2.1
index 5ec596e386db..d12460bb8334 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=111cea26d4fe28418286282f0447137c
diff --git a/metadata/md5-cache/dev-java/javacup-0.11b_p20151001 b/metadata/md5-cache/dev-java/javacup-0.11b_p20151001
index 71b4a3eb1018..73a104d00f4a 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b9a23fc12a7e1744fa1be2beb9c52a90
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 8e57f2acc963..3beb80a6cfca 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0280d5c11cc638f36255030d81adcdeb
diff --git a/metadata/md5-cache/dev-java/javassist-2.6-r2 b/metadata/md5-cache/dev-java/javassist-2.6-r2
index 735601f93bd6..73f308a16627 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d3d9181ed3f0871006c749591d83ab02
diff --git a/metadata/md5-cache/dev-java/javassist-3.18.2 b/metadata/md5-cache/dev-java/javassist-3.18.2
index f7a104abbd5d..c5d5d2773d86 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e0a769e4a9226f88bb3302e4c14461b7
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 0a32aef0f3e9..564d73c98996 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	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	017377e73405d964cd0137088cddb9c3	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a06c9133a1f23e839c1d6bdb9c58b65c
diff --git a/metadata/md5-cache/dev-java/javax-inject-1-r2 b/metadata/md5-cache/dev-java/javax-inject-1-r2
index 3c1dfd52ec9d..7fb94890788d 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6ab8a7315e5d41f0c4c8e5cd6f728839
diff --git a/metadata/md5-cache/dev-java/javax-mail-1.4 b/metadata/md5-cache/dev-java/javax-mail-1.4
index 53300dd093a1..b6d2d71890e1 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=82504d60c72ebf7d01c99411a60dc8ee
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 b731cdce0937..75ef62cab94c 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bb64563db442931acb475841651e8cac
diff --git a/metadata/md5-cache/dev-java/javolution-6.0.0 b/metadata/md5-cache/dev-java/javolution-6.0.0
index d126032dfdc0..ef02f0f99be1 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aabe8178c8b179f51bab86b9c8a31770
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 be26804b4099..3ac05a20f24a 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dd025269c86513071afcde73d9950539
diff --git a/metadata/md5-cache/dev-java/jaxen-1.1.6 b/metadata/md5-cache/dev-java/jaxen-1.1.6
index 6bfd4708a5ea..d945b59c9d75 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=314b3dbab236f176405d41871c6b222f
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 ed94483d5a05..4ef3b05d703f 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d6cd1edc5652252583d58ae7bb0998d4
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 1f5479f5e295..ca2b9d19d685 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e3e15495f293c56f79410d6356750552
diff --git a/metadata/md5-cache/dev-java/jbitcollider-core-0.8 b/metadata/md5-cache/dev-java/jbitcollider-core-0.8
index 35477f3fadc4..6bf48de7e621 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0f4a3ffd89a92784bcc9f6c6635cd10a
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 97bfdde18a3d..f52b77821da0 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a044d8906d252cf7b40c99ea17f9ac4c
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 7f6de6cfdfcc..26e5b149686a 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=edb3034f46b5d411dca2bca4078adbe2
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 4ce681b37486..eb96a4374c4f 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=41a15d1d8196904c379ca8ce73559df1
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 3619b53641fd..fd4439aea0a6 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=65e6defa3e99914f8ca72b86d550a638
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 915ac5fc0bd2..0d9b78943869 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=62408e986de15cbbd9981e47a197d3b8
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 5b1d139d022a..bb898af6ded7 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=99a74cef226c312ae1be95825c3e1ddf
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 f8dee9bf9265..42b96c08d6cd 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7cc83cf99911c4be1d0aec92e07e5f3b
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 cb670a5da263..134c72ac4ed5 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=74738c1d303cccbc051169b9b7fc522d
diff --git a/metadata/md5-cache/dev-java/jcalendar-1.4 b/metadata/md5-cache/dev-java/jcalendar-1.4
index d7329e508a5a..1cd0df386037 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cdfbc310ac4895a3bd71a75204f2068d
diff --git a/metadata/md5-cache/dev-java/jchardet-1.1-r1 b/metadata/md5-cache/dev-java/jchardet-1.1-r1
index 4b588d6a796d..7edfa593f4a2 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0eafbfdc7992f891acd52b703228e905
diff --git a/metadata/md5-cache/dev-java/jchart2d-3.2.2 b/metadata/md5-cache/dev-java/jchart2d-3.2.2
index 11f04028d0a3..305ef3c8c5fe 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7b9a279be34e57f2670a1df8edb0aef4
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 82d34dbaf199..a1b552fc921e 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7bd60229f94ac09be6d4e2beb553c0cb
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 d78f612ade93..591b2e52d8e9 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c73dd9cb6bfb232fe5c14eafc978bd03
diff --git a/metadata/md5-cache/dev-java/jclasslib-3.0-r1 b/metadata/md5-cache/dev-java/jclasslib-3.0-r1
index 86edf4d7eeba..48d9ba61a64f 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d02e9041b127873d27b72545268540b2
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 38c3519f7b12..dc23b334dc45 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6ace69e084a4809a7759b605fd57d834
diff --git a/metadata/md5-cache/dev-java/jcmdline-2.0.0 b/metadata/md5-cache/dev-java/jcmdline-2.0.0
index 640ba0b378e9..1e0590627e20 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d5b247fad5125be20e982d2a6dc3e7ca
diff --git a/metadata/md5-cache/dev-java/jcodings-1.0.11 b/metadata/md5-cache/dev-java/jcodings-1.0.11
index 7a5224830041..b4cf7014c89f 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4e17cbe64f444d481366f79c820cb84a
diff --git a/metadata/md5-cache/dev-java/jcodings-1.0.4 b/metadata/md5-cache/dev-java/jcodings-1.0.4
index f311af634dde..9abd18750714 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=865792815b973b533cb7af6becd00f50
diff --git a/metadata/md5-cache/dev-java/jcodings-1.0.5 b/metadata/md5-cache/dev-java/jcodings-1.0.5
index 6cdb185a035f..dab5ec315c5b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b7ad123cddcc75319f445e97f67b5c23
diff --git a/metadata/md5-cache/dev-java/jcommander-1.48 b/metadata/md5-cache/dev-java/jcommander-1.48
index 63a40a0f559f..4d3225dda262 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1d26df66391499bc25b21df62d93abe9
diff --git a/metadata/md5-cache/dev-java/jcommon-1.0.23 b/metadata/md5-cache/dev-java/jcommon-1.0.23
index d18c24c31d70..bc862dd1f2ee 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9bc420285e4970c254a1d835a7a93e9d
diff --git a/metadata/md5-cache/dev-java/jcs-2.0 b/metadata/md5-cache/dev-java/jcs-2.0
index c5fc43b30389..ac82472cb036 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c1ff06e4baddee5bb121c4a18c3a87ba
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 5429af9a9653..00d6969ee6a1 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ef1009d065a006d205f676b003d502d2
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 007648a5b92c..fe33dec30940 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3ea17a236201357de72cfc439bd28feb
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 8b9e0e32d6ec..7dbaa293bb04 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=59d8b94bf609813de27ff69d6bbe8e1a
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 7340b279f14f..28b86309fa4e 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=506f388b403ed820fcc1ef7c3b470747
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 0b416a7bc0b2..b2da2ebfab84 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d2ba19b2dc5087a23176e97ef633c6d1
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 76f637a0fc60..a3022b8517d7 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9f3014cc6c4660a00f722bdbbef10ebd
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 9650fc5ef4e3..a1500bf7f58d 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6c9e76560a073735f334fc57151947dd
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 b4b940a41e31..e2bb17f3a386 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=74b51075d9460aee5c3d12f0801c4e4f
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 edd578d91429..0b827ab4782d 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5d0a532eda10a36710cb8ce19893cdca
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 d2612e86bbd4..79b2ada59484 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c69e626b5168b91dae64d17417c5e51f
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 a9fc84c519a2..3f5c4e9ed250 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c69e626b5168b91dae64d17417c5e51f
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 cadfc46549e7..150f8f15d2df 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e2441372d0a78501e6da11b736e01565
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 2f16ddf7f21f..a496b48726a1 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e55d1de016818b414277d61a9ee196f0
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 576d7ee93342..1aee22aabe8d 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0981eea9a722149e594736f60f44db1b
diff --git a/metadata/md5-cache/dev-java/jdbm-0.12-r2 b/metadata/md5-cache/dev-java/jdbm-0.12-r2
index 5f3a67606a31..b18308ba6f39 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b6f9e13c751147a7777fdca29467ae51
diff --git a/metadata/md5-cache/dev-java/jdepend-2.9-r5 b/metadata/md5-cache/dev-java/jdepend-2.9-r5
index 2cc086abe68b..03f963c7eecc 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c767accef18adf42bfef1523c274b890
diff --git a/metadata/md5-cache/dev-java/jdom-1.0-r2 b/metadata/md5-cache/dev-java/jdom-1.0-r2
index 349262b8054f..17e0d9c27369 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=db11827a79653f976ba0e8a96b707bb5
diff --git a/metadata/md5-cache/dev-java/jdom-1.0-r4 b/metadata/md5-cache/dev-java/jdom-1.0-r4
index eb4e256b2522..b4d3fe59dbc3 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2ec920c5bf26545b83b5b23ba8e13e97
diff --git a/metadata/md5-cache/dev-java/jdom-1.1.3 b/metadata/md5-cache/dev-java/jdom-1.1.3
index c7782e36e8bc..ee474c60b551 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=69d149d1f40ff0a52007a503c2681841
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 57e10860ba88..625e3fd170c2 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=55afe736f9ca8ed313e5ce1c70e3b749
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 a8a71c8e4fff..06694a527729 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a08fc4de9f15c9aad091b4d870ccb4dd
diff --git a/metadata/md5-cache/dev-java/jdynamite-1.2-r1 b/metadata/md5-cache/dev-java/jdynamite-1.2-r1
index 1f2974ccc4ef..3f7ce402ea70 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d1767d348928bffc2037e0b6611642a6
diff --git a/metadata/md5-cache/dev-java/jebl-2013.02.18 b/metadata/md5-cache/dev-java/jebl-2013.02.18
index 9ef7175f48cb..86202b3bdbcb 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=942a9e4e900e5bfa4c5a9a6286b74c6b
diff --git a/metadata/md5-cache/dev-java/jempbox-1.7.1 b/metadata/md5-cache/dev-java/jempbox-1.7.1
index eb264dd04b81..278562df4ee0 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d67c518c3c3b84cf7a1c83c22c0cb27c
diff --git a/metadata/md5-cache/dev-java/jempbox-1.8.11 b/metadata/md5-cache/dev-java/jempbox-1.8.11
index e7e9ad9dd75f..45908d0e19f5 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cbdac9dd39ca06044776f02d6031c84b
diff --git a/metadata/md5-cache/dev-java/jettison-1.3.7 b/metadata/md5-cache/dev-java/jettison-1.3.7
index 3517f2ca03f2..15324d8226c8 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8e6d4804727523c6cc342a59c1c9e142
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 6305292e9dfc..6374c09b8cc5 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=70f6fe0db9f1f33eae928b1e2e7c2568
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 76997ebb7c90..8d099f2f3594 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b860bd0c2e42081b9f4c8fc2f11dc5d0
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 4ac67f96dbdb..b4298ce51db9 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=546e502517d644d1cf9905be154a57b2
diff --git a/metadata/md5-cache/dev-java/jffi-1.2.9 b/metadata/md5-cache/dev-java/jffi-1.2.9
index 68cad320d055..ece6f86bfa77 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a359b1b446ccdcfa4abadcc7f0d50bb2
diff --git a/metadata/md5-cache/dev-java/jflex-1.6.1 b/metadata/md5-cache/dev-java/jflex-1.6.1
index 15709c8d1226..d61d6495be87 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f916a9437ce7186c8c0cdac6bcb3fe28
diff --git a/metadata/md5-cache/dev-java/jformatstring-2.0.3 b/metadata/md5-cache/dev-java/jformatstring-2.0.3
index a13e340ce361..1dfd9ddb87ac 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4c68c600533e841316b52d31fa7877d7
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 cb013a8dc3d2..7bf66bb6d735 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e03e4b6fefaffe412046bc5fff90b135
diff --git a/metadata/md5-cache/dev-java/jfreesvg-2.1-r1 b/metadata/md5-cache/dev-java/jfreesvg-2.1-r1
index b6c612e29ccf..55021de5f21b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c25afddf0aac5f53525011cb95b12d40
diff --git a/metadata/md5-cache/dev-java/jfreesvg-3.0 b/metadata/md5-cache/dev-java/jfreesvg-3.0
index 72c746e5db45..c8cba885486b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a3ec0a14f3c91fa668ba07356258f39d
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 65452bfe6f33..bcdeee3480b7 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=584169f0a70716973b43be191131b220
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 36aaa613ce17..e9dfe93b1fa8 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fdf04eb694de4a685360451183035ca8
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 450b98544015..b9be2b5c896f 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=85d3635ee5a40ae707d4f762d8f9770f
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 cd2a7ea053e5..2c66fccb2a8a 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1add2825937efab85c216f389039eb62
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 2d48083cdb6f..e7f3bf49b5fd 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bbc7b8c0b46739035e409109cc8cc24c
diff --git a/metadata/md5-cache/dev-java/jgoodies-forms-1.3.0 b/metadata/md5-cache/dev-java/jgoodies-forms-1.3.0
index aa6768a130cb..f6b6b3e26cb8 100644
--- a/metadata/md5-cache/dev-java/jgoodies-forms-1.3.0
+++ b/metadata/md5-cache/dev-java/jgoodies-forms-1.3.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=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_unpack:- src_compile:- src_install:-
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aa14e85b777b38f55ce44ee648765a63
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 a337ac64edd1..d65d8b932a98 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.4 >=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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=df86748e354ac0e5e53b95c9156be277
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 8da3b71d9c76..b964278d2e97 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eb3b1eb1524e8fe22f31ce67c220331e
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 9c13377a004b..3406ac710ab9 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=85c468dca1f56fe14110d82659632b3a
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 6777409f6fbd..9584ca8e7b62 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=92dd9af00e39e7f5545ce685c666746c
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 9ed092ecca56..1497e5714c97 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3608ddfaed12185e2fc3368d8923ecb9
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 c595c0307523..0d572d091948 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=62dee6f7fbb2acf3c3bd54aa77cc1486
diff --git a/metadata/md5-cache/dev-java/jgrapht-0.8.3 b/metadata/md5-cache/dev-java/jgrapht-0.8.3
index 4d5fe7e55a12..04c00a27e4a4 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b5d0c06e20d9986f86cdcf47da6a6ffb
diff --git a/metadata/md5-cache/dev-java/jgroups-2.9.0 b/metadata/md5-cache/dev-java/jgroups-2.9.0
index d98ec5aa06b0..6edadb68f110 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7dac791c1c88719e4aa86e71d25ddadf
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 8586908ba1ae..47373962fe3b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7c7fb7630871f1a9c69c7cab9df6a2f5
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 bdd67277fd86..23a79331179c 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=827ef1e4e551b01599075977f07907a9
diff --git a/metadata/md5-cache/dev-java/jibx-1.2.6 b/metadata/md5-cache/dev-java/jibx-1.2.6
index 700d9b10e845..ea51f84c4994 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=caf9f68220a527066db8fd49ccf03788
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 ce09de53fa99..dd845c7e7b7e 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=983c439d9af7517a134cff782d50fa6a
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 d4f334dceab1..f14e6bfcfbfe 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=04677e5a2d3d16e6c22e89954045793f
diff --git a/metadata/md5-cache/dev-java/jicmp-1.0.2 b/metadata/md5-cache/dev-java/jicmp-1.0.2
index d9faba9e9e76..fbbff80bf8fc 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=76848a76520fdd0bbc22de8c368b3e21
diff --git a/metadata/md5-cache/dev-java/jid3-0.46-r2 b/metadata/md5-cache/dev-java/jid3-0.46-r2
index 64deb9917d06..3e4f1dc20cdf 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e1536f6b7378fe5e6dba5ffd5469eb09
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 c038fd74937a..578f5d3be14b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aa1c6c15c79a5c8ad69ead26b006fe0d
diff --git a/metadata/md5-cache/dev-java/jikes-1.22-r13 b/metadata/md5-cache/dev-java/jikes-1.22-r13
index 6c3f30732905..3b1b4da6defb 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	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
 _md5_=875eabe3121190987ab55ae44ed2f70b
diff --git a/metadata/md5-cache/dev-java/jinklevel-0.1 b/metadata/md5-cache/dev-java/jinklevel-0.1
index 04a925c92892..234142229a50 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8e81b7f8bf9fe7f218ac57c1bd81fee7
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 1f75b24ee861..e28432e81478 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=04b417d6c9e5035d4836e366d95f6f8d
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 1147d77a7d7d..a54727e963eb 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=73a742298f569d98577ea93fe18b7b66
diff --git a/metadata/md5-cache/dev-java/jlayer-1.0.1 b/metadata/md5-cache/dev-java/jlayer-1.0.1
index 0ff1df5e7bfa..066dafeee3d2 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0fac9a4a6eb79521fe51f34069ea98d1
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 835f7c94cabe..806ff555c82a 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5d2b82a798e13459769b469f29ae87b1
diff --git a/metadata/md5-cache/dev-java/jlfgr-1.0-r2 b/metadata/md5-cache/dev-java/jlfgr-1.0-r2
index 8b61318b4e7e..d3327b09a9bb 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=94939de1be46e8507e308d56dd753c77
diff --git a/metadata/md5-cache/dev-java/jlibeps-0.1-r1 b/metadata/md5-cache/dev-java/jlibeps-0.1-r1
index f8b714c245fd..9220ce6405bd 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ecb0325655de41744cd66e4c8c89a43c
diff --git a/metadata/md5-cache/dev-java/jline-1.0 b/metadata/md5-cache/dev-java/jline-1.0
index 7cb0ad9e6bdb..35c9839644fa 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d935f456fcb95d855b9886c0035d0094
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 af322abfc94e..88ceef614df4 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8e615453bd759dd9842c71601983149b
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 75625e840a0b..c6864221ff47 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1b543a3959baaac67dd502480bc0c29e
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 bc7c9b91b785..1d0da43d8d96 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f8be19dc77357b1b5b27d2c2a7fc81d1
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 b047f58682e7..5eccfb403946 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=70089cc4620f9295eeb588d266ec6b80
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 5cdd8e52498d..cd72d4c3a8a2 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ef152c1d243a0df0227a17e8cbb51c89
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 97bd35884738..962a2f517e71 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3882d829206cfd3ce799d70aa6fbc6db
diff --git a/metadata/md5-cache/dev-java/jmock-2.6.1 b/metadata/md5-cache/dev-java/jmock-2.6.1
index c6d3587afb8a..cfde6fbe55f2 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b41ca81f42b30c7c6216486752b59e04
diff --git a/metadata/md5-cache/dev-java/jna-3.4.1 b/metadata/md5-cache/dev-java/jna-3.4.1
index 46e689830826..6b2452abd4c2 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	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=135ca9c5bdc4add9ea974997a147529f
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 2bdd2f84f0f6..264ff9ba7c3b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ff68237e00d92f721c308939ceade907
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 5bb079ed2f09..f58af91a353c 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f0b9b1fde45e57724d363fba5a90b706
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 3f264c525cf6..07f95fed7b91 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e73d5cb697e1ca162b5ac025b846d786
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 65b098f0d60f..49cb33d93d9a 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=104914c0495518c9b09e24a2d39c01d2
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 90f12e9b3be3..dfcc8cf24c69 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cf9ab8c7120b1716671842fc4ecc5562
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 4ff446ec2783..af0098a502cc 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8b91fb954095424b23cc5a15b286daf4
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 4f95b14700f8..b486067378bc 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5adbc622db0df8de9e7e52157aa1fcd4
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 8c4dd5ad631b..f491b34f4638 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ed257ed13f1a66826b712ef8b8671cda
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 b7b6bbad2316..b89368eb1eaa 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d36b9fa1b0c3f41974b73bfda7f66771
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 72b9e29f4478..d34b866adc3c 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=64a4fb089f4c45d5f3add460316535e5
diff --git a/metadata/md5-cache/dev-java/joda-time-2.7 b/metadata/md5-cache/dev-java/joda-time-2.7
index a76ba372c21d..6239b1117117 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9309a25bc03883fbbbf66a213ad88dfa
diff --git a/metadata/md5-cache/dev-java/joni-2.1.0 b/metadata/md5-cache/dev-java/joni-2.1.0
index 74e0b5996a64..fe632e773a2b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d9b41cad5ccc12b1ce32198182082038
diff --git a/metadata/md5-cache/dev-java/jopt-simple-4.6 b/metadata/md5-cache/dev-java/jopt-simple-4.6
index f5e2022c68cd..4a5da39a0139 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=23b86b98d023270add458d0e1b4943e5
diff --git a/metadata/md5-cache/dev-java/jopt-simple-4.8 b/metadata/md5-cache/dev-java/jopt-simple-4.8
index c93d8a9318c4..258bf74e701f 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4a832d5c72dc26d5489eab973c8ad9d5
diff --git a/metadata/md5-cache/dev-java/jopt-simple-4.9 b/metadata/md5-cache/dev-java/jopt-simple-4.9
index da334b439960..92bc7f4d7679 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1034528d10e1f9f8ba7b63caaa6d8df2
diff --git a/metadata/md5-cache/dev-java/jortho-1.0 b/metadata/md5-cache/dev-java/jortho-1.0
index 8c229b619d8f..cff98c9ee312 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=57c4e1cad73b4e0189722af1c53c37a6
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 895b62d41739..c35b1a0f22e2 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=91d55d6b447b34cf5409cd7cd06af15a
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 616efc15790a..45ee5f6ec4fb 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ecfde31cb328525d6a1d51941fb8921b
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 d3dfaddd2970..397caebb154e 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ce528f31a536e9a35eef395ef22a4140
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 02428b01dad1..ff633e114aac 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=74bf1226c798fbcf93303c2d0985f88e
diff --git a/metadata/md5-cache/dev-java/jruby-1.7.12 b/metadata/md5-cache/dev-java/jruby-1.7.12
index 97e34e5a562e..4cf2d93374e6 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e9a8528c53693ab0f23c2f0ae7346246
diff --git a/metadata/md5-cache/dev-java/jsap-2.1-r2 b/metadata/md5-cache/dev-java/jsap-2.1-r2
index 67dd9344f3cd..510abe44cd34 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fd1ee1ff279279f0c3470bec7f6f05dd
diff --git a/metadata/md5-cache/dev-java/jsch-0.1.52 b/metadata/md5-cache/dev-java/jsch-0.1.52
index 9ba9154e1986..2950a7dbece3 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1341f6bf211825c8e6d90b829a1c9f20
diff --git a/metadata/md5-cache/dev-java/json-20150729 b/metadata/md5-cache/dev-java/json-20150729
index 3e0b65df7938..1d22caf4a7e0 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5e4cd8a419120cf1448e7596a97093ea
diff --git a/metadata/md5-cache/dev-java/json-20160212 b/metadata/md5-cache/dev-java/json-20160212
index bff02926dad2..d47bc810041a 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=981ab9eecaa4ab89aeecb1acf5823815
diff --git a/metadata/md5-cache/dev-java/json-simple-1.1 b/metadata/md5-cache/dev-java/json-simple-1.1
index 1eb81910daa9..042a25c0eab8 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=74f0f038b9a72d27ff00d3d186af0d17
diff --git a/metadata/md5-cache/dev-java/jsoup-1.8.3 b/metadata/md5-cache/dev-java/jsoup-1.8.3
index ca256e4e37a2..5b72c2d4556a 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=08aa504f17d71c9e41940f02dd269d12
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 2f98410f43c2..538fc3a74dc7 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c70192c5ec931f00c59287731f94e1f3
diff --git a/metadata/md5-cache/dev-java/jsr101-1.4-r3 b/metadata/md5-cache/dev-java/jsr101-1.4-r3
index bd784e7e680a..a11458b9aedf 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9d1e7c77eef3dd1e7f0dd377da9d2979
diff --git a/metadata/md5-cache/dev-java/jsr173-1.0-r1 b/metadata/md5-cache/dev-java/jsr173-1.0-r1
index c9c127047263..52c6a16967c1 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b11cc2c58e1cc0f1cee405a4dfdc8530
diff --git a/metadata/md5-cache/dev-java/jsr173-1.0-r2 b/metadata/md5-cache/dev-java/jsr173-1.0-r2
index 10f9ef8f3e7d..7d7f7f9b61d3 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fb3d6ff4b18d76e81507cb60481c9023
diff --git a/metadata/md5-cache/dev-java/jsr173-1.0-r3 b/metadata/md5-cache/dev-java/jsr173-1.0-r3
index 2babec98d452..671975180bab 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3a6cf7f9082e028a3bbaff9d431c99a7
diff --git a/metadata/md5-cache/dev-java/jsr181-1.0-r2 b/metadata/md5-cache/dev-java/jsr181-1.0-r2
index 3079c25c42d7..973234269b60 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e1e23c9b15d94cf402a617d284f80432
diff --git a/metadata/md5-cache/dev-java/jsr223-1.0-r2 b/metadata/md5-cache/dev-java/jsr223-1.0-r2
index 885fd89b6f17..918e59783eee 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=496e455ec521d466182a7d7615fc1a47
diff --git a/metadata/md5-cache/dev-java/jsr225-1.0 b/metadata/md5-cache/dev-java/jsr225-1.0
index 1fd6a944ac8c..f7e49bf50441 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b3a6a16c5c1d1d55a6adfe2c7f0bb818
diff --git a/metadata/md5-cache/dev-java/jsr250-1.2 b/metadata/md5-cache/dev-java/jsr250-1.2
index 7d66562d5e8e..de23aafef45c 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=469bb98ddae5cb595a5a7ad1532e4866
diff --git a/metadata/md5-cache/dev-java/jsr305-3.0.1 b/metadata/md5-cache/dev-java/jsr305-3.0.1
index 78baf4fc8a01..b2d99f371b20 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ee6349d4a0bc3f4998d6e024d2d6ffd3
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 117e8286657f..57362a81af2f 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9bff8f0c6d6bdb336b167fcb83416226
diff --git a/metadata/md5-cache/dev-java/jsr322-1.5 b/metadata/md5-cache/dev-java/jsr322-1.5
index ced10264060c..ae5bafda4e19 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2b021afdba0c9b815f6bfb28fb425439
diff --git a/metadata/md5-cache/dev-java/jsr67-1.3-r1 b/metadata/md5-cache/dev-java/jsr67-1.3-r1
index 50409450234f..7a83dea8f63e 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9385e4e365df005ad23c4410e78f9321
diff --git a/metadata/md5-cache/dev-java/jss-4.3.2 b/metadata/md5-cache/dev-java/jss-4.3.2
index 8c5dbcfba356..b0e818caa772 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=35bf46e1271905a71a2d010eafa57923
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 4c3811f593c3..0d01dc151a97 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=370a351dcd968b491e861c9a43c1f96d
diff --git a/metadata/md5-cache/dev-java/jstun-0.7.3 b/metadata/md5-cache/dev-java/jstun-0.7.3
index b4f0988e8e0b..77e5fdf277e5 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=68690ff58106e0d871e5fa645bc6e8b2
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 d5f83670c4c2..c1ff6b1c5d96 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6428f8c81b9d127cfe3df408c09dd4c4
diff --git a/metadata/md5-cache/dev-java/jta-1.1 b/metadata/md5-cache/dev-java/jta-1.1
index 906eeb72dc20..391bc6d12d97 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dd9738042d804c459afda26b7ab3cf46
diff --git a/metadata/md5-cache/dev-java/jtds-1.3.1 b/metadata/md5-cache/dev-java/jtds-1.3.1
index 2f9336d19c3e..0ee7bdd81b6b 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1146108a3bfda1dd4a62b057b67f3645
diff --git a/metadata/md5-cache/dev-java/jtidy-1.0 b/metadata/md5-cache/dev-java/jtidy-1.0
index b3ef92009dd2..a8f29a69ae61 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=72b2a24f76ab6474f6e991d4ea2fc50d
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 f435583ee949..202708c02154 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d4b9f141a3690b64da8d6279ed630e5e
diff --git a/metadata/md5-cache/dev-java/jts-core-1.14 b/metadata/md5-cache/dev-java/jts-core-1.14
index 250a68ae5220..1e85e5a1eede 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2af88159c367aa24d0024590b9cbb697
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 9f2a0282b730..5a2c7cefd623 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=78e0dedbae633882811e39de32530bac
diff --git a/metadata/md5-cache/dev-java/jump-0.5-r1 b/metadata/md5-cache/dev-java/jump-0.5-r1
index f69cdb79a255..76f8a6c1119b 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=416a269dbd0033e5a7d2c6b14b378173
diff --git a/metadata/md5-cache/dev-java/jung-1.7.6 b/metadata/md5-cache/dev-java/jung-1.7.6
index 03b6167d0f4e..d993b0aa921f 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3da848fe0f88d5224d3e134105002648
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 37e81f0eca7e..f2b482b9351d 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=60c242bb4d4c38c79614cce756948c0b
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 39dfa3a4d77f..0300091ff068 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c7c1ea670d729624099df8e5f189076f
diff --git a/metadata/md5-cache/dev-java/junit-4.12-r1 b/metadata/md5-cache/dev-java/junit-4.12-r1
index 3dceda0820ea..0bebaf543a3d 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3698d6868f0a11303145b4a39c16a53a
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 d9844c1b9a35..72a178a8b618 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=28e01f74b288e985e0d13b7a28b36218
diff --git a/metadata/md5-cache/dev-java/junitperf-1.9.1-r1 b/metadata/md5-cache/dev-java/junitperf-1.9.1-r1
index d50ce145ca5c..31dae4ff8ae8 100644
--- a/metadata/md5-cache/dev-java/junitperf-1.9.1-r1
+++ b/metadata/md5-cache/dev-java/junitperf-1.9.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 =dev-java/junit-3.8* >=dev-java/java-config-2.2.0-r3 >
 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_unpack:- src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3d960c06014cb1b271a61e7e219e6f3d
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 0c4c2bfa7fed..00d388a63a24 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d0892702f5e7ef7a5f9dc1ffe3908801
diff --git a/metadata/md5-cache/dev-java/junrar-0.6 b/metadata/md5-cache/dev-java/junrar-0.6
index 1b897274e0db..59dc336227ca 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3ad6710a35583d6875c32c9f352f1def
diff --git a/metadata/md5-cache/dev-java/jupidator-0.6.0 b/metadata/md5-cache/dev-java/jupidator-0.6.0
index 5b79861ba8b0..0a6009b5371c 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=92649537d35d888d2c47387758ca8f89
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 32055f515b21..da21018ccde1 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=04b9b868e4614fa3ae9db4218fc90d39
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 b230385069e0..a0910475d8e4 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	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=01c73dca391fc2563757adc10c344e1b
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 11c60cf78808..478d473575f5 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b3458fe9d32afe3173e1516544606ba9
diff --git a/metadata/md5-cache/dev-java/jvmstat-3.0 b/metadata/md5-cache/dev-java/jvmstat-3.0
index f65adea77aef..85892919b438 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b0b4a46e47841769b9d33f45d668aae3
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 b8cd20f06131..a24182722434 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c0136b65c2d5aad5c5139da56989602a
diff --git a/metadata/md5-cache/dev-java/jvyamlb-0.2.5 b/metadata/md5-cache/dev-java/jvyamlb-0.2.5
index b154be0d4ba7..b5c8207b1829 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=124c0d3d8e79f84751ffbc0f3e989a95
diff --git a/metadata/md5-cache/dev-java/jython-2.7.0 b/metadata/md5-cache/dev-java/jython-2.7.0
index 58a30048e4ce..a0e838429ea3 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	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=614b2292876efae2910c72f0fe4ef574
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 52129bd392b5..5a0696b7b275 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	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f2778253f3dbfa3ef3d254376dbf1711
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 25b9b87b2548..6e98baab0829 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ea0e5ba216993c4829f03a60b1938c4f
diff --git a/metadata/md5-cache/dev-java/jzlib-1.1.1 b/metadata/md5-cache/dev-java/jzlib-1.1.1
index 2292e1425399..b73d047bb6c2 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aac0062d6bb0944a50ee0b233066e964
diff --git a/metadata/md5-cache/dev-java/jzlib-1.1.3 b/metadata/md5-cache/dev-java/jzlib-1.1.3
index 65254e15b852..10ebea11c272 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=982e5cc024a036111da9dd94242f20ea
diff --git a/metadata/md5-cache/dev-java/kryo-2.24.0 b/metadata/md5-cache/dev-java/kryo-2.24.0
index 6cf069dafa5d..bca04cf6779b 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=552a53c9dbd1947d0a5dfb43d2e22ab4
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 dbe0e9dd7ed2..7181efe737f0 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2fd5e0f42578907b3b6d1b33a7814ef8
diff --git a/metadata/md5-cache/dev-java/kxml-2.3.0 b/metadata/md5-cache/dev-java/kxml-2.3.0
index 8ca708729406..8812265d04e4 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=515b382902ddfb665f930d056fe52973
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 e9fdc31f4380..4cfa143b044d 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7e941a0ca88bc29da2bd998722116f89
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 4f15b9dd0420..fcb6bfbd295a 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=641c34d9dcaf743ac0dae20d6c2ee7c3
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 e1fc22cfbcee..fdbbe46f0fe1 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e08f92287e522d2718e339a5d29bface
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 ac68a100c21d..5fc2bfbc6d67 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=79dd5adc1068562f89ec67177a8a33f1
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 286edeb520ae..487508183ab4 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=79dd5adc1068562f89ec67177a8a33f1
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 c0a8276d36dd..4601cc62b7da 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1cdc8377aef338e4276ee92c27ea9d0f
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 61ded940a191..ae307bcb6739 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	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1fdf6207db380d6d5c9c8cab8eff029c
diff --git a/metadata/md5-cache/dev-java/libmso-0.1 b/metadata/md5-cache/dev-java/libmso-0.1
index cd201e973297..2d9729157427 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cfa222c8797bf851d4aa52b05756aecb
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 1e74e7010d26..3d693ead8d1f 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ecdc3c223cd23e97fc21c13a3a9981c7
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 d035988dbbfe..a437f17964ea 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=46786f4e8d635f0f8378ef1151afa123
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 abbd9e32779d..ffb20bed3dd1 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0db1da13eaa1b6715464780b2c3f180c
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 36d274cf3782..662dd54b2285 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=044c7fdb7be507d6a223afbc10bf0f79
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 a5718c733757..5ce06da0a5ca 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=74da587faab26e0d6a720570e46d7624
diff --git a/metadata/md5-cache/dev-java/lucene-3.5.0 b/metadata/md5-cache/dev-java/lucene-3.5.0
index 93ab50f8e72f..c88ae3788287 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0a292ecee3c93f5b8dd619f80f49598d
diff --git a/metadata/md5-cache/dev-java/lucene-3.6.2 b/metadata/md5-cache/dev-java/lucene-3.6.2
index 05d915166b47..1e4c96b64087 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=07534aeba3871ccaffc4654b364adc77
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 812627023baf..e6abeb469a48 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5362be898a16e19ccb7efc52281dd523
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 fca78fe30a4e..f6b8f1f2322f 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=84015ae3faaa88e619cb14e6e7ceae58
diff --git a/metadata/md5-cache/dev-java/lzma-9.18 b/metadata/md5-cache/dev-java/lzma-9.18
index 51ed443a7382..fdb021dc140f 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7d977c02f84a6326c5e9997c2710875c
diff --git a/metadata/md5-cache/dev-java/lzmajio-0.95-r1 b/metadata/md5-cache/dev-java/lzmajio-0.95-r1
index 43b19ea20765..4c102bb64169 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2cd582dbc79969d72b8792a7e944daa0
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 d8f08e7c1798..dc844f085225 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b2f039686c9fac42a9877b10b54034ca
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 601086f6b564..7109837a1dbe 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9d8d7d5388546747a854183929f8a53a
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 9e36606ed910..b9fb44960401 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=08b15e8b54ccaf44d1939a34c053b3b6
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 2c931b06253f..728634272637 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f3f815ed8533b42fe84d6427f8ac4e48
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 fa5842ce1e4a..55b9172755dc 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e2f5cdac03f2d34570dcb1878b883431
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 120d6bd46a4a..16028965af57 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=075e8dddd93bae82404fb6a43e427173
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 de5786e68a44..57e6ca4f51b1 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b9a56c796d94e4e088852435e523d6b4
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 5d1362551f5a..c4e4ee2a16d0 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8e924ceeb331f1db22f9d4d905f36cae
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 288405d467fb..f8441e9c263f 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d4d24d412fd6e7838e46470fbb65a867
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 fa8138f63dc5..3a628edcad90 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dc34f7e15945cbd4185a1374103ccebd
diff --git a/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r1 b/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r1
index 8f0242455faf..454223d35b06 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dfdff444aee065a188796cdc39a53062
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 210b78251933..27684a64b915 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=be5c459ea7e6eb781dc4eafd67a38c3e
diff --git a/metadata/md5-cache/dev-java/metainf-services-1.6 b/metadata/md5-cache/dev-java/metainf-services-1.6
index ffe1d6447f2b..cd1c34c45ed7 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=584b20ffe305ebdebecafcebe4a9fb8b
diff --git a/metadata/md5-cache/dev-java/metainf-services-1.7 b/metadata/md5-cache/dev-java/metainf-services-1.7
index ce1fe2f9c784..b17a46b34e26 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=abb512f600bcaa86bfc01d49fb02152f
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 65816953a081..4969e0a3e9ef 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=de58ee9fa6a5d7cd38e195c1a0ce6b55
diff --git a/metadata/md5-cache/dev-java/miglayout-4.0 b/metadata/md5-cache/dev-java/miglayout-4.0
index baa5bd1ffe11..3ee835cb5635 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9c95afb0254c3006a3d154b1204c861f
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 955bafd80588..bb2b02b74032 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4b113867e1b33e09a913a5d02111e68e
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 8faa39b231fc..926d66e64ebf 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=62d17024f249bfbce540173937e41a53
diff --git a/metadata/md5-cache/dev-java/mimepull-1.8 b/metadata/md5-cache/dev-java/mimepull-1.8
index 514f6b135340..17c125189c25 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=33bf03a28f5f9915c4a72ac600aa0935
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 957bfc055bfe..340a48ae98b4 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5d0c13e32b75c5feb043c525c591a82f
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 46ad5e6477fe..c3e02a8a5c8b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5302b50e9d22ae0951da4c140f90803f
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 ccddeabf6515..863b79f1b6c5 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e60889d5b524fb8bb102e28ef6e1d42e
diff --git a/metadata/md5-cache/dev-java/minlog-1.2 b/metadata/md5-cache/dev-java/minlog-1.2
index 782f16e6b2b4..ddb940d1f72e 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c48db2c18027ea23d6b3b00992cbf3e5
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 f6f931694603..77aebed97d15 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f9c02ea1b5289b24ee3033d65228db36
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 67be9e5c61df..760fc5f816ba 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=232b8784fc49d802b6d6f084112a4a3c
diff --git a/metadata/md5-cache/dev-java/moshi-1.1.0 b/metadata/md5-cache/dev-java/moshi-1.1.0
index fac7d71d1e77..7417035ea099 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ac6280afd4e83ec0873e6a048998f45c
diff --git a/metadata/md5-cache/dev-java/msv-20130601 b/metadata/md5-cache/dev-java/msv-20130601
index 3446b50e93b1..6d95aa328982 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9d820a8775b4e7d0b2203d27349efaa4
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 a87a1b469cb0..f9298f640831 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3dfa21695aadae1db703e9236b27d5ea
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 562e10dfae85..c8c6a1ac6912 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9645949379c813649f98993dd2a395f9
diff --git a/metadata/md5-cache/dev-java/nachocalendar-0.23-r1 b/metadata/md5-cache/dev-java/nachocalendar-0.23-r1
index 096fe2e37cbb..a68f9c27dddc 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=73ddf60e179d15b00dc8960924f0a5ac
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 8d369ead8ef1..9e904f7ee6be 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5bee4e6c6d05f3b3f033be18b368d531
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 605f9c0cbd74..49fb92c28266 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ce8dee49e8f16b2910f6fb66b1838028
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 71f13a8a0209..c423b9edb99e 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=49ebb3cb7fd7e8c159e255a13210532f
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 3a81ac7b5265..035dbfee112f 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6cdca6939d83ac87867d08f1acbdb6ff
diff --git a/metadata/md5-cache/dev-java/netbeans-apisupport-8.1 b/metadata/md5-cache/dev-java/netbeans-apisupport-8.1
index 7005e83017c1..a76ca6f23ceb 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ddb1ec3065499b4f62d2ca696189e0d8
diff --git a/metadata/md5-cache/dev-java/netbeans-apisupport-8.2 b/metadata/md5-cache/dev-java/netbeans-apisupport-8.2
index dc5f528ea827..a6f3555525a4 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=620424953ee0d2f518e3d0747bfd3046
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 e63bc681b37a..c456f885786c 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=56f9fd1d64e271f6dda99a2d386e38d3
diff --git a/metadata/md5-cache/dev-java/netbeans-cnd-8.1 b/metadata/md5-cache/dev-java/netbeans-cnd-8.1
index 1f3e772acf15..0f2239f1953f 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ac2c5d4ca5a78954d0071a40486adaf2
diff --git a/metadata/md5-cache/dev-java/netbeans-cnd-8.2 b/metadata/md5-cache/dev-java/netbeans-cnd-8.2
index cf1320f26b08..a24c1a5b5279 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dcdb7639b5d06f80d63dc4be673e9ead
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 d07ec62bc8d5..0118d3534758 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7ec9bc3abc66f8761e6a103391676c1d
diff --git a/metadata/md5-cache/dev-java/netbeans-dlight-8.1 b/metadata/md5-cache/dev-java/netbeans-dlight-8.1
index 578370916a5a..8a5cf7ecb340 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6e1c57eb286a40e932534f004fd40461
diff --git a/metadata/md5-cache/dev-java/netbeans-dlight-8.2 b/metadata/md5-cache/dev-java/netbeans-dlight-8.2
index 5596b484c287..3250bccc4d66 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8dadab5851f44fb1e23de731ff539e9f
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 9b83200c3907..ee1d452296a4 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=262de79e23fc8839b57c23b46d32cf1a
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 86e6544e926b..fbaf5b1819c6 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4cd505235cdafd609dd662d845edf163
diff --git a/metadata/md5-cache/dev-java/netbeans-enterprise-8.2 b/metadata/md5-cache/dev-java/netbeans-enterprise-8.2
index c25ab3efcff5..e3285c03833f 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cd9f28c32f55140a893265cfc8e7bc33
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 829c72be08e5..834a89fd3848 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d3fbe314b7787c66e13125b1fca0e119
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 db114d43beac..5fa09fe71c62 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=714c20ba241e63909e860b48fa681adb
diff --git a/metadata/md5-cache/dev-java/netbeans-ergonomics-8.1 b/metadata/md5-cache/dev-java/netbeans-ergonomics-8.1
index 367318e45ba6..a8902a6945bc 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=141c76840c7d7b4620f6195b0192c66c
diff --git a/metadata/md5-cache/dev-java/netbeans-ergonomics-8.2 b/metadata/md5-cache/dev-java/netbeans-ergonomics-8.2
index 0e55abf104cd..451d202e09a3 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=781a3def92a503c2e5324677abcdd90b
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 35dc392fc239..9659053a2316 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5c0c72b69db9ada1bb363dc1f8269c50
diff --git a/metadata/md5-cache/dev-java/netbeans-extide-8.1 b/metadata/md5-cache/dev-java/netbeans-extide-8.1
index 769a43b584c3..5cf49f921f62 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=502a3f75c38eab65820b97570b40b59a
diff --git a/metadata/md5-cache/dev-java/netbeans-extide-8.2 b/metadata/md5-cache/dev-java/netbeans-extide-8.2
index 1cd55cbabec0..9359336f87ce 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b3331b66f11f7958a0cdeeab9c1fc701
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 e73a09671084..5479c658fd0a 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a9de35b75eaeefd6b443d48c8fb32485
diff --git a/metadata/md5-cache/dev-java/netbeans-groovy-8.1 b/metadata/md5-cache/dev-java/netbeans-groovy-8.1
index 2daaa0f27df3..c52a1969f56b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5108480e1d8478cc8d92f5c2a5e4c047
diff --git a/metadata/md5-cache/dev-java/netbeans-groovy-8.2 b/metadata/md5-cache/dev-java/netbeans-groovy-8.2
index 4fdd422e3719..93a26fea6c96 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=852ec96e7de6f546fa935344e71b10f8
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 df83e1e49e87..3279f00885cf 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=076b67863ace010e0de53fcc094acdb6
diff --git a/metadata/md5-cache/dev-java/netbeans-harness-8.1 b/metadata/md5-cache/dev-java/netbeans-harness-8.1
index 3bf006d5a98a..4f63cc5019d3 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1775ba1e4b62d6fc2de5555320310590
diff --git a/metadata/md5-cache/dev-java/netbeans-harness-8.2 b/metadata/md5-cache/dev-java/netbeans-harness-8.2
index cc8961f69880..4b1c59a32a19 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6887b412ede762ab7a019442094a619c
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 d9535f87dc6f..39d994795925 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c744eb346e399a9da2173590b6bd722a
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 bd7a8a757c0f..721b353658ca 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4b3a8880a8ff058407346f180e79f477
diff --git a/metadata/md5-cache/dev-java/netbeans-ide-8.2 b/metadata/md5-cache/dev-java/netbeans-ide-8.2
index 6f51688ff886..5154faa66bf2 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=31c8bfe47a59ef7b04551eec06082e77
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 fc2108d2a962..33044ffc7c89 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=144f1ee833ae058ebd219c9d4d756cb6
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 ebc898753f17..33886bf1864a 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3b273aa00362325e57d31e17064fcb97
diff --git a/metadata/md5-cache/dev-java/netbeans-java-8.2 b/metadata/md5-cache/dev-java/netbeans-java-8.2
index bd7e9b6ccdfe..819ea34683b1 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2ffec8e827e5bda7972bdbda2b9515fb
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 e8250ca92ab2..6138bc78e70b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9dcfe9529b8ab3daa037b0bae903063f
diff --git a/metadata/md5-cache/dev-java/netbeans-javacard-8.1 b/metadata/md5-cache/dev-java/netbeans-javacard-8.1
index 61659e4ef40f..1475f0d99f08 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=33c6b992c6c0c3c4b8c0398ef9db5f32
diff --git a/metadata/md5-cache/dev-java/netbeans-javacard-8.2 b/metadata/md5-cache/dev-java/netbeans-javacard-8.2
index 8a517f7411d4..cdb7899a1425 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a18aae00d561c707f46589f03d37310e
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 19033bc28420..a0504ca2233b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1b84223117e5b4ae020f733b57a83f46
diff --git a/metadata/md5-cache/dev-java/netbeans-javadoc-8.1 b/metadata/md5-cache/dev-java/netbeans-javadoc-8.1
index 2a104d521727..adc7b1c4c18f 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b772ce2ba634ad44a2db22b9936bba3a
diff --git a/metadata/md5-cache/dev-java/netbeans-javadoc-8.2 b/metadata/md5-cache/dev-java/netbeans-javadoc-8.2
index 9cc840e70a0a..9d9488342e3b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=011698dc441f05f8a9a85b82086af21d
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 6611abf0eb4e..1f4b697ac38a 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c1d49985ca3124606ed7683f2f0329ea
diff --git a/metadata/md5-cache/dev-java/netbeans-javafx-8.1 b/metadata/md5-cache/dev-java/netbeans-javafx-8.1
index b13115862c0c..6d699d1ba1f3 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5f25fcf0be1f7bffb68932643090cc47
diff --git a/metadata/md5-cache/dev-java/netbeans-javafx-8.2 b/metadata/md5-cache/dev-java/netbeans-javafx-8.2
index 9ab6f252c28b..a65a82de2c51 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=08cbe57a5325b1de121456f8380ee83c
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 3a324c4a3790..86d40f1c2917 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8ca0b108c05f3daf1aa9a38aa2d482a3
diff --git a/metadata/md5-cache/dev-java/netbeans-mobility-8.1 b/metadata/md5-cache/dev-java/netbeans-mobility-8.1
index e050cff945fb..7c15e4c6c47d 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e4049aa5909ed0c5679c9a2acbeffe3b
diff --git a/metadata/md5-cache/dev-java/netbeans-mobility-8.2 b/metadata/md5-cache/dev-java/netbeans-mobility-8.2
index ed1fe9a7f12e..4ed104dfaab0 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ba56537c82c578c392df4e721227f23a
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 97efc0bee4f9..9aa4c6250887 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3be46a2ad57386b1eba7711e4c908054
diff --git a/metadata/md5-cache/dev-java/netbeans-nb-8.1 b/metadata/md5-cache/dev-java/netbeans-nb-8.1
index 0d58f0963b37..9cd815e67e64 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8969a75da43f417b6d7c0ee9365695ad
diff --git a/metadata/md5-cache/dev-java/netbeans-nb-8.2 b/metadata/md5-cache/dev-java/netbeans-nb-8.2
index 5951e9b9d109..e62e110a24b2 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=392fee8be8f5a29f0e4c08a0a0e843a6
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 291323dae77b..39680fe77d90 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a6ba3691c8e974719ba49dbb2c9d057f
diff --git a/metadata/md5-cache/dev-java/netbeans-php-8.1 b/metadata/md5-cache/dev-java/netbeans-php-8.1
index 5d3e73006cea..28b82fe2dd0b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bd72b6cba4b283df8d7cc2674417c9f5
diff --git a/metadata/md5-cache/dev-java/netbeans-php-8.2 b/metadata/md5-cache/dev-java/netbeans-php-8.2
index 761f93cce23a..60bbd97a18ff 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=172ee28746f9f6f2ffafe14ac80e2ee9
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 d80005091118..ebc8208ed0e1 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ca9086807a9ed3d351e05ba4493109e5
diff --git a/metadata/md5-cache/dev-java/netbeans-platform-8.1 b/metadata/md5-cache/dev-java/netbeans-platform-8.1
index af9129f1ec66..e90db7af669f 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=20e4b405bb7944ac44e40053a6fc11cb
diff --git a/metadata/md5-cache/dev-java/netbeans-platform-8.2 b/metadata/md5-cache/dev-java/netbeans-platform-8.2
index 34ef58a5141c..bcbae1e9dfd3 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e0be611bd99280becf54bed7178f366c
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 45362ce382e1..b4d3d5b31d5c 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d82ea95d503961ec51b4faf691376974
diff --git a/metadata/md5-cache/dev-java/netbeans-profiler-8.1 b/metadata/md5-cache/dev-java/netbeans-profiler-8.1
index 6e1080a57ee7..9c5bf1beb6e0 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d941f913768baf899f3cbf5ddf9cd6c2
diff --git a/metadata/md5-cache/dev-java/netbeans-profiler-8.2 b/metadata/md5-cache/dev-java/netbeans-profiler-8.2
index 39101e5f55c4..bf3bac063226 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b33d2bfa023b6f9e9c302572af9d7e73
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 0ac3960a65d0..425baf681b90 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1f8262fe7756574239b3985f7219fd21
diff --git a/metadata/md5-cache/dev-java/netbeans-webcommon-8.1 b/metadata/md5-cache/dev-java/netbeans-webcommon-8.1
index e168b3f1ad9f..d5e719552e63 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fe29ed376db1002a5cfa9b18caae5af0
diff --git a/metadata/md5-cache/dev-java/netbeans-webcommon-8.2 b/metadata/md5-cache/dev-java/netbeans-webcommon-8.2
index 846dd6073587..a0074c5858cd 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1df78c06cbfed657fdeac3bc1be17b7c
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 a361519df7d9..eebaa6f90d47 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9d908a8ef3e1e43673714ecf8795cf99
diff --git a/metadata/md5-cache/dev-java/netbeans-websvccommon-8.1 b/metadata/md5-cache/dev-java/netbeans-websvccommon-8.1
index 9673e93557f2..34e55e08154f 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=968b8c1faca1adb7cc8b6894cdf6c870
diff --git a/metadata/md5-cache/dev-java/netbeans-websvccommon-8.2 b/metadata/md5-cache/dev-java/netbeans-websvccommon-8.2
index 5ada91db91e9..aaa46d583870 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bf6e4d0a3f25b608e57a2697d0aa317b
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 5aaba672f4bf..550b4ee9bc0b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=46ea591e489767e3fc88c34cf9ed4030
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 858b2be273f2..5a25f607aff8 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ddb03926af2a4c44eb87d2afa2fc0e39
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 f3dbb7d61d9e..1b00d04da3fb 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0110981822e6b2074ab33bb293cc07f4
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 ee285362cd95..e521e3173aa7 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0e86c5424fb44d744cd5e9985d1e1972
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 bba6cd4f9179..dd894a61ebaa 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3a13d2f31aa1d5a4ffa91e8d123b0827
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 c172df6631ea..d0204413f7ce 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8e455ce84ea31a00fd71de2b912d4718
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 b6638cee2122..2f03600cbb21 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f121a50b7dcca8cb8b1f1fda277d44ed
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 2bea5aa01217..ca8d6c48be57 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e01cb30ac4a9b3f8a328dc0379d70f49
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 6f7e27b2b8b3..c2aae8231905 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=215c26588b34d98c47b103e0b931e0ff
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 8fe694af55a1..bc3bb267b13f 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=949b3fb3bf5d353e894552a062c07f0a
diff --git a/metadata/md5-cache/dev-java/neuroph-2.3 b/metadata/md5-cache/dev-java/neuroph-2.3
index 8c623ea01a48..e23e7af82859 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a6c971d4df73a15ddbdb3480acdb518c
diff --git a/metadata/md5-cache/dev-java/neuroph-2.3.1 b/metadata/md5-cache/dev-java/neuroph-2.3.1
index 4ca090830fea..21b8fb9cf1bb 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a6c971d4df73a15ddbdb3480acdb518c
diff --git a/metadata/md5-cache/dev-java/neuroph-2.4 b/metadata/md5-cache/dev-java/neuroph-2.4
index dc7e12e8c2cd..83f6a3478084 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2b2573a719373a87554793315f934e2e
diff --git a/metadata/md5-cache/dev-java/objenesis-1.3 b/metadata/md5-cache/dev-java/objenesis-1.3
index 22ebde008583..c0650c4ba36b 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ee6b7ef31c45723b36de97a15754bf93
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 50c403c30c1d..f96e19264f53 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e5ee4b04840ad7d9ad297f964c557559
diff --git a/metadata/md5-cache/dev-java/ognl-3.0.8 b/metadata/md5-cache/dev-java/ognl-3.0.8
index 349927e07982..cd634771e1ec 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7e9c52173e4ede9a5bcebdcb6b85930f
diff --git a/metadata/md5-cache/dev-java/okio-1.11.0 b/metadata/md5-cache/dev-java/okio-1.11.0
index f484f13fc944..658bfaf2279d 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5b2aa2da4dacfd8ffb8cab89b0b758f8
diff --git a/metadata/md5-cache/dev-java/opencsv-2.3 b/metadata/md5-cache/dev-java/opencsv-2.3
index 907f99d90d80..69635c43ac8a 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c2097cd0ee7fac37cfdfec7428afa4f4
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 545be9e8d9d6..8cc02b6b9405 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f798296bdbc6fbe83623d98a005d1397
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 54b0c9c81a51..02c29706e6b1 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9a280282b09392b9e45f9258851f1b92
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 6ea4b71222d7..526855f2e067 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9a280282b09392b9e45f9258851f1b92
diff --git a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.111 b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.111
index 451cf5380925..277244cbde84 100644
--- a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.111
+++ b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.111
@@ -12,5 +12,5 @@ RESTRICT=fetch preserve-libs strip
 SLOT=1.8
 SRC_URI=arm? ( jdk-8u111-linux-arm32-vfp-hflt.tar.gz examples? ( jdk-8u111-linux-arm32-vfp-hflt-demos.tar.gz ) ) arm64? ( jdk-8u111-linux-arm64-vfp-hflt.tar.gz examples? ( jdk-8u111-linux-arm64-vfp-hflt-demos.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	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	c8b4e8309c59dc750e862fc8a2fec671	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	c8b4e8309c59dc750e862fc8a2fec671	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=158d634c9df7e859e55098439fa45c50
diff --git a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.112 b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.112
index 61ecd4d5ab5a..e785027c894f 100644
--- a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.112
+++ b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.112
@@ -12,5 +12,5 @@ RESTRICT=fetch preserve-libs strip
 SLOT=1.8
 SRC_URI=amd64? ( jdk-8u112-linux-x64.tar.gz examples? ( jdk-8u112-linux-x64-demos.tar.gz ) ) x86? ( jdk-8u112-linux-i586.tar.gz examples? ( jdk-8u112-linux-i586-demos.tar.gz ) ) x64-solaris? ( jdk-8u112-solaris-x64.tar.gz examples? ( jdk-8u112-solaris-x64-demos.tar.gz ) ) sparc64-solaris? ( jdk-8u112-solaris-sparcv9.tar.gz examples? ( jdk-8u112-solaris-sparcv9-demos.tar.gz ) ) x64-macos? ( jdk-8u112-macosx-x64.dmg examples? ( jdk-8u112-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	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	c8b4e8309c59dc750e862fc8a2fec671	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	c8b4e8309c59dc750e862fc8a2fec671	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c2931e63174f315cafa42e009b8ce3df
diff --git a/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.112 b/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.112
index 45c215ff32f8..3a3d9f9b0bb6 100644
--- a/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.112
+++ b/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.112
@@ -11,5 +11,5 @@ RESTRICT=fetch preserve-libs strip
 SLOT=1.8
 SRC_URI=amd64? ( jre-8u112-linux-x64.tar.gz ) x86? ( jre-8u112-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	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	c8b4e8309c59dc750e862fc8a2fec671	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	c8b4e8309c59dc750e862fc8a2fec671	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9592d6bf373fb7649b63b4aa4e77fb18
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 f635d2f68cf0..5e4b983deb75 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a5cbe5068fec521f198546094f7d7917
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 9a4fbc497737..7dc83d85e016 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=87bebd688491eb43562769ed9a925e90
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 72144f990b9b..308e996dcf35 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b959a33bfa87f26a6ca1d8be5e7c6ba2
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 bf20259dcf43..349d3c8f14b0 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3124a4eeb9a314ecfa02853204dbf22d
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 0d7d2fa28c55..ca6ef9c465f9 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b1e08d4a8ae241982edc047368dfc5f9
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 8e4f688e3e44..a570401b3de3 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d22b32945e569a7eca9a98389b09f576
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 f0e2d9339040..a737d6f2dd7b 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8cc333e2513945b96d32e9e5fb2a0dc3
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 56db22645fae..c75a1e6ce169 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=75940c07ac4cd067385d3cac92c0d13c
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 07e58a2e4673..b85c4390dac2 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bc5b25726b4b5648f5dde138ce0a3415
diff --git a/metadata/md5-cache/dev-java/pdfbox-1.8.11 b/metadata/md5-cache/dev-java/pdfbox-1.8.11
index 658236248193..247ef6a2e5c8 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cb37e3ba6cd23a9da13e035b84c0705c
diff --git a/metadata/md5-cache/dev-java/piccolo-1.04 b/metadata/md5-cache/dev-java/piccolo-1.04
index 53dc73b1631e..1f65a62d0c69 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=94b8a72b1c6d61286dd977210d3fa832
diff --git a/metadata/md5-cache/dev-java/piccolo2d-3.0-r1 b/metadata/md5-cache/dev-java/piccolo2d-3.0-r1
index 928f82b6e63d..47a0f9997955 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=115320394394574bb4edd675befc1f98
diff --git a/metadata/md5-cache/dev-java/picocontainer-1.1-r1 b/metadata/md5-cache/dev-java/picocontainer-1.1-r1
index e3947374adc9..b6752631679c 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d44a14ca1ac0235716e90cebd2671d57
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 ef6c959fd72e..d4c228f7c0c3 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b450e3fc2dbfb057baeb16d28f76e26d
diff --git a/metadata/md5-cache/dev-java/portletapi-1.0-r1 b/metadata/md5-cache/dev-java/portletapi-1.0-r1
index e5a377919a4a..70b0d96e6e8d 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=39ec7a56487207ab68b3c7908c6f10cb
diff --git a/metadata/md5-cache/dev-java/portletapi-2.0-r1 b/metadata/md5-cache/dev-java/portletapi-2.0-r1
index 67e74cd21eea..3926ebacc057 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0a800a6f69ca96a88493b2079c6c1b7a
diff --git a/metadata/md5-cache/dev-java/prefuse-20071021_beta b/metadata/md5-cache/dev-java/prefuse-20071021_beta
index ecd363dfd0ec..776d38b4295d 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d4947f5d8d105497807527a7340fa61e
diff --git a/metadata/md5-cache/dev-java/proguard-4.5 b/metadata/md5-cache/dev-java/proguard-4.5
index 5e5c74d0c95c..fec53bbdf9f5 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a9bcb7ff7ff6b3b83a0990767503d5f6
diff --git a/metadata/md5-cache/dev-java/proguard-4.7 b/metadata/md5-cache/dev-java/proguard-4.7
index 7482d464cd68..1e12acb7f69c 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7aebdf33867b15f0bc88c18c953622cb
diff --git a/metadata/md5-cache/dev-java/proguard-4.8 b/metadata/md5-cache/dev-java/proguard-4.8
index 9af18abb43b3..dfe17a080e59 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7fa22d791a1896cf4da6d182a60f41ad
diff --git a/metadata/md5-cache/dev-java/proguard-5.2.1 b/metadata/md5-cache/dev-java/proguard-5.2.1
index d70dded1e699..7a4d72c4117b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=46cebf5d1695ed950d1b37019380faa1
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 a1e6c461ee6d..61d12a3b568a 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=17e083bc3e700116d6b2eb241e3e3c68
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 185e49663481..cf187362266d 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=af2ca79360dc08a1a414c435ba61cd47
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 63991b9368d4..e84fd0f69ef8 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f4a5fc0eeb1e71c3b7a9b62d19482855
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 7e6495afe413..fc187224b950 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=be844aa21e61bb387ae2ef62db06cd0a
diff --git a/metadata/md5-cache/dev-java/qdox-1.6.3 b/metadata/md5-cache/dev-java/qdox-1.6.3
index 7d0443e6b9f0..df5dc1e2cc2d 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e32b202031a87f55238ee71686aa74f9
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 66a3efc731d3..20b1ca3d2d21 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6256687cb4ae1104a6abe855f7ea7665
diff --git a/metadata/md5-cache/dev-java/rat-0.11 b/metadata/md5-cache/dev-java/rat-0.11
index e678509e023e..186f014994a6 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b21df9c8fca62fb6c809dcd5dbd98a14
diff --git a/metadata/md5-cache/dev-java/reflectasm-1.11.0 b/metadata/md5-cache/dev-java/reflectasm-1.11.0
index 74f4c8be0361..f637d6eccd59 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ed6488b51448e558965534907bd4dd4f
diff --git a/metadata/md5-cache/dev-java/reflectasm-1.11.1 b/metadata/md5-cache/dev-java/reflectasm-1.11.1
index 81cd57a9439b..cf609e52874f 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=72120022cb289cd6ff19eb9b09b0c8e9
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 8db7096123b9..3be4ca8a2eec 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=38b1ca769cda546cb17e9b7be8819079
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 c3c790f305d8..165437aec5af 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5f6f0778869d1c2d83ab9b1d229e3641
diff --git a/metadata/md5-cache/dev-java/relaxngcc-1.12-r3 b/metadata/md5-cache/dev-java/relaxngcc-1.12-r3
index 7bbe5f2c8794..5096300bfc2b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3371896072d9a4b6a62c6e64e3cfa786
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 cf69a4e88fe8..b808c851eb06 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e18a3aa4f5344d81b13837d58b8f7ef7
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 861b6205df3d..d763d6873045 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ec05d88ee8aba5b1fc37f39348899193
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 3bad89b3b029..cae756458116 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=38a531da017257d50c3a72a6fa69bfa1
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 438d8508b02c..3fcc9ad71bdf 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=abc8671627c6f92619379d092b5d4921
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 33e0ea0c0c35..32314bf871b7 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b0b50a6bc7f359c7b6bc285c80b53591
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 4cdb608a4262..63f5adb2f73e 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b0b50a6bc7f359c7b6bc285c80b53591
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 25c1bbac0f94..9efaab66d55e 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d6647bef205f3a39c48629f99ed1164a
diff --git a/metadata/md5-cache/dev-java/rngom-20100718-r1 b/metadata/md5-cache/dev-java/rngom-20100718-r1
index 0044999c4f95..0ba2c08d3196 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9f284728cfa064702c369e49ebfc3510
diff --git a/metadata/md5-cache/dev-java/rome-0.9-r2 b/metadata/md5-cache/dev-java/rome-0.9-r2
index 94c14713a7cc..816c87d93187 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2cdc1699237ed43a9c9dd25b61ddeb4c
diff --git a/metadata/md5-cache/dev-java/rome-0.9-r3 b/metadata/md5-cache/dev-java/rome-0.9-r3
index 8c05292e8ee6..1eeb08f80cd2 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4585ebed65b07f1b5654c96f9e2f0382
diff --git a/metadata/md5-cache/dev-java/rundoc-0.11-r1 b/metadata/md5-cache/dev-java/rundoc-0.11-r1
index d59b1bb47f08..ea984a19a350 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d52ee7001e62bf0ac0d3958884187028
diff --git a/metadata/md5-cache/dev-java/rxtx-2.2_pre2 b/metadata/md5-cache/dev-java/rxtx-2.2_pre2
index 9d07fa7abc16..645812701107 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ac49d7d906489912fc479f082e6c75e1
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 4c5d7a79f429..4a0cc24dad76 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=384c9f6c6e1f77752f3ae5af251ca97d
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 f6ff1c9cba53..798c46d53e26 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=06eaceca0471648ee6c132ae80b9cb64
diff --git a/metadata/md5-cache/dev-java/sablecc-3.7-r1 b/metadata/md5-cache/dev-java/sablecc-3.7-r1
index 541af23b27de..bb7d3a874e4b 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0f04d5d0d18705750209aef2ce621140
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 911b118ea536..d00c4658dc81 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=57b4cee6f799b906da21d31bc8783356
diff --git a/metadata/md5-cache/dev-java/sac-1.3-r2 b/metadata/md5-cache/dev-java/sac-1.3-r2
index 961b14814c10..e8b05d44c4c8 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0d47167c6c38642c0f097d200919c14a
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 afba3d4c0d99..d104e0672b12 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c418055e4e093a09b741c819ec442c19
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 8ee15d45b080..708a549c16d8 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4ede27a2d6bcc023dfd172f5c0473454
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 2495b278893e..5ad20926c1b2 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4fcd6408c60589002a71ed69e1b1e33b
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 a9e6931bf28a..80e771837780 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4c7f1203fc1477ad5ec7ddf860db6124
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 dfc4838fcc11..2958366b8e66 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9f51d9314866032f45da5ede88542563
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 7e6c5e3c5b5e..6ef19e17f2cc 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1351f0315e35306dec977af40e33ec8d
diff --git a/metadata/md5-cache/dev-java/saxon-6.5.5 b/metadata/md5-cache/dev-java/saxon-6.5.5
index 17540bd2e481..ae5ef996aea5 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ef1ff799914606dd8dd192131cb25026
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 62aa9f280cd9..341513f01334 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=68eba903909a4ce7e2a825cd56facec7
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 0f5d007acc0a..75c5f774f24d 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=32c6cdd6dd269b2d21c32ce81385ef31
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 f6f69d25cef4..03b414b85c6b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e04629f2c7117e620655d17624504131
diff --git a/metadata/md5-cache/dev-java/saxpath-1.0-r2 b/metadata/md5-cache/dev-java/saxpath-1.0-r2
index f9518383729e..fdf5e8673e4d 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cd341cbb6af19df4030317ca995f59f2
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 cdc79e9f8f31..160f5b859878 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aef68072b3a3704b9e2644397d522cc5
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 6d4d2412311c..07a641e4d18b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=df26676baabebfc5e54b983086cf2b74
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 5008c3ffc9db..60b833717c44 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=20f1fe2eaf98d99bd8767e22ee8665e4
diff --git a/metadata/md5-cache/dev-java/sbt-0.13.11 b/metadata/md5-cache/dev-java/sbt-0.13.11
index 21d32a981d66..c993f61f83c6 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=01313637f0ec4ff32d1058420f20bfeb
diff --git a/metadata/md5-cache/dev-java/sbt-0.13.13 b/metadata/md5-cache/dev-java/sbt-0.13.13
index ef368731ad6e..65528128a568 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=996ee038b46f04a95787c02c9cf8398c
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 97518d79e959..ec8b32b75a97 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a855e4f7c73a9ac45b1f5ac3a612163b
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 72117d0959b6..8001120c565f 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=df7955c5df478eefe79f2a7b440afa05
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 4af26e924353..2c327aed6d28 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=df7955c5df478eefe79f2a7b440afa05
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 2d5c84460e30..da7d81daa880 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=df7955c5df478eefe79f2a7b440afa05
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 66bb78fd86c1..c9ef1179de37 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=df7955c5df478eefe79f2a7b440afa05
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 fc906ef7cc79..43fd7e8db9b6 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=df7955c5df478eefe79f2a7b440afa05
diff --git a/metadata/md5-cache/dev-java/servletapi-2.2-r3 b/metadata/md5-cache/dev-java/servletapi-2.2-r3
index 3468e801f04d..b3ee2e06659b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3ed79e5eeac15cde7b26b0c6048f17ea
diff --git a/metadata/md5-cache/dev-java/servletapi-2.3-r3 b/metadata/md5-cache/dev-java/servletapi-2.3-r3
index f53bce3a4b60..304f7f76c439 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f7f05c895ec1cee883e51648bf94e8ec
diff --git a/metadata/md5-cache/dev-java/servletapi-2.4-r5 b/metadata/md5-cache/dev-java/servletapi-2.4-r5
index 7ed27e13f9c3..f2418ab21541 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=77070ad57d1ece6b6ee1b6d357b47d28
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 f7647357ee37..9ff34b66dcd5 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=946f47176c6cee03018bfa28694ba980
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 79ae44a99173..e55a0710938d 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=be0dd21b6271863af5fd5e7a932e8210
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 de65a959eaf2..04a769d4086f 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=66d680652c99d69c7bfce5fa203fb0f6
diff --git a/metadata/md5-cache/dev-java/skinlf-6.7-r1 b/metadata/md5-cache/dev-java/skinlf-6.7-r1
index 66a25c1572cb..d577cae0625c 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f918fe4e919f13da303bf012daac7013
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 9a18d122ef25..147ec80f9c5b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4227a46ca6de3450f049809d6911cb4d
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 de019ea6b490..362797e12990 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=41c7c67d524602719fed1dd29525d133
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 fab8b8e213ba..4eaf352707ca 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a3594b3fbcbef7f2df2f979d304ef9c4
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 605fd25fd134..d3109133bc1f 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e0284b80167957f1f490ac9c617fa141
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 aabfaa07c854..11668b1804b1 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9dcff2dc8d1ab47f7c522a174af5d363
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 7fa908194cc5..e5f199dafa84 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=08ca7e2fe1bb27cacf5494f369806864
diff --git a/metadata/md5-cache/dev-java/smack-2.2.1 b/metadata/md5-cache/dev-java/smack-2.2.1
index 3f95af0a7d0f..b5a25a8051e5 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b85edb896e5c4c0f66bc6799ad313c1a
diff --git a/metadata/md5-cache/dev-java/snakeyaml-1.16 b/metadata/md5-cache/dev-java/snakeyaml-1.16
index 8b383df05a96..c0a6f3df8768 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=db8fdb6df1567afc1e097e56b7803993
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 f1ca6748d131..b8ad9e831768 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f9a8d3361ffc457fa6a635b7e8a41856
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 b3e7f39263f3..872ec4d8151e 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5f1fda4025885b655017f70776c1edfb
diff --git a/metadata/md5-cache/dev-java/snip-0.11-r1 b/metadata/md5-cache/dev-java/snip-0.11-r1
index 060e0166e039..77c9c505f750 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d52ee7001e62bf0ac0d3958884187028
diff --git a/metadata/md5-cache/dev-java/spice-jndikit-1.2 b/metadata/md5-cache/dev-java/spice-jndikit-1.2
index 9ab79461d6ab..840ffb4949d3 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1d1c86a557572982757791818df0a8f5
diff --git a/metadata/md5-cache/dev-java/spice-jndikit-1.4 b/metadata/md5-cache/dev-java/spice-jndikit-1.4
index 730d8dfa3ddc..eeba275999ff 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b448c8ffa85ac9f46dedb33f3dd6da8c
diff --git a/metadata/md5-cache/dev-java/spin-1.5-r1 b/metadata/md5-cache/dev-java/spin-1.5-r1
index f3382abf35ad..963eed2a3224 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1e8240fc087afff2edfe2d1089678c03
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 27b3f00d431e..c81c643c688a 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1fcae0a87eaa2af3236bf17cf4f9a17b
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 2cfb08edb4bc..bedb26def468 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1b0fed8113df1f7dbf797f74c5af827a
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 1dcb8448f676..a22fabde7f19 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1d2070d296fde4ac566f1ae802c87221
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 0df54faae87e..37081ae3f65e 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f502aefaacd88d85cdd2311d557d465d
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 d7e03407b78b..dd84267a5a0f 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fca57445c1e215019076a33820e67549
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 a42640d7c001..814e3a778903 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6014c683cd4a6ce1f8470c53f1574a08
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 633d36e5997b..4cab14883808 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2c12f76a460bbdaa2fa202bb320f4adc
diff --git a/metadata/md5-cache/dev-java/stax-1.2.0 b/metadata/md5-cache/dev-java/stax-1.2.0
index 09513728d342..51642074a40a 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2aa5242d60065388a09e5c552cfc8e69
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 cc08a5b1b0fa..0368389b9533 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=db0ada23352c23e0b1e717d97ce9131b
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 cf7266d78d05..124886485b7a 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b2a6a7b78a9404a2161cfbb074494d66
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 984152a78cef..6fe4cab5fa39 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6731f900c29d4828565f8d23eb60946c
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 1298da066e66..78d0f5faebec 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=027e96fcad1fea5f16036ac75e7d6f2f
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 797be3d0b022..fb571340c9bd 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2fc463cf45d7127b4206ce3bd2647369
diff --git a/metadata/md5-cache/dev-java/stringtemplate-4.0.8 b/metadata/md5-cache/dev-java/stringtemplate-4.0.8
index 009fb26f3a99..a5c99833605d 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f331874920cb82a251bc3608c2b6504a
diff --git a/metadata/md5-cache/dev-java/sun-dtdparser-1.0 b/metadata/md5-cache/dev-java/sun-dtdparser-1.0
index bc84fe2c2631..3e0710f74e4c 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ab8dc3dd4e4dfe5db1d9eb1acb169609
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 1dfbee41a8b3..5681b829217e 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5c53142dbfd9240bc010ede57c5af74b
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 1f8d649a84dc..a4892a67f458 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3b76b8562ca7598d156ca01d488ab41d
diff --git a/metadata/md5-cache/dev-java/sun-jacc-api-20070102 b/metadata/md5-cache/dev-java/sun-jacc-api-20070102
index 1acdb092f616..c99d24711c55 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f4e7a58863223c22814974ac619eea7f
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 0e7e4a51f780..aa6f25992378 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2d6019ebc768b509d98ade96c877a03d
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 6acdbac4c9d2..9d9b0f68dabf 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5c347e6977e6f3c484c1e2800e08b7d7
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 e23af0bd534c..f1202c9457b6 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=47c16bd5b376ab623a096e44a91ef6b0
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 7a84778365e1..6f79f81967af 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=76e368e98b4efff43c92478802102207
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 1d62a928fff4..8353f32fdf35 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4929950fd5d66b9062dc1f2d4d9cb9e7
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 9c585e75f1cb..c25a5bf0ac8e 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1751f73b2e843025e18ddd17ee33ba83
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 da0c3da162ee..62d8bb7df672 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3659f12919f24ae121afa7191cd4b14a
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 1447de3d43a9..702ec3f09367 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ce74481a9019ba34b10b8f9321a01a7a
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 37e792b59e8c..a2fa8001de60 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=75575d49508a212befc48df6ec71329a
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 cd72d711bbbb..db17e902f80f 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=32b43285af7963c21b749c038d05a03c
diff --git a/metadata/md5-cache/dev-java/svgsalamander-0.0-r2 b/metadata/md5-cache/dev-java/svgsalamander-0.0-r2
index 828d87972f21..16750701c701 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6a9003313e7875ba4592d6bfccd31956
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 a29b0e024864..67b41626a736 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=abbee118fd7a8a559e993d33fa6ee451
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 5abe65703da5..18718e121681 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d6807a2eb5f38398372d2b8610ebf338
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 cafeab9700f9..b60c9a17dad1 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=46678f73521688ae4c80f5f330bd3ed5
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 e7725cb6f8ef..745f2e54bdd3 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=604156773d48abd2b7ae0e4fafd84bed
diff --git a/metadata/md5-cache/dev-java/swing-worker-1.1 b/metadata/md5-cache/dev-java/swing-worker-1.1
index 03c80ffba663..69a14e635e5b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=31345c40027c9f0f2db3c696dbf3cb03
diff --git a/metadata/md5-cache/dev-java/swingx-1.6.4 b/metadata/md5-cache/dev-java/swingx-1.6.4
index de9b1e13da3e..f9c03c01c6b4 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=26fdf53ff50721170c5904ec3b4321f0
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 8050a6c6a544..ea2d7355b049 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ab42c80589e0b3f63d1ffe76897dbffb
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 32e0a53a63d9..39f6ab59c07e 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=49c9546704af6d99ba57f51b2029db39
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 8c3dbd0ad2b5..2d98dc06e4b1 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5ea8e2bcb3f6344b562bc826fb4c2134
diff --git a/metadata/md5-cache/dev-java/swt-3.5.2 b/metadata/md5-cache/dev-java/swt-3.5.2
index 550ead2d37e1..aa836cc28aee 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0457149633ffb5fb918cdf49530d1990
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 63a649b2615f..7a1888239f7e 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=27ae35f62b7e08037de54768bd141555
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 9bdc0fe17123..b61bc77b1ab4 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3fb7c7976287ea7cf948f9ebf7b24684
diff --git a/metadata/md5-cache/dev-java/swt-4.2-r2 b/metadata/md5-cache/dev-java/swt-4.2-r2
index 5d1a3639d336..2fd69da27163 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	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0b8ff4dd0db3498be737851d3c80b116
diff --git a/metadata/md5-cache/dev-java/tablelayout-1.0 b/metadata/md5-cache/dev-java/tablelayout-1.0
index 903dd54d89af..7f50890ceecc 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3d60698d511f372f7a7693e511352134
diff --git a/metadata/md5-cache/dev-java/tagsoup-1.2.1 b/metadata/md5-cache/dev-java/tagsoup-1.2.1
index d7ecc6847cfc..bd21efe00a13 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=619ddb376ad063b7ed15efc56d528e59
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 d0c2048707f2..414fcfc08a76 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8cb4d09b3ee84b5bee3c8fd727db6183
diff --git a/metadata/md5-cache/dev-java/telnetd-2.0-r1 b/metadata/md5-cache/dev-java/telnetd-2.0-r1
index f711e5d45f7d..83c2088e2d30 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ec82285d1fe4155289dcea02e2c129c2
diff --git a/metadata/md5-cache/dev-java/testng-6.9.10 b/metadata/md5-cache/dev-java/testng-6.9.10
index 75e98bb4eeb9..c1fe11335a0e 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=da7407597d4d692f11853b3e29ebad88
diff --git a/metadata/md5-cache/dev-java/texhyphj-1.1 b/metadata/md5-cache/dev-java/texhyphj-1.1
index 21c5b6b00a72..32a3a68844fb 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3ac3b5292e0eaa834329d5a0fdadb368
diff --git a/metadata/md5-cache/dev-java/tijmp-0.8 b/metadata/md5-cache/dev-java/tijmp-0.8
index d1bf2b598a32..734750e2d9bd 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1ba8db266288470cdaff33bca5c05540
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 ce091a77e257..6ac74dca2e82 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=979af093c2b878620e88678b15c05719
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 11ec0659e9e9..5e25483ae70c 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7132e1c957bb23272ba1615a92f1fe9e
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 4215f1bd7037..6252d86730d7 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=62322babe2b7ff15b5d080b0332ee9c4
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 cbeab62957fb..762113075062 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c57fe347dce9abaf7a0118438579f358
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 fad66cfa2d84..b3cf858bcdf1 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=42d13e610237092fda506730ec915a94
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 144ff0086b71..a108621b5751 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5f475fb38cd35a906322591e437696d3
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 b477b40a085f..58e091be8d58 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=42d13e610237092fda506730ec915a94
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 6d94df6ea8ed..5f90d13e22c3 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=759606736750c1d5b194f953baac473f
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-3 b/metadata/md5-cache/dev-java/tomcat-servlet-api-3
index 07012dab2ed3..cf466aa574b5 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ee98c2c33b29665c3876707b0fc7b6de
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 b494843d1701..45e455333407 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2b7fb10ac076b4b52269a907aa87eb07
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 6a402bbe09c9..7a77428ef5ee 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a516340efdce34ad4d886a2df409fd6e
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 6a406a41dd11..a80542b8ef24 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=353c4bfafc81d6fd39fcfa4a9a5c014b
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 895ead613ac7..bb4ad2cd4bd0 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e6edd400a57974d1116b91300b791af8
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 bde4bfaf3d4f..49744daf4f08 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6c7ae6352bbbefe017e2ca3e312022c7
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 a81a925cc668..f82db0629a0c 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b8bd9cf8602e045e422db0c39ee5bed3
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 3fffd5a25046..a84d30f4abd6 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7b5298843079408dd73056a2a64c2326
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 cfffc2698ff1..f54aee5faa29 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0eee92ea248dc95f17db7d4df041729c
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 a250e3203812..327ec0af8bf1 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f51ef65239e037b460ea3ebcd20f507c
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 3ecdab0c58d7..da657591c4a7 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8e8c1c510dfac033757394e1401c7221
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 7ee4406d6853..387d98fef2f5 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f0ecc36b97cf2143f320c033291a5390
diff --git a/metadata/md5-cache/dev-java/treelayout-1.0.2 b/metadata/md5-cache/dev-java/treelayout-1.0.2
index 1a307f4bc488..df9fac13cdd7 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=52aa4d58ec4864a1bc377f26fea401fc
diff --git a/metadata/md5-cache/dev-java/trident-1.3 b/metadata/md5-cache/dev-java/trident-1.3
index 0e69140ef43c..7c2ac889bef8 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7c8ebdc0ce992b961db560119345e010
diff --git a/metadata/md5-cache/dev-java/trove-2.1.0 b/metadata/md5-cache/dev-java/trove-2.1.0
index 31ab48a7b20d..bee13303f8a4 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1002c146361ecc34c5a23e8ff0a0e128
diff --git a/metadata/md5-cache/dev-java/trove-3.0.2 b/metadata/md5-cache/dev-java/trove-3.0.2
index 8605320bb612..785c0c493379 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=01778a4b3152464bf227d24970382494
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 02a36df350a2..4f4bfc602561 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=895fcc3554e83815d05aacd82d768deb
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 7d76f2bab5c1..129eadc59616 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=646b24bd6d380844d47ea508ace69162
diff --git a/metadata/md5-cache/dev-java/txw2-runtime-20110809 b/metadata/md5-cache/dev-java/txw2-runtime-20110809
index 6a40b9a97045..c1ff3b137502 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=495a02ebd1d0695b24ac838949853201
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 e071ba60bafa..ee63eaebf554 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=995485ee9c082ca88bcc3b2c82695076
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 6b58f10511b8..9db2b3fca282 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1ffb37da0492af88312f9e2893e2567c
diff --git a/metadata/md5-cache/dev-java/unkrig-nullanalysis-0_pre1644 b/metadata/md5-cache/dev-java/unkrig-nullanalysis-0_pre1644
index 8278bc1c9424..5e2d63716a4e 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c635702f4b207ad77d761f784ba73e09
diff --git a/metadata/md5-cache/dev-java/upnplib-1.0.7 b/metadata/md5-cache/dev-java/upnplib-1.0.7
index 30f0c288ff91..17e992e23e5d 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5378a22b8f044823a813a0ef5dec8aab
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 e760038bd867..ec67e7050dd2 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0e7663b475de468d748243232092bce6
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 b7667a9c88a5..fe827e82766a 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d75c52b1d4ce9a1347c4fe13e665f42d
diff --git a/metadata/md5-cache/dev-java/velocity-1.7-r2 b/metadata/md5-cache/dev-java/velocity-1.7-r2
index 2e4b5e94e7f4..d66ea9dd8fb7 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=78a3f10cc9c5f7bdddaf44bfd176a9fc
diff --git a/metadata/md5-cache/dev-java/velocity-dvsl-1.0 b/metadata/md5-cache/dev-java/velocity-dvsl-1.0
index 6a384bb7113a..de0ea1447389 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=80b8c6e4f41c9fc7b376d5fa877ec43f
diff --git a/metadata/md5-cache/dev-java/vldocking-3.0.5 b/metadata/md5-cache/dev-java/vldocking-3.0.5
index cc4337c80905..1e595887f087 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=91358952916f3f39d08d43d7967e2c48
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 fb17d7a8716d..f3f1895fd08b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=567bce4d1c310c1b7eb94791fb5c9fe6
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 d5169c61eeef..a58a3d74ffd8 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=901aee45d374862c3132904d991537a5
diff --git a/metadata/md5-cache/dev-java/wsdl4j-1.6.2 b/metadata/md5-cache/dev-java/wsdl4j-1.6.2
index 467cb574ad07..4a0b7a63b0c2 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6879479b335ffb82fa6f411f31e16efe
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 15d6fd1f938c..16525a82d27d 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ee9daf0aec7757c47129da14fc749f9a
diff --git a/metadata/md5-cache/dev-java/xalan-2.7.2 b/metadata/md5-cache/dev-java/xalan-2.7.2
index e5afcffa0e05..640118b29970 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b1596a7d0d313c2d9caf5d8a6965de92
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 2c452eef71d1..3bc316559dab 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=caf0f7d344c09a6103f9ea8d4f9029e6
diff --git a/metadata/md5-cache/dev-java/xerces-2.11.0 b/metadata/md5-cache/dev-java/xerces-2.11.0
index c18b1144d711..446b72f0c6bc 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=73160460c8923f09c665e99746b8e26d
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 207f4d45cb16..a4b231d0cc0e 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1ec0150d82a407f9c5aa7603910a4fd2
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 1ea36698c761..2c5db2f0ea42 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1ce87607f16174e2519956bd903ba6fe
diff --git a/metadata/md5-cache/dev-java/xjavac-20110814 b/metadata/md5-cache/dev-java/xjavac-20110814
index ee44290f5117..2891952bfe59 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=be622052511a6be8f295e12db8487a1b
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 c436460781e5..e1e412669c3f 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=80dd15639213c71cfa1c037d5cd55669
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 cb8f8aa05007..b3c782b56695 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=383c4edccdba315a9a3d3da329fca7fd
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 db8cd602f211..6239fc218492 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=907dfc00c6cf730086a893837a23c6d4
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 7e2d621b9777..b96c328c0532 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=20cee3065e375a16082ac7bbf62ea332
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 a6620aa4e61a..20cae522b4e7 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=790a16798be79c7eae8897f15269e093
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 93671db164ad..ea4d1a91ab7a 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6043baad2aebfea12ca3790f6fd221b9
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 8b9c3520112a..b0fcca31320b 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c851d458acbc24a8217aad944aff3291
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 d65c91d65852..db026bc8026b 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e72f1325212d2a00a098038588b604d6
diff --git a/metadata/md5-cache/dev-java/xmldb-20011111-r1 b/metadata/md5-cache/dev-java/xmldb-20011111-r1
index eb794bf7d2ab..390e389a89fd 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9a2c1da30499a3823cf8c35cc9e43b8b
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 5a94d02344c8..f3d3a916b00c 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=38bcd99789c23611d43315024bb95735
diff --git a/metadata/md5-cache/dev-java/xmlrpc-3.1.3 b/metadata/md5-cache/dev-java/xmlrpc-3.1.3
index fb9987dc2f09..cf6af64626d4 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=85811cf60a8dc8b4e02131a9ee5d76e9
diff --git a/metadata/md5-cache/dev-java/xmlstreambuffer-1.5.3 b/metadata/md5-cache/dev-java/xmlstreambuffer-1.5.3
index c622b0646cb5..ecce5874643b 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7b59b7a8ede9a3325c48be3b635ec310
diff --git a/metadata/md5-cache/dev-java/xmlunit-1.6 b/metadata/md5-cache/dev-java/xmlunit-1.6
index 24fd53a9dfc4..cd7d810d5efc 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a6661a3308bbbacd4c9d566b755526b2
diff --git a/metadata/md5-cache/dev-java/xmpcore-5.1.2 b/metadata/md5-cache/dev-java/xmpcore-5.1.2
index 67283ecda021..1873b9472b9d 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=811850158ca768088454d58c6210cc36
diff --git a/metadata/md5-cache/dev-java/xom-1.2.10 b/metadata/md5-cache/dev-java/xom-1.2.10
index 7ae8cdebb123..30997db66335 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f25a3683ba5e79b0375c0677fe5cb8cf
diff --git a/metadata/md5-cache/dev-java/xp-0.5-r3 b/metadata/md5-cache/dev-java/xp-0.5-r3
index a0eaca2ee911..7ce92a7d037a 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4d430ae49465ea814b6f02c71f7b174d
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 bf7081c3929b..c124c08e077f 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1c9233ae8146b2f4fe5bdcaf5509e49a
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 e82324f347d4..84c65722c644 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4cc58a45715663d10be9cd6583c572b3
diff --git a/metadata/md5-cache/dev-java/xsdlib-20090415 b/metadata/md5-cache/dev-java/xsdlib-20090415
index 85e53e9be67c..5b518932d473 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e4bf3814fdb523e22a549feb3be99340
diff --git a/metadata/md5-cache/dev-java/xsom-20140925 b/metadata/md5-cache/dev-java/xsom-20140925
index abbc090144da..524b60beb366 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=103b9a57ab6cc120598ddb2535f42af1
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 a5669554c7f6..6b21eed50aa8 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ac52125a78783c6ac890713b29536517
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 90dcc2f246c2..357921c47b62 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	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bc6c82f8efc7fe8ec074f9f846d0091b
diff --git a/metadata/md5-cache/dev-java/xz-java-1.5 b/metadata/md5-cache/dev-java/xz-java-1.5
index 3b3be05b5e0f..2ebe4ce103e2 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2b67ec2934be0add8c0c50ec233b1b56
diff --git a/metadata/md5-cache/dev-java/yanfs-1.0 b/metadata/md5-cache/dev-java/yanfs-1.0
index 49d7cb6b7574..307121530bd1 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fdc722d788b962fadeb010dfb1bad959
diff --git a/metadata/md5-cache/dev-java/zemberek-2.1.1 b/metadata/md5-cache/dev-java/zemberek-2.1.1
index 55386223c659..220e7936f4a6 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=40a1bb5ae76c47f44a3034f8717db480
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 3a90ccf1489a..95c000da8459 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	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a38a3f9374271e8f9a11d23d3d6227e7