www-servers/tomcat: bumped to versions 6.0.39 and 7.0.52

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

6 files changed, 427 insertions, 22 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 5d591d1c0523..4af2b58b0beb 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.327 2014/01/08 06:09:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.328 2014/02/19 13:16:49 fordfrog Exp $
+
+*tomcat-7.0.52 (19 Feb 2014)
+*tomcat-6.0.39 (19 Feb 2014)
+
+  19 Feb 2014; Miroslav Šulc <fordfrog@gentoo.org> +tomcat-6.0.39.ebuild,
+  +tomcat-7.0.52.ebuild, +files/tomcat-6.0.39-build.xml.patch,
+  +files/tomcat-7.0.52-build.xml.patch:
+  bumped to versions 6.0.39 and 7.0.52
 
   08 Jan 2014; Mike Frysinger <vapier@gentoo.org> tomcat-6.0.37.ebuild:
   Inherit the user eclass for enewuser/etc...
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 43f52ead6002..1a05440a98a9 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,34 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX tomcat-6.0.37-build.xml.patch 950 SHA256 33af0fd388c439e3ee74fd2271d94066169b530b61dab3f1f01a094ec22e3f9f SHA512 69775288f3ba31bc5b3f1f6125c1ca6f27c64647eeeb40928227fcbeb3a33f832ccc24be051efec9f8ca575475549c6493b12495d4a98e9e4fd1c27b9af68f8c WHIRLPOOL e31b35c1395c152c65863cddd79617ec92b21269567fc1458914e6f9b10e3a70698987d05724e52b706e6e0cfeab56e818feca5d04d80ee08f24bfefe89ea63f
+AUX tomcat-6.0.39-build.xml.patch 950 SHA256 33af0fd388c439e3ee74fd2271d94066169b530b61dab3f1f01a094ec22e3f9f SHA512 69775288f3ba31bc5b3f1f6125c1ca6f27c64647eeeb40928227fcbeb3a33f832ccc24be051efec9f8ca575475549c6493b12495d4a98e9e4fd1c27b9af68f8c WHIRLPOOL e31b35c1395c152c65863cddd79617ec92b21269567fc1458914e6f9b10e3a70698987d05724e52b706e6e0cfeab56e818feca5d04d80ee08f24bfefe89ea63f
 AUX tomcat-7.0.42-build.xml.patch 3852 SHA256 6b003e9c58131cfec4b5d312a18dbcd088428774a544d8d29b896542d3c92c5a SHA512 01feaa4428345203e2c5f0e28ee40bb9f7fd9351446e2454b43d5c1f7f7775606b70b47905e452511661e38ab5965865ed0622979e7845661c87e01a64f0e8cd WHIRLPOOL c86197abec4af7417803d85bd05615e24942f944fbda6712cf3c29ccd4989306f017663d378a719c2d71dd069d5c8850d5e2f4ec57b2243f4758c46bfe7ce2ed
 AUX tomcat-7.0.47-build.xml.patch 3852 SHA256 6b003e9c58131cfec4b5d312a18dbcd088428774a544d8d29b896542d3c92c5a SHA512 01feaa4428345203e2c5f0e28ee40bb9f7fd9351446e2454b43d5c1f7f7775606b70b47905e452511661e38ab5965865ed0622979e7845661c87e01a64f0e8cd WHIRLPOOL c86197abec4af7417803d85bd05615e24942f944fbda6712cf3c29ccd4989306f017663d378a719c2d71dd069d5c8850d5e2f4ec57b2243f4758c46bfe7ce2ed
+AUX tomcat-7.0.52-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
 DIST apache-tomcat-6.0.37-src.tar.gz 3430692 SHA256 665d72f375a9bf9ec5b8f9300c0af620948ff14d35b4c57c4297030ff6c1f281 SHA512 b4f3c795aa760854f52e2286073f2612602e95245e7075d7c9033d3fb455ef6077cdd1f5b0c0229d5b75d32f2cb436154cc9c7b1a8ddf2e59e0ed2f095789958 WHIRLPOOL 3cec31dfd5e7e22fb6e3a87bfdb6a1b58e353faa023a9d3703043746e22afd379249ca5378cddaddac1e6c59130fe5465b359e887d991713aea0cf4f9bd5188d
