Only remove .jar files, not directories; Fixed my stupid patch file (bug #528908)

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x77C501ED

4 files changed, 41 insertions, 62 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index f77f64f80abb..5747d49095a5 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.330 2014/11/02 10:19:15 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.331 2014/11/11 18:21:05 ercpe Exp $
+
+  11 Nov 2014; Johann Schmitz <ercpe@gentoo.org>
+  files/tomcat-7.0.56-build.xml.patch, tomcat-7.0.56.ebuild:
+  Only remove .jar files, not directories; Fixed my stupid patch file (bug
+  #528908)
 
 *tomcat-7.0.56 (02 Nov 2014)
 
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index fe9711c1bb0d..3b4f7eeaa46a 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -7,7 +7,7 @@ AUX tomcat-6.0.41-build.xml.patch 950 SHA256 33af0fd388c439e3ee74fd2271d94066169
 AUX tomcat-7.0.42-build.xml.patch 3852 SHA256 6b003e9c58131cfec4b5d312a18dbcd088428774a544d8d29b896542d3c92c5a SHA512 01feaa4428345203e2c5f0e28ee40bb9f7fd9351446e2454b43d5c1f7f7775606b70b47905e452511661e38ab5965865ed0622979e7845661c87e01a64f0e8cd WHIRLPOOL c86197abec4af7417803d85bd05615e24942f944fbda6712cf3c29ccd4989306f017663d378a719c2d71dd069d5c8850d5e2f4ec57b2243f4758c46bfe7ce2ed
 AUX tomcat-7.0.47-build.xml.patch 3852 SHA256 6b003e9c58131cfec4b5d312a18dbcd088428774a544d8d29b896542d3c92c5a SHA512 01feaa4428345203e2c5f0e28ee40bb9f7fd9351446e2454b43d5c1f7f7775606b70b47905e452511661e38ab5965865ed0622979e7845661c87e01a64f0e8cd WHIRLPOOL c86197abec4af7417803d85bd05615e24942f944fbda6712cf3c29ccd4989306f017663d378a719c2d71dd069d5c8850d5e2f4ec57b2243f4758c46bfe7ce2ed
 AUX tomcat-7.0.52-build.xml.patch 3852 SHA256 6b003e9c58131cfec4b5d312a18dbcd088428774a544d8d29b896542d3c92c5a SHA512 01feaa4428345203e2c5f0e28ee40bb9f7fd9351446e2454b43d5c1f7f7775606b70b47905e452511661e38ab5965865ed0622979e7845661c87e01a64f0e8cd WHIRLPOOL c86197abec4af7417803d85bd05615e24942f944fbda6712cf3c29ccd4989306f017663d378a719c2d71dd069d5c8850d5e2f4ec57b2243f4758c46bfe7ce2ed
-AUX tomcat-7.0.56-build.xml.patch 4710 SHA256 f1a6a1f034139fb9a056c9e965de51ddd43a4906a963ec919fc3cb2862cc47fc SHA512 23d34da0c35be0c33196b0d174540776fc94ff7807a8df5cc251e0331e13636d95237faaa4bb3a2723fc8c135b9145c6c37372bf83f0992b997a1269a7f5198b WHIRLPOOL 656e783d390c670ef19d7acfa499d604b3c9458a2d77327044a5524aec176287c3a627670e3b2535bc7dece5772a90c75066ab8bed65722372f670f8fbf9ed77
+AUX tomcat-7.0.56-build.xml.patch 3854 SHA256 51b845985859132b633371c6fd2e1e2ea5c787bf7206125546c4b8752464d39e SHA512 8da59a51e58db16b0062bcc6b24e6b0b43d13884abd7c68a37b15226ff4184fb872a8e43ac281c3c7bd379dd11a1343db3eff84175f9323808d1d0c8641242b4 WHIRLPOOL 6035466159f30b873117478a8859451d73c4424cb22e29991cec2af72fc918cf14adf2bb51d107a7a1b95ca1b770f7a3ba6290abdb036d1bdf1a9a4b8da75130
 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
@@ -25,17 +25,17 @@ EBUILD tomcat-6.0.41.ebuild 4106 SHA256 35232da099632e8be06a2c4c21c2aeeef048319b
 EBUILD tomcat-7.0.42.ebuild 4036 SHA256 c717c7d67b0ba3931c848057980a10a7897db8d6b5e1ea975f3daef321546290 SHA512 55ddd1823146d6cce2e19ed71bdd36cc778f276c01eb699147744fef0378f4ac1f6c2e357b823274d0ac42887af4f83c832306ffa09e2740ccd1f97589251669 WHIRLPOOL b6d7ee5c22d8e89903ca0f6b99ecf78c72eccb6a788f36d37c672edef9f0d3c92f585a02877653b3ca2b8dcb6fb606f76f26466d852e955e3ec4aaa621e1a378
 EBUILD tomcat-7.0.47.ebuild 4047 SHA256 fd45a575e61eada7d36e7b6f4b93435d4684093efe1d8fe7e5871bcd300bc1c2 SHA512 0ac833f9e80b6fea175c4894df53ffeb1c2930e54dbfdb506e86e3b28ec36698d1d3d907fe11d97c71b70ceb36a4ccd236851519e1e0834bde9c3dffe95350f0 WHIRLPOOL 6d5184b23115b7d2d89621aa72eca2e411d5e8362179ef0fea8ac702acf986142ea5a0361d6f7fad6b8b51848fa5edd165a48726e08d487eea92a43062d21ccf
 EBUILD tomcat-7.0.52.ebuild 4047 SHA256 21a962b9afb1f8b3e0a0d5564de05a5b79d9b8de885493ffb2304fb84833f02d SHA512 326b2fb72ac1133c21e5d4267b6aaba3d5819df1c4f513c48f8009c1dee8d7c251c9d476feac08b743b80d664a6439868f5f98c9380b861781d6f5cbcf4d0173 WHIRLPOOL c5d8079a8e5b4c49b726313ec08fe003e9e38a18fe2502efe25d8f37410cdef4b0d9f56c67b7fda84c2751e1bbc0b24536bc36c800fb5b16a0c84c5b03c67761
-EBUILD tomcat-7.0.56.ebuild 4211 SHA256 e8896ab0ae612a62703bae91f011be20128beef516f8607306c2aef451733e9f SHA512 c20948c145a6d12d3d31628a7344cd0834958072c246158cf534a6484f163f1c7c436cb01d61c6dcefa0caac03ce5493c140486a1f51e50a6074ff250411a522 WHIRLPOOL dc6452a0f3b3579d17ceed902629e24c897ac336bff4d33331ecebcf08fd92f41a852b53e326188a2bfeba386b4218995f9dd754f574d9cc040255149f4f38c5
-MISC ChangeLog 78962 SHA256 7ea3af799f578b79c4c984cedef69101ed22e689a2094f42d70765cd676ef52f SHA512 4407eb74f7a66ee0eabc10a694fbc0dc7f150fd74a2c1a5a99a9529d901c8c9348284d77aca8bfb0ec93fc5db37b10e991d2e000557ab4e4b87a1f35c78d910a WHIRLPOOL 8ee7588991eae1a522fe86ebee0c776e837a9419847de7fed3cbb7dc8c6539578ee1e95cf804aa73745513350a66f44d9a80b3bf9a83a7c11a5ffa8a833d6555
+EBUILD tomcat-7.0.56.ebuild 4221 SHA256 74d60208e3b0772ccb5828a93103039dd66d998db35f79673061bed174bc46f3 SHA512 4fab3938983add7a241dcd2d9a75ecd9256d34d58ec0136788e1c67c6efb257fee10c29702e6e2a8bfef4f6d83fa8b27dfa7337c23bb2eb73f709515766fea90 WHIRLPOOL a9548894e8bd517fe1e5208a622c765e8ec5df8052984a85ec6f72cd2777258c6b2e1611c4635d37b0cbdd056772eb12f49e5e94e1aa6a0643d558bf7d946f24
+MISC ChangeLog 79159 SHA256 56f3636c0154c667c9fc57a60beab275dc97b3fbcea1a51783d878eacda76330 SHA512 35ff7f87cb644067f196477b6757943252f80637d001931920fe00356733be17c46d7cd49a8522e377fa95cd05c65a6e7276cdce7553c760c40ef8d58daf18ee WHIRLPOOL fa70980340c5465f1fdd280a1f9eb46ef32a180d53d4d03a6d627bd106b967c25dfc17bfac9b34cff04d2715f7caac557e029c44ada07cdbb5c8928c60376102
 MISC metadata.xml 561 SHA256 a53b91aa1c4371952ed465d0b570fde6eebd1a621804990aa3d2c31f3a8cecab SHA512 354849871d8ff7e9d3bba1bd412f78789693518f1f9804aac412b64e9e86622fb86080b8290bbe16424c760b3601e96824cb3f0b956edbc2245dfa5be299c8c5 WHIRLPOOL f740fcc281807c913934662fcff48a023d42065ec0b50564d4a12ff970ce09447cac0a71016a33ff4896a596dcd86cd9372b4a12286fb0bf46bb01bb6bd2c7e1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUVgUkAAoJEKCEBkJ3xQHtTKMIALAwRMVB5Z0x62/QbdKXILiF
-XCLZY4WDRUOFboNSDKnN50R/lveVOrW0Yi41aKqdzjscP05V+1/sOIr7A1gcbXFW
-bXiGsFopkGn0wHjarkv91XvxSRrqnOzxCa0tMoDZGJsLQl9HTWatDMAHWmN3G/fS
-g0/y1RFISEZ7M3bilUaBsbjhFP88bGb5ZR+C3H4TYFLE9mjCF7HgAg3LK/S6SQHi
-mkIYe2znR8qdyco5pklZGxelB/ykrTgMJdbJvHuzfeelXeQSDYKED5LmHXcwzsB/
-BSFfIjiAxoCyon3Uqi6mx7nwa5HsbsxybLRlkCQQVOYc0xbStN0i3hWikQ3KmlY=
-=Cp05
+iQEcBAEBCAAGBQJUYlOYAAoJEKCEBkJ3xQHt7TsIAJEksbe1ugtoqZppOebGQ0gF
+zt4gR7wdE2auCEYskHH/k7lJ+9kZyuSJOhE0QBpfmQp4sT3KLpEaacq/F1BBi7jP
+qEno79G+0mKLvqrT9QpVsZtX6VNaqt+84tQknHAnCQ0EFSh7B1w9HtlwLni/DF0+
+h8iTe9KuoQyAdK4qNIx6YPioXnvFcWQ2UgyBdZ4cWJBruu40wdwIwbsdFHVYUPpY
+wNrzQc9R6q5n692RcILcphPG9+tK0Q07ybLFD3MgigeWStsuAdy+uYLwCaPy+UtG
+XxwxFdxk/XkEl66T0pcbAaIEE8O1H1fjXBCZE/az3zEjE02yqX6GD7ouWTI+CLc=
+=k8gT
 -----END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/files/tomcat-7.0.56-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.56-build.xml.patch
index d97891832077..6b431d97a4fa 100644
--- a/www-servers/tomcat/files/tomcat-7.0.56-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-7.0.56-build.xml.patch
@@ -1,32 +1,32 @@
 diff --git a/apache-tomcat-7.0.56-src/build.xml b/apache-tomcat-7.0.56-src/build.xml
-index 166f45e..cb82a5f 100644
+index 166f45e..66a95ce 100644
 --- a/apache-tomcat-7.0.56-src/build.xml
 +++ b/apache-tomcat-7.0.56-src/build.xml
-@@ -686,7 +686,8 @@
-       filesId="files.annotations-api"
+@@ -687,26 +687,32 @@
        manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
  
--    <!-- Servlet 3.0 Implementation JAR File -->
+     <!-- Servlet 3.0 Implementation JAR File -->
 +<!--
-+    Servlet 3.0 Implementation JAR File
      <jarIt jarfile="${servlet-api.jar}"
        filesDir="${tomcat.classes}"
        filesId="files.servlet-api"
-@@ -694,7 +695,7 @@
+       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
        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
+     <!-- JSP 2.2 Implementation JAR File -->
++<!--
      <jarIt jarfile="${jsp-api.jar}"
        filesDir="${tomcat.classes}"
        filesId="files.jsp-api"
-@@ -702,11 +703,12 @@
+       manifest="${tomcat.manifests}/jsp-api.jar.manifest"
        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 
+     <!-- JSP 2.2 EL Implementation JAR File -->
++<!--
      <jarIt jarfile="${el-api.jar}"
        filesDir="${tomcat.classes}"
        filesId="files.el-api"
@@ -35,28 +35,7 @@ index 166f45e..cb82a5f 100644
  
      <!-- Bootstrap JAR File -->
      <jarIt jarfile="${bootstrap.jar}"
-@@ -801,16 +803,19 @@
-   <target name="package-java7" depends="compile,build-manifests"
-           if="java.7.home">
-     <!-- WebSocket 1.0 API JAR File -->
-+<!--
-     <jarIt jarfile="${websocket-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.websocket-api"
-       manifest="${tomcat.manifests}/websocket-api.jar.manifest" />
--
-+-->
-     <!-- WebSocket 1.0 implementation JAR File -->
-+<!--
-     <jarIt jarfile="${tomcat7-websocket.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat7-websocket"
-       meta-inf="${tomcat.manifests}/tomcat7-websocket.jar"/>
-+-->
-   </target>
- 
-   <target name="build-docs" depends="compile-prepare" description="Builds all documentation from XML sources">
-@@ -952,13 +957,14 @@
+@@ -952,12 +958,14 @@
    <target name="deploy" depends="package,build-docs,compile-webapp-examples"
            description="Default. Builds a working Tomcat instance">
  
@@ -67,12 +46,11 @@ index 166f45e..cb82a5f 100644
              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">
-@@ -1011,9 +1017,11 @@
+@@ -1011,9 +1019,11 @@
      <!-- Add sources for examples -->
      <antcall target="examples-sources" />
  
@@ -84,43 +62,39 @@ index 166f45e..cb82a5f 100644
  
      <!-- build the jdbc-pool jar and source jar-->
      <echo message="Building Tomcat JDBC pool libraries"/>
-@@ -1606,7 +1614,8 @@
+@@ -1606,7 +1616,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">
++          description="Prepare to build web services extras package" unless="noget">
  
      <antcall target="downloadfile">
        <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -2651,7 +2660,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -2651,7 +2661,7 @@ 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">
++          description="Download (and build) components necessary to compile" unless="noget">
  
      <antcall target="downloadfile-2">
        <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2708,7 +2718,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -2708,7 +2718,7 @@ 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">
++          description="Download additional components for the tests" unless="noget">
  
      <antcall target="downloadfile">
        <param name="sourcefile" value="${junit.loc}"/>
-@@ -2736,7 +2747,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -2736,7 +2746,7 @@ 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">
++          description="Download additional components for a distribution" unless="noget">
  
      <antcall target="downloadzip-2">
        <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
diff --git a/www-servers/tomcat/tomcat-7.0.56.ebuild b/www-servers/tomcat/tomcat-7.0.56.ebuild
index 5e2335ab9de7..2a1472b6067a 100644
--- a/www-servers/tomcat/tomcat-7.0.56.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.56.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.56.ebuild,v 1.1 2014/11/02 10:19:15 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.56.ebuild,v 1.2 2014/11/11 18:21:05 ercpe Exp $
 
 EAPI=5
 
@@ -48,8 +48,8 @@ pkg_setup() {
 }
 
 java_prepare() {
-	find -name '*.jar' -exec rm -frv {} + || die
-	epatch "${FILESDIR}/${P}-build.xml.patch"
+	find -type f -name '*.jar' -exec rm -frv {} + || die
+	epatch "${FILESDIR}/${P}-2-build.xml.patch"
 
 	# For use of catalina.sh in netbeans
 	sed -i -e "/^# ----- Execute The Requested Command/ a\