www-servers/tomcat: version bump

Package-Manager: portage-2.1.12.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xCFE47E2F

4 files changed, 256 insertions, 5 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index c9166bde1653..cd76817ee07d 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.318 2013/06/11 11:38:17 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.319 2013/07/08 16:57:56 fordfrog Exp $
+
+*tomcat-7.0.42 (08 Jul 2013)
+
+  08 Jul 2013; Miroslav Šulc <fordfrog@gentoo.org> +tomcat-7.0.42.ebuild,
+  +files/tomcat-7.0.42-build.xml.patch:
+  version bump
 
   11 Jun 2013; Miroslav Šulc <fordfrog@gentoo.org> -tomcat-7.0.33.ebuild,
   -tomcat-7.0.34.ebuild, -tomcat-7.0.35.ebuild, -tomcat-7.0.37.ebuild,
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 694e17bccae4..693dc7bf9523 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -6,6 +6,7 @@ AUX tomcat-6.0.37-build.xml.patch 950 SHA256 33af0fd388c439e3ee74fd2271d94066169
 AUX tomcat-7.0.32-build.xml.patch 3852 SHA256 6b003e9c58131cfec4b5d312a18dbcd088428774a544d8d29b896542d3c92c5a SHA512 01feaa4428345203e2c5f0e28ee40bb9f7fd9351446e2454b43d5c1f7f7775606b70b47905e452511661e38ab5965865ed0622979e7845661c87e01a64f0e8cd WHIRLPOOL c86197abec4af7417803d85bd05615e24942f944fbda6712cf3c29ccd4989306f017663d378a719c2d71dd069d5c8850d5e2f4ec57b2243f4758c46bfe7ce2ed
 AUX tomcat-7.0.39-build.xml.patch 3852 SHA256 6b003e9c58131cfec4b5d312a18dbcd088428774a544d8d29b896542d3c92c5a SHA512 01feaa4428345203e2c5f0e28ee40bb9f7fd9351446e2454b43d5c1f7f7775606b70b47905e452511661e38ab5965865ed0622979e7845661c87e01a64f0e8cd WHIRLPOOL c86197abec4af7417803d85bd05615e24942f944fbda6712cf3c29ccd4989306f017663d378a719c2d71dd069d5c8850d5e2f4ec57b2243f4758c46bfe7ce2ed
 AUX tomcat-7.0.41-build.xml.patch 3852 SHA256 6b003e9c58131cfec4b5d312a18dbcd088428774a544d8d29b896542d3c92c5a SHA512 01feaa4428345203e2c5f0e28ee40bb9f7fd9351446e2454b43d5c1f7f7775606b70b47905e452511661e38ab5965865ed0622979e7845661c87e01a64f0e8cd WHIRLPOOL c86197abec4af7417803d85bd05615e24942f944fbda6712cf3c29ccd4989306f017663d378a719c2d71dd069d5c8850d5e2f4ec57b2243f4758c46bfe7ce2ed
+AUX tomcat-7.0.42-build.xml.patch 3852 SHA256 6b003e9c58131cfec4b5d312a18dbcd088428774a544d8d29b896542d3c92c5a SHA512 01feaa4428345203e2c5f0e28ee40bb9f7fd9351446e2454b43d5c1f7f7775606b70b47905e452511661e38ab5965865ed0622979e7845661c87e01a64f0e8cd WHIRLPOOL c86197abec4af7417803d85bd05615e24942f944fbda6712cf3c29ccd4989306f017663d378a719c2d71dd069d5c8850d5e2f4ec57b2243f4758c46bfe7ce2ed
 AUX tomcat-instance-manager.bash 6403 SHA256 09ff73a51d6f11b83c78d6306322455091da302c8d6bd711a0fa4983d850dab4 SHA512 7b51b77447854dd4c6fd4a3bc16aa912edcb5e31d64a4c47f24102c3fc29c2a18f51d8b8f0e28723fba694451c8ab780dcac3d12dc553dc3f182c1d1372e7171 WHIRLPOOL ad845aedd608615df243722be6a4e3ad477890ee8e59b5d0061c4490d95058d7857346bf545c16d7756ecfa62a0b31f137d819095461cb6180cc75df1d81511d
 AUX tomcat.conf 1544 SHA256 6f74ff1ea148322d7595bb6bc10bd00a81851d1822046c01e7f42885b357a4cc SHA512 36ba5c4ccf9ac062acfaaecefd9aba1065fd5553df21cd9c2ffd2b320de472c3397d8499d3a2a96b51d8ef513aa86d5879a42287579da4152916802a988c7811 WHIRLPOOL f2ea708f87b21a004680f3f2865b98bfbeb4dbbee77ce19e7577a8d461df21d682136bda88591114c6b9c2e1dec42ed816ea4a981e6863ea1faaf3f0407dbce3
 AUX tomcat.init 2989 SHA256 bae9e2663e5fda9c665fc97e916074cca46468560af17e3bbad030adf950e314 SHA512 0be4ed921efebc740326009bfb3cf33df0bcd3d24395381e8dfee09b993bbb1865369e7a1837710c5853d3d4534bbd4362a50edc05b30f2badbb942cf20ea65b WHIRLPOOL 0282df5c5a51449d81c8d4c38b64411c9cf0d9c66d2746f116760fc63dabb587c5f37361f2a87d1de22e2dc90ff7b53d5fc041be64caa12eddc701c7bf4fa154
