dev-java/tomcat-servlet-api: version bump

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

4 files changed, 83 insertions, 12 deletions

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index b526d30b9e6c..d08e35079d87 100644
--- a/dev-java/tomcat-servlet-api/ChangeLog
+++ b/dev-java/tomcat-servlet-api/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/tomcat-servlet-api
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.136 2012/09/29 17:58:23 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.137 2012/10/29 10:55:15 fordfrog Exp $
+
+*tomcat-servlet-api-7.0.32 (29 Oct 2012)
+*tomcat-servlet-api-6.0.36 (29 Oct 2012)
+
+  29 Oct 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  +tomcat-servlet-api-6.0.36.ebuild, +tomcat-servlet-api-7.0.32.ebuild:
+  version bump
 
   29 Sep 2012; Fabian Groffen <grobian@gentoo.org>
   tomcat-servlet-api-4.1.36.ebuild:
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 8063416708b2..2d7e40548657 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 2.5-build.xml 2864 SHA256 b2cbb540ab2bfacc8044e0c6d67afbbd8c1e2e04a12a9c0f565902e1ef3c687a SHA512 729fa2287e7178fdbc15747e57c9792de7a34366af3ab7bb703f17168ad1b296e395883e1d859dce0edb9640ca65e495b3b3224d5c2c91275f2fb35852cf4c0e WHIRLPOOL b882958a2be6610ccd81a21e74446c9f6f31dd306896360a42fc6929774159c1f71b7101ed9d19b855a6ddbe2c0d54e9841c5f28a5ab31532f27109521284506
 AUX 3.0-build.xml 3192 SHA256 94539ae9bb8360efcdcb3c9529a21cad7f3a744ef6491f54c8baea2a656a4a9a SHA512 fff70f29b7b8025ce10261c9afc140b0765aee35821fbbdc161872ecec4819832ed12a71bb54e9eea96ecf8418f51a11a8716b07bfdfb957dde6bc1abe8ee7e8 WHIRLPOOL b4ed25230c69d896003e53e66f17512b9c2a67ed8360207aa8ac5e3c20daa28885ddd8410b85e18b8a4fcf6ff3bf0a91eaf145500d1687db808c7f4ecc194800
 AUX jsp-api-2.0-manifest 474 SHA256 62c4ac2cef5685a2a631270034a945b1eaf774e89362486e27fd357dd928cfd0 SHA512 f2e21cee74fd1c3f1403eb3e26c1c7a59be420bc25da842af0cfae851fcf4bb22575b147feb2ffd3a52410e0e552bafb4414b9f8ef5f9a0f4df1d061f2c6be41 WHIRLPOOL 72e236694417c2b34d38ad3cc3fd64ffd66dffce57f7eb69de58dcf87dcde5e29c8e67ef18043e25c29ec910cf3b99b1d74daaec2147052718b752fabc07267d
@@ -9,30 +6,27 @@ DIST apache-tomcat-4.1.36-src.tar.gz 3715200 SHA256 51f9139f10cd865fc331cf5def49
 DIST apache-tomcat-5.5.27-src.tar.gz 7382057 SHA256 90bc8abcddda604e855c37035653b1e24b31c2f09b7a29235e92d65025f7a334 SHA512 32c605aad92b7d554b9e0f28a4d3e707b3cbfc0661a969eb2479512517f8e9e8848b820132d711c41f5c0fa863028b38e1fa903e7c0205599e9e58a86ab4733a WHIRLPOOL d3bca642fd8d5ad73dadf8864ebd0a75146adc805c298d0fd5ad26ab2d4d93293a9ea83d4190e64accd3a7cd38bebc1580dcc266f9a81c4472bacb37598acef7
 DIST apache-tomcat-5.5.34-src.tar.gz 3720299 SHA256 a52e7f2abf0fbdd9665ca398d2b39f99b80683b0ee43c72751390e88dcd6114d SHA512 4c8616f839a3c413ffef45b7b6876f123cbda37f4029db96ac1c8f259a75f0d65cdb5709468d89e731e5436b011dac4ee3e9dc397adfc9ad4d0b1bc462c8e519 WHIRLPOOL 25e987b58af5535914b666a5bb8691146d68b2287796ba25b8a5f792df08f55901a7ea3f419602207f7a8168302b080592bde5f4aeb67b58f40e5da00b8049ad
 DIST apache-tomcat-6.0.35-src.tar.gz 3403286 SHA256 6e5205834bd595250c8e0b640e2345ef643f23364ae0e099334b5132103be764 SHA512 fbf9d471f67d6dbd22c37f1963e24c1f45f39431049feedc78557efda86a793565ec5b0b5b31735d9d98a639a00a42c034ac6ddcf7b649cfdbcb8b4c6b160a39 WHIRLPOOL fe747f3ebe937b93bfce8cf15e1bf46a8d4fa9df860223f74021157c0333db9ddabee40a62cd04fc3248e817e3259a7c0fdb4fc452e7b5c095213d4e3cdb332c