+DIST apache-tomcat-6.0.39-src.tar.gz 3593901 SHA256 f31eba79138f5ac8223ff706fb2637205837ea44ba27c39bfb18ce9aada0f7ec SHA512 a48478d92094344b07020df879c35e0ff3afc3db3900c22982d94722c86deebe6a3a9e513f84925a8c7b96a44d49ce69125d298b0dd08cf138bfa8a574cf4736 WHIRLPOOL c117c524baec8a5b6d899a8a60970cc1bb01678a04b2b032f53f2f9b9830abf9e25dacb98e02661a51e87dc2d615f5c0f17d9fe29f6b68fd5f2cc886a51d7a0d
 DIST apache-tomcat-7.0.42-src.tar.gz 4422120 SHA256 5dbc2194b894de0b620752f18f5dc69901627f49b87d9dfb5951750bb9c20c72 SHA512 02703483ceeb218fdbb9c57cd45af3572d0c482ff0914e29862646bf395d03f81efd94271ffa6a59412df1b6cbecc7380e7bfb9e83da8db6a8f63355b722bcd0 WHIRLPOOL 21ba3934169ef9672f0f160e45dad4cdf04827e64bb3fcce1eac6fa7a9d4cf5b699bb96dd07a900bbea1099d35a91fe0df3dbcbdeeef44ef3e969af78aaafcd2
 DIST apache-tomcat-7.0.47-src.tar.gz 4568824 SHA256 be7cad1c70b9db84e8b139a81312ecd80761f2e69edbd1d176d49e52f728bc99 SHA512 bb0d2c5ecc05b69655ebb6073e92ab379b588e18ea2d4e5883297ce528d6a6e7a400e3038d93f6d5e79be24687105e4fd3d6ab62b616da715f333dd9067dbaf8 WHIRLPOOL 126b2bae767c620ed0b4bd83ed71cea3f6ea81862258bce1273e7840682b771fca55393e6090300e9635d3839b9de9d48aa346bef8d06fb87b435f20e6b32495
+DIST apache-tomcat-7.0.52-src.tar.gz 4613085 SHA256 208781c82c8355f1796696f1022e47968d903a6e5f3e429f9fcf76c21d9d1024 SHA512 a83e16c575fee90585024121414171345645377f13b6a1af15a8fdfe307fb2aca020bae8c214b6bae8bd817ff1c6b3c37f01f38749bf87c06448a7519803b298 WHIRLPOOL 3492e99ef9f100ff1a7afa75d383668c4f69a2e4b4509b0cf7989026d9ace01d1758cd06dd23878b0716ef418901f0551521060d70f6de2d3d91be0695f81db3
 EBUILD tomcat-6.0.37.ebuild 3963 SHA256 934c69c50021c2a1b8b9c2aeffd8acb47c7b08ee79d358ac889a9c3954f2fb37 SHA512 0f19f8080a6c737379431590d5d8acbb67c202d4b535b64c87250b6fd54850bb8c2c745655c7845ff1b2216d36e16dcad7fbf7b638b1a7f5e9ca5f541c6c07f0 WHIRLPOOL d17092377652126e5e614b85253ee1627655a6ca52999e9045189f126c05c171301554b42d01d2da0d41083966c91b6b45077b487218c6793a1411b3c79b7418
