www-servers/tomcat: removed obsolete file

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

3 files changed, 6 insertions, 108 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 1911d9eb12e7..5ff6b41d36b7 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,10 @@
 # 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.310 2012/12/06 11:07:55 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.311 2012/12/06 11:13:24 fordfrog Exp $
+
+  06 Dec 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  -files/tomcat-7.0.30-build.xml.patch:
+  removed obsolete file
 
   06 Dec 2012; Miroslav Šulc <fordfrog@gentoo.org>
   -files/tomcat-6.0.35-build.xml.patch, -files/6/catalina.policy,
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index e238e69cf28f..4d2a423f680b 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,5 +1,4 @@
 AUX tomcat-6.0.36-build.xml.patch 950 SHA256 33af0fd388c439e3ee74fd2271d94066169b530b61dab3f1f01a094ec22e3f9f SHA512 69775288f3ba31bc5b3f1f6125c1ca6f27c64647eeeb40928227fcbeb3a33f832ccc24be051efec9f8ca575475549c6493b12495d4a98e9e4fd1c27b9af68f8c WHIRLPOOL e31b35c1395c152c65863cddd79617ec92b21269567fc1458914e6f9b10e3a70698987d05724e52b706e6e0cfeab56e818feca5d04d80ee08f24bfefe89ea63f
-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
@@ -11,5 +10,5 @@ DIST apache-tomcat-7.0.33-src.tar.gz 4240455 SHA256 f665b4b39471b6f7ddd10845058a
 EBUILD tomcat-6.0.36.ebuild 3689 SHA256 234d2e80c2485e44abb69677b26abe45f93f4e040e9b630e02ee35ba0207b01c SHA512 db204d39b03b9b2dcec6f2a82e6d0d5142fdd99e2e74d32dc8db9ae6894b8b6f2da83200f71bcc6f7d39fe9518e53ea9604a77fd68e46445418f3b2ba402e6f9 WHIRLPOOL 8b45055f236b87b26270108c4ab1a5be8f7fd903e94f468050baa115e64f0e2f12cf1e9854e0e43e6825312519922695e89e5133f27760c7ba117fd7ec3a30fa
 EBUILD tomcat-7.0.32.ebuild 3770 SHA256 38d7b2548b0efc29d3b61476f3dfce9d89b023988c06a57597f5e55838b97d80 SHA512 26273706ae2263b64665371342b8abbbf44340074c2186c40af3dd1e628c280b57ea242dbe8c90226bf8d47d90ec78e58b65441cfa6325cb4111eaf811f0aadd WHIRLPOOL 83f3885d5277cf80219128cccf75a700ecbdeacd8dc07e1f1fba2e6d9e02eb3e24290386dc1ea1695b9e2cf4810b17177347ba51f0f47bdacdf62c84b709d251
 EBUILD tomcat-7.0.33.ebuild 3779 SHA256 9346925751bbf18ab0e48c4a97d30f3e7d25693c7a2b73b5d5b821ab186db676 SHA512 997e0028953e745f94ceef615ee395e89557292a1afc3132777574dca1bf8e057f4887cad6af9baae626ae71f41f3f4248d9ee0be39bd76ef6b57fe342296202 WHIRLPOOL f1569219f0d2b818f6a2fd93b93305f2927324d834acb4acfe5837bcfe0c3b81d7a014d6266e00d266d926a9546e93c67666dceecf221a126125d2696e579157
-MISC ChangeLog 75346 SHA256 2ee7845f4d4d56efbf750c9909ae9a7d171c4c99ff4502729f516eaef9e332a8 SHA512 284ed66e01a693ae6011dcae3da1b185d9ef6380d98df08d3c1105d975b74fa893ede77d88df157388d19a692acc92edcadee45f130d3a19940d6ba8977d558e WHIRLPOOL b83c4f16e1ab3d031395e29057eed13b14df0c0493f5c6ef3ebc409ffef1c83c87eb92fe08d0bed99be0701976f443637a6d562d2ed2e3117bedf5647b1bc7b3
+MISC ChangeLog 75463 SHA256 e974a265c8d2d59c3a1177350481caac55bd48b77a4105841a42020986365f7d SHA512 80cc4481a4564859d27d76c531d47e3de03afc6afbeffcda4ac77a98c85c16d7de0a4ad67274f3797d31f5a409328c0fcf2f75237e008078876ef44458289d86 WHIRLPOOL e3c7cb3d3d4d01735fdd5140d86b813ae48d4a92c8d27ad46898b5d84332d8f5ade3c14d7c671ab8b7b44d18ee90f55838124cdee62b90d18540e8bdd114accd
 MISC metadata.xml 561 SHA256 a53b91aa1c4371952ed465d0b570fde6eebd1a621804990aa3d2c31f3a8cecab SHA512 354849871d8ff7e9d3bba1bd412f78789693518f1f9804aac412b64e9e86622fb86080b8290bbe16424c760b3601e96824cb3f0b956edbc2245dfa5be299c8c5 WHIRLPOOL f740fcc281807c913934662fcff48a023d42065ec0b50564d4a12ff970ce09447cac0a71016a33ff4896a596dcd86cd9372b4a12286fb0bf46bb01bb6bd2c7e1
diff --git a/www-servers/tomcat/files/tomcat-7.0.30-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.30-build.xml.patch
deleted file mode 100644
index 9b07137451aa..000000000000
--- a/www-servers/tomcat/files/tomcat-7.0.30-build.xml.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-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}"/>