[patch] Properly fix both the keep dir, and an invisible problem

tomcatkeepdir.patch (text/plain), 1.08 KB, created by Peter Ansell on 2006-12-12 16:32:30 UTC

--- /usr/portage/www-servers/tomcat/tomcat-5.5.20-r5.ebuild	2006-12-12 08:06:32.000000000 +1000
+++ /usr/local/portage-overlays/ansells-portage-overlay/www-servers/tomcat/tomcat-5.5.20-r6.ebuild	2006-12-13 10:24:44.000000000 +1000
@@ -56,8 +56,8 @@
 
 S=${WORKDIR}/${MY_P}
 
-TOMCAT_HOME="/usr/share/${PN}-${SLOT}"
 TOMCAT_NAME="${PN}-${SLOT}"
+TOMCAT_HOME="/usr/share/${TOMCAT_NAME}"
 WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
 
 pkg_setup() {
@@ -182,7 +182,7 @@
 
 	# create dir structure
 	diropts -m755 -o tomcat -g tomcat
-	dodir /usr/share/${TOMCAT_NAME}
+	dodir ${TOMCAT_HOME}
 	keepdir /var/log/${TOMCAT_NAME}/
 	keepdir /var/tmp/${TOMCAT_NAME}/
 	keepdir /var/run/${TOMCAT_NAME}/
@@ -191,8 +191,10 @@
 	dodir   ${CATALINA_BASE}
 	keepdir ${CATALINA_BASE}/shared/lib
 	keepdir ${CATALINA_BASE}/shared/classes
-
-	keepdir /usr/share/${TOMCAT_NAME}/${CATALIA_HOME}/common/lib
+	keepdir ${TOMCAT_HOME}/server/classes
+	keepdir ${TOMCAT_HOME}/common/classes
+	keepdir ${TOMCAT_HOME}/common/endorsed
+	keepdir ${TOMCAT_HOME}/common/lib
 
 	dodir   /etc/${TOMCAT_NAME}
 	fperms  750 /etc/${TOMCAT_NAME}