www-servers/tomcat: version bump
authorMiroslav Šulc <fordfrog@gentoo.org>
Tue, 29 Nov 2011 13:00:21 +0000 (13:00 +0000)
committerMiroslav Šulc <fordfrog@gentoo.org>
Tue, 29 Nov 2011 13:00:21 +0000 (13:00 +0000)
Package-Manager: portage-2.1.10.39/cvs/Linux x86_64

www-servers/tomcat/ChangeLog
www-servers/tomcat/Manifest
www-servers/tomcat/files/7/7.0.23-build-xml.patch [new file with mode: 0644]
www-servers/tomcat/tomcat-7.0.23.ebuild [new file with mode: 0644]

index 346467cc4d6106322cc5194fbb0081c9ced61304..d550332177777a3d66feb1cf828767b891145371 100644 (file)
@@ -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.268 2011/11/13 15:02:17 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.269 2011/11/29 13:00:21 fordfrog Exp $
+
+*tomcat-7.0.23 (29 Nov 2011)
+
+  29 Nov 2011; Miroslav Šulc <fordfrog@gentoo.org>
+  +files/7/7.0.23-build-xml.patch, +tomcat-7.0.23.ebuild:
+  Version bump
 
   13 Nov 2011; Markus Meier <maekke@gentoo.org> tomcat-6.0.33.ebuild:
   x86 stable, bug #388131
index e164a82a6073aaf2c64b9f18a9a9857d5da09189..f8216b37627048abb1859aae71eba86f737e0168 100644 (file)
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 5.5/26-main_tomcat_catalina_jasper_build_xml.patch 16573 RMD160 53f1deaa88a39459a584cf14c761cb411d68f2e6 SHA1 69b3ca39f9dbabe12c56865d47866c06dcb7c2e3 SHA256 99a2c1bb164d97407525305512a85e6139531d81a47aa2c25f5c2cfe50aee1f6
 AUX 5.5/5.5.27-dynamic-JSSE13Factory.patch 1853 RMD160 31d20202a3be06c156b0c13f0afb3b394b8ecf02 SHA1 d7e7640dd4f7b7b92b21ac51d1b508fe56691a81 SHA256 f7db0e692088ec25a4731a521c1da4a0075e747f68690235fde3ca93c6f2e19d
 AUX 5.5/build-jspc-classpath.patch 1486 RMD160 454b41920a864e06b5b70e448fae724241eb008d SHA1 3671b1cd4d53fd248c19380c96760c051f7f7bff SHA256 865fd2a8721799b1628fe7b31f9bad00563d679236aba5656740feb310b6eb88
@@ -14,23 +11,19 @@ AUX 6/tomcat.conf 2895 RMD160 36ece62ddff5257c04f47d75b9c77bd4dc198652 SHA1 8fef
 AUX 6/tomcat.init.2 4034 RMD160 28a47d7e62ac5437eb2c9164f4595bd67b86f676 SHA1 c55f843f15db90e3e0af6069dfefc91daa4e0015 SHA256 55abf160871648ebeca531865b5918846cf298dadc9cdc5cc7ee060a8db487ad
 AUX 6/tomcat.init.3 4050 RMD160 d7fe0c83c7e5aeb30f2946c259c9f2bb3fe98aa8 SHA1 1519b957d5c467d604e5422f7876a08d79874ca5 SHA256 726fbfd0961df4a6fb70df17f72144a3f19c1080bd6f1f6abdadd849d5dd343c
 AUX 7/7.0.22-build-xml.patch 4744 RMD160 3d89056a8325ac7bf40f4b49822aff552e570d64 SHA1 87b6d986778e8c085500896feac1d7d0b56e3a9c SHA256 8764f2b11ca68712a8122b3c5995d85a4a3c56b855855ced1dce4ffd7b7bb1c1
