Restore vulnerable ebuilds until security team stabilise the the new version. See bug 549536.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.14/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x93491BB8

9 files changed, 178 insertions, 18 deletions

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index 8cc89399f114..eb3bb681634e 100644
--- a/dev-java/tomcat-servlet-api/ChangeLog
+++ b/dev-java/tomcat-servlet-api/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-java/tomcat-servlet-api
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.185 2015/06/03 14:57:43 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.186 2015/06/03 16:28:19 monsieurp Exp $
+
+*tomcat-servlet-api-7.0.56 (03 Jun 2015)
+*tomcat-servlet-api-6.0.43 (03 Jun 2015)
+*tomcat-servlet-api-7.0.57 (03 Jun 2015)
+*tomcat-servlet-api-6.0.41 (03 Jun 2015)
+
+  03 Jun 2015; Patrice Clement <monsieurp@gentoo.org>
+  +tomcat-servlet-api-6.0.41.ebuild, +tomcat-servlet-api-6.0.43.ebuild,
+  +tomcat-servlet-api-7.0.56.ebuild, +tomcat-servlet-api-7.0.57.ebuild,
+  tomcat-servlet-api-6.0.44.ebuild, tomcat-servlet-api-7.0.59.ebuild,
+  tomcat-servlet-api-8.0.23.ebuild:
+  Restore vulnerable ebuilds until security team stabilise the the new version.
+  See bug 549536.
 
   03 Jun 2015; Patrice Clement <monsieurp@gentoo.org>
   -tomcat-servlet-api-7.0.56.ebuild, -tomcat-servlet-api-7.0.57.ebuild:
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index fc8d50a3d5b7..111a9ced8efa 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -9,7 +9,11 @@ AUX servlet-api-2.4-manifest 310 SHA256 134371e8d3d0b137096e268df05751c4bcb29911
 DIST apache-tomcat-4.1.36-src.tar.gz 3715200 SHA256 51f9139f10cd865fc331cf5def49faa718ab4a510790af3582b4189a48a5b951 SHA512 f2f36fbad5114c8a74154602249280226b839cbb75b2a584d6a6efbc11dcd2a5e27a67ee9b7ca2f12689cabfe1110035f95b27690ce6c304bbbb6389dfa97cd2 WHIRLPOOL 8188e2ed1aba7337b00e971e347594d897e01f6ea25d9e86e641cea4a1f2c68e4b9e594dd57f773447e81066bcb3377130c05ae7608fe9d9dc36a28bd89d515f
 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.41-src.tar.gz 3591370 SHA256 6def26d6eefb168a0968400d53dc08939284570ca850a0c4740398e9b645ff3c SHA512 605b33fb48772af3d34f33082d30c6791308c8ce6c52607a0e8e97b353ecd1a768a400ed65abcf2701381fff7e61d4d83a887140d4eebf753551e26dcef58e5d WHIRLPOOL c70f397308c051287d5de77e2c66b70d6003dd015cc0ba236599c09f5046bc6d5f0f03ddb672c7c9267ec860491ad7144104ede3e599a064776a931f9babfddd
+DIST apache-tomcat-6.0.43-src.tar.gz 3595710 SHA256 ef32da195dc0f070c5f8d1c48b02a213cc69b680ec735f1297ef0d8ca62e75be SHA512 f2cb32e6d01e8841e4ea43cae0b495f988eb590649047627eea31411b7eac9d8a5d5747fb986d577946430c656c1e926a75b850bc7f59ec1b86c632fdb7af7e8 WHIRLPOOL 6c6ffe58a9c2bd162aa7d6b60248304fedd51724c602d9387ae2759a8218eedf93a85b40e18bb2e46de2b245c412d32ca941109045f8e5b898546f9b4cc7602f
 DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be WHIRLPOOL c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97
