www-servers/tomcat: version bump

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

4 files changed, 408 insertions, 24 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 5736db134564..3be25105e9dc 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.293 2012/06/19 14:36:26 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.294 2012/07/08 21:35:54 fordfrog Exp $
+
+*tomcat-7.0.29 (08 Jul 2012)
+
+  08 Jul 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  +files/7/7.0.29-build-xml.patch, +tomcat-7.0.29.ebuild:
+  version bump
 
 *tomcat-7.0.28 (19 Jun 2012)
 
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index d99b8c0ed37a..b0b951a5d89b 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,23 +1,26 @@
-AUX 6/catalina.policy 6956 RMD160 957ad3b5dc4aeaa5acd289cdaada0a2e48974d52 SHA1 13b65455c8f52fff9d1b09ea67e93ec7a88f1a47 SHA256 9399efda3f6cfc238fb783fb338060e67aff15d0044b31c3d0265e1f9e5769e5
-AUX 6/tomcat.conf 2895 RMD160 36ece62ddff5257c04f47d75b9c77bd4dc198652 SHA1 8fef42463b7bf186e2f1d1aeb083bdb370603265 SHA256 b04b085618be755ad9e1796fcbcbb8c2e192eefda3b240f1c06b0d9cc88f2ff0
-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 6/tomcat.init.4 4052 RMD160 cc78f9de540487a3fa456e1f88f4e3d016856b68 SHA1 cfba63b9d42e3e039e899e00b58a9c04460ae9b2 SHA256 f7e9b18f0381ae5ba6c0c28cf03a40a7f8b6256f61d630a4f7a941be01cc599d
-AUX 7/7.0.23-build-xml.patch 4897 RMD160 3b3b5755bd40e759985643f95f26e88069780f3c SHA1 8948dc0f168384670d6e69947de42069c30d78fd SHA256 e6f171cbdfa1af457dfe72be86a316e07a9bb9c22d3c98c094a0972ee4c38011
-AUX 7/7.0.26-build-xml.patch 4947 RMD160 73a69d96e362ef3535bd52be962e16583ffa2c6b SHA1 7928ed6a2504f8fdda2091708883f35a61475b5b SHA256 0b4d41ae8eec8077f7772662fe65a8a3c44e399599c90f9f14d3d2875e20adea
-AUX 7/7.0.27-build-xml.patch 4947 RMD160 73a69d96e362ef3535bd52be962e16583ffa2c6b SHA1 7928ed6a2504f8fdda2091708883f35a61475b5b SHA256 0b4d41ae8eec8077f7772662fe65a8a3c44e399599c90f9f14d3d2875e20adea
-AUX 7/7.0.28-build-xml.patch 5049 RMD160 4e0217f8e6e0355b4ced49548c608ddd0527789d SHA1 a6b0c26619d48fdbae3a8e4a6e6592ede98bef21 SHA256 2d01c63357d321ab73c7754a0a8d3d28862009c8d2cc91c550572f9e96d2204d
-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-6.0.35-src.tar.gz 3403286 RMD160 d292b210fe62aafec4a074e3a626766585367a3e SHA1 1a47ad41d52a27757cfeddf7fa1627688ed4027a SHA256 6e5205834bd595250c8e0b640e2345ef643f23364ae0e099334b5132103be764
-DIST apache-tomcat-7.0.23-src.tar.gz 4103854 RMD160 ebe500ffcc7903c6f4d301533a2a16cb878d11ef SHA1 fe56adb0939825c4f7c0f69e57858b1fb93ae958 SHA256 b86523095b06d58b9553683f480250dec7216ce1914c92ea8ecca0799e6ad3b0
-DIST apache-tomcat-7.0.26-src.tar.gz 4127697 RMD160 809b05b3b41c1712579d8a9f90641c3e54ad2f9d SHA1 05f40cb17c99d7d135cdfcd16005b9a59a7f1392 SHA256 864304e76ff6edb284fc56d7297f8e0711ce0968c9f735c89b2617d70694cc0e
-DIST apache-tomcat-7.0.27-src.tar.gz 4189578 RMD160 a7fa37219db2e23446f27275e2c0324192bfcee5 SHA1 1a8510d7d3b5c22bc5d56340a1d8b1e37322075c SHA256 9e692cfe55168e866094d1dba2653d2bb75462c535f0940f756a0253284b2ca9
-DIST apache-tomcat-7.0.28-src.tar.gz 4222498 RMD160 43fc7a1ee9484a4041654098f5e9cfa4e854fe83 SHA1 fda5ef24078b76cf40ca71a56866378294a3554f SHA256 a035eab4aa7372534161314ee09bdb086dc00179345fb002a358e157e8fb2c42
-EBUILD tomcat-6.0.35.ebuild 6985 RMD160 048285bb084918490b679f8074c2d8725e4b0161 SHA1 be111aaa36c5dcb7e02f018c9bcd58645c4fe711 SHA256 49ab1c00568f34f75f98a9c865731ed31aa740385d68eb350a56e1ebdddc7346
-EBUILD tomcat-7.0.23-r3.ebuild 7638 RMD160 8a804145e24e1fcc1d2991937cc4889bae16ce5a SHA1 b2aaf63f1f81edbf9bc4dd12ef828f77f36d7f7f SHA256 a94b38f501e7c4f3db23570510dd274dcacd867dcf5ec9320829a5234bb331bf
-EBUILD tomcat-7.0.26.ebuild 7634 RMD160 523c1959050f94839f608c3004610bac1c65a97b SHA1 d84a90e2bf7081f1af621eed33c4b6a453f4eea3 SHA256 bdfdb09fd372f3346062f451ae4130e4299baba0fe452ab0007297e6ce23fe73
-EBUILD tomcat-7.0.27.ebuild 7634 RMD160 8defff653bcb14cc6bdfd8378cbe0a182dfcb1c1 SHA1 53fb4c4387be1e10b2bfde3644e292a34eb018be SHA256 a461a8ee10e01bb5fc5d5813462d5cf656a1a600b58c199ef337d3f888380f2b
-EBUILD tomcat-7.0.28.ebuild 7640 RMD160 12c3704c4199cdbb565cfc1f18b691cf3036e25e SHA1 7af6da23dfc551058703686fa023d00b737a867d SHA256 2cd83c336add922ae80d0e20700d46f3ded17d321ef1a1ffd9972e4d67914b61
-MISC ChangeLog 71364 RMD160 b849f1b972baea45a19b50e08095e29dc35bcf7f SHA1 faf3461c30f0b3cedd9da567e2ca455b3ef74c31 SHA256 b470848e48e3fbbe3272a92b39e654c5d4f989443ce3eb8c84061cbcb27c2e57
-MISC metadata.xml 451 RMD160 965e7cb85fbf383be678e48d2ae0cdf7b4247c99 SHA1 9b3717d68fdd17b010345fb0a63ad9aa0126dc42 SHA256 b508f373350a4e92bc04ebafa528a5c50eac8bfbd67d2fab6a4fa82811d1f109
+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
+AUX 6/tomcat.init.3 4050 SHA256 726fbfd0961df4a6fb70df17f72144a3f19c1080bd6f1f6abdadd849d5dd343c SHA512 fc98104fa88f4cc08b23b5425fba09da8b28f7c569108cfdab56e04a96426951ca1cebaa46e6da621fe5ad74a0cd87476d4f816fe5c1b3e066c77fc19d1cd85c WHIRLPOOL 92cec49584f131d5e3c7f9ff46d9aa908ae5117ab3653989ddfb1a5919caeeabd7b9799769723836732e2575fd1d92130b107ee900fd1103bc450b51a6972e4c
+AUX 6/tomcat.init.4 4052 SHA256 f7e9b18f0381ae5ba6c0c28cf03a40a7f8b6256f61d630a4f7a941be01cc599d SHA512 8611abc1bad57ac9ca44c8dd5ad94b3f3ed7d5870cb3e033b223fea9c3811c69e53943fdf979fe1d177c178e4558a48b8fa340ee8c869aa551b1be8fe95a3df6 WHIRLPOOL 81d0ed40d27dc4070aebdbac3bb4e5ef3277dcc6eb79b86ff200197bc913f5503916c0d87b3b1ce545bb53b7b0915ecb8881963ef5e67c5540f96292cec7f853
+AUX 7/7.0.23-build-xml.patch 4897 SHA256 e6f171cbdfa1af457dfe72be86a316e07a9bb9c22d3c98c094a0972ee4c38011 SHA512 beee10e653ca5aeb0be5522830db691b23f76f2402d35002c569194033b7956d78c21a87e50a5b0ad426bb64aeec9a5216ab2a0e9181a41d179be4e442c8d77b WHIRLPOOL 262e72c46dfe66cbd329c2cfc946e610b63d11e72622f2c7a7dcaeb54dae6ac9c0cabd8859e05d474a776cdcc73e94654645f1ad3d1a6b4bea552cfb25dfc003
+AUX 7/7.0.26-build-xml.patch 4947 SHA256 0b4d41ae8eec8077f7772662fe65a8a3c44e399599c90f9f14d3d2875e20adea SHA512 bfcae25172c3bb6059aac3a0a3a775dd1b6e3fe46ee308e644612382ee9e11c28dc65b1b5ba58c65a9e758d9cc41ae5f62ebb5acdc2d3139ef51df6d460e558d WHIRLPOOL 45e01e3bc5a6ee667fc3831573fd81b638c66e5e6f697ff49a344fbe8e4c1cfdd6f21d3b06c489be16a1e30bbcf2a760474a5a380479a1837deeb3286322e4c7
+AUX 7/7.0.27-build-xml.patch 4947 SHA256 0b4d41ae8eec8077f7772662fe65a8a3c44e399599c90f9f14d3d2875e20adea SHA512 bfcae25172c3bb6059aac3a0a3a775dd1b6e3fe46ee308e644612382ee9e11c28dc65b1b5ba58c65a9e758d9cc41ae5f62ebb5acdc2d3139ef51df6d460e558d WHIRLPOOL 45e01e3bc5a6ee667fc3831573fd81b638c66e5e6f697ff49a344fbe8e4c1cfdd6f21d3b06c489be16a1e30bbcf2a760474a5a380479a1837deeb3286322e4c7
+AUX 7/7.0.28-build-xml.patch 5049 SHA256 2d01c63357d321ab73c7754a0a8d3d28862009c8d2cc91c550572f9e96d2204d SHA512 acb90d46a97d010349a9dc6d93cea959d325e8f86496c41e06edf5a97749069513a11542e5437208fd24ae85c9cda4bfcb8a67904b5b2b2e46997314de08058b WHIRLPOOL 97526a7ed9b7f190519cf5aff0a820f290629cc0af41df46e6a0ac0bb97bde6f59c3384a1f77b89d2abf3fcf7fb305a110ecd2fa45e721bc0d0a9eed5e620c1b
+AUX 7/7.0.29-build-xml.patch 5049 SHA256 2d01c63357d321ab73c7754a0a8d3d28862009c8d2cc91c550572f9e96d2204d SHA512 acb90d46a97d010349a9dc6d93cea959d325e8f86496c41e06edf5a97749069513a11542e5437208fd24ae85c9cda4bfcb8a67904b5b2b2e46997314de08058b WHIRLPOOL 97526a7ed9b7f190519cf5aff0a820f290629cc0af41df46e6a0ac0bb97bde6f59c3384a1f77b89d2abf3fcf7fb305a110ecd2fa45e721bc0d0a9eed5e620c1b
+AUX 7/tomcat.conf 2895 SHA256 834b38c1e17294ee73c6571a45fb35bc398f15da4ed189e4d359b8b39121bb8e SHA512 fe39f43a4da5cdc5ed5a4d2c71002b9a1b56a55e386276e2e48e102ee1a978bd288882565f5dd2d793d0549b6256d30481d97bd440ed394f0caf1240939160d5 WHIRLPOOL dd20c3c0b7ea9a3408304e28339b3e58cad67bc9337608b11cc666e8e4a603ed49a498d3f41c3f5f0d1fa93291a38afbf3d97bde09c9c8983fa72ef4e8fbb0dc
+AUX 7/tomcat.init 3505 SHA256 9b2eaaadc9ccf25cf56212d3ca0574bba286fef7895c0a56327d5c3d5f98f5d5 SHA512 47337962fb8c2029ef84980203e40b4841f0a0596d010edd4266d73a1144de22fed17363f94aecf8fb68dae97059fe50f3f52457386a82281f3cf7c3917976d2 WHIRLPOOL f93d5da7bee183a19f06968ed6b913bf3800963aff424bd47d41548ad8ee2f871084bd0b7c1a8d00fa78b3419113cc386ad77a2ce2c6658f88ba9015cbf2c919
+DIST apache-tomcat-6.0.35-src.tar.gz 3403286 SHA256 6e5205834bd595250c8e0b640e2345ef643f23364ae0e099334b5132103be764
+DIST apache-tomcat-7.0.23-src.tar.gz 4103854 SHA256 b86523095b06d58b9553683f480250dec7216ce1914c92ea8ecca0799e6ad3b0
+DIST apache-tomcat-7.0.26-src.tar.gz 4127697 SHA256 864304e76ff6edb284fc56d7297f8e0711ce0968c9f735c89b2617d70694cc0e
+DIST apache-tomcat-7.0.27-src.tar.gz 4189578 SHA256 9e692cfe55168e866094d1dba2653d2bb75462c535f0940f756a0253284b2ca9
+DIST apache-tomcat-7.0.28-src.tar.gz 4222498 SHA256 a035eab4aa7372534161314ee09bdb086dc00179345fb002a358e157e8fb2c42 SHA512 b6ef998f79029ff2c71a9f04fb3bd7f8859fefe4762c6af25e431c571a8e9b6cebe12c982cae2ea8cd5c282a15ee7026df6ac5c4f01c5fa1c361ff7e869b823a WHIRLPOOL 2d0a5b38ada6f836960ba730f8d1e00b98dd258f07e7e6decba9c7dc8f46dc252b56c7ca72b7ef218777eddc95d4d60e5f34f01b3aaffa0123bd6ff19fa1c4b7
+DIST apache-tomcat-7.0.29-src.tar.gz 4212630 SHA256 00d42b13044303d735103373a5faf7680786879b304ca231d73844c893f6e0ea SHA512 f17a6e0c2535fdd7cbcce518c918a940ebeebef68fa1c6afb482a2d0f5001b87f973cf86f1fce9026d39cf75f2a3763b8a155fb67538e7e1f7d71472660d50db WHIRLPOOL 3b52c6118f9595b85a96302e6d1a0fe421c12a1f16c30f90380195717126911eec0f785e36ec713e80b6d9abe4d72d1104e9d1330534bc8e7d590cd017948f35
+EBUILD tomcat-6.0.35.ebuild 6985 SHA256 49ab1c00568f34f75f98a9c865731ed31aa740385d68eb350a56e1ebdddc7346 SHA512 0765d25d570fab44d8e186fcb943629e2f6d77d0ef2bd7fb996f767de731297df96208974dfc3cd67628cdc367c95aa393f47b3f3012a24fd128c18de5c49e92 WHIRLPOOL fc667584dcb3516fb65c49c641e567cec5a357788aad6a5ac40630cf0da137493050848090877fe03c9b6924a901eb51ef3f89c6177e839313b9583b18ee601b
+EBUILD tomcat-7.0.23-r3.ebuild 7638 SHA256 a94b38f501e7c4f3db23570510dd274dcacd867dcf5ec9320829a5234bb331bf SHA512 94b3202600cec659af3033fb2079d694b29f3f492a32045cd9ef8733b1ddd07e97e501c8eb2216bf72fe53b18546250d5bbdbf0cc2db1ed642e232ed6b5a4ae7 WHIRLPOOL bd2631d2513956c87a9bd4b7db1f73e84ecf76612554cd8fc296c3021995b30041084a51693837a8f764d0b276bd049c8787fed04ebd0dd7c976b3da9d2c51be
+EBUILD tomcat-7.0.26.ebuild 7634 SHA256 bdfdb09fd372f3346062f451ae4130e4299baba0fe452ab0007297e6ce23fe73 SHA512 f66e92d0470af6ac045cad1d5b2a6043f6d651fb5141d7dd5db58172abda35b467422ebbd40f383973481ae4ae40c4cd71354bf9441bae0d87c3a9c43840f11f WHIRLPOOL 2803d0b8db32bed38d1017b1ceb24b3ab81eeb1409fe6095ae4ed929a606187c82b1ef6b691256af18d8b63db8a18e8db438f1e1da147cd18c62c5d011e9ae44
+EBUILD tomcat-7.0.27.ebuild 7634 SHA256 a461a8ee10e01bb5fc5d5813462d5cf656a1a600b58c199ef337d3f888380f2b SHA512 c4c37d499d93899328d97c85d1effbdaa4d581d82094f6ae491d1b7434a9f47fc6fc2bd396c146a719dabb4dc70b258a8101be4b38d97edf96ff143251486856 WHIRLPOOL 4099a81db09816f218c691da337d1b57b652e18ec4e65a65f80f2c83c5d658d44c377f772ea0a480e33e8290c3edeffc443e4264961922b7e16cf241173fbd42
+EBUILD tomcat-7.0.28.ebuild 7640 SHA256 2cd83c336add922ae80d0e20700d46f3ded17d321ef1a1ffd9972e4d67914b61 SHA512 d96c4bcd6938f9b1dc3dc785629e1bf530a28dadd692400ef7adbf0e6df247dddc1452658ebad15c5e6f9f1d532519d7e133de9da0322982dc2f5ad1ae0e4ec4 WHIRLPOOL ebaaa516eeb527dfc44fa638fb8e8747b0abe27bdc65cfc843bbe697ebc722f82150c0a627efd5b63d1d3f814489416d571cb9f5b7c81d6ae48b1fae261189e4
+EBUILD tomcat-7.0.29.ebuild 7640 SHA256 4c1f9e42a694c6832f23a8fe394fdd5058c2d8a2453d852166b25ec668d69be1 SHA512 70e3649793a2b893dc6d2bac92bf831bd9fe12c560b2bc716837be4aacb8c0918478563b571c71b441f8d9bb77b98ba17c1201858907c0507e6b7844cb8de590 WHIRLPOOL 9b01fe83b636f205a3a8f5138192c33aa706882b26932d3cf1cf38ff9fd5127370014090c0362124ffae2e1550fd5a39d5c219adb0fa5abd11da99c704f300a3
+MISC ChangeLog 71520 SHA256 59e6a55f5a37b1fc82dd7a52603a7df80c1398df7c65afdfb2e3666948b32174 SHA512 a0bccfdce7ec0e0164d69f4998736de6779f59033d249abd5514c63fe6dbed83a70553533f53021d4b63dcf0532abbae8b570601d528783b9e123d8c943556f4 WHIRLPOOL 11f3a8356bfe431297a433a85c3b1e43382fff675ceb16374fc83d9909b808b5e3f8ff0f1c87273a679da1fa307c9f4e21c8398e7fde270d3d0192331c22591d
+MISC metadata.xml 451 SHA256 b508f373350a4e92bc04ebafa528a5c50eac8bfbd67d2fab6a4fa82811d1f109 SHA512 603530848551221a73f8120cb7a5cd9f49590a459a150f6ee6a50215e9362ecc4e7c9de12007d0adca1f000cac859274590e262bb3a1c7264349fb8861265aec WHIRLPOOL b6f9df258a4fa3e2a36d29538876b76c405379b189cdc6cddd244a7ccb06e7add91a8c09b330ccd017762c3fb91f9c17ef77842bb6deeeb3cfd6ebd036b6882a
diff --git a/www-servers/tomcat/files/7/7.0.29-build-xml.patch b/www-servers/tomcat/files/7/7.0.29-build-xml.patch
new file mode 100644
index 000000000000..e4d30ea2a661
--- /dev/null
+++ b/www-servers/tomcat/files/7/7.0.29-build-xml.patch
@@ -0,0 +1,138 @@
+diff --git a/apache-tomcat-7.0.28-src/build.xml b/apache-tomcat-7.0.28-src/build.xml
+index 3ff8f81..fb50560 100644
+--- a/apache-tomcat-7.0.28-src/build.xml
++++ b/apache-tomcat-7.0.28-src/build.xml
+@@ -163,6 +163,7 @@
+ 
+   <!-- Classpaths -->
+   <path id="compile.classpath">
++    <pathelement location="${ant.jar}"/>
+     <pathelement location="${jdt.jar}"/>
+   </path>
+ 
+@@ -309,6 +310,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">
+@@ -439,7 +441,7 @@
+   </target>
+ 
+   <target name="validate" if="${execute.validate}"
+-    depends="build-prepare,compile-prepare,download-validate"
++    depends="build-prepare,compile-prepare"
+     description="Uses Checkstyle tool to perform style check for the source code">
+     <!-- Required so we can cache checkstyle results -->
+     <mkdir dir="${tomcat.output}/res/checkstyle"/>
+@@ -551,7 +553,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}"
+@@ -613,7 +615,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"
+@@ -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,12 +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}"
+       filesDir="${tomcat.classes}"
+@@ -725,7 +727,7 @@
+ 
+   </target>
+ 
+-  <target name="build-docs" depends="compile-prepare" description="Builds all documentation from XML sources">
++  <target name="build-docs" depends="compile-prepare" unless="nobuild.docs" description="Builds all documentation from XML sources">
+ 
+     <copy todir="${tomcat.build}/webapps">
+       <fileset dir="webapps">
+@@ -833,14 +835,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">
+@@ -897,7 +899,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">
+@@ -909,7 +911,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">
+@@ -917,11 +919,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">
+@@ -1105,7 +1107,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.29.ebuild b/www-servers/tomcat/tomcat-7.0.29.ebuild
new file mode 100644
index 000000000000..55d721374eaf
--- /dev/null
+++ b/www-servers/tomcat/tomcat-7.0.29.ebuild
@@ -0,0 +1,237 @@
+# 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.29.ebuild,v 1.1 2012/07/08 21:35:54 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.9
+	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 "${S}"/output/build/webapps/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
+	# we cannot symlink work directory because that breaks saving session data
+	# because session file cannot be saved to symlinked location by default
+	#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
+		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
+
+	# bug with storing SESSIONS.ser file to path with symlink
+	if [[ -L "${ROOT}var/lib/${TOMCAT_NAME}/work" ]] ; then
+		elog
+		ewarn "${ROOT}var/lib/${TOMCAT_NAME}/work is symbolic link which breaks"
+		ewarn "storing of SESSIONS.ser files in work directory when allowLinking"
+		ewarn "is disabled (the default). Remove the symbolic link (while Tomcat is"
+		ewarn "not running) to fix the issue."
+	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
+}