Attachment #68197 for bug #105636




	>=dev-java/commons-logging-1.0.4
	>=dev-java/commons-modeler-1.1
	>=dev-java/commons-pool-1.2
	dev-java/jaxen
	>=dev-java/junit-3.8.1
	dev-java/jmx
	>=dev-java/log4j-1.2.8

	epatch ${FILESDIR}/${PV}/build.xml-02.patch
	epatch ${FILESDIR}/${PV}/gentoo.diff
	epatch ${FILESDIR}/${PV}/scripts.patch
	epatch ${FILESDIR}/${PV}/java5.patch
	use jikes && epatch ${FILESDIR}/${PV}/jikes.diff

	# avoid packed jars :-)

	java-pkg_jar-from servletapi-2.4

	mkdir -p ../../server/lib && cd ../../server/lib
	java-pkg_jar-from commons-beanutils commons-beanutils.jar
	java-pkg_jar-from commons-digester
	java-pkg_jar-from commons-fileupload
	java-pkg_jar-from commons-modeler

}

src_compile(){
	local antflags="-Dbase.path=${T}" jaxen_jar
	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"

	jaxen_jar=$(java-pkg_getjar jaxen-1.1 jaxen.jar 2>/dev/null)
	if [ -z "${jaxen_jar}" ]; then
		jaxen_jar=$(java-pkg_getjar jaxen jaxen-full.jar)
	fi

	antflags="${antflags} -Dactivation.jar=$(java-config -p sun-jaf-bin)"
	antflags="${antflags} -Dcommons-collections.jar=$(java-config -p commons-collections)"
	antflags="${antflags} -Dcommons-daemon.jar=$(java-config -p commons-daemon)"

	antflags="${antflags} -Dlog4j.jar=$(java-config -p log4j)"
	antflags="${antflags} -Dregexp.jar=$(java-config -p jakarta-regexp-1.3)"
	antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts struts.jar)"
	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils commons-beanutils.jar)"
	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
	antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)"
	antflags="${antflags} -Djaxen.jar=${jaxen_jar}"
	antflags="${antflags} -Djmx.jar=$(java-pkg_getjar jmx jmxri.jar)"
	antflags="${antflags} -Djmx-tools.jar=$(java-pkg_getjar jmx jmxtools.jar)"
	antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"

	antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xerces-2 xml-apis.jar)"
	antflags="${antflags} -Dstruts.home=/usr/share/struts"

	einfo "ant ${antflags}"
	ant ${antflags} || die "compile failed"

}

Return to bug 105636

Lines 24-30 Link Here

(-)/usr/portage/www-servers/tomcat/tomcat-5.0.28-r4.ebuild (-5 / +12 lines)
24	>=dev-java/commons-logging-1.0.4	24	>=dev-java/commons-logging-1.0.4
25	>=dev-java/commons-modeler-1.1	25	>=dev-java/commons-modeler-1.1
26	>=dev-java/commons-pool-1.2	26	>=dev-java/commons-pool-1.2
27	~dev-java/jaxen-1.0	27	dev-java/jaxen
28	>=dev-java/junit-3.8.1	28	>=dev-java/junit-3.8.1
29	dev-java/jmx	29	dev-java/jmx
30	>=dev-java/log4j-1.2.8	30	>=dev-java/log4j-1.2.8
Lines 54-59 Link Here
54	epatch ${FILESDIR}/${PV}/build.xml-02.patch	54	epatch ${FILESDIR}/${PV}/build.xml-02.patch
55	epatch ${FILESDIR}/${PV}/gentoo.diff	55	epatch ${FILESDIR}/${PV}/gentoo.diff
56	epatch ${FILESDIR}/${PV}/scripts.patch	56	epatch ${FILESDIR}/${PV}/scripts.patch
		57	epatch ${FILESDIR}/${PV}/java5.patch
