From 4862c765671a10c64c0bb365b0c9f35430a4697b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Miroslav=20=C5=A0ulc?= <fordfrog@gentoo.org>
Date: Mon, 15 Aug 2011 09:24:20 +0000
Subject: [PATCH] www-servers/tomcat: version bump

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64
---
 www-servers/tomcat/ChangeLog                  |   8 +-
 www-servers/tomcat/Manifest                   |   5 +-
 .../tomcat/files/7/7.0.20-build-xml.patch     | 136 +++++++++++
 www-servers/tomcat/tomcat-7.0.20.ebuild       | 227 ++++++++++++++++++
 4 files changed, 374 insertions(+), 2 deletions(-)
 create mode 100644 www-servers/tomcat/files/7/7.0.20-build-xml.patch
 create mode 100644 www-servers/tomcat/tomcat-7.0.20.ebuild

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 143ff9cffded..9be53b0a1a82 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.256 2011/07/19 13:59:24 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.257 2011/08/15 09:24:20 fordfrog Exp $
+
+*tomcat-7.0.20 (15 Aug 2011)
+
+  15 Aug 2011; Miroslav Å ulc <fordfrog@gentoo.org>
+  +files/7/7.0.20-build-xml.patch, +tomcat-7.0.20.ebuild:
+  Version bump
 
 *tomcat-7.0.19 (19 Jul 2011)
 
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 66fcdbdd4c00..2f7f366cf933 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -16,6 +16,7 @@ AUX 6/tomcat.init.3 4050 RMD160 d7fe0c83c7e5aeb30f2946c259c9f2bb3fe98aa8 SHA1 15
 AUX 7/7.0.14-build-xml.patch 4612 RMD160 9cec14c22e777eab0ea99e3d096a4e70647c6ec2 SHA1 b64989924cca3e121752e93100ac795a52e1d456 SHA256 5fcdfe19d7815deebb860d542cc0779012dec8727b37da4861e19dba80e771fc
 AUX 7/7.0.16-build-xml.patch 4612 RMD160 9cec14c22e777eab0ea99e3d096a4e70647c6ec2 SHA1 b64989924cca3e121752e93100ac795a52e1d456 SHA256 5fcdfe19d7815deebb860d542cc0779012dec8727b37da4861e19dba80e771fc
 AUX 7/7.0.19-build-xml.patch 4744 RMD160 3d89056a8325ac7bf40f4b49822aff552e570d64 SHA1 87b6d986778e8c085500896feac1d7d0b56e3a9c SHA256 8764f2b11ca68712a8122b3c5995d85a4a3c56b855855ced1dce4ffd7b7bb1c1
+AUX 7/7.0.20-build-xml.patch 4744 RMD160 3d89056a8325ac7bf40f4b49822aff552e570d64 SHA1 87b6d986778e8c085500896feac1d7d0b56e3a9c SHA256 8764f2b11ca68712a8122b3c5995d85a4a3c56b855855ced1dce4ffd7b7bb1c1
 AUX 7/build-xml.patch 5561 RMD160 672659e5273a9d6ef450fd29cc171fae56c99c9a SHA1 08714c12a72b1db8490460b10f74d32fc951dacb SHA256 f85ec37d37cc2bceca7877da3271570701a352e087e101e6b3146bdd16f31490
 AUX 7/examples-cal.patch 565 RMD160 85294480f354eb19340bdc7357690ae55ef5a89f SHA1 e9550e02500f2d9da6f4f7b3c7ca79c1934318ea SHA256 caf76c88d3b67d29a7aadca1485accd01270d986e7bc77281a9b30f0b1582b55
 AUX 7/tomcat.conf 2895 RMD160 e0f3b7f72b925a5d681780e1dcdde46143daef48 SHA1 1b94de2c71c046045b5622756d976378678200a3 SHA256 834b38c1e17294ee73c6571a45fb35bc398f15da4ed189e4d359b8b39121bb8e