+DIST apache-tomcat-7.0.56-src.tar.gz 4648164 SHA256 d51fd6b596fbcf418eddeff721f23b6109ec4d8085ba111580dbdeaa007c5b59 SHA512 f283ec2cd806ea1ac5372efc667e75687ea637185b1b74b396cf46379248da09c9a8bbdd1f4e37e84d91ed142f80a1185816fc5215e199df2ff25dded13cacff WHIRLPOOL cf63cd6e4888585f3dd9e4659f993f48e3a08f8c220414fe8f9dac9389a1456d49878b4a39674646fd6a9ad3df4259272005ccf40ead53ab51a196bee4150a93
+DIST apache-tomcat-7.0.57-src.tar.gz 4651308 SHA256 07962d20f2ce051c3e4fbdbd65a15d87d07553e7ee1542547a5ce0c201743c64 SHA512 fad8c296c2191c0168bf841b4b7c649b06900aa1b8b12d895fdaa1963f5a2b08fedb71f614cba1269b405892392daea0850c85360fb4fda2ea36311f8e8c563a WHIRLPOOL 9c938fdc419f989d9a2bc7618e9c68c0ee96b1dfaa94822d995818975c9217b7ff80c28b31cc6e9dea47d4097a2c61325e8075d4f313bc6415aa535361933741
 DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
 DIST apache-tomcat-8.0.22-src.tar.gz 4862888 SHA256 a7f1e511e10019217ec2ae91705886092ab5487e6e1c0d709023a472996ccb2b SHA512 7f6a0df1f2718021e0ece8034dad43286c0c2b3a83dfa125de78e4de8f576b0bfa7ebf67d31c5b8bac451a6b09144632283f499adac9b10aadcab634502c8b9a WHIRLPOOL e74dd5df9dabe5b2277901dd4507c4404f5fce63b0ed6c2069646c386a0fde7879293affe35997f27666c9e256d1d0b0b6e8fca5b78441306285649d80b27b71
 DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c WHIRLPOOL b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
@@ -18,20 +22,24 @@ EBUILD tomcat-servlet-api-3.ebuild 1007 SHA256 c80db78ac3e23f5f8f78929aad52c1a8c
 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 1577 SHA256 15d0f33e86760f8998c27f7b61950f4e84de607edb6c7dcc747f6aa5ca8edd75 SHA512 ce0f99fe2f0bec83f33ce38cb4b8e1daa05df4c562e918a1ee960af82b3cc338b5d6713a20fdcb28459cc3d85e137423312a330caccde68d70f697a95db2fdd5 WHIRLPOOL 412b80fd6b20b58aa2e6b656ffff6fe31c5d9dc0b9f09a976f1d343930ef165b83842e0112a3a736affa52a46d2078149ddb1382f1011aef62b31d62cb4b0d2b
