www-servers/tomcat: version bump

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

4 files changed, 383 insertions, 2 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 0cd71d20ee50..c6f38bb08459 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.343 2015/02/24 21:06:23 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.344 2015/03/28 15:54:37 fordfrog Exp $
+
+*tomcat-8.0.21 (28 Mar 2015)
+
+  28 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org> +tomcat-8.0.21.ebuild,
+  +files/tomcat-8.0.21-build.xml.patch:
+  version bump
 
 *tomcat-8.0.20 (24 Feb 2015)
 
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index a2bacd891d1b..f0ebacd55d60 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -5,6 +5,7 @@ AUX tomcat-7.0.57-build.xml.patch 7127 SHA256 ed30b302255203296a7e895924587f845e
 AUX tomcat-7.0.59-build.xml.patch 4021 SHA256 eaedbf4f596109b8b2218f4643b8433d9907ded1e81060e1694bd9b8ea1c972c SHA512 c58512a0edec2c70ed1751cefebdcfeb992f5748f83a5797bd6a23f17f99f40283521dfc8c1734868168ecae8bcf1b8435900f16ff113b0c89c2ea1d64e4dbcc WHIRLPOOL f2ff5781f8e31bbd7210a535216b8e61b6d0c000629eaba96a05fd48eb32bf828be9f79b6081aacc0071c333bb72e1fc70eedfedcc1311fb8ea7583b628e13c9
 AUX tomcat-8.0.18-build.xml.patch 9015 SHA256 8d6f7bfc3b8aaddb1e7cb636e5048c64ff2f32206a3e495d35eef490dbaf586f SHA512 dbb855189281350e49184f87843db0655b831b47a298928ba942de2e20fa6cf10445911cd9ac12a73d1737611940d3330152f999b339d2a8d64e69b4240f248c WHIRLPOOL 007a0e5401870df8028b7856fe116864c45dffdd96481cbfa84d7daf5c61ef4b72b0c8ef1be46c29b9cbb960ef394dbfebd8c9b82270aa12c2ce7970145303e2
 AUX tomcat-8.0.20-build.xml.patch 9015 SHA256 8d6f7bfc3b8aaddb1e7cb636e5048c64ff2f32206a3e495d35eef490dbaf586f SHA512 dbb855189281350e49184f87843db0655b831b47a298928ba942de2e20fa6cf10445911cd9ac12a73d1737611940d3330152f999b339d2a8d64e69b4240f248c WHIRLPOOL 007a0e5401870df8028b7856fe116864c45dffdd96481cbfa84d7daf5c61ef4b72b0c8ef1be46c29b9cbb960ef394dbfebd8c9b82270aa12c2ce7970145303e2
+AUX tomcat-8.0.21-build.xml.patch 9015 SHA256 8d6f7bfc3b8aaddb1e7cb636e5048c64ff2f32206a3e495d35eef490dbaf586f SHA512 dbb855189281350e49184f87843db0655b831b47a298928ba942de2e20fa6cf10445911cd9ac12a73d1737611940d3330152f999b339d2a8d64e69b4240f248c WHIRLPOOL 007a0e5401870df8028b7856fe116864c45dffdd96481cbfa84d7daf5c61ef4b72b0c8ef1be46c29b9cbb960ef394dbfebd8c9b82270aa12c2ce7970145303e2
 AUX tomcat-instance-manager-r1.bash 6451 SHA256 28990e664007e6eab91d1f90f58009457f683c4c9d37ef78f9065b4b6c87add2 SHA512 3c8f994519d1ca5ff24229798786ad3d75dd20dbf8b3b81f6c0ccd121b978d2cb12633270f463a39ed5c4097e5869b1a4bfbf867994a64c5e41916e378038570 WHIRLPOOL 3be20ac95b1b2e80d62cecbd5e47d0b7c768e78ec38c5ec5661e4d563962196eb45fae82d54349a9202323f5a464ac922930b1b01e197ed6e83f03a3d38f79af
 AUX tomcat-instance-manager.bash 6403 SHA256 09ff73a51d6f11b83c78d6306322455091da302c8d6bd711a0fa4983d850dab4 SHA512 7b51b77447854dd4c6fd4a3bc16aa912edcb5e31d64a4c47f24102c3fc29c2a18f51d8b8f0e28723fba694451c8ab780dcac3d12dc553dc3f182c1d1372e7171 WHIRLPOOL ad845aedd608615df243722be6a4e3ad477890ee8e59b5d0061c4490d95058d7857346bf545c16d7756ecfa62a0b31f137d819095461cb6180cc75df1d81511d
 AUX tomcat.conf 1544 SHA256 6f74ff1ea148322d7595bb6bc10bd00a81851d1822046c01e7f42885b357a4cc SHA512 36ba5c4ccf9ac062acfaaecefd9aba1065fd5553df21cd9c2ffd2b320de472c3397d8499d3a2a96b51d8ef513aa86d5879a42287579da4152916802a988c7811 WHIRLPOOL f2ea708f87b21a004680f3f2865b98bfbeb4dbbee77ce19e7577a8d461df21d682136bda88591114c6b9c2e1dec42ed816ea4a981e6863ea1faaf3f0407dbce3