@@ -28,6 +29,7 @@ DIST apache-tomcat-6.0.32-src.tar.gz 3394648 RMD160 e6203645e6570564b25154018436
 DIST apache-tomcat-7.0.14-src.tar.gz 3898052 RMD160 7361f27ea40cbbe0e431c8dc5e39794cfe271b4b SHA1 ef717f131ff27fc52e8949ceb15eceec806ebf84 SHA256 2d50f2f67c0e2e711cb5119739ac8752c15bc6732f4c8eaf85fe00008103fb17
 DIST apache-tomcat-7.0.16-src.tar.gz 3906690 RMD160 0546da942c4fcc498bcea88cc018e19829f3534b SHA1 d19b59df519858c07cae3e94a78a08f44b648391 SHA256 a63e2ddf79748142ac28824e108a75074d1da7dbc32c87e738c8c001594e785c
 DIST apache-tomcat-7.0.19-src.tar.gz 4055185 RMD160 ea57d5ddfeff9902ded5908efb0da3224a286d9c SHA1 b2bd010fd92cc5491e383f31de01cc89ded8e433 SHA256 6d9549bf63cd69e44b48ac06e85e9a7642808abf45ff8d459b248c74e4a878d3
+DIST apache-tomcat-7.0.20-src.tar.gz 4037475 RMD160 9c3cf854e98b3e4ef9e4b16cfbf11b48a7300947 SHA1 9bdffb0567c59eaa7502818ec48ca63310709cbe SHA256 7391619ee4e27b1608a8fea18b0a4677d7f2be51e4b1340c553650f1cfa1036d
 EBUILD tomcat-5.5.27-r4.ebuild 10058 RMD160 a235794b1e53760c35289566dcaff2446437f53d SHA1 a49fb2db00fbcab78ab8672cdb11a8b0404df671 SHA256 18b69fb66c088a621db636243823701504af0a1dcc16df378e018f1958ecfa01
 EBUILD tomcat-5.5.27-r5.ebuild 10119 RMD160 ef3c4d2d31ca81fdc357afdb11c13704ed14a5a1 SHA1 daf3d57e12f9bd8f25465e74be7f3bef945a8db2 SHA256 2dcbf313716d4e208f3c70abc759a9c43cb066705793d1ad94304363b270906f
 EBUILD tomcat-6.0.26-r2.ebuild 6913 RMD160 bdf0aba8f686216106286f7210823387699e1960 SHA1 75ea1850ed3d9f2ab7a2194cefa022e0652e286a SHA256 33fe5868df3c1eb86983fc9c220629947b2ec0538f7467aaafa14ed1571a14a2
@@ -39,5 +41,6 @@ EBUILD tomcat-6.0.32-r2.ebuild 6968 RMD160 756ffd21d60906c47031e0bc202d3fc77b21c
 EBUILD tomcat-7.0.14.ebuild 7085 RMD160 7e9104de3a2201eed81725fd871d526cef8d0fc3 SHA1 a6fc7ca22901bb524dc45471105db1b47549c49c SHA256 1de546fadcb7b84b4aaa0849b703bca94e50f7b77e892f191fafa601fcffe32c
 EBUILD tomcat-7.0.16.ebuild 7085 RMD160 ed13c4fcd59a070cb0a3517e5c2d931bebe013de SHA1 771e6935e83c571456c9b2470caaa236da4d79c9 SHA256 ab9f3436c8944221c73eb61360a7f6b3218d820955465b450a309d7c2864b565
 EBUILD tomcat-7.0.19.ebuild 7147 RMD160 04def7f58e6f75b5635da8dc3138308e61cbfaa8 SHA1 9f11db6f2bb7cbad5d457780bded3d14a44b221b SHA256 97660acb392b883263db92aa86b6cb762e948200b99ef0e1c5daa33564e073a9