-EBUILD tomcat-servlet-api-6.0.44.ebuild 1040 SHA256 53fbb4fd0941eed3b1499d59f1f2e802474f56df77180255081f1ea0778ccc17 SHA512 b7c0b58a0a472c2e2b7f8a8204c1255b445cac4038939e601981bac997caefbd3d092aa8f15e59b39e65e64e47d4d86ebfc9618f065294b9652411e5a6cdfd16 WHIRLPOOL 9af53e232adc1400bcad3468e5a63789621d07224cf25dbe319108b466eda1b6df7efc021e1cc6085120e094e1a13c8fc7e5d653e12cfab2e0864fbb0c6dce64
-EBUILD tomcat-servlet-api-7.0.59.ebuild 1113 SHA256 bd5a84828befd6fb4d22cb6937070dd1b86bd697163c1007062fbfe5364a1406 SHA512 c23d3b1b7416f7447c8318b8c2b74f682e502d84fd922734f5a318d45db49891486cc2fe26a449c35cd51a02328e560413a78d0ed3af45c427838496268f9ac0 WHIRLPOOL 438c446e8de6a8217eca816f58b26c6e51c3d8dc2abacf234f830d0068611a1bd326635b78d766f80dbfb15b260a54e47cb037757ce93341e40ad1944f3ae67f
+EBUILD tomcat-servlet-api-6.0.41.ebuild 1036 SHA256 c2025f2b800ba61710a5aab42b60e6242c7217d4b4d42274ffd4be54f1865440 SHA512 93898753f54447a8e274040c87764cc1c144b13fe0c78b1e6249262995e4cc678e91d2c2d4a2b414a448c851842810c58a0bbe043f6e96ba9ea966b93e430020 WHIRLPOOL 828cb5ad2316332b0c93126dbafe293fa0b45c885853283afd7953ae99c498c45064a28afa73aecc4e98707cfc56e27f368fccf9b4a732ceb85c1d8a57f1b2fe
+EBUILD tomcat-servlet-api-6.0.43.ebuild 1040 SHA256 3e5fdc325cae3fd3cae699aa140314fe737d9709bd3c3366c90b8b115d670c38 SHA512 380f3421788423f1cda4e9a659bf4cfb9639703fc08bf0e0b0f16aa1ee21d1de0d3ee9687cc70db9087f684e52684216e9ab5b53113cea689994530acf1ceead WHIRLPOOL 5ec5627cf9277f31140232215cbab3c794819b333303a8cceed85066e1a1053fb3178430ba29f45a43996806582b3a7794f52d7a8faa6e380c0fedf479952826
+EBUILD tomcat-servlet-api-6.0.44.ebuild 1036 SHA256 ecb5cfddc55e67da7613add60493f83e59283652762e6f51251a915f986febc3 SHA512 270f7792f1b3becbb70a85e4ef8aab46a4668dbdd0e9d409ec6b7f287b42adf52c626f82a7644ec5938dd8174164c12c3d257ae9d9d7ddd3165c622cd61ceb20 WHIRLPOOL 2b8608d856b85f46a8e1d6ad0cda6bae59aa807e930e96191926715ffc59ba473ac1f50876fa795fde7005aff2e085148f3f3cb54d8824e9ec16c4a375420661
+EBUILD tomcat-servlet-api-7.0.56.ebuild 1140 SHA256 3ae2bea4a44746a1d499a72abbf19a881e2f1e722030c15d962844758f86f7c7 SHA512 9fda256d97ce8995e2de7a667bdbecb893f7a3988275f394b27737b68231ff4445c1ca8ee0403e2483ee381bfd0a07a3eca0b7213a87c7249cb80674a1775a2b WHIRLPOOL 4ec92399a9659a718ae76b30f449a0fe37ed876d06d79705aada4044a79cffebfb1a81e133353caad543626dc22972f9f8896b31c0ab0a379242482caaa4a632
+EBUILD tomcat-servlet-api-7.0.57.ebuild 1113 SHA256 47ffa80065f3f574abfe9f09d40ff3e35146f0070275782c0d6bb81c74b26ead SHA512 af912bc3ca9748c4a33bd2c338fb5d51f15798a9016040270f83d17600b78c6cc5aceefc7c5e8caf80c77c6ebbcc6f7e74a25775e7b07d70bc3a7d0f0eccac3f WHIRLPOOL 0fbba143c55cebab3a89d5cff1dd51816c716df0d60c61d59e1bb63891231942df8d3a9a7001a57aab0e85e150cb300615f739e67295ff734a0450135f772d01
+EBUILD tomcat-servlet-api-7.0.59.ebuild 1110 SHA256 bd047ba26d1b20e0c5bb80b369639010545cc6b149a31b8e74cdfe65b1550c40 SHA512 3e4816bdce4b22f0fe61b0c6663fb6b3fb2fcb3aab9dbd57660ed8b3d6a96491aa9bb6ecd53426af8ebda275c734d0edd59e696863d75a35e82c2a0623f98878 WHIRLPOOL 73b3a7b0ff334eaa77166c60ca1cb92778ff8cdfdb96ddd5c1093e1468868860bcbd04601abe567602eca593f4e325cc205d9aa54df0d841d55c7dae7000d5b4
 EBUILD tomcat-servlet-api-8.0.22.ebuild 1131 SHA256 72ed8df19a937a24e2ec100f9ccbf6711748788c7643c8c2bce04b99ac19b46b SHA512 131ec5521d7afb5dc87e24d7d287f47ff6b7bfe4ca3205f5ff4aaf88b4bf94cb450dd314edf478f3ee8cb4ab345848d10bdef5d8c27b029cc797cef760eacb62 WHIRLPOOL 0d4169eb08a87553a3f25ba4a0604f564e4e23b52760e358543a2471fbdfa76cf43f7ccdbf73a6f14f6472c71e16a4730264906e2d576f971cdb3bd171c7782a