+DIST apache-tomcat-6.0.36-src.tar.gz 3411736 SHA256 8da5b897ff28f688a5c7fe5abaa95e0ae0de9562283cec3c2643faaa13a6932c SHA512 6646c54c6e2ce440b07401b0560617204cf6e8d65885120165cb38a9cabe8f3dc61d07330e5b03be1ad480bb131f2d63aef86e367d180df96e053200587384b3 WHIRLPOOL 5e168a6cd3389cb98d0a01a2bd23f4fb49eaa82af134175c21eca3975c1ca1a6003db023d8bc069f95d4ba43dd053e28e03ff626a5b09da74dc2ba365b8c9821
 DIST apache-tomcat-7.0.23-src.tar.gz 4103854 SHA256 b86523095b06d58b9553683f480250dec7216ce1914c92ea8ecca0799e6ad3b0 SHA512 32923e45c9485f22b4691ef5b36046aef5a07613fac21810180b86675220cfa6fbc3e89b1067afdae919a6681c20d5835ea1a537877a69f36d8f4950c6d485d1 WHIRLPOOL 9b203f818f2dbf2046df764e7b882a17523fba9775fc41d4cfcedcd94534053fbf4f7404c2f38008392eb984ecd434ef4d24396ca2f487c9abe60b35089ec9f7
 DIST apache-tomcat-7.0.26-src.tar.gz 4127697 SHA256 864304e76ff6edb284fc56d7297f8e0711ce0968c9f735c89b2617d70694cc0e SHA512 3b4c981a75bc89e61ef09a6658d6c4c862a07ea516825a5ca299b888200ae58b647964cf4d2de955a570654f1473729857bf510f9de07eb4378bd0b857a7beae WHIRLPOOL 59b6d7b4f399c872a93aa2a57e4b9b538aa1af27ac1e025166fd97a55a803e77b2fc2fe821f88ebc79a3d8360f244dcb4f86ffb4e03db1ee671f06bcee4124fc
 DIST apache-tomcat-7.0.27-src.tar.gz 4189578 SHA256 9e692cfe55168e866094d1dba2653d2bb75462c535f0940f756a0253284b2ca9 SHA512 e2b00777157e0cd66dd1cadcfba4302defd3c45d4233261d56e5e7322260eefb28d3015026322f72809c9ee4403ab83886353bc1618415d3b1115ef2e5657429 WHIRLPOOL 1c523a73c7ee5894ca4eda22f3833fb79a5d9694a164a1a7ac207638a36fd2aa587ca255065c670163850e516cc741598afc5ad32293c701719bfd728584a84d
 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
 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 jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1
 EBUILD tomcat-servlet-api-3.ebuild 1020 SHA256 61b963d839d4498080252504d95c0f0cb6d71a3ffbdfaef58c29439b39cc6e81 SHA512 13f4b0ed04cc6bf7c7d844629fb729271315542b019147d4a8e7d1ce6f573ffbc3ab2ce42059ae6f0d74160b18f0f9146ab5fb93a78df702b5574190ff6c4a76 WHIRLPOOL 1ca4fd948467c414bdb2025cbd6a17057866a7c87374d246c1e950106fb93c2907ef0a5c5c590a01866d3a7ed126a1bca93ab93ddcab2eabe2a2eeaa4b9c6f51
 EBUILD tomcat-servlet-api-4.1.36.ebuild 1144 SHA256 760a639f1db06019140df2d3fae8bef8ba3acc07bc5e2aa589a14556470bc653 SHA512 be3c516dba70fdcb83ef5a14b73d17854ddecf66601a9f81df73db578e64aee0dfeaaad069ada7e9bcab3ff4d0dc0851393d7d089b05ee632324e85e1aa66277 WHIRLPOOL 2c371d8ead6f42024dad8c6e72bbe13b349e8cb911b52a0694cd1e7f74f9da0990c94f37967dda673efd8a5d98c7aa8ad37f3debb3aecc3a1c2a85c69612cdf5
 EBUILD tomcat-servlet-api-5.5.27-r1.ebuild 1569 SHA256 1c5128987b55e888b911e7624de4e80ef85cbd5069298eef47ebc8833d02777e SHA512 447b95366f49edcd47d4316fa4d2c2a745d4b13a662bfee83448a89b29fdb6ebae7ccd287c55a64626cf32df19d25a0a4c387209da16cbef238600ebdea8e070 WHIRLPOOL 4685db2d9630d39c48153cc7aafca28d0e1ba25d8fb60c8311a7623c966a03d48e510f8a21b1d10398f44931ae358fb8e4c4a247c48151855dde83779b589f5a
 EBUILD tomcat-servlet-api-5.5.34.ebuild 1569 SHA256 ab0cba8b24713b5665914a4f0df8e8d6f441c96f73ef12880319d4739343f653 SHA512 b231ce4ec828228d26c605c6539a353ed8c6806e4592e0a12e3a182980e58a3dd8c2e457edc34b72e18e642f8b5e76f387f28b8442fd330e36dbe5046cb2d7ef WHIRLPOOL 71c80a315aa84a734cc8a795794813ec1172a92f72e8a239111a242850242511abbb8da509f55a5385256b2231cdfe6a2bd615d7712480fed6b486be96b8ffef
 EBUILD tomcat-servlet-api-6.0.35.ebuild 1009 SHA256 e0e3af3c27b5c23130933ec0177c6471323db1c46e145a360a1bd3d146cccde7 SHA512 c4479e797ca7ab514070aeb99609caa1844aee8b14dc4dc3a2dbe17197cf792b79ec8b805e7d666ff8a15b91bf5b114063cf67228ef40398cf784677efd9f673 WHIRLPOOL 925c6ba7e0741b113fbbfc77bb3a864a6bcc283c50baf69f0ca62dd1582b0015ce8645499c955dc7adb37d7610fc66405dfe90f8e4c56aafafedc621ccd2e2d6