+EBUILD tomcat-6.0.39.ebuild 3969 SHA256 1964b2a6c1c56e5cc0a00c8f307cf91494143c57b016980c8e2f60da96c9af80 SHA512 0c9df1c8bde93c76047e43769e4e0b20ea04e13c8d610df3f9a4c95b6db5d1ecc714ee08ca5ad6ac7814259a9faa258a38d300f6550dfff01d428fa91506cca2 WHIRLPOOL 5e8d38b79b3bd3e991b499cff5cef7c3cc0450be31de4591eece5a3b06d99be0097eadff58362e04c6467c024740535a2341168cfbb1a80e9fa6194e7f498e92
 EBUILD tomcat-7.0.42.ebuild 4036 SHA256 c717c7d67b0ba3931c848057980a10a7897db8d6b5e1ea975f3daef321546290 SHA512 55ddd1823146d6cce2e19ed71bdd36cc778f276c01eb699147744fef0378f4ac1f6c2e357b823274d0ac42887af4f83c832306ffa09e2740ccd1f97589251669 WHIRLPOOL b6d7ee5c22d8e89903ca0f6b99ecf78c72eccb6a788f36d37c672edef9f0d3c92f585a02877653b3ca2b8dcb6fb606f76f26466d852e955e3ec4aaa621e1a378
 EBUILD tomcat-7.0.47.ebuild 4047 SHA256 fd45a575e61eada7d36e7b6f4b93435d4684093efe1d8fe7e5871bcd300bc1c2 SHA512 0ac833f9e80b6fea175c4894df53ffeb1c2930e54dbfdb506e86e3b28ec36698d1d3d907fe11d97c71b70ceb36a4ccd236851519e1e0834bde9c3dffe95350f0 WHIRLPOOL 6d5184b23115b7d2d89621aa72eca2e411d5e8362179ef0fea8ac702acf986142ea5a0361d6f7fad6b8b51848fa5edd165a48726e08d487eea92a43062d21ccf
-MISC ChangeLog 78287 SHA256 0bb828667d8d00eeea504f6035516174608cfa40fb3b2957088199782f2d5825 SHA512 2cbf5004c084c634d4d4a468e5ef900055630c78234309f1ab85fffdfbd85aa74a3485239eeb2c7f5015677c6d63a37e64c98642b765ea38b5647fecd00ad5c7 WHIRLPOOL 8ed73efe2f16f9af5d4e864c119461e982618393c4d8eb4c189edeaf3228b1fc77eed262ed24b4d369bf1862a5fe13a953b453f02dfed89b576b5fb0ae128556
+EBUILD tomcat-7.0.52.ebuild 4047 SHA256 21a962b9afb1f8b3e0a0d5564de05a5b79d9b8de885493ffb2304fb84833f02d SHA512 326b2fb72ac1133c21e5d4267b6aaba3d5819df1c4f513c48f8009c1dee8d7c251c9d476feac08b743b80d664a6439868f5f98c9380b861781d6f5cbcf4d0173 WHIRLPOOL c5d8079a8e5b4c49b726313ec08fe003e9e38a18fe2502efe25d8f37410cdef4b0d9f56c67b7fda84c2751e1bbc0b24536bc36c800fb5b16a0c84c5b03c67761
+MISC ChangeLog 78566 SHA256 385a2f20b75f77c127b788a9af71e659afb57701de89bfb1fe47a1eb76d9b464 SHA512 e1219cc108af90c3819896ac683fcd867aa9ee2d9f7d8657b7722e4216d89fce5bceced4209d220728d91c66745bd02c7b676c17b86b8ea58c961f2e6d58ce12 WHIRLPOOL 8e4770ffed641e1e8faff3f61c057112f7f990d1de880ac2a3a9518f69c203f8e56f3cc840a0580915badff84f969a35867d6e86f427db83d23065619c57e103
 MISC metadata.xml 561 SHA256 a53b91aa1c4371952ed465d0b570fde6eebd1a621804990aa3d2c31f3a8cecab SHA512 354849871d8ff7e9d3bba1bd412f78789693518f1f9804aac412b64e9e86622fb86080b8290bbe16424c760b3601e96824cb3f0b956edbc2245dfa5be299c8c5 WHIRLPOOL f740fcc281807c913934662fcff48a023d42065ec0b50564d4a12ff970ce09447cac0a71016a33ff4896a596dcd86cd9372b4a12286fb0bf46bb01bb6bd2c7e1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJSzOuYAAoJEPGu1DbS6WIA4TkP/2qC3Bo84YRDbPy+1OMWC80l