57	use jikes && epatch ${FILESDIR}/${PV}/jikes.diff	58	use jikes && epatch ${FILESDIR}/${PV}/jikes.diff
58		59
59	# avoid packed jars :-)	60	# avoid packed jars :-)
Lines 78-84 Link Here
78	java-pkg_jar-from servletapi-2.4	79	java-pkg_jar-from servletapi-2.4
79		80
80	mkdir -p ../../server/lib && cd ../../server/lib	81	mkdir -p ../../server/lib && cd ../../server/lib
81	java-pkg_jar-from commons-beanutils-1.7 commons-beanutils.jar	82	java-pkg_jar-from commons-beanutils commons-beanutils.jar
82	java-pkg_jar-from commons-digester	83	java-pkg_jar-from commons-digester
83	java-pkg_jar-from commons-fileupload	84	java-pkg_jar-from commons-fileupload
84	java-pkg_jar-from commons-modeler	85	java-pkg_jar-from commons-modeler
Lines 86-94 Link Here
86	}	87	}
87		88
88	src_compile(){	89	src_compile(){
89	local antflags="-Dbase.path=${T}"	90	local antflags="-Dbase.path=${T}" jaxen_jar
90	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"	91	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
91		92
		93	jaxen_jar=$(java-pkg_getjar jaxen-1.1 jaxen.jar 2>/dev/null)
		94	if [ -z "${jaxen_jar}" ]; then
		95	jaxen_jar=$(java-pkg_getjar jaxen jaxen-full.jar)
		96	fi
		97
92	antflags="${antflags} -Dactivation.jar=$(java-config -p sun-jaf-bin)"	98	antflags="${antflags} -Dactivation.jar=$(java-config -p sun-jaf-bin)"
93	antflags="${antflags} -Dcommons-collections.jar=$(java-config -p commons-collections)"	99	antflags="${antflags} -Dcommons-collections.jar=$(java-config -p commons-collections)"
94	antflags="${antflags} -Dcommons-daemon.jar=$(java-config -p commons-daemon)"	100	antflags="${antflags} -Dcommons-daemon.jar=$(java-config -p commons-daemon)"
Lines 104-113 Link Here
104	antflags="${antflags} -Dlog4j.jar=$(java-config -p log4j)"	110	antflags="${antflags} -Dlog4j.jar=$(java-config -p log4j)"
105	antflags="${antflags} -Dregexp.jar=$(java-config -p jakarta-regexp-1.3)"	111	antflags="${antflags} -Dregexp.jar=$(java-config -p jakarta-regexp-1.3)"
106	antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts struts.jar)"	112	antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts struts.jar)"
107	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)"	113	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils commons-beanutils.jar)"
108	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"	114	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
109	antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)"	115	antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)"
110	antflags="${antflags} -Djaxen.jar=$(java-pkg_getjar jaxen jaxen-full.jar)"	116	antflags="${antflags} -Djaxen.jar=${jaxen_jar}"
111	antflags="${antflags} -Djmx.jar=$(java-pkg_getjar jmx jmxri.jar)"	117	antflags="${antflags} -Djmx.jar=$(java-pkg_getjar jmx jmxri.jar)"
112	antflags="${antflags} -Djmx-tools.jar=$(java-pkg_getjar jmx jmxtools.jar)"	118	antflags="${antflags} -Djmx-tools.jar=$(java-pkg_getjar jmx jmxtools.jar)"
113	antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"	119	antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"
Lines 115-120 Link Here
115	antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xerces-2 xml-apis.jar)"	121	antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xerces-2 xml-apis.jar)"
116	antflags="${antflags} -Dstruts.home=/usr/share/struts"	122	antflags="${antflags} -Dstruts.home=/usr/share/struts"
117		123
		124	einfo "ant ${antflags}"
118	ant ${antflags} \|\| die "compile failed"	125	ant ${antflags} \|\| die "compile failed"
119		126
120	}	127	}