-MISC ChangeLog 64588 RMD160 93b3c676820238481f9029b2f01b9cd6ce6750b2 SHA1 a20efaf1b557de6a60c7f3d35fd30ef190c4da43 SHA256 e200f2ccbabb35605057d0b11255c199c7f2773bfae45a866ae6cf7862d4f2d7
+EBUILD tomcat-7.0.20.ebuild 7147 RMD160 6e390e475b84c9b5ec9d79eb255f3d141fc59eb5 SHA1 1a94aff31bb323419b55e63525c14a3e7b6e00f2 SHA256 e0d24ef557db1924d0200d5ba19c4ec55899c1eabe7ac1e260c466e6a4e3e886
+MISC ChangeLog 64744 RMD160 7d3d030a5c594a6282dc8537c2eff515481bb4d7 SHA1 4b1fa204f51c4c1df8c1a4257ed16e7c0e9e0737 SHA256 2953987068d0f36f001985733c4a68abdd783414e527f18ad4c803e3f45e0076
 MISC metadata.xml 521 RMD160 72b6ce433f5c9a65deaa0c1830c070c3adbcf33a SHA1 2c4f4fd887a5df9e955c711d0fcd21a5cab90a2d SHA256 dbab559e58c59eddd5df1c3bb39d17b26fadb587ad5dab51fc6fa7af5e601e22