@@ -16,6 +17,7 @@ DIST apache-tomcat-7.0.57-src.tar.gz 4651308 SHA256 07962d20f2ce051c3e4fbdbd65a1
 DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
 DIST apache-tomcat-8.0.18-src.tar.gz 5019289 SHA256 ab1085912c26356ea1526c1679f3a950fe97483d9ee2041e63a17cb058c763bd SHA512 4aa908fc5d59ee2070a10d688c5977b7a8ba3507df2ed067c76f1a3e41fff369a7b7323ef1330f2227e4b1c3e3b1c3172a800f194f62fc1c9a594c79da362f67 WHIRLPOOL f23109f0e3c5fd9f01231cc844c9e35e202f33f81b87ca84ac120f43abc2316cd97679c8c5b9ca8a46b5c1bf04ead4bcb9ce85bcd588189dfd6a41e9b98dc5ba
 DIST apache-tomcat-8.0.20-src.tar.gz 5026885 SHA256 39a39d5b0c45c0a3992a97e5cf2980c5c94cab1d5fd577da4f2db40a81f8359e SHA512 4883e490901500a01aa92ae855afba864cd985fe4ddb923b17048c9d4b80c6cc6897317550e0a8d8c08260affa3be7c357448961cbd3ea72eb3491316d2fff83 WHIRLPOOL 7967a247061ced57c81e54060155e3a1512f891b5dcdd6eedee06a95a6c53261b033001f6eee81f5ded70d89c9b9742d1f0752f78afc9bb7ea64612d4c847d25
+DIST apache-tomcat-8.0.21-src.tar.gz 4894606 SHA256 9fe0d4f0f86593a78eec952b257c7282765604926c30fe13c9dbe6f9f35674d8 SHA512 dc97e46fd1e0874613921df337577156891c84844126a6c99ce57567a61783eff81f00cdbe98faf73eec4c4db0ab7af25b96702382b0c3495f965ca0139642d0 WHIRLPOOL 338e94f4a87f8b71ef71319e8d5d5d7830e0d06779abdcd31a4c15bc71188b95fdbbbcde3434c49bd6e606e2922089f24e211236984c5875e2d656c53b78f472
 EBUILD tomcat-6.0.41.ebuild 4100 SHA256 f6670ad36ebe0e33e355dbd48247498f0442375379dfd07699898dc017ec735c SHA512 a9cd92dbda03655749ecab0b18859c9b675da10cdca481c4cb5a817264a592fece1918488900f5737eb54e8a604ac6f1147818ded09cc7e9e95454e466ea0322 WHIRLPOOL 2238288feeeec4b2f24ade1606561d48461b5d0cb1d9996c03fcbf3e2a3474c0cfa0c54c876dd5e3a29e20d3015a370affad2df20bdd17d8949dbf7149fd5d61
 EBUILD tomcat-6.0.43.ebuild 4109 SHA256 5577cf55a7ca8cabd213e62178c81ad6e98b7bdde8da7c1d27976d72c1514aff SHA512 782fd83b71db4a13a9c9247c3773cf0674a507f5332c7dc61129c4217b013b401621c4c233e9534b49f0713be54e2018aed6a604d54e9986192044b3b1dc0cb6 WHIRLPOOL 37e7b8cf12c98a74c43db448d4ad0bfb2b7299df44894552fb52232e3c52997ba79f335d175b2eb488d075168e4115ad87810172677fad3bf9cbe6b01cc86331
 EBUILD tomcat-7.0.56.ebuild 4365 SHA256 97276b1e8550dc3d8b3605d57e744a76930c056dbcba21ee83742e8053cb7a52 SHA512 f3a968f5ed7c04e5752a0749467767689b5006ada49848aac02d9ac977ef2024d21a8ea5fcae2e1f609f5faab99b60c35ee084a01c961c668d031d0554650b78 WHIRLPOOL 81f7673fcf5c09cf3f705b748fcd7bc35d0d73672ec43af8e333b8e84fcdf8128eadf269e9835cc6e7da1e41478b4848572a6a6682c55026aba0dd457946f507
