Way to many things to have kept track of. I really ought to commit more regularly.

SRC_URI I had hosted elsewhere now point at gentooexperimental
Several slot fixes.
Added a package.mask for things in process / that are broken


svn path=/gentoo-java-experimental/; revision=946

3 files changed, 463 insertions, 460 deletions

diff --git a/eclass/commons-jelly-tags.eclass b/eclass/commons-jelly-tags.eclass
index 920e81f9..d01836d9 100644
--- a/eclass/commons-jelly-tags.eclass
+++ b/eclass/commons-jelly-tags.eclass
@@ -56,7 +56,7 @@ IUSE="doc jikes"
 LICENSE=""
 
 #SRC_URI="mirror://gentoo/${P}.tar.bz2 mirror://gentoo/commons-jelly-tags-1.0-gentoo.patch.bz2"
-SRC_URI="http://www.scorec.rpi.edu/~nichoj/projects/java/${P}.tar.bz2 http://www.scorec.rpi.edu/~nichoj/projects/java/commons-jelly-tags-1.0-gentoo.patch.bz2"
+SRC_URI="http://gentooexperimental.org/distfiles/${P}.tar.bz2 http://gentooexperimental.org/distfiles/commons-jelly-tags-1.0-gentoo.patch.bz2"
 
 EXPORT_FUNCTIONS src_unpack src_compile src_install src_test
 
diff --git a/eclass/jboss-4.eclass b/eclass/jboss-4.eclass
index b4011ca6..b71926a8 100644
--- a/eclass/jboss-4.eclass
+++ b/eclass/jboss-4.eclass
@@ -30,10 +30,10 @@ JBOSS_THIRDPARTY="${JBOSS_ROOT}/thirdparty"
 S="${JBOSS_ROOT}/${MODULE}"
 
 THIRDPARTY_P="jboss-thirdparty-${PV}-gentoo"
-TOOLS_P="jboss-tools-${PV}-gentoo"
+TOOLS_P="jboss-tools-${PV}-gentoo-r1"
 GENTOO_CONF="jboss-${PVR}-gentoo.data"
-BASE_URL="http://www.scorec.rpi.edu/~nichoj/projects/java"
-#BASE_URL="mirror://gentoo"
+#BASE_URL="http://www.scorec.rpi.edu/~nichoj/projects/java"
+BASE_URL="http://gentooexperimental.org/distfiles"
 ECLASS_URI="${BASE_URL}/${TOOLS_P}.tar.bz2 ${BASE_URL}/${THIRDPARTY_P}.tar.bz2
 mirror://gentoo/${GENTOO_CONF}"
 MY_A="${P}-gentoo.tar.bz2 ${TOOLS_P}.tar.bz2 ${THIRDPARTY_P}.tar.bz2"
