Additional sed to correct server webapp context. Switched from copying context's to symlinking. Unbundled examples jakarta-jstl jars when USE flag is set.

(Portage version: 2.1.2.3)

3 files changed, 28 insertions, 15 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index dfd1e17e21c5..2755565d4028 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.131 2007/04/03 07:40:57 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.132 2007/04/04 22:22:55 wltjr Exp $
+
+*tomcat-6.0.10-r2 (04 Apr 2007)
+
+  04 Apr 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -tomcat-6.0.10-r1.ebuild, +tomcat-6.0.10-r2.ebuild:
+  Additional sed to correct server webapp context. Switched from copying
+  context's to symlinking. Unbundled examples jakarta-jstl jars when USE flag
+  is set.
 
   03 Apr 2007; Christian Faulhammer <opfer@gentoo.org>
   tomcat-5.5.23-r1.ebuild:
diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.10-r1 b/www-servers/tomcat/files/digest-tomcat-6.0.10-r2
index 3dd91cc642dc..3dd91cc642dc 100644
--- a/www-servers/tomcat/files/digest-tomcat-6.0.10-r1
+++ b/www-servers/tomcat/files/digest-tomcat-6.0.10-r2
diff --git a/www-servers/tomcat/tomcat-6.0.10-r1.ebuild b/www-servers/tomcat/tomcat-6.0.10-r2.ebuild
index 273b388b3c61..a964c9e7c790 100644
--- a/www-servers/tomcat/tomcat-6.0.10-r1.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.10-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.10-r1.ebuild,v 1.2 2007/03/30 23:17:05 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.10-r2.ebuild,v 1.1 2007/04/04 22:22:55 wltjr Exp $
 
 WANT_ANT_TASKS="ant-trax"
 
@@ -23,7 +23,8 @@ RDEPEND=">=virtual/jre-1.5
 	>=dev-java/commons-dbcp-1.2.1
 	>=dev-java/commons-logging-1.1
 	>=dev-java/commons-pool-1.2
-	~dev-java/tomcat-servlet-api-${PV}"
+	~dev-java/tomcat-servlet-api-${PV}
+	examples? ( dev-java/jakarta-jstl )"
 
 DEPEND=">=virtual/jdk-1.5
 	${RDEPEND}
@@ -81,9 +82,12 @@ src_install() {
 
 	# create dir structure
 	diropts -m755 -o tomcat -g tomcat
-	dodir   /etc/${TOMCAT_NAME}
+	dodir   /etc/${TOMCAT_NAME}/Catalina/localhost
 	fperms  750 /etc/${TOMCAT_NAME}
 	dodir /usr/share/${TOMCAT_NAME}
+	keepdir ${WEBAPPS_DIR}
+	chown tomcat:tomcat ${D}/${WEBAPPS_DIR} || die "Failed to change owner off ${1}."
+	chmod 750           ${D}/${WEBAPPS_DIR} || die "Failed to change permissions off ${1}."
 	keepdir /var/log/${TOMCAT_NAME}/
 	keepdir /var/tmp/${TOMCAT_NAME}/
 	keepdir /var/run/${TOMCAT_NAME}/
@@ -93,13 +97,9 @@ src_install() {
 	cd "${S}"
 	# fix context's since upstream is slackin
 	sed -i -e 's:}/server/:}/:' ${S}/webapps/host-manager/host-manager.xml
+	sed -i -e 's:}/server/:}/:' ${S}/webapps/host-manager/manager.xml
 	sed -i -e 's:}/server/:}/:' ${S}/webapps/manager/manager.xml
 
-	# copy the manager's context to the right position
-	mkdir -p conf/Catalina/localhost
-	cp ${S}/webapps/host-manager/host-manager.xml conf/Catalina/localhost
-	cp ${S}/webapps/manager/manager.xml conf/Catalina/localhost
-
 	# replace the default pw with a random one, see #92281
 	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
 	sed -e s:SHUTDOWN:${randpw}: -i conf/server.xml
@@ -107,15 +107,11 @@ src_install() {
 	# copy over the directories
 	chown -R tomcat:tomcat webapps/* conf/*
 	cp -pR conf/* ${D}/etc/${TOMCAT_NAME} || die "failed to copy conf"
-	cp -PR output/build/bin ${D}/usr/share/${TOMCAT_NAME} || die "failed to copy"
+	cp -pPR output/build/bin ${D}/usr/share/${TOMCAT_NAME} || die "failed to copy"
 
 	cp ${T}/tomcat6-deps/jdt/jasper-jdt.jar ${D}/usr/share/${TOMCAT_NAME}/lib \
 		|| die "failed to copy"
 
-	keepdir               ${WEBAPPS_DIR}
-	chown  tomcat:tomcat ${D}/${WEBAPPS_DIR} || die "Failed to change owner off ${1}."
-	chmod  750           ${D}/${WEBAPPS_DIR} || die "Failed to change permissions off ${1}."
-
 	cd "${D}/usr/share/${TOMCAT_NAME}/lib"
 	java-pkg_jar-from tomcat-servlet-api-2.5
 
@@ -134,7 +130,12 @@ src_install() {
 		cp -pr output/build/webapps/docs ${D}${CATALINA_BASE}/webapps
 	fi
 	if use examples; then
-		cp -pr output/build/webapps/examples ${D}${CATALINA_BASE}/webapps
+		cd output/build/webapps/examples/WEB-INF/lib
+		rm -f *.jar
+		java-pkg_jar-from jakarta-jstl jstl.jar
+		java-pkg_jar-from jakarta-jstl standard.jar
+		cd "${S}"
+		cp -pPr output/build/webapps/examples ${D}${CATALINA_BASE}/webapps
 	fi
 
 	# symlink the directories to make CATALINA_BASE possible
@@ -143,6 +144,10 @@ src_install() {
 	dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp
 	dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work
 
+	# link the manager's context to the right position
+	dosym ${TOMCAT_HOME}/webapps/host-manager/host-manager.xml /etc/${TOMCAT_NAME}/Catalina/localhost/host-manager.xml
+	dosym ${TOMCAT_HOME}/webapps/manager/manager.xml /etc/${TOMCAT_NAME}/Catalina/localhost/manager.xml
+
 	dodoc  ${S}/{RELEASE-NOTES,RUNNING.txt}
 	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
 }