@@ -23,5 +25,6 @@ EBUILD tomcat-7.0.57.ebuild 4349 SHA256 6fc213d477109c9438715922d2f86ad4b2e208ad
 EBUILD tomcat-7.0.59.ebuild 4352 SHA256 139c44589a83570efcbf9c3ac00d0da77d91be2fa9cdf4f075f007f8cf63dc6f SHA512 2d96e0b56fa306c832528ee7baad071ba3f2d3cb274a62d070e164ce51b7018b50c110784f842b302df0f8d00ee0d05471e17e5c298e6bd8a9018b4810eb6521 WHIRLPOOL 6f6a5e9652ea117e74c11a980934b20137a67c0295392de75818acc23f974b0d7db568b9b92ba55117d482180e5377252113ca1d9204a89f04e878c99b819b2a
 EBUILD tomcat-8.0.18.ebuild 4182 SHA256 51f609db4de52c4e8005c94247f805bac85ca22c4915606644560646702630fd SHA512 13f004ab14cafa7e23b0903170049768b3c901cb58f76804afb2d9b1e424079d8b1d2a75fb33f84aade46f5843a456785da31579edc78c102fd1e3fabf85a2ab WHIRLPOOL 3c2e16cf60250c3b476b0be6e8c3237814ae1f119411137c7cdaeb7c2a703a02535bf744a6b4912bc8e7a6235eca51d3ce367c2895e297569fa25e3d185aa68f
 EBUILD tomcat-8.0.20.ebuild 4182 SHA256 859e1181db68ae0bc11407fef3cdd4e94fadc086d50a7f793013e877265d4967 SHA512 27afb7bb308f3e708c56ffd59cb1c769547ed332935e4867dd3e6daff605b9934c6b688dbfcc034acca36fc6f2fc4aa5357769cc110747ae2d627c78b80c36bd WHIRLPOOL ceb8e1e9b30485d1e76684bfd1d4adec0dbafb8f51e60fc3dcc7374c68aa214b83634d8331bf8ebe50f0d6da72937184b460394d7fa121a23f6fda75788027c5