@@ -145,13 +145,14 @@ jboss-4_fix-module() {
 	mkdir -p ${dir}
 
 	quiet_pushd ${dir}
-	java-pkg_jar-from ${pkg}
+	java-pkg_jar-from ${pkg} || die "Couldn't find a package.."
 	local libdir="/usr/share/${pkg}/lib"
 	for jar in ${libdir}/*.jar; do
 		if [ -d "${jar}" ]; then
 			ln -sf ${jar}
 		fi
 	done
+	# TODO: only perform this if there are actual files
 	local servicedir="/usr/share/${pkg}/services"
 	for sar in ${servicedir}/*.sar; do
 		if [ -d "${sar}" ]; then
@@ -169,6 +170,8 @@ jboss-4_src_unpack() {
 
 	unpack ${MY_A}
 
+	mkdir -p ${JBOSS_THIRDPARTY}/sun-servlet/lib # workaround because something
+												 # depends on this being around
 	jboss-4_fix-dir tools/lib
 	jboss-4_fix-thirdparty
 	jboss-4_fix-modules
@@ -178,7 +181,7 @@ jboss-4_src_compile() {
 	debug-print-function ${FUNCNAME} $*
 	
 	cd ${S}
-	local antflags
+	local antflags="${ANT_TARGET:-jars}"
 	use jikes && antflags="-Dbuild.compiler=jikes"
 
 	ant ${antflags} || die "Build script failed"
@@ -282,460 +285,460 @@ jboss-4_dosar() {
 #################################################
 #################################################
 #################################################
-jboss-4_fix-tools() {
-	debug-print-function "Fixing jars in ${JBOSS_ROOT}/tools/lib"
-	quiet_pushd ${JBOSS_ROOT}/tools/lib
-	java-pkg_jar-from ${ANT_JAVAMAIL} 
-	java-pkg_jar-from ${ANT_JUNIT}
-	java-pkg_jar-from ${ANT_LAUNCHER}
-	java-pkg_jar-from ${ANT_NODEPS}
-	java-pkg_jar-from ${ANT_TRAX}
-	java-pkg_jar-from ${ANT_XSLP}
-	java-pkg_jar-from ${ANT}
-	java-pkg_jar-from ${BSF}
-	java-pkg_jar-from ${BUILDMAGIC_TASKS}
-	java-pkg_jar-from ${JUNIT}
-	java-pkg_jar-from ${RESOLVER}
-	java-pkg_jar-from ${XALAN}
-	java-pkg_jar-from ${XERCES_IMPL}
-	java-pkg_jar-from ${XML_APIS}
-	quiet_popd
-}
-
-jboss-4_clean_jars() {
-	einfo "Removing jars from ${JBOSS_ROOT}"
-	find ${JBOSS_ROOT} -name *.jar -exec rm {} \;
-}
-
-jboss-4_fix-apache-addressing() {
-	quiet_pushd ${JBOSS_THIRDPARTY}/apache-addressing/lib
-	quiet_popd
-}
-
-jboss-4_fix-apache-avalon() {
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-avalon/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/apache-avalon/lib
-	java-pkg_jar-from ${AVALON_FRAMEWORK}
-	java-pkg_jar-from ${LOGKIT}
-	quiet_popd
-}
-
-jboss-4_fix-apache-bcel() {
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-bcel/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/apache-bcel/lib
-	java-pkg_jar-from ${BCEL}
-	quiet_popd
-}
-
-jboss-4_fix-apache-commons() {
-	# RDEPENDS:
-	# 	=dev-java/commons-beanutils-1.6*
-	#	dev-java/commons-codec
-	#	dev-java/commons-collections
-	#	dev-java/commons-digester
-	#	dev-java/commons-discovery
-	#	dev-java/commons-fileupload
-	#	dev-java/commons-httpclient
-	#	dev-java/commons-lang
-	#	dev-java/commons-logging
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-commons/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/apache-commons/lib
-	java-pkg_jar-from ${COMMONS_BEANUTILS}
-	java-pkg_jar-from ${COMMONS_CODEC} commons-codec-1.2.jar
-	java-pkg_jar-from ${COMMONS_COLLECTIONS}
-	java-pkg_jar-from ${COMMONS_DIGESTER} commons-digest-1.6.jar
-	java-pkg_jar-from ${COMMONS_DISCOVERY}
-	java-pkg_jar-from ${COMMONS_FILEUPLOAD}
-	java-pkg_jar-from ${COMMONS_HTTPCLIENT}
-	java-pkg_jar-from ${COMMONS_LANG} commons-lang-1.0.jar
-	java-pkg_jar-from ${COMMONS_LOGGING}
-	java-pkg_jar-from ${COMMONS_LOGGING_API}
-	quiet_popd
-}
-
-jboss-4_fix-apache-jaxme() {
-	# bug #94432
-	quiet_pushd ${JBOSS_THIRDPARTY}/apache-jaxme 
-	quiet_popd
-}
-
-jboss-4_fix-apache-log4j() {
-	# RDEPENDS:
-	#	dev-java/log4j
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-log4j/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/apache-log4j/lib
-	java-pkg_jar-from ${LOG4J}
-	# TODO: replace snmpTrapAppender.jar
-	quiet_popd
-}
-
-jboss-4_fix-apache-myfaces() {
-	# bug #94434
-	quiet_pushd ${JBOSS_THIRDPARTY}/apache-myfaces/lib 
-	quiet_popd
-}
-
-jboss-4_fix-apache-scout() {
-	# bug #94460
-	quiet_pushd ${thirdparty}/apache-scout/lib
-	quiet_popd
-}
-
-jboss-4_fix-apache-slide() {
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-slide/client/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/apache-slide/client/lib
-	java-pkg_jar-from ${WEBDAVLIB}
-	quiet_popd
-}
-
-jboss-4_fix-apache-tomcat-50() {
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-tomcat-50"
-	quiet_pushd ${JBOSS_THIRDPARTY}/apache-tomcat50
-	java-pkg_jar-from ${TOMCAT5}
-	java-pkg_jar-from ${SERVLET24}
-	java-pkg_jar-from ${COMMONS_BEANUTILS}
-	java-pkg_jar-from ${COMMONS_COLLECTIONS}
-	java-pkg_jar-from ${COMMONS_EL}
-	java-pkg_jar-from ${COMMONS_DIGESTER}
-	java-pkg_jar-from ${COMMONS_LOGGING}
-	java-pkg_jar-from ${COMMONS_MODELER}
-	java-pkg_jar-from ${JAKARTA_REGEXP}
-	quiet_popd
-}
-
-jboss-4_fix-apache-tomcat-55() {
-	# bug #75224
-	quiet_pushd ${JBOSS_THIRDPARTY}/apache-tomcat-55
-	quiet_popd
-}
-
-jboss-4_fix-apache-velocity() {
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-velocity"
-	quiet_pushd ${JBOSS_THIRDPARTY}
-	java-pkg_jar-from ${VELOCITY}
-	quiet_popd
-}
-
-jboss-4_fix-apache-xalan() {
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-xalan/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/apache-xalan/lib
-	java-pkg_jar-from ${XALAN}
-	quiet_popd
-}
-
-jboss-4_fix-apache-xerces() {
-#	fix_dir ${JBOSS_THIRDPARTY}/apache-xerces/lib \
-#		"${RESOLVER}" \
-#		"${XERCES_IMPL}" \
-#		"${XML_APIS}"
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-xerces/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/apache-xerces/lib
-	java-pkg_jar-from ${RESOLVER}
-	java-pkg_jar-from ${XERCES_IMPL}
-	java-pkg_jar-from ${XML_APIS}
-	quiet_popd
-}
-
-jboss-4_fix-apache-xmlsec() {
-	# bug #94438
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-xmlsec/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/apache-xmlsec/lib 
-	java-pkg_jar-from ${XMLSEC}
-	quiet_popd
-}
-
-jboss-4_fix-beanshell() {
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/beahshell-beanshell/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/beanshell-beanshell/lib
-	java-pkg_jar-from ${BSH} bsh-1.3.0.jar
-	quiet_popd
-}
-
-jboss-4_fix-bouncycastle() {
-	# bug #944346
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/bouncycastle/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/bouncycastle/lib 
-	java-pkg_jar-from ${BCPROV} bcprov-jdk14-124.jar
-	quiet_popd
-}
-jboss-4_fix-cglib() {
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/cglib/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/cglib/lib
-	java-pkg_jar-from ${CGLIB} cglib-2.1.jar
-	quiet_popd
-}
-
-jboss-4_fix-dom4j() {
-	# bug #63268
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/dom4j-dom4j/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/dom4j-dom4j/lib
-	java-pkg_jar-from ${DOM4J}
-	java-pkg_jar-from ${JAXEN} jaxen-1.1-beta-4.jar
-	quiet_popd
-}
-
-jboss-4_fix-eclipse-jdt() {
-	# bug #80526
-	quiet_pushd ${JBOSS_THIRDPARTY}/eclipse-jdt/lib 
-	quiet_popd
-}
-
-jboss-4_fix-gjt-jpl-util() {
-	# bug #94439
-	quiet_pushd ${JBOSS_THIRDPARTY}/gjt-jpl-util/lib
-	quiet_popd
-}
-
-jboss-4_fix-gnu-getopt() {
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/gnu-getopt/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/gnu-getopt/lib
-	java-pkg_jar-from ${GNU_GETOPT} getopt.jar
-	quiet_popd
-}
-
-jboss-4_fix-gnu-regexp() {
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/gnu-regexp/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/gnu-regexp/lib
-	java-pkg_jar-from ${GNU_REGEXP}
-	quiet_popd
-}
-
-jboss-4_fix-hibernate() {
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/hibernate/lib"
-	# TODO: need a new hibernate ebuild, bug #91986
-	quiet_pushd ${JBOSS_THIRDPARTY}/hibernate/lib
-	java-pkg_jar-from ${ANTLR}
-	java-pkg_jar-from ${ASM_ATTRS}
-	java-pkg_jar-from ${ASM}
-	#java-pkg_jar-from ${HIBERNATE3}
-	#java-pkg_jar-from ${HIBERNATE_METADATA}
-	quiet_popd
-}
-
-jboss-4_fix-hsqldb() {
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/hsqldb-hsqldb/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/hsqldb-hsqldb/lib
-	java-pkg_jar-from ${HSQLDB}
-	quiet_popd
-}
-
-jboss-4_fix-ibm-wsdl4j() {
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/ibm-wsdl4j/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/ibm-wsdl4j/lib
-	java-pkg_jar-from ${WSDL4J}
-	quiet_popd
-}
-
-jboss-4_fix-jacorb() {
-	# Not in portage yet, bug #93396
-	# TODO: where are jacorb_g.jar and idl_g.jar from??
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/jacorb-jacorb/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/jacorb-jacorb/lib
-	java-pkg_jar-from ${JACORB}
-	java-pkg_jar-from ${IDL}
-	quiet_popd
-
-}
-
-jboss-4_fix-javagroups() {
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/javagroups-javagroups/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/javagroups-javagroups/lib
-	java-pkg_jar-from ${JGROUPS}
-	quiet_popd
-}
-
-jboss-4_fix-javassist() {
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/javassist-javassist"
-	quiet_pushd ${JBOSS_THIRDPARTY}/javassist/lib
-	java-pkg_jar-from ${JAVASSIST}
-	quiet_popd
-}
-
-jboss-4_fix-jfreechart() {
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/jfreechart-jfreechart/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/jfreechart/lib
-	# jfreechart.jar may be patched!
-	#java-pkg_jar-from ${JFREECHART}
-	java-pkg_jar-from ${JCOMMON}
-	quiet_popd
-}
-
-jboss-4_fix-juddi() {
-	# bug #94441
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/juddi-juddi/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/juddi-juddi/lib
-	java-pkg_jar-from ${JUDDI}
-	# TODO replace war file
-	quiet_popd
-}
-
-jboss-4_fix-junit() {
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/junit-junit/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/junit-junit/lib
-	java-pkg_jar-from ${JUNIT}
-	quiet_popd
-}
-
-jboss-4_fix-junitejb() {
-	# bug #94442
-	quiet_pushd ${JBOSS_THIRDPARTY}/junitejb/junitejb/lib
-	quiet_popd
-}
-
-jboss-4_fix-odmg() {
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/odmg/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/odmg/lib
-	java-pkg_jar-from ${ODMG}
-	quiet_popd
-}
-
-jboss-4_fix-opensaml() {
-	# bug #94428
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/opensaml/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/opensaml/lib 
-	java-pkg_jar-from ${OPENSAML}
-	quiet_popd
-}
-
-jboss-4_fix-opennms() {
-	# bug #94426
-	quiet_pushd ${JBOSS_THIRDPARTY}/opennms/lib
-	quiet_popd
-}
-
-jboss-4_fix-oswego-concurrent() {
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/oswego-concurrent/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/oswego-concurrent/lib 
-	java-pkg_jar-from ${CONCURRENT}
-	quiet_popd
-}
-
-jboss-4_fix-qdox() {
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/qdox/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/qdox/lib
-	java-pkg_jar-from ${QDOX}
-	quiet_popd
-}
-
-jboss-4_fix-sleepycat() {
-	# bug #94430
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/sleepycat/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/sleepycat/lib 
-	java-pkg_jar-from ${JE}
-	quiet_popd
-}
-
-jboss-4_fix-sun-jaf() {
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/sun-jaf/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/sun-jaf/lib
-	java-pkg_jar-from ${ACTIVATION}
-	quiet_popd
-}
-
-jboss-4_fix-sun-javacc() {
-	# I don't think our packaged javacc.jar is a drop in replacement for
-	# JavaCC.zip
-	#einfo "Fixing jars in thirdparty/sun/javacc/lib"
-	quiet_pushd ${thirdparty}/sun/javacc/lib
-	#java-pkg_jar-from javacc javacc.jar JavaCC.zip
-	quiet_popd
-}
-
-jboss-4_fix-sun-javamail() {
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/sun-javamail/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/sun-javamail/lib
-	java-pkg_jar-from ${IMAP}
-	java-pkg_jar-from ${MAIL}
-	java-pkg_jar-from ${MAILAPI}
-	java-pkg_jar-from ${POP3}
-	java-pkg_jar-from ${SMTP}
-	quiet_popd
-}
-
-jboss-4_fix-sun-jaxp() {
-	quiet_pushd ${JBOSS_THIRDPARTY}/sun-jaxp/lib
-	quiet_popd
-}
-
-jboss-4_fix-sun-jmf() {
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/sun-jmf/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/sun-jmf/lib
-	java-pkg_jar-from ${JMF}
-	quiet_popd
-}
-
-jboss-4_fix-sun-jmx() {
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/sun-jmx/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/sun-jmx/lib
-	java-pkg_jar-from ${JMXRI}
-	java-pkg_jar-from ${JMXTOOLS}
-	# TODO: need to replace jmxgrinder.jar
-	quiet_popd
-}
-
-jboss-4_fix-sun-servlet() {
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/sun-servlet/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/sun-servlet/lib
-	java-pkg_jar-from ${SERVLET24}
-	quiet_popd
-}
-
-jboss-4_fix-trove() {
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/trove/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/trove/lib
-	java-pkg_jar-from ${TROVE} 
-	quiet_popd
-}
-
-jboss-4_fix-wukta-dtdparser() {
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/wutka-dtdparser/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/wutka-dtdparser/lib
-	java-pkg_jar-from ${DTDPARSER}
-	quiet_popd
-}
-
-jboss-4_fix-xdoclet() {
-	# I suspect that these are patched by jboss...
-	#einfo "Fixing jars in xdoclet-xdoclet/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/xdoclet/xdoclet/lib
-	#java-pkg_jar-from ${COMMONS_LOGGING}
-	#java-pkg_jar-from ${XDOCLET}
-	#java-pkg_jar-from ${XDOCLET_BEA}
-	#java-pkg_jar-from ${XDOCLET_EJB}
-	#java-pkg_jar-from ${XDOCLET_JAVA}
-	#java-pkg_jar-from ${XDOCLET_JBOSS}
-	#java-pkg_jar-from ${XDOCLET_JDO}
-	#java-pkg_jar-from ${XDOCLET_JMX}
-	#java-pkg_jar-from ${XDOCLET_WEB}
-	#java-pkg_jar-from ${XDOCLET_XDOCLET}
-	#java-pkg_jar-from ${XJAVADOC}
-	quiet_popd
-}
-
-jboss-4_fix-xml-sax() {
-	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/xml-sax/lib"
-	quiet_pushd ${JBOSS_THIRDPARTY}/xml-sax/lib
-	java-pkg_jar-from ${SAX}
-	quiet_popd
-}
-
-jboss-4_fix-jboss-common() {
-	einfo "Populating ${JBOSS_ROOT}/common/output/lib"
-	mkdir -p ${JBOSS_ROOT}/common/output/lib
-	quiet_pushd ${JBOSS_ROOT}/common/output/lib
-	java-pkg_jar-from ${JBOSS_COMMON}
-	quiet_popd
-}
-
-jboss-4_fix-jboss-jmx() {
-	einfo "Populating ${JBOSS_ROOT}/jmx/output/lib"
-	mkdir -p ${JBOSS_ROOT}/jmx/output/lib
-	quiet_pushd ${JBOSS_ROOT}/jmx/output/lib
-	java-pkg_jar-from ${JBOSS_JMX}
-	quiet_popd
-}
+#jboss-4_fix-tools() {
+#	debug-print-function "Fixing jars in ${JBOSS_ROOT}/tools/lib"
+#	quiet_pushd ${JBOSS_ROOT}/tools/lib
+#	java-pkg_jar-from ${ANT_JAVAMAIL} 
+#	java-pkg_jar-from ${ANT_JUNIT}
+#	java-pkg_jar-from ${ANT_LAUNCHER}
+#	java-pkg_jar-from ${ANT_NODEPS}
+#	java-pkg_jar-from ${ANT_TRAX}
+#	java-pkg_jar-from ${ANT_XSLP}
+#	java-pkg_jar-from ${ANT}
+#	java-pkg_jar-from ${BSF}
+#	java-pkg_jar-from ${BUILDMAGIC_TASKS}
+#	java-pkg_jar-from ${JUNIT}
+#	java-pkg_jar-from ${RESOLVER}
+#	java-pkg_jar-from ${XALAN}
+#	java-pkg_jar-from ${XERCES_IMPL}
+#	java-pkg_jar-from ${XML_APIS}
+#	quiet_popd
+#}
+#
+#jboss-4_clean_jars() {
+#	einfo "Removing jars from ${JBOSS_ROOT}"
+#	find ${JBOSS_ROOT} -name *.jar -exec rm {} \;
+#}
+#
+#jboss-4_fix-apache-addressing() {
+#	quiet_pushd ${JBOSS_THIRDPARTY}/apache-addressing/lib
+#	quiet_popd
+#}
+#
+#jboss-4_fix-apache-avalon() {
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-avalon/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/apache-avalon/lib
+#	java-pkg_jar-from ${AVALON_FRAMEWORK}
+#	java-pkg_jar-from ${LOGKIT}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-apache-bcel() {
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-bcel/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/apache-bcel/lib
+#	java-pkg_jar-from ${BCEL}
+#	quiet_popd
+#}
 
-#fix_dir() {
+#jboss-4_fix-apache-commons() {
+#	# RDEPENDS:
+#	# 	=dev-java/commons-beanutils-1.6*
+#	#	dev-java/commons-codec
+#	#	dev-java/commons-collections
+#	#	dev-java/commons-digester
+#	#	dev-java/commons-discovery
+#	#	dev-java/commons-fileupload
+#	#	dev-java/commons-httpclient
+#	#	dev-java/commons-lang
+#	#	dev-java/commons-logging
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-commons/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/apache-commons/lib
+#	java-pkg_jar-from ${COMMONS_BEANUTILS}
+#	java-pkg_jar-from ${COMMONS_CODEC} commons-codec-1.2.jar
+#	java-pkg_jar-from ${COMMONS_COLLECTIONS}
+#	java-pkg_jar-from ${COMMONS_DIGESTER} commons-digest-1.6.jar
+#	java-pkg_jar-from ${COMMONS_DISCOVERY}
+#	java-pkg_jar-from ${COMMONS_FILEUPLOAD}
+#	java-pkg_jar-from ${COMMONS_HTTPCLIENT}
+#	java-pkg_jar-from ${COMMONS_LANG} commons-lang-1.0.jar
+#	java-pkg_jar-from ${COMMONS_LOGGING}
+#	java-pkg_jar-from ${COMMONS_LOGGING_API}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-apache-jaxme() {
+#	# bug #94432
+#	quiet_pushd ${JBOSS_THIRDPARTY}/apache-jaxme 
+#	quiet_popd
+#}
+#
+#jboss-4_fix-apache-log4j() {
+#	# RDEPENDS:
+#	#	dev-java/log4j
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-log4j/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/apache-log4j/lib
+#	java-pkg_jar-from ${LOG4J}
+#	# TODO: replace snmpTrapAppender.jar
+#	quiet_popd
+#}
+#
+#jboss-4_fix-apache-myfaces() {
+#	# bug #94434
+#	quiet_pushd ${JBOSS_THIRDPARTY}/apache-myfaces/lib 
+#	quiet_popd
+#}
+#
+#jboss-4_fix-apache-scout() {
+#	# bug #94460
+#	quiet_pushd ${thirdparty}/apache-scout/lib
+#	quiet_popd
+#}
+#
+#jboss-4_fix-apache-slide() {
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-slide/client/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/apache-slide/client/lib
+#	java-pkg_jar-from ${WEBDAVLIB}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-apache-tomcat-50() {
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-tomcat-50"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/apache-tomcat50
+#	java-pkg_jar-from ${TOMCAT5}
+#	java-pkg_jar-from ${SERVLET24}
+#	java-pkg_jar-from ${COMMONS_BEANUTILS}
+#	java-pkg_jar-from ${COMMONS_COLLECTIONS}
+#	java-pkg_jar-from ${COMMONS_EL}
+#	java-pkg_jar-from ${COMMONS_DIGESTER}
+#	java-pkg_jar-from ${COMMONS_LOGGING}
+#	java-pkg_jar-from ${COMMONS_MODELER}
+#	java-pkg_jar-from ${JAKARTA_REGEXP}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-apache-tomcat-55() {
+#	# bug #75224
+#	quiet_pushd ${JBOSS_THIRDPARTY}/apache-tomcat-55
+#	quiet_popd
+#}
+#
+#jboss-4_fix-apache-velocity() {
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-velocity"
+#	quiet_pushd ${JBOSS_THIRDPARTY}
+#	java-pkg_jar-from ${VELOCITY}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-apache-xalan() {
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-xalan/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/apache-xalan/lib
+#	java-pkg_jar-from ${XALAN}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-apache-xerces() {
+##	fix_dir ${JBOSS_THIRDPARTY}/apache-xerces/lib \
+##		"${RESOLVER}" \
+##		"${XERCES_IMPL}" \
+##		"${XML_APIS}"
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-xerces/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/apache-xerces/lib
+#	java-pkg_jar-from ${RESOLVER}
+#	java-pkg_jar-from ${XERCES_IMPL}
+#	java-pkg_jar-from ${XML_APIS}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-apache-xmlsec() {
+#	# bug #94438
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-xmlsec/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/apache-xmlsec/lib 
+#	java-pkg_jar-from ${XMLSEC}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-beanshell() {
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/beahshell-beanshell/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/beanshell-beanshell/lib
+#	java-pkg_jar-from ${BSH} bsh-1.3.0.jar
+#	quiet_popd
+#}
+#
+#jboss-4_fix-bouncycastle() {
+#	# bug #944346
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/bouncycastle/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/bouncycastle/lib 
+#	java-pkg_jar-from ${BCPROV} bcprov-jdk14-124.jar
+#	quiet_popd
+#}
+#jboss-4_fix-cglib() {
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/cglib/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/cglib/lib
+#	java-pkg_jar-from ${CGLIB} cglib-2.1.jar
+#	quiet_popd
+#}
+#
+#jboss-4_fix-dom4j() {
+#	# bug #63268
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/dom4j-dom4j/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/dom4j-dom4j/lib
+#	java-pkg_jar-from ${DOM4J}
+#	java-pkg_jar-from ${JAXEN} jaxen-1.1-beta-4.jar
+#	quiet_popd
+#}
+#
+#jboss-4_fix-eclipse-jdt() {
+#	# bug #80526
+#	quiet_pushd ${JBOSS_THIRDPARTY}/eclipse-jdt/lib 
+#	quiet_popd
+#}
+#
+#jboss-4_fix-gjt-jpl-util() {
+#	# bug #94439
+#	quiet_pushd ${JBOSS_THIRDPARTY}/gjt-jpl-util/lib
+#	quiet_popd
+#}
+#
+#jboss-4_fix-gnu-getopt() {
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/gnu-getopt/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/gnu-getopt/lib
+#	java-pkg_jar-from ${GNU_GETOPT} getopt.jar
+#	quiet_popd
+#}
+#
+#jboss-4_fix-gnu-regexp() {
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/gnu-regexp/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/gnu-regexp/lib
+#	java-pkg_jar-from ${GNU_REGEXP}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-hibernate() {
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/hibernate/lib"
+#	# TODO: need a new hibernate ebuild, bug #91986
+#	quiet_pushd ${JBOSS_THIRDPARTY}/hibernate/lib
+#	java-pkg_jar-from ${ANTLR}
+#	java-pkg_jar-from ${ASM_ATTRS}
+#	java-pkg_jar-from ${ASM}
+#	#java-pkg_jar-from ${HIBERNATE3}
+#	#java-pkg_jar-from ${HIBERNATE_METADATA}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-hsqldb() {
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/hsqldb-hsqldb/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/hsqldb-hsqldb/lib
+#	java-pkg_jar-from ${HSQLDB}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-ibm-wsdl4j() {
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/ibm-wsdl4j/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/ibm-wsdl4j/lib
+#	java-pkg_jar-from ${WSDL4J}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-jacorb() {
+#	# Not in portage yet, bug #93396
+#	# TODO: where are jacorb_g.jar and idl_g.jar from??
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/jacorb-jacorb/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/jacorb-jacorb/lib
+#	java-pkg_jar-from ${JACORB}
+#	java-pkg_jar-from ${IDL}
+#	quiet_popd
+#
+#}
+#
+#jboss-4_fix-javagroups() {
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/javagroups-javagroups/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/javagroups-javagroups/lib
+#	java-pkg_jar-from ${JGROUPS}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-javassist() {
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/javassist-javassist"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/javassist/lib
+#	java-pkg_jar-from ${JAVASSIST}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-jfreechart() {
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/jfreechart-jfreechart/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/jfreechart/lib
+#	# jfreechart.jar may be patched!
+#	#java-pkg_jar-from ${JFREECHART}
+#	java-pkg_jar-from ${JCOMMON}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-juddi() {
+#	# bug #94441
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/juddi-juddi/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/juddi-juddi/lib
+#	java-pkg_jar-from ${JUDDI}
+#	# TODO replace war file
+#	quiet_popd
+#}
+#
+#jboss-4_fix-junit() {
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/junit-junit/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/junit-junit/lib
+#	java-pkg_jar-from ${JUNIT}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-junitejb() {
+#	# bug #94442
+#	quiet_pushd ${JBOSS_THIRDPARTY}/junitejb/junitejb/lib
+#	quiet_popd
+#}
+#
+#jboss-4_fix-odmg() {
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/odmg/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/odmg/lib
+#	java-pkg_jar-from ${ODMG}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-opensaml() {
+#	# bug #94428
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/opensaml/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/opensaml/lib 
+#	java-pkg_jar-from ${OPENSAML}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-opennms() {
+#	# bug #94426
+#	quiet_pushd ${JBOSS_THIRDPARTY}/opennms/lib
+#	quiet_popd
+#}
+#
+#jboss-4_fix-oswego-concurrent() {
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/oswego-concurrent/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/oswego-concurrent/lib 
+#	java-pkg_jar-from ${CONCURRENT}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-qdox() {
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/qdox/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/qdox/lib
+#	java-pkg_jar-from ${QDOX}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-sleepycat() {
+#	# bug #94430
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/sleepycat/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/sleepycat/lib 
+#	java-pkg_jar-from ${JE}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-sun-jaf() {
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/sun-jaf/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/sun-jaf/lib
+#	java-pkg_jar-from ${ACTIVATION}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-sun-javacc() {
+#	# I don't think our packaged javacc.jar is a drop in replacement for
+#	# JavaCC.zip
+#	#einfo "Fixing jars in thirdparty/sun/javacc/lib"
+#	quiet_pushd ${thirdparty}/sun/javacc/lib
+#	#java-pkg_jar-from javacc javacc.jar JavaCC.zip
+#	quiet_popd
+#}
+#
+#jboss-4_fix-sun-javamail() {
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/sun-javamail/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/sun-javamail/lib
+#	java-pkg_jar-from ${IMAP}
+#	java-pkg_jar-from ${MAIL}
+#	java-pkg_jar-from ${MAILAPI}
+#	java-pkg_jar-from ${POP3}
+#	java-pkg_jar-from ${SMTP}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-sun-jaxp() {
+#	quiet_pushd ${JBOSS_THIRDPARTY}/sun-jaxp/lib
+#	quiet_popd
+#}
+#
+#jboss-4_fix-sun-jmf() {
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/sun-jmf/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/sun-jmf/lib
+#	java-pkg_jar-from ${JMF}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-sun-jmx() {
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/sun-jmx/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/sun-jmx/lib
+#	java-pkg_jar-from ${JMXRI}
+#	java-pkg_jar-from ${JMXTOOLS}
+#	# TODO: need to replace jmxgrinder.jar
+#	quiet_popd
+#}
+#
+#jboss-4_fix-sun-servlet() {
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/sun-servlet/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/sun-servlet/lib
+#	java-pkg_jar-from ${SERVLET24}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-trove() {
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/trove/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/trove/lib
+#	java-pkg_jar-from ${TROVE} 
+#	quiet_popd
+#}
+#
+#jboss-4_fix-wukta-dtdparser() {
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/wutka-dtdparser/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/wutka-dtdparser/lib
+#	java-pkg_jar-from ${DTDPARSER}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-xdoclet() {
+#	# I suspect that these are patched by jboss...
+#	#einfo "Fixing jars in xdoclet-xdoclet/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/xdoclet/xdoclet/lib
+#	#java-pkg_jar-from ${COMMONS_LOGGING}
+#	#java-pkg_jar-from ${XDOCLET}
+#	#java-pkg_jar-from ${XDOCLET_BEA}
+#	#java-pkg_jar-from ${XDOCLET_EJB}
+#	#java-pkg_jar-from ${XDOCLET_JAVA}
+#	#java-pkg_jar-from ${XDOCLET_JBOSS}
+#	#java-pkg_jar-from ${XDOCLET_JDO}
+#	#java-pkg_jar-from ${XDOCLET_JMX}
+#	#java-pkg_jar-from ${XDOCLET_WEB}
+#	#java-pkg_jar-from ${XDOCLET_XDOCLET}
+#	#java-pkg_jar-from ${XJAVADOC}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-xml-sax() {
+#	einfo "Fixing jars in ${JBOSS_THIRDPARTY}/xml-sax/lib"
+#	quiet_pushd ${JBOSS_THIRDPARTY}/xml-sax/lib
+#	java-pkg_jar-from ${SAX}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-jboss-common() {
+#	einfo "Populating ${JBOSS_ROOT}/common/output/lib"
+#	mkdir -p ${JBOSS_ROOT}/common/output/lib
+#	quiet_pushd ${JBOSS_ROOT}/common/output/lib
+#	java-pkg_jar-from ${JBOSS_COMMON}
+#	quiet_popd
+#}
+#
+#jboss-4_fix-jboss-jmx() {
+#	einfo "Populating ${JBOSS_ROOT}/jmx/output/lib"
+#	mkdir -p ${JBOSS_ROOT}/jmx/output/lib
+#	quiet_pushd ${JBOSS_ROOT}/jmx/output/lib
+#	java-pkg_jar-from ${JBOSS_JMX}
+#	quiet_popd
+#}
+#
+##fix_dir() {
 #	local target_dir=${1};
 #	local jar_from_commands=${@##${1}} # all arguments, except the first
 #
diff --git a/eclass/wagon.eclass b/eclass/wagon.eclass
index b3d9155b..9c2b31b7 100644
--- a/eclass/wagon.eclass
+++ b/eclass/wagon.eclass
@@ -15,7 +15,7 @@ HOMEPAGE=""
 MY_PV="${PV/_alpha/-alpha-}"
 MY_P="${PN}-${MY_PV}"
 S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2 mirror://gentoo/build-wagon.xml.bz2"
+SRC_URI="http://gentooexperimental.org/distfiles/${MY_P}.tar.bz2 http://gentooexperimental.org/distfiles/build-wagon.xml.bz2"
 
 DEPEND="virtual/jdk
 	dev-java/ant-core"