+AUX 7/7.0.23-build-xml.patch 4897 RMD160 3b3b5755bd40e759985643f95f26e88069780f3c SHA1 8948dc0f168384670d6e69947de42069c30d78fd SHA256 e6f171cbdfa1af457dfe72be86a316e07a9bb9c22d3c98c094a0972ee4c38011
 AUX 7/tomcat.conf 2895 RMD160 e0f3b7f72b925a5d681780e1dcdde46143daef48 SHA1 1b94de2c71c046045b5622756d976378678200a3 SHA256 834b38c1e17294ee73c6571a45fb35bc398f15da4ed189e4d359b8b39121bb8e
 AUX 7/tomcat.init 3505 RMD160 6fd99e04c94ca5cccd61d4dce4f35fa9f058488f SHA1 1e550da27a648a36eec9a4e3991e77992fdbd7c8 SHA256 9b2eaaadc9ccf25cf56212d3ca0574bba286fef7895c0a56327d5c3d5f98f5d5
 DIST apache-tomcat-5.5.27-src.tar.gz 7382057 RMD160 8114fa3be19fd28a5d2d0d7e7087f6d82e0f111f SHA1 c6217d78d2e64fa839a30372bd2724ba75030c14 SHA256 90bc8abcddda604e855c37035653b1e24b31c2f09b7a29235e92d65025f7a334
 DIST apache-tomcat-6.0.32-src.tar.gz 3394648 RMD160 e6203645e6570564b25154018436d908c5b1a71a SHA1 ec94c511e54da2b02dd2ba45b9fd1703d5771a45 SHA256 aa2b72343f2d7f5090e8aabdbf6e0c4f65cd504a719ebb2e18268207ff2c426c
 DIST apache-tomcat-6.0.33-src.tar.gz 3389376 RMD160 24bd6c0e1bee7daa4cb59ec56552599330f0bb4c SHA1 437db0ba55c6e398fe3af73c4fa5eed3c4666842 SHA256 6dbd5d6eedcf3acd8bf7b6e32544a6e94ec595f7c921baa92f08adb5a5d91b64
 DIST apache-tomcat-7.0.22-src.tar.gz 4044650 RMD160 e49636d4555f92a4f56a46aee7fcdec3ede5b1f1 SHA1 588512b2149850b3e6de1ac20c79b54aea074eff SHA256 e907cc65ec38cf9e01995432cc7925c18d03cdbc0dd6baa8f82df2bae83c8486
+DIST apache-tomcat-7.0.23-src.tar.gz 4103854 RMD160 ebe500ffcc7903c6f4d301533a2a16cb878d11ef SHA1 fe56adb0939825c4f7c0f69e57858b1fb93ae958 SHA256 b86523095b06d58b9553683f480250dec7216ce1914c92ea8ecca0799e6ad3b0
 EBUILD tomcat-5.5.27-r4.ebuild 10028 RMD160 39b0fde8bce7ca92a11d69992f1f8ba70404d70d SHA1 31953fe9665686f43d333608dfb73eff87717bae SHA256 bb074efd50f5164c4b07b97de1de0d77cc05c8548112de7f873fb1afe2b04b19
 EBUILD tomcat-5.5.27-r5.ebuild 10087 RMD160 f9f32edcf802c72499de5519e332aaf7b4b7efbf SHA1 7d494c9bd1ea4b6da8bf4913c8f28e7180d57535 SHA256 93e335594ff10e4bd9d9d2537f0ba5d701c909e181d0fe25d841b771743ec8fb
 EBUILD tomcat-6.0.32-r1.ebuild 6964 RMD160 a38e0536f45b4fbf5d4cbffb903a11c83948bdb4 SHA1 3196907adc07db41a62c43078c1c078a11e4d249 SHA256 00f8ecbc1676db5902971dd76d354e8b5bfe8938f285e9d5578e64160dcc087b
 EBUILD tomcat-6.0.33.ebuild 6961 RMD160 17c4cc0cd1bf9b681f612bf131f34440e1a67bae SHA1 1dbe88bf2615d57add8e0deab2074d653a7423f0 SHA256 ae706bb3f875113fa03dc4e9770cd43b033db449f75bb3c76e7bd9b1405c2036
 EBUILD tomcat-7.0.22-r1.ebuild 7061 RMD160 bee674c76e8b18d6f7151b8c97ca7ce518cbec5c SHA1 667080b1585a16af1153d09c65b338a803bd7f4b SHA256 4896d355fcfbd5053584d83b01d6cd94ab965daa61113a26110c44f7eb09ccde
