www-servers/tomcat: version bump

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

4 files changed, 249 insertions, 16 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 56a2bdf64cbc..18669748814d 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.300 2012/10/31 02:45:37 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.301 2012/11/22 01:43:40 fordfrog Exp $
+
+*tomcat-7.0.33 (22 Nov 2012)
+
+  22 Nov 2012; Miroslav Šulc <fordfrog@gentoo.org> +tomcat-7.0.33.ebuild,
+  +files/tomcat-7.0.33-build.xml.patch:
+  version bump
 
   31 Oct 2012; Christoph Junghans <ottxor@gentoo.org> tomcat-7.0.32.ebuild:
   added prefix keywords
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 50d5d66c7eb8..f0b20825bb8d 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 6/catalina.policy 6956 SHA256 9399efda3f6cfc238fb783fb338060e67aff15d0044b31c3d0265e1f9e5769e5 SHA512 fd41389f562890994a181e120af6c3ecd358fdcce6a3891091375e53f088e254bc07fb8ee607c8d0f4533fd59ebee32981ec2fbced21de7a1a08b7b45e8d7169 WHIRLPOOL a903691689662cfec8a4fbe827a34183fbadaa0b3dae275a715762fcb6b04af0f8d7e3912a010fa3729a299aa87b8b3c84cf5cafbf7c9553d39f8b079919f72f
 AUX 6/tomcat.conf 2895 SHA256 b04b085618be755ad9e1796fcbcbb8c2e192eefda3b240f1c06b0d9cc88f2ff0 SHA512 2b182acaa636cc36358bffde693af7e78020e0321f4595c44c991a5dafdf1e386d93659a43a76626781ac1d73723c91cd8f86f93d9a41ba61cb8bffc2ece7d6a WHIRLPOOL dafa1ed7299041916a8362625f031c98ac98b630dcda6152529c162fee7af60bb0cfc5e5abe7259d58df5aa6bf1a1a7ca81a84577ac97c8cd3603ec67abb228e
 AUX 6/tomcat.init.2 4034 SHA256 55abf160871648ebeca531865b5918846cf298dadc9cdc5cc7ee060a8db487ad SHA512 79259b423df6f3b8c16f81acd4f3ad33711699d9397fdc313ac1de912121e94a38bb9e33f568b84b921d15fb7434244645ec7c552b59bd1a080d1f03f8947fa1 WHIRLPOOL 27ccf2e9259de6aaeb6098ecd8bb74d760a60fe6674f0bf7657a034d6548e8348809d8ddbc063a926f605c301ac95739ac7443fa2f6aa1096099355571e7d326
@@ -18,6 +15,7 @@ AUX tomcat-6.0.36-build.xml.patch 950 SHA256 33af0fd388c439e3ee74fd2271d94066169
 AUX tomcat-7.0.29-build.xml.patch 3852 SHA256 6b003e9c58131cfec4b5d312a18dbcd088428774a544d8d29b896542d3c92c5a SHA512 01feaa4428345203e2c5f0e28ee40bb9f7fd9351446e2454b43d5c1f7f7775606b70b47905e452511661e38ab5965865ed0622979e7845661c87e01a64f0e8cd WHIRLPOOL c86197abec4af7417803d85bd05615e24942f944fbda6712cf3c29ccd4989306f017663d378a719c2d71dd069d5c8850d5e2f4ec57b2243f4758c46bfe7ce2ed
 AUX tomcat-7.0.30-build.xml.patch 3852 SHA256 6b003e9c58131cfec4b5d312a18dbcd088428774a544d8d29b896542d3c92c5a SHA512 01feaa4428345203e2c5f0e28ee40bb9f7fd9351446e2454b43d5c1f7f7775606b70b47905e452511661e38ab5965865ed0622979e7845661c87e01a64f0e8cd WHIRLPOOL c86197abec4af7417803d85bd05615e24942f944fbda6712cf3c29ccd4989306f017663d378a719c2d71dd069d5c8850d5e2f4ec57b2243f4758c46bfe7ce2ed
 AUX tomcat-7.0.32-build.xml.patch 3852 SHA256 6b003e9c58131cfec4b5d312a18dbcd088428774a544d8d29b896542d3c92c5a SHA512 01feaa4428345203e2c5f0e28ee40bb9f7fd9351446e2454b43d5c1f7f7775606b70b47905e452511661e38ab5965865ed0622979e7845661c87e01a64f0e8cd WHIRLPOOL c86197abec4af7417803d85bd05615e24942f944fbda6712cf3c29ccd4989306f017663d378a719c2d71dd069d5c8850d5e2f4ec57b2243f4758c46bfe7ce2ed
