Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 105636 | Differences between
and this patch

Collapse All | Expand All

(-)tomcat-5.0.28-r7.ebuild (-10 / +2 lines)
Lines 56-62 Link Here
56
	epatch ${FILESDIR}/${PV}/build.xml-02.patch
56
	epatch ${FILESDIR}/${PV}/build.xml-02.patch
57
	epatch ${FILESDIR}/${PV}/gentoo.diff
57
	epatch ${FILESDIR}/${PV}/gentoo.diff
58
	epatch ${FILESDIR}/${PV}/scripts.patch
58
	epatch ${FILESDIR}/${PV}/scripts.patch
59
	epatch ${FILESDIR}/${PV}/java5.patch
60
	use jikes && epatch ${FILESDIR}/${PV}/jikes.diff
59
	use jikes && epatch ${FILESDIR}/${PV}/jikes.diff
61
60
62
	# avoid packed jars :-)
61
	# avoid packed jars :-)
Lines 89-101 Link Here
89
}
88
}
90
89
91
src_compile(){
90
src_compile(){
92
91
	local antflags="-Dbase.path=${T}"
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
98
	local antflags="-Dbase.path=${T}" ${jaxen_jar}
99
	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
92
	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
100
93
101
	antflags="${antflags} -Dactivation.jar=$(java-config -p sun-jaf-bin)"
94
	antflags="${antflags} -Dactivation.jar=$(java-config -p sun-jaf-bin)"
Lines 116-122 Link Here
116
	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)"
109
	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)"
117
	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
110
	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
118
	antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)"
111
	antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)"
119
	antflags="${antflags} -Djaxen.jar=${jaxen_jar}"
112
	antflags="${antflags} -Djaxen.jar=$(java-pkg_getjar jaxen jaxen-full.jar)"
120
	antflags="${antflags} -Djmx.jar=$(java-pkg_getjar jmx jmxri.jar)"
113
	antflags="${antflags} -Djmx.jar=$(java-pkg_getjar jmx jmxri.jar)"
121
	antflags="${antflags} -Djmx-tools.jar=$(java-pkg_getjar jmx jmxtools.jar)"
114
	antflags="${antflags} -Djmx-tools.jar=$(java-pkg_getjar jmx jmxtools.jar)"
122
	antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"
115
	antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"
Lines 124-130 Link Here
124
	antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xerces-2 xml-apis.jar)"
117
	antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xerces-2 xml-apis.jar)"
125
	antflags="${antflags} -Dstruts.home=/usr/share/struts-1.1/"
118
	antflags="${antflags} -Dstruts.home=/usr/share/struts-1.1/"
126
119
127
	einfo "ant ${antflags}"
128
	ant ${antflags} || die "compile failed"
120
	ant ${antflags} || die "compile failed"
129
121
130
}
122
}

Return to bug 105636