diff --git a/www-servers/tomcat/files/7/7.0.20-build-xml.patch b/www-servers/tomcat/files/7/7.0.20-build-xml.patch
new file mode 100644
index 000000000000..9a7825c502f7
--- /dev/null
+++ b/www-servers/tomcat/files/7/7.0.20-build-xml.patch
@@ -0,0 +1,136 @@
+--- build.xml.orig	2011-03-05 14:11:01.000000000 +0100
++++ build.xml	2011-03-08 17:39:53.752257789 +0100
+@@ -147,6 +147,7 @@
+   
+   <!-- Classpaths -->
+   <path id="compile.classpath">
++    <pathelement location="${ant.jar}"/>
+     <pathelement location="${jdt.jar}"/>
+   </path>
+ 
+@@ -291,6 +292,7 @@
+     <exclude name="org/apache/catalina/mbeans/JmxRemote*" />
+     <exclude name="org/apache/catalina/tribes/**" />
+     <exclude name="org/apache/naming/factory/webservices/**" />
++    <exclude name="javax/servlet/**" />
+   </patternset>
+ 
+   <patternset id="files.catalina-tribes">
+@@ -420,7 +422,7 @@
+     
+   </target>
+ 
+-  <target name="validate" depends="download-validate" if="${execute.validate}">
++  <target name="validate" if="${execute.validate}">
+     <!-- Required so we can cache checkstyle results -->
+     <mkdir dir="${tomcat.output}/res/checkstyle"/>
+ 
+@@ -464,7 +466,7 @@
+     </checkstyle>
+   </target>
+ 
+-  <target name="compile" depends="build-prepare,download-compile,validate">
++  <target name="compile" depends="build-prepare,validate">
+ 
+     <!-- Compile internal server components -->
+     <javac srcdir="java" destdir="${tomcat.classes}"
+@@ -525,7 +527,7 @@
+       filesId="files.annotations-api"
+       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+-    <!-- Servlet 3.0 Implementation JAR File -->
++<!-- Servlet 3.0 Implementation JAR File
+     <jarIt jarfile="${servlet-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.servlet-api"
+@@ -533,7 +535,7 @@
+       notice="${tomcat.manifests}/servlet-api.jar.notice"
+       license="${tomcat.manifests}/servlet-api.jar.license" />
+ 
+-    <!-- JSP 2.2 Implementation JAR File -->
++    JSP 2.2 Implementation JAR File
+     <jarIt jarfile="${jsp-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jsp-api"
+@@ -541,12 +543,12 @@
+       notice="${tomcat.manifests}/jsp-api.jar.notice"
+       license="${tomcat.manifests}/jsp-api.jar.license" />
+ 
+-    <!-- JSP 2.2 EL Implementation JAR File -->
++    JSP 2.2 EL Implementation JAR File
+     <jarIt jarfile="${el-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.el-api"
+       manifest="${tomcat.manifests}/el-api.jar.manifest" />
+-
++-->
+     <!-- Bootstrap JAR File -->
+     <jarIt jarfile="${bootstrap.jar}"
+       filesDir="${tomcat.classes}"
+@@ -637,7 +639,7 @@
+ 
+   </target>
+ 
+-  <target name="build-docs" description="Builds all documentation from XML sources">
++  <target name="build-docs" unless="nobuild.docs" description="Builds all documentation from XML sources">
+ 
+     <copy todir="${tomcat.build}/webapps">
+       <fileset dir="webapps">
+@@ -745,14 +747,14 @@
+ 
+   <target name="deploy" depends="package,build-docs"
+           description="Default. Builds a working Tomcat instance">
+-
++<!--
+     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
+             file="${tomcat-native.tar.gz}" />
+     <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
+             file="${commons-daemon.native.src.tgz}" />
+ 
+     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+     <!-- Copy scripts -->
+     <copy todir="${tomcat.build}/bin">
+       <fileset dir="bin">
+@@ -809,7 +811,7 @@
+              source="${compile.source}"
+              target="${compile.target}"
+              optimize="${compile.optimize}"
+-             classpath="${tomcat.classes}"
++             classpath="${tomcat.classes}:${jsp-api.jar}"
+              excludes="**/CVS/**,**/.svn/**"
+              encoding="ISO-8859-1"
+              includeantruntime="false">
+@@ -821,7 +823,7 @@
+              source="${compile.source}"
+              target="${compile.target}"
+              optimize="${compile.optimize}"
+-             classpath="$tomcat.lcasses}"
++             classpath="${tomcat.classes}:${jsp-api.jar}"
+              excludes="**/CVS/**,**/.svn/**"
+              encoding="ISO-8859-1"
+              includeantruntime="false">
+@@ -829,11 +831,11 @@
+ 
+     <!-- Add sources for examples -->
+     <antcall target="examples-sources" />
+-
++<!--
+     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
+       failonerror="false"/>
+     <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
+-
++-->
+     <!-- build the jdbc-pool jar and source jar-->
+     <echo message="Building Tomcat JDBC pool libraries"/>
+     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" inheritall="false" target="build">
+@@ -1008,7 +1010,7 @@
+ 
+   </target>
+ 
+-  <target name="test-compile" depends="compile,download-test-compile" >
++  <target name="test-compile" depends="compile" >
+     <mkdir dir="${test.classes}"/>
+     <!-- Compile -->
+     <javac srcdir="test" destdir="${test.classes}"
diff --git a/www-servers/tomcat/tomcat-7.0.20.ebuild b/www-servers/tomcat/tomcat-7.0.20.ebuild
new file mode 100644
index 000000000000..59d70e7bf454
--- /dev/null
+++ b/www-servers/tomcat/tomcat-7.0.20.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.20.ebuild,v 1.1 2011/08/15 09:24:20 fordfrog Exp $
+
+EAPI=2
+JAVA_PKG_IUSE="doc examples source test"
+WANT_ANT_TASKS="ant-trax"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
+
+MY_P="apache-${P}-src"
+SLOT="7"
+SRC_URI="mirror://apache/${PN}/${PN}-${SLOT}/v${PV}/src/${MY_P}.tar.gz"
+HOMEPAGE="http://tomcat.apache.org/"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+LICENSE="Apache-2.0"
+
+IUSE=""
+
+# eclipse ecj version/slot (upstream uses version 3.7 which we do not have packaged yet)
+ECJV="3.6"
+
+# servlet-api slot
+SAPIS="3.0"
+
+COMMON_DEPEND="dev-java/eclipse-ecj:${ECJV}
+	dev-java/ant-eclipse-ecj:${ECJV}
+	>=dev-java/commons-dbcp-1.4
+	>=dev-java/commons-logging-1.1
+	>=dev-java/commons-pool-1.5.5
+	~dev-java/tomcat-servlet-api-${PV}
+	examples? ( dev-java/jakarta-jstl )"
+
+RDEPEND="
+	!<dev-java/tomcat-native-1.1.20
+	>=virtual/jre-1.6
+	>=dev-java/commons-daemon-1.0.3
+	dev-java/ant-core
+	${COMMON_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	${COMMON_DEPEND}
+	test? ( =dev-java/junit-3.8* )"
+
+S=${WORKDIR}/${MY_P}
+
+TOMCAT_NAME="${PN}-${SLOT}"
+TOMCAT_HOME="/usr/share/${TOMCAT_NAME}"
+WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
+
+# TODO: Fails to find PrettyPrint in with python 2.6 and xml-rewriter-3
+# Find out why so
+JAVA_ANT_CELEMENT_REWRITER="true"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_NEEDS_TOOLS="true"
+EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPIS},eclipse-ecj-${ECJV}"
+
+EANT_BUILD_TARGET="package"
+EANT_DOC_TARGET="build-docs"
+
+EANT_EXTRA_ARGS="-Dbase.path=${T} -Dversion=${PV}-gentoo -Dversion.number=${PV}
+-Dcompile.debug=false -Del-api.jar=el-api.jar -Djsp-api.jar=jsp-api.jar -Dservlet-api.jar=servlet-api.jar
+-Dant.jar=ant.jar"
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	enewgroup tomcat 265
+	enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+java_prepare() {
+	epatch "${FILESDIR}/${SLOT}/${PV}-build-xml.patch"
+
+	rm -v webapps/examples/WEB-INF/lib/*.jar \
+		test/webapp-3.0-fragments/WEB-INF/lib/*.jar || die
+
+	# bug # 178980 and #312293
+	use amd64 && java-pkg_force-compiler eclipse-ecj-${ECJV}
+
+	if ! use doc; then
+		EANT_EXTRA_ARGS+=" -Dnobuild.docs=true"
+	fi
+
+	EANT_EXTRA_ARGS+=" -Djdt.jar=$(java-pkg_getjar eclipse-ecj-${ECJV} ecj.jar)"
+	java-pkg_jarfrom --build-only ant-core ant.jar
+}
+
+src_install() {
+	cd "${S}/bin"
+	rm -f *.bat
+	chmod 755 *.sh
+
+	# register jars per bug #171496
+	cd "${S}/output/build/lib/"
+	for jar in *.jar; do
+		java-pkg_dojar ${jar}
+	done
+
+	local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
+
+	# init.d, conf.d
+	newinitd "${FILESDIR}"/${SLOT}/tomcat.init ${TOMCAT_NAME}
+	newconfd "${FILESDIR}"/${SLOT}/tomcat.conf ${TOMCAT_NAME}
+
+	# create dir structure
+	dodir /usr/share/${TOMCAT_NAME}
+
+	diropts -m750 -o tomcat -g tomcat
+	dodir   /etc/${TOMCAT_NAME}
+	keepdir ${WEBAPPS_DIR}
+
+	diropts -m755 -o tomcat -g tomcat
+	dodir   ${CATALINA_BASE}
+
+	diropts -m775 -o tomcat -g tomcat
+	dodir   /etc/${TOMCAT_NAME}/Catalina/localhost
+	keepdir /var/log/${TOMCAT_NAME}/
+	keepdir /var/run/${TOMCAT_NAME}/
+	keepdir /var/tmp/${TOMCAT_NAME}/
+
+	cd "${S}"
+	# fix context's so webapps will be deployed
+	sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/host-manager"  a:' "${S}"/webapps/host-manager/META-INF/context.xml
+	sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/manager"  a:' "${S}"/webapps/manager/META-INF/context.xml
+
+	# 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
+
+	# copy over the directories
+	chown -R tomcat:tomcat webapps/* conf/*
+	cp -pR conf/* "${D}"/etc/${TOMCAT_NAME} || die "failed to copy conf"
+	cp -pPR output/build/bin "${D}"/usr/share/${TOMCAT_NAME} \
+		|| die "failed to copy"
+	# webapps get stored in /usr/share/${TOMCAT_NAME}/webapps
+	cd "${S}"/webapps || die
+	ebegin "Installing webapps to /usr/share/${TOMCAT_NAME}"
+
+	dodir /usr/share/${TOMCAT_NAME}/webapps
+	cp -pR ROOT "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
+	cp -pR host-manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
+	cp -pR manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
+	if use doc; then
+		cp -pR docs "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
+	fi
+	if use examples; then
+		cd "${S}"/webapps/examples/WEB-INF/lib
+		java-pkg_jar-from jakarta-jstl jstl.jar
+		java-pkg_jar-from jakarta-jstl standard.jar
+		cd "${S}"/webapps
+		cp -pR examples "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
+	fi
+
+	# replace catalina.policy with gentoo specific one bug #176701
+#	cp ${FILESDIR}/${SLOT}/catalina.policy "${D}"/etc/${TOMCAT_NAME} \
+#		|| die "failed to replace catalina.policy"
+
+	cd "${D}/usr/share/${TOMCAT_NAME}/lib" || die
+	java-pkg_jar-from eclipse-ecj-${ECJV}
+	java-pkg_jar-from tomcat-servlet-api-${SAPIS}
+
+	# symlink the directories to make CATALINA_BASE possible
+	dosym /etc/${TOMCAT_NAME} ${CATALINA_BASE}/conf
+	dosym /var/log/${TOMCAT_NAME} ${CATALINA_BASE}/logs
+	dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp
+	dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work
+
+	dodoc  "${S}"/{RELEASE-NOTES,RUNNING.txt}
+	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
+
+	#install *.sh scripts bug #278059
+	exeinto /usr/share/${TOMCAT_NAME}/bin
+	doexe "${S}"/bin/*.sh
+}
+
+pkg_postinst() {
+	ewarn "Changing ownership recursively on /etc/${TOMCAT_NAME}"
+	# temp fix for bug #176097
+	chown -fR tomcat:tomcat /etc/${TOMCAT_NAME}
+	ewarn "Owner ship changed to tomcat:tomcat. Temp hack/fix."
+
+	# bug #180519
+	if [[ -e "${ROOT}var/lib/${TOMCAT_NAME}/webapps/manager" ]] ; then
+		elog "The latest webapp has NOT been installed into"
+		elog "${ROOT}var/lib/${TOMCAT_NAME}/webapps/ because directory already exists"
+		elog "and we do not want to overwrite any files you have put there."
+		elog
+		elog "Installing latest webapp into"
+		elog "${ROOT}usr/share/${TOMCAT_NAME}/webapps instead"
+		elog
+		elog "Manager Symbolic Links NOT created."
+
+		else
+		einfo "Installing latest webroot to ${ROOT}/${WEBAPPS_DIR}"
+		cp -pR "${ROOT}"/usr/share/${TOMCAT_NAME}/webapps/* \
+			"${ROOT}""${WEBAPPS_DIR}"
+		# link the manager's context to the right position
+		dosym ${TOMCAT_HOME}/webapps/host-manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/host-manager.xml
+		dosym ${TOMCAT_HOME}/webapps/manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/manager.xml
+	fi
+
+	elog
+	elog " This ebuild implements a FHS compliant layout for tomcat"
+	elog " Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml"
+	elog " for more information."
+	elog
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+	elog
+
+	ewarn "The manager webapps have known exploits, please refer to"
+	ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2450"
+
+	if use examples ; then
+		ewarn
+		ewarn "The examples webapp has a known exploit, please refer to"
+		ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2449"
+		ewarn
+	fi
+
+	elog
+	elog " Please report any bugs to http://bugs.gentoo.org/"
+	elog
+}
-- 
2.26.2