@@ -14,17 +15,19 @@ DIST apache-tomcat-6.0.37-src.tar.gz 3430692 SHA256 665d72f375a9bf9ec5b8f9300c0a
 DIST apache-tomcat-7.0.32-src.tar.gz 4236930 SHA256 ab4a752a9f833340dc3ceea85edff84a4b0cd697cf6fb2a5348a14096b348dcb SHA512 ac6141713f05437834617df4113aad629e61d3d28e603f63d8ccd50f9a463c4bc0679cd853dc332660396bc84c9a437ec323767edba20cb4ed0650510d653577 WHIRLPOOL 9182666e580368e54d864271c407a8c2d21e024f156d33f823bbde0b9382a78e89dcecae01d691725c5a09e2a66cff590f8f3e75d427c26caf0526e3b1946ca6
 DIST apache-tomcat-7.0.39-src.tar.gz 4295207 SHA256 d9b4daceb2040bff84dbc37ea07d442cf6b0a608b2d161f15740147fac76101d SHA512 f3c054e66f65ea2721c53280e69b069c035f0a870d57c898a4fec716f23bf66be833d2898ae36da44cd13201a3d43984e3b2266927aad5fe3e2245d7f499323d WHIRLPOOL b2b3572bb6c15147bd4c25f90d0b8e1cafe1151bd2736ce3d60828818f87481e1c94448684c825816c6741cda1d5e1c091440245c2ae48cde23779ad55d683e7
 DIST apache-tomcat-7.0.41-src.tar.gz 4407748 SHA256 283a80c5be1a1eda9fc8864b11dcd026ba3bf2433b0d8377a4da4c2536a07ea6 SHA512 dadff0f20e5e7b5c4b46ee7ba4c3bc8776568b6fff182cfd3764abd5eba6e7bb4239a3700969c6065b8991ba8a04061042a917e7bfe29de2afbcce788554fd9e WHIRLPOOL 2bd6dc37704709f0ce1096df1bd96faaf63aa1796d664777ad4f4280e22bbcd0acc06cc48eae852481ef60a16efdf8ae6a1ca2dd4c5dc06ea6ed684103dbfa65