+EBUILD tomcat-servlet-api-6.0.36.ebuild 1011 SHA256 f5a20de3a4d93018d1a80893715d62b75188706dbd8740bacbce49d91aa4fdf0 SHA512 16b306e3341654a0b78e7a0b6945b846a96ffafad37e67bf8c0177702298582fef8b884901c6bfd3a1d6835d43c22dbe23b23367ef75c5f98756bf748fce7c95 WHIRLPOOL f4ee16d09b86fcdfab5355cefa29dec9cddb82b3d587ec4b322e7a90447c0f80f5d513bd789cb0888c8e20b99cae72421827bcb7eb8619d43cc0bdf71a49c6bc
 EBUILD tomcat-servlet-api-7.0.23.ebuild 1115 SHA256 73a217aeb024a22e0125aa3244d7d4c7ddff8d5e4d1e87228f1fee378fa6bd7e SHA512 080bd92cd986f8b74ca6cb80ae03b1f2816b03507eea78f4bb5209ab1ffa634d603ef186e756a04adbf19ad20749f5150110218a49c994265efb24fc25c83ff8 WHIRLPOOL fb5ca67a990ed4209b905b374c5ca3d0614392eb7d59dd725d92d26305662b3208fd1104c4411676e8cd6fe9a8bd718677f35324a6e6ada42ab6e2dce7d1b5cf
 EBUILD tomcat-servlet-api-7.0.26.ebuild 1117 SHA256 ae15944dacc907bca888ed346580a5bf10273f683f298738a06760634022d106 SHA512 67be73dfeefb664bf457f38ec77347cca1a679bfecb383fa35c3d57bf405ea4631cf34ce5e3cec4a5be951263b8186d70c047af662c5a717295de352aab6cfeb WHIRLPOOL 3a3ecfad4e097a803b067f48441a30f21dae4b2184bb0d526d52d70e8faef4d9f0c8dc250c056fbaab43d61d3842ff142b285208b3621d727029c8ffb9469fec
 EBUILD tomcat-servlet-api-7.0.27.ebuild 1112 SHA256 5ff6c7faf9caec26eab4c839746e09d8adc8d4bc34f6b5b306a3da7c694de872 SHA512 135368de421f0f5b772a79dd53ee05e859d83c9d51c5c398210888941debb223ef0f6e1f730ea4d44f8149c0301069e06053bf8fdd293e22d6b4086adcfde197 WHIRLPOOL 9dc3aa0b53008b15a91ed55e0b0d5e94544855c76995c82245c8a576abf13db0d757cd44f74b7249b119a8661ab4302644e4a0fe48568f8b7527ad03905e2eb6
 EBUILD tomcat-servlet-api-7.0.28.ebuild 1120 SHA256 807c83c3db2a156751b67f26b2b4ebad5a118eb6c05a18821698b68a813fc213 SHA512 383a7cbda6bcfc15acda43593da894343de193501a99f9f5695f6aa37ff581daf9796a756f1f67e938194eeed6e83363358472929ffbf6e16adfd5a30678e690 WHIRLPOOL 7265be8db04ab71d46b06619b5ade19c068ce1ed8e7331ceccae105bd8470d4ae25292a546339e41576b38627440dd7d6d206cf90cc96a36a3963f461ec34155
 EBUILD tomcat-servlet-api-7.0.29.ebuild 1120 SHA256 959b258fd16f79116c6a8e408453035d5ab48ae5931de1e378d3d47aa79141df SHA512 997ee813fc131a91624a73d47999972561ed3596fbe898fa334e588262bb514330d19c930fcd7e77f854e784f661f466e58c5a0de468d0969bfe644654ccb07b WHIRLPOOL c479ed23ccfe2f2d3961629642ddd25e62efe177866e4f7e4e4e4d4dac1c3a995710f0ead365edec8afb397b0f58445ecedba158d852c13591824319f9882b9e
 EBUILD tomcat-servlet-api-7.0.30.ebuild 1120 SHA256 7715d23ea966269ffc5e4a109b042e038f8008ed2a317c9b38d0ac7bc2ae85d2 SHA512 1e5225d8d09a189fa70ec7fb9dfc0285a19073ae5757608a6379d2f6ccc3af283b63dce8a0e79ee49c709f2d1f67c73e2ede60f738cb61931405a9d27600f203 WHIRLPOOL 710b542f5618dabbf96cb426e57e146be5829a0db6b7bb052b16bb08ad2fee1c2d00060384b70b74ec1792df26ce72facb72a9e885f52b60968bfd5f7f42b8f2