-4TZrhGiN3NEiRdy6bnv0zoHzmblgGavpYhLFd6zhEKbhCkExw7PRzSdGm19X0hPr
-HAmFZMeul3aWy+4NIS2pvM29c1cmCkNwksiMjNUBK16NGBplcj9nXu1jwv98Llni
-v/kw1dML8EmF33kSsZr8YVm4axLJx2g1UE4vDa/BRlyQf/cKfFG5+jxq4UsbXCS/
-uxo6cWXTGuf7HgJQpNF9nTSW5JduV8wIsvqG2FRbNtsDNHuCUAWa5uYkDZTsxbgH
-pULd0iUNl3NvlscjcwB0nzFV9TP9a0eKcQ9cK559XlGhIHJiH8+OlqIgrWIODgoQ
-dlnLjZNwRYfjSxZr/mHRQuchY+JodeZ/sCV3UN9Pp0eyTWy1XDmbukQkymiWWC1L
-mCJvGGEsRzxzwe1h0p9XeObm0YeZbS2c3EqFrONWfqotU3qDY5cVYokzbdguvWTB
-mzeebhZdFas0ZtVRXUBMtCFhMN/jME8kr0VLRU4CmD/omI+OhENEz7T77hKjt9DJ
-BTRVkVI5p2GP3b51kNKIv4uSaOljdSfuM0lHgsMvdsjnnH9PFBTziJC5/VOUP26t
-dlAsZ7vJPby5eGS/goM3ZmIbldalgeYHtgAxomeFx2XEFg+F0uSa9znBs8kjAIRV
-p9nLuO4NCbYRGWakhIgP
-=fd0P
------END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/files/tomcat-6.0.39-build.xml.patch b/www-servers/tomcat/files/tomcat-6.0.39-build.xml.patch
new file mode 100644
index 000000000000..6517dee4d196
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-6.0.39-build.xml.patch
@@ -0,0 +1,31 @@
+--- build.xml.orig	2012-07-06 20:26:21.361299240 +0200
++++ build.xml	2012-07-06 20:26:56.085899911 +0200
+@@ -487,12 +487,14 @@
+ 
+   <target name="deploy" depends="build-only,build-docs,warn.dbcp">
+ 
++<!--
+     <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">
+--- build.xml.orig	2012-07-06 20:31:31.387806167 +0200
++++ build.xml	2012-07-06 20:32:33.185315885 +0200
+@@ -646,9 +646,11 @@
+       </fileset>
+     </txt2html>
+ 
++<!--
+     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
+       failonerror="false"/>
+     <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
++-->
+ 
+   </target>
+ 
diff --git a/www-servers/tomcat/files/tomcat-7.0.52-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.52-build.xml.patch
new file mode 100644
index 000000000000..9b07137451aa
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.52-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-6.0.39.ebuild b/www-servers/tomcat/tomcat-6.0.39.ebuild
new file mode 100644
index 000000000000..2a1209d5afbe
--- /dev/null
+++ b/www-servers/tomcat/tomcat-6.0.39.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.39.ebuild,v 1.1 2014/02/19 13:16:49 fordfrog Exp $
+
+EAPI=4
+
+JAVA_PKG_IUSE="source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="6"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="extra-webapps"
+
+RESTRICT="test"
+
+ECJ_SLOT="3.7"
+SAPI_SLOT="2.5"
+
+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.20
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	>=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_DOC_TARGET=""
+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 (<6.0.36), 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."
+}
diff --git a/www-servers/tomcat/tomcat-7.0.52.ebuild b/www-servers/tomcat/tomcat-7.0.52.ebuild
new file mode 100644
index 000000000000..76c1b84758fb
--- /dev/null
+++ b/www-servers/tomcat/tomcat-7.0.52.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.52.ebuild,v 1.1 2014/02/19 13:16:49 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 -frv {} + || 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."
+}