-MISC ChangeLog 66908 RMD160 54e84860385bd21ed231950c1ca6cb44f5187332 SHA1 ca55c879f209ac9dc5ddf005b08816d7f0dcb9da SHA256 af6552dd07af55263186c04ca95a6fee189dcac2dfd6c3b08b317b46d04985eb
+EBUILD tomcat-7.0.23.ebuild 7058 RMD160 a9d606e91ee0c811cb1efc0336ca553be0f540d8 SHA1 9a88b0c66bec18ddd524c60f7e6b65cbc0514dae SHA256 aa7245b06be0cec0e5cc6be67d1b6cb7347dd5563e5cf3a1b8d1905733ef8099
+MISC ChangeLog 67066 RMD160 ff6f9bc4a54918585b6ef53b2bb7f7827a463fb0 SHA1 a03d645e9ead64cb85cc1744128ebebd39997ed6 SHA256 9a7198839967b5081fb60d589cfc4288432741a046bac06c5d31043f98815d00
 MISC metadata.xml 521 RMD160 72b6ce433f5c9a65deaa0c1830c070c3adbcf33a SHA1 2c4f4fd887a5df9e955c711d0fcd21a5cab90a2d SHA256 dbab559e58c59eddd5df1c3bb39d17b26fadb587ad5dab51fc6fa7af5e601e22
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk6/3E4ACgkQkKaRLQcq0GLywgCfZ3kmbgWQWzTYPf6tozvGHiaF
-x2oAmgI6G/3WSUz0D1muhLALl/8Utp7N
-=ScYb
------END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/files/7/7.0.23-build-xml.patch b/www-servers/tomcat/files/7/7.0.23-build-xml.patch
new file mode 100644 (file)
index 0000000..e5978bb
--- /dev/null
@@ -0,0 +1,138 @@
+diff --git a/apache-tomcat-7.0.23-src/build.xml b/apache-tomcat-7.0.23-src/build.xml
+index 1601cc6..a3a66a8 100644
+--- a/apache-tomcat-7.0.23-src/build.xml
++++ b/apache-tomcat-7.0.23-src/build.xml
+@@ -156,6 +156,7 @@
+   
+   <!-- Classpaths -->
+   <path id="compile.classpath">
++    <pathelement location="${ant.jar}"/>
+     <pathelement location="${jdt.jar}"/>
+   </path>
+ 
+@@ -301,6 +302,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">
+@@ -430,7 +432,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"/>
+ 
+@@ -482,7 +484,7 @@
+     </copy>
+   </target>
+ 
+-  <target name="compile" depends="build-prepare,download-compile,compile-prepare,validate">
++  <target name="compile" depends="build-prepare,compile-prepare,validate">
+     <!-- Compile internal server components -->
+     <javac srcdir="java" destdir="${tomcat.classes}"
+            debug="${compile.debug}"
+@@ -544,7 +546,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"
+@@ -552,7 +554,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"
+@@ -560,12 +562,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}"
+@@ -656,7 +658,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">
+@@ -770,14 +772,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">
+@@ -834,7 +836,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">
+@@ -846,7 +848,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">
+@@ -854,11 +856,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">
+@@ -1042,7 +1044,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.23.ebuild b/www-servers/tomcat/tomcat-7.0.23.ebuild
new file mode 100644 (file)
index 0000000..c69936e
--- /dev/null
@@ -0,0 +1,226 @@
+# 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.23.ebuild,v 1.1 2011/11/29 13:00:21 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=""
+
+ECJV="3.7"
+
+# 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
+}