-MISC ChangeLog 21701 SHA256 29de382dbe5765f6063e16f49ff77a2e9cf06234a80f08be55d4a30d2f03421c SHA512 2d6e1733508ffe4c1356a630956869a8666f441edf52c5ec8a6a0d915ed4500864ff38cf1bcc4cf615a6e657b46e2fdd61e0b7500bad6550db15af53666a076a WHIRLPOOL f55fa5934c8271712a0cf9d4da256628b715ddd9c232a89b739a35a4718b86ae032fbcde7eebe308e5c82b6d1e9060ae6ab73c943aaa323273a3da06c46465fd
+EBUILD tomcat-servlet-api-7.0.32.ebuild 1120 SHA256 e2eea719c09252d50f91a6f44b4f71a09b1ad286290a77436f931a87c50f3011 SHA512 1838258c8129c9a18fc81b2105efaea52a58f8683d9cbef9e617677c6b0de8b4ef8b415d6686de06d7ba3d63e60072ace9a6cb04f25c7b0fe4cd21a0a403180f WHIRLPOOL 05a8075060d9f069fa4b5de4c8c01288f906ef8a30d12c38edfc8f3771993e56380cd5a5aae082bf3ca34faaa4afef61cc155d99ce01da84f0b6058b22125a14
+MISC ChangeLog 21925 SHA256 691ec6d6d8543c5e6210b6ed4f06bc62608e49ade6bf8009bcbc666d36e92b7c SHA512 9631b63f4f46330b3aedc602133a6cde7473ed3723e8c088f9de847ed30f3e575928123320f3dd045de920b765c06d25b47a1313149f7b10aff1130e6d110fde WHIRLPOOL 5f20c4eaeb5c2d5092954b87e62a5d9585c5800dc5264aa3b6ba475e8cc9e3ea9ba190fe0d8600b783deb4c55bc356c8c5a7935363efff4caea651cfa8b3c207
 MISC metadata.xml 265 SHA256 6b387cd849d192d7139aa572a2638fd4d44d99d7ea78e30f26b0f3f4baeab84b SHA512 1d6299dd8a1ec8fc5fcb06ec43c2c59504b4285aa7cbfaa1eea3cc28f20b68d7367c74fc2ba29101f2e359d2990e64b7a21d719a6c68e55d2f7c94c2d8e22bbc WHIRLPOOL 2d40903d68542f78c6c62b0072610e5d1fdea4634f2aa55a7fcb1bb0dbf3ed00ee35a84b7f23bde7eee24770fca1dc1be2809cc0a6376edb9f0960b2826f566a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (SunOS)
-
-iEYEAREIAAYFAlBnNsUACgkQX3X2B8XHTonkRACeNDlMZ4hNB+D3J41VeXoWufen
-NH0AoIfvNAEylbaCwi3gYZUm7/DfdW+l
-=IhSd
------END PGP SIGNATURE-----
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.36.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.36.ebuild
new file mode 100644
index 000000000000..fe9bbcf11bcf
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.36.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.36.ebuild,v 1.1 2012/10/29 10:55:15 fordfrog Exp $
+
+EAPI="2"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 2.5/JSP API 2.1 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.5"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm */*/build.xml
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.32.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.32.ebuild
new file mode 100644
index 000000000000..301cdf193884
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.32.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.32.ebuild,v 1.1 2012/10/29 10:55:15 fordfrog Exp $
+
+EAPI="2"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -delete
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}