[patch] tomcat-5.5.17-r2.ebuild.diff - admin use

tomcat-5.5.17-r2.ebuild.diff (text/plain), 1.07 KB, created by Alon Bar-Lev (RETIRED) on 2006-09-05 11:48:44 UTC

--- tomcat-5.5.17-r2.ebuild	2006-09-04 20:06:24.000000000 +0300
+++ tomcat-5.5.17-r2.ebuild	2006-09-05 21:45:20.000000000 +0300
@@ -27,6 +27,7 @@ RDEPEND="=dev-java/eclipse-ecj-3.1*
 	>=dev-java/commons-pool-1.2
 	>=dev-java/log4j-1.2.9
 	~dev-java/servletapi-2.4
+	admin? >=dev-java/struts-1.2.9
 	java5? ( >=virtual/jre-1.5 )
 	!java5? (
 		=virtual/jre-1.4*
@@ -44,7 +45,7 @@ DEPEND="java5? ( >=virtual/jdk-1.5 )
 	${RDEPEND}
 	sys-apps/sed
 	dev-java/ant"
-IUSE="java5 doc examples source test"
+IUSE="java5 admin doc examples source test"
 
 if ! use java5; then
 	JAVA_PKG_NV_DEPEND="=virtual/jdk-1.4*"
@@ -214,11 +215,13 @@ src_install() {
 		cd ${base}
 	done
 
-	# replace a packed struts.jar
-	cd server/webapps/admin/WEB-INF/lib
-	rm -f struts.jar
-	java-pkg_jar-from struts-1.2 struts.jar
-	cd ${base}
+	if use admin; then
+		# replace a packed struts.jar
+		cd server/webapps/admin/WEB-INF/lib
+		rm -f struts.jar
+		java-pkg_jar-from struts-1.2 struts.jar
+		cd ${base}
+	fi
 
 	# replace the default pw with a random one, see #92281
 	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)