-MISC ChangeLog 81535 SHA256 fa6eec92342dc39ff57d42ca83b839909562feafa0d678b7a08cf27a5762e76a SHA512 f2119a48d80572730046f83e5a38b17d77dbd6fe05c15b46c9bbaedca15355afcc408c40c7929508653e1b06113c743b89bd4e3edf09fd24ff5fae86f708192b WHIRLPOOL 102ab59cbf4f19cb27586b47c73a1da7c10be03a2a36a601db6060f7050b49cbbfc06a7837ffa63ac8857eefd1d512c431fb7a7a2bca830a21ee506fbc9d73a7
+EBUILD tomcat-8.0.21.ebuild 4182 SHA256 2eca5c95cd568475b7ceba3684ca0109f99321563c5cac9b8f8575320a877e1b SHA512 ceedb0b5f4b7f7601b19c6f220fce5e4b1a0e3d805170aaa818790e67a7b714d3c7777c6386fbb21b3291bffe03ed49da27271eae932090323132d3d6c8acf6c WHIRLPOOL 2c795ee6fd2983ed02870f31a8e90aa99856ddb315956a813870e3600b53339eff6beb53b6be1139b8f0184a49d5db42827643f4d4a86b47003f3b9f58995f38
+MISC ChangeLog 81696 SHA256 ba9113d6e6e508b092ff163489c4ee5680e9186c2f8e5ba240375a1f071587bd SHA512 f9ba9590fd83260433cb7d87e05abf4dfd20b002eb36fb25cdb57a59251bf9c4fd4b4d042d57852357469c3137944ea6a7b6908bae4aec296d8265042e768198 WHIRLPOOL f549ef29eb44aeaf30a3ada03b8f09b070cffe729f7f1a4d5f4d1ef741517562a2532122ee728b400c2c045feec9bac0d6dce1308be5f7711b2771a134004a21
 MISC metadata.xml 652 SHA256 ec9dcba0295a5c3eff6b20d7d8038e09c6438d2fc56e45b5cfc3c27206f4bfd8 SHA512 07bc791d1240d11cb34a117657187a9efe4ef4bcdfee76d99f9656caa6fde1c1ffb67b78fe5e552c2a44ddb7e595d4175ada50f0426f2b0d832f0162f6b0afac WHIRLPOOL e1cc5d3799a6b7f6249f5c1420248600b5fec9228dd803fd673b1a75e26900c6539222a1da07e83bb4560e17681ecdf9ff31fe5dcc4d0fb15a694e9402991d7e