+AUX tomcat-7.0.33-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
@@ -30,6 +28,7 @@ DIST apache-tomcat-7.0.28-src.tar.gz 4222498 SHA256 a035eab4aa7372534161314ee09b
 DIST apache-tomcat-7.0.29-src.tar.gz 4212630 SHA256 00d42b13044303d735103373a5faf7680786879b304ca231d73844c893f6e0ea SHA512 f17a6e0c2535fdd7cbcce518c918a940ebeebef68fa1c6afb482a2d0f5001b87f973cf86f1fce9026d39cf75f2a3763b8a155fb67538e7e1f7d71472660d50db WHIRLPOOL 3b52c6118f9595b85a96302e6d1a0fe421c12a1f16c30f90380195717126911eec0f785e36ec713e80b6d9abe4d72d1104e9d1330534bc8e7d590cd017948f35
 DIST apache-tomcat-7.0.30-src.tar.gz 4229801 SHA256 c8396fdb6d15326991ed286baef385d62d58d47740565349c16410dc77ebf685 SHA512 0cb0f0a6bd65c403b6871b4891ffa7f58df205dab02faaf5ba37c5cad4d511f571bd00c127d13510f378b02016d04c86f5389073f790b25a3ae9f64edb588a46 WHIRLPOOL e10609defef2c1b85b39337d1317afd0a9048ce2ce543b0e78bc403c2019f916a4e172c92d89db429aaf5b01ec148abc319a5d1478f097e090f75f0c53d02b5c
 DIST apache-tomcat-7.0.32-src.tar.gz 4236930 SHA256 ab4a752a9f833340dc3ceea85edff84a4b0cd697cf6fb2a5348a14096b348dcb SHA512 ac6141713f05437834617df4113aad629e61d3d28e603f63d8ccd50f9a463c4bc0679cd853dc332660396bc84c9a437ec323767edba20cb4ed0650510d653577 WHIRLPOOL 9182666e580368e54d864271c407a8c2d21e024f156d33f823bbde0b9382a78e89dcecae01d691725c5a09e2a66cff590f8f3e75d427c26caf0526e3b1946ca6
+DIST apache-tomcat-7.0.33-src.tar.gz 4240455 SHA256 f665b4b39471b6f7ddd10845058a76308694a8be24b7651971de86a34ca66243 SHA512 c0daaa785ac90c78fa52db576a9cbe67ab51d52fcc2f2155ccab188489e9c81cd9a6dc4302ec0a43b1628fad85245f382dc39adb62e8f8c1a65cde0439e1e62f WHIRLPOOL db7ddd69e8227c37278e5f2f95a365ddf0ad4d7d27dd697352fdc9e6138a9d0b3192ada7ffc5e9079ef6493e1a999c1cc979ba192219878b45003f0042138f3a
 EBUILD tomcat-6.0.35-r1.ebuild 3702 SHA256 8093d442e5b28cc01baef2f90a764340dabc529d223c9f7f024e08007c4867c0 SHA512 99a833d300cc553f1f6dd883edede826d7dd64eade13a3b1224117bca262c4a573aacbd3be8b4b120750608f376a7e6624352ea2d9786a853f31a442468b35e1 WHIRLPOOL 706eed993d1340d9852d01e6affb588e1b1286f0d2d4d3d308793152d8de060cd950467ec7b2deeaf085f59f4e1ce153ff75cc97e80cbfee861c7df50f22f07c
 EBUILD tomcat-6.0.35.ebuild 6985 SHA256 49ab1c00568f34f75f98a9c865731ed31aa740385d68eb350a56e1ebdddc7346 SHA512 0765d25d570fab44d8e186fcb943629e2f6d77d0ef2bd7fb996f767de731297df96208974dfc3cd67628cdc367c95aa393f47b3f3012a24fd128c18de5c49e92 WHIRLPOOL fc667584dcb3516fb65c49c641e567cec5a357788aad6a5ac40630cf0da137493050848090877fe03c9b6924a901eb51ef3f89c6177e839313b9583b18ee601b
 EBUILD tomcat-6.0.36.ebuild 3698 SHA256 32ec980b04da0690c9dfca49435b08f9d9ec9353dfbfa92b1fad7bfe347b2f19 SHA512 38d701e1b9eca25ecaa417577c7701b96ecacc4e97a99d41d585367ecf3c044f30573e248c87145d4de9dc66c6db3329f9680f0d148e0a2d075e746e53750320 WHIRLPOOL 5d1159246b07e614e8728e390fcc2bf056edb99063b799ee9f8db0b087613bf3d11a182d14b695f3c925771fa776d876416e4dea36a5124aaf4ec88fa349041d
