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

Collapse All | Expand All

(-)tomcat-5.5.17-r2.ebuild (-6 / +9 lines)
Lines 27-32 RDEPEND="=dev-java/eclipse-ecj-3.1* Link Here
27
	>=dev-java/commons-pool-1.2
27
	>=dev-java/commons-pool-1.2
28
	>=dev-java/log4j-1.2.9
28
	>=dev-java/log4j-1.2.9
29
	~dev-java/servletapi-2.4
29
	~dev-java/servletapi-2.4
30
	admin? >=dev-java/struts-1.2.9
30
	java5? ( >=virtual/jre-1.5 )
31
	java5? ( >=virtual/jre-1.5 )
31
	!java5? (
32
	!java5? (
32
		=virtual/jre-1.4*
33
		=virtual/jre-1.4*
Lines 44-50 DEPEND="java5? ( >=virtual/jdk-1.5 ) Link Here
44
	${RDEPEND}
45
	${RDEPEND}
45
	sys-apps/sed
46
	sys-apps/sed
46
	dev-java/ant"
47
	dev-java/ant"
47
IUSE="java5 doc examples source test"
48
IUSE="java5 admin doc examples source test"
48
49
49
if ! use java5; then
50
if ! use java5; then
50
	JAVA_PKG_NV_DEPEND="=virtual/jdk-1.4*"
51
	JAVA_PKG_NV_DEPEND="=virtual/jdk-1.4*"
Lines 214-224 src_install() { Link Here
214
		cd ${base}
215
		cd ${base}
215
	done
216
	done
216
217
217
	# replace a packed struts.jar
218
	if use admin; then
218
	cd server/webapps/admin/WEB-INF/lib
219
		# replace a packed struts.jar
219
	rm -f struts.jar
220
		cd server/webapps/admin/WEB-INF/lib
220
	java-pkg_jar-from struts-1.2 struts.jar
221
		rm -f struts.jar
221
	cd ${base}
222
		java-pkg_jar-from struts-1.2 struts.jar
223
		cd ${base}
224
	fi
222
225
223
	# replace the default pw with a random one, see #92281
226
	# replace the default pw with a random one, see #92281
224
	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
227
	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)

Return to bug 146349