+DIST apache-tomcat-7.0.42-src.tar.gz 4422120 SHA256 5dbc2194b894de0b620752f18f5dc69901627f49b87d9dfb5951750bb9c20c72 SHA512 02703483ceeb218fdbb9c57cd45af3572d0c482ff0914e29862646bf395d03f81efd94271ffa6a59412df1b6cbecc7380e7bfb9e83da8db6a8f63355b722bcd0 WHIRLPOOL 21ba3934169ef9672f0f160e45dad4cdf04827e64bb3fcce1eac6fa7a9d4cf5b699bb96dd07a900bbea1099d35a91fe0df3dbcbdeeef44ef3e969af78aaafcd2
 EBUILD tomcat-6.0.36.ebuild 3960 SHA256 03400e345a2e33c6f32f0d24f7ef2e946cf0432189ad4498c0929a3226c69ce4 SHA512 a666209dfb901795c9c1bfbdab04934bca2c0496d94c017033e3d1d96aac9b12187669459023836d87719f279c245f64701c226d0a5fb39f9e656c2ba726af08 WHIRLPOOL 486de361f58a411d40c4406f395ef6f6ebedfa4a10650065dfa97bafed1ffd325078e8bd95f3ee58b87bc0341bd504210680a512c646901befebd46fa750452b
 EBUILD tomcat-6.0.37.ebuild 3964 SHA256 d5582363cbf7fd8be2a1072224618c36e4a1f37bba6c312a0f68a0971bcef6d0 SHA512 ed1043b0e37f13c961a964836da811207d3a86949164319aa2a4bd3811b86fd26e23f139755321a17bc2060275ff5542950f58f4c90adaaccef7ec3532035b31 WHIRLPOOL fbbddf6ed12b8ef0ffcbafbd4ba7a0971ed26992ffc70b18efa1dc46e18839557ffdbbd72f8c2f081724251e3b0f7e6c60f54b644b114a74cf3b188adf33d227
 EBUILD tomcat-7.0.32.ebuild 4041 SHA256 cfc34ea3aab98e6da8fdbb82fe314a3d14dddd99d551609a347a64ea4f8a7a2d SHA512 1abcee9506d04cae7c1936fa8a3f036d77e2519cf05b7f8d99602b35af339ecf279895cb38129920bbe1832a7db0cae2ac8a807fbb927ee01d6c0ba2f6748b8c WHIRLPOOL 9cf2d47341b35adeda484386ae1018e887d1be61edb0ed944dbd31e1fae3d4fdf98683b24d5d4cf21851381080dac1f04f20579893abba1672b8f2a5b6dc3949
 EBUILD tomcat-7.0.39.ebuild 4045 SHA256 acc4219d51960e1ea990753a4304f7f36834ef106ea1572fd2c3629098dd1f9c SHA512 10fb49cedfcb04b2c9c632f6731f9028d3673219a8ca011fb4cb493d1bacaf96eacab9a299b547154bb1420fc28495321cacb0f9b37a71236fdc33f9accdd507 WHIRLPOOL 6a5faa7a56143f6e8e0812c4ad24e9a0ce169d6de5e58d214dccf75e1046c71aa0c778c3970aa1927cd0e8a957a3349b04d4e6675260df705b6c4940e9ebc463
 EBUILD tomcat-7.0.41.ebuild 4045 SHA256 a24b93f899e8eb2d0f4f052d476f3cad5421393024fb24fedd1a4029a9e56da8 SHA512 46d7852fc69ef82f639abb3cb14cadfa77bdebb4ef6a03525c8823dfb4527651975c39232f9e6765afa574ca5ebe0c7701c2a52002e980d264bd2d435c750e2e WHIRLPOOL 0c01789959c1825dca29163eed6396fd8b4535b2c6385053c3b380254af863e0cacc4a7d68b4a51934ee14a6f4813a6419139b57742fe4dde1809f52d0a1b6d3
-MISC ChangeLog 76853 SHA256 bf8e606a51997262dcf383c3e057216e3c1598b76df40e21f4527382028a5d55 SHA512 8197ca05db3389e0aa3c8468572386179d2d41bb9760524d37b4e688dede413d8ad034f7b0fb34b4f8e74b36529270438c4c632aecb8cbf1d6a49383b4224648 WHIRLPOOL cdeea045230998ebd6050bc29ddb07abf613455ed27e580bde412122fa50c163ab543a23c2a8bf0a56d8a2ed2fbe98bf2a3711293ba2c2cea72ff69fe7aba55a
+EBUILD tomcat-7.0.42.ebuild 4045 SHA256 0ae565ace8d7be28a29c415389ce15d8216ba48ec69577cd04c2fb9670bf9db4 SHA512 b99ddcdd204464e987c1128510cf0b45efb61e925b9933ba64986c9d9f12b42510d83287422ef7f9d31d04a066baaa7b8c33d0c8d00fcc6c57341d381442fb5c WHIRLPOOL c40237233c6ac0527f88115655e20e6bb544cc3425404d3130cde3a9c4d079f59e2aa42a928cfc0c6cf0d95761fc2a7d1235bd24f30ae60b710098c6756a4b69
+MISC ChangeLog 77014 SHA256 0cd00d6eb85a654844172262b5a97856da4693955e3832ad2c70ce0a1efc1472 SHA512 44ac0d3dee748a214fa6d2b65e7e8099a2e1b255b64ee2711a549f1b8a4a09669fb5d2f29a8ae9eefdbcf011cf5f07b49a1fb909ea057e3591ef22a0f30ed0e9 WHIRLPOOL 615f5a75867278f926585bf49247ccf78034443069d83efcef17864c877f2c2c3e668c5ffc22cba6c793d9f9957cc4438c09578d5b1f7a1e8df89d3fd74410f8
 MISC metadata.xml 561 SHA256 a53b91aa1c4371952ed465d0b570fde6eebd1a621804990aa3d2c31f3a8cecab SHA512 354849871d8ff7e9d3bba1bd412f78789693518f1f9804aac412b64e9e86622fb86080b8290bbe16424c760b3601e96824cb3f0b956edbc2245dfa5be299c8c5 WHIRLPOOL f740fcc281807c913934662fcff48a023d42065ec0b50564d4a12ff970ce09447cac0a71016a33ff4896a596dcd86cd9372b4a12286fb0bf46bb01bb6bd2c7e1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlG3DCoACgkQ5LnnVc/kfi9apwD/cxE7STHPqXxlFkF25GzGxp7y