-EBUILD tomcat-servlet-api-8.0.23.ebuild 1131 SHA256 a557a069342e1bf8133abfd6afb31a47e2fc36b8790deb5e36dcc264b46b257f SHA512 5b91c35812285f2dbb2e77da437cee9894a3571d37ab07e0df4948fe835bcaabed45aa75d046ec01400fca1d7387122e8c4011fbc8ac3d41266c61cdf35bcf74 WHIRLPOOL 07f3347fbf21ccb0911af044750f6b1ae8c582887189d4fe92899c5e674ee1ecbc8d59598b8a863479c5dac19e1f756c1292b90307a4077ab2480f31fca72196
-MISC ChangeLog 29655 SHA256 dc055cddc91b069132003e6b8fac7ee990f43b8b8b3059ba396ca24310f69de5 SHA512 eab7417aeb2a02f40d6f3bf197436e78d740b5383449628b847fe30c6dcd3ee0d404fcf00648a9ff85c3bce0221224bb7e7e386bbe299069f5512aa884b14df2 WHIRLPOOL 59f66a80fc9a511f99e258bf85a85989c8e516990a3f32736d468ebe73d3825a0e366f6784bf0358a966a5f7842602e0a978c827d2cf029eea080839ff5aa15f
+EBUILD tomcat-servlet-api-8.0.23.ebuild 1130 SHA256 96c1c1818415c41976ba578684669937a4cd21ec84e2e10369a8ee9f4756e293 SHA512 0fafdfc5bcfdd4b1de0a4ee72ef0279c780c4f8900ef02b067f22a6626a1c5649e66e402b680180409adbc7517b8b7cce333613b20c75e012429a598a52518fb WHIRLPOOL 94f694f292d19d62ffcc2cd87d8795aa271e9dc5327a84f8956b5e54b7bee089d2a7421efe9c562fe21b0f30cc03499096fd1073ff27c9bac36909a5c32f4d49
+MISC ChangeLog 30223 SHA256 52769d154d654061e7c4383a5e3f52bc4bf08fa275f5d22d9e7810f042dff62c SHA512 b1ff40be79633a4c105033f562ca74dbe5b914fe1d7c5887e77caac8d6e887bc4c218f06077306bb8d7fa7f731028db98a8957e0a915ce9a0463d01c5b5613dc WHIRLPOOL e077ac2a1f9066055bc258d6b6b165c69e58fb63a374de962283666a9bcc8ec459d21e8c4b5618362081e6079e58d06010bb5dbfad4961e4ba3d56c972f7e28f
 MISC metadata.xml 265 SHA256 6b387cd849d192d7139aa572a2638fd4d44d99d7ea78e30f26b0f3f4baeab84b SHA512 1d6299dd8a1ec8fc5fcb06ec43c2c59504b4285aa7cbfaa1eea3cc28f20b68d7367c74fc2ba29101f2e359d2990e64b7a21d719a6c68e55d2f7c94c2d8e22bbc WHIRLPOOL 2d40903d68542f78c6c62b0072610e5d1fdea4634f2aa55a7fcb1bb0dbf3ed00ee35a84b7f23bde7eee24770fca1dc1be2809cc0a6376edb9f0960b2826f566a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVbxVuAAoJEJGRpfGTSRu4kuwH/3XNn2N7jcVOXRzjAPT9d6om