diff --git a/www-servers/tomcat/files/tomcat-8.0.21-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.21-build.xml.patch
new file mode 100644
index 000000000000..d7479598837b
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.0.21-build.xml.patch
@@ -0,0 +1,230 @@
+diff -Naur apache-tomcat-8.0.18-src-orig/build.xml apache-tomcat-8.0.18-src/build.xml
+--- apache-tomcat-8.0.18-src-orig/build.xml	2015-01-28 15:10:36.112146352 -0500
++++ apache-tomcat-8.0.18-src/build.xml	2015-02-19 18:08:37.971396016 -0500
+@@ -703,24 +703,29 @@
+       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+     <!-- Servlet 3.1 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${servlet-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.servlet-api"
+       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+       notice="${tomcat.manifests}/servlet-api.jar.notice"
+       license="${tomcat.manifests}/servlet-api.jar.license" />
+-
++-->
+     <!-- JSP 2.3 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${jsp-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jsp-api"
+       manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+ 
+     <!-- EL 3.0 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${el-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.el-api"
+       manifest="${tomcat.manifests}/el-api.jar.manifest" />
++-->
+ 
+     <!-- WebSocket 1.1 API JAR File -->
+     <jarIt jarfile="${websocket-api.jar}"
+@@ -992,14 +997,14 @@
+ 
+   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
+           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">
+@@ -1059,7 +1064,7 @@
+         <exclude name="${jdt.jar.filename}"/>
+       </fileset>
+     </delete>
+-    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+ 
+     <!-- Add sources for examples -->
+     <antcall target="examples-sources" />
+@@ -1093,7 +1098,7 @@
+     </javac>
+   </target>
+ 
+-  <target name="build-tomcat-jdbc" depends="package">
++  <target name="build-tomcat-jdbc" depends="package" unless="noget">
+     <!-- 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}"
+@@ -1108,7 +1113,7 @@
+     <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+   </target>
+ 
+-  <target name="build-tomcat-jdbc-src">
++  <target name="build-tomcat-jdbc-src" unless="noget">
+     <!-- build the jdbc-pool source jar-->
+     <echo message="Building Tomcat JDBC pool src JAR"/>
+     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+@@ -1212,10 +1217,11 @@
+ 
+     <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+     <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+       failonerror="false"/>
+     <copy file="${jdt.jar}" todir="${tomcat.embed}" />
+-
++-->
+     <!-- Note the meta-inf below will work as long as there is only one JAR
+          that needs to add entries. If there is more than one a more complex
+          solution will be required. -->
+@@ -1519,7 +1525,7 @@
+ 
+   <target name="extras-commons-logging-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-2">
+       <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/>
+@@ -1658,7 +1664,7 @@
+ 
+   <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}"/>
+@@ -2703,7 +2709,7 @@
+   </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}"/>
+@@ -2746,7 +2752,7 @@
+   </target>
+ 
+   <target name="download-test-compile"
+-          description="Download additional components for the tests" >
++          description="Download additional components for the tests" unless="noget">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${junit.loc}"/>
+@@ -2792,7 +2798,7 @@
+   </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}"/>
+@@ -2818,18 +2824,18 @@
+ 
+   <!-- =============== Utility Targets to support downloads ================ -->
+ 
+-  <target name="setproxy" if="${proxy.use}">
++  <target name="setproxy" if="${proxy.use}" unless="noget">
+     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+               proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+     <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+   </target>
+ 
+-  <target name="testexist">
++  <target name="testexist" unless="noget">
+     <echo message="Testing  for ${destfile}"/>
+     <available file="${destfile}" property="exist"/>
+   </target>
+ 
+-  <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++  <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+     <!-- Download and extract the package -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2841,7 +2847,7 @@
+     <delete file="${temp.file}.tar.gz"/>
+   </target>
+ 
+-  <target name="downloadgz-2" unless="exist" depends="testexist">
++  <target name="downloadgz-2" unless="noget" depends="testexist">
+     <!-- Download and extract the package from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2860,7 +2866,7 @@
+     <delete file="${temp.file}.tar.gz"/>
+   </target>
+ 
+-  <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++  <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+     <!-- Download and extract the package -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2871,7 +2877,7 @@
+     <delete file="${temp.file}"/>
+   </target>
+ 
+-  <target name="downloadzip-2" unless="exist" depends="testexist">
++  <target name="downloadzip-2" unless="noget" depends="testexist">
+     <!-- Download and extract the package from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2889,7 +2895,7 @@
+     <delete file="${temp.file}"/>
+   </target>
+ 
+-  <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++  <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+     <!-- Download the file -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2899,7 +2905,7 @@
+     <move file="${temp.file}" tofile="${destfile}"/>
+   </target>
+ 
+-  <target name="downloadfile-2" unless="exist" depends="testexist">
++  <target name="downloadfile-2" unless="noget" depends="testexist">
+     <!-- Download the file from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2922,7 +2928,7 @@
+     <move file="${temp.file}" tofile="${destfile}"/>
+   </target>
+ 
+-  <target name="trydownload.check" depends="setproxy">
++  <target name="trydownload.check" depends="setproxy" unless="noget">
+     <condition property="trydownload.run">
+       <and>
+         <not>
+@@ -2933,7 +2939,7 @@
+     </condition>
+   </target>
+ 
+-  <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++  <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+     <!-- Downloads a file if not yet downloaded and the source URL is available -->
+     <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+   </target>
+@@ -2944,7 +2950,7 @@
+ 
+   <target name="ide-eclipse"
+           depends="download-compile, extras-webservices-prepare, download-test-compile"
+-          description="Prepares the source tree to be built in Eclipse">
++          description="Prepares the source tree to be built in Eclipse" unless="noget">
+ 
+     <!-- Copy the sample project files into the root directory -->
+     <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-8.0.21.ebuild b/www-servers/tomcat/tomcat-8.0.21.ebuild
new file mode 100644
index 000000000000..d6b96fd14b76
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.0.21.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-8.0.21.ebuild,v 1.1 2015/03/28 15:54:37 fordfrog Exp $
+
+EAPI="5"
+
+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.1/JSP-2.3 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="8"
+KEYWORDS="~amd64 ~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.4"
+SAPI_SLOT="3.1"
+
+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.7"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.7
+	>=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' -type f -delete -print || 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"
+
+# revision of the instance-manager script
+IM_REV="-r1"
+
+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${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	doexe "${T}"/tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-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."
+}