diff -Nu /usr/./portage/dev-java/istack-commons-runtime/istack-commons-runtime-20070122.ebuild /usr/local/portage/dev-java/istack-commons-runtime/istack-commons-runtime-20070223.ebuild
--- /usr/./portage/dev-java/istack-commons-runtime/istack-commons-runtime-20070122.ebuild	2007-05-23 19:05:53.000000000 +0200
+++ /usr/local/portage/dev-java/istack-commons-runtime/istack-commons-runtime-20070223.ebuild	2007-08-08 01:07:36.000000000 +0200
@@ -3,6 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/dev-java/istack-commons-runtime/istack-commons-runtime-20070122.ebuild,v 1.3 2007/05/23 17:00:28 flameeyes Exp $
 
 JAVA_PKG_IUSE="source"
+ANT_TASKS="none"
 
 inherit java-pkg-2 java-ant-2
 
@@ -15,7 +16,7 @@
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE=""
 
-COMMON_DEP="dev-java/sun-jaf"
+COMMON_DEP="dev-java/sun-jaf dev-java/jsr173"
 
 DEPEND=">=virtual/jdk-1.5
 	${COMMON_DEP}"
@@ -30,6 +31,7 @@
 	java-ant_bsfix_one "${S}/build-common.xml"
 
 	java-pkg_jarfrom --into "${S}/runtime/lib" sun-jaf
+	java-pkg_jarfrom --into "${S}/runtime/lib" jsr173
 }
 
 EANT_BUILD_XML="runtime/build.xml"
diff -Nu /usr/./portage/dev-java/istack-commons-tools/istack-commons-tools-20070122.ebuild /usr/local/portage/dev-java/istack-commons-tools/istack-commons-tools-20070223.ebuild
--- /usr/./portage/dev-java/istack-commons-tools/istack-commons-tools-20070122.ebuild	2007-05-23 19:35:42.000000000 +0200
+++ /usr/local/portage/dev-java/istack-commons-tools/istack-commons-tools-20070223.ebuild	2007-08-08 01:09:17.000000000 +0200
@@ -3,6 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/dev-java/istack-commons-tools/istack-commons-tools-20070122.ebuild,v 1.2 2007/05/23 17:28:57 flameeyes Exp $
 
 JAVA_PKG_IUSE="source"
+ANT_TASKS="none"
 
 inherit java-pkg-2 java-ant-2
 
diff -Nu /usr/./portage/dev-java/istack-commons-test/istack-commons-test-20070122.ebuild /usr/local/portage/dev-java/istack-commons-test/istack-commons-test-20070223.ebuild
--- /usr/./portage/dev-java/istack-commons-test/istack-commons-test-20070122.ebuild	1970-01-01 01:00:00.000000000 +0100
+++ /usr/local/portage/dev-java/istack-commons-test/istack-commons-test-20070223.ebuild	2007-08-08 01:05:27.000000000 +0200
@@ -0,0 +1,57 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/istack-commons-tools/istack-commons-tools-20070122.ebuild,v 1.2 2007/05/23 17:28:57 flameeyes Exp $
+
+JAVA_PKG_IUSE="source"
+ANT_TASKS="none"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="istack-commons - test"
+HOMEPAGE="https://istack-commons.dev.java.net/"
+SRC_URI="mirror://gentoo/istack-commons-${PV}.tar.bz2"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEP="=dev-java/istack-commons-runtime-${PV}
+	dev-java/dom4j
+	dev-java/junit
+	dev-java/ant-junit"
+
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+
+S="${WORKDIR}/istack-commons-${PV}"
+
+src_unpack() {
+
+	unpack ${A}
+
+	java-ant_bsfix_one "${S}/build-common.xml"
+
+	cd "${S}/test"
+	mkdir -p lib || die
+	cd "${S}/test/lib"
+	java-pkg_jarfrom istack-commons-runtime
+	java-pkg_jarfrom dom4j-1
+	java-pkg_jarfrom junit
+	java-pkg_jarfrom ant-junit
+
+	ln -s $(java-config --tools) || die
+
+}
+
+EANT_BUILD_XML="test/build.xml"
+
+src_install() {
+
+	java-pkg_dojar test/build/istack-commons-test.jar
+
+	use source && java-pkg_dosrc test/src/*
+
+}