-uEaa02bBrpdrcAuCwLj+g74Ly6m7Wf3aApXWsckSeRLTA1WXIfy/aoQuj+54OoyA
-8L9TUzpfSjp8kAgDrK3NTkiLWPHr++NaPVjymOz0R46ktggUdmN3RACu+Q43DOao
-r3huqDxyM1fObjzJZkM5ZcS+ZuxeRHsiK/rUQlZjjX6jRWILraFznu/Z2B2w7LXx
-64L1T/njsX+WBsXIKNMHVJ2nQEmHPOUIiSqRRi7c7akhNGpzZQkfMHo0jfCkWVTI
-HFaHcByObYoB2hWFLo8vE2ht43xGxnxoIlSSlT5Cx38d9Mnau3Ry+7oMEGrkE18=
-=ErZe
+iQEcBAEBCAAGBQJVbyqrAAoJEJGRpfGTSRu4JiAIAIPSNyN/pSWeDk0kZjgihuGE
+1v9XBYrSx1FcJYmdduyWu46+uAN1+q5XIQuiYrfcnEOKcucmjOA5yjjSF9l60xz4
+p/JtLGBHL2rcCABOEKrsLpePviE/JGesfacTe5ZpZ5AxcIC3QXzyqK+7LOqxK7Cb
+vfnDkXWYB+qMTtepxEg0MP5G7irkihMXG5fjkCNnuZHxK/vMvMG7V5b3dVMAHaeo
+SzrdFfsVavgGvneTzc+0IWlp6/6bOBvlyR+uSI2lgow8fa733Uwj89kB175JtIEC
+uHfRULjvGrH2ZFHcLE2ezBDiQksDzUCXca5qLdVRdceOI0Udbe+lgzv6160/yUI=
+=qe3v
 -----END PGP SIGNATURE-----
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.41.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.41.ebuild
new file mode 100644
index 000000000000..c0b7accbc5e5
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.41.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 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.41.ebuild,v 1.7 2015/06/03 16:28:19 monsieurp Exp $
+
+EAPI="5"
+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 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~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-6.0.43.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.43.ebuild
new file mode 100644
index 000000000000..39b18aa346b8
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.43.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 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.43.ebuild,v 1.3 2015/06/03 16:28:19 monsieurp Exp $
+
+EAPI="5"
+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 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~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-6.0.44.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44.ebuild
index 3a2369524300..52d4a0e481bf 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.44.ebuild,v 1.1 2015/06/03 14:56:25 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44.ebuild,v 1.2 2015/06/03 16:28:19 monsieurp Exp $
 
 EAPI="5"
 JAVA_PKG_IUSE="source"
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.5"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.56.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.56.ebuild
new file mode 100644
index 000000000000..dd4d9644fc6d
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.56.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 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.56.ebuild,v 1.7 2015/06/03 16:28:19 monsieurp Exp $
+
+EAPI="5"
+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 ~amd64-fbsd ~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' ')' -exec rm -frv {} +
+}
+
+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.57.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.57.ebuild
new file mode 100644
index 000000000000..af0780920ae9
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.57.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 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.57.ebuild,v 1.4 2015/06/03 16:28:19 monsieurp Exp $
+
+EAPI="5"
+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 ~amd64-fbsd ~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 ||die
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} + || die
+}
+
+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.59.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.59.ebuild
index 8ce47eac717f..0e2d84a37269 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.59.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.59.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.59.ebuild,v 1.1 2015/02/10 11:32:57 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.59.ebuild,v 1.2 2015/06/03 16:28:19 monsieurp Exp $
 
 EAPI="5"
 JAVA_PKG_IUSE="source"
@@ -15,7 +15,7 @@ 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 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.23.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.23.ebuild
index 3223adf1258c..12f8e5c5fe0e 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.23.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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-8.0.23.ebuild,v 1.1 2015/05/26 20:04:24 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.23.ebuild,v 1.2 2015/06/03 16:28:19 monsieurp Exp $
 
 EAPI="5"
 JAVA_PKG_IUSE="source"
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.7"