@@ -41,16 +40,6 @@ EBUILD tomcat-7.0.29-r1.ebuild 3728 SHA256 298e6a1468c43b7f520c987ddfb987be9f48f
 EBUILD tomcat-7.0.29.ebuild 7640 SHA256 4c1f9e42a694c6832f23a8fe394fdd5058c2d8a2453d852166b25ec668d69be1 SHA512 70e3649793a2b893dc6d2bac92bf831bd9fe12c560b2bc716837be4aacb8c0918478563b571c71b441f8d9bb77b98ba17c1201858907c0507e6b7844cb8de590 WHIRLPOOL 9b01fe83b636f205a3a8f5138192c33aa706882b26932d3cf1cf38ff9fd5127370014090c0362124ffae2e1550fd5a39d5c219adb0fa5abd11da99c704f300a3
 EBUILD tomcat-7.0.30.ebuild 3724 SHA256 e9c5291bb08dc414ce761998d6d7e374a700894716546a9de425060a0bcbca3f SHA512 fbd80865c9fdaba66ca3406b2b000a0af09c7c199fed5c467c41f0af2650351f2654cad330a23dc8c57070698421b0dc6e450f9992d4c501502da3646e305ff9 WHIRLPOOL 5486a13c8cd71c79426339c517014f5b6b89d10e2f77f7af0b583e07be2ffbc9d8ad7e3162f1cf2421837d0933fc4d6d48baea0e9d1b8c2fdf3d747d096522ee
 EBUILD tomcat-7.0.32.ebuild 3777 SHA256 79e291cc939b70f34b35c971cc1744e6c973cff0763eed78eebcdeb925e578bd SHA512 729357cb6c3e70a67d19b89c4155a74b2a9de9b88d765b5ab64d1ea864fb3548871ddb650a3794291458f686328f1041da5637dea719e784a75b24363a12ca56 WHIRLPOOL 364dc2b7e72792003c02ff6cb35ba249c3dfd994af988c2ac81e208d8e85f6ee93152b725829d0ba84fb00b103bba86b2e3df8804b4c4880270685c093720798
-MISC ChangeLog 73742 SHA256 80ecb4cd339ee65cf8d5aa362bc890c1e8277d9edc24ab8638c891f7778d835f SHA512 652aaa90134ef075f727b8c8cb97f1225ea981a6ccb23a8966478dedb2ef9897371b61971155008d99558213130e8c961dc9572cd0890730632ecf28b1bdea3d WHIRLPOOL 95a8c7d6efa9ebf78a9f88bdfb398b3467c6f1418d446318fd609ac19d1035d9517c9e9f23a5263c4f5def702c39307b6f5232bdd5600656e80138613965b7cc
+EBUILD tomcat-7.0.33.ebuild 3779 SHA256 9346925751bbf18ab0e48c4a97d30f3e7d25693c7a2b73b5d5b821ab186db676 SHA512 997e0028953e745f94ceef615ee395e89557292a1afc3132777574dca1bf8e057f4887cad6af9baae626ae71f41f3f4248d9ee0be39bd76ef6b57fe342296202 WHIRLPOOL f1569219f0d2b818f6a2fd93b93305f2927324d834acb4acfe5837bcfe0c3b81d7a014d6266e00d266d926a9546e93c67666dceecf221a126125d2696e579157
+MISC ChangeLog 73905 SHA256 cee674a7d9b8db3c8d120d389612baf7b5b8e8cdfdfe5e24ee0456b2cb806ca5 SHA512 0ea316e5db70d0c22fdcabc27135eb7934942bab0f4cc905990d30932c252be6c17b1a6e0cc565f9d9d5884e77b443550abf21401457119ee3fef786619cd1cc WHIRLPOOL 2d657e60b92b7c1fd92dca5aa2a38f04346a970c4629c6d6ed5d52554bd39b97be06eb803b6d95d7ba4ce63b1bd2539ca6ed503e1b781b685dee61e89c78696b
 MISC metadata.xml 561 SHA256 a53b91aa1c4371952ed465d0b570fde6eebd1a621804990aa3d2c31f3a8cecab SHA512 354849871d8ff7e9d3bba1bd412f78789693518f1f9804aac412b64e9e86622fb86080b8290bbe16424c760b3601e96824cb3f0b956edbc2245dfa5be299c8c5 WHIRLPOOL f740fcc281807c913934662fcff48a023d42065ec0b50564d4a12ff970ce09447cac0a71016a33ff4896a596dcd86cd9372b4a12286fb0bf46bb01bb6bd2c7e1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQkJDTAAoJEOeBhlrCAAWGqaoH/0UqEkWPpQAo6uppF/MAw7gw
-1hmSmCd/Z0KkwTIcFvb1iZf84TVKqoZKJz8jtDh/tc4nGqswdqt41B4YWP6/8Fhq
-h69KuiIz58KLX17POVBGO2TCTpgDuqvwJfdYzkDOaTWn+Z4cORJk+xwUdk0Uqsst
-u0cTTBalB3rrbKSOfu0hVVqfVlxeHcTAiW39eUHYPhQ+5ER4PF8P3w+E9QQ+A3ol
-MCZbU4Mic3AE7KfWYDL/aLzAh9BkejAvzjA4bva4NOTdcDwzlvfkxIQKgdOhYNDW
-sicnjIDxE8R63GQLTAbizZerOuR6zvXOlSJItTgdqxnt1ZT9zqLKtYHjS07m6eA=
-=9Y36
------END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/files/tomcat-7.0.33-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.33-build.xml.patch
new file mode 100644
index 000000000000..9b07137451aa
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.33-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.33.ebuild b/www-servers/tomcat/tomcat-7.0.33.ebuild
new file mode 100644
index 000000000000..6abb5c4b1608
--- /dev/null
+++ b/www-servers/tomcat/tomcat-7.0.33.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.33.ebuild,v 1.1 2012/11/22 01:43:40 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="3.7"
+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.20
+	>=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 "For how to deploy a server instance 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."
+}