-770RgWVIWns8s6mKYXkA/0mULxb4ogrBlPKkq0JSr8FtCFuPNw8tiMPpEHADAZZt
-=EY3n
+iF4EAREIAAYFAlHa75UACgkQ5LnnVc/kfi9CcgD7BGN09i7YoCNH4astJfakMWVR
+Aqo7phF/4QARbxiKthEA/RS/Lm7ooMwyyCWcM2/THsz5jPK+6HpLoPtMQ9BE5Ad1
+=Ppaw
 -----END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/files/tomcat-7.0.42-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.42-build.xml.patch
new file mode 100644
index 000000000000..9b07137451aa
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.42-build.xml.patch
@@ -0,0 +1,105 @@
+diff --git a/build.xml b/build.xml
+index 3ff8f81..83357a4 100644
+--- a/build.xml
++++ b/build.xml
+@@ -613,7 +614,8 @@
+       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"
+@@ -621,7 +623,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"
+@@ -629,11 +631,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}"
+@@ -834,13 +837,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">
+@@ -918,9 +922,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"/>
+@@ -1355,7 +1361,8 @@
+ 
+   <target name="extras-webservices-prepare"
+           depends="extras-prepare"
+-          description="Prepare to build web services extras package">
++          description="Prepare to build web services extras package"
++          unless="noget">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -2278,7 +2285,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+   </target>
+ 
+   <target name="download-compile"
+-          description="Download (and build) components necessary to compile" >
++          description="Download (and build) components necessary to compile"
++          unless="noget">
+ 
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -2335,7 +2343,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+   </target>
+ 
+   <target name="download-test-compile"
+-          description="Download additional components for the tests" >
++          description="Download additional components for the tests"
++          unless="noget">
+ 
+     <antcall target="downloadzip">
+       <param name="sourcefile" value="${junit.loc}"/>
+@@ -2346,7 +2355,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+   </target>
+ 
+   <target name="download-dist"
+-          description="Download additional components for a distribution" >
++          description="Download additional components for a distribution"
++          unless="noget">
+ 
+     <antcall target="downloadzip-2">
+       <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
diff --git a/www-servers/tomcat/tomcat-7.0.42.ebuild b/www-servers/tomcat/tomcat-7.0.42.ebuild
new file mode 100644
index 000000000000..f25e365ccf50
--- /dev/null
+++ b/www-servers/tomcat/tomcat-7.0.42.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.42.ebuild,v 1.1 2013/07/08 16:57:56 fordfrog Exp $
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="7"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.2"
+SAPI_SLOT="3.0"
+
+COMMON_DEP="
+	dev-java/eclipse-ecj:${ECJ_SLOT}
+	~dev-java/tomcat-servlet-api-${PV}
+	extra-webapps? ( dev-java/jakarta-jstl:0 )"
+RDEPEND="${COMMON_DEP}
+	!<dev-java/tomcat-native-1.1.24
+	>=virtual/jre-1.6"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.6
+	>=dev-java/ant-core-1.8.1:0
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:4
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	enewgroup tomcat 265
+	enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+java_prepare() {
+	find -name '*.jar' -exec rm -v {} + || die
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPI_SLOT},eclipse-ecj-${ECJ_SLOT}"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+	java-pkg-2_src_compile
+}
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	# so we don't have to call java-config with --with-dependencies, which might
+	# bring in more jars then actually desired.
+	java-pkg_addcp "$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT})"
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# replace the default pw with a random one, see #92281
+	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,.init,-instance-manager.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,.init,-instance-manager.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,.init,-instance-manager.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	doexe "${T}"/tomcat{.init,-instance-manager.bash}
+}
+
+pkg_postinst() {
+